Change in ...coreboot[master]: src/soc/intel/skylake/bootblock: Add KBL C236 to PCH Table

[Christian Walter (Code Review)]

Christian Walter has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33248

Change subject: src/soc/intel/skylake/bootblock: Add KBL C236 to PCH Table
......................................................................

src/soc/intel/skylake/bootblock: Add KBL C236 to PCH Table

Add Kabylake C236 to the PCH Table.

Change-Id: I435927f15e9d3219886375426b09c68632dfe3d9
Signed-off-by: Christian Walter 
---
M src/soc/intel/skylake/bootblock/report_platform.c
1 file changed, 1 insertion(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/33248/1

diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c
index 1e81809..11355b5 100644
--- a/src/soc/intel/skylake/bootblock/report_platform.c
+++ b/src/soc/intel/skylake/bootblock/report_platform.c
@@ -90,6 +90,7 @@
    { PCI_DEVICE_ID_INTEL_KBP_LP_U_PREMIUM, "Kabylake-U Premium" },
    { PCI_DEVICE_ID_INTEL_KBP_LP_Y_PREMIUM, "Kabylake-Y Premium" },
    { PCI_DEVICE_ID_INTEL_KBP_LP_SUPER_SKU, "Kabylake Super Sku" },
+	{ PCI_DEVICE_ID_INTEL_KBP_H_C236, "Kabylake PCH-H C236" },
    { PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22,
    		"Kabylake-Y iHDCP 2.2 Premium" },
    { PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22,

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33248 )

Change subject: src/soc/intel/skylake/bootblock: Add KBL C236 to PCH Table
......................................................................

Patch Set 3: Code-Review+2

[Felix Held (Code Review)]

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33248 )

Change subject: src/soc/intel/skylake/bootblock: Add KBL C236 to PCH Table
......................................................................

Patch Set 7:

huh, why is there a skylake and a kabylake C236 PCH? shouldn't that be the same PCH, since both are called C236?

Change in ...coreboot[master]: src/soc/intel/skylake/bootblock: Add SPT C236 to PCH Table

[Christian Walter (Code Review)]

Hello Philipp Deppenwiese, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/33248

to look at the new patch set (#8).

Change subject: src/soc/intel/skylake/bootblock: Add SPT C236 to PCH Table
......................................................................

src/soc/intel/skylake/bootblock: Add SPT C236 to PCH Table

Add Skylake C236 to the PCH Table. The one which was already in there is
actually the CM236 and not the C236. This can be checked in datasheet:
100-series-chipset-datasheet-vol-1 p. 25.

Change-Id: I435927f15e9d3219886375426b09c68632dfe3d9
Signed-off-by: Christian Walter 
---
M src/include/device/pci_ids.h
M src/soc/intel/common/block/lpc/lpc.c
M src/soc/intel/skylake/bootblock/report_platform.c
3 files changed, 4 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/33248/8

Change in ...coreboot[master]: src/soc/intel/skylake/bootblock: Add SPT C236 to PCH Table

[Felix Held (Code Review)]

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33248 )

Change subject: src/soc/intel/skylake/bootblock: Add SPT C236 to PCH Table
......................................................................

Patch Set 8: Code-Review+2

Change in ...coreboot[master]: src/soc/intel/skylake/bootblock: Add SPT C236 to PCH Table

[Felix Held (Code Review)]

Felix Held has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33248 )

Change subject: src/soc/intel/skylake/bootblock: Add SPT C236 to PCH Table
......................................................................

src/soc/intel/skylake/bootblock: Add SPT C236 to PCH Table

Add Skylake C236 to the PCH Table. The one which was already in there is
actually the CM236 and not the C236. This can be checked in datasheet:
100-series-chipset-datasheet-vol-1 p. 25.

Change-Id: I435927f15e9d3219886375426b09c68632dfe3d9
Signed-off-by: Christian Walter 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33248
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Held 
---
M src/include/device/pci_ids.h
M src/soc/intel/common/block/lpc/lpc.c
M src/soc/intel/skylake/bootblock/report_platform.c
3 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index fd90396..dae5c9a 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2696,8 +2696,8 @@
 #define PCI_DEVICE_ID_INTEL_SPT_H_Q170			0xa146
 #define PCI_DEVICE_ID_INTEL_SPT_H_Q150			0xa147
 #define PCI_DEVICE_ID_INTEL_SPT_H_B150			0xa148
-#define PCI_DEVICE_ID_INTEL_KBP_H_C236			0xa149
-#define PCI_DEVICE_ID_INTEL_SPT_H_C236			0xa150
+#define PCI_DEVICE_ID_INTEL_SPT_H_C236			0xa149
+#define PCI_DEVICE_ID_INTEL_SPT_H_CM236			0xa150
 #define PCI_DEVICE_ID_INTEL_SPT_H_PREMIUM		0xa14e
 #define PCI_DEVICE_ID_INTEL_SPT_H_H110			0xa143
 #define PCI_DEVICE_ID_INTEL_SPT_H_QM170			0xa14d
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index 86547a4..84471d2 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -124,8 +124,8 @@
    PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE,
    PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM,
    PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM,
+	PCI_DEVICE_ID_INTEL_SPT_H_CM236,
    PCI_DEVICE_ID_INTEL_SPT_H_C236,
-	PCI_DEVICE_ID_INTEL_KBP_H_C236,
    PCI_DEVICE_ID_INTEL_SPT_H_PREMIUM,
    PCI_DEVICE_ID_INTEL_SPT_H_H110,
    PCI_DEVICE_ID_INTEL_SPT_H_H170,
diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c
index e201a0a..6733f91 100644
--- a/src/soc/intel/skylake/bootblock/report_platform.c
+++ b/src/soc/intel/skylake/bootblock/report_platform.c
@@ -80,6 +80,7 @@
    { PCI_DEVICE_ID_INTEL_SPT_H_Q170, "Skylake PCH-H Q170" },
    { PCI_DEVICE_ID_INTEL_SPT_H_Q150, "Skylake PCH-H Q150" },
    { PCI_DEVICE_ID_INTEL_SPT_H_B150, "Skylake PCH-H B150" },
+	{ PCI_DEVICE_ID_INTEL_SPT_H_CM236, "Skylake PCH-H CM236" },
    { PCI_DEVICE_ID_INTEL_SPT_H_C236, "Skylake PCH-H C236" },
    { PCI_DEVICE_ID_INTEL_SPT_H_QM170, "Skylake PCH-H QM170" },
    { PCI_DEVICE_ID_INTEL_SPT_H_HM175, "Skylake PCH-H HM175" },