Skip to content

Commit db40452

Browse files
rafaeljwrafaeljw
committed
Merge back new cpufreq material for v6.11.
2 parents 350cbb5 + 7e1c3f5 commit db40452

File tree

2 files changed

+51
-50
lines changed

2 files changed

+51
-50
lines changed

‎drivers/cpufreq/intel_pstate.c

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,54 +2368,54 @@ static const struct pstate_funcs knl_funcs = {
23682368
.get_val = core_get_val,
23692369
};
23702370

2371-
#define X86_MATCH(model, policy) \
2372-
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
2373-
X86_FEATURE_APERFMPERF, &policy)
2371+
#define X86_MATCH(vfm, policy) \
2372+
X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_APERFMPERF, &policy)
23742373

23752374
static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
2376-
X86_MATCH(SANDYBRIDGE, core_funcs),
2377-
X86_MATCH(SANDYBRIDGE_X, core_funcs),
2378-
X86_MATCH(ATOM_SILVERMONT, silvermont_funcs),
2379-
X86_MATCH(IVYBRIDGE, core_funcs),
2380-
X86_MATCH(HASWELL, core_funcs),
2381-
X86_MATCH(BROADWELL, core_funcs),
2382-
X86_MATCH(IVYBRIDGE_X, core_funcs),
2383-
X86_MATCH(HASWELL_X, core_funcs),
2384-
X86_MATCH(HASWELL_L, core_funcs),
2385-
X86_MATCH(HASWELL_G, core_funcs),
2386-
X86_MATCH(BROADWELL_G, core_funcs),
2387-
X86_MATCH(ATOM_AIRMONT, airmont_funcs),
2388-
X86_MATCH(SKYLAKE_L, core_funcs),
2389-
X86_MATCH(BROADWELL_X, core_funcs),
2390-
X86_MATCH(SKYLAKE, core_funcs),
2391-
X86_MATCH(BROADWELL_D, core_funcs),
2392-
X86_MATCH(XEON_PHI_KNL, knl_funcs),
2393-
X86_MATCH(XEON_PHI_KNM, knl_funcs),
2394-
X86_MATCH(ATOM_GOLDMONT, core_funcs),
2395-
X86_MATCH(ATOM_GOLDMONT_PLUS, core_funcs),
2396-
X86_MATCH(SKYLAKE_X, core_funcs),
2397-
X86_MATCH(COMETLAKE, core_funcs),
2398-
X86_MATCH(ICELAKE_X, core_funcs),
2399-
X86_MATCH(TIGERLAKE, core_funcs),
2400-
X86_MATCH(SAPPHIRERAPIDS_X, core_funcs),
2401-
X86_MATCH(EMERALDRAPIDS_X, core_funcs),
2375+
X86_MATCH(INTEL_SANDYBRIDGE, core_funcs),
2376+
X86_MATCH(INTEL_SANDYBRIDGE_X, core_funcs),
2377+
X86_MATCH(INTEL_ATOM_SILVERMONT, silvermont_funcs),
2378+
X86_MATCH(INTEL_IVYBRIDGE, core_funcs),
2379+
X86_MATCH(INTEL_HASWELL, core_funcs),
2380+
X86_MATCH(INTEL_BROADWELL, core_funcs),
2381+
X86_MATCH(INTEL_IVYBRIDGE_X, core_funcs),
2382+
X86_MATCH(INTEL_HASWELL_X, core_funcs),
2383+
X86_MATCH(INTEL_HASWELL_L, core_funcs),
2384+
X86_MATCH(INTEL_HASWELL_G, core_funcs),
2385+
X86_MATCH(INTEL_BROADWELL_G, core_funcs),
2386+
X86_MATCH(INTEL_ATOM_AIRMONT, airmont_funcs),
2387+
X86_MATCH(INTEL_SKYLAKE_L, core_funcs),
2388+
X86_MATCH(INTEL_BROADWELL_X, core_funcs),
2389+
X86_MATCH(INTEL_SKYLAKE, core_funcs),
2390+
X86_MATCH(INTEL_BROADWELL_D, core_funcs),
2391+
X86_MATCH(INTEL_XEON_PHI_KNL, knl_funcs),
2392+
X86_MATCH(INTEL_XEON_PHI_KNM, knl_funcs),
2393+
X86_MATCH(INTEL_ATOM_GOLDMONT, core_funcs),
2394+
X86_MATCH(INTEL_ATOM_GOLDMONT_PLUS, core_funcs),
2395+
X86_MATCH(INTEL_SKYLAKE_X, core_funcs),
2396+
X86_MATCH(INTEL_COMETLAKE, core_funcs),
2397+
X86_MATCH(INTEL_ICELAKE_X, core_funcs),
2398+
X86_MATCH(INTEL_TIGERLAKE, core_funcs),
2399+
X86_MATCH(INTEL_SAPPHIRERAPIDS_X, core_funcs),
2400+
X86_MATCH(INTEL_EMERALDRAPIDS_X, core_funcs),
24022401
{}
24032402
};
24042403
MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
24052404

24062405
#ifdef CONFIG_ACPI
24072406
static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {
2408-
X86_MATCH(BROADWELL_D, core_funcs),
2409-
X86_MATCH(BROADWELL_X, core_funcs),
2410-
X86_MATCH(SKYLAKE_X, core_funcs),
2411-
X86_MATCH(ICELAKE_X, core_funcs),
2412-
X86_MATCH(SAPPHIRERAPIDS_X, core_funcs),
2407+
X86_MATCH(INTEL_BROADWELL_D, core_funcs),
2408+
X86_MATCH(INTEL_BROADWELL_X, core_funcs),
2409+
X86_MATCH(INTEL_SKYLAKE_X, core_funcs),
2410+
X86_MATCH(INTEL_ICELAKE_X, core_funcs),
2411+
X86_MATCH(INTEL_SAPPHIRERAPIDS_X, core_funcs),
2412+
X86_MATCH(INTEL_EMERALDRAPIDS_X, core_funcs),
24132413
{}
24142414
};
24152415
#endif
24162416

24172417
static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = {
2418-
X86_MATCH(KABYLAKE, core_funcs),
2418+
X86_MATCH(INTEL_KABYLAKE, core_funcs),
24192419
{}
24202420
};
24212421

@@ -3351,14 +3351,13 @@ static inline void intel_pstate_request_control_from_smm(void) {}
33513351

33523352
#define INTEL_PSTATE_HWP_BROADWELL 0x01
33533353

3354-
#define X86_MATCH_HWP(model, hwp_mode) \
3355-
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
3356-
X86_FEATURE_HWP, hwp_mode)
3354+
#define X86_MATCH_HWP(vfm, hwp_mode) \
3355+
X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_HWP, hwp_mode)
33573356

33583357
static const struct x86_cpu_id hwp_support_ids[] __initconst = {
3359-
X86_MATCH_HWP(BROADWELL_X, INTEL_PSTATE_HWP_BROADWELL),
3360-
X86_MATCH_HWP(BROADWELL_D, INTEL_PSTATE_HWP_BROADWELL),
3361-
X86_MATCH_HWP(ANY, 0),
3358+
X86_MATCH_HWP(INTEL_BROADWELL_X, INTEL_PSTATE_HWP_BROADWELL),
3359+
X86_MATCH_HWP(INTEL_BROADWELL_D, INTEL_PSTATE_HWP_BROADWELL),
3360+
X86_MATCH_HWP(INTEL_ANY, 0),
33623361
{}
33633362
};
33643363

@@ -3391,15 +3390,17 @@ static const struct x86_cpu_id intel_epp_default[] = {
33913390
* which can result in one core turbo frequency for
33923391
* AlderLake Mobile CPUs.
33933392
*/
3394-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, HWP_SET_DEF_BALANCE_PERF_EPP(102)),
3395-
X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, HWP_SET_DEF_BALANCE_PERF_EPP(32)),
3396-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, HWP_SET_EPP_VALUES(HWP_EPP_POWERSAVE,
3397-
HWP_EPP_BALANCE_POWERSAVE, 115, 16)),
3393+
X86_MATCH_VFM(INTEL_ALDERLAKE_L, HWP_SET_DEF_BALANCE_PERF_EPP(102)),
3394+
X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, HWP_SET_DEF_BALANCE_PERF_EPP(32)),
3395+
X86_MATCH_VFM(INTEL_METEORLAKE_L, HWP_SET_EPP_VALUES(HWP_EPP_POWERSAVE,
3396+
179, 64, 16)),
3397+
X86_MATCH_VFM(INTEL_ARROWLAKE, HWP_SET_EPP_VALUES(HWP_EPP_POWERSAVE,
3398+
179, 64, 16)),
33983399
{}
33993400
};
34003401

34013402
static const struct x86_cpu_id intel_hybrid_scaling_factor[] = {
3402-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, HYBRID_SCALING_FACTOR_MTL),
3403+
X86_MATCH_VFM(INTEL_METEORLAKE_L, HYBRID_SCALING_FACTOR_MTL),
34033404
{}
34043405
};
34053406

‎drivers/cpufreq/speedstep-centrino.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,10 @@ static struct cpufreq_driver centrino_driver = {
520520
* or ASCII model IDs.
521521
*/
522522
static const struct x86_cpu_id centrino_ids[] = {
523-
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, 9, X86_FEATURE_EST, NULL),
524-
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, 13, X86_FEATURE_EST, NULL),
525-
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 15, 3, X86_FEATURE_EST, NULL),
526-
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 15, 4, X86_FEATURE_EST, NULL),
523+
X86_MATCH_VFM_FEATURE(IFM( 6, 9), X86_FEATURE_EST, NULL),
524+
X86_MATCH_VFM_FEATURE(IFM( 6, 13), X86_FEATURE_EST, NULL),
525+
X86_MATCH_VFM_FEATURE(IFM(15, 3), X86_FEATURE_EST, NULL),
526+
X86_MATCH_VFM_FEATURE(IFM(15, 4), X86_FEATURE_EST, NULL),
527527
{}
528528
};
529529

0 commit comments

Comments
 (0)