From e73da80d2c63f14cdc301a2436cf9b93dc5a531f Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 8 Sep 2015 16:16:34 -0700 Subject: braswell: Switch to using common ACPI _SWS code Switch braswell to use the common code for filling out the NVS data used by ACPI _SWS methods. This code was out of date on braswell so also update it to provide the \_GPE.SWS method. BUG=chrome-os-partner:40635 BRANCH=none TEST=emerge-cyan coreboot Change-Id: I41c2a141c15f78dc0d9482954c157f81bd0759fa Signed-off-by: Patrick Georgi Original-Commit-Id: 4c4d1ee76f337addf687ca5a9ae2da5e898c2de0 Original-Change-Id: I44424784d5d3afb06d0d58c651a9339c7b77418c Original-Signed-off-by: Duncan Laurie Original-Reviewed-on: https://chromium-review.googlesource.com/298230 Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11649 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/soc/intel/braswell/Kconfig | 1 + src/soc/intel/braswell/acpi/globalnvs.asl | 3 ++- src/soc/intel/braswell/acpi/platform.asl | 9 +++------ src/soc/intel/braswell/include/soc/nvs.h | 5 +++-- src/soc/intel/braswell/ramstage.c | 29 ++++++++--------------------- 5 files changed, 17 insertions(+), 30 deletions(-) (limited to 'src/soc/intel/braswell') diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig index 043dc1a43a..f76b9b244c 100644 --- a/src/soc/intel/braswell/Kconfig +++ b/src/soc/intel/braswell/Kconfig @@ -32,6 +32,7 @@ config CPU_SPECIFIC_OPTIONS select PLATFORM_USES_FSP1_1 select REG_SCRIPT select SOC_INTEL_COMMON + select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE select SOC_INTEL_COMMON_FSP_RAM_INIT select SOC_INTEL_COMMON_FSP_ROMSTAGE select SOC_INTEL_COMMON_RESET diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl index fe131f993a..f37bf45054 100644 --- a/src/soc/intel/braswell/acpi/globalnvs.asl +++ b/src/soc/intel/braswell/acpi/globalnvs.asl @@ -53,7 +53,8 @@ Field (GNVS, ByteAcc, NoLock, Preserve) TLVL, 8, /* 0x13 - Throttle Level */ PPCM, 8, /* 0x14 - Maximum P-state usable by OS */ PM1I, 32, /* 0x15 - System Wake Source - PM1 Index */ - BDID, 8, /* 0x19 - Board ID */ + GPEI, 32, /* 0x19 - GPE Wake Source */ + BDID, 8, /* 0x1d - Board ID */ /* Device Config */ Offset (0x20), diff --git a/src/soc/intel/braswell/acpi/platform.asl b/src/soc/intel/braswell/acpi/platform.asl index 33be9ee98e..6f5e6629cf 100644 --- a/src/soc/intel/braswell/acpi/platform.asl +++ b/src/soc/intel/braswell/acpi/platform.asl @@ -18,6 +18,9 @@ * Foundation, Inc. */ +/* Enable ACPI _SWS methods */ +#include + /* The APM port can be used for generating software SMIs */ OperationRegion (APMP, SystemIO, 0xb2, 2) @@ -72,9 +75,3 @@ Method(_WAK,1) { Return(Package(){0,0}) } - -Method (_SWS) -{ - /* Index into PM1 for device that caused wake */ - Return (\PM1I) -} diff --git a/src/soc/intel/braswell/include/soc/nvs.h b/src/soc/intel/braswell/include/soc/nvs.h index 9492f2c61b..23bd719570 100644 --- a/src/soc/intel/braswell/include/soc/nvs.h +++ b/src/soc/intel/braswell/include/soc/nvs.h @@ -46,8 +46,9 @@ typedef struct { u8 tlvl; /* 0x13 - Throttle Level */ u8 ppcm; /* 0x14 - Maximum P-state usable by OS */ u32 pm1i; /* 0x15 - System Wake Source - PM1 Index */ - u8 bdid; /* 0x19 - Board ID */ - u8 rsvd1[6]; + u32 gpei; /* 0x19 - GPE Wake Source */ + u8 bdid; /* 0x1d - Board ID */ + u8 rsvd1[2]; /* Device Config */ u8 s5u0; /* 0x20 - Enable USB0 in S5 */ diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c index 26c23bc486..2454c6b141 100644 --- a/src/soc/intel/braswell/ramstage.c +++ b/src/soc/intel/braswell/ramstage.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -142,30 +143,18 @@ static inline void set_acpi_sleep_type(int val) #endif } -/* Save bit index for first enabled event in PM1_STS for \_SB._SWS */ -static void s3_save_acpi_wake_source(global_nvs_t *gnvs) +/* Save wake source information for calculating ACPI _SWS values */ +int soc_fill_acpi_wake(uint32_t *pm1, uint32_t **gpe0) { struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE); - uint16_t pm1; + static uint32_t gpe0_sts; - if (!ps) - return; - - pm1 = ps->pm1_sts & ps->pm1_en; - - /* Scan for first set bit in PM1 */ - for (gnvs->pm1i = 0; gnvs->pm1i < 16; gnvs->pm1i++) { - if (pm1 & 1) - break; - pm1 >>= 1; - } + *pm1 = ps->pm1_sts & ps->pm1_en; - /* If unable to determine then return -1 */ - if (gnvs->pm1i >= 16) - gnvs->pm1i = -1; + gpe0_sts = ps->gpe0_sts & ps->gpe0_en; + *gpe0 = &gpe0_sts; - printk(BIOS_DEBUG, "ACPI System Wake Source is PM1 Index %d\n", - gnvs->pm1i); + return 1; } static void s3_resume_prepare(void) @@ -184,8 +173,6 @@ static void s3_resume_prepare(void) } set_acpi_sleep_type(3); - - s3_save_acpi_wake_source(gnvs); } static void set_board_id(void) -- cgit v1.2.3