arch/x86/cpu: introduce and use device_match_mask
Instead of always doing exact matches between the CPUID read in
identify_cpu and the device entries of the CPU device ID table,
offer the possibility to use a bit mask in the CPUID matching. This
allows covering all steppings of a CPU family/model with one entry and
avoids that case of a missing new stepping causing the CPUs not being
properly initialized.
Some of the CPU device ID tables can now be deduplicated using the
CPUID_ALL_STEPPINGS_MASK define, but that's outside of the scope of this
patch.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I0540b514ca42591c0d3468307a82b5612585f614
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72847
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
diff --git a/src/arch/x86/cpu.c b/src/arch/x86/cpu.c
index a51cadb..53c9a7b 100644
--- a/src/arch/x86/cpu.c
+++ b/src/arch/x86/cpu.c
@@ -188,6 +188,11 @@
}
}
+static bool cpuid_match(uint32_t a, uint32_t b, uint32_t mask)
+{
+ return (a & mask) == (b & mask);
+}
+
struct cpu_driver *find_cpu_driver(struct device *cpu)
{
struct cpu_driver *driver;
@@ -196,7 +201,7 @@
for (id = driver->id_table;
id->vendor != X86_VENDOR_INVALID; id++) {
if ((cpu->vendor == id->vendor) &&
- (cpu->device == id->device))
+ cpuid_match(cpu->device, id->device, id->device_match_mask))
return driver;
if (id->vendor == X86_VENDOR_ANY)
return driver;
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index 26315eb..e24c446 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -111,9 +111,13 @@
struct device;
+#define CPUID_EXACT_MATCH_MASK 0xffffffff
+#define CPUID_ALL_STEPPINGS_MASK 0xfffffff0
+
struct cpu_device_id {
unsigned int vendor;
uint32_t device;
+ uint32_t device_match_mask;
};
struct cpu_driver {
diff --git a/src/cpu/amd/pi/00730F01/model_16_init.c b/src/cpu/amd/pi/00730F01/model_16_init.c
index 5b43a07..3806407 100644
--- a/src/cpu/amd/pi/00730F01/model_16_init.c
+++ b/src/cpu/amd/pi/00730F01/model_16_init.c
@@ -58,9 +58,9 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_AMD, 0x730F00 },
- { X86_VENDOR_AMD, 0x730F01 },
- { 0, 0 },
+ { X86_VENDOR_AMD, 0x730F00, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_AMD, 0x730F01, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver model_16 __cpu_driver = {
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index 5a0b09d..a8193bf 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -640,18 +640,18 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, CPUID_HASWELL_A0 },
- { X86_VENDOR_INTEL, CPUID_HASWELL_B0 },
- { X86_VENDOR_INTEL, CPUID_HASWELL_C0 },
- { X86_VENDOR_INTEL, CPUID_HASWELL_ULT_B0 },
- { X86_VENDOR_INTEL, CPUID_HASWELL_ULT_C0 },
- { X86_VENDOR_INTEL, CPUID_CRYSTALWELL_B0 },
- { X86_VENDOR_INTEL, CPUID_CRYSTALWELL_C0 },
- { X86_VENDOR_INTEL, CPUID_BROADWELL_C0 },
- { X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_C0 },
- { X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_D0 },
- { X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_E0 },
- { 0, 0 },
+ { X86_VENDOR_INTEL, CPUID_HASWELL_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_HASWELL_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_HASWELL_C0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_HASWELL_ULT_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_HASWELL_ULT_C0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_CRYSTALWELL_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_CRYSTALWELL_C0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_BROADWELL_C0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_C0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_D0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_E0, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 825a246..226495b 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -265,10 +265,10 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x10676 },
- { X86_VENDOR_INTEL, 0x10677 },
- { X86_VENDOR_INTEL, 0x1067A },
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x10676, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x10677, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x1067A, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c
index 4cf16d8..ba89f3d 100644
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@@ -80,9 +80,9 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x106c0 }, /* Intel Atom 230 */
- { X86_VENDOR_INTEL, 0x106ca }, /* Intel Atom D5xx */
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x106c0, CPUID_EXACT_MATCH_MASK }, /* Intel Atom 230 */
+ { X86_VENDOR_INTEL, 0x106ca, CPUID_EXACT_MATCH_MASK }, /* Intel Atom D5xx */
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c
index 389989c..0556a15 100644
--- a/src/cpu/intel/model_2065x/model_2065x_init.c
+++ b/src/cpu/intel/model_2065x/model_2065x_init.c
@@ -175,12 +175,12 @@
/* Arrandale / Clarkdale CPU IDs */
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x20650 },
- { X86_VENDOR_INTEL, 0x20651 },
- { X86_VENDOR_INTEL, 0x20652 },
- { X86_VENDOR_INTEL, 0x20654 },
- { X86_VENDOR_INTEL, 0x20655 },
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x20650, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x20651, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x20652, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x20654, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x20655, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 6522e0fe..aecd61c 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -427,17 +427,17 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x206a0 }, /* Intel Sandybridge */
- { X86_VENDOR_INTEL, 0x206a6 }, /* Intel Sandybridge D1 */
- { X86_VENDOR_INTEL, 0x206a7 }, /* Intel Sandybridge D2/J1 */
- { X86_VENDOR_INTEL, 0x306a0 }, /* Intel IvyBridge */
- { X86_VENDOR_INTEL, 0x306a2 }, /* Intel IvyBridge */
- { X86_VENDOR_INTEL, 0x306a4 }, /* Intel IvyBridge */
- { X86_VENDOR_INTEL, 0x306a5 }, /* Intel IvyBridge */
- { X86_VENDOR_INTEL, 0x306a6 }, /* Intel IvyBridge */
- { X86_VENDOR_INTEL, 0x306a8 }, /* Intel IvyBridge */
- { X86_VENDOR_INTEL, 0x306a9 }, /* Intel IvyBridge */
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x206a0, CPUID_EXACT_MATCH_MASK }, /* Intel Sandybridge */
+ { X86_VENDOR_INTEL, 0x206a6, CPUID_EXACT_MATCH_MASK }, /* Intel Sandybridge D1 */
+ { X86_VENDOR_INTEL, 0x206a7, CPUID_EXACT_MATCH_MASK }, /* Intel Sandybridge D2/J1 */
+ { X86_VENDOR_INTEL, 0x306a0, CPUID_EXACT_MATCH_MASK }, /* Intel IvyBridge */
+ { X86_VENDOR_INTEL, 0x306a2, CPUID_EXACT_MATCH_MASK }, /* Intel IvyBridge */
+ { X86_VENDOR_INTEL, 0x306a4, CPUID_EXACT_MATCH_MASK }, /* Intel IvyBridge */
+ { X86_VENDOR_INTEL, 0x306a5, CPUID_EXACT_MATCH_MASK }, /* Intel IvyBridge */
+ { X86_VENDOR_INTEL, 0x306a6, CPUID_EXACT_MATCH_MASK }, /* Intel IvyBridge */
+ { X86_VENDOR_INTEL, 0x306a8, CPUID_EXACT_MATCH_MASK }, /* Intel IvyBridge */
+ { X86_VENDOR_INTEL, 0x306a9, CPUID_EXACT_MATCH_MASK }, /* Intel IvyBridge */
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_65x/model_65x_init.c b/src/cpu/intel/model_65x/model_65x_init.c
index 15246b6..bc1dc2d 100644
--- a/src/cpu/intel/model_65x/model_65x_init.c
+++ b/src/cpu/intel/model_65x/model_65x_init.c
@@ -35,11 +35,12 @@
* http://download.intel.com/support/processors/pentiumii/xeon/24377632.pdf
*/
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x0650 }, /* PII/Celeron, dA0/mdA0/A0 */
- { X86_VENDOR_INTEL, 0x0651 }, /* PII/Celeron, dA1/A1 */
- { X86_VENDOR_INTEL, 0x0652 }, /* PII/Celeron/Xeon, dB0/mdB0/B0 */
- { X86_VENDOR_INTEL, 0x0653 }, /* PII/Xeon, dB1/B1 */
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x0650, CPUID_EXACT_MATCH_MASK }, /* PII/Celeron, dA0/mdA0/A0 */
+ { X86_VENDOR_INTEL, 0x0651, CPUID_EXACT_MATCH_MASK }, /* PII/Celeron, dA1/A1 */
+ /* PII/Celeron/Xeon, dB0/mdB0/B0 */
+ { X86_VENDOR_INTEL, 0x0652, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x0653, CPUID_EXACT_MATCH_MASK }, /* PII/Xeon, dB1/B1 */
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_67x/model_67x_init.c b/src/cpu/intel/model_67x/model_67x_init.c
index d524705..0cc33f3 100644
--- a/src/cpu/intel/model_67x/model_67x_init.c
+++ b/src/cpu/intel/model_67x/model_67x_init.c
@@ -35,11 +35,11 @@
* http://download.intel.com/design/intarch/specupdt/24445358.pdf
*/
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x0671 },
- { X86_VENDOR_INTEL, 0x0672 }, /* PIII, kB0 */
- { X86_VENDOR_INTEL, 0x0673 }, /* PIII, kC0 */
+ { X86_VENDOR_INTEL, 0x0671, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x0672, CPUID_EXACT_MATCH_MASK }, /* PIII, kB0 */
+ { X86_VENDOR_INTEL, 0x0673, CPUID_EXACT_MATCH_MASK }, /* PIII, kC0 */
- { 0, 0 },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_68x/model_68x_init.c b/src/cpu/intel/model_68x/model_68x_init.c
index 0b5d454..aef66bd 100644
--- a/src/cpu/intel/model_68x/model_68x_init.c
+++ b/src/cpu/intel/model_68x/model_68x_init.c
@@ -45,13 +45,17 @@
* http://download.intel.com/design/intarch/specupdt/24530663.pdf
*/
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x0680 },
- { X86_VENDOR_INTEL, 0x0681 }, /* PIII, cA2/cA2c/A2/BA2/PA2/MA2 */
- { X86_VENDOR_INTEL, 0x0683 }, /* PIII/Celeron, cB0/cB0c/B0/BB0/PB0/MB0*/
- { X86_VENDOR_INTEL, 0x0686 }, /* PIII/Celeron, cC0/C0/BC0/PC0/MC0 */
- { X86_VENDOR_INTEL, 0x068a }, /* PIII/Celeron, cD0/D0/BD0/PD0 */
+ { X86_VENDOR_INTEL, 0x0680, CPUID_EXACT_MATCH_MASK },
+ /* PIII, cA2/cA2c/A2/BA2/PA2/MA2 */
+ { X86_VENDOR_INTEL, 0x0681, CPUID_EXACT_MATCH_MASK },
+ /* PIII/Celeron, cB0/cB0c/B0/BB0/PB0/MB0*/
+ { X86_VENDOR_INTEL, 0x0683, CPUID_EXACT_MATCH_MASK },
+ /* PIII/Celeron, cC0/C0/BC0/PC0/MC0 */
+ { X86_VENDOR_INTEL, 0x0686, CPUID_EXACT_MATCH_MASK },
+ /* PIII/Celeron, cD0/D0/BD0/PD0 */
+ { X86_VENDOR_INTEL, 0x068a, CPUID_EXACT_MATCH_MASK },
- { 0, 0 },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c
index 0e54f93..485ac49 100644
--- a/src/cpu/intel/model_6bx/model_6bx_init.c
+++ b/src/cpu/intel/model_6bx/model_6bx_init.c
@@ -39,9 +39,10 @@
* http://download.intel.com/design/intarch/specupdt/24445358.pdf
*/
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x06b1 }, /* Pentium III/Celeron, tA1/A1/FPA1 */
- { X86_VENDOR_INTEL, 0x06b4 }, /* Pentium III, tB1/FPB1 */
- { 0, 0 },
+ /* Pentium III/Celeron, tA1/A1/FPA1 */
+ { X86_VENDOR_INTEL, 0x06b1, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x06b4, CPUID_EXACT_MATCH_MASK }, /* Pentium III, tB1/FPB1 */
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index bfa4a3e..ebcf263 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -120,10 +120,10 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x06e0 }, /* Intel Core Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06e8 }, /* Intel Core Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06ec }, /* Intel Core Solo/Core Duo */
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x06e0, CPUID_EXACT_MATCH_MASK }, /* Intel Core Solo/Core Duo */
+ { X86_VENDOR_INTEL, 0x06e8, CPUID_EXACT_MATCH_MASK }, /* Intel Core Solo/Core Duo */
+ { X86_VENDOR_INTEL, 0x06ec, CPUID_EXACT_MATCH_MASK }, /* Intel Core Solo/Core Duo */
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
index ff64ab1..321c5d3 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -133,15 +133,16 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x06f0 }, /* Intel Core 2 Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06f2 }, /* Intel Core 2 Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06f6 }, /* Intel Core 2 Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06f7 }, /* Intel Core 2 Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06fa }, /* Intel Core 2 Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06fb }, /* Intel Core 2 Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06fd }, /* Intel Core 2 Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x10661 }, /* Intel Core 2 Celeron Conroe-L */
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x06f0, CPUID_EXACT_MATCH_MASK }, /* Intel Core 2 Solo/Core Duo */
+ { X86_VENDOR_INTEL, 0x06f2, CPUID_EXACT_MATCH_MASK }, /* Intel Core 2 Solo/Core Duo */
+ { X86_VENDOR_INTEL, 0x06f6, CPUID_EXACT_MATCH_MASK }, /* Intel Core 2 Solo/Core Duo */
+ { X86_VENDOR_INTEL, 0x06f7, CPUID_EXACT_MATCH_MASK }, /* Intel Core 2 Solo/Core Duo */
+ { X86_VENDOR_INTEL, 0x06fa, CPUID_EXACT_MATCH_MASK }, /* Intel Core 2 Solo/Core Duo */
+ { X86_VENDOR_INTEL, 0x06fb, CPUID_EXACT_MATCH_MASK }, /* Intel Core 2 Solo/Core Duo */
+ { X86_VENDOR_INTEL, 0x06fd, CPUID_EXACT_MATCH_MASK }, /* Intel Core 2 Solo/Core Duo */
+ /* Intel Core 2 Celeron Conroe-L */
+ { X86_VENDOR_INTEL, 0x10661, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_6xx/model_6xx_init.c b/src/cpu/intel/model_6xx/model_6xx_init.c
index f9afc6c..7cc7860 100644
--- a/src/cpu/intel/model_6xx/model_6xx_init.c
+++ b/src/cpu/intel/model_6xx/model_6xx_init.c
@@ -47,29 +47,33 @@
* http://download.intel.com/design/intarch/specupdt/24530663.pdf
*/
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x0611 }, /* Pentium Pro, B0 */
- { X86_VENDOR_INTEL, 0x0612 }, /* Pentium Pro, C0 */
- { X86_VENDOR_INTEL, 0x0616 }, /* Pentium Pro, sA0 */
- { X86_VENDOR_INTEL, 0x0617 }, /* Pentium Pro, sA1 */
- { X86_VENDOR_INTEL, 0x0619 }, /* Pentium Pro, sB1 */
+ { X86_VENDOR_INTEL, 0x0611, CPUID_EXACT_MATCH_MASK }, /* Pentium Pro, B0 */
+ { X86_VENDOR_INTEL, 0x0612, CPUID_EXACT_MATCH_MASK }, /* Pentium Pro, C0 */
+ { X86_VENDOR_INTEL, 0x0616, CPUID_EXACT_MATCH_MASK }, /* Pentium Pro, sA0 */
+ { X86_VENDOR_INTEL, 0x0617, CPUID_EXACT_MATCH_MASK }, /* Pentium Pro, sA1 */
+ { X86_VENDOR_INTEL, 0x0619, CPUID_EXACT_MATCH_MASK }, /* Pentium Pro, sB1 */
- { X86_VENDOR_INTEL, 0x0633 }, /* PII, C0 */
- { X86_VENDOR_INTEL, 0x0634 }, /* PII, C1 */
+ { X86_VENDOR_INTEL, 0x0633, CPUID_EXACT_MATCH_MASK }, /* PII, C0 */
+ { X86_VENDOR_INTEL, 0x0634, CPUID_EXACT_MATCH_MASK }, /* PII, C1 */
- { X86_VENDOR_INTEL, 0x0660 }, /* Celeron, A0 */
- { X86_VENDOR_INTEL, 0x0665 }, /* Celeron, B0 */
- { X86_VENDOR_INTEL, 0x066a }, /* PII, mdxA0/dmmA0 + others */
+ { X86_VENDOR_INTEL, 0x0660, CPUID_EXACT_MATCH_MASK }, /* Celeron, A0 */
+ { X86_VENDOR_INTEL, 0x0665, CPUID_EXACT_MATCH_MASK }, /* Celeron, B0 */
+ { X86_VENDOR_INTEL, 0x066a, CPUID_EXACT_MATCH_MASK }, /* PII, mdxA0/dmmA0 + others */
- { X86_VENDOR_INTEL, 0x0680 },
- { X86_VENDOR_INTEL, 0x0681 }, /* PIII, cA2/cA2c/A2/BA2/PA2/MA2 */
- { X86_VENDOR_INTEL, 0x0683 }, /* PIII/Celeron, cB0/cB0c/B0/BB0/PB0/MB0*/
- { X86_VENDOR_INTEL, 0x0686 }, /* PIII/Celeron, cC0/C0/BC0/PC0/MC0 */
- { X86_VENDOR_INTEL, 0x068a }, /* PIII/Celeron, cD0/D0/BD0/PD0 */
+ { X86_VENDOR_INTEL, 0x0680, CPUID_EXACT_MATCH_MASK },
+ /* PIII, cA2/cA2c/A2/BA2/PA2/MA2 */
+ { X86_VENDOR_INTEL, 0x0681, CPUID_EXACT_MATCH_MASK },
+ /* PIII/Celeron, cB0/cB0c/B0/BB0/PB0/MB0*/
+ { X86_VENDOR_INTEL, 0x0683, CPUID_EXACT_MATCH_MASK },
+ /* PIII/Celeron, cC0/C0/BC0/PC0/MC0 */
+ { X86_VENDOR_INTEL, 0x0686, CPUID_EXACT_MATCH_MASK },
+ /* PIII/Celeron, cD0/D0/BD0/PD0 */
+ { X86_VENDOR_INTEL, 0x068a, CPUID_EXACT_MATCH_MASK },
- { X86_VENDOR_INTEL, 0x06a0 }, /* PIII, A0 */
- { X86_VENDOR_INTEL, 0x06a1 }, /* PIII, A1 */
- { X86_VENDOR_INTEL, 0x06a4 }, /* PIII, B0 */
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x06a0, CPUID_EXACT_MATCH_MASK }, /* PIII, A0 */
+ { X86_VENDOR_INTEL, 0x06a1, CPUID_EXACT_MATCH_MASK }, /* PIII, A1 */
+ { X86_VENDOR_INTEL, 0x06a4, CPUID_EXACT_MATCH_MASK }, /* PIII, B0 */
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_f2x/model_f2x_init.c b/src/cpu/intel/model_f2x/model_f2x_init.c
index 2fc7360..5f27ea4 100644
--- a/src/cpu/intel/model_f2x/model_f2x_init.c
+++ b/src/cpu/intel/model_f2x/model_f2x_init.c
@@ -16,13 +16,13 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x0f22 },
- { X86_VENDOR_INTEL, 0x0f24 },
- { X86_VENDOR_INTEL, 0x0f25 },
- { X86_VENDOR_INTEL, 0x0f26 },
- { X86_VENDOR_INTEL, 0x0f27 },
- { X86_VENDOR_INTEL, 0x0f29 },
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x0f22, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x0f24, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x0f25, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x0f26, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x0f27, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x0f29, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_f3x/model_f3x_init.c b/src/cpu/intel/model_f3x/model_f3x_init.c
index bcbfdcf..1cf1ddb 100644
--- a/src/cpu/intel/model_f3x/model_f3x_init.c
+++ b/src/cpu/intel/model_f3x/model_f3x_init.c
@@ -18,8 +18,8 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x0f34 }, /* Xeon */
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x0f34, CPUID_EXACT_MATCH_MASK }, /* Xeon */
+ { 0, 0, 0 },
};
static const struct cpu_driver model_f3x __cpu_driver = {
diff --git a/src/cpu/intel/model_f4x/model_f4x_init.c b/src/cpu/intel/model_f4x/model_f4x_init.c
index b495dee..73bb710 100644
--- a/src/cpu/intel/model_f4x/model_f4x_init.c
+++ b/src/cpu/intel/model_f4x/model_f4x_init.c
@@ -15,14 +15,14 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x0f41 }, /* Xeon */
- { X86_VENDOR_INTEL, 0x0f43 }, /* Not tested */
- { X86_VENDOR_INTEL, 0x0f44 }, /* Not tested */
- { X86_VENDOR_INTEL, 0x0f47 },
- { X86_VENDOR_INTEL, 0x0f48 }, /* Not tested */
- { X86_VENDOR_INTEL, 0x0f49 }, /* Not tested */
- { X86_VENDOR_INTEL, 0x0f4a }, /* Not tested */
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x0f41, CPUID_EXACT_MATCH_MASK }, /* Xeon */
+ { X86_VENDOR_INTEL, 0x0f43, CPUID_EXACT_MATCH_MASK }, /* Not tested */
+ { X86_VENDOR_INTEL, 0x0f44, CPUID_EXACT_MATCH_MASK }, /* Not tested */
+ { X86_VENDOR_INTEL, 0x0f47, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x0f48, CPUID_EXACT_MATCH_MASK }, /* Not tested */
+ { X86_VENDOR_INTEL, 0x0f49, CPUID_EXACT_MATCH_MASK }, /* Not tested */
+ { X86_VENDOR_INTEL, 0x0f4a, CPUID_EXACT_MATCH_MASK }, /* Not tested */
+ { 0, 0, 0 },
};
static const struct cpu_driver model_f4x __cpu_driver = {
diff --git a/src/cpu/qemu-x86/qemu.c b/src/cpu/qemu-x86/qemu.c
index f0cdb58..c0a3afe 100644
--- a/src/cpu/qemu-x86/qemu.c
+++ b/src/cpu/qemu-x86/qemu.c
@@ -12,8 +12,8 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_ANY, 0 },
- { 0, 0 },
+ { X86_VENDOR_ANY, 0, 0 },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/soc/amd/cezanne/cpu.c b/src/soc/amd/cezanne/cpu.c
index 78ca9e5..ddd4afe 100644
--- a/src/soc/amd/cezanne/cpu.c
+++ b/src/soc/amd/cezanne/cpu.c
@@ -47,8 +47,8 @@
};
static struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_AMD, CEZANNE_A0_CPUID},
- { 0, 0 },
+ { X86_VENDOR_AMD, CEZANNE_A0_CPUID, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver zen_2_3 __cpu_driver = {
diff --git a/src/soc/amd/glinda/cpu.c b/src/soc/amd/glinda/cpu.c
index 372ec4a3..c5a0ec4 100644
--- a/src/soc/amd/glinda/cpu.c
+++ b/src/soc/amd/glinda/cpu.c
@@ -50,8 +50,8 @@
};
static struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_AMD, GLINDA_A0_CPUID}, /* TODO: Update for Glinda */
- { 0, 0 },
+ { X86_VENDOR_AMD, GLINDA_A0_CPUID, CPUID_EXACT_MATCH_MASK }, /* TODO: Update for Glinda */
+ { 0, 0, 0 },
};
static const struct cpu_driver zen_2_3 __cpu_driver = {
diff --git a/src/soc/amd/mendocino/cpu.c b/src/soc/amd/mendocino/cpu.c
index fe5b054..7561b24 100644
--- a/src/soc/amd/mendocino/cpu.c
+++ b/src/soc/amd/mendocino/cpu.c
@@ -48,8 +48,8 @@
};
static struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_AMD, MENDOCINO_A0_CPUID},
- { 0, 0 },
+ { X86_VENDOR_AMD, MENDOCINO_A0_CPUID, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver zen_2_3 __cpu_driver = {
diff --git a/src/soc/amd/phoenix/cpu.c b/src/soc/amd/phoenix/cpu.c
index 68e440b..cba22e9 100644
--- a/src/soc/amd/phoenix/cpu.c
+++ b/src/soc/amd/phoenix/cpu.c
@@ -51,8 +51,8 @@
static struct cpu_device_id cpu_table[] = {
/* TODO: Add Phoenix CPUID */
- { X86_VENDOR_AMD, PHOENIX2_A0_CPUID},
- { 0, 0 },
+ { X86_VENDOR_AMD, PHOENIX2_A0_CPUID, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver zen_2_3 __cpu_driver = {
diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c
index 47c71ab..0ec753d 100644
--- a/src/soc/amd/picasso/cpu.c
+++ b/src/soc/amd/picasso/cpu.c
@@ -48,12 +48,12 @@
};
static struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_AMD, RAVEN1_B0_CPUID},
- { X86_VENDOR_AMD, PICASSO_B0_CPUID },
- { X86_VENDOR_AMD, PICASSO_B1_CPUID },
- { X86_VENDOR_AMD, RAVEN2_A0_CPUID },
- { X86_VENDOR_AMD, RAVEN2_A1_CPUID },
- { 0, 0 },
+ { X86_VENDOR_AMD, RAVEN1_B0_CPUID, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_AMD, PICASSO_B0_CPUID, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_AMD, PICASSO_B1_CPUID, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_AMD, RAVEN2_A0_CPUID, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_AMD, RAVEN2_A1_CPUID, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver model_17 __cpu_driver = {
diff --git a/src/soc/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c
index 8e44ede..a40b54b 100644
--- a/src/soc/amd/stoneyridge/cpu.c
+++ b/src/soc/amd/stoneyridge/cpu.c
@@ -60,9 +60,9 @@
};
static struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_AMD, 0x660f01 },
- { X86_VENDOR_AMD, 0x670f00 },
- { 0, 0 },
+ { X86_VENDOR_AMD, 0x660f01, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_AMD, 0x670f00, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver model_15 __cpu_driver = {
diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c
index 7407415..c942b59 100644
--- a/src/soc/intel/apollolake/cpu.c
+++ b/src/soc/intel/apollolake/cpu.c
@@ -110,13 +110,13 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_A0 },
- { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_B0 },
- { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_E0 },
- { X86_VENDOR_INTEL, CPUID_GLK_A0 },
- { X86_VENDOR_INTEL, CPUID_GLK_B0 },
- { X86_VENDOR_INTEL, CPUID_GLK_R0 },
- { 0, 0 },
+ { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_E0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_GLK_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_GLK_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_GLK_R0, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/soc/intel/baytrail/cpu.c b/src/soc/intel/baytrail/cpu.c
index 1dbc3d7..db0c4ee 100644
--- a/src/soc/intel/baytrail/cpu.c
+++ b/src/soc/intel/baytrail/cpu.c
@@ -59,10 +59,10 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x30673 },
- { X86_VENDOR_INTEL, 0x30678 },
- { X86_VENDOR_INTEL, 0x30679 },
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x30673, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x30678, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x30679, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/soc/intel/braswell/cpu.c b/src/soc/intel/braswell/cpu.c
index b11007d..e45804f 100644
--- a/src/soc/intel/braswell/cpu.c
+++ b/src/soc/intel/braswell/cpu.c
@@ -59,10 +59,10 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x406c4 },
- { X86_VENDOR_INTEL, 0x406c3 },
- { X86_VENDOR_INTEL, 0x406c2 },
- { 0, 0 },
+ { X86_VENDOR_INTEL, 0x406c4, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x406c3, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, 0x406c2, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index 4636b3b..6d51f99 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -32,56 +32,56 @@
};
static const struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, CPUID_METEORLAKE_A0_1},
- { X86_VENDOR_INTEL, CPUID_METEORLAKE_A0_2},
- { X86_VENDOR_INTEL, CPUID_SKYLAKE_C0 },
- { X86_VENDOR_INTEL, CPUID_SKYLAKE_D0 },
- { X86_VENDOR_INTEL, CPUID_SKYLAKE_HQ0 },
- { X86_VENDOR_INTEL, CPUID_SKYLAKE_HR0 },
- { X86_VENDOR_INTEL, CPUID_KABYLAKE_G0 },
- { X86_VENDOR_INTEL, CPUID_KABYLAKE_H0 },
- { 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_CANNONLAKE_D0 },
- { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_A0 },
- { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_B0 },
- { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_E0 },
- { X86_VENDOR_INTEL, CPUID_GLK_A0 },
- { X86_VENDOR_INTEL, CPUID_GLK_B0 },
- { X86_VENDOR_INTEL, CPUID_GLK_R0 },
- { X86_VENDOR_INTEL, CPUID_WHISKEYLAKE_V0 },
- { X86_VENDOR_INTEL, CPUID_WHISKEYLAKE_W0 },
- { X86_VENDOR_INTEL, CPUID_COFFEELAKE_U0 },
- { X86_VENDOR_INTEL, CPUID_COFFEELAKE_B0 },
- { X86_VENDOR_INTEL, CPUID_COFFEELAKE_P0 },
- { X86_VENDOR_INTEL, CPUID_COFFEELAKE_R0 },
- { X86_VENDOR_INTEL, CPUID_COMETLAKE_U_A0 },
- { X86_VENDOR_INTEL, CPUID_COMETLAKE_U_K0_S0 },
- { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_6_2_G0 },
- { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_6_2_G1 },
- { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_10_2_P0 },
- { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_10_2_P1 },
- { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_10_2_Q0 },
- { X86_VENDOR_INTEL, CPUID_TIGERLAKE_A0 },
- { X86_VENDOR_INTEL, CPUID_TIGERLAKE_B0 },
- { X86_VENDOR_INTEL, CPUID_TIGERLAKE_R0 },
- { X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_A0 },
- { X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_B0 },
- { X86_VENDOR_INTEL, CPUID_JASPERLAKE_A0 },
- { X86_VENDOR_INTEL, CPUID_ALDERLAKE_S_A0 },
- { X86_VENDOR_INTEL, CPUID_ALDERLAKE_J0 },
- { X86_VENDOR_INTEL, CPUID_ALDERLAKE_K0 },
- { X86_VENDOR_INTEL, CPUID_ALDERLAKE_L0 },
- { X86_VENDOR_INTEL, CPUID_ALDERLAKE_Q0 },
- { X86_VENDOR_INTEL, CPUID_ALDERLAKE_R0 },
- { X86_VENDOR_INTEL, CPUID_ALDERLAKE_N_A0 },
- { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_P_J0 },
- { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_P_Q0 },
- { 0, 0 },
+ { X86_VENDOR_INTEL, CPUID_METEORLAKE_A0_1, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_METEORLAKE_A0_2, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_SKYLAKE_C0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_SKYLAKE_D0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_SKYLAKE_HQ0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_SKYLAKE_HR0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_KABYLAKE_G0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_KABYLAKE_H0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_KABYLAKE_Y0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_KABYLAKE_HA0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_KABYLAKE_HB0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_CANNONLAKE_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_CANNONLAKE_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_CANNONLAKE_C0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_CANNONLAKE_D0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_APOLLOLAKE_E0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_GLK_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_GLK_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_GLK_R0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_WHISKEYLAKE_V0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_WHISKEYLAKE_W0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COFFEELAKE_U0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COFFEELAKE_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COFFEELAKE_P0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COFFEELAKE_R0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_U_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_U_K0_S0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_6_2_G0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_6_2_G1, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_10_2_P0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_10_2_P1, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_10_2_Q0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_TIGERLAKE_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_TIGERLAKE_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_TIGERLAKE_R0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_B0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_JASPERLAKE_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ALDERLAKE_S_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ALDERLAKE_J0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ALDERLAKE_K0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ALDERLAKE_L0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ALDERLAKE_Q0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ALDERLAKE_R0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_ALDERLAKE_N_A0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_P_J0, CPUID_EXACT_MATCH_MASK },
+ { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_P_Q0, CPUID_EXACT_MATCH_MASK },
+ { 0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/soc/intel/denverton_ns/cpu.c b/src/soc/intel/denverton_ns/cpu.c
index 8b5fb40..210aefe 100644
--- a/src/soc/intel/denverton_ns/cpu.c
+++ b/src/soc/intel/denverton_ns/cpu.c
@@ -122,10 +122,11 @@
};
static const struct cpu_device_id cpu_table[] = {
- {X86_VENDOR_INTEL,
- CPUID_DENVERTON_A0_A1}, /* Denverton-NS A0/A1 CPUID */
- {X86_VENDOR_INTEL, CPUID_DENVERTON_B0}, /* Denverton-NS B0 CPUID */
- {0, 0},
+ /* Denverton-NS A0/A1 CPUID */
+ {X86_VENDOR_INTEL, CPUID_DENVERTON_A0_A1, CPUID_EXACT_MATCH_MASK },
+ /* Denverton-NS B0 CPUID */
+ {X86_VENDOR_INTEL, CPUID_DENVERTON_B0, CPUID_EXACT_MATCH_MASK },
+ {0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/soc/intel/xeon_sp/cpx/cpu.c b/src/soc/intel/xeon_sp/cpx/cpu.c
index 8a7dd2a..bf26f7c 100644
--- a/src/soc/intel/xeon_sp/cpx/cpu.c
+++ b/src/soc/intel/xeon_sp/cpx/cpu.c
@@ -127,9 +127,9 @@
};
static const struct cpu_device_id cpu_table[] = {
- {X86_VENDOR_INTEL, CPUID_COOPERLAKE_SP_A0},
- {X86_VENDOR_INTEL, CPUID_COOPERLAKE_SP_A1},
- {0, 0},
+ {X86_VENDOR_INTEL, CPUID_COOPERLAKE_SP_A0, CPUID_EXACT_MATCH_MASK },
+ {X86_VENDOR_INTEL, CPUID_COOPERLAKE_SP_A1, CPUID_EXACT_MATCH_MASK },
+ {0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/soc/intel/xeon_sp/skx/cpu.c b/src/soc/intel/xeon_sp/skx/cpu.c
index 24984e1..2656b9a 100644
--- a/src/soc/intel/xeon_sp/skx/cpu.c
+++ b/src/soc/intel/xeon_sp/skx/cpu.c
@@ -148,12 +148,12 @@
static const struct cpu_device_id cpu_table[] = {
/* Skylake-SP A0/A1 CPUID 0x506f0*/
- {X86_VENDOR_INTEL, CPUID_SKYLAKE_SP_A0_A1},
+ {X86_VENDOR_INTEL, CPUID_SKYLAKE_SP_A0_A1, CPUID_EXACT_MATCH_MASK },
/* Skylake-SP B0 CPUID 0x506f1*/
- {X86_VENDOR_INTEL, CPUID_SKYLAKE_SP_B0},
+ {X86_VENDOR_INTEL, CPUID_SKYLAKE_SP_B0, CPUID_EXACT_MATCH_MASK },
/* Skylake-SP 4 CPUID 0x50654*/
- {X86_VENDOR_INTEL, CPUID_SKYLAKE_SP_4},
- {0, 0},
+ {X86_VENDOR_INTEL, CPUID_SKYLAKE_SP_4, CPUID_EXACT_MATCH_MASK },
+ {0, 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {