lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 672/917] clk: at91: clk-master: check if div or pres is zero
    Date
    From: Claudiu Beznea <claudiu.beznea@microchip.com>

    [ Upstream commit c2910c00fee4cbb7b222d6e02846adef9ae4135a ]

    Check if div or pres is zero before using it as argument for ffs().
    In case div is zero ffs() will return 0 and thus substracting from
    zero will lead to invalid values to be setup in registers.

    Fixes: 7a110b9107ed8 ("clk: at91: clk-master: re-factor master clock")
    Fixes: 75c88143f3b87 ("clk: at91: clk-master: add master clock support for SAMA7G5")
    Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
    Link: https://lore.kernel.org/r/20211011112719.3951784-9-claudiu.beznea@microchip.com
    Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/at91/clk-master.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
    index a80427980bf73..2e410815a3405 100644
    --- a/drivers/clk/at91/clk-master.c
    +++ b/drivers/clk/at91/clk-master.c
    @@ -280,7 +280,7 @@ static int clk_master_pres_set_rate(struct clk_hw *hw, unsigned long rate,

    else if (pres == 3)
    pres = MASTER_PRES_MAX;
    - else
    + else if (pres)
    pres = ffs(pres) - 1;

    spin_lock_irqsave(master->lock, flags);
    @@ -610,7 +610,7 @@ static int clk_sama7g5_master_set_rate(struct clk_hw *hw, unsigned long rate,

    if (div == 3)
    div = MASTER_PRES_MAX;
    - else
    + else if (div)
    div = ffs(div) - 1;

    spin_lock_irqsave(master->lock, flags);
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 02:10    [W:2.180 / U:0.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site