Revert "{northbridge,soc,southbridge}: Don't use both of _ADR and _HID"

This reverts commit 01787608670adec26fcea48173e18395e51c790e.

AMD: Dropping the _HID of PCI root bus doesn't work well and people
started to notice the breakage.

Intel: These platforms have a devicetree switch to choose between PCI
and ACPI modes. In the former case we need _ADR, but in the latter _HID
as the PCI devices are hidden.

The conflicting use of _ADR and _HID still needs to be fixed before
we can bump our IASL version.

Change-Id: If7b52b9e8f2f53574849aa3fddfccfa016288179
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37710
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

9 files changed, 25 insertions, 9 deletions

diff --git a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
index fad157da29..06199a1b07 100644
--- a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
@@ -16,7 +16,7 @@
 /* Note: Only need HID on Primary Bus */
 External (TOM1)
 External (TOM2)
-/* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
+Name(_HID, EISAID("PNP0A08"))	/* PCI Express Root Bridge */
 Name(_CID, EISAID("PNP0A03"))	/* PCI Root Bridge */
 Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
 
@@ -125,6 +125,7 @@ Device(PE23) {
 
 /* Northbridge function 3 */
 Device(NBF3) {
+	Name(_ADR, 0x00180003)
 
 	/* k10temp thermal zone */
 	#include "thermal_mixin.asl"
diff --git a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
index 96c2d8bfac..9a1fa9ed88 100644
--- a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
@@ -16,7 +16,7 @@
 /* Note: Only need HID on Primary Bus */
 External (TOM1)
 External (TOM2)
-/* Name(_HID, EISAID("PNP0A03")) // PCI Express Root Bridge */
+Name(_HID, EISAID("PNP0A03"))	/* PCI Express Root Bridge */
 Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
 
 /* Describe the Northbridge devices */
diff --git a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
index a7e8307349..f74b31a080 100644
--- a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
@@ -16,7 +16,7 @@
 /* Note: Only need HID on Primary Bus */
 External (TOM1)
 External (TOM2)
-/* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
+Name(_HID, EISAID("PNP0A08"))	/* PCI Express Root Bridge */
 Name(_CID, EISAID("PNP0A03"))	/* PCI Root Bridge */
 Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
 
diff --git a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
index de47bc2151..c2b3aac4c5 100644
--- a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
@@ -16,7 +16,7 @@
 /* Note: Only need HID on Primary Bus */
 External (TOM1)
 External (TOM2)
-/* Name(_HID, EISAID("PNP0A03"))  // PCI Express Root Bridge */
+Name(_HID, EISAID("PNP0A03"))	/* PCI Express Root Bridge */
 Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
 
 /* Describe the Northbridge devices */
diff --git a/src/northbridge/amd/pi/00660F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00660F01/acpi/northbridge.asl
index 4a48aaf401..d54f985e90 100644
--- a/src/northbridge/amd/pi/00660F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00660F01/acpi/northbridge.asl
@@ -16,7 +16,7 @@
 /* Note: Only need HID on Primary Bus */
 External (TOM1)
 External (TOM2)
-/* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
+Name(_HID, EISAID("PNP0A08"))	/* PCI Express Root Bridge */
 Name(_CID, EISAID("PNP0A03"))	/* PCI Root Bridge */
 Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
 
diff --git a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
index b317ccf1ea..f74b31a080 100644
--- a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
@@ -16,9 +16,10 @@
 /* Note: Only need HID on Primary Bus */
 External (TOM1)
 External (TOM2)
-/* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
+Name(_HID, EISAID("PNP0A08"))	/* PCI Express Root Bridge */
 Name(_CID, EISAID("PNP0A03"))	/* PCI Root Bridge */
 Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
+
 /* Describe the Northbridge devices */
 
 Method(_BBN, 0, NotSerialized)	/* Bus number = 0 */
diff --git a/src/soc/amd/stoneyridge/acpi/northbridge.asl b/src/soc/amd/stoneyridge/acpi/northbridge.asl
index 09bf2e18c2..fe78534403 100644
--- a/src/soc/amd/stoneyridge/acpi/northbridge.asl
+++ b/src/soc/amd/stoneyridge/acpi/northbridge.asl
@@ -17,7 +17,7 @@
 /* Note: Only need HID on Primary Bus */
 External (TOM1)
 External (TOM2)
-/* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
+Name(_HID, EISAID("PNP0A08"))	/* PCI Express Root Bridge */
 Name(_CID, EISAID("PNP0A03"))	/* PCI Root Bridge */
 Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
 
diff --git a/src/soc/intel/broadwell/acpi/serialio.asl b/src/soc/intel/broadwell/acpi/serialio.asl
index fd25b0d8a8..1b44e9566a 100644
--- a/src/soc/intel/broadwell/acpi/serialio.asl
+++ b/src/soc/intel/broadwell/acpi/serialio.asl
@@ -157,7 +157,7 @@ Device (SIOR)
 Device (SDMA)
 {
 	// Serial IO DMA Controller
-	/* Name (_HID, "INTL9C60") */
+	Name (_HID, "INTL9C60")
 	Name (_UID, 1)
 	Name (_ADR, 0x00150000)
 
@@ -205,6 +205,7 @@ Device (I2C0)
 		Return ("INT33C2")
 	}
 	Name (_UID, 1)
+	Name (_ADR, 0x00150001)
 
 	Name (SSCN, Package () { 432, 507, 30 })
 	Name (FMCN, Package () { 72, 160, 30 })
@@ -275,6 +276,7 @@ Device (I2C1)
 		Return ("INT33C3")
 	}
 	Name (_UID, 1)
+	Name (_ADR, 0x00150002)
 
 	Name (SSCN, Package () { 432, 507, 30 })
 	Name (FMCN, Package () { 72, 160, 30 })
@@ -345,6 +347,7 @@ Device (SPI0)
 		Return ("INT33C0")
 	}
 	Name (_UID, 1)
+	Name (_ADR, 0x00150003)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
@@ -400,6 +403,7 @@ Device (SPI1)
 		Return ("INT33C1")
 	}
 	Name (_UID, 1)
+	Name (_ADR, 0x00150004)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
@@ -467,6 +471,7 @@ Device (UAR0)
 		Return ("INT33C4")
 	}
 	Name (_UID, 1)
+	Name (_ADR, 0x00150005)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
@@ -534,6 +539,7 @@ Device (UAR1)
 		Return ("INT33C5")
 	}
 	Name (_UID, 1)
+	Name (_ADR, 0x00150006)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
@@ -590,6 +596,7 @@ Device (SDIO)
 	}
 	Name (_CID, "PNP0D40")
 	Name (_UID, 1)
+	Name (_ADR, 0x00170000)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
diff --git a/src/southbridge/intel/lynxpoint/acpi/serialio.asl b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
index 0eebe32dd6..9323b91cac 100644
--- a/src/southbridge/intel/lynxpoint/acpi/serialio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
@@ -123,7 +123,7 @@ Device (SIOR)
 Device (SDMA)
 {
 	// Serial IO DMA Controller
-	/* Name (_HID, "INTL9C60") */
+	Name (_HID, "INTL9C60")
 	Name (_UID, 1)
 	Name (_ADR, 0x00150000)
 
@@ -163,6 +163,7 @@ Device (I2C0)
 	Name (_HID, "INT33C2")
 	Name (_CID, "INT33C2")
 	Name (_UID, 1)
+	Name (_ADR, 0x00150001)
 
 	Name (SSCN, Package () { 432, 507, 30 })
 	Name (FMCN, Package () { 72, 160, 30 })
@@ -244,6 +245,7 @@ Device (I2C1)
 	Name (_HID, "INT33C3")
 	Name (_CID, "INT33C3")
 	Name (_UID, 1)
+	Name (_ADR, 0x00150002)
 
 	Name (SSCN, Package () { 432, 507, 30 })
 	Name (FMCN, Package () { 72, 160, 30 })
@@ -325,6 +327,7 @@ Device (SPI0)
 	Name (_HID, "INT33C0")
 	Name (_CID, "INT33C0")
 	Name (_UID, 1)
+	Name (_ADR, 0x00150003)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
@@ -362,6 +365,7 @@ Device (SPI1)
 	Name (_HID, "INT33C1")
 	Name (_CID, "INT33C1")
 	Name (_UID, 1)
+	Name (_ADR, 0x00150004)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
@@ -412,6 +416,7 @@ Device (UAR0)
 	Name (_HID, "INT33C4")
 	Name (_CID, "INT33C4")
 	Name (_UID, 1)
+	Name (_ADR, 0x00150005)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
@@ -462,6 +467,7 @@ Device (UAR1)
 	Name (_HID, "INT33C5")
 	Name (_CID, "INT33C5")
 	Name (_UID, 1)
+	Name (_ADR, 0x00150006)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()
@@ -499,6 +505,7 @@ Device (SDIO)
 	Name (_HID, "INT33C6")
 	Name (_CID, "PNP0D40")
 	Name (_UID, 1)
+	Name (_ADR, 0x00170000)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
 	Name (RBUF, ResourceTemplate ()