Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cpufreq: cpufreq-cpu0: Call CPUFREQ_POSTCHANGE notifier for failure cases too

Currently we are simply returning from target() if we encounter some error after
broadcasting CPUFREQ_PRECHANGE notifier. Which looks to be wrong as others might
depend on POSTCHANGE notifier for their functioning.

So, better broadcast CPUFREQ_POSTCHANGE notifier for these failure cases too,
but with old frequency.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Viresh Kumar and committed by
Rafael J. Wysocki
fd143b4d 746b3df9

+8 -5
+8 -5
drivers/cpufreq/cpufreq-cpu0.c
··· 77 77 if (IS_ERR(opp)) { 78 78 rcu_read_unlock(); 79 79 pr_err("failed to find OPP for %ld\n", freq_Hz); 80 - return PTR_ERR(opp); 80 + freqs.new = freqs.old; 81 + ret = PTR_ERR(opp); 82 + goto post_notify; 81 83 } 82 84 volt = opp_get_voltage(opp); 83 85 rcu_read_unlock(); ··· 97 95 if (ret) { 98 96 pr_err("failed to scale voltage up: %d\n", ret); 99 97 freqs.new = freqs.old; 100 - return ret; 98 + goto post_notify; 101 99 } 102 100 } 103 101 ··· 106 104 pr_err("failed to set clock rate: %d\n", ret); 107 105 if (cpu_reg) 108 106 regulator_set_voltage_tol(cpu_reg, volt_old, tol); 109 - return ret; 107 + freqs.new = freqs.old; 108 + goto post_notify; 110 109 } 111 110 112 111 /* scaling down? scale voltage after frequency */ ··· 117 114 pr_err("failed to scale voltage down: %d\n", ret); 118 115 clk_set_rate(cpu_clk, freqs.old * 1000); 119 116 freqs.new = freqs.old; 120 - return ret; 121 117 } 122 118 } 123 119 120 + post_notify: 124 121 for_each_online_cpu(cpu) { 125 122 freqs.cpu = cpu; 126 123 cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); 127 124 } 128 125 129 - return 0; 126 + return ret; 130 127 } 131 128 132 129 static int cpu0_cpufreq_init(struct cpufreq_policy *policy)