| Message ID | 20161121140450.12353-1-georgi.djakov@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On 11/21, Georgi Djakov wrote: > The clk_hw_onecell_data struct is missing references to the > actual clocks. Fix this. > > Reported-by: Michael Scott <michael.scott@linaro.org> > Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> > --- > drivers/clk/qcom/clk-smd-rpm.c | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c > index a27013dbc0aa..58821f7213b0 100644 > --- a/drivers/clk/qcom/clk-smd-rpm.c > +++ b/drivers/clk/qcom/clk-smd-rpm.c > @@ -148,8 +148,7 @@ struct clk_smd_rpm_req { > > struct rpm_cc { > struct qcom_rpm *rpm; > - struct clk_hw_onecell_data data; > - struct clk_hw *hws[]; > + struct clk_hw_onecell_data *data; How about rolling our own xlate function to return hw pointers? We already have a list of hws here, so it doesn't seem like much more to do.
On 11/22/2016 01:13 AM, Stephen Boyd wrote: > On 11/21, Georgi Djakov wrote: >> The clk_hw_onecell_data struct is missing references to the >> actual clocks. Fix this. >> >> Reported-by: Michael Scott <michael.scott@linaro.org> >> Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> >> --- >> drivers/clk/qcom/clk-smd-rpm.c | 20 +++++++++----------- >> 1 file changed, 9 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c >> index a27013dbc0aa..58821f7213b0 100644 >> --- a/drivers/clk/qcom/clk-smd-rpm.c >> +++ b/drivers/clk/qcom/clk-smd-rpm.c >> @@ -148,8 +148,7 @@ struct clk_smd_rpm_req { >> >> struct rpm_cc { >> struct qcom_rpm *rpm; >> - struct clk_hw_onecell_data data; >> - struct clk_hw *hws[]; >> + struct clk_hw_onecell_data *data; > > How about rolling our own xlate function to return hw pointers? > We already have a list of hws here, so it doesn't seem like much > more to do. We could do this, but is there any benefit of adding and using our own xlate function instead of the of_clk_hw_onecell_get, which is already there? Maybe I'm missing something..? Thanks, Georgi -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/22, Georgi Djakov wrote: > On 11/22/2016 01:13 AM, Stephen Boyd wrote: > >On 11/21, Georgi Djakov wrote: > >>The clk_hw_onecell_data struct is missing references to the > >>actual clocks. Fix this. > >> > >>Reported-by: Michael Scott <michael.scott@linaro.org> > >>Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> > >>--- > >> drivers/clk/qcom/clk-smd-rpm.c | 20 +++++++++----------- > >> 1 file changed, 9 insertions(+), 11 deletions(-) > >> > >>diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c > >>index a27013dbc0aa..58821f7213b0 100644 > >>--- a/drivers/clk/qcom/clk-smd-rpm.c > >>+++ b/drivers/clk/qcom/clk-smd-rpm.c > >>@@ -148,8 +148,7 @@ struct clk_smd_rpm_req { > >> > >> struct rpm_cc { > >> struct qcom_rpm *rpm; > >>- struct clk_hw_onecell_data data; > >>- struct clk_hw *hws[]; > >>+ struct clk_hw_onecell_data *data; > > > >How about rolling our own xlate function to return hw pointers? > >We already have a list of hws here, so it doesn't seem like much > >more to do. > > We could do this, but is there any benefit of adding and using our own > xlate function instead of the of_clk_hw_onecell_get, which is already > there? Maybe I'm missing something..? > Yes, the benefit is reusing the static array of rpm clocks that already exist. In a sense, we already have the hw_onecell_data array in those list of clocks. Now we just need to implement the function to return them to the framework when the appropriate identifier is requested.
diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c index a27013dbc0aa..58821f7213b0 100644 --- a/drivers/clk/qcom/clk-smd-rpm.c +++ b/drivers/clk/qcom/clk-smd-rpm.c @@ -148,8 +148,7 @@ struct clk_smd_rpm_req { struct rpm_cc { struct qcom_rpm *rpm; - struct clk_hw_onecell_data data; - struct clk_hw *hws[]; + struct clk_hw_onecell_data *data; }; struct rpm_smd_clk_desc { @@ -470,9 +469,7 @@ MODULE_DEVICE_TABLE(of, rpm_smd_clk_match_table); static int rpm_smd_clk_probe(struct platform_device *pdev) { - struct clk_hw **hws; struct rpm_cc *rcc; - struct clk_hw_onecell_data *data; int ret; size_t num_clks, i; struct qcom_smd_rpm *rpm; @@ -492,14 +489,13 @@ static int rpm_smd_clk_probe(struct platform_device *pdev) rpm_smd_clks = desc->clks; num_clks = desc->num_clks; - rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc) + sizeof(*hws) * num_clks, - GFP_KERNEL); + rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc), GFP_KERNEL); if (!rcc) return -ENOMEM; - hws = rcc->hws; - data = &rcc->data; - data->num = num_clks; + rcc->data = devm_kzalloc(&pdev->dev, sizeof(*rcc->data) + num_clks * + sizeof(*rcc->data->hws), GFP_KERNEL); + rcc->data->num = num_clks; for (i = 0; i < num_clks; i++) { if (!rpm_smd_clks[i]) @@ -518,17 +514,19 @@ static int rpm_smd_clk_probe(struct platform_device *pdev) for (i = 0; i < num_clks; i++) { if (!rpm_smd_clks[i]) { - data->hws[i] = ERR_PTR(-ENOENT); + rcc->data->hws[i] = ERR_PTR(-ENOENT); continue; } ret = devm_clk_hw_register(&pdev->dev, &rpm_smd_clks[i]->hw); if (ret) goto err; + + rcc->data->hws[i] = &rpm_smd_clks[i]->hw; } ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get, - data); + rcc->data); if (ret) goto err;
The clk_hw_onecell_data struct is missing references to the actual clocks. Fix this. Reported-by: Michael Scott <michael.scott@linaro.org> Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> --- drivers/clk/qcom/clk-smd-rpm.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html