lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 170/171] clocksource/drivers/dw_apb_timer_of: Fix probe failure
    Date
    From: Alexey Sheplyakov <asheplyakov@basealt.ru>

    commit a663bd19114d79f0902e2490fc484e5a7419cdc2 upstream.

    The driver refuses to probe with -EINVAL since the commit 5d9814df0aec
    ("clocksource/drivers/dw_apb_timer_of: Add error handling if no clock
    available").

    Before the driver used to probe successfully if either "clock-freq" or
    "clock-frequency" properties has been specified in the device tree.

    That commit changed

    if (A && B)
    panic("No clock nor clock-frequency property");

    into

    if (!A && !B)
    return 0;

    That's a bug: the reverse of `A && B` is '!A || !B', not '!A && !B'

    Signed-off-by: Vadim V. Vlasov <vadim.vlasov@elpitech.ru>
    Signed-off-by: Alexey Sheplyakov <asheplyakov@basealt.ru>
    Fixes: 5d9814df0aec56a6 ("clocksource/drivers/dw_apb_timer_of: Add error handling if no clock available").
    Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
    Cc: Dinh Nguyen <dinguyen@kernel.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Vadim V. Vlasov <vadim.vlasov@elpitech.ru>
    Acked-by: Dinh Nguyen <dinguyen@kernel.org>
    Link: https://lore.kernel.org/r/20211109153401.157491-1-asheplyakov@basealt.ru
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/clocksource/dw_apb_timer_of.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/clocksource/dw_apb_timer_of.c
    +++ b/drivers/clocksource/dw_apb_timer_of.c
    @@ -47,7 +47,7 @@ static int __init timer_get_base_and_rat
    pr_warn("pclk for %pOFn is present, but could not be activated\n",
    np);

    - if (!of_property_read_u32(np, "clock-freq", rate) &&
    + if (!of_property_read_u32(np, "clock-freq", rate) ||
    !of_property_read_u32(np, "clock-frequency", rate))
    return 0;


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