mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 08:33:17 +02:00
cpufreq: intel_pstate: Relocate platform preference check
Move the invocation of intel_pstate_platform_pwr_mgmt_exists() before checking whether or not HWP is enabled because it does not depend on any code running before it except for the vendor check and if CPU performance scaling is going to be carried out by the platform, all of the code that runs before that function (again, except for the vendor check) is redundant. This is not expected to alter any functionality except for the ordering of messages printed by intel_pstate_init() when it is going to return an error before attempting to register the driver. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Link: https://patch.msgid.link/2776745.mvXUDI8C0e@rjwysocki.net
This commit is contained in:
parent
3698dd6b13
commit
ed7cad0504
|
|
@ -3694,6 +3694,15 @@ static int __init intel_pstate_init(void)
|
|||
if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
|
||||
return -ENODEV;
|
||||
|
||||
/*
|
||||
* The Intel pstate driver will be ignored if the platform
|
||||
* firmware has its own power management modes.
|
||||
*/
|
||||
if (intel_pstate_platform_pwr_mgmt_exists()) {
|
||||
pr_info("P-states controlled by the platform\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
id = x86_match_cpu(hwp_support_ids);
|
||||
if (id) {
|
||||
hwp_forced = intel_pstate_hwp_is_enabled();
|
||||
|
|
@ -3749,15 +3758,6 @@ static int __init intel_pstate_init(void)
|
|||
default_driver = &intel_cpufreq;
|
||||
|
||||
hwp_cpu_matched:
|
||||
/*
|
||||
* The Intel pstate driver will be ignored if the platform
|
||||
* firmware has its own power management modes.
|
||||
*/
|
||||
if (intel_pstate_platform_pwr_mgmt_exists()) {
|
||||
pr_info("P-states controlled by the platform\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (!hwp_active && hwp_only)
|
||||
return -ENOTSUPP;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user