erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

soc/intel/xeon_sp/spr/acpi: Fix regression

Browse source 
Fix regression introduced in commit 177bb5e9b9
("soc/intel/xeon_sp: Revise IIO domain ACPI name encoding").

Ensure domain ACPI names in the DSDT are in sync with SSDT ACPI names.
Fixes PCI devices not discovered on socket 1-3.

TEST: Booted in ibm/sbp1 and found all PCI devices working, no errors
      in dmesg are shown.

Change-Id: Ice168bdebc46dc0cfb9c63c78c46a5d9ff2b7658
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85562
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Shuo Liu <shuo.liu@intel.com>
This commit is contained in:
Patrick Rudolph 2024-12-11 15:04:10 +01:00 • committed by Lean Sheng Tan
commit d65ff8492c
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/soc/intel/xeon_sp/spr/acpi/cxl_resource.asl
View file

@ -8,7 +8,7 @@
#define _IIO_DEVICE_UID(str, skt, stk) STR(str##skt##stk)
#define IIO_DEVICE_UID(str, skt, stk) _IIO_DEVICE_UID(str, skt, stk)
Device (IIO_DEVICE_NAME(DEVPREFIX, SOCKET, STACK))
Device (IIO_DEVICE_NAME(DEVPREFIX, SOCKET_NAME, STACK))
{
Name (_HID, "ACPI0017") /* CXL */
Name (_CID, Package (0x02)
@ -16,7 +16,7 @@ Device (IIO_DEVICE_NAME(DEVPREFIX, SOCKET, STACK))
EisaId ("PNP0A08") /* PCI Express Bus */,
EisaId ("PNP0A03") /* PCI Bus */
})
Name (_UID, IIO_DEVICE_UID(DEVPREFIX, SOCKET, STACK))
Name (_UID, IIO_DEVICE_UID(DEVPREFIX, SOCKET_NAME, STACK))
Method (_STA, 0, NotSerialized)
{
/*

4
src/soc/intel/xeon_sp/spr/acpi/pci_resource.asl
View file

@ -8,11 +8,11 @@
#define _IIO_DEVICE_UID(str, skt, stk) STR(str##skt##stk)
#define IIO_DEVICE_UID(str, skt, stk) _IIO_DEVICE_UID(str, skt, stk)
Device (IIO_DEVICE_NAME(DEVPREFIX, SOCKET, STACK))
Device (IIO_DEVICE_NAME(DEVPREFIX, SOCKET_NAME, STACK))
{
Name (_HID, EisaId ("PNP0A08") /* PCI Express Bus */)
Name (_CID, EisaId ("PNP0A03") /* PCI Bus */)
Name (_UID, IIO_DEVICE_UID(DEVPREFIX, SOCKET, STACK))
Name (_UID, IIO_DEVICE_UID(DEVPREFIX, SOCKET_NAME, STACK))
Method (_STA, 0, NotSerialized)
{
/*

8
src/soc/intel/xeon_sp/spr/acpi/uncore.asl
View file

@ -10,7 +10,9 @@ Scope (\_SB)
{
#include "uncore_irq.asl"
// Keep in sync with iio_domain_set_acpi_name()!
#define SOCKET 0
#define SOCKET_NAME 0
#include "iiostack.asl"
#undef SOCKET
@ -24,19 +26,25 @@ Scope (\_SB)
#endif
#if (CONFIG_MAX_SOCKET > 1)
// Keep in sync with iio_domain_set_acpi_name()!
#define SOCKET 1
#define SOCKET_NAME 2
#include "iiostack.asl"
#undef SOCKET
#endif
#if (CONFIG_MAX_SOCKET > 2)
// Keep in sync with iio_domain_set_acpi_name()!
#define SOCKET 2
#define SOCKET_NAME 4
#include "iiostack.asl"
#undef SOCKET
#endif
#if (CONFIG_MAX_SOCKET > 3)
// Keep in sync with iio_domain_set_acpi_name()!
#define SOCKET 3
#define SOCKET_NAME 6
#include "iiostack.asl"
#undef SOCKET
#endif