| Message ID | 20241220-sm6350-parent_map-v1-1-64f3d04cb2eb@fairphone.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | Add missing parent_map to clocks in SM6350 clock drivers | expand |
On 20.12.2024 10:03 AM, Luca Weiss wrote: > If a clk_rcg2 has a parent, it should also have parent_map defined, ^ freq_tbl > otherwise we'll get a NULL pointer dereference when calling clk_set_rate > like the following: > > [ 3.388105] Call trace: > [ 3.390664] qcom_find_src_index+0x3c/0x70 (P) > [ 3.395301] qcom_find_src_index+0x1c/0x70 (L) > [ 3.399934] _freq_tbl_determine_rate+0x48/0x100 > [ 3.404753] clk_rcg2_determine_rate+0x1c/0x28 > [ 3.409387] clk_core_determine_round_nolock+0x58/0xe4 > [ 3.421414] clk_core_round_rate_nolock+0x48/0xfc > [ 3.432974] clk_core_round_rate_nolock+0xd0/0xfc > [ 3.444483] clk_core_set_rate_nolock+0x8c/0x300 > [ 3.455886] clk_set_rate+0x38/0x14c > > Add the parent_map property for two clocks where it's missing and also > un-inline the parent_data as well to keep the matching parent_map and > parent_data together. The patch looks good otherwise Konrad
On Fri Dec 20, 2024 at 10:42 AM CET, Konrad Dybcio wrote: > On 20.12.2024 10:03 AM, Luca Weiss wrote: > > If a clk_rcg2 has a parent, it should also have parent_map defined, > > ^ > freq_tbl I was basing this on that part of the clk-rcg2.c, so for every parent there also needs to be a parent_map specified. int num_parents = clk_hw_get_num_parents(hw); [...] for (i = 0; i < num_parents; i++) if (cfg == rcg->parent_map[i].cfg) [...] Should I still change the commit message? I guess there's no clk_rcg2 without a parent at all? I guess I could reword it like that also or something? A clk_rcg2 needs to have a parent_map entry for every parent it has, otherwise [...] Regards Luca > > > otherwise we'll get a NULL pointer dereference when calling clk_set_rate > > like the following: > > > > [ 3.388105] Call trace: > > [ 3.390664] qcom_find_src_index+0x3c/0x70 (P) > > [ 3.395301] qcom_find_src_index+0x1c/0x70 (L) > > [ 3.399934] _freq_tbl_determine_rate+0x48/0x100 > > [ 3.404753] clk_rcg2_determine_rate+0x1c/0x28 > > [ 3.409387] clk_core_determine_round_nolock+0x58/0xe4 > > [ 3.421414] clk_core_round_rate_nolock+0x48/0xfc > > [ 3.432974] clk_core_round_rate_nolock+0xd0/0xfc > > [ 3.444483] clk_core_set_rate_nolock+0x8c/0x300 > > [ 3.455886] clk_set_rate+0x38/0x14c > > > > Add the parent_map property for two clocks where it's missing and also > > un-inline the parent_data as well to keep the matching parent_map and > > parent_data together. > > The patch looks good otherwise > > Konrad
On 20.12.2024 11:21 AM, Luca Weiss wrote: > On Fri Dec 20, 2024 at 10:42 AM CET, Konrad Dybcio wrote: >> On 20.12.2024 10:03 AM, Luca Weiss wrote: >>> If a clk_rcg2 has a parent, it should also have parent_map defined, >> >> ^ >> freq_tbl > > I was basing this on that part of the clk-rcg2.c, so for every parent > there also needs to be a parent_map specified. > > int num_parents = clk_hw_get_num_parents(hw); > [...] > for (i = 0; i < num_parents; i++) > if (cfg == rcg->parent_map[i].cfg) > [...] > > Should I still change the commit message? I guess there's no clk_rcg2 > without a parent at all? > > I guess I could reword it like that also or something? > > A clk_rcg2 needs to have a parent_map entry for every parent it has, > otherwise [...] > > Regards > Luca Okay I suppose it's fine as-is Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Konrad
diff --git a/drivers/clk/qcom/gcc-sm6350.c b/drivers/clk/qcom/gcc-sm6350.c index a811fad2aa2785fffbdee0d4bd3cd1133e4d0906..74346dc026068a224e173fdc0472fbaf878052c4 100644 --- a/drivers/clk/qcom/gcc-sm6350.c +++ b/drivers/clk/qcom/gcc-sm6350.c @@ -182,6 +182,14 @@ static const struct clk_parent_data gcc_parent_data_2_ao[] = { { .hw = &gpll0_out_odd.clkr.hw }, }; +static const struct parent_map gcc_parent_map_3[] = { + { P_BI_TCXO, 0 }, +}; + +static const struct clk_parent_data gcc_parent_data_3[] = { + { .fw_name = "bi_tcxo" }, +}; + static const struct parent_map gcc_parent_map_4[] = { { P_BI_TCXO, 0 }, { P_GPLL0_OUT_MAIN, 1 }, @@ -701,13 +709,12 @@ static struct clk_rcg2 gcc_ufs_phy_phy_aux_clk_src = { .cmd_rcgr = 0x3a0b0, .mnd_width = 0, .hid_width = 5, + .parent_map = gcc_parent_map_3, .freq_tbl = ftbl_gcc_ufs_phy_phy_aux_clk_src, .clkr.hw.init = &(struct clk_init_data){ .name = "gcc_ufs_phy_phy_aux_clk_src", - .parent_data = &(const struct clk_parent_data){ - .fw_name = "bi_tcxo", - }, - .num_parents = 1, + .parent_data = gcc_parent_data_3, + .num_parents = ARRAY_SIZE(gcc_parent_data_3), .ops = &clk_rcg2_ops, }, }; @@ -764,13 +771,12 @@ static struct clk_rcg2 gcc_usb30_prim_mock_utmi_clk_src = { .cmd_rcgr = 0x1a034, .mnd_width = 0, .hid_width = 5, + .parent_map = gcc_parent_map_3, .freq_tbl = ftbl_gcc_usb30_prim_mock_utmi_clk_src, .clkr.hw.init = &(struct clk_init_data){ .name = "gcc_usb30_prim_mock_utmi_clk_src", - .parent_data = &(const struct clk_parent_data){ - .fw_name = "bi_tcxo", - }, - .num_parents = 1, + .parent_data = gcc_parent_data_3, + .num_parents = ARRAY_SIZE(gcc_parent_data_3), .ops = &clk_rcg2_ops, }, };
If a clk_rcg2 has a parent, it should also have parent_map defined, otherwise we'll get a NULL pointer dereference when calling clk_set_rate like the following: [ 3.388105] Call trace: [ 3.390664] qcom_find_src_index+0x3c/0x70 (P) [ 3.395301] qcom_find_src_index+0x1c/0x70 (L) [ 3.399934] _freq_tbl_determine_rate+0x48/0x100 [ 3.404753] clk_rcg2_determine_rate+0x1c/0x28 [ 3.409387] clk_core_determine_round_nolock+0x58/0xe4 [ 3.421414] clk_core_round_rate_nolock+0x48/0xfc [ 3.432974] clk_core_round_rate_nolock+0xd0/0xfc [ 3.444483] clk_core_set_rate_nolock+0x8c/0x300 [ 3.455886] clk_set_rate+0x38/0x14c Add the parent_map property for two clocks where it's missing and also un-inline the parent_data as well to keep the matching parent_map and parent_data together. Fixes: 131abae905df ("clk: qcom: Add SM6350 GCC driver") Cc: <stable@vger.kernel.org> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> --- drivers/clk/qcom/gcc-sm6350.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)