diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2023-06-01 22:03:44 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-06-07 18:54:28 +0000 |
| commit | 0fddbc75e35d044961393e531a465e4dffee8bf3 (patch) | |
| tree | 582993e04213ecc96cbdd9e9556d090c3364e11b | |
| parent | 1d703a7e6e48838b412d6d5894b6df9c946dc5d9 (diff) | |
soc/amd/phoenix/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: If293188fc8d0ff41b47ab84c9655333e9ebe58e8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75594
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
| -rw-r--r-- | src/soc/amd/phoenix/acpi/pci0.asl | 26 | ||||
| -rw-r--r-- | src/soc/amd/phoenix/acpi/soc.asl | 7 |
2 files changed, 6 insertions, 27 deletions
diff --git a/src/soc/amd/phoenix/acpi/pci0.asl b/src/soc/amd/phoenix/acpi/pci0.asl deleted file mode 100644 index 6039a5aae9..0000000000 --- a/src/soc/amd/phoenix/acpi/pci0.asl +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* TODO: Update for Phoenix */ - -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 */ diff --git a/src/soc/amd/phoenix/acpi/soc.asl b/src/soc/amd/phoenix/acpi/soc.asl index 4df7835b55..ee2e9c886b 100644 --- a/src/soc/amd/phoenix/acpi/soc.asl +++ b/src/soc/amd/phoenix/acpi/soc.asl @@ -2,6 +2,7 @@ /* TODO: Update for Phoenix */ +#include <soc/amd/common/acpi/pci_root.asl> #include "globalnvs.asl" Scope(\_SB) { @@ -18,7 +19,11 @@ Scope(\_SB) { #include "mmio.asl" - #include "pci0.asl" + ROOT_BRIDGE(PCI0) + + Scope(PCI0) { + #include <soc/amd/common/acpi/lpc.asl> + } /* End PCI0 scope */ } /* End \_SB scope */ #include <soc/amd/common/acpi/alib.asl> |