diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-08-09 15:28:08 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-08-09 15:28:08 +0200 |
| commit | 01a620d491592ead12eca039fe1c9e74908c35cf (patch) | |
| tree | 15271737ef24a7375f01eb928595ea3ba13c13ad /arch/x86/kernel/cpu/aperfmperf.c | |
| parent | 74b0666f97f9455bc799405b7874df62fcb66bae (diff) | |
| parent | 9ba48db9f77ce0001dbb882476fa46e092feb695 (diff) | |
| download | linux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.gz linux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.bz2 linux-01a620d491592ead12eca039fe1c9e74908c35cf.zip | |
Merge tag 'i2c-host-fixes-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
Two fixes on the Qualcomm GENI I2C controller are cleaning up the
error exit patch in the runtime_resume() function. The first is
disabling the clock, the second disables the icc on the way out.
Diffstat (limited to 'arch/x86/kernel/cpu/aperfmperf.c')
| -rw-r--r-- | arch/x86/kernel/cpu/aperfmperf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/aperfmperf.c b/arch/x86/kernel/cpu/aperfmperf.c index b3fa61d45352..0b69bfbf345d 100644 --- a/arch/x86/kernel/cpu/aperfmperf.c +++ b/arch/x86/kernel/cpu/aperfmperf.c @@ -306,7 +306,7 @@ static void freq_invariance_enable(void) WARN_ON_ONCE(1); return; } - static_branch_enable(&arch_scale_freq_key); + static_branch_enable_cpuslocked(&arch_scale_freq_key); register_freq_invariance_syscore_ops(); pr_info("Estimated ratio of average max frequency by base frequency (times 1024): %llu\n", arch_max_freq_ratio); } @@ -323,8 +323,10 @@ static void __init bp_init_freq_invariance(void) if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) return; - if (intel_set_max_freq_ratio()) + if (intel_set_max_freq_ratio()) { + guard(cpus_read_lock)(); freq_invariance_enable(); + } } static void disable_freq_invariance_workfn(struct work_struct *work) |