diff options
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
-rw-r--r-- | drivers/cpufreq/intel_pstate.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 1405b393c93d..0e841eecb743 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c | |||
@@ -948,6 +948,7 @@ static struct cpufreq_driver intel_pstate_driver = { | |||
948 | 948 | ||
949 | static int __initdata no_load; | 949 | static int __initdata no_load; |
950 | static int __initdata no_hwp; | 950 | static int __initdata no_hwp; |
951 | static unsigned int force_load; | ||
951 | 952 | ||
952 | static int intel_pstate_msrs_not_valid(void) | 953 | static int intel_pstate_msrs_not_valid(void) |
953 | { | 954 | { |
@@ -1094,7 +1095,8 @@ static bool intel_pstate_platform_pwr_mgmt_exists(void) | |||
1094 | case PSS: | 1095 | case PSS: |
1095 | return intel_pstate_no_acpi_pss(); | 1096 | return intel_pstate_no_acpi_pss(); |
1096 | case PPC: | 1097 | case PPC: |
1097 | return intel_pstate_has_acpi_ppc(); | 1098 | return intel_pstate_has_acpi_ppc() && |
1099 | (!force_load); | ||
1098 | } | 1100 | } |
1099 | } | 1101 | } |
1100 | 1102 | ||
@@ -1175,6 +1177,8 @@ static int __init intel_pstate_setup(char *str) | |||
1175 | no_load = 1; | 1177 | no_load = 1; |
1176 | if (!strcmp(str, "no_hwp")) | 1178 | if (!strcmp(str, "no_hwp")) |
1177 | no_hwp = 1; | 1179 | no_hwp = 1; |
1180 | if (!strcmp(str, "force")) | ||
1181 | force_load = 1; | ||
1178 | return 0; | 1182 | return 0; |
1179 | } | 1183 | } |
1180 | early_param("intel_pstate", intel_pstate_setup); | 1184 | early_param("intel_pstate", intel_pstate_setup); |