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

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

Pull power management fix from Rafael Rafael:
 "Fix a locking issue in the cpufreq core introduced recently and caught
  by lockdep (Christian Loehle)"

* tag 'pm-6.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: Initialize cpufreq-based invariance before subsys
parents 74c7cc79 8ffe28b4

drivers/cpufreq/cpufreq.c

+11 −9
Original line number Diff line number Diff line
@@ -2953,6 +2953,15 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) 
			goto err_null_driver;

	}



	/*

	 * Mark support for the scheduler's frequency invariance engine for

	 * drivers that implement target(), target_index() or fast_switch().

	 */

	if (!cpufreq_driver->setpolicy) {

		static_branch_enable_cpuslocked(&cpufreq_freq_invariance);

		pr_debug("cpufreq: supports frequency invariance\n");

	}



	ret = subsys_interface_register(&cpufreq_interface);

	if (ret)

		goto err_boost_unreg;
@@ -2974,21 +2983,14 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) 
	hp_online = ret;

	ret = 0;



	/*

	 * Mark support for the scheduler's frequency invariance engine for

	 * drivers that implement target(), target_index() or fast_switch().

	 */

	if (!cpufreq_driver->setpolicy) {

		static_branch_enable_cpuslocked(&cpufreq_freq_invariance);

		pr_debug("supports frequency invariance");

	}



	pr_debug("driver %s up and running\n", driver_data->name);

	goto out;



err_if_unreg:

	subsys_interface_unregister(&cpufreq_interface);

err_boost_unreg:

	if (!cpufreq_driver->setpolicy)

		static_branch_disable_cpuslocked(&cpufreq_freq_invariance);

	remove_boost_sysfs_file();

err_null_driver:

	write_lock_irqsave(&cpufreq_driver_lock, flags);