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

This patch moves platform.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 _PIC method present inside
common platform.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: I5189b03d6abfaec39882d28b40a9bfa002128be3
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45982
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

src/mainboard/asrock/h110m/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/clevo/cml-u/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 

src/mainboard/facebook/monolith/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/google/dedede/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/jasperlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/google/deltaur/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/tigerlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/google/drallion/dsdt.asl

@@ -12,7 +12,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/google/eve/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/google/fizz/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/google/glados/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/google/hatch/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/google/poppy/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/google/sarien/dsdt.asl

@@ -12,7 +12,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/google/volteer/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/tigerlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/intel/cannonlake_rvp/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/intel/coffeelake_rvp/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/intel/icelake_rvp/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/icelake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/intel/jasperlake_rvp/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/jasperlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/intel/kblrvp/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/intel/kunimitsu/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/intel/saddlebrook/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/intel/tglrvp/dsdt.asl

@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/tigerlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/kontron/bsl6/dsdt.asl

@@ -11,7 +11,7 @@ DefinitionBlock(
 )
 {
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 	#include <soc/intel/skylake/acpi/globalnvs.asl>
 
 	Device (\_SB.PCI0) {

src/mainboard/libretrend/lt1000/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 	#include <soc/intel/skylake/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 

src/mainboard/prodrive/hermes/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>

src/mainboard/protectli/vault_kbl/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 	#include <soc/intel/skylake/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 

src/mainboard/purism/librem_skl/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/purism/librem_whl/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 

src/mainboard/razer/blade_stealth_kbl/dsdt.asl

@@ -11,7 +11,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 ){
 	//Platform
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/supermicro/x11-lga1151-series/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>

src/mainboard/system76/lemp9/dsdt.asl

@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 

src/soc/intel/elkhartlake/acpi/platform.asl

@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Enable ACPI _SWS methods */
-#include <soc/intel/common/acpi/acpi_wake_source.asl>
-/* Generic indicator for sleep state */
-#include <soc/intel/common/acpi/platform.asl>
-
-/*
- * The _PIC method is called by the OS to choose between interrupt
- * routing via the i8259 interrupt controller or the APIC.
- *
- * _PIC is called with a parameter of 0 for i8259 configuration and
- * with a parameter of 1 for Local Apic/IOAPIC configuration.
- */
-
-Method (_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice. */
-	PICM = Arg0
-}

src/soc/intel/icelake/acpi/platform.asl

@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Enable ACPI _SWS methods */
-#include <soc/intel/common/acpi/acpi_wake_source.asl>
-/* Generic indicator for sleep state */
-#include <soc/intel/common/acpi/platform.asl>
-
-/*
- * The _PIC method is called by the OS to choose between interrupt
- * routing via the i8259 interrupt controller or the APIC.
- *
- * _PIC is called with a parameter of 0 for i8259 configuration and
- * with a parameter of 1 for Local Apic/IOAPIC configuration.
- */
-
-Method (_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice. */
-	PICM = Arg0
-}

src/soc/intel/jasperlake/acpi/platform.asl

@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Enable ACPI _SWS methods */
-#include <soc/intel/common/acpi/acpi_wake_source.asl>
-/* Generic indicator for sleep state */
-#include <soc/intel/common/acpi/platform.asl>
-
-/*
- * The _PIC method is called by the OS to choose between interrupt
- * routing via the i8259 interrupt controller or the APIC.
- *
- * _PIC is called with a parameter of 0 for i8259 configuration and
- * with a parameter of 1 for Local Apic/IOAPIC configuration.
- */
-
-Method (_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice. */
-	PICM = Arg0
-}

src/soc/intel/skylake/acpi/platform.asl

@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Enable ACPI _SWS methods */
-#include <soc/intel/common/acpi/acpi_wake_source.asl>
-/* Generic indicator for sleep state */
-#include <soc/intel/common/acpi/platform.asl>
-
-/*
- * The _PIC method is called by the OS to choose between interrupt
- * routing via the i8259 interrupt controller or the APIC.
- *
- * _PIC is called with a parameter of 0 for i8259 configuration and
- * with a parameter of 1 for Local Apic/IOAPIC configuration.
- */
-
-Method (_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice. */
-	PICM = Arg0
-}

src/soc/intel/tigerlake/acpi/platform.asl

@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Enable ACPI _SWS methods */
-#include <soc/intel/common/acpi/acpi_wake_source.asl>
-/* Generic indicator for sleep state */
-#include <soc/intel/common/acpi/platform.asl>
-
-/*
- * The _PIC method is called by the OS to choose between interrupt
- * routing via the i8259 interrupt controller or the APIC.
- *
- * _PIC is called with a parameter of 0 for i8259 configuration and
- * with a parameter of 1 for Local Apic/IOAPIC configuration.
- */
-
-Method (_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice. */
-	PICM = Arg0
-}