Change in coreboot[master]: soc/intel/common/block: Add WHL 2-core SKU

[Krzysztof M Sywula (Code Review)]

Krzysztof M Sywula has uploaded this change for review. ( https://review.coreboot.org/28111

Change subject: soc/intel/common/block: Add WHL 2-core SKU
......................................................................

soc/intel/common/block: Add WHL 2-core SKU

There are two SKUs of Whiskey Lake W0, 2-core and 4-core.

Change-Id: Ia9b2707568702a5fbae3e9495ca53df34613a542
Signed-off-by: Krzysztof Sywula 
---
M src/include/device/pci_ids.h
M src/soc/intel/cannonlake/bootblock/report_platform.c
M src/soc/intel/common/block/systemagent/systemagent.c
3 files changed, 6 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/28111/1

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index c9e4212..4ced4a5 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2902,7 +2902,8 @@
 #define PCI_DEVICE_ID_INTEL_KBL_ID_DT	0x591f
 #define PCI_DEVICE_ID_INTEL_CNL_ID_U	0x5A04
 #define PCI_DEVICE_ID_INTEL_CNL_ID_Y	0x5A02
-#define PCI_DEVICE_ID_INTEL_WHL_ID_W	0x3E34
+#define PCI_DEVICE_ID_INTEL_WHL_ID_Wx4	0x3E34
+#define PCI_DEVICE_ID_INTEL_WHL_ID_Wx2	0x3E35
 #define PCI_DEVICE_ID_INTEL_CFL_ID_U	0x3ED0

/* Intel SMBUS device Ids */
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index d7daa18..937e56c 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -47,7 +47,8 @@
    { PCI_DEVICE_ID_INTEL_CNL_ID_U, "Cannonlake-U" },
    { PCI_DEVICE_ID_INTEL_CNL_ID_Y, "Cannonlake-Y" },
    { PCI_DEVICE_ID_INTEL_CFL_ID_U, "Coffeelake U (4+3e)"},
-	{ PCI_DEVICE_ID_INTEL_WHL_ID_W, "Whiskeylake"},
+	{ PCI_DEVICE_ID_INTEL_WHL_ID_Wx4, "Whiskeylake W (4+2)"},
+	{ PCI_DEVICE_ID_INTEL_WHL_ID_Wx2, "Whiskeylake W (2+2)"},
 };

static struct {
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index 7f5e5a9..72cecb1 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -294,7 +294,8 @@
    PCI_DEVICE_ID_INTEL_SKL_ID_Y,
    PCI_DEVICE_ID_INTEL_SKL_ID_ULX,
    PCI_DEVICE_ID_INTEL_SKL_ID_H,
-	PCI_DEVICE_ID_INTEL_WHL_ID_W,
+	PCI_DEVICE_ID_INTEL_WHL_ID_Wx2,
+	PCI_DEVICE_ID_INTEL_WHL_ID_Wx4,
    PCI_DEVICE_ID_INTEL_KBL_ID_S,
    PCI_DEVICE_ID_INTEL_SKL_ID_H_EM,
    PCI_DEVICE_ID_INTEL_KBL_ID_U,