summaryrefslogtreecommitdiff
path: root/src/cpu/intel/model_6bx
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2023-02-06 15:19:11 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-02-08 15:07:45 +0000
commit6a6ac1e0b929a47aedcff41420990cd700e22d13 (patch)
tree669b654a6876be7ae88045783bda9254b55e457e /src/cpu/intel/model_6bx
parent2fe5d3e5a5982169aeac86188949a301ab9ed0aa (diff)
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>
Diffstat (limited to 'src/cpu/intel/model_6bx')
-rw-r--r--src/cpu/intel/model_6bx/model_6bx_init.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c
index 0e54f934e6..485ac49224 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 @@ static struct device_operations cpu_dev_ops = {
* 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 = {