Change in ...coreboot[master]: soc/intel/common: Include cometlake CPU IDs

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31143 )

Change subject: soc/intel/common: Include cometlake CPU IDs
......................................................................

soc/intel/common: Include cometlake CPU IDs

Add cometlake specific CPU IDs

Change-Id: I75d5b82524c9df1402abf6659d62dbc716c28c30
Signed-off-by: Ronak Kanabar 
Reviewed-on: https://review.coreboot.org/c/31143
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Subrata Banik 
Reviewed-by: Wonkyu Kim 
---
M src/soc/intel/cannonlake/bootblock/report_platform.c
M src/soc/intel/common/block/cpu/mp_init.c
M src/soc/intel/common/block/include/intelblocks/mp_init.h
3 files changed, 13 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Subrata Banik: Looks good to me, approved
  Wonkyu Kim: Looks good to me, but someone else must approve

diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index 0b87615..a4328cb 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -40,6 +40,10 @@
    { 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 7deaaa8..4aecf84 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 @@
    { 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 fca6ca5..3c7467d 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.