Commit cae68764 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix some issues in the ARM cpufreq drivers and in the operating
  performance points (OPP) framework.

  Specifics:

   - Fix useless WARN() in the OPP core and prevent a noisy warning
     from being printed by OPP _put functions (Dmitry Osipenko).

   - Fix error path when allocation failed in the arm_scmi cpufreq
     driver (Lukasz Luba).

   - Blacklist Qualcomm sc8180x and Qualcomm sm8150 in
     cpufreq-dt-platdev (Bjorn Andersson, Thara Gopinath).

   - Forbid cpufreq for 1.2 GHz variant in the armada-37xx cpufreq
     driver (Marek Behún)"

* tag 'pm-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  opp: Drop empty-table checks from _put functions
  cpufreq: armada-37xx: forbid cpufreq for 1.2 GHz variant
  cpufreq: blocklist Qualcomm sm8150 in cpufreq-dt-platdev
  cpufreq: arm_scmi: Fix error path when allocation failed
  opp: remove WARN when no valid OPPs remain
  cpufreq: blacklist Qualcomm sc8180x in cpufreq-dt-platdev
parents ed3bad2e f2963c7e

drivers/cpufreq/armada-37xx-cpufreq.c

+5 −1
Original line number Diff line number Diff line
@@ -104,7 +104,11 @@ struct armada_37xx_dvfs { 
};



static struct armada_37xx_dvfs armada_37xx_dvfs[] = {

	{.cpu_freq_max = 1200*1000*1000, .divider = {1, 2, 4, 6} },

	/*

	 * The cpufreq scaling for 1.2 GHz variant of the SOC is currently

	 * unstable because we do not know how to configure it properly.

	 */

	/* {.cpu_freq_max = 1200*1000*1000, .divider = {1, 2, 4, 6} }, */

	{.cpu_freq_max = 1000*1000*1000, .divider = {1, 2, 4, 5} },

	{.cpu_freq_max = 800*1000*1000,  .divider = {1, 2, 3, 4} },

	{.cpu_freq_max = 600*1000*1000,  .divider = {2, 4, 5, 6} },

drivers/cpufreq/cpufreq-dt-platdev.c

+2 −0
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ static const struct of_device_id blocklist[] __initconst = { 
	{ .compatible = "qcom,qcs404", },

	{ .compatible = "qcom,sc7180", },

	{ .compatible = "qcom,sc7280", },

	{ .compatible = "qcom,sc8180x", },

	{ .compatible = "qcom,sdm845", },

	{ .compatible = "qcom,sm8150", },



	{ .compatible = "st,stih407", },

	{ .compatible = "st,stih410", },

drivers/cpufreq/scmi-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy) 
	}



	if (!zalloc_cpumask_var(&opp_shared_cpus, GFP_KERNEL))

		ret = -ENOMEM;

		return -ENOMEM;



	/* Obtain CPUs that share SCMI performance controls */

	ret = scmi_get_sharing_cpus(cpu_dev, policy->cpus);

drivers/opp/core.c

+0 −15
Original line number Diff line number Diff line
@@ -1856,9 +1856,6 @@ void dev_pm_opp_put_supported_hw(struct opp_table *opp_table) 
	if (unlikely(!opp_table))

		return;



	/* Make sure there are no concurrent readers while updating opp_table */

	WARN_ON(!list_empty(&opp_table->opp_list));



	kfree(opp_table->supported_hw);

	opp_table->supported_hw = NULL;

	opp_table->supported_hw_count = 0;
@@ -1944,9 +1941,6 @@ void dev_pm_opp_put_prop_name(struct opp_table *opp_table) 
	if (unlikely(!opp_table))

		return;



	/* Make sure there are no concurrent readers while updating opp_table */

	WARN_ON(!list_empty(&opp_table->opp_list));



	kfree(opp_table->prop_name);

	opp_table->prop_name = NULL;
@@ -2056,9 +2050,6 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table) 
	if (!opp_table->regulators)

		goto put_opp_table;



	/* Make sure there are no concurrent readers while updating opp_table */

	WARN_ON(!list_empty(&opp_table->opp_list));



	if (opp_table->enabled) {

		for (i = opp_table->regulator_count - 1; i >= 0; i--)

			regulator_disable(opp_table->regulators[i]);
@@ -2178,9 +2169,6 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table) 
	if (unlikely(!opp_table))

		return;



	/* Make sure there are no concurrent readers while updating opp_table */

	WARN_ON(!list_empty(&opp_table->opp_list));



	clk_put(opp_table->clk);

	opp_table->clk = ERR_PTR(-EINVAL);
@@ -2279,9 +2267,6 @@ void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table) 
	if (unlikely(!opp_table))

		return;



	/* Make sure there are no concurrent readers while updating opp_table */

	WARN_ON(!list_empty(&opp_table->opp_list));



	opp_table->set_opp = NULL;



	mutex_lock(&opp_table->lock);

drivers/opp/of.c

+3 −2
Original line number Diff line number Diff line
@@ -964,8 +964,9 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table) 
		}

	}



	/* There should be one of more OPP defined */

	if (WARN_ON(!count)) {

	/* There should be one or more OPPs defined */

	if (!count) {

		dev_err(dev, "%s: no supported OPPs", __func__);

		ret = -ENOENT;

		goto remove_static_opp;

	}