From 8e6059db28491249954df81ba3baa593395be97a Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Wed, 3 Mar 2021 17:01:46 -0700 Subject: soc/amd,mb/google/,mb/amd: Move sleepstates.asl This file is common for all the AMD platforms. Signed-off-by: Raul E Rangel Change-Id: I10ee600b4bcd7aaff39bfab075eb4dbc9096b435 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51299 Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- src/mainboard/amd/bilby/dsdt.asl | 2 +- src/mainboard/amd/gardenia/dsdt.asl | 2 +- src/mainboard/amd/mandolin/dsdt.asl | 2 +- src/mainboard/amd/padmelon/dsdt.asl | 2 +- src/mainboard/google/kahlee/dsdt.asl | 2 +- src/mainboard/google/zork/dsdt.asl | 2 +- src/soc/amd/common/acpi/sleepstates.asl | 28 ++++++++++++++++++++++++++++ src/soc/amd/picasso/acpi/sleepstates.asl | 28 ---------------------------- src/soc/amd/stoneyridge/acpi/sleepstates.asl | 28 ---------------------------- 9 files changed, 34 insertions(+), 62 deletions(-) create mode 100644 src/soc/amd/common/acpi/sleepstates.asl delete mode 100644 src/soc/amd/picasso/acpi/sleepstates.asl delete mode 100644 src/soc/amd/stoneyridge/acpi/sleepstates.asl diff --git a/src/mainboard/amd/bilby/dsdt.asl b/src/mainboard/amd/bilby/dsdt.asl index 1cce71e588..3b33adc233 100644 --- a/src/mainboard/amd/bilby/dsdt.asl +++ b/src/mainboard/amd/bilby/dsdt.asl @@ -25,7 +25,7 @@ DefinitionBlock ( #include /* Contains the supported sleep states for this chipset */ - #include + #include /* Contains _SWS methods */ #include diff --git a/src/mainboard/amd/gardenia/dsdt.asl b/src/mainboard/amd/gardenia/dsdt.asl index a22e090089..6c275a0632 100644 --- a/src/mainboard/amd/gardenia/dsdt.asl +++ b/src/mainboard/amd/gardenia/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock ( #include /* Contains the supported sleep states for this chipset */ - #include + #include /* Contains the Sleep methods (WAK, PTS, GTS, etc.) */ #include "acpi/sleep.asl" diff --git a/src/mainboard/amd/mandolin/dsdt.asl b/src/mainboard/amd/mandolin/dsdt.asl index 1cce71e588..3b33adc233 100644 --- a/src/mainboard/amd/mandolin/dsdt.asl +++ b/src/mainboard/amd/mandolin/dsdt.asl @@ -25,7 +25,7 @@ DefinitionBlock ( #include /* Contains the supported sleep states for this chipset */ - #include + #include /* Contains _SWS methods */ #include diff --git a/src/mainboard/amd/padmelon/dsdt.asl b/src/mainboard/amd/padmelon/dsdt.asl index 7b7f239e5a..026acf4869 100644 --- a/src/mainboard/amd/padmelon/dsdt.asl +++ b/src/mainboard/amd/padmelon/dsdt.asl @@ -26,7 +26,7 @@ DefinitionBlock ( #include /* Contains the supported sleep states for this chipset */ - #include + #include /* Contains the Sleep methods (WAK, PTS, GTS, etc.) */ #include "acpi/sleep.asl" diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl index d8b25e0ac9..4820306647 100644 --- a/src/mainboard/google/kahlee/dsdt.asl +++ b/src/mainboard/google/kahlee/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock ( #include /* Contains the supported sleep states for this chipset */ - #include + #include /* Contains the Sleep methods (WAK, PTS, GTS, etc.) */ #include diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl index ab8f145ec0..c11052a9af 100644 --- a/src/mainboard/google/zork/dsdt.asl +++ b/src/mainboard/google/zork/dsdt.asl @@ -26,7 +26,7 @@ DefinitionBlock ( #include /* Contains the supported sleep states for this chipset */ - #include + #include /* Contains _SWS methods */ #include diff --git a/src/soc/amd/common/acpi/sleepstates.asl b/src/soc/amd/common/acpi/sleepstates.asl new file mode 100644 index 0000000000..03d28bb4f8 --- /dev/null +++ b/src/soc/amd/common/acpi/sleepstates.asl @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ +Name(SSFG, 0x09) +If (CONFIG(HAVE_ACPI_RESUME)) { + SSFG = 0x0D +} +If (CONFIG(DISABLE_ACPI_HIBERNATE)) { + SSFG &= 0xF7 +} + +/* Supported sleep states: */ +Name(\_S0, Package () {0x00, 0x00, 0x00, 0x00} ) /* (S0) - working state */ + +If (SSFG & 0x01) { + Name(\_S1, Package () {0x01, 0x01, 0x00, 0x00} ) /* (S1) - sleeping w/CPU context */ +} +If (SSFG & 0x02) { + Name(\_S2, Package () {0x02, 0x02, 0x00, 0x00} ) /* (S2) - "light" Suspend to RAM */ +} +If (SSFG & 0x04) { + Name(\_S3, Package () {0x03, 0x03, 0x00, 0x00} ) /* (S3) - Suspend to RAM */ +} +If (SSFG & 0x08) { + Name(\_S4, Package () {0x04, 0x04, 0x00, 0x00} ) /* (S4) - Suspend to Disk */ +} + +Name(\_S5, Package () {0x05, 0x05, 0x00, 0x00} ) /* (S5) - Soft Off */ diff --git a/src/soc/amd/picasso/acpi/sleepstates.asl b/src/soc/amd/picasso/acpi/sleepstates.asl deleted file mode 100644 index 03d28bb4f8..0000000000 --- a/src/soc/amd/picasso/acpi/sleepstates.asl +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ -Name(SSFG, 0x09) -If (CONFIG(HAVE_ACPI_RESUME)) { - SSFG = 0x0D -} -If (CONFIG(DISABLE_ACPI_HIBERNATE)) { - SSFG &= 0xF7 -} - -/* Supported sleep states: */ -Name(\_S0, Package () {0x00, 0x00, 0x00, 0x00} ) /* (S0) - working state */ - -If (SSFG & 0x01) { - Name(\_S1, Package () {0x01, 0x01, 0x00, 0x00} ) /* (S1) - sleeping w/CPU context */ -} -If (SSFG & 0x02) { - Name(\_S2, Package () {0x02, 0x02, 0x00, 0x00} ) /* (S2) - "light" Suspend to RAM */ -} -If (SSFG & 0x04) { - Name(\_S3, Package () {0x03, 0x03, 0x00, 0x00} ) /* (S3) - Suspend to RAM */ -} -If (SSFG & 0x08) { - Name(\_S4, Package () {0x04, 0x04, 0x00, 0x00} ) /* (S4) - Suspend to Disk */ -} - -Name(\_S5, Package () {0x05, 0x05, 0x00, 0x00} ) /* (S5) - Soft Off */ diff --git a/src/soc/amd/stoneyridge/acpi/sleepstates.asl b/src/soc/amd/stoneyridge/acpi/sleepstates.asl deleted file mode 100644 index 9d85062fde..0000000000 --- a/src/soc/amd/stoneyridge/acpi/sleepstates.asl +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ -Name(SSFG, 0x09) -If (CONFIG(HAVE_ACPI_RESUME)) { - SSFG = 0x0d -} -If (CONFIG(DISABLE_ACPI_HIBERNATE)) { - SSFG &= 0xf7 -} - -/* Supported sleep states: */ -Name(\_S0, Package () {0x00, 0x00, 0x00, 0x00} ) /* (S0) - working state */ - -If (SSFG & 0x01) { - Name(\_S1, Package () {0x01, 0x01, 0x00, 0x00} ) /* (S1) - sleeping w/CPU context */ -} -If (SSFG & 0x02) { - Name(\_S2, Package () {0x02, 0x02, 0x00, 0x00} ) /* (S2) - "light" Suspend to RAM */ -} -If (SSFG & 0x04) { - Name(\_S3, Package () {0x03, 0x03, 0x00, 0x00} ) /* (S3) - Suspend to RAM */ -} -If (SSFG & 0x08) { - Name(\_S4, Package () {0x04, 0x04, 0x00, 0x00} ) /* (S4) - Suspend to Disk */ -} - -Name(\_S5, Package () {0x05, 0x05, 0x00, 0x00} ) /* (S5) - Soft Off */ -- cgit v1.2.3