diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2023-02-06 15:19:11 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-02-08 15:07:45 +0000 |
| commit | 6a6ac1e0b929a47aedcff41420990cd700e22d13 (patch) | |
| tree | 669b654a6876be7ae88045783bda9254b55e457e /src/cpu/intel/model_6xx | |
| parent | 2fe5d3e5a5982169aeac86188949a301ab9ed0aa (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_6xx')
| -rw-r--r-- | src/cpu/intel/model_6xx/model_6xx_init.c | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/cpu/intel/model_6xx/model_6xx_init.c b/src/cpu/intel/model_6xx/model_6xx_init.c index f9afc6cbad..7cc7860d5d 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 @@ static struct device_operations cpu_dev_ops = { * 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 = { |