Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 404b1369 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

OPP: Don't try to remove all OPP tables on failure 



dev_pm_opp_of_cpumask_add_table() creates the OPP table for all CPUs
present in the cpumask and on errors it should revert all changes it has
done.

It actually is doing a bit more than that. On errors, it tries to free
all the OPP tables, even the one it hasn't created yet. This may also
end up freeing the OPP tables which were created from separate path,
like dev_pm_opp_set_supported_hw().

Reported-and-tested-by: default avatarNiklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 2fbb8670

drivers/opp/cpu.c

+6 −2
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ void dev_pm_opp_free_cpufreq_table(struct device *dev, 
EXPORT_SYMBOL_GPL(dev_pm_opp_free_cpufreq_table);

#endif	/* CONFIG_CPU_FREQ */



void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of)

void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of,

				      int last_cpu)

{

	struct device *cpu_dev;

	int cpu;
@@ -116,6 +117,9 @@ void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of) 
	WARN_ON(cpumask_empty(cpumask));



	for_each_cpu(cpu, cpumask) {

		if (cpu == last_cpu)

			break;



		cpu_dev = get_cpu_device(cpu);

		if (!cpu_dev) {

			pr_err("%s: failed to get cpu%d device\n", __func__,
@@ -140,7 +144,7 @@ void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of) 
 */

void dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask)

{

	_dev_pm_opp_cpumask_remove_table(cpumask, false);

	_dev_pm_opp_cpumask_remove_table(cpumask, false, -1);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_cpumask_remove_table);

drivers/opp/of.c

+2 −2
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_indexed); 
 */

void dev_pm_opp_of_cpumask_remove_table(const struct cpumask *cpumask)

{

	_dev_pm_opp_cpumask_remove_table(cpumask, true);

	_dev_pm_opp_cpumask_remove_table(cpumask, true, -1);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_of_cpumask_remove_table);
@@ -627,7 +627,7 @@ int dev_pm_opp_of_cpumask_add_table(const struct cpumask *cpumask) 
				 __func__, cpu, ret);



			/* Free all other OPPs */

			dev_pm_opp_of_cpumask_remove_table(cpumask);

			_dev_pm_opp_cpumask_remove_table(cpumask, true, cpu);

			break;

		}

	}

drivers/opp/opp.h

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ struct dev_pm_opp *_opp_allocate(struct opp_table *opp_table); 
void _opp_free(struct dev_pm_opp *opp);

int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table, bool rate_not_available);

int _opp_add_v1(struct opp_table *opp_table, struct device *dev, unsigned long freq, long u_volt, bool dynamic);

void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of);

void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of, int last_cpu);

struct opp_table *_add_opp_table(struct device *dev);



#ifdef CONFIG_OF