[S] Change in coreboot[main]: soc/intel/xeon_sp/spr/acpi: Fix regression

[Lean Sheng Tan (Code Review)]

Lean Sheng Tan has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85562?usp=email )

Change subject: soc/intel/xeon_sp/spr/acpi: Fix regression
......................................................................

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

Fix regression introduced in commit 177bb5e9b9789cc830f504815e711973190def4e
("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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85562
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Shuo Liu 
---
M src/soc/intel/xeon_sp/spr/acpi/cxl_resource.asl
M src/soc/intel/xeon_sp/spr/acpi/pci_resource.asl
M src/soc/intel/xeon_sp/spr/acpi/uncore.asl
3 files changed, 12 insertions(+), 4 deletions(-)

Approvals:
  Shuo Liu: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/soc/intel/xeon_sp/spr/acpi/cxl_resource.asl b/src/soc/intel/xeon_sp/spr/acpi/cxl_resource.asl
index 553ca9d..7676a3f 100644
--- a/src/soc/intel/xeon_sp/spr/acpi/cxl_resource.asl
+++ b/src/soc/intel/xeon_sp/spr/acpi/cxl_resource.asl
@@ -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 @@
    	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)
    {
    	/*
diff --git a/src/soc/intel/xeon_sp/spr/acpi/pci_resource.asl b/src/soc/intel/xeon_sp/spr/acpi/pci_resource.asl
index fdb599e..a2cc03f 100644
--- a/src/soc/intel/xeon_sp/spr/acpi/pci_resource.asl
+++ b/src/soc/intel/xeon_sp/spr/acpi/pci_resource.asl
@@ -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)
    {
    	/*
diff --git a/src/soc/intel/xeon_sp/spr/acpi/uncore.asl b/src/soc/intel/xeon_sp/spr/acpi/uncore.asl
index c1b8bdc..f6fbe96 100644
--- a/src/soc/intel/xeon_sp/spr/acpi/uncore.asl
+++ b/src/soc/intel/xeon_sp/spr/acpi/uncore.asl
@@ -10,7 +10,9 @@
 {
    #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 @@
    #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