Commit 2a6c7273 authored by Lifeng Zheng's avatar Lifeng Zheng Committed by Rafael J. Wysocki
Browse files

cpufreq: Initialize cpufreq-based frequency-invariance later 



The cpufreq-based invariance is enabled in cpufreq_register_driver(),
but never disabled after registration fails. Move the invariance
initialization to where all other initializations have been successfully
done to solve this problem.

Fixes: 874f6353 ("cpufreq: report whether cpufreq supports Frequency Invariance (FI)")
Signed-off-by: default avatarLifeng Zheng <zhenglifeng1@huawei.com>
Link: https://patch.msgid.link/20250709104145.2348017-2-zhenglifeng1@huawei.com


[ rjw: New subject ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5d6ecaaa

drivers/cpufreq/cpufreq.c

+9 −9
Original line number Diff line number Diff line
@@ -2940,15 +2940,6 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) 
	cpufreq_driver = driver_data;

	write_unlock_irqrestore(&cpufreq_driver_lock, flags);



	/*

	 * 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");

	}



	if (driver_data->setpolicy)

		driver_data->flags |= CPUFREQ_CONST_LOOPS;
@@ -2979,6 +2970,15 @@ 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;