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 <fabioaiuto83@gmail.com>
Change-Id: I8addc0b05f9e360afc52091c4bb731341d7213cf
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67618
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Fabio Aiuto
2022-09-11 12:25:13 +02:00
committed by Felix Held
parent e6d6d3620e
commit fdcf698a89
21 changed files with 41 additions and 43 deletions

View File

@@ -175,7 +175,7 @@ int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_rtc(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_RTC) < 0)
return 1;
return rtc_failed(ps->gen_pmcon_b);

View File

@@ -89,7 +89,7 @@ void pch_log_state(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_elog(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_ELOG) < 0)
return;
/* Power and Reset */

View File

@@ -191,7 +191,7 @@ int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_rtc(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_RTC) < 0)
return 1;
return rtc_failed(ps->gen_pmcon1);

View File

@@ -77,7 +77,7 @@ void southcluster_log_state(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_elog(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_ELOG) < 0)
return;
log_power_and_resets(ps);

View File

@@ -147,7 +147,7 @@ static void acpi_save_wake_source(void *unused)
if (acpi_reset_gnvs_for_wake(&gnvs) < 0)
return;
if (acpi_pm_state_for_wake(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_WAKE) < 0)
return;
pm_fill_gnvs(gnvs, ps);

View File

@@ -77,7 +77,7 @@ void southcluster_log_state(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_elog(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_ELOG) < 0)
return;
log_power_and_resets(ps);

View File

@@ -107,7 +107,7 @@ static void pch_log_state(void *unused)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_elog(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_ELOG) < 0)
return;
/* Power and Reset */

View File

@@ -51,7 +51,7 @@ static void acpi_save_wake_source(void *unused)
if (acpi_reset_gnvs_for_wake(&gnvs) < 0)
return;
if (acpi_pm_state_for_wake(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_WAKE) < 0)
return;
pm_fill_gnvs(gnvs, ps);

View File

@@ -168,7 +168,7 @@ int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_rtc(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_RTC) < 0)
return 1;
return rtc_failed(ps->gen_pmcon_b);

View File

@@ -54,7 +54,7 @@ static void acpi_save_wake_source(void *unused)
if (acpi_reset_gnvs_for_wake(&gnvs) < 0)
return;
if (acpi_pm_state_for_wake(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_WAKE) < 0)
return;
pm_fill_gnvs(gnvs, ps);

View File

@@ -184,7 +184,7 @@ int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_rtc(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_RTC) < 0)
return 1;
return check_rtc_failed(ps->gen_pmcon_b);

View File

@@ -184,7 +184,7 @@ int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_rtc(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_RTC) < 0)
return 1;
return check_rtc_failed(ps->gen_pmcon_b);

View File

@@ -184,7 +184,7 @@ int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_rtc(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_RTC) < 0)
return 1;
return check_rtc_failed(ps->gen_pmcon_b);

View File

@@ -166,7 +166,7 @@ int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_rtc(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_RTC) < 0)
return 1;
return rtc_failed(ps->gen_pmcon_b);

View File

@@ -232,7 +232,7 @@ static void pch_log_state(void *unused)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_elog(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_ELOG) < 0)
return;
/* Power and Reset */

View File

@@ -190,7 +190,7 @@ int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps;
if (acpi_pm_state_for_rtc(&ps) < 0)
if (acpi_fetch_pm_state(&ps, PS_CLAIMER_RTC) < 0)
return 1;
return check_rtc_failed(ps->gen_pmcon_b);