Commit 4ec6afd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power management fixes from Rafael Wysocki:
 "These fix a CPU hot-add issue in the cpufreq core, fix a comment in
  the cpufreq core code and update its documentation, and disable the
  DTPM (Dynamic Thermal Power Management) code for the time being to
  prevent it from causing issues to appear.

  Specifics:

   - Disable DTPM for this cycle to prevent it from causing issues to
     appear on otherwise functional systems (Daniel Lezcano)

   - Fix cpufreq sysfs interface failure related to physical CPU hot-add
     (Xiongfeng Wang)

   - Fix comment in cpufreq core and update its documentation (Tang
     Yizhou)"

* tag 'pm-5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  powercap: DTPM: Drop unused local variable from init_dtpm()
  cpufreq: docs: Update core.rst
  cpufreq: Fix a comment in cpufreq_policy_free
  powercap/drivers/dtpm: Disable DTPM at boot time
  cpufreq: Fix get_cpu_device() failure in add_cpu_dev_symlink()
parents 757f3e6d 404c9121

Documentation/cpu-freq/core.rst

+3 −3
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ CPUFREQ_POSTCHANGE. 
The third argument is a struct cpufreq_freqs with the following

values:



=====	===========================

cpu	number of the affected CPU

======	======================================

policy	a pointer to the struct cpufreq_policy

old	old frequency

new	new frequency

flags	flags of the cpufreq driver

=====	===========================

======	======================================



3. CPUFreq Table Generation with Operating Performance Point (OPP)

==================================================================

drivers/cpufreq/cpufreq.c

+7 −7
Original line number Diff line number Diff line
@@ -1004,10 +1004,9 @@ static struct kobj_type ktype_cpufreq = { 
	.release	= cpufreq_sysfs_release,

};



static void add_cpu_dev_symlink(struct cpufreq_policy *policy, unsigned int cpu)

static void add_cpu_dev_symlink(struct cpufreq_policy *policy, unsigned int cpu,

				struct device *dev)

{

	struct device *dev = get_cpu_device(cpu);



	if (unlikely(!dev))

		return;
@@ -1296,8 +1295,9 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy) 


	if (policy->max_freq_req) {

		/*

		 * CPUFREQ_CREATE_POLICY notification is sent only after

		 * successfully adding max_freq_req request.

		 * Remove max_freq_req after sending CPUFREQ_REMOVE_POLICY

		 * notification, since CPUFREQ_CREATE_POLICY notification was

		 * sent after adding max_freq_req earlier.

		 */

		blocking_notifier_call_chain(&cpufreq_policy_notifier_list,

					     CPUFREQ_REMOVE_POLICY, policy);
@@ -1391,7 +1391,7 @@ static int cpufreq_online(unsigned int cpu) 
	if (new_policy) {

		for_each_cpu(j, policy->related_cpus) {

			per_cpu(cpufreq_cpu_data, j) = policy;

			add_cpu_dev_symlink(policy, j);

			add_cpu_dev_symlink(policy, j, get_cpu_device(j));

		}



		policy->min_freq_req = kzalloc(2 * sizeof(*policy->min_freq_req),
@@ -1565,7 +1565,7 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) 
	/* Create sysfs link on CPU registration */

	policy = per_cpu(cpufreq_cpu_data, cpu);

	if (policy)

		add_cpu_dev_symlink(policy, cpu);

		add_cpu_dev_symlink(policy, cpu, dev);



	return 0;

}

drivers/powercap/dtpm.c

+0 −5
Original line number Diff line number Diff line
@@ -463,17 +463,12 @@ int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) 


static int __init init_dtpm(void)

{

	struct dtpm_descr *dtpm_descr;



	pct = powercap_register_control_type(NULL, "dtpm", NULL);

	if (IS_ERR(pct)) {

		pr_err("Failed to register control type\n");

		return PTR_ERR(pct);

	}



	for_each_dtpm_table(dtpm_descr)

		dtpm_descr->init();



	return 0;

}

late_initcall(init_dtpm);