Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpufreq: qcom-hw: Fix the frequency returned by cpufreq_driver->get()

Browse Source 
The cpufreq_driver->get() callback is supposed to return the current
frequency of the CPU and not the one requested by the CPUFreq core.
Fix it by returning the frequency that gets supplied to the CPU after
the DCVS operation of EPSS/OSM.

Fixes: 2849dd8bc7 ("cpufreq: qcom-hw: Add support for QCOM cpufreq HW driver")
Reported-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Manivannan Sadhasivam 2022-11-17 11:01:45 +05:30 committed by Viresh Kumar
parent 9901c21bca
commit c72cf0cb1d
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/cpufreq/qcom-cpufreq-hw.c
View File

@ -129,7 +129,35 @@ static int qcom_cpufreq_hw_target_index(struct cpufreq_policy *policy,
return 0; return 0;
} }
static unsigned long qcom_lmh_get_throttle_freq(struct qcom_cpufreq_data *data)
{
unsigned int lval;
if (qcom_cpufreq.soc_data->reg_current_vote)
lval = readl_relaxed(data->base + qcom_cpufreq.soc_data->reg_current_vote) & 0x3ff;
else
lval = readl_relaxed(data->base + qcom_cpufreq.soc_data->reg_domain_state) & 0xff;
return lval * xo_rate;
}
/* Get the current frequency of the CPU (after throttling) */
static unsigned int qcom_cpufreq_hw_get(unsigned int cpu) static unsigned int qcom_cpufreq_hw_get(unsigned int cpu)
{
struct qcom_cpufreq_data *data;
struct cpufreq_policy *policy;
policy = cpufreq_cpu_get_raw(cpu);
if (!policy)
return 0;
data = policy->driver_data;
return qcom_lmh_get_throttle_freq(data) / HZ_PER_KHZ;
}
/* Get the frequency requested by the cpufreq core for the CPU */
static unsigned int qcom_cpufreq_get_freq(unsigned int cpu)
{ {
struct qcom_cpufreq_data *data; struct qcom_cpufreq_data *data;
const struct qcom_cpufreq_soc_data *soc_data; const struct qcom_cpufreq_soc_data *soc_data;
@ -291,18 +319,6 @@ static void qcom_get_related_cpus(int index, struct cpumask *m)
} }
} }
static unsigned long qcom_lmh_get_throttle_freq(struct qcom_cpufreq_data *data)
{
unsigned int lval;
if (qcom_cpufreq.soc_data->reg_current_vote)
lval = readl_relaxed(data->base + qcom_cpufreq.soc_data->reg_current_vote) & 0x3ff;
else
lval = readl_relaxed(data->base + qcom_cpufreq.soc_data->reg_domain_state) & 0xff;
return lval * xo_rate;
}
static void qcom_lmh_dcvs_notify(struct qcom_cpufreq_data *data) static void qcom_lmh_dcvs_notify(struct qcom_cpufreq_data *data)
{ {
struct cpufreq_policy *policy = data->policy; struct cpufreq_policy *policy = data->policy;
@ -346,7 +362,7 @@ static void qcom_lmh_dcvs_notify(struct qcom_cpufreq_data *data)
* If h/w throttled frequency is higher than what cpufreq has requested * If h/w throttled frequency is higher than what cpufreq has requested
* for, then stop polling and switch back to interrupt mechanism. * for, then stop polling and switch back to interrupt mechanism.
*/ */
if (throttled_freq >= qcom_cpufreq_hw_get(cpu)) if (throttled_freq >= qcom_cpufreq_get_freq(cpu))
enable_irq(data->throttle_irq); enable_irq(data->throttle_irq);
else else
mod_delayed_work(system_highpri_wq, &data->throttle_work, mod_delayed_work(system_highpri_wq, &data->throttle_work,