Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30523
Change subject: google/buddy: fix Windows ACPI error with WLAN ......................................................................
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 --- M src/mainboard/google/auron/acpi/mainboard.asl M src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl 2 files changed, 4 insertions(+), 26 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/30523/1
diff --git a/src/mainboard/google/auron/acpi/mainboard.asl b/src/mainboard/google/auron/acpi/mainboard.asl index 204c1c4..b473362 100644 --- a/src/mainboard/google/auron/acpi/mainboard.asl +++ b/src/mainboard/google/auron/acpi/mainboard.asl @@ -16,8 +16,11 @@
#include <variant/onboard.h>
-#if !IS_ENABLED(CONFIG_BOARD_GOOGLE_BUDDY) +#if IS_ENABLED(CONFIG_BOARD_GOOGLE_BUDDY) +Scope (_SB.PCI0.RP02) +#else Scope (_SB.PCI0.RP01) +#endif { Device (WLAN) { @@ -35,7 +38,6 @@ } } } -#endif
#include <variant/acpi/mainboard.asl>
diff --git a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl index 788fbdc..e9fd212 100644 --- a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl @@ -117,27 +117,3 @@ } } } - -/* - * 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) - } - } - } -}
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/30523
to look at the new patch set (#2).
Change subject: google/buddy: fix Windows ACPI error with WLAN ......................................................................
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 --- M src/mainboard/google/auron/acpi/mainboard.asl M src/mainboard/google/auron/variants/buddy/devicetree.cb M src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl 3 files changed, 9 insertions(+), 28 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/30523/2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30523 )
Change subject: google/buddy: fix Windows ACPI error with WLAN ......................................................................
Patch Set 4: Code-Review+2
Might be worth looking in ssdt generators but this is an improvement.
Matt DeVillier has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30523 )
Change subject: google/buddy: fix Windows ACPI error with WLAN ......................................................................
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 --- M src/mainboard/google/auron/acpi/mainboard.asl M src/mainboard/google/auron/variants/buddy/devicetree.cb M src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl 3 files changed, 9 insertions(+), 28 deletions(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved
diff --git a/src/mainboard/google/auron/acpi/mainboard.asl b/src/mainboard/google/auron/acpi/mainboard.asl index a07ce3e..cd6a830 100644 --- a/src/mainboard/google/auron/acpi/mainboard.asl +++ b/src/mainboard/google/auron/acpi/mainboard.asl @@ -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 @@ } } } -#endif
#include <variant/acpi/mainboard.asl>
diff --git a/src/mainboard/google/auron/variants/buddy/devicetree.cb b/src/mainboard/google/auron/variants/buddy/devicetree.cb index e662794..f75da84 100644 --- a/src/mainboard/google/auron/variants/buddy/devicetree.cb +++ b/src/mainboard/google/auron/variants/buddy/devicetree.cb @@ -90,8 +90,8 @@ 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 diff --git a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl index 788fbdc..e9fd212 100644 --- a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl @@ -117,27 +117,3 @@ } } } - -/* - * 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) - } - } - } -}
-
Arthur Heymans (Code Review) -
Matt DeVillier (Code Review)