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

google/buddy: fix Windows ACPI error with WLAN 

Buddy's WLAN ACPI code was equivalent to, but formatted
differently from the other auron variants. Since only
differnce is root port used, have buddy use common
WLAN ACPI and use preprocessor guards to set the root
port correctly.

Test: build/boot Buddy, verify Windows 10 boots
without ACPI BIOS ERROR.

Change-Id: I78d994f2bb3981d4d10cb534cd6e0ae673f73527
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/30523
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Matt DeVillier 2018-12-29 21:43:11 -06:00
parent a2c219a91d
commit a82f991122
3 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mainboard/google/auron/acpi/mainboard.asl
View File

@ -16,8 +16,14 @@
#include <variant/onboard.h>
#if !CONFIG(BOARD_GOOGLE_BUDDY)
/*
* WLAN on Buddy connected to RP4, becomes RP2 after coalesce
*/
#if CONFIG(BOARD_GOOGLE_BUDDY)
Scope (\_SB.PCI0.RP02)
#else
Scope (\_SB.PCI0.RP01)
#endif
{
Device (WLAN)
{
@ -35,7 +41,6 @@ Scope (\_SB.PCI0.RP01)
}
}
}
#endif
#include <variant/acpi/mainboard.asl>

4
src/mainboard/google/auron/variants/buddy/devicetree.cb
View File

@ -90,8 +90,8 @@ chip soc/intel/broadwell
device pci 1b.0 off end # High Definition Audio
device pci 1c.0 off end # PCIe Port #1
device pci 1c.1 off end # PCIe Port #2
device pci 1c.2 on end # PCIe Port #3
device pci 1c.3 on end # PCIe Port #4
device pci 1c.2 on end # PCIe Port #3 - LAN (becomes RP1)
device pci 1c.3 on end # PCIe Port #4 - WLAN (becomes RP2)
device pci 1c.4 on end # PCIe Port #5
device pci 1c.5 off end # PCIe Port #6
device pci 1d.0 on end # USB2 EHCI

24
src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
View File

@ -117,27 +117,3 @@ Scope (\_SB.PCI0.RP01)
}
}
}
/*
* WLAN connected to Root Port 4, becomes Root Port 2 after coalesce
*/
Scope (\_SB.PCI0.RP02)
{
Device (WLAN)
{
Name (_ADR, 0x00000000)
/* GPIO10 is WLAN_WAKE_L_Q */
Name (GPIO, BOARD_WLAN_WAKE_GPIO)
Name (_PRW, Package() { GPIO, 3 })
Method (_DSW, 3, NotSerialized)
{
If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source
\_SB.PCI0.LPCB.GPIO.GWAK (^GPIO)
}
}
}
}