soc/intel/common/block/acpi: Factor out common pch_glan.asl

This patch moves pch_glan.asl into common block acpi directory to
avoid duplicating the same ASL code block across SoC directory.

TEST=Able to build and boot TGL, CNL and CML platform.
1) Dump and disassemble DSDT, verify GLAN device present inside
common pch_glan.asl is still there.
2) Verify no ACPI error seen while running 'dmesg` from console.

Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Change-Id: I479678c864eba39e5ab04f658600e8cba48198ef
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45975
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

10 files changed, 14 insertions, 60 deletions

diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl
index a6b023716d..76a54453cf 100644
--- a/src/soc/intel/cannonlake/acpi/southbridge.asl
+++ b/src/soc/intel/cannonlake/acpi/southbridge.asl
@@ -43,8 +43,8 @@
 /* PCI _OSC */
 #include <soc/intel/common/acpi/pci_osc.asl>
 
-/* GBe 0:1f.6 */
-#include "pch_glan.asl"
+/* GbE 0:1f.6 */
+#include <soc/intel/common/block/acpi/acpi/pch_glan.asl>
 
 /* PMC Core */
 #include <soc/intel/common/block/acpi/acpi/pmc.asl>
diff --git a/src/soc/intel/cannonlake/acpi/pch_glan.asl b/src/soc/intel/common/block/acpi/acpi/pch_glan.asl
index 97faf7ac80..6bf733d739 100644
--- a/src/soc/intel/cannonlake/acpi/pch_glan.asl
+++ b/src/soc/intel/common/block/acpi/acpi/pch_glan.asl
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 /* Intel Gigabit Ethernet Controller 0:1f.6 */
+#include <soc/gpe.h>
 
 Device (GLAN)
 {
diff --git a/src/soc/intel/elkhartlake/acpi/pch_glan.asl b/src/soc/intel/elkhartlake/acpi/pch_glan.asl
deleted file mode 100644
index 97faf7ac80..0000000000
--- a/src/soc/intel/elkhartlake/acpi/pch_glan.asl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Intel Gigabit Ethernet Controller 0:1f.6 */
-
-Device (GLAN)
-{
-	Name (_ADR, 0x001f0006)
-
-	Name (_S0W, 3)
-
-	Name (_PRW, Package() {GPE0_PME_B0, 4})
-
-	Method (_DSW, 3) {}
-}
diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl
index fd874697f5..003c4c29f5 100644
--- a/src/soc/intel/elkhartlake/acpi/southbridge.asl
+++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl
@@ -43,3 +43,6 @@
 
 /* EMMC/SD card */
 #include "scs.asl"
+
+/* GbE 0:1f.6 */
+#include <soc/intel/common/block/acpi/acpi/pch_glan.asl>
diff --git a/src/soc/intel/icelake/acpi/pch_glan.asl b/src/soc/intel/icelake/acpi/pch_glan.asl
deleted file mode 100644
index 97faf7ac80..0000000000
--- a/src/soc/intel/icelake/acpi/pch_glan.asl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Intel Gigabit Ethernet Controller 0:1f.6 */
-
-Device (GLAN)
-{
-	Name (_ADR, 0x001f0006)
-
-	Name (_S0W, 3)
-
-	Name (_PRW, Package() {GPE0_PME_B0, 4})
-
-	Method (_DSW, 3) {}
-}
diff --git a/src/soc/intel/icelake/acpi/southbridge.asl b/src/soc/intel/icelake/acpi/southbridge.asl
index 474c6cc922..019a5f0a25 100644
--- a/src/soc/intel/icelake/acpi/southbridge.asl
+++ b/src/soc/intel/icelake/acpi/southbridge.asl
@@ -38,5 +38,5 @@
 /* PCI _OSC */
 #include <soc/intel/common/acpi/pci_osc.asl>
 
-/* GBe 0:1f.6 */
-#include "pch_glan.asl"
+/* GbE 0:1f.6 */
+#include <soc/intel/common/block/acpi/acpi/pch_glan.asl>
diff --git a/src/soc/intel/jasperlake/acpi/pch_glan.asl b/src/soc/intel/jasperlake/acpi/pch_glan.asl
deleted file mode 100644
index 97faf7ac80..0000000000
--- a/src/soc/intel/jasperlake/acpi/pch_glan.asl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Intel Gigabit Ethernet Controller 0:1f.6 */
-
-Device (GLAN)
-{
-	Name (_ADR, 0x001f0006)
-
-	Name (_S0W, 3)
-
-	Name (_PRW, Package() {GPE0_PME_B0, 4})
-
-	Method (_DSW, 3) {}
-}
diff --git a/src/soc/intel/jasperlake/acpi/southbridge.asl b/src/soc/intel/jasperlake/acpi/southbridge.asl
index 48411e4407..76a97142fc 100644
--- a/src/soc/intel/jasperlake/acpi/southbridge.asl
+++ b/src/soc/intel/jasperlake/acpi/southbridge.asl
@@ -49,3 +49,6 @@
 
 /* EMMC/SD card */
 #include "scs.asl"
+
+/* GbE 0:1f.6 */
+#include <soc/intel/common/block/acpi/acpi/pch_glan.asl>
diff --git a/src/soc/intel/tigerlake/acpi/pch_glan.asl b/src/soc/intel/tigerlake/acpi/pch_glan.asl
deleted file mode 100644
index 97faf7ac80..0000000000
--- a/src/soc/intel/tigerlake/acpi/pch_glan.asl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Intel Gigabit Ethernet Controller 0:1f.6 */
-
-Device (GLAN)
-{
-	Name (_ADR, 0x001f0006)
-
-	Name (_S0W, 3)
-
-	Name (_PRW, Package() {GPE0_PME_B0, 4})
-
-	Method (_DSW, 3) {}
-}
diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl
index ff683cf4f6..b193de49c3 100644
--- a/src/soc/intel/tigerlake/acpi/southbridge.asl
+++ b/src/soc/intel/tigerlake/acpi/southbridge.asl
@@ -43,3 +43,6 @@
 
 /* PMC Core*/
 #include <soc/intel/common/block/acpi/acpi/pmc.asl>
+
+/* GbE 0:1f.6 */
+#include <soc/intel/common/block/acpi/acpi/pch_glan.asl>