soc/amd/cezanne/acpi: use ROOT_BRIDGE macro

Use the ROOT_BRIDGE macro in soc.asl to replace the pci0.asl file. The
soc/amd/common/acpi/lpc.asl file which was included in the now removed
pci0.asl file now gets included in the correct scope in the soc.asl
file.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ia8f0f1619a71f4ab2051714a9d8c7eb200845390
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75592
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2023-06-01 22:01:40 +02:00
parent 15aa0a56ce
commit 90044bd6d1
2 changed files with 6 additions and 25 deletions

View File

@ -1,24 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
Device(PCI0) {
Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */
Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */
/* Operating System Capabilities Method */
Method(_OSC, 4) {
CreateDWordField(Arg3, 0, CDW1) /* Capabilities dword 1 */
/* Check for proper PCI/PCIe UUID */
If (Arg0 == ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")) {
/* Let OS control everything */
Return (Arg3)
} Else {
CDW1 |= 4 /* Unrecognized UUID */
Return (Arg3)
}
}
/* 0:14.3 - LPC */
#include <soc/amd/common/acpi/lpc.asl>
} /* End PCI0 scope */

View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <soc/amd/common/acpi/pci_root.asl>
#include "globalnvs.asl" #include "globalnvs.asl"
Scope(\_SB) { Scope(\_SB) {
@ -16,7 +17,11 @@ Scope(\_SB) {
#include "mmio.asl" #include "mmio.asl"
#include "pci0.asl" ROOT_BRIDGE(PCI0)
Scope(PCI0) {
#include <soc/amd/common/acpi/lpc.asl>
} /* End PCI0 scope */
} /* End \_SB scope */ } /* End \_SB scope */
#include <soc/amd/common/acpi/alib.asl> #include <soc/amd/common/acpi/alib.asl>