summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonak Kanabar <ronak.kanabar@intel.com>2019-01-29 19:52:53 +0530
committerSubrata Banik <subrata.banik@intel.com>2019-02-24 04:49:25 +0000
commit128bb2a7ca4cad75c1769f7dea0e4350b9180260 (patch)
tree51d56544b0089d67d6585756cf2ef1faaaa075eb
parentd8e55350f193449109906dfd1a261a4921ac95ab (diff)
soc/intel/common: Include cometlake CPU IDs
Add cometlake specific CPU IDs Change-Id: I75d5b82524c9df1402abf6659d62dbc716c28c30 Signed-off-by: Ronak Kanabar <ronak.kanabar@intel.com> Reviewed-on: https://review.coreboot.org/c/31143 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Subrata Banik <subrata.banik@intel.com> Reviewed-by: Wonkyu Kim <wonkyu.kim@intel.com>
-rw-r--r--src/soc/intel/cannonlake/bootblock/report_platform.c4
-rw-r--r--src/soc/intel/common/block/cpu/mp_init.c4
-rw-r--r--src/soc/intel/common/block/include/intelblocks/mp_init.h5
3 files changed, 13 insertions, 0 deletions
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index 0b87615c4c..a4328cb696 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -40,6 +40,10 @@ static struct {
{ CPUID_WHISKEYLAKE_V0, "Whiskeylake V0" },
{ CPUID_WHISKEYLAKE_W0, "Whiskeylake W0" },
{ CPUID_COFFEELAKE_U0, "Coffeelake U0 (6+2)" },
+ { CPUID_COMETLAKE_U_A0, "Cometlake-U A0 (6+2)" },
+ { CPUID_COMETLAKE_U_K0_S0, "Cometlake-U K0/S0 (6+2)/(4+2)" },
+ { CPUID_COMETLAKE_H_S_6_2_P0, "Cometlake-H/S P0 (6+2)" },
+ { CPUID_COMETLAKE_H_S_10_2_P0, "Cometlake-H/S P0 (10+2)" },
};
static struct {
diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index 7deaaa8096..4aecf8470d 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -76,6 +76,10 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, CPUID_COFFEELAKE_D0 },
{ X86_VENDOR_INTEL, CPUID_ICELAKE_A0 },
{ X86_VENDOR_INTEL, CPUID_ICELAKE_B0 },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_U_A0 },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_U_K0_S0 },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_6_2_P0 },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_10_2_P0 },
{ 0, 0 },
};
diff --git a/src/soc/intel/common/block/include/intelblocks/mp_init.h b/src/soc/intel/common/block/include/intelblocks/mp_init.h
index fca6ca59fd..3c7467da57 100644
--- a/src/soc/intel/common/block/include/intelblocks/mp_init.h
+++ b/src/soc/intel/common/block/include/intelblocks/mp_init.h
@@ -44,6 +44,11 @@
#define CPUID_ICELAKE_A0 0x706e0
#define CPUID_ICELAKE_B0 0x706e1
+#define CPUID_COMETLAKE_U_A0 0xa0660
+#define CPUID_COMETLAKE_U_K0_S0 0xa0661
+#define CPUID_COMETLAKE_H_S_6_2_P0 0xa0650
+#define CPUID_COMETLAKE_H_S_10_2_P0 0xa0651
+
/*
* MP Init callback function to Find CPU Topology. This function is common
* among all SOCs and thus its in Common CPU block.