]> git.baikalelectronics.ru Git - kernel.git/commit
cpufreq: intel_pstate: Fix fast-switch fallback path
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Dec 2020 17:08:18 +0000 (18:08 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 30 Dec 2020 17:22:17 +0000 (18:22 +0100)
commit93ca39a2d20c87da034470d711f948a8b89e7778
treecd5401910c4378f5ad3951fbbe32dfc6b7eba854
parent703b4aaeda226c411ae7e592fdcf61efe00c01a0
cpufreq: intel_pstate: Fix fast-switch fallback path

When sugov_update_single_perf() falls back to the "frequency"
path due to the missing scale-invariance, it will call
cpufreq_driver_fast_switch() via sugov_fast_switch()
and the driver's ->fast_switch() callback will be invoked,
so it must not be NULL.

However, after commit 611b137298a8 ("cpufreq: intel_pstate: Implement
the ->adjust_perf() callback") intel_pstate sets ->fast_switch() to
NULL when it is going to use intel_cpufreq_adjust_perf(), which is a
mistake, because on x86 the scale-invariance may be turned off
dynamically, so modify it to retain the original ->adjust_perf()
callback pointer.

Fixes: 611b137298a8 ("cpufreq: intel_pstate: Implement the ->adjust_perf() callback")
Reported-by: Kenneth R. Crudup <kenny@panix.com>
Tested-by: Kenneth R. Crudup <kenny@panix.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/intel_pstate.c