soc/amd/picasso/acpi: use ROOT_BRIDGE macro
Instead of having the different static parts of the PCI0 device in northbridge.asl and sb_pci0_fch.asl, instantiate the static parts of the PCI0 device via the ROOT_BRIDGE macro in soc.asl. TEST=Both Ubuntu 2022.4 and Windows 10 still boot successfully and don't show any new ACPI-related error. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I2587d8bb270dc3edce9dfa570a5018116fc9187f Reviewed-on: https://review.coreboot.org/c/coreboot/+/75569 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
parent
e4500c6530
commit
c79c64be95
|
@ -1,9 +1,5 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
/* Note: Only need HID on Primary Bus */
|
||||
Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */
|
||||
Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */
|
||||
|
||||
/* Describe the Northbridge devices */
|
||||
|
||||
Method(_STA, 0, NotSerialized)
|
||||
|
|
|
@ -3,21 +3,6 @@
|
|||
/* System Bus */
|
||||
/* _SB.PCI0 */
|
||||
|
||||
/* Operating System Capabilities Method */
|
||||
Method(_OSC,4)
|
||||
{
|
||||
/* Check for proper PCI/PCIe UUID */
|
||||
If (Arg0 == ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))
|
||||
{
|
||||
/* Let OS control everything */
|
||||
Return (Arg3)
|
||||
} Else {
|
||||
CreateDWordField(Arg3,0,CDW1)
|
||||
CDW1 |= 4 // Unrecognized UUID
|
||||
Return (Arg3)
|
||||
}
|
||||
}
|
||||
|
||||
/* 0:14.3 - LPC */
|
||||
#include <soc/amd/common/acpi/lpc.asl>
|
||||
#include <soc/amd/common/acpi/platform.asl>
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
Device(PCI0) {
|
||||
#include <soc/amd/common/acpi/pci_root.asl>
|
||||
|
||||
ROOT_BRIDGE(PCI0)
|
||||
|
||||
Scope(PCI0) {
|
||||
/* Describe the AMD Northbridge */
|
||||
#include "northbridge.asl"
|
||||
|
||||
|
|
Loading…
Reference in New Issue