GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec/lenovo/h8/acpi: Apply state on wake 

Implement ACPI S3 resume control to restore the state before entering
sleep.
* Store the requested state wake state for bluetooth and WWAN.
* Add new methods to init the state and apply the requested state on wake.
* Call the new method on all devices.

Change-Id: I13c08b8c6b1bf0f3deb25a464b26880d8469c005
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/22377
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Patrick Rudolph 2017-11-08 19:52:51 +01:00 committed by Felix Held
parent f281b6d175
commit 31fb846c59
14 changed files with 80 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/ec/lenovo/h8/acpi/thinkpad.asl
View File

@ -157,6 +157,11 @@ Device (HKEY)
Return (\_SB.PCI0.LPCB.EC.GSTS)
}
/* Has thinkpad_acpi module loaded */
Name (HAST, 0)
/* State after sleep */
Name (WBDC, 0)
/*
* Returns the current state:
* Bit 0: BT HW present
@ -165,14 +170,15 @@ Device (HKEY)
*/
Method (GBDC, 0)
{
Store (One, HAST)
If (HBDC) {
Store(One, Local0)
If(\_SB.PCI0.LPCB.EC.BTEB)
{
Or(Local0, 2, Local0)
}
/* FIXME: Implement state at resume, for now Enabled */
Or(Local0, 4, Local0)
Or(Local0, ShiftLeft(WBDC, 2), Local0)
Return (Local0)
} Else {
Return (0)
@ -186,14 +192,18 @@ Device (HKEY)
*/
Method (SBDC, 1)
{
Store (One, HAST)
If (HBDC) {
ShiftRight (And(Arg0, 2), 1, Local0)
Store (Local0, \_SB.PCI0.LPCB.EC.BTEB)
/* FIXME: Store state at resume */
ShiftRight (And(Arg0, 4), 2, Local0)
Store (Local0, WBDC)
}
}
/* State after sleep */
Name (WWAN, 0)
/*
* Returns the current state:
* Bit 0: WWAN HW present
@ -202,14 +212,15 @@ Device (HKEY)
*/
Method (GWAN, 0)
{
Store (One, HAST)
If (HWAN) {
Store(One, Local0)
If(\_SB.PCI0.LPCB.EC.WWEB)
{
Or(Local0, 2, Local0)
}
/* FIXME: Implement state at resume, for now Enabled */
Or(Local0, 4, Local0)
Or(Local0, ShiftLeft(WWAN, 2), Local0)
Return (Local0)
} Else {
Return (0)
@ -223,11 +234,12 @@ Device (HKEY)
*/
Method (SWAN, 1)
{
Store (One, HAST)
If (HWAN) {
ShiftRight (And(Arg0, 2), 1, Local0)
Store (Local0, \_SB.PCI0.LPCB.EC.WWEB)
/* FIXME: Store state at resume */
ShiftRight (And(Arg0, 4), 2, WWAN)
}
}
@ -291,4 +303,24 @@ Device (HKEY)
Store (Local0, \_SB.PCI0.LPCB.EC.UWBE)
}
}
/*
* Store initial state
*/
Method (_INI, 0, NotSerialized)
{
Store (\_SB.PCI0.LPCB.EC.BTEB, WBDC)
Store (\_SB.PCI0.LPCB.EC.WWEB, WWAN)
}
/*
* Called from _WAK
*/
Method (WAKE, 1)
{
If (HAST) {
Store (WBDC, \_SB.PCI0.LPCB.EC.BTEB)
Store (WWAN, \_SB.PCI0.LPCB.EC.WWEB)
}
}
}

3
src/mainboard/lenovo/t400/acpi/platform.asl
View File

@ -31,6 +31,9 @@ Method(_PTS,1)
Method(_WAK,1)
{
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
// CPU specific part
// Notify PCI Express slots in case a card

3
src/mainboard/lenovo/t420s/acpi/platform.asl
View File

@ -32,6 +32,9 @@ Method(_WAK,1)
Store (0, \_TZ.MEB1)
Store (0, \_TZ.MEB2)
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
/* Not implemented. */
Return(Package(){0,0})
}

4
src/mainboard/lenovo/t430/acpi/platform.asl
View File

@ -18,6 +18,10 @@ Method(_WAK,1)
/* ME may not be up yet. */
Store (0, \_TZ.MEB1)
Store (0, \_TZ.MEB2)
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
Return(Package(){0,0})
}

3
src/mainboard/lenovo/t430s/acpi/platform.asl
View File

@ -32,6 +32,9 @@ Method(_WAK,1)
Store (0, \_TZ.MEB1)
Store (0, \_TZ.MEB2)
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
/* Not implemented. */
Return(Package(){0,0})
}

3
src/mainboard/lenovo/t520/acpi/platform.asl
View File

@ -32,6 +32,9 @@ Method(_WAK,1)
Store (0, \_TZ.MEB1)
Store (0, \_TZ.MEB2)
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
/* Not implemented. */
Return(Package(){0,0})
}

3
src/mainboard/lenovo/t530/acpi/platform.asl
View File

@ -32,6 +32,9 @@ Method(_WAK,1)
Store (0, \_TZ.MEB1)
Store (0, \_TZ.MEB2)
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
/* Not implemented. */
Return(Package(){0,0})
}

3
src/mainboard/lenovo/t60/acpi/platform.asl
View File

@ -29,6 +29,9 @@ Method(_PTS,1)
Method(_WAK,1)
{
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
// CPU specific part
// Notify PCI Express slots in case a card

3
src/mainboard/lenovo/x1_carbon_gen1/acpi/platform.asl
View File

@ -30,6 +30,9 @@ Method(_WAK,1)
Store (0, \_TZ.MEB1)
Store (0, \_TZ.MEB2)
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
/* Not implemented. */
Return(Package(){0,0})
}

3
src/mainboard/lenovo/x200/acpi/platform.asl
View File

@ -31,6 +31,9 @@ Method(_PTS,1)
Method(_WAK,1)
{
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
// CPU specific part
// Notify PCI Express slots in case a card

3
src/mainboard/lenovo/x201/acpi/platform.asl
View File

@ -63,6 +63,9 @@ Method(_PTS,1)
Method(_WAK,1)
{
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
/* Not implemented. */
Return(Package(){0,0})
}

3
src/mainboard/lenovo/x220/acpi/platform.asl
View File

@ -32,6 +32,9 @@ Method(_WAK,1)
Store (0, \_TZ.MEB1)
Store (0, \_TZ.MEB2)
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
/* Not implemented. */
Return(Package(){0,0})
}

3
src/mainboard/lenovo/x230/acpi/platform.asl
View File

@ -32,6 +32,9 @@ Method(_WAK,1)
Store (0, \_TZ.MEB1)
Store (0, \_TZ.MEB2)
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
/* Not implemented. */
Return(Package(){0,0})
}

3
src/mainboard/lenovo/x60/acpi/platform.asl
View File

@ -29,6 +29,9 @@ Method(_PTS,1)
Method(_WAK,1)
{
/* Wake the HKEY to init BT/WWAN */
\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
// CPU specific part
// Notify PCI Express slots in case a card