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>
This commit is contained in:
Sean Rhodes 2022-02-24 10:44:59 +00:00 committed by Felix Held
parent 2ba886aa6c
commit 28a30426fe
1 changed files with 10 additions and 2 deletions

View File

@ -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 */