GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/common: add single function ACPI PM1 GPE helpers 

The existing code in common/block/acpi is mixing multiple operations:
saving things to cbmem in common code but then soc code uses that
information, reliant upon soc-specific struct soc_power_reg object,
and only saving/snapshotting ACPI registers very deep in ramstage.

To unwind the above provide some functions that are more targeted:
- Add struct acpi_pm_gpe_state object
- Add acpi_fill_pm_gpe_state()
- Add acpi_pm_gpe_add_events_print_events()
- Add acpi_clear_pm_gpe_status()

BUG=b:159947207

Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Change-Id: Ia7afed2861343802b3c78728784f7cfaf6f53f62
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44481
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Aaron Durbin 2020-08-14 14:48:45 -06:00
parent ac8e1062cb
commit 746e598d07
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/soc/amd/common/block/acpi/acpi.c
View File

@ -91,6 +91,28 @@ static void log_pm1_status(uint16_t pm1_sts)
elog_add_event_wake(ELOG_WAKE_SOURCE_PCIE, 0);
}
void acpi_fill_pm_gpe_state(struct acpi_pm_gpe_state *state)
{
state->pm1_sts = acpi_read16(MMIO_ACPI_PM1_STS);
state->pm1_en = acpi_read16(MMIO_ACPI_PM1_EN);
state->gpe0_sts = acpi_read32(MMIO_ACPI_GPE0_STS);
state->gpe0_en = acpi_read32(MMIO_ACPI_GPE0_EN);
state->previous_sx_state = acpi_get_sleep_type();
state->aligning_field = 0;
}
void acpi_pm_gpe_add_events_print_events(const struct acpi_pm_gpe_state *state)
{
log_pm1_status(state->pm1_sts);
print_pm1_status(state->pm1_sts);
}
void acpi_clear_pm_gpe_status(void)
{
acpi_write16(MMIO_ACPI_PM1_STS, acpi_read16(MMIO_ACPI_PM1_STS));
acpi_write32(MMIO_ACPI_GPE0_STS, acpi_read32(MMIO_ACPI_GPE0_STS));
}
static void save_sws(uint16_t pm1_status)
{
struct soc_power_reg *sws;

17
src/soc/amd/common/block/include/amdblocks/acpi.h
View File

@ -16,6 +16,23 @@
#define MMIO_ACPI_GPE0_STS 0x14
#define MMIO_ACPI_GPE0_EN 0x18
/* Structure to maintain standard ACPI register state for reporting purposes. */
struct acpi_pm_gpe_state {
uint16_t pm1_sts;
uint16_t pm1_en;
uint32_t gpe0_sts;
uint32_t gpe0_en;
uint16_t previous_sx_state;
uint16_t aligning_field;
};
/* Fill object with the ACPI PM and GPE state. */
void acpi_fill_pm_gpe_state(struct acpi_pm_gpe_state *state);
/* Save events to eventlog log and also print information on console. */
void acpi_pm_gpe_add_events_print_events(const struct acpi_pm_gpe_state *state);
/* Clear PM and GPE status registers. */
void acpi_clear_pm_gpe_status(void);
void acpi_clear_pm1_status(void);
/*