Followup to "Make clk_hw::init NULL after clk registration"
Subsystems (6)
Stephen Boyd
maintainercover Followup to "Make clk_hw::init NULL after clk registration"
I found some more cases where the init structure is referenced from within the clk_hw struct after clk_registration is called. I suspect the rtc driver fix is useful to avoid crashes on Allwinner devices, reported by kernel-ci.
Stephen Boyd (4):
clk: milbeaut: Don't reference clk_init_data after registration
clk: zx296718: Don't reference clk_init_data after registration
rtc: sun6i: Don't reference clk_init_data after registration
clk: qcom: Remove error prints from DFS registration
drivers/clk/clk-milbeaut.c | 2 +- drivers/clk/qcom/clk-rcg2.c | 8 +-- drivers/clk/zte/clk-zx296718.c | 109 +++++++++++++++------------------ drivers/rtc/rtc-sun6i.c | 2 +- 4 files changed, 52 insertions(+), 69 deletions(-)
Signature · 1 line
Sent by a computer through tubes
Stephen Boyd
maintainerPATCH 1/4 clk: milbeaut: Don't reference clk_init_data after registration
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.
--- drivers/clk/clk-milbeaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-milbeaut.c +1 -1
@@ -437,7 +437,7 @@ static int m10v_clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,if (readl_poll_timeout (divider->write_valid_reg, val, !val,M10V_UPOLL_RATE ,M10V_UTIMEOUT ))pr_err ("%s:%s couldn't stabilize\n" , - __func__, divider->hw.init->name); + __func__,clk_hw_get_name (hw)); }if (divider->lock)
Signature · 1 line
Sent by a computer through tubes
Re: [PATCH 1/4] clk: milbeaut: Don't reference clk_init_data after registration
Quoting Stephen Boyd (2019-08-15 09:00:17)
Quoted 8 lines
A future patch is going to change semantics of
clk_register()so thatclk_hw::initis 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 Sugaya Taichi <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH 2/4 clk: zx296718: Don't reference clk_init_data after registration
In reply to Stephen BoydA 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.
--- drivers/clk/zte/clk-zx296718.c | 109 +++++++++++++++------------------ 1 file changed, 49 insertions(+), 60 deletions(-)
drivers/clk/zte/clk-zx296718.c +49 -60
@@ -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,
Signature · 1 line
Sent by a computer through tubes
Re: [PATCH 2/4] clk: zx296718: Don't reference clk_init_data after registration
Quoting Stephen Boyd (2019-08-15 09:00:18)
Quoted 9 lines
A future patch is going to change semantics of
clk_register()so thatclk_hw::initis 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 <[email protected]>Cc Shawn Guo <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH 3/4 rtc: sun6i: Don't reference clk_init_data after registration
In reply to Stephen BoydA 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.
---
Please ack so I can take this through clk tree.
drivers/rtc/rtc-sun6i.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-sun6i.c +1 -1
@@ -279,7 +279,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,of_property_read_string_index (node,"clock-output-names" ,1 , &clkout_name); - rtc->ext_losc =clk_register_gate (NULL , clkout_name, rtc->hw.init->name, + rtc->ext_losc =clk_register_gate (NULL , clkout_name, init.name,0 , rtc->base +SUN6I_LOSC_OUT_GATING ,SUN6I_LOSC_OUT_GATING_EN_OFFSET ,0 , &rtc->lock);
Signature · 1 line
Sent by a computer through tubes
Re: [PATCH 3/4] rtc: sun6i: Don't reference clk_init_data after registration
Quoted 11 lines · Stephen Boyd
A future patch is going to change semantics of
clk_register()so thatclk_hw::initis 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 Alessandro Zummo <[email protected]>Cc Alexandre Belloni <[email protected]>Cc Maxime Ripard <[email protected]>Cc Chen-Yu Tsai <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Stephen Boyd
maintainerRe: [PATCH 3/4] rtc: sun6i: Don't reference clk_init_data after registration
In reply to Stephen BoydQuoting Stephen Boyd (2019-08-15 09:00:19)
Quoted 5 lines
A future patch is going to change semantics of
clk_register()so thatclk_hw::initis guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions.
Quoted 7 lines
Cc Alessandro Zummo <[email protected]>Cc Alexandre Belloni <[email protected]>Cc Maxime Ripard <[email protected]>Cc Chen-Yu Tsai <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Looks like this fixed the sunxi boot crashes in -next. I'll add a tag for kernelci credit.
Re: [PATCH 3/4] rtc: sun6i: Don't reference clk_init_data after registration
In reply to Stephen BoydQuoted 10 lines · Stephen Boyd
A future patch is going to change semantics of
clk_register()so thatclk_hw::initis 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 Alessandro Zummo <[email protected]>Cc Alexandre Belloni <[email protected]>Cc Maxime Ripard <[email protected]>Cc Chen-Yu Tsai <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 23 lines
---
Please ack so I can take this through clk tree.
drivers/rtc/rtc-sun6i.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/rtc/rtc-sun6i.c +1
-1@@ -279,7 +279,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,of_property_read_string_index (node,"clock-output-names" ,1 , &clkout_name); - rtc->ext_losc =clk_register_gate (NULL , clkout_name, rtc->hw.init->name, + rtc->ext_losc =clk_register_gate (NULL , clkout_name, init.name,0 , rtc->base +SUN6I_LOSC_OUT_GATING ,SUN6I_LOSC_OUT_GATING_EN_OFFSET ,0 , &rtc->lock);Signature · 1 line
Sent by a computer through tubes
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH 3/4] rtc: sun6i: Don't reference clk_init_data after registration
In reply to Stephen BoydQuoting Stephen Boyd (2019-08-15 09:00:19)
Quoted 11 lines
A future patch is going to change semantics of
clk_register()so thatclk_hw::initis 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 Alessandro Zummo <[email protected]>Cc Alexandre Belloni <[email protected]>Cc Maxime Ripard <[email protected]>Cc Chen-Yu Tsai <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH 4/4 clk: qcom: Remove error prints from DFS registration
In reply to Stephen BoydThese aren't useful and they reference the init structure name. Let's just drop them.
--- drivers/clk/qcom/clk-rcg2.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/clk/qcom/clk-rcg2.c +1 -7
@@ -1105,8 +1105,6 @@ static int clk_rcg2_enable_dfs(const struct clk_rcg_dfs_data *data, rcg->freq_tbl =NULL ; -pr_debug ("DFS registered for clk %s\n" , init->name); -return 0 ; }
@@ -1117,12 +1115,8 @@ int qcom_cc_register_rcg_dfs(struct regmap *regmap,for (i =0 ; i < len; i++) { ret =clk_rcg2_enable_dfs (&rcgs[i], regmap); -if (ret) { -const char *name = rcgs[i].init->name; - -pr_err ("DFS register failed for clk %s\n" , name); +if (ret)return ret; - } }return 0 ;
Signature · 1 line
Sent by a computer through tubes
Re: [PATCH 4/4] clk: qcom: Remove error prints from DFS registration
Quoted 6 lines · Stephen Boyd
These aren't useful and they reference the init structure name. Let's just drop them.
Cc Taniya Das <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Signature · 4 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation. --
Re: [PATCH 4/4] clk: qcom: Remove error prints from DFS registration
In reply to Stephen BoydQuoting Stephen Boyd (2019-08-15 09:00:20)
Quoted 6 lines
These aren't useful and they reference the init structure name. Let's just drop them.
Cc Taniya Das <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Quoted 4 lines · Stephen Boyd
I found some more cases where the init structure is referenced from within the
clk_hwstruct afterclk_registrationis called. I suspect the rtc driver fix is useful to avoid crashes on Allwinner devices, reported by kernel-ci.
Please feel free to add this trailer where appropriate:
Thanks,
Guillaume