Commit 3baad655 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: dt: Add support for APM X-Gene 2
  cpufreq: intel_pstate: Always keep all limits settings in sync
  cpufreq: intel_pstate: Use locking in intel_cpufreq_verify_policy()
  cpufreq: intel_pstate: Use locking in intel_pstate_resume()
  cpufreq: intel_pstate: Do not expose PID parameters in passive mode
parents 0c744ea4 e11b6293
...@@ -26,6 +26,8 @@ static const struct of_device_id machines[] __initconst = { ...@@ -26,6 +26,8 @@ static const struct of_device_id machines[] __initconst = {
{ .compatible = "allwinner,sun8i-a83t", }, { .compatible = "allwinner,sun8i-a83t", },
{ .compatible = "allwinner,sun8i-h3", }, { .compatible = "allwinner,sun8i-h3", },
{ .compatible = "apm,xgene-shadowcat", },
{ .compatible = "arm,integrator-ap", }, { .compatible = "arm,integrator-ap", },
{ .compatible = "arm,integrator-cp", }, { .compatible = "arm,integrator-cp", },
......
...@@ -857,13 +857,13 @@ static struct freq_attr *hwp_cpufreq_attrs[] = { ...@@ -857,13 +857,13 @@ static struct freq_attr *hwp_cpufreq_attrs[] = {
NULL, NULL,
}; };
static void intel_pstate_hwp_set(const struct cpumask *cpumask) static void intel_pstate_hwp_set(struct cpufreq_policy *policy)
{ {
int min, hw_min, max, hw_max, cpu, range, adj_range; int min, hw_min, max, hw_max, cpu, range, adj_range;
struct perf_limits *perf_limits = limits; struct perf_limits *perf_limits = limits;
u64 value, cap; u64 value, cap;
for_each_cpu(cpu, cpumask) { for_each_cpu(cpu, policy->cpus) {
int max_perf_pct, min_perf_pct; int max_perf_pct, min_perf_pct;
struct cpudata *cpu_data = all_cpu_data[cpu]; struct cpudata *cpu_data = all_cpu_data[cpu];
s16 epp; s16 epp;
...@@ -949,7 +949,7 @@ static void intel_pstate_hwp_set(const struct cpumask *cpumask) ...@@ -949,7 +949,7 @@ static void intel_pstate_hwp_set(const struct cpumask *cpumask)
static int intel_pstate_hwp_set_policy(struct cpufreq_policy *policy) static int intel_pstate_hwp_set_policy(struct cpufreq_policy *policy)
{ {
if (hwp_active) if (hwp_active)
intel_pstate_hwp_set(policy->cpus); intel_pstate_hwp_set(policy);
return 0; return 0;
} }
...@@ -968,19 +968,28 @@ static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy) ...@@ -968,19 +968,28 @@ static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy)
static int intel_pstate_resume(struct cpufreq_policy *policy) static int intel_pstate_resume(struct cpufreq_policy *policy)
{ {
int ret;
if (!hwp_active) if (!hwp_active)
return 0; return 0;
mutex_lock(&intel_pstate_limits_lock);
all_cpu_data[policy->cpu]->epp_policy = 0; all_cpu_data[policy->cpu]->epp_policy = 0;
return intel_pstate_hwp_set_policy(policy); ret = intel_pstate_hwp_set_policy(policy);
mutex_unlock(&intel_pstate_limits_lock);
return ret;
} }
static void intel_pstate_hwp_set_online_cpus(void) static void intel_pstate_update_policies(void)
{ {
get_online_cpus(); int cpu;
intel_pstate_hwp_set(cpu_online_mask);
put_online_cpus(); for_each_possible_cpu(cpu)
cpufreq_update_policy(cpu);
} }
/************************** debugfs begin ************************/ /************************** debugfs begin ************************/
...@@ -1018,10 +1027,6 @@ static void __init intel_pstate_debug_expose_params(void) ...@@ -1018,10 +1027,6 @@ static void __init intel_pstate_debug_expose_params(void)
struct dentry *debugfs_parent; struct dentry *debugfs_parent;
int i = 0; int i = 0;
if (hwp_active ||
pstate_funcs.get_target_pstate == get_target_pstate_use_cpu_load)
return;
debugfs_parent = debugfs_create_dir("pstate_snb", NULL); debugfs_parent = debugfs_create_dir("pstate_snb", NULL);
if (IS_ERR_OR_NULL(debugfs_parent)) if (IS_ERR_OR_NULL(debugfs_parent))
return; return;
...@@ -1105,11 +1110,10 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b, ...@@ -1105,11 +1110,10 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
limits->no_turbo = clamp_t(int, input, 0, 1); limits->no_turbo = clamp_t(int, input, 0, 1);
if (hwp_active)
intel_pstate_hwp_set_online_cpus();
mutex_unlock(&intel_pstate_limits_lock); mutex_unlock(&intel_pstate_limits_lock);
intel_pstate_update_policies();
return count; return count;
} }
...@@ -1134,11 +1138,10 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b, ...@@ -1134,11 +1138,10 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,
limits->max_perf_pct); limits->max_perf_pct);
limits->max_perf = div_ext_fp(limits->max_perf_pct, 100); limits->max_perf = div_ext_fp(limits->max_perf_pct, 100);
if (hwp_active)
intel_pstate_hwp_set_online_cpus();
mutex_unlock(&intel_pstate_limits_lock); mutex_unlock(&intel_pstate_limits_lock);
intel_pstate_update_policies();
return count; return count;
} }
...@@ -1163,11 +1166,10 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b, ...@@ -1163,11 +1166,10 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,
limits->min_perf_pct); limits->min_perf_pct);
limits->min_perf = div_ext_fp(limits->min_perf_pct, 100); limits->min_perf = div_ext_fp(limits->min_perf_pct, 100);
if (hwp_active)
intel_pstate_hwp_set_online_cpus();
mutex_unlock(&intel_pstate_limits_lock); mutex_unlock(&intel_pstate_limits_lock);
intel_pstate_update_policies();
return count; return count;
} }
...@@ -2153,8 +2155,12 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy) ...@@ -2153,8 +2155,12 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy)
if (per_cpu_limits) if (per_cpu_limits)
perf_limits = cpu->perf_limits; perf_limits = cpu->perf_limits;
mutex_lock(&intel_pstate_limits_lock);
intel_pstate_update_perf_limits(policy, perf_limits); intel_pstate_update_perf_limits(policy, perf_limits);
mutex_unlock(&intel_pstate_limits_lock);
return 0; return 0;
} }
...@@ -2487,7 +2493,10 @@ static int __init intel_pstate_init(void) ...@@ -2487,7 +2493,10 @@ static int __init intel_pstate_init(void)
if (rc) if (rc)
goto out; goto out;
if (intel_pstate_driver == &intel_pstate && !hwp_active &&
pstate_funcs.get_target_pstate != get_target_pstate_use_cpu_load)
intel_pstate_debug_expose_params(); intel_pstate_debug_expose_params();
intel_pstate_sysfs_expose_params(); intel_pstate_sysfs_expose_params();
if (hwp_active) if (hwp_active)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment