From fdcf698a89ebfe2316fc6ef2f94df7c8203a7f4b Mon Sep 17 00:00:00 2001 From: Fabio Aiuto Date: Sun, 11 Sep 2022 12:25:13 +0200 Subject: acpi/acpi_pm.c: refactor acpi_pm_state_for_* functions Use just one function to get the chipset powerstate and add an argument to specify the powerstate claimer {RTC,ELOG,WAKE} and adjust the failure log accordingly. TEST: compile tested and qemu emulation successfully run Signed-off-by: Fabio Aiuto Change-Id: I8addc0b05f9e360afc52091c4bb731341d7213cf Reviewed-on: https://review.coreboot.org/c/coreboot/+/67618 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/acpi/acpi_pm.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) (limited to 'src/acpi/acpi_pm.c') diff --git a/src/acpi/acpi_pm.c b/src/acpi/acpi_pm.c index bee5616e57db..40a3fbd7ad2d 100644 --- a/src/acpi/acpi_pm.c +++ b/src/acpi/acpi_pm.c @@ -2,10 +2,17 @@ #include #include +#include #include #include #include +static const char *pm_fetch_failure_msg[PS_CLAIMER_MAX] = { + [PS_CLAIMER_ELOG] = "no event recorded in ELOG.", + [PS_CLAIMER_RTC] = "RTC init aborted.", + [PS_CLAIMER_WAKE] = "wake source unknown.", +}; + void __weak mainboard_suspend_resume(void) { } @@ -38,31 +45,16 @@ struct chipset_power_state *acpi_get_pm_state(void) return acpi_pm_state; } -int acpi_pm_state_for_elog(const struct chipset_power_state **ps) -{ - *ps = acpi_get_pm_state(); - if (!*ps) { - printk(BIOS_ERR, "No CBMEM_ID_POWER_STATE entry, no event recorded in ELOG.\n"); - return -1; - } - return 0; -} - -int acpi_pm_state_for_rtc(const struct chipset_power_state **ps) +int acpi_fetch_pm_state(const struct chipset_power_state **ps, + enum power_state_claimer ps_claimer) { + assert(ps_claimer < PS_CLAIMER_MAX); *ps = acpi_get_pm_state(); - if (!*ps) { - printk(BIOS_ERR, "No CBMEM_ID_POWER_STATE entry, RTC init aborted.\n"); - return -1; - } - return 0; -} -int acpi_pm_state_for_wake(const struct chipset_power_state **ps) -{ - *ps = acpi_get_pm_state(); if (!*ps) { - printk(BIOS_ERR, "No CBMEM_ID_POWER_STATE entry, wake source unknown.\n"); + printk(BIOS_ERR, "No CBMEM_ID_POWER_STATE entry, %s\n", + ps_claimer < PS_CLAIMER_MAX ? + pm_fetch_failure_msg[ps_claimer] : "unknown claimer."); return -1; } return 0; -- cgit v1.2.3