tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

intel_idle: Convert to new X86 CPU match macros

The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.

Get rid the of the local macro wrappers for consistency.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131510.193755545@linutronix.de

authored by

Thomas Gleixner and committed by
Borislav Petkov 4a9f45a0 20d320c6

+38 -41
+38 -41
drivers/idle/intel_idle.c
··· 1068 1068 }; 1069 1069 1070 1070 static const struct x86_cpu_id intel_idle_ids[] __initconst = { 1071 - INTEL_CPU_FAM6(NEHALEM_EP, idle_cpu_nhx), 1072 - INTEL_CPU_FAM6(NEHALEM, idle_cpu_nehalem), 1073 - INTEL_CPU_FAM6(NEHALEM_G, idle_cpu_nehalem), 1074 - INTEL_CPU_FAM6(WESTMERE, idle_cpu_nehalem), 1075 - INTEL_CPU_FAM6(WESTMERE_EP, idle_cpu_nhx), 1076 - INTEL_CPU_FAM6(NEHALEM_EX, idle_cpu_nhx), 1077 - INTEL_CPU_FAM6(ATOM_BONNELL, idle_cpu_atom), 1078 - INTEL_CPU_FAM6(ATOM_BONNELL_MID, idle_cpu_lincroft), 1079 - INTEL_CPU_FAM6(WESTMERE_EX, idle_cpu_nhx), 1080 - INTEL_CPU_FAM6(SANDYBRIDGE, idle_cpu_snb), 1081 - INTEL_CPU_FAM6(SANDYBRIDGE_X, idle_cpu_snx), 1082 - INTEL_CPU_FAM6(ATOM_SALTWELL, idle_cpu_atom), 1083 - INTEL_CPU_FAM6(ATOM_SILVERMONT, idle_cpu_byt), 1084 - INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, idle_cpu_tangier), 1085 - INTEL_CPU_FAM6(ATOM_AIRMONT, idle_cpu_cht), 1086 - INTEL_CPU_FAM6(IVYBRIDGE, idle_cpu_ivb), 1087 - INTEL_CPU_FAM6(IVYBRIDGE_X, idle_cpu_ivt), 1088 - INTEL_CPU_FAM6(HASWELL, idle_cpu_hsw), 1089 - INTEL_CPU_FAM6(HASWELL_X, idle_cpu_hsx), 1090 - INTEL_CPU_FAM6(HASWELL_L, idle_cpu_hsw), 1091 - INTEL_CPU_FAM6(HASWELL_G, idle_cpu_hsw), 1092 - INTEL_CPU_FAM6(ATOM_SILVERMONT_D, idle_cpu_avn), 1093 - INTEL_CPU_FAM6(BROADWELL, idle_cpu_bdw), 1094 - INTEL_CPU_FAM6(BROADWELL_G, idle_cpu_bdw), 1095 - INTEL_CPU_FAM6(BROADWELL_X, idle_cpu_bdx), 1096 - INTEL_CPU_FAM6(BROADWELL_D, idle_cpu_bdx), 1097 - INTEL_CPU_FAM6(SKYLAKE_L, idle_cpu_skl), 1098 - INTEL_CPU_FAM6(SKYLAKE, idle_cpu_skl), 1099 - INTEL_CPU_FAM6(KABYLAKE_L, idle_cpu_skl), 1100 - INTEL_CPU_FAM6(KABYLAKE, idle_cpu_skl), 1101 - INTEL_CPU_FAM6(SKYLAKE_X, idle_cpu_skx), 1102 - INTEL_CPU_FAM6(XEON_PHI_KNL, idle_cpu_knl), 1103 - INTEL_CPU_FAM6(XEON_PHI_KNM, idle_cpu_knl), 1104 - INTEL_CPU_FAM6(ATOM_GOLDMONT, idle_cpu_bxt), 1105 - INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, idle_cpu_bxt), 1106 - INTEL_CPU_FAM6(ATOM_GOLDMONT_D, idle_cpu_dnv), 1107 - INTEL_CPU_FAM6(ATOM_TREMONT_D, idle_cpu_dnv), 1071 + X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP, &idle_cpu_nhx), 1072 + X86_MATCH_INTEL_FAM6_MODEL(NEHALEM, &idle_cpu_nehalem), 1073 + X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_G, &idle_cpu_nehalem), 1074 + X86_MATCH_INTEL_FAM6_MODEL(WESTMERE, &idle_cpu_nehalem), 1075 + X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP, &idle_cpu_nhx), 1076 + X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX, &idle_cpu_nhx), 1077 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_BONNELL, &idle_cpu_atom), 1078 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_BONNELL_MID, &idle_cpu_lincroft), 1079 + X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX, &idle_cpu_nhx), 1080 + X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &idle_cpu_snb), 1081 + X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &idle_cpu_snx), 1082 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL, &idle_cpu_atom), 1083 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &idle_cpu_byt), 1084 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &idle_cpu_tangier), 1085 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &idle_cpu_cht), 1086 + X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &idle_cpu_ivb), 1087 + X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &idle_cpu_ivt), 1088 + X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &idle_cpu_hsw), 1089 + X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &idle_cpu_hsx), 1090 + X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &idle_cpu_hsw), 1091 + X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &idle_cpu_hsw), 1092 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_D, &idle_cpu_avn), 1093 + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &idle_cpu_bdw), 1094 + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &idle_cpu_bdw), 1095 + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &idle_cpu_bdx), 1096 + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &idle_cpu_bdx), 1097 + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &idle_cpu_skl), 1098 + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &idle_cpu_skl), 1099 + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &idle_cpu_skl), 1100 + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &idle_cpu_skl), 1101 + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &idle_cpu_skx), 1102 + X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &idle_cpu_knl), 1103 + X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &idle_cpu_knl), 1104 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &idle_cpu_bxt), 1105 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &idle_cpu_bxt), 1106 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &idle_cpu_dnv), 1107 + X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &idle_cpu_dnv), 1108 1108 {} 1109 1109 }; 1110 1110 1111 - #define INTEL_CPU_FAM6_MWAIT \ 1112 - { X86_VENDOR_INTEL, 6, X86_MODEL_ANY, X86_FEATURE_MWAIT, 0 } 1113 - 1114 1111 static const struct x86_cpu_id intel_mwait_ids[] __initconst = { 1115 - INTEL_CPU_FAM6_MWAIT, 1112 + X86_MATCH_VENDOR_FAM_FEATURE(INTEL, 6, X86_FEATURE_MWAIT, NULL), 1116 1113 {} 1117 1114 }; 1118 1115