lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 011/111] clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Rajan Vaja <rajan.vaja@xilinx.com>

    [ Upstream commit f6dab4233d6b64d719109040503b567f71fbfa01 ]

    Fixed factor clock has two initializations at of_clk_init() time
    and during platform driver probe. Before of_clk_init() call,
    node is marked as populated and so its probe never gets called.

    During of_clk_init() fixed factor clock registration may fail if
    any of its parent clock is not registered. In this case, it doesn't
    get chance to retry registration from probe. Clear OF_POPULATED
    flag if fixed factor clock registration fails so that clock
    registration is attempted again from probe.

    Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/clk/clk-fixed-factor.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    --- a/drivers/clk/clk-fixed-factor.c
    +++ b/drivers/clk/clk-fixed-factor.c
    @@ -177,8 +177,15 @@ static struct clk *_of_fixed_factor_clk_

    clk = clk_register_fixed_factor(NULL, clk_name, parent_name, flags,
    mult, div);
    - if (IS_ERR(clk))
    + if (IS_ERR(clk)) {
    + /*
    + * If parent clock is not registered, registration would fail.
    + * Clear OF_POPULATED flag so that clock registration can be
    + * attempted again from probe function.
    + */
    + of_node_clear_flag(node, OF_POPULATED);
    return clk;
    + }

    ret = of_clk_add_provider(node, of_clk_src_simple_get, clk);
    if (ret) {

    \
     
     \ /
      Last update: 2018-09-24 14:11    [W:4.473 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site