x86/cpu: Remove 'x86_cpu_desc' infrastructure

All the users of 'x86_cpu_desc' are gone.  Zap it from the tree.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20241213185133.AF0BF2BC%40davehans-spike.ostc.intel.com

diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index 88564bb1845f9dffd242561e1514f9366d9d9a49..ba32e0f44cba70cbca5915058eaec329c898c2ab 100644 (file)
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -243,42 +243,7 @@
                VFM_MODEL(vfm),                         \
                X86_STEPPING_ANY, feature, data)
 
-/*
- * Match specific microcode revisions.
- *
- * vendor/family/model/stepping must be all set.
- *
- * Only checks against the boot CPU.  When mixed-stepping configs are
- * valid for a CPU model, add a quirk for every valid stepping and
- * do the fine-tuning in the quirk handler.
- */
-
-struct x86_cpu_desc {
-       u8      x86_family;
-       u8      x86_vendor;
-       u8      x86_model;
-       u8      x86_stepping;
-       u32     x86_microcode_rev;
-};
-
-#define INTEL_CPU_DESC(vfm, stepping, revision) {              \
-       .x86_family             = VFM_FAMILY(vfm),              \
-       .x86_vendor             = VFM_VENDOR(vfm),              \
-       .x86_model              = VFM_MODEL(vfm),               \
-       .x86_stepping           = (stepping),                   \
-       .x86_microcode_rev      = (revision),                   \
-}
-
-#define AMD_CPU_DESC(fam, model, stepping, revision) {         \
-       .x86_family             = (fam),                        \
-       .x86_vendor             = X86_VENDOR_AMD,               \
-       .x86_model              = (model),                      \
-       .x86_stepping           = (stepping),                   \
-       .x86_microcode_rev      = (revision),                   \
-}
-
 extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
-extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
 extern bool x86_match_min_microcode_rev(const struct x86_cpu_id *table);
 
 #endif /* _ASM_X86_CPU_DEVICE_ID */

diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c
index 2de2a83a7e128cd3bfb35c50b8552dc84a6a5420..1a714f70be8472d900db217c4be6a94c20ff60a1 100644 (file)
--- a/arch/x86/kernel/cpu/match.c
+++ b/arch/x86/kernel/cpu/match.c
@@ -56,37 +56,6 @@ const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match)
 }
 EXPORT_SYMBOL(x86_match_cpu);
 
-static const struct x86_cpu_desc *
-x86_match_cpu_with_stepping(const struct x86_cpu_desc *match)
-{
-       struct cpuinfo_x86 *c = &boot_cpu_data;
-       const struct x86_cpu_desc *m;
-
-       for (m = match; m->x86_family | m->x86_model; m++) {
-               if (c->x86_vendor != m->x86_vendor)
-                       continue;
-               if (c->x86 != m->x86_family)
-                       continue;
-               if (c->x86_model != m->x86_model)
-                       continue;
-               if (c->x86_stepping != m->x86_stepping)
-                       continue;
-               return m;
-       }
-       return NULL;
-}
-
-bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table)
-{
-       const struct x86_cpu_desc *res = x86_match_cpu_with_stepping(table);
-
-       if (!res || res->x86_microcode_rev > boot_cpu_data.microcode)
-               return false;
-
-       return true;
-}
-EXPORT_SYMBOL_GPL(x86_cpu_has_min_microcode_rev);
-
 bool x86_match_min_microcode_rev(const struct x86_cpu_id *table)
 {
        const struct x86_cpu_id *res = x86_match_cpu(table);