[M] Change in coreboot[main]: soc/amd/picasso/acpi: move SoC-common code from dsdt.asl to soc.asl

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/79653?usp=email )

Change subject: soc/amd/picasso/acpi: move SoC-common code from dsdt.asl to soc.asl
......................................................................

soc/amd/picasso/acpi: move SoC-common code from dsdt.asl to soc.asl

To avoid code duplication and to also bring the mainboards using the
Picasso SoC more in line with Cezanne and newer, factor out the SoC-
specific code from the mainboard's dsdt.asl files to the SoC's soc.asl.

TEST=Timeless builds result in identical images for Bilby, Mandolin, and
Zork/Morphius

Signed-off-by: Felix Held 
Change-Id: Id4ed3a3d3cb55c8b3b474c66a7c1700e24fe908e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79653
Tested-by: build bot (Jenkins) 
Reviewed-by: Eric Lai 
Reviewed-by: Matt DeVillier 
---
M src/mainboard/amd/bilby/dsdt.asl
M src/mainboard/amd/mandolin/dsdt.asl
M src/mainboard/google/zork/dsdt.asl
M src/soc/amd/picasso/acpi/soc.asl
4 files changed, 39 insertions(+), 77 deletions(-)

Approvals:
  Matt DeVillier: Looks good to me, approved
  Eric Lai: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified

diff --git a/src/mainboard/amd/bilby/dsdt.asl b/src/mainboard/amd/bilby/dsdt.asl
index dd42608..57ee5d6 100644
--- a/src/mainboard/amd/bilby/dsdt.asl
+++ b/src/mainboard/amd/bilby/dsdt.asl
@@ -14,25 +14,7 @@
    )
 {	/* Start of ASL file */
    #include <acpi/dsdt_top.asl>
-	#include <globalnvs.asl>

-	/* Power state notification to ALIB */
-	#include <pnot.asl>
-
-	/* Contains the supported sleep states for this chipset */
-	#include <soc/amd/common/acpi/sleepstates.asl>
-
-	/* Contains _SWS methods */
-	#include <soc/amd/common/acpi/acpi_wake_source.asl>
-
-	/* System Bus */
-	Scope(_SB) { /* Start _SB scope */
-		/* global utility methods expected within the _SB scope */
-		#include <arch/x86/acpi/globutil.asl>
-
-		/* Describe the SOC */
-		#include <soc.asl>
-
-	} /* End _SB scope */
+	#include <soc.asl>
 }
 /* End of ASL file */
diff --git a/src/mainboard/amd/mandolin/dsdt.asl b/src/mainboard/amd/mandolin/dsdt.asl
index dd42608..57ee5d6 100644
--- a/src/mainboard/amd/mandolin/dsdt.asl
+++ b/src/mainboard/amd/mandolin/dsdt.asl
@@ -14,25 +14,7 @@
    )
 {	/* Start of ASL file */
    #include <acpi/dsdt_top.asl>
-	#include <globalnvs.asl>

-	/* Power state notification to ALIB */
-	#include <pnot.asl>
-
-	/* Contains the supported sleep states for this chipset */
-	#include <soc/amd/common/acpi/sleepstates.asl>
-
-	/* Contains _SWS methods */
-	#include <soc/amd/common/acpi/acpi_wake_source.asl>
-
-	/* System Bus */
-	Scope(_SB) { /* Start _SB scope */
-		/* global utility methods expected within the _SB scope */
-		#include <arch/x86/acpi/globutil.asl>
-
-		/* Describe the SOC */
-		#include <soc.asl>
-
-	} /* End _SB scope */
+	#include <soc.asl>
 }
 /* End of ASL file */
diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl
index dc4322d..4cb8506 100644
--- a/src/mainboard/google/zork/dsdt.asl
+++ b/src/mainboard/google/zork/dsdt.asl
@@ -18,26 +18,7 @@

Name(LIDS, 0)

-	#include <globalnvs.asl>
-
-	/* Power state notification to ALIB */
-	#include <pnot.asl>
-
-	/* Contains the supported sleep states for this chipset */
-	#include <soc/amd/common/acpi/sleepstates.asl>
-
-	/* Contains _SWS methods */
-	#include <soc/amd/common/acpi/acpi_wake_source.asl>
-
-	/* System Bus */
-	Scope(_SB) { /* Start _SB scope */
-		/* global utility methods expected within the _SB scope */
-		#include <arch/x86/acpi/globutil.asl>
-
-		/* Describe the SOC */
-		#include <soc.asl>
-
-	} /* End _SB scope */
+	#include <soc.asl>

/* Thermal handler */
    #include <variant/acpi/thermal.asl>
diff --git a/src/soc/amd/picasso/acpi/soc.asl b/src/soc/amd/picasso/acpi/soc.asl
index a958570..7c13f08 100644
--- a/src/soc/amd/picasso/acpi/soc.asl
+++ b/src/soc/amd/picasso/acpi/soc.asl
@@ -1,30 +1,47 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <soc/amd/common/acpi/pci_root.asl>
+#include "globalnvs.asl"

-ROOT_BRIDGE(PCI0)
+/* Power state notification to ALIB */
+#include "pnot.asl"

-Scope(PCI0) {
-	/* Describe the AMD Northbridge */
-	#include "northbridge.asl"
+/* Contains the supported sleep states for this chipset */
+#include <soc/amd/common/acpi/sleepstates.asl>

-	/* Describe the AMD Fusion Controller Hub */
-	#include <soc/amd/common/acpi/lpc.asl>
-	#include <soc/amd/common/acpi/platform.asl>
-}
+/* Contains _SWS methods */
+#include <soc/amd/common/acpi/acpi_wake_source.asl>

-/* PCI IRQ mapping for the Southbridge */
-#include "pci_int_defs.asl"
+/* System Bus */
+Scope(_SB) { /* Start _SB scope */
+	/* global utility methods expected within the _SB scope */
+	#include <arch/x86/acpi/globutil.asl>

-/* Describe PCI INT[A-H] for the Southbridge */
-#include <soc/amd/common/acpi/pci_int.asl>
+	ROOT_BRIDGE(PCI0)

-/* Describe the MMIO devices in the FCH */
-#include "mmio.asl"
+	Scope(PCI0) {
+		/* Describe the AMD Northbridge */
+		#include "northbridge.asl"

-/* Add GPIO library */
-#include <soc/amd/common/acpi/gpio_bank_lib.asl>
+		/* Describe the AMD Fusion Controller Hub */
+		#include <soc/amd/common/acpi/lpc.asl>
+		#include <soc/amd/common/acpi/platform.asl>
+	}

-#if CONFIG(SOC_AMD_COMMON_BLOCK_ACPI_DPTC)
-#include <soc/amd/common/acpi/dptc.asl>
-#endif
+	/* PCI IRQ mapping for the Southbridge */
+	#include "pci_int_defs.asl"
+
+	/* Describe PCI INT[A-H] for the Southbridge */
+	#include <soc/amd/common/acpi/pci_int.asl>
+
+	/* Describe the MMIO devices in the FCH */
+	#include "mmio.asl"
+
+	/* Add GPIO library */
+	#include <soc/amd/common/acpi/gpio_bank_lib.asl>
+
+	#if CONFIG(SOC_AMD_COMMON_BLOCK_ACPI_DPTC)
+	#include <soc/amd/common/acpi/dptc.asl>
+	#endif
+
+} /* End _SB scope */