Commit b2a6181e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull ARM cpufreq driver changes for v5.15 from Viresh Kumar:

"This contains:

 - Update cpufreq-dt blocklist with more platforms (Bjorn Andersson).

 - Allow freq changes from any CPU for qcom-hw driver (Taniya Das).

 - Add DSVS interrupt's support for qcom-hw driver (Thara Gopinath).

 - A new callback (->register_em()) to register EM at a more convenient
   point of time."

* 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: qcom-hw: Set dvfs_possible_from_any_cpu cpufreq driver flag
  cpufreq: blocklist more Qualcomm platforms in cpufreq-dt-platdev
  cpufreq: qcom-cpufreq-hw: Add dcvs interrupt support
  cpufreq: scmi: Use .register_em() to register with energy model
  cpufreq: vexpress: Use .register_em() to register with energy model
  cpufreq: scpi: Use .register_em() to register with energy model
  cpufreq: qcom-cpufreq-hw: Use .register_em() to register with energy model
  cpufreq: omap: Use .register_em() to register with energy model
  cpufreq: mediatek: Use .register_em() to register with energy model
  cpufreq: imx6q: Use .register_em() to register with energy model
  cpufreq: dt: Use .register_em() to register with energy model
  cpufreq: Add callback to register with energy model
  cpufreq: vexpress: Set CPUFREQ_IS_COOLING_DEV flag
parents d0e936ad f0712ace

drivers/base/arch_topology.c

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ void topology_set_freq_scale(const struct cpumask *cpus, unsigned long cur_freq, 
}



DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;

EXPORT_PER_CPU_SYMBOL_GPL(cpu_scale);



void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity)

{
@@ -165,6 +166,7 @@ void topology_set_thermal_pressure(const struct cpumask *cpus, 
	for_each_cpu(cpu, cpus)

		WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure);

}

EXPORT_SYMBOL_GPL(topology_set_thermal_pressure);



static ssize_t cpu_capacity_show(struct device *dev,

				 struct device_attribute *attr,

drivers/cpufreq/cpufreq-dt-platdev.c

+4 −0
Original line number Diff line number Diff line
@@ -137,11 +137,15 @@ static const struct of_device_id blocklist[] __initconst = { 
	{ .compatible = "qcom,apq8096", },

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

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

	{ .compatible = "qcom,sa8155p" },

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

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

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

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

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

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

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

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



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

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

drivers/cpufreq/cpufreq-dt.c

+1 −2
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
		cpufreq_dt_attr[1] = &cpufreq_freq_attr_scaling_boost_freqs;

	}



	dev_pm_opp_of_register_em(cpu_dev, policy->cpus);



	return 0;



out_clk_put:
@@ -184,6 +182,7 @@ static struct cpufreq_driver dt_cpufreq_driver = { 
	.exit = cpufreq_exit,

	.online = cpufreq_online,

	.offline = cpufreq_offline,

	.register_em = cpufreq_register_em_with_opp,

	.name = "cpufreq-dt",

	.attr = cpufreq_dt_attr,

	.suspend = cpufreq_generic_suspend,

drivers/cpufreq/cpufreq.c

+13 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,19 @@ static int cpufreq_online(unsigned int cpu) 
		write_lock_irqsave(&cpufreq_driver_lock, flags);

		list_add(&policy->policy_list, &cpufreq_policy_list);

		write_unlock_irqrestore(&cpufreq_driver_lock, flags);



		/*

		 * Register with the energy model before

		 * sched_cpufreq_governor_change() is called, which will result

		 * in rebuilding of the sched domains, which should only be done

		 * once the energy model is properly initialized for the policy

		 * first.

		 *

		 * Also, this should be called before the policy is registered

		 * with cooling framework.

		 */

		if (cpufreq_driver->register_em)

			cpufreq_driver->register_em(policy);

	}



	ret = cpufreq_init_policy(policy);

drivers/cpufreq/imx6q-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy) 
	policy->clk = clks[ARM].clk;

	cpufreq_generic_init(policy, freq_table, transition_latency);

	policy->suspend_freq = max_freq;

	dev_pm_opp_of_register_em(cpu_dev, policy->cpus);



	return 0;

}
@@ -204,6 +203,7 @@ static struct cpufreq_driver imx6q_cpufreq_driver = { 
	.target_index = imx6q_set_target,

	.get = cpufreq_generic_get,

	.init = imx6q_cpufreq_init,

	.register_em = cpufreq_register_em_with_opp,

	.name = "imx6q-cpufreq",

	.attr = cpufreq_generic_attr,

	.suspend = cpufreq_generic_suspend,