From bb0cf0191110b5edf4e3c4e05983d9704af5537d Mon Sep 17 00:00:00 2001 From: Krzysztof Sywula Date: Wed, 15 Aug 2018 09:26:35 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/28111 Tested-by: build bot (Jenkins) Reviewed-by: Lijian Zhao Reviewed-by: Furquan Shaikh --- src/include/device/pci_ids.h | 3 ++- src/soc/intel/cannonlake/bootblock/report_platform.c | 3 ++- src/soc/intel/common/block/systemagent/systemagent.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index c9e4212767..4ced4a5b27 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 d7daa18a56..937e56cde0 100644 --- a/src/soc/intel/cannonlake/bootblock/report_platform.c +++ b/src/soc/intel/cannonlake/bootblock/report_platform.c @@ -47,7 +47,8 @@ static struct { { 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 7f5e5a916a..72cecb1ed6 100644 --- a/src/soc/intel/common/block/systemagent/systemagent.c +++ b/src/soc/intel/common/block/systemagent/systemagent.c @@ -294,7 +294,8 @@ static const unsigned short systemagent_ids[] = { 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, -- cgit v1.2.3