diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-08-07 23:05:09 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-08-23 03:39:06 +0000 |
| commit | bbd60e31becddfae9496b82551945727050fc08d (patch) | |
| tree | 026e220e01b278a9fb7321dc75060c0a4ff44dfa | |
| parent | fb9458555413c6595dc67fe0f0d4f024570448e1 (diff) | |
soc/amd/stoneyridge ACPI: Sync sleepstates.asl definitions
Sync file with southbridge/amd/common/sleepstates.asl.
SSFG was meant to be used as a mask to enable sleepstates
_S1 thru _S4. However as a logical instead of bitwise 'and'
operation was used, all the states were enabled if only
one was marked available.
Change-Id: I674953f1a5add74e16ddd84c252e8d21501ffefd
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21092
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marc Jones <marc@marcjonesconsulting.com>
| -rw-r--r-- | src/mainboard/amd/gardenia/acpi/mainboard.asl | 2 | ||||
| -rw-r--r-- | src/mainboard/google/kahlee/acpi/mainboard.asl | 3 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/acpi/sleepstates.asl | 20 |
3 files changed, 11 insertions, 14 deletions
diff --git a/src/mainboard/amd/gardenia/acpi/mainboard.asl b/src/mainboard/amd/gardenia/acpi/mainboard.asl index 508daa7234..db5731f088 100644 --- a/src/mainboard/amd/gardenia/acpi/mainboard.asl +++ b/src/mainboard/amd/gardenia/acpi/mainboard.asl @@ -22,8 +22,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */ Name(HPBA, 0xFED00000) /* Base address of HPET table */ -Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ - /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ diff --git a/src/mainboard/google/kahlee/acpi/mainboard.asl b/src/mainboard/google/kahlee/acpi/mainboard.asl index b870e9e791..5c938962f3 100644 --- a/src/mainboard/google/kahlee/acpi/mainboard.asl +++ b/src/mainboard/google/kahlee/acpi/mainboard.asl @@ -27,9 +27,6 @@ Name (PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Base address of HPET table */ Name (HPBA, 0xFED00000) -/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ -Name (SSFG, 0x0D) - /* Global Data */ Name (OSVR, 3) /* WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name (OSV, Ones) /* Assume nothing */ diff --git a/src/soc/amd/stoneyridge/acpi/sleepstates.asl b/src/soc/amd/stoneyridge/acpi/sleepstates.asl index c8ad5204ee..2f3673878b 100644 --- a/src/soc/amd/stoneyridge/acpi/sleepstates.asl +++ b/src/soc/amd/stoneyridge/acpi/sleepstates.asl @@ -14,25 +14,27 @@ * GNU General Public License for more details. */ +/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ +#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) +Name (SSFG, 0x0D) +#else +Name (SSFG, 0x09) +#endif + /* Supported sleep states: */ Name(\_S0, Package () {0x00, 0x00, 0x00, 0x00} ) /* (S0) - working state */ -If (LAnd(SSFG, 0x01)) { +If (And(SSFG, 0x01)) { Name(\_S1, Package () {0x01, 0x01, 0x00, 0x00} ) /* (S1) - sleeping w/CPU context */ } -If (LAnd(SSFG, 0x02)) { +If (And(SSFG, 0x02)) { Name(\_S2, Package () {0x02, 0x02, 0x00, 0x00} ) /* (S2) - "light" Suspend to RAM */ } -#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) -If (LAnd(SSFG, 0x04)) { +If (And(SSFG, 0x04)) { Name(\_S3, Package () {0x03, 0x03, 0x00, 0x00} ) /* (S3) - Suspend to RAM */ } -#endif -If (LAnd(SSFG, 0x08)) { +If (And(SSFG, 0x08)) { Name(\_S4, Package () {0x04, 0x04, 0x00, 0x00} ) /* (S4) - Suspend to Disk */ } Name(\_S5, Package () {0x05, 0x05, 0x00, 0x00} ) /* (S5) - Soft Off */ - -Name(\_SB.CSPS ,0) /* Current Sleep State (S0, S1, S2, S3, S4, S5) */ -Name(CSMS, 0) /* Current System State */ |