cpufreq: qcom: Don't add frequencies without an OPP (bc9b9c5a) · Commits · 戴 / test

The driver currently adds all frequencies from the hardware LUT to the cpufreq table, regardless of whether the corresponding OPP exists. This prevents devices from disabling certain OPPs through the device tree and can result in CPU frequencies for which the interconnect bandwidth can't be adjusted. Only add frequencies with an OPP entry. Fixes: ("cpufreq: qcom: Read voltage LUT and populate OPP") Signed-off-by:

Matthias Kaehlcke <mka@chromium.org> Signed-off-by:

Viresh Kumar <viresh.kumar@linaro.org>

drivers/cpufreq/qcom-cpufreq-hw.c

+15 −6

Original line number	Diff line number	Diff line
		@@ -187,10 +187,15 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
		freq = cpu_hw_rate / 1000;

		if (freq != prev_freq && core_count != LUT_TURBO_IND) {
		if (!qcom_cpufreq_update_opp(cpu_dev, freq, volt)) {
		table[i].frequency = freq;
		qcom_cpufreq_update_opp(cpu_dev, freq, volt);
		dev_dbg(cpu_dev, "index=%d freq=%d, core_count %d\n", i,
		freq, core_count);
		} else {
		dev_warn(cpu_dev, "failed to update OPP for freq=%d\n", freq);
		table[i].frequency = CPUFREQ_ENTRY_INVALID;
		}

		} else if (core_count == LUT_TURBO_IND) {
		table[i].frequency = CPUFREQ_ENTRY_INVALID;
		}
		@@ -207,9 +212,13 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
		* as the boost frequency
		*/
		if (prev->frequency == CPUFREQ_ENTRY_INVALID) {
		if (!qcom_cpufreq_update_opp(cpu_dev, prev_freq, volt)) {
		prev->frequency = prev_freq;
		prev->flags = CPUFREQ_BOOST_FREQ;
		qcom_cpufreq_update_opp(cpu_dev, prev_freq, volt);
		} else {
		dev_warn(cpu_dev, "failed to update OPP for freq=%d\n",
		freq);
		}
		}

		break;

Admin message