Jonathan Zhang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
soc/intel/common/block/lpc: add acpi name
Add ACPI name for LPC device. The name matches with what is in lpc.asl.
Signed-off-by: Jonathan Zhang jonzhang@fb.com Change-Id: If418c83caafe5d9e2af135a8946cbe5eb687b9ef --- M src/soc/intel/common/block/lpc/lpc.c 1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/45590/1
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index 212fd70..b7636b6 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -95,6 +95,13 @@ pch_lpc_set_child_resources(dev); }
+#if CONFIG(HAVE_ACPI_TABLES) +static const char *lpc_acpi_name(const struct device *dev) +{ + return "LPCB"; +} +#endif + static struct device_operations device_ops = { .read_resources = pch_lpc_read_resources, .set_resources = pch_lpc_set_resources, @@ -102,6 +109,7 @@ #if CONFIG(HAVE_ACPI_TABLES) .write_acpi_tables = southbridge_write_acpi_tables, .acpi_inject_dsdt = southbridge_inject_dsdt, + .acpi_name = lpc_acpi_name, #endif .init = lpc_soc_init, .scan_bus = scan_static_bus,
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 1: Code-Review+1
(2 comments)
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... File src/soc/intel/common/block/lpc/lpc.c:
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... PS1, Line 101: return "LPCB"; One tab is enough
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... PS1, Line 112: .acpi_name = lpc_acpi_name, Looks like the other entries are aligned with tabs.
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... File src/soc/intel/common/block/lpc/lpc.c:
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... PS1, Line 101: LPCB We should now drop "LPCB" from SoC chip functions:
# git grep "return "LPCB"" apollolake/chip.c: return "LPCB"; cannonlake/chip.c: case PCH_DEVFN_LPC: return "LPCB"; elkhartlake/chip.c: case PCH_DEVFN_ESPI: return "LPCB"; icelake/chip.c: case PCH_DEVFN_ESPI: return "LPCB"; jasperlake/chip.c: case PCH_DEVFN_ESPI: return "LPCB"; skylake/acpi.c: case PCH_DEVFN_LPC: return "LPCB"; tigerlake/chip.c: case PCH_DEVFN_ESPI: return "LPCB";
Jonathan Zhang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 1:
(3 comments)
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... File src/soc/intel/common/block/lpc/lpc.c:
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... PS1, Line 101: return "LPCB";
One tab is enough
Done
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... PS1, Line 101: LPCB
We should now drop "LPCB" from SoC chip functions: […]
Thanks. Since only apollolake select CONFIG_SOC_INTEL_COMMON_BLOCK_LPC, I updated apollolake accordingly.
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... PS1, Line 112: .acpi_name = lpc_acpi_name,
Looks like the other entries are aligned with tabs.
Done
Hello Philipp Deppenwiese, build bot (Jenkins), Marc Jones, Christian Walter, Angel Pons, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45590
to look at the new patch set (#2).
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
soc/intel/common/block/lpc: add acpi name
Add ACPI name for LPC device. The name matches with what is in soc/intel/common/block/acpi/acpi/lpc.asl.
Since soc/intel/apollolake selects CONFIG_SOC_INTEL_COMMON_BLOCK_LPC, remove duplicated acpi name assignment.
Signed-off-by: Jonathan Zhang jonzhang@fb.com Change-Id: If418c83caafe5d9e2af135a8946cbe5eb687b9ef --- M src/soc/intel/apollolake/chip.c M src/soc/intel/common/block/lpc/lpc.c 2 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/45590/2
Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 2: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... File src/soc/intel/common/block/lpc/lpc.c:
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... PS1, Line 101: LPCB
Thanks. […]
Actually CONFIG_SOC_INTEL_COMMON_BLOCK_LPC is selected for all the above SoCs:
# git grep "select SOC_INTEL_COMMON_BLOCK_LPC" src/soc/intel/apollolake/Kconfig: select SOC_INTEL_COMMON_BLOCK_LPC src/soc/intel/common/pch/Kconfig: select SOC_INTEL_COMMON_BLOCK_LPC src/soc/intel/xeon_sp/Kconfig: select SOC_INTEL_COMMON_BLOCK_LPC
In common/pch/Kconfig, SOC_INTEL_COMMON_BLOCK_LPC is auto-selected if SOC_INTEL_COMMON_PCH_BASE is selected.
# git grep "select SOC_INTEL_COMMON_PCH_BASE" src/soc/intel/alderlake/Kconfig: select SOC_INTEL_COMMON_PCH_BASE src/soc/intel/cannonlake/Kconfig: select SOC_INTEL_COMMON_PCH_BASE src/soc/intel/elkhartlake/Kconfig: select SOC_INTEL_COMMON_PCH_BASE src/soc/intel/icelake/Kconfig: select SOC_INTEL_COMMON_PCH_BASE src/soc/intel/jasperlake/Kconfig: select SOC_INTEL_COMMON_PCH_BASE src/soc/intel/skylake/Kconfig: select SOC_INTEL_COMMON_PCH_BASE src/soc/intel/tigerlake/Kconfig: select SOC_INTEL_COMMON_PCH_BASE
Jonathan Zhang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... File src/soc/intel/common/block/lpc/lpc.c:
https://review.coreboot.org/c/coreboot/+/45590/1/src/soc/intel/common/block/... PS1, Line 101: LPCB
Actually CONFIG_SOC_INTEL_COMMON_BLOCK_LPC is selected for all the above SoCs: […]
Thanks! I did not know about SOC_INTEL_COMMON_PCH_BASE.
Hello Philipp Deppenwiese, build bot (Jenkins), Marc Jones, Christian Walter, Angel Pons, Andrey Petrov, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45590
to look at the new patch set (#3).
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
soc/intel/common/block/lpc: add acpi name
Add ACPI name for LPC device. The name matches with what is in soc/intel/common/block/acpi/acpi/lpc.asl.
Since several Intel SOCs select CONFIG_SOC_INTEL_COMMON_BLOCK_LPC, remove duplicated acpi name assignments.
Signed-off-by: Jonathan Zhang jonzhang@fb.com Change-Id: If418c83caafe5d9e2af135a8946cbe5eb687b9ef --- M src/soc/intel/apollolake/chip.c M src/soc/intel/cannonlake/chip.c M src/soc/intel/common/block/lpc/lpc.c M src/soc/intel/elkhartlake/chip.c M src/soc/intel/icelake/chip.c M src/soc/intel/jasperlake/chip.c M src/soc/intel/skylake/acpi.c M src/soc/intel/tigerlake/chip.c 8 files changed, 8 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/45590/3
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 3: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/45590/3/src/soc/intel/elkhartlake/c... File src/soc/intel/elkhartlake/chip.c:
https://review.coreboot.org/c/coreboot/+/45590/3/src/soc/intel/elkhartlake/c... PS3, Line 98: /* Keeping ACPI device name coherent with ec.asl */ These comments refer to the now-gone entry for LPC/eSPI. Please drop them too.
Jonathan Zhang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45590/3/src/soc/intel/elkhartlake/c... File src/soc/intel/elkhartlake/chip.c:
https://review.coreboot.org/c/coreboot/+/45590/3/src/soc/intel/elkhartlake/c... PS3, Line 98: /* Keeping ACPI device name coherent with ec.asl */
These comments refer to the now-gone entry for LPC/eSPI. Please drop them too.
Done
Hello Philipp Deppenwiese, build bot (Jenkins), Marc Jones, Christian Walter, Angel Pons, Andrey Petrov, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45590
to look at the new patch set (#4).
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
soc/intel/common/block/lpc: add acpi name
Add ACPI name for LPC device. The name matches with what is in soc/intel/common/block/acpi/acpi/lpc.asl.
Since several Intel SOCs select CONFIG_SOC_INTEL_COMMON_BLOCK_LPC, remove duplicated acpi name assignments.
Signed-off-by: Jonathan Zhang jonzhang@fb.com Change-Id: If418c83caafe5d9e2af135a8946cbe5eb687b9ef --- M src/soc/intel/apollolake/chip.c M src/soc/intel/cannonlake/chip.c M src/soc/intel/common/block/lpc/lpc.c M src/soc/intel/elkhartlake/chip.c M src/soc/intel/icelake/chip.c M src/soc/intel/jasperlake/chip.c M src/soc/intel/skylake/acpi.c M src/soc/intel/tigerlake/chip.c 8 files changed, 8 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/45590/4
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 4: Code-Review+1
(3 comments)
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/icelake/chip.... File src/soc/intel/icelake/chip.c:
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/icelake/chip.... PS4, Line 78: /* Keeping ACPI device name coherent with ec.asl */ This needs to be dropped as well.
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/jasperlake/ch... File src/soc/intel/jasperlake/chip.c:
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/jasperlake/ch... PS4, Line 98: /* Keeping ACPI device name coherent with ec.asl */ This needs to be dropped as well.
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/tigerlake/chi... File src/soc/intel/tigerlake/chip.c:
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/tigerlake/chi... PS4, Line 107: /* Keeping ACPI device name coherent with ec.asl */ Same here.
Jonathan Zhang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 4:
(3 comments)
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/icelake/chip.... File src/soc/intel/icelake/chip.c:
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/icelake/chip.... PS4, Line 78: /* Keeping ACPI device name coherent with ec.asl */
This needs to be dropped as well.
Done
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/jasperlake/ch... File src/soc/intel/jasperlake/chip.c:
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/jasperlake/ch... PS4, Line 98: /* Keeping ACPI device name coherent with ec.asl */
This needs to be dropped as well.
Done
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/tigerlake/chi... File src/soc/intel/tigerlake/chip.c:
https://review.coreboot.org/c/coreboot/+/45590/4/src/soc/intel/tigerlake/chi... PS4, Line 107: /* Keeping ACPI device name coherent with ec.asl */
Same here.
Done
Hello Philipp Deppenwiese, build bot (Jenkins), Marc Jones, Furquan Shaikh, Christian Walter, Subrata Banik, Angel Pons, Andrey Petrov, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45590
to look at the new patch set (#5).
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
soc/intel/common/block/lpc: add acpi name
Add ACPI name for LPC device. The name matches with what is in soc/intel/common/block/acpi/acpi/lpc.asl.
Since several Intel SOCs select CONFIG_SOC_INTEL_COMMON_BLOCK_LPC, remove duplicated acpi name assignments.
Signed-off-by: Jonathan Zhang jonzhang@fb.com Change-Id: If418c83caafe5d9e2af135a8946cbe5eb687b9ef --- M src/soc/intel/apollolake/chip.c M src/soc/intel/cannonlake/chip.c M src/soc/intel/common/block/lpc/lpc.c M src/soc/intel/elkhartlake/chip.c M src/soc/intel/icelake/chip.c M src/soc/intel/jasperlake/chip.c M src/soc/intel/skylake/acpi.c M src/soc/intel/tigerlake/chip.c 8 files changed, 8 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/45590/5
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
Patch Set 5: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45590 )
Change subject: soc/intel/common/block/lpc: add acpi name ......................................................................
soc/intel/common/block/lpc: add acpi name
Add ACPI name for LPC device. The name matches with what is in soc/intel/common/block/acpi/acpi/lpc.asl.
Since several Intel SOCs select CONFIG_SOC_INTEL_COMMON_BLOCK_LPC, remove duplicated acpi name assignments.
Signed-off-by: Jonathan Zhang jonzhang@fb.com Change-Id: If418c83caafe5d9e2af135a8946cbe5eb687b9ef Reviewed-on: https://review.coreboot.org/c/coreboot/+/45590 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/soc/intel/apollolake/chip.c M src/soc/intel/cannonlake/chip.c M src/soc/intel/common/block/lpc/lpc.c M src/soc/intel/elkhartlake/chip.c M src/soc/intel/icelake/chip.c M src/soc/intel/jasperlake/chip.c M src/soc/intel/skylake/acpi.c M src/soc/intel/tigerlake/chip.c 8 files changed, 8 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 9f73727..96b0900 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -139,9 +139,6 @@ /* DSDT: acpi/northbridge.asl */ case SA_DEVFN_ROOT: return "MCHC"; - /* DSDT: acpi/lpc.asl */ - case PCH_DEVFN_LPC: - return "LPCB"; /* DSDT: acpi/xhci.asl */ case PCH_DEVFN_XHCI: return "XHCI"; diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index ef85215..1769846 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -127,7 +127,6 @@ case PCH_DEVFN_GSPI2: return "SPI2"; case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_SDCARD: return "SDXC"; - case PCH_DEVFN_LPC: return "LPCB"; case PCH_DEVFN_P2SB: return "P2SB"; case PCH_DEVFN_PMC: return "PMC_"; case PCH_DEVFN_HDA: return "HDAS"; diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index 212fd70..28c030f 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -95,6 +95,13 @@ pch_lpc_set_child_resources(dev); }
+#if CONFIG(HAVE_ACPI_TABLES) +static const char *lpc_acpi_name(const struct device *dev) +{ + return "LPCB"; +} +#endif + static struct device_operations device_ops = { .read_resources = pch_lpc_read_resources, .set_resources = pch_lpc_set_resources, @@ -102,6 +109,7 @@ #if CONFIG(HAVE_ACPI_TABLES) .write_acpi_tables = southbridge_write_acpi_tables, .acpi_inject_dsdt = southbridge_inject_dsdt, + .acpi_name = lpc_acpi_name, #endif .init = lpc_soc_init, .scan_bus = scan_static_bus, diff --git a/src/soc/intel/elkhartlake/chip.c b/src/soc/intel/elkhartlake/chip.c index e4884ef..cd65260 100644 --- a/src/soc/intel/elkhartlake/chip.c +++ b/src/soc/intel/elkhartlake/chip.c @@ -95,8 +95,6 @@ case PCH_DEVFN_GSPI3: return "SPI3"; case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_SDCARD: return "SDXC"; - /* Keeping ACPI device name coherent with ec.asl */ - case PCH_DEVFN_ESPI: return "LPCB"; case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_SMBUS: return "SBUS"; case PCH_DEVFN_GBE: return "GLAN"; diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c index a455bfc..d0ea732 100644 --- a/src/soc/intel/icelake/chip.c +++ b/src/soc/intel/icelake/chip.c @@ -75,8 +75,6 @@ case PCH_DEVFN_GSPI2: return "SPI2"; case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_SDCARD: return "SDXC"; - /* Keeping ACPI device name coherent with ec.asl */ - case PCH_DEVFN_ESPI: return "LPCB"; case PCH_DEVFN_P2SB: return "P2SB"; case PCH_DEVFN_PMC: return "PMC_"; case PCH_DEVFN_HDA: return "HDAS"; diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c index 36e0175..d34ef55 100644 --- a/src/soc/intel/jasperlake/chip.c +++ b/src/soc/intel/jasperlake/chip.c @@ -95,8 +95,6 @@ case PCH_DEVFN_GSPI3: return "SPI3"; case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_SDCARD: return "SDXC"; - /* Keeping ACPI device name coherent with ec.asl */ - case PCH_DEVFN_ESPI: return "LPCB"; case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_SMBUS: return "SBUS"; case PCH_DEVFN_GBE: return "GLAN"; diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index eb5b5b0..275e77d 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -688,7 +688,6 @@ case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_SDIO: return "SDIO"; case PCH_DEVFN_SDCARD: return "SDXC"; - case PCH_DEVFN_LPC: return "LPCB"; case PCH_DEVFN_P2SB: return "P2SB"; case PCH_DEVFN_PMC: return "PMC_"; case PCH_DEVFN_HDA: return "HDAS"; diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c index d3c3c62..98ed55c 100644 --- a/src/soc/intel/tigerlake/chip.c +++ b/src/soc/intel/tigerlake/chip.c @@ -104,8 +104,6 @@ case PCH_DEVFN_GSPI1: return "SPI1"; case PCH_DEVFN_GSPI2: return "SPI2"; case PCH_DEVFN_GSPI3: return "SPI3"; - /* Keeping ACPI device name coherent with ec.asl */ - case PCH_DEVFN_ESPI: return "LPCB"; case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_SMBUS: return "SBUS"; case PCH_DEVFN_GBE: return "GLAN";