| Message ID | 20201214120740.10948-1-ionela.voinescu@arm.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [v2] ACPI: processor: fix NONE coordination for domain mapping failure | expand |
On Mon, Dec 14, 2020 at 1:48 PM Ionela Voinescu <ionela.voinescu@arm.com> wrote: > > For errors parsing the _PSD domains, a separate domain is returned for > each CPU in the failed _PSD domain with no coordination (as per previous > comment). But contrary to the intention, the code was setting > CPUFREQ_SHARED_TYPE_ALL as coordination type. > > Change shared_type to CPUFREQ_SHARED_TYPE_NONE in case of errors parsing > the domain information. The function still returns the error and the caller > is free to bail out the domain initialisation altogether in that case. > > Given that both functions return domains with a single CPU, this change > does not affect the functionality, but clarifies the intention. > > Signed-off-by: Ionela Voinescu <ionela.voinescu@arm.com> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > [ rjw: Subject edit ] > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > > Hi guys, > > I'm sending v2 of some of the patches at [1] in light of the discussions > at [2]. > > This patch is a trivial rebase on linux next 20201211, submitted separately > due to its lack of dependency on the other patches. > > [1] https://lore.kernel.org/linux-pm/20201105125524.4409-1-ionela.voinescu@arm.com/#t > [2] https://lore.kernel.org/linux-pm/20201210142139.20490-1-yousaf.kaukab@suse.com/ Applied as 5.11-rc material, thanks! > drivers/acpi/cppc_acpi.c | 2 +- > drivers/acpi/processor_perflib.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c > index a852dc4927f7..62f55db443c1 100644 > --- a/drivers/acpi/cppc_acpi.c > +++ b/drivers/acpi/cppc_acpi.c > @@ -512,7 +512,7 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) > /* Assume no coordination on any error parsing domain info */ > cpumask_clear(pr->shared_cpu_map); > cpumask_set_cpu(i, pr->shared_cpu_map); > - pr->shared_type = CPUFREQ_SHARED_TYPE_ALL; > + pr->shared_type = CPUFREQ_SHARED_TYPE_NONE; > } > out: > free_cpumask_var(covered_cpus); > diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c > index 0dcedd652807..32f0f554ccae 100644 > --- a/drivers/acpi/processor_perflib.c > +++ b/drivers/acpi/processor_perflib.c > @@ -708,7 +708,7 @@ int acpi_processor_preregister_performance( > if (retval) { > cpumask_clear(pr->performance->shared_cpu_map); > cpumask_set_cpu(i, pr->performance->shared_cpu_map); > - pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL; > + pr->performance->shared_type = CPUFREQ_SHARED_TYPE_NONE; > } > pr->performance = NULL; /* Will be set for real in register */ > } > -- > 2.29.2.dirty >
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index a852dc4927f7..62f55db443c1 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -512,7 +512,7 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) /* Assume no coordination on any error parsing domain info */ cpumask_clear(pr->shared_cpu_map); cpumask_set_cpu(i, pr->shared_cpu_map); - pr->shared_type = CPUFREQ_SHARED_TYPE_ALL; + pr->shared_type = CPUFREQ_SHARED_TYPE_NONE; } out: free_cpumask_var(covered_cpus); diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 0dcedd652807..32f0f554ccae 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -708,7 +708,7 @@ int acpi_processor_preregister_performance( if (retval) { cpumask_clear(pr->performance->shared_cpu_map); cpumask_set_cpu(i, pr->performance->shared_cpu_map); - pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL; + pr->performance->shared_type = CPUFREQ_SHARED_TYPE_NONE; } pr->performance = NULL; /* Will be set for real in register */ }