Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45979 )
Change subject: soc/intel/common/block/acpi: Factor out common smbus.asl ......................................................................
soc/intel/common/block/acpi: Factor out common smbus.asl
This patch moves smbus.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 SBUS device present inside common smbus.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: Ib1ae48f7ece3e521501d92c40cd551287ea2f1ec --- D src/soc/intel/cannonlake/acpi/smbus.asl M src/soc/intel/cannonlake/acpi/southbridge.asl R src/soc/intel/common/block/acpi/acpi/smbus.asl D src/soc/intel/denverton_ns/acpi/smbus.asl M src/soc/intel/denverton_ns/acpi/southcluster.asl M src/soc/intel/elkhartlake/acpi/southbridge.asl D src/soc/intel/icelake/acpi/smbus.asl M src/soc/intel/icelake/acpi/southbridge.asl D src/soc/intel/jasperlake/acpi/smbus.asl M src/soc/intel/jasperlake/acpi/southbridge.asl M src/soc/intel/skylake/acpi/pch.asl D src/soc/intel/skylake/acpi/smbus.asl D src/soc/intel/tigerlake/acpi/smbus.asl M src/soc/intel/tigerlake/acpi/southbridge.asl 14 files changed, 7 insertions(+), 55 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/45979/1
diff --git a/src/soc/intel/cannonlake/acpi/smbus.asl b/src/soc/intel/cannonlake/acpi/smbus.asl deleted file mode 100644 index 7860f60..0000000 --- a/src/soc/intel/cannonlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index 76a5445..7b6708c 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -32,7 +32,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* ISH 0:13.0 */ #include "ish.asl" diff --git a/src/soc/intel/elkhartlake/acpi/smbus.asl b/src/soc/intel/common/block/acpi/acpi/smbus.asl similarity index 100% rename from src/soc/intel/elkhartlake/acpi/smbus.asl rename to src/soc/intel/common/block/acpi/acpi/smbus.asl diff --git a/src/soc/intel/denverton_ns/acpi/smbus.asl b/src/soc/intel/denverton_ns/acpi/smbus.asl deleted file mode 100644 index 7860f60..0000000 --- a/src/soc/intel/denverton_ns/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/denverton_ns/acpi/southcluster.asl b/src/soc/intel/denverton_ns/acpi/southcluster.asl index ad9c088..68f55f2 100644 --- a/src/soc/intel/denverton_ns/acpi/southcluster.asl +++ b/src/soc/intel/denverton_ns/acpi/southcluster.asl @@ -117,7 +117,7 @@ #include "pmc.asl"
// SMBus 0:1f.4 -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
// Northpeak 0:1f.7 #include "npk.asl" diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl index 003c4c2..d85ddac 100644 --- a/src/soc/intel/elkhartlake/acpi/southbridge.asl +++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* USB XHCI 0:14.0 */ #include "xhci.asl" diff --git a/src/soc/intel/icelake/acpi/smbus.asl b/src/soc/intel/icelake/acpi/smbus.asl deleted file mode 100644 index 7860f60..0000000 --- a/src/soc/intel/icelake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/icelake/acpi/southbridge.asl b/src/soc/intel/icelake/acpi/southbridge.asl index 019a5f0..4abea7c 100644 --- a/src/soc/intel/icelake/acpi/southbridge.asl +++ b/src/soc/intel/icelake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* USB XHCI 0:14.0 */ #include "xhci.asl" diff --git a/src/soc/intel/jasperlake/acpi/smbus.asl b/src/soc/intel/jasperlake/acpi/smbus.asl deleted file mode 100644 index 6705f22..0000000 --- a/src/soc/intel/jasperlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel SMBus Controller 0:1f.4 */ - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/jasperlake/acpi/southbridge.asl b/src/soc/intel/jasperlake/acpi/southbridge.asl index 76a9714..c1ea273 100644 --- a/src/soc/intel/jasperlake/acpi/southbridge.asl +++ b/src/soc/intel/jasperlake/acpi/southbridge.asl @@ -33,7 +33,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* ISH 0:12.0 */ #include "ish.asl" diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl index 9d5f8be..6eea5bb 100644 --- a/src/soc/intel/skylake/acpi/pch.asl +++ b/src/soc/intel/skylake/acpi/pch.asl @@ -36,7 +36,7 @@ #include "serialio.asl"
/* SMBus 0:1f.3 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* Storage Controllers */ #include "scs.asl" diff --git a/src/soc/intel/skylake/acpi/smbus.asl b/src/soc/intel/skylake/acpi/smbus.asl deleted file mode 100644 index 7860f60..0000000 --- a/src/soc/intel/skylake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/tigerlake/acpi/smbus.asl b/src/soc/intel/tigerlake/acpi/smbus.asl deleted file mode 100644 index 6705f22..0000000 --- a/src/soc/intel/tigerlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel SMBus Controller 0:1f.4 */ - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl index b193de4..7d6a0fb 100644 --- a/src/soc/intel/tigerlake/acpi/southbridge.asl +++ b/src/soc/intel/tigerlake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* ISH 0:12.0 */ #include "ish.asl"
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45979 )
Change subject: soc/intel/common/block/acpi: Factor out common smbus.asl ......................................................................
Patch Set 1: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45979 )
Change subject: soc/intel/common/block/acpi: Factor out common smbus.asl ......................................................................
Patch Set 1: Code-Review+2
Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45979 )
Change subject: soc/intel/common/block/acpi: Factor out common smbus.asl ......................................................................
soc/intel/common/block/acpi: Factor out common smbus.asl
This patch moves smbus.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 SBUS device present inside common smbus.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: Ib1ae48f7ece3e521501d92c40cd551287ea2f1ec Reviewed-on: https://review.coreboot.org/c/coreboot/+/45979 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Angel Pons th3fanbus@gmail.com --- D src/soc/intel/cannonlake/acpi/smbus.asl M src/soc/intel/cannonlake/acpi/southbridge.asl R src/soc/intel/common/block/acpi/acpi/smbus.asl D src/soc/intel/denverton_ns/acpi/smbus.asl M src/soc/intel/denverton_ns/acpi/southcluster.asl M src/soc/intel/elkhartlake/acpi/southbridge.asl D src/soc/intel/icelake/acpi/smbus.asl M src/soc/intel/icelake/acpi/southbridge.asl D src/soc/intel/jasperlake/acpi/smbus.asl M src/soc/intel/jasperlake/acpi/southbridge.asl M src/soc/intel/skylake/acpi/pch.asl D src/soc/intel/skylake/acpi/smbus.asl D src/soc/intel/tigerlake/acpi/smbus.asl M src/soc/intel/tigerlake/acpi/southbridge.asl 14 files changed, 7 insertions(+), 55 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/soc/intel/cannonlake/acpi/smbus.asl b/src/soc/intel/cannonlake/acpi/smbus.asl deleted file mode 100644 index 7860f60..0000000 --- a/src/soc/intel/cannonlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index 76a5445..7b6708c 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -32,7 +32,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* ISH 0:13.0 */ #include "ish.asl" diff --git a/src/soc/intel/elkhartlake/acpi/smbus.asl b/src/soc/intel/common/block/acpi/acpi/smbus.asl similarity index 100% rename from src/soc/intel/elkhartlake/acpi/smbus.asl rename to src/soc/intel/common/block/acpi/acpi/smbus.asl diff --git a/src/soc/intel/denverton_ns/acpi/smbus.asl b/src/soc/intel/denverton_ns/acpi/smbus.asl deleted file mode 100644 index 7860f60..0000000 --- a/src/soc/intel/denverton_ns/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/denverton_ns/acpi/southcluster.asl b/src/soc/intel/denverton_ns/acpi/southcluster.asl index ad9c088..68f55f2 100644 --- a/src/soc/intel/denverton_ns/acpi/southcluster.asl +++ b/src/soc/intel/denverton_ns/acpi/southcluster.asl @@ -117,7 +117,7 @@ #include "pmc.asl"
// SMBus 0:1f.4 -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
// Northpeak 0:1f.7 #include "npk.asl" diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl index 003c4c2..d85ddac 100644 --- a/src/soc/intel/elkhartlake/acpi/southbridge.asl +++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* USB XHCI 0:14.0 */ #include "xhci.asl" diff --git a/src/soc/intel/icelake/acpi/smbus.asl b/src/soc/intel/icelake/acpi/smbus.asl deleted file mode 100644 index 7860f60..0000000 --- a/src/soc/intel/icelake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/icelake/acpi/southbridge.asl b/src/soc/intel/icelake/acpi/southbridge.asl index 019a5f0..4abea7c 100644 --- a/src/soc/intel/icelake/acpi/southbridge.asl +++ b/src/soc/intel/icelake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* USB XHCI 0:14.0 */ #include "xhci.asl" diff --git a/src/soc/intel/jasperlake/acpi/smbus.asl b/src/soc/intel/jasperlake/acpi/smbus.asl deleted file mode 100644 index 6705f22..0000000 --- a/src/soc/intel/jasperlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel SMBus Controller 0:1f.4 */ - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/jasperlake/acpi/southbridge.asl b/src/soc/intel/jasperlake/acpi/southbridge.asl index 76a9714..c1ea273 100644 --- a/src/soc/intel/jasperlake/acpi/southbridge.asl +++ b/src/soc/intel/jasperlake/acpi/southbridge.asl @@ -33,7 +33,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* ISH 0:12.0 */ #include "ish.asl" diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl index 9d5f8be..6eea5bb 100644 --- a/src/soc/intel/skylake/acpi/pch.asl +++ b/src/soc/intel/skylake/acpi/pch.asl @@ -36,7 +36,7 @@ #include "serialio.asl"
/* SMBus 0:1f.3 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* Storage Controllers */ #include "scs.asl" diff --git a/src/soc/intel/skylake/acpi/smbus.asl b/src/soc/intel/skylake/acpi/smbus.asl deleted file mode 100644 index 7860f60..0000000 --- a/src/soc/intel/skylake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SMBus Controller 0:1f.4 - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/tigerlake/acpi/smbus.asl b/src/soc/intel/tigerlake/acpi/smbus.asl deleted file mode 100644 index 6705f22..0000000 --- a/src/soc/intel/tigerlake/acpi/smbus.asl +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel SMBus Controller 0:1f.4 */ - -Device (SBUS) -{ - Name (_ADR, 0x001f0004) -} diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl index b193de4..7d6a0fb 100644 --- a/src/soc/intel/tigerlake/acpi/southbridge.asl +++ b/src/soc/intel/tigerlake/acpi/southbridge.asl @@ -30,7 +30,7 @@ #include "serialio.asl"
/* SMBus 0:1f.4 */ -#include "smbus.asl" +#include <soc/intel/common/block/acpi/acpi/smbus.asl>
/* ISH 0:12.0 */ #include "ish.asl"
-
Angel Pons (Code Review) -
HAOUAS Elyes (Code Review)
-
Subrata Banik (Code Review)