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

soc/intel/common: add possiblity to override GPE0 to acpi_fill_soc_wake 

Currently, only the PM1_STS mask gets passed to `acpi_fill_soc_wake`. To
be able to override the GPE0_STS mask as well, also pass that one. To
accomplish that, pointers to the variables are passed now.

Change-Id: If9f28cf054ae8b602c0587e4dd4a13a4aba810c7
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58071
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Michael Niewöhner 2021-09-30 21:03:07 +02:00
parent f855b8bfee
commit 820b9c4676
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/soc/intel/common/block/acpi/acpi.c
View File

@ -192,10 +192,9 @@ unsigned long southbridge_write_acpi_tables(const struct device *device,
} }
__weak __weak
uint32_t acpi_fill_soc_wake(uint32_t generic_pm1_en, void acpi_fill_soc_wake(uint32_t *pm1_en, uint32_t *gpe0_en,
const struct chipset_power_state *ps) const struct chipset_power_state *ps)
{ {
return generic_pm1_en;
} }
/* /*
@ -210,6 +209,7 @@ uint32_t acpi_fill_soc_wake(uint32_t generic_pm1_en,
int soc_fill_acpi_wake(const struct chipset_power_state *ps, uint32_t *pm1, uint32_t **gpe0) int soc_fill_acpi_wake(const struct chipset_power_state *ps, uint32_t *pm1, uint32_t **gpe0)
{ {
static uint32_t gpe0_sts[GPE0_REG_MAX]; static uint32_t gpe0_sts[GPE0_REG_MAX];
uint32_t gpe0_en[GPE0_REG_MAX];
uint32_t pm1_en; uint32_t pm1_en;
int i; int i;
@ -220,14 +220,16 @@ int soc_fill_acpi_wake(const struct chipset_power_state *ps, uint32_t *pm1, uint
pm1_en = ps->pm1_en; pm1_en = ps->pm1_en;
pm1_en |= WAK_STS | PWRBTN_EN; pm1_en |= WAK_STS | PWRBTN_EN;
pm1_en = acpi_fill_soc_wake(pm1_en, ps); memcpy(gpe0_en, ps->gpe0_en, sizeof(gpe0_en));
acpi_fill_soc_wake(&pm1_en, gpe0_en, ps);
*pm1 = ps->pm1_sts & pm1_en; *pm1 = ps->pm1_sts & pm1_en;
/* Mask off GPE0 status bits that are not enabled */ /* Mask off GPE0 status bits that are not enabled */
*gpe0 = &gpe0_sts[0]; *gpe0 = &gpe0_sts[0];
for (i = 0; i < GPE0_REG_MAX; i++) for (i = 0; i < GPE0_REG_MAX; i++)
gpe0_sts[i] = ps->gpe0_sts[i] & ps->gpe0_en[i]; gpe0_sts[i] = ps->gpe0_sts[i] & gpe0_en[i];
return GPE0_REG_MAX; return GPE0_REG_MAX;
} }

6
src/soc/intel/common/block/include/intelblocks/acpi.h
View File

@ -6,6 +6,7 @@
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <device/device.h> #include <device/device.h>
#include <intelblocks/cpulib.h> #include <intelblocks/cpulib.h>
#include <soc/pm.h>
#include <stdint.h> #include <stdint.h>
/* Forward declare the power state struct here */ /* Forward declare the power state struct here */
@ -47,10 +48,9 @@ acpi_tstate_t *soc_get_tss_table(int *entries);
/* /*
* Chipset specific quirks for the wake enable bits. * Chipset specific quirks for the wake enable bits.
* Returns wake events for the soc.
*/ */
uint32_t acpi_fill_soc_wake(uint32_t generic_pm1_en, void acpi_fill_soc_wake(uint32_t *pm1_en, uint32_t *gpe0_en,
const struct chipset_power_state *ps); const struct chipset_power_state *ps);
/* Chipset specific settings for filling up dmar table */ /* Chipset specific settings for filling up dmar table */
unsigned long sa_write_acpi_tables(const struct device *dev, unsigned long sa_write_acpi_tables(const struct device *dev,