Skip to content

Commit f28a1b0

Browse files
committed
Merge branches 'pm-cpufreq' and 'acpi-cppc'
* pm-cpufreq: intel_pstate: Fix "performance" mode behavior with HWP enabled cpufreq: SCPI: Depend on SCPI clk driver cpufreq: intel_pstate: Fix limits->max_perf rounding error cpufreq: intel_pstate: Fix limits->max_policy_pct rounding error cpufreq: Always remove sysfs cpuX/cpufreq link on ->remove_dev() * acpi-cppc: cpufreq: CPPC: Initialize and check CPUFreq CPU co-ord type correctly
2 parents 584ee3d + 9dc1791 commit f28a1b0

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/cpufreq/cppc_cpufreq.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,11 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
9898
policy->max = cpu->perf_caps.highest_perf;
9999
policy->cpuinfo.min_freq = policy->min;
100100
policy->cpuinfo.max_freq = policy->max;
101+
policy->shared_type = cpu->shared_type;
101102

102103
if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
103104
cpumask_copy(policy->cpus, cpu->shared_cpu_map);
104-
else {
105+
else if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL) {
105106
/* Support only SW_ANY for now. */
106107
pr_debug("Unsupported CPU co-ord type\n");
107108
return -EFAULT;

0 commit comments

Comments
 (0)