diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2015-09-08 16:12:44 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-09-17 14:23:40 +0000 |
| commit | a1c8b34d7b1b3a8df5b86faab79010c06b037445 (patch) | |
| tree | a3ef38b194fe7094ee4ee7e7dd9ab6a440115b06 /src/soc/intel/skylake/acpi | |
| parent | 47a0b8494b59cf292dcc3372a01ee597b6de3923 (diff) | |
skylake: Use common ACPI _SWS code
Enable and use the common code for filling out the NVS data used
by the _SWS methods. Add a function to provide the wake source
data. With Deep S3 enabled skylake does not retain the contents
of the PM1_EN register so instead just select the wake related
events in PM1_STS.
BUG=chrome-os-partner:40635
BRANCH=none
TEST=tested on glados by checking for valid _SWS string in
/sys/firmware/log after suspend/resume. Wake sources that were
tested are RTC, power button, keypress, trackpad, and wifi.
Change-Id: I93a4f740f2e2ef1c34e948db1d8e273332296921
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: cb4d4705b87ef7169f1979009c34a58de93c4ef0
Original-Change-Id: Ib6b4df09ea3090894f09290d00dcdc5aebc3eabb
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/298169
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11648
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc/intel/skylake/acpi')
| -rw-r--r-- | src/soc/intel/skylake/acpi/platform.asl | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/soc/intel/skylake/acpi/platform.asl b/src/soc/intel/skylake/acpi/platform.asl index f0ed4e0816..24df241edf 100644 --- a/src/soc/intel/skylake/acpi/platform.asl +++ b/src/soc/intel/skylake/acpi/platform.asl @@ -19,6 +19,9 @@ * Foundation, Inc. */ +/* Enable ACPI _SWS methods */ +#include <soc/intel/common/acpi/acpi_wake_source.asl> + /* The APM port can be used for generating software SMIs */ OperationRegion (APMP, SystemIO, 0xb2, 2) @@ -83,21 +86,3 @@ Method (_WAK, 1) { Return (Package (){ 0, 0 }) } - -Scope (\_SB) -{ - Method (_SWS) - { - /* Index into PM1 for device that caused wake */ - Return (\PM1I) - } -} - -Scope (\_GPE) -{ - Method (_SWS) - { - /* Index into GPE for device that caused wake */ - Return (\GPEI) - } -} |