lkml.org 
[lkml]   [2019]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.3 40/87] clk: zx296718: Don't reference clk_init_data after registration
    Date
    From: Stephen Boyd <sboyd@kernel.org>

    [ Upstream commit 1a4549c150e27dbc3aea762e879a88209df6d1a5 ]

    A future patch is going to change semantics of clk_register() so that
    clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid
    referencing this member here so that we don't run into NULL pointer
    exceptions.

    Cc: Jun Nie <jun.nie@linaro.org>
    Cc: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Link: https://lkml.kernel.org/r/20190815160020.183334-3-sboyd@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/zte/clk-zx296718.c | 109 +++++++++++++++------------------
    1 file changed, 49 insertions(+), 60 deletions(-)

    diff --git a/drivers/clk/zte/clk-zx296718.c b/drivers/clk/zte/clk-zx296718.c
    index fd6c347bec6a7..dd7045bc48c15 100644
    --- a/drivers/clk/zte/clk-zx296718.c
    +++ b/drivers/clk/zte/clk-zx296718.c
    @@ -564,6 +564,7 @@ static int __init top_clocks_init(struct device_node *np)
    {
    void __iomem *reg_base;
    int i, ret;
    + const char *name;

    reg_base = of_iomap(np, 0);
    if (!reg_base) {
    @@ -573,11 +574,10 @@ static int __init top_clocks_init(struct device_node *np)

    for (i = 0; i < ARRAY_SIZE(zx296718_pll_clk); i++) {
    zx296718_pll_clk[i].reg_base += (uintptr_t)reg_base;
    + name = zx296718_pll_clk[i].hw.init->name;
    ret = clk_hw_register(NULL, &zx296718_pll_clk[i].hw);
    - if (ret) {
    - pr_warn("top clk %s init error!\n",
    - zx296718_pll_clk[i].hw.init->name);
    - }
    + if (ret)
    + pr_warn("top clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(top_ffactor_clk); i++) {
    @@ -585,11 +585,10 @@ static int __init top_clocks_init(struct device_node *np)
    top_hw_onecell_data.hws[top_ffactor_clk[i].id] =
    &top_ffactor_clk[i].factor.hw;

    + name = top_ffactor_clk[i].factor.hw.init->name;
    ret = clk_hw_register(NULL, &top_ffactor_clk[i].factor.hw);
    - if (ret) {
    - pr_warn("top clk %s init error!\n",
    - top_ffactor_clk[i].factor.hw.init->name);
    - }
    + if (ret)
    + pr_warn("top clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(top_mux_clk); i++) {
    @@ -598,11 +597,10 @@ static int __init top_clocks_init(struct device_node *np)
    &top_mux_clk[i].mux.hw;

    top_mux_clk[i].mux.reg += (uintptr_t)reg_base;
    + name = top_mux_clk[i].mux.hw.init->name;
    ret = clk_hw_register(NULL, &top_mux_clk[i].mux.hw);
    - if (ret) {
    - pr_warn("top clk %s init error!\n",
    - top_mux_clk[i].mux.hw.init->name);
    - }
    + if (ret)
    + pr_warn("top clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(top_gate_clk); i++) {
    @@ -611,11 +609,10 @@ static int __init top_clocks_init(struct device_node *np)
    &top_gate_clk[i].gate.hw;

    top_gate_clk[i].gate.reg += (uintptr_t)reg_base;
    + name = top_gate_clk[i].gate.hw.init->name;
    ret = clk_hw_register(NULL, &top_gate_clk[i].gate.hw);
    - if (ret) {
    - pr_warn("top clk %s init error!\n",
    - top_gate_clk[i].gate.hw.init->name);
    - }
    + if (ret)
    + pr_warn("top clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(top_div_clk); i++) {
    @@ -624,11 +621,10 @@ static int __init top_clocks_init(struct device_node *np)
    &top_div_clk[i].div.hw;

    top_div_clk[i].div.reg += (uintptr_t)reg_base;
    + name = top_div_clk[i].div.hw.init->name;
    ret = clk_hw_register(NULL, &top_div_clk[i].div.hw);
    - if (ret) {
    - pr_warn("top clk %s init error!\n",
    - top_div_clk[i].div.hw.init->name);
    - }
    + if (ret)
    + pr_warn("top clk %s init error!\n", name);
    }

    ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
    @@ -754,6 +750,7 @@ static int __init lsp0_clocks_init(struct device_node *np)
    {
    void __iomem *reg_base;
    int i, ret;
    + const char *name;

    reg_base = of_iomap(np, 0);
    if (!reg_base) {
    @@ -767,11 +764,10 @@ static int __init lsp0_clocks_init(struct device_node *np)
    &lsp0_mux_clk[i].mux.hw;

    lsp0_mux_clk[i].mux.reg += (uintptr_t)reg_base;
    + name = lsp0_mux_clk[i].mux.hw.init->name;
    ret = clk_hw_register(NULL, &lsp0_mux_clk[i].mux.hw);
    - if (ret) {
    - pr_warn("lsp0 clk %s init error!\n",
    - lsp0_mux_clk[i].mux.hw.init->name);
    - }
    + if (ret)
    + pr_warn("lsp0 clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(lsp0_gate_clk); i++) {
    @@ -780,11 +776,10 @@ static int __init lsp0_clocks_init(struct device_node *np)
    &lsp0_gate_clk[i].gate.hw;

    lsp0_gate_clk[i].gate.reg += (uintptr_t)reg_base;
    + name = lsp0_gate_clk[i].gate.hw.init->name;
    ret = clk_hw_register(NULL, &lsp0_gate_clk[i].gate.hw);
    - if (ret) {
    - pr_warn("lsp0 clk %s init error!\n",
    - lsp0_gate_clk[i].gate.hw.init->name);
    - }
    + if (ret)
    + pr_warn("lsp0 clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(lsp0_div_clk); i++) {
    @@ -793,11 +788,10 @@ static int __init lsp0_clocks_init(struct device_node *np)
    &lsp0_div_clk[i].div.hw;

    lsp0_div_clk[i].div.reg += (uintptr_t)reg_base;
    + name = lsp0_div_clk[i].div.hw.init->name;
    ret = clk_hw_register(NULL, &lsp0_div_clk[i].div.hw);
    - if (ret) {
    - pr_warn("lsp0 clk %s init error!\n",
    - lsp0_div_clk[i].div.hw.init->name);
    - }
    + if (ret)
    + pr_warn("lsp0 clk %s init error!\n", name);
    }

    ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
    @@ -862,6 +856,7 @@ static int __init lsp1_clocks_init(struct device_node *np)
    {
    void __iomem *reg_base;
    int i, ret;
    + const char *name;

    reg_base = of_iomap(np, 0);
    if (!reg_base) {
    @@ -875,11 +870,10 @@ static int __init lsp1_clocks_init(struct device_node *np)
    &lsp0_mux_clk[i].mux.hw;

    lsp1_mux_clk[i].mux.reg += (uintptr_t)reg_base;
    + name = lsp1_mux_clk[i].mux.hw.init->name;
    ret = clk_hw_register(NULL, &lsp1_mux_clk[i].mux.hw);
    - if (ret) {
    - pr_warn("lsp1 clk %s init error!\n",
    - lsp1_mux_clk[i].mux.hw.init->name);
    - }
    + if (ret)
    + pr_warn("lsp1 clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(lsp1_gate_clk); i++) {
    @@ -888,11 +882,10 @@ static int __init lsp1_clocks_init(struct device_node *np)
    &lsp1_gate_clk[i].gate.hw;

    lsp1_gate_clk[i].gate.reg += (uintptr_t)reg_base;
    + name = lsp1_gate_clk[i].gate.hw.init->name;
    ret = clk_hw_register(NULL, &lsp1_gate_clk[i].gate.hw);
    - if (ret) {
    - pr_warn("lsp1 clk %s init error!\n",
    - lsp1_gate_clk[i].gate.hw.init->name);
    - }
    + if (ret)
    + pr_warn("lsp1 clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(lsp1_div_clk); i++) {
    @@ -901,11 +894,10 @@ static int __init lsp1_clocks_init(struct device_node *np)
    &lsp1_div_clk[i].div.hw;

    lsp1_div_clk[i].div.reg += (uintptr_t)reg_base;
    + name = lsp1_div_clk[i].div.hw.init->name;
    ret = clk_hw_register(NULL, &lsp1_div_clk[i].div.hw);
    - if (ret) {
    - pr_warn("lsp1 clk %s init error!\n",
    - lsp1_div_clk[i].div.hw.init->name);
    - }
    + if (ret)
    + pr_warn("lsp1 clk %s init error!\n", name);
    }

    ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
    @@ -979,6 +971,7 @@ static int __init audio_clocks_init(struct device_node *np)
    {
    void __iomem *reg_base;
    int i, ret;
    + const char *name;

    reg_base = of_iomap(np, 0);
    if (!reg_base) {
    @@ -992,11 +985,10 @@ static int __init audio_clocks_init(struct device_node *np)
    &audio_mux_clk[i].mux.hw;

    audio_mux_clk[i].mux.reg += (uintptr_t)reg_base;
    + name = audio_mux_clk[i].mux.hw.init->name;
    ret = clk_hw_register(NULL, &audio_mux_clk[i].mux.hw);
    - if (ret) {
    - pr_warn("audio clk %s init error!\n",
    - audio_mux_clk[i].mux.hw.init->name);
    - }
    + if (ret)
    + pr_warn("audio clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(audio_adiv_clk); i++) {
    @@ -1005,11 +997,10 @@ static int __init audio_clocks_init(struct device_node *np)
    &audio_adiv_clk[i].hw;

    audio_adiv_clk[i].reg_base += (uintptr_t)reg_base;
    + name = audio_adiv_clk[i].hw.init->name;
    ret = clk_hw_register(NULL, &audio_adiv_clk[i].hw);
    - if (ret) {
    - pr_warn("audio clk %s init error!\n",
    - audio_adiv_clk[i].hw.init->name);
    - }
    + if (ret)
    + pr_warn("audio clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(audio_div_clk); i++) {
    @@ -1018,11 +1009,10 @@ static int __init audio_clocks_init(struct device_node *np)
    &audio_div_clk[i].div.hw;

    audio_div_clk[i].div.reg += (uintptr_t)reg_base;
    + name = audio_div_clk[i].div.hw.init->name;
    ret = clk_hw_register(NULL, &audio_div_clk[i].div.hw);
    - if (ret) {
    - pr_warn("audio clk %s init error!\n",
    - audio_div_clk[i].div.hw.init->name);
    - }
    + if (ret)
    + pr_warn("audio clk %s init error!\n", name);
    }

    for (i = 0; i < ARRAY_SIZE(audio_gate_clk); i++) {
    @@ -1031,11 +1021,10 @@ static int __init audio_clocks_init(struct device_node *np)
    &audio_gate_clk[i].gate.hw;

    audio_gate_clk[i].gate.reg += (uintptr_t)reg_base;
    + name = audio_gate_clk[i].gate.hw.init->name;
    ret = clk_hw_register(NULL, &audio_gate_clk[i].gate.hw);
    - if (ret) {
    - pr_warn("audio clk %s init error!\n",
    - audio_gate_clk[i].gate.hw.init->name);
    - }
    + if (ret)
    + pr_warn("audio clk %s init error!\n", name);
    }

    ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-24 19:02    [W:4.253 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site