Merge tag 'pm-turbostat-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[jlayton/linux.git] / drivers / cpufreq / intel_pstate.c

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 676a92413e6830b329b1837d9a8d06736ddbabbb..108826d9c40f72196d7a08c5caebca3457cbe0f9 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -359,37 +359,25 @@ static bool driver_registered __read_mostly;
 static bool acpi_ppc;
 #endif
 
-static struct perf_limits performance_limits = {
-       .no_turbo = 0,
-       .turbo_disabled = 0,
-       .max_perf_pct = 100,
-       .max_perf = int_ext_tofp(1),
-       .min_perf_pct = 100,
-       .min_perf = int_ext_tofp(1),
-       .max_policy_pct = 100,
-       .max_sysfs_pct = 100,
-       .min_policy_pct = 0,
-       .min_sysfs_pct = 0,
-};
+static struct perf_limits performance_limits;
+static struct perf_limits powersave_limits;
+static struct perf_limits *limits;
 
-static struct perf_limits powersave_limits = {
-       .no_turbo = 0,
-       .turbo_disabled = 0,
-       .max_perf_pct = 100,
-       .max_perf = int_ext_tofp(1),
-       .min_perf_pct = 0,
-       .min_perf = 0,
-       .max_policy_pct = 100,
-       .max_sysfs_pct = 100,
-       .min_policy_pct = 0,
-       .min_sysfs_pct = 0,
-};
+static void intel_pstate_init_limits(struct perf_limits *limits)
+{
+       memset(limits, 0, sizeof(*limits));
+       limits->max_perf_pct = 100;
+       limits->max_perf = int_ext_tofp(1);
+       limits->max_policy_pct = 100;
+       limits->max_sysfs_pct = 100;
+}
 
-#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
-static struct perf_limits *limits = &performance_limits;
-#else
-static struct perf_limits *limits = &powersave_limits;
-#endif
+static void intel_pstate_set_performance_limits(struct perf_limits *limits)
+{
+       intel_pstate_init_limits(limits);
+       limits->min_perf_pct = 100;
+       limits->min_perf = int_ext_tofp(1);
+}
 
 static DEFINE_MUTEX(intel_pstate_driver_lock);
 static DEFINE_MUTEX(intel_pstate_limits_lock);
@@ -2079,20 +2067,6 @@ static void intel_pstate_clear_update_util_hook(unsigned int cpu)
        synchronize_sched();
 }
 
-static void intel_pstate_set_performance_limits(struct perf_limits *limits)
-{
-       limits->no_turbo = 0;
-       limits->turbo_disabled = 0;
-       limits->max_perf_pct = 100;
-       limits->max_perf = int_ext_tofp(1);
-       limits->min_perf_pct = 100;
-       limits->min_perf = int_ext_tofp(1);
-       limits->max_policy_pct = 100;
-       limits->max_sysfs_pct = 100;
-       limits->min_policy_pct = 0;
-       limits->min_sysfs_pct = 0;
-}
-
 static void intel_pstate_update_perf_limits(struct cpufreq_policy *policy,
                                            struct perf_limits *limits)
 {
@@ -2461,6 +2435,11 @@ static int intel_pstate_register_driver(void)
 {
        int ret;
 
+       intel_pstate_init_limits(&powersave_limits);
+       intel_pstate_set_performance_limits(&performance_limits);
+       limits = IS_ENABLED(CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE) ?
+                       &performance_limits : &powersave_limits;
+
        ret = cpufreq_register_driver(intel_pstate_driver);
        if (ret) {
                intel_pstate_driver_cleanup();