From cc22b73c21df69b3f9be90270f3d229bb382b943 Mon Sep 17 00:00:00 2001 From: Barnali Sarkar Date: Mon, 7 Aug 2017 18:44:02 +0530 Subject: [PATCH] soc/intel/common/block: Add CNL, APL and GLK CPU device IDs Add Cannon lake, Apollo Lake and GLK CPU device IDs in common Mp Init code. BUG=none BRANCH=none TEST=Build and boot reef Change-Id: I22694ced0cf900a55a28d1ecaa177cab2ea9a90c Signed-off-by: Barnali Sarkar Reviewed-on: https://review.coreboot.org/20896 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/soc/intel/common/block/cpu/mp_init.c | 7 +++++++ src/soc/intel/common/block/include/intelblocks/mp_init.h | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c index e147bb01f3..fd8b5db89e 100644 --- a/src/soc/intel/common/block/cpu/mp_init.c +++ b/src/soc/intel/common/block/cpu/mp_init.c @@ -61,6 +61,13 @@ static struct cpu_device_id cpu_table[] = { { X86_VENDOR_INTEL, CPUID_KABYLAKE_Y0 }, { X86_VENDOR_INTEL, CPUID_KABYLAKE_HA0 }, { X86_VENDOR_INTEL, CPUID_KABYLAKE_HB0 }, + { X86_VENDOR_INTEL, CPUID_CANNONLAKE_A0 }, + { X86_VENDOR_INTEL, CPUID_CANNONLAKE_B0 }, + { X86_VENDOR_INTEL, CPUID_CANNONLAKE_C0 }, + { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_A0 }, + { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_B0 }, + { X86_VENDOR_INTEL, CPUID_GLK_A0 }, + { X86_VENDOR_INTEL, CPUID_GLK_B0 }, { 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 3a021c6f84..1e5531cfd5 100644 --- a/src/soc/intel/common/block/include/intelblocks/mp_init.h +++ b/src/soc/intel/common/block/include/intelblocks/mp_init.h @@ -28,8 +28,13 @@ #define CPUID_KABYLAKE_Y0 0x806ea #define CPUID_KABYLAKE_HA0 0x506e8 #define CPUID_KABYLAKE_HB0 0x906e9 +#define CPUID_CANNONLAKE_A0 0x60660 +#define CPUID_CANNONLAKE_B0 0x60661 +#define CPUID_CANNONLAKE_C0 0x60662 #define CPUID_APOLLOLAKE_A0 0x506c8 #define CPUID_APOLLOLAKE_B0 0x506c9 +#define CPUID_GLK_A0 0x706a0 +#define CPUID_GLK_B0 0x706a1 /* * MP Init callback function to Find CPU Topology. This function is common