diff options
| author | Sean Rhodes <sean@starlabs.systems> | 2022-02-24 10:44:59 +0000 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-03-08 15:02:33 +0000 |
| commit | 28a30426fece253e463f8d4ed3bd6b031a906a29 (patch) | |
| tree | 7adae2e55d84a1c23a4fa086e366b5b947377a69 | |
| parent | 2ba886aa6c94990b0708a78c85e3c4f8fb702185 (diff) | |
ec/starlabs/merlin: Disable ACPI support last when suspending
When entering suspend, ACPI support is disabled by setting OSFG to 0x00.
This has been moved to be the final action, so it is after saving the
current EC settings.
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I5705efab42d2fe0fd5abc6c17eeea46ead27db17
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62335
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
| -rw-r--r-- | src/ec/starlabs/merlin/acpi/suspend.asl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ec/starlabs/merlin/acpi/suspend.asl b/src/ec/starlabs/merlin/acpi/suspend.asl index 2dae8dae68..f89e501a14 100644 --- a/src/ec/starlabs/merlin/acpi/suspend.asl +++ b/src/ec/starlabs/merlin/acpi/suspend.asl @@ -2,8 +2,6 @@ Method (RPTS, 1, NotSerialized) { - \_SB.PCI0.LPCB.EC.OSFG = 0x00 - If ((Arg0 == 0x04) || (Arg0 == 0x05)) { /* Store current EC settings in CMOS */ @@ -16,10 +14,20 @@ Method (RPTS, 1, NotSerialized) \_SB.PCI0.LPCB.KLBC = \_SB.PCI0.LPCB.EC.ECRD (RefOf (\_SB.PCI0.LPCB.EC.KLBE)) } + + /* + * Disable ACPI support. + * This should always be the last action before entering S4 or S5. + */ + \_SB.PCI0.LPCB.EC.OSFG = 0x00 } Method (RWAK, 1, Serialized) { + /* + * Enable ACPI support. + * This should always be the first action when exiting S4 or S5. + */ \_SB.PCI0.LPCB.EC.OSFG = 0x01 /* Restore EC settings from CMOS */ |