x86/cpu: Fix FAM5_QUARK_X1000 to use X86_MATCH_VFM()

This family 5 CPU escaped notice when cleaning up all the family 6
CPUs.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20241031185733.17327-1-tony.luck%40intel.com

diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 73676447204849cfdb687a858ddf5bd0f21eb6d3..6d7b04ffc5fd0e41a1b968fcfa81b3ebf78acdc3 100644 (file)
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -177,7 +177,6 @@
 #define INTEL_XEON_PHI_KNM             IFM(6, 0x85) /* Knights Mill */
 
 /* Family 5 */
-#define INTEL_FAM5_QUARK_X1000         0x09 /* Quark X1000 SoC */
 #define INTEL_QUARK_X1000              IFM(5, 0x09) /* Quark X1000 SoC */
 
 /* Family 19 */

diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index f0cc00032751d063955e10ee556b08ca4b3806a9..846bf49f2508da980f8f4a30e19e61e313a3c697 100644 (file)
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -656,8 +656,7 @@ static int qrk_capsule_setup_info(struct capsule_info *cap_info, void **pkbuff,
 }
 
 static const struct x86_cpu_id efi_capsule_quirk_ids[] = {
-       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000,
-                                  &qrk_capsule_setup_info),
+       X86_MATCH_VFM(INTEL_QUARK_X1000, &qrk_capsule_setup_info),
        { }
 };
 

diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c
index d3d456925b2a9388d245a940a4097a57360e59a6..ee25b032c0b3abcaf6a745999045af977c99240e 100644 (file)
--- a/arch/x86/platform/intel-quark/imr.c
+++ b/arch/x86/platform/intel-quark/imr.c
@@ -569,7 +569,7 @@ static void __init imr_fixup_memmap(struct imr_device *idev)
 }
 
 static const struct x86_cpu_id imr_ids[] __initconst = {
-       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),
+       X86_MATCH_VFM(INTEL_QUARK_X1000, NULL),
        {}
 };
 

diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
index 84ba715f44d128776b1dd535cd63445535ad2757..657925b0f428dcdbc30b7bca76f1f331d5bb47c7 100644 (file)
--- a/arch/x86/platform/intel-quark/imr_selftest.c
+++ b/arch/x86/platform/intel-quark/imr_selftest.c
@@ -105,7 +105,7 @@ static void __init imr_self_test(void)
 }
 
 static const struct x86_cpu_id imr_ids[] __initconst = {
-       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),
+       X86_MATCH_VFM(INTEL_QUARK_X1000, NULL),
        {}
 };
 

diff --git a/drivers/thermal/intel/intel_quark_dts_thermal.c b/drivers/thermal/intel/intel_quark_dts_thermal.c
index 47296a14db3c156f928726e6a382dfc9a9202faf..89498eb29a89da779da1414d25b9fd346a76f739 100644 (file)
--- a/drivers/thermal/intel/intel_quark_dts_thermal.c
+++ b/drivers/thermal/intel/intel_quark_dts_thermal.c
@@ -401,7 +401,7 @@ err_ret:
 }
 
 static const struct x86_cpu_id qrk_thermal_ids[] __initconst  = {
-       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),
+       X86_MATCH_VFM(INTEL_QUARK_X1000, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, qrk_thermal_ids);