lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 410/639] cpufreq: brcmstb-avs-cpufreq: Fix types for voltage/frequency
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    [ 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: de322e085995 ("cpufreq: brcmstb-avs-cpufreq: AVS CPUfreq driver for Broadcom STB SoCs")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Acked-by: Markus Mayer <mmayer@broadcom.com>
    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/cpufreq/brcmstb-avs-cpufreq.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
    index 6ed53ca8aa980..77b0e5d0fb134 100644
    --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
    +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
    @@ -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);
    }

    -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);
    }

    -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 */
    }
    @@ -653,14 +653,14 @@ static ssize_t show_brcm_avs_voltage(struct cpufreq_policy *policy, char *buf)
    {
    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)
    {
    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);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:23    [W:2.532 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site