提交 b21cf495 编写于 作者: F Florian Fainelli 提交者: Yang Yingliang

cpufreq: brcmstb-avs-cpufreq: Fix types for voltage/frequency

[ Upstream commit 4c5681fcc684c762b09435de3e82ffeee7769d21 ]

What we read back from the register is going to be capped at 32-bits,
and cpufreq_freq_table.frequency is an unsigned int. Avoid any possible
value truncation by using the appropriate return value.

Fixes: de322e08 ("cpufreq: brcmstb-avs-cpufreq: AVS CPUfreq driver for Broadcom STB SoCs")
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: NMarkus Mayer <mmayer@broadcom.com>
Signed-off-by: NViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 aa0b50cd
...@@ -384,12 +384,12 @@ static int brcm_avs_set_pstate(struct private_data *priv, unsigned int pstate) ...@@ -384,12 +384,12 @@ static int brcm_avs_set_pstate(struct private_data *priv, unsigned int pstate)
return __issue_avs_command(priv, AVS_CMD_SET_PSTATE, true, args); return __issue_avs_command(priv, AVS_CMD_SET_PSTATE, true, args);
} }
static unsigned long brcm_avs_get_voltage(void __iomem *base) static u32 brcm_avs_get_voltage(void __iomem *base)
{ {
return readl(base + AVS_MBOX_VOLTAGE1); return readl(base + AVS_MBOX_VOLTAGE1);
} }
static unsigned long brcm_avs_get_frequency(void __iomem *base) static u32 brcm_avs_get_frequency(void __iomem *base)
{ {
return readl(base + AVS_MBOX_FREQUENCY) * 1000; /* in kHz */ return readl(base + AVS_MBOX_FREQUENCY) * 1000; /* in kHz */
} }
...@@ -653,14 +653,14 @@ static ssize_t show_brcm_avs_voltage(struct cpufreq_policy *policy, char *buf) ...@@ -653,14 +653,14 @@ static ssize_t show_brcm_avs_voltage(struct cpufreq_policy *policy, char *buf)
{ {
struct private_data *priv = policy->driver_data; struct private_data *priv = policy->driver_data;
return sprintf(buf, "0x%08lx\n", brcm_avs_get_voltage(priv->base)); return sprintf(buf, "0x%08x\n", brcm_avs_get_voltage(priv->base));
} }
static ssize_t show_brcm_avs_frequency(struct cpufreq_policy *policy, char *buf) static ssize_t show_brcm_avs_frequency(struct cpufreq_policy *policy, char *buf)
{ {
struct private_data *priv = policy->driver_data; struct private_data *priv = policy->driver_data;
return sprintf(buf, "0x%08lx\n", brcm_avs_get_frequency(priv->base)); return sprintf(buf, "0x%08x\n", brcm_avs_get_frequency(priv->base));
} }
cpufreq_freq_attr_ro(brcm_avs_pstate); cpufreq_freq_attr_ro(brcm_avs_pstate);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册