clk: qcom: ipq8074: fix PCI-E clock oops
Subsystems (3)
PATCH 1/1 clk: qcom: ipq8074: fix PCI-E clock oops
Fix PCI-E clock related kernel oops that are causes by missing parent_names.
Without the use of parent_names kernel will panic on clk_core_get_parent_by_index() due to a NULL pointer.
Without this earlycon is needed to even catch the OOPS as it will reset the board before serial is initialized.
--- drivers/clk/qcom/gcc-ipq8074.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/clk/qcom/gcc-ipq8074.c +5 -6
@@ -4357,8 +4357,7 @@ static struct clk_rcg2 pcie0_rchng_clk_src = { .parent_map = gcc_xo_gpll0_map, .clkr.hw.init = &(struct clk_init_data ){ .name ="pcie0_rchng_clk_src" , - .parent_hws = (const struct clk_hw *[]) { - &gpll0.clkr.hw }, + .parent_names = gcc_xo_gpll0, .num_parents =2 , .ops = &clk_rcg2_ops, },
@@ -4372,8 +4371,8 @@ static struct clk_branch gcc_pcie0_rchng_clk = { .enable_mask = BIT(1), .hw.init = &(struct clk_init_data ){ .name ="gcc_pcie0_rchng_clk" , - .parent_hws = (const struct clk_hw *[]){ - &pcie0_rchng_clk_src.clkr.hw, + .parent_names = (const char *[]){ +"pcie0_rchng_clk_src" , }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT ,
@@ -4390,8 +4389,8 @@ static struct clk_branch gcc_pcie0_axi_s_bridge_clk = { .enable_mask = BIT(0), .hw.init = &(struct clk_init_data ){ .name ="gcc_pcie0_axi_s_bridge_clk" , - .parent_hws = (const struct clk_hw *[]){ - &pcie0_axi_clk_src.clkr.hw, + .parent_names = (const char *[]){ +"pcie0_axi_clk_src" }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT ,
Signature · 1 line
2.31.1
Stephen Boyd
maintainerQuoting Robert Marko (2021-05-18 10:51:53)
Quoted 8 lines
Fix PCI-E clock related kernel oops that are causes by missing
parent_names.Without the use of
parent_nameskernel will panic onclk_core_get_parent_by_index()due to a NULL pointer.Without this earlycon is needed to even catch the OOPS as it will reset the board before serial is initialized.
Can you share the oops message here in the commit text?
Quoted 12 lines
Fixes f0cfcf1ade20 ("clk: qcom: ipq8074: Add missing clocks for pcie")Signed-off-by Robert Marko <[email protected]>--- drivers/clk/qcom/gcc-ipq8074.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)drivers/clk/qcom/gcc-ipq8074.c +0
-0
drivers/clk/qcom/gcc-ipq8074.c static struct clk_rcg2 pcie0_rchng_clk_src = { · line 4360
Quoted 6 lines
drivers/clk/qcom/gcc-ipq8074.c +1
-2@@ -4357,8 +4357,7 @@ static struct clk_rcg2 pcie0_rchng_clk_src = { .parent_map = gcc_xo_gpll0_map, .clkr.hw.init = &(struct clk_init_data ){ .name ="pcie0_rchng_clk_src" , - .parent_hws = (const struct clk_hw *[]) { - &gpll0.clkr.hw }, + .parent_names = gcc_xo_gpll0,
This seems to imply that we need to have two parents but we didn't realize that was the case. Ouch! Please use a struct clk_parent_data array and then use the firmware name for XO and the clk_hw pointer for gpll0.
Quoted 15 lines
drivers/clk/qcom/gcc-ipq8074.c +2
-2.num_parents = 2, .ops = &clk_rcg2_ops, },@@ -4372,8 +4371,8 @@ static struct clk_branch gcc_pcie0_rchng_clk = { .enable_mask = BIT(1), .hw.init = &(struct clk_init_data ){ .name ="gcc_pcie0_rchng_clk" , - .parent_hws = (const struct clk_hw *[]){ - &pcie0_rchng_clk_src.clkr.hw, + .parent_names = (const char *[]){ +"pcie0_rchng_clk_src" , }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT ,
drivers/clk/qcom/gcc-ipq8074.c static struct clk_branch gcc_pcie0_axi_s_bridge_clk = { · line 4393
Quoted 7 lines
drivers/clk/qcom/gcc-ipq8074.c +2
-2@@ -4390,8 +4389,8 @@ static struct clk_branch gcc_pcie0_axi_s_bridge_clk = { .enable_mask = BIT(0), .hw.init = &(struct clk_init_data ){ .name ="gcc_pcie0_axi_s_bridge_clk" , - .parent_hws = (const struct clk_hw *[]){ - &pcie0_axi_clk_src.clkr.hw, + .parent_names = (const char *[]){ +"pcie0_axi_clk_src"
These two hunks can be dropped.
Quoted 53 lines · Stephen Boyd
Quoting Robert Marko (2021-05-18 10:51:53)
Quoted 8 lines
Fix PCI-E clock related kernel oops that are causes by missing
parent_names.Without the use of
parent_nameskernel will panic onclk_core_get_parent_by_index()due to a NULL pointer.Without this earlycon is needed to even catch the OOPS as it will reset the board before serial is initialized.
Can you share the oops message here in the commit text?
Quoted 12 lines
Fixes f0cfcf1ade20 ("clk: qcom: ipq8074: Add missing clocks for pcie")Signed-off-by Robert Marko <[email protected]>--- drivers/clk/qcom/gcc-ipq8074.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)drivers/clk/qcom/gcc-ipq8074.c +0
-0drivers/clk/qcom/gcc-ipq8074.c static struct clk_rcg2 pcie0_rchng_clk_src = { · line 4360
Quoted 6 lines
drivers/clk/qcom/gcc-ipq8074.c +1
-2@@ -4357,8 +4357,7 @@ static struct clk_rcg2 pcie0_rchng_clk_src = { .parent_map = gcc_xo_gpll0_map, .clkr.hw.init = &(struct clk_init_data ){ .name ="pcie0_rchng_clk_src" , - .parent_hws = (const struct clk_hw *[]) { - &gpll0.clkr.hw }, + .parent_names = gcc_xo_gpll0,This seems to imply that we need to have two parents but we didn't realize that was the case. Ouch! Please use a struct
clk_parent_dataarray and then use the firmware name for XO and theclk_hwpointer for gpll0.Quoted 16 lines
drivers/clk/qcom/gcc-ipq8074.c +2
-2.num_parents = 2, .ops = &clk_rcg2_ops, },@@ -4372,8 +4371,8 @@ static struct clk_branch gcc_pcie0_rchng_clk = { .enable_mask = BIT(1), .hw.init = &(struct clk_init_data ){ .name ="gcc_pcie0_rchng_clk" , - .parent_hws = (const struct clk_hw *[]){ - &pcie0_rchng_clk_src.clkr.hw, + .parent_names = (const char *[]){ +"pcie0_rchng_clk_src" , }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT ,@@ -4390,8 +4389,8 @@ static struct clk_branch gcc_pcie0_axi_s_bridge_clk = { .enable_mask = BIT(0),
Quoted 8 lines
drivers/clk/qcom/gcc-ipq8074.c static struct clk_branch gcc_pcie0_axi_s_bridge_clk = { · line 4393
Quoted 6 lines
drivers/clk/qcom/gcc-ipq8074.c +2
-2.hw.init = &(struct clk_init_data){ .name ="gcc_pcie0_axi_s_bridge_clk" , - .parent_hws = (const struct clk_hw *[]){ - &pcie0_axi_clk_src.clkr.hw, + .parent_names = (const char *[]){ +"pcie0_axi_clk_src" These two hunks can be dropped.
Hi Stephen, sorry for the really late reply.
Essentially it looks this is not necessary in the newer kernels, I tested again with 5.14 and newer and I don't have a panic anymore. I was hitting the issue with 5.10 kernel.
Regards,
Robert