Merge tag 'x86_cpu_for_v6.14_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 cpuid updates from Borislav Petkov:

 - Remove the less generic CPU matching infra around struct x86_cpu_desc
   and use the generic struct x86_cpu_id thing

 - Remove magic naked numbers for CPUID functions and use proper defines
   of the prefix CPUID_LEAF_*. Consolidate some of the crazy use around
   the tree

 - Smaller cleanups and improvements

* tag 'x86_cpu_for_v6.14_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Make all all CPUID leaf names consistent
  x86/fpu: Remove unnecessary CPUID level check
  x86/fpu: Move CPUID leaf definitions to common code
  x86/tsc: Remove CPUID "frequency" leaf magic numbers.
  x86/tsc: Move away from TSC leaf magic numbers
  x86/cpu: Move TSC CPUID leaf definition
  x86/cpu: Refresh DCA leaf reading code
  x86/cpu: Remove unnecessary MwAIT leaf checks
  x86/cpu: Use MWAIT leaf definition
  x86/cpu: Move MWAIT leaf definition to common header
  x86/cpu: Remove 'x86_cpu_desc' infrastructure
  x86/cpu: Move AMD erratum 1386 table over to 'x86_cpu_id'
  x86/cpu: Replace PEBS use of 'x86_cpu_desc' use with 'x86_cpu_id'
  x86/cpu: Expose only stepping min/max interface
  x86/cpu: Introduce new microcode matching helper
  x86/cpufeature: Document cpu_feature_enabled() as the default to use
  x86/paravirt: Remove the WBINVD callback
  x86/cpufeatures: Free up unused feature bits

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/include/asm/special_insns.h
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
Simple merge

diff --cc arch/x86/kernel/cpu/resctrl/pseudo_lock.c
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc arch/x86/xen/enlighten_pv.c
Simple merge

diff --cc drivers/edac/i10nm_base.c
index 70dff342c1b978d4de9c47a1e235ad16dc09ebea,09bf5a3f06bfc383d4aa2f188c8771af0c739f0e..f45d849d3f150928f49cd593ed07cb99df247612
--- 1/drivers/edac/i10nm_base.c
--- 2/drivers/edac/i10nm_base.c
+++ b/drivers/edac/i10nm_base.c
@@@ -938,17 -938,17 +938,18 @@@ static struct res_config gnr_cfg = 
  };
  
  static const struct x86_cpu_id i10nm_cpuids[] = {
-       X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_TREMONT_D,   X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0),
-       X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_TREMONT_D,   X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1),
-       X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_X,        X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0),
-       X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_X,        X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1),
-       X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_D,        X86_STEPPINGS(0x0, 0xf), &i10nm_cfg1),
-       X86_MATCH_VFM_STEPPINGS(INTEL_SAPPHIRERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg),
-       X86_MATCH_VFM_STEPPINGS(INTEL_EMERALDRAPIDS_X,  X86_STEPPINGS(0x0, 0xf), &spr_cfg),
-       X86_MATCH_VFM_STEPPINGS(INTEL_GRANITERAPIDS_X,  X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
-       X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_CRESTMONT_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
-       X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_CRESTMONT,   X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
-       X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_DARKMONT_X,  X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
+       X86_MATCH_VFM_STEPS(INTEL_ATOM_TREMONT_D, X86_STEP_MIN,          0x3, &i10nm_cfg0),
+       X86_MATCH_VFM_STEPS(INTEL_ATOM_TREMONT_D,          0x4, X86_STEP_MAX, &i10nm_cfg1),
+       X86_MATCH_VFM_STEPS(INTEL_ICELAKE_X,      X86_STEP_MIN,          0x3, &i10nm_cfg0),
+       X86_MATCH_VFM_STEPS(INTEL_ICELAKE_X,               0x4, X86_STEP_MAX, &i10nm_cfg1),
+       X86_MATCH_VFM(      INTEL_ICELAKE_D,                                  &i10nm_cfg1),
+ 
+       X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &spr_cfg),
+       X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,  &spr_cfg),
+       X86_MATCH_VFM(INTEL_GRANITERAPIDS_X,  &gnr_cfg),
+       X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, &gnr_cfg),
+       X86_MATCH_VFM(INTEL_ATOM_CRESTMONT,   &gnr_cfg),
++      X86_MATCH_VFM(INTEL_ATOM_DARKMONT_X,  &gnr_cfg),
        {}
  };
  MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids);

diff --cc drivers/edac/skx_base.c
Simple merge