Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45975 )
Change subject: soc/intel/common/block/acpi: Factor out common pch_glan.asl ......................................................................
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 --- M src/soc/intel/cannonlake/acpi/southbridge.asl R src/soc/intel/common/block/acpi/acpi/pch_glan.asl D src/soc/intel/elkhartlake/acpi/pch_glan.asl M src/soc/intel/elkhartlake/acpi/southbridge.asl D src/soc/intel/icelake/acpi/pch_glan.asl M src/soc/intel/icelake/acpi/southbridge.asl D src/soc/intel/jasperlake/acpi/pch_glan.asl M src/soc/intel/jasperlake/acpi/southbridge.asl D src/soc/intel/tigerlake/acpi/pch_glan.asl M src/soc/intel/tigerlake/acpi/southbridge.asl 10 files changed, 12 insertions(+), 58 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/45975/1
diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index a6b0237..0c54877 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -44,7 +44,7 @@ #include <soc/intel/common/acpi/pci_osc.asl>
/* GBe 0:1f.6 */ -#include "pch_glan.asl" +#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 similarity index 90% rename from src/soc/intel/cannonlake/acpi/pch_glan.asl rename to src/soc/intel/common/block/acpi/acpi/pch_glan.asl index 97faf7a..6bf733d 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 97faf7a..0000000 --- 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 fd87469..f84539b 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 97faf7a..0000000 --- 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 474c6cc..56e19bb 100644 --- a/src/soc/intel/icelake/acpi/southbridge.asl +++ b/src/soc/intel/icelake/acpi/southbridge.asl @@ -39,4 +39,4 @@ #include <soc/intel/common/acpi/pci_osc.asl>
/* GBe 0:1f.6 */ -#include "pch_glan.asl" +#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 97faf7a..0000000 --- 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 48411e4..c19791b 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 97faf7a..0000000 --- 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 ff683cf..23fdb17 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>
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45975 )
Change subject: soc/intel/common/block/acpi: Factor out common pch_glan.asl ......................................................................
Patch Set 1: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/45975/1/src/soc/intel/elkhartlake/a... File src/soc/intel/elkhartlake/acpi/southbridge.asl:
https://review.coreboot.org/c/coreboot/+/45975/1/src/soc/intel/elkhartlake/a... PS1, Line 47: GBe nit: GbE
Also, EHL didn't include the file before. Does it matter?
Hello build bot (Jenkins), Furquan Shaikh, Tim Wawrzynczak, Angel Pons, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45975
to look at the new patch set (#2).
Change subject: soc/intel/common/block/acpi: Factor out common pch_glan.asl ......................................................................
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 --- M src/soc/intel/cannonlake/acpi/southbridge.asl R src/soc/intel/common/block/acpi/acpi/pch_glan.asl D src/soc/intel/elkhartlake/acpi/pch_glan.asl M src/soc/intel/elkhartlake/acpi/southbridge.asl D src/soc/intel/icelake/acpi/pch_glan.asl M src/soc/intel/icelake/acpi/southbridge.asl D src/soc/intel/jasperlake/acpi/pch_glan.asl M src/soc/intel/jasperlake/acpi/southbridge.asl D src/soc/intel/tigerlake/acpi/pch_glan.asl M src/soc/intel/tigerlake/acpi/southbridge.asl 10 files changed, 14 insertions(+), 60 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/45975/2
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45975 )
Change subject: soc/intel/common/block/acpi: Factor out common pch_glan.asl ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45975/1/src/soc/intel/elkhartlake/a... File src/soc/intel/elkhartlake/acpi/southbridge.asl:
https://review.coreboot.org/c/coreboot/+/45975/1/src/soc/intel/elkhartlake/a... PS1, Line 47: GBe
nit: GbE
Done
Also, EHL didn't include the file before. Does it matter?
no its mostly EHL had copied JSL code 😊 both boards has Ethernet controller
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45975 )
Change subject: soc/intel/common/block/acpi: Factor out common pch_glan.asl ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45975/1/src/soc/intel/elkhartlake/a... File src/soc/intel/elkhartlake/acpi/southbridge.asl:
https://review.coreboot.org/c/coreboot/+/45975/1/src/soc/intel/elkhartlake/a... PS1, Line 47: GBe
nit: GbE […]
Ack. Maybe that explains why EHL is so similar to JSL
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45975 )
Change subject: soc/intel/common/block/acpi: Factor out common pch_glan.asl ......................................................................
Patch Set 2: Code-Review+2
Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45975 )
Change subject: soc/intel/common/block/acpi: Factor out common pch_glan.asl ......................................................................
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 --- M src/soc/intel/cannonlake/acpi/southbridge.asl R src/soc/intel/common/block/acpi/acpi/pch_glan.asl D src/soc/intel/elkhartlake/acpi/pch_glan.asl M src/soc/intel/elkhartlake/acpi/southbridge.asl D src/soc/intel/icelake/acpi/pch_glan.asl M src/soc/intel/icelake/acpi/southbridge.asl D src/soc/intel/jasperlake/acpi/pch_glan.asl M src/soc/intel/jasperlake/acpi/southbridge.asl D src/soc/intel/tigerlake/acpi/pch_glan.asl M src/soc/intel/tigerlake/acpi/southbridge.asl 10 files changed, 14 insertions(+), 60 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index a6b0237..76a5445 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 similarity index 90% rename from src/soc/intel/cannonlake/acpi/pch_glan.asl rename to src/soc/intel/common/block/acpi/acpi/pch_glan.asl index 97faf7a..6bf733d 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 97faf7a..0000000 --- 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 fd87469..003c4c2 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 97faf7a..0000000 --- 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 474c6cc..019a5f0 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 97faf7a..0000000 --- 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 48411e4..76a9714 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 97faf7a..0000000 --- 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 ff683cf..b193de4 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>
-
Angel Pons (Code Review) -
Subrata Banik (Code Review)