| Message ID | 20240911094516.16901-1-quic_rlaggysh@quicinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | [V2] interconnect: qcom: icc-rpmh: probe defer incase of missing QoS clock dependency | expand |
On Wed, Sep 11, 2024 at 09:45:16AM GMT, Raviteja Laggyshetty wrote: > Return -EPROBE_DEFER from interconnect provider incase probe defer is > received from devm_clk_bulk_get_all(). This would help in reattempting > the inteconnect driver probe, once the required QoS clocks are > available. > Might be a bit overzealous, but to me this feels like a fix so something like: Fixes: 0a7be6b35da8 ("interconnect: qcom: icc-rpmh: Add QoS configuration support") might be appropriate? What are your thoughts? > Suggested-by: Bjorn Andersson <andersson@kernel.org> > Signed-off-by: Raviteja Laggyshetty <quic_rlaggysh@quicinc.com> > --- > Changes in v2: > - Removed the qos_clk_required rename change and posted it as separate > patch. > - As suggested, dev_err_probe is used for reporting the probe defer > error message. > --- > drivers/interconnect/qcom/icc-rpmh.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c > index f49a8e0cb03c..adacd6f7d6a8 100644 > --- a/drivers/interconnect/qcom/icc-rpmh.c > +++ b/drivers/interconnect/qcom/icc-rpmh.c > @@ -311,6 +311,9 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev) > } > > qp->num_clks = devm_clk_bulk_get_all(qp->dev, &qp->clks); > + if (qp->num_clks == -EPROBE_DEFER) > + return dev_err_probe(dev, qp->num_clks, "Failed to get QoS clocks\n"); > + > if (qp->num_clks < 0 || (!qp->num_clks && desc->qos_clks_required)) { > dev_info(dev, "Skipping QoS, failed to get clk: %d\n", qp->num_clks); > goto skip_qos_config; > -- > 2.39.2 > >
diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c index f49a8e0cb03c..adacd6f7d6a8 100644 --- a/drivers/interconnect/qcom/icc-rpmh.c +++ b/drivers/interconnect/qcom/icc-rpmh.c @@ -311,6 +311,9 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev) } qp->num_clks = devm_clk_bulk_get_all(qp->dev, &qp->clks); + if (qp->num_clks == -EPROBE_DEFER) + return dev_err_probe(dev, qp->num_clks, "Failed to get QoS clocks\n"); + if (qp->num_clks < 0 || (!qp->num_clks && desc->qos_clks_required)) { dev_info(dev, "Skipping QoS, failed to get clk: %d\n", qp->num_clks); goto skip_qos_config;
Return -EPROBE_DEFER from interconnect provider incase probe defer is received from devm_clk_bulk_get_all(). This would help in reattempting the inteconnect driver probe, once the required QoS clocks are available. Suggested-by: Bjorn Andersson <andersson@kernel.org> Signed-off-by: Raviteja Laggyshetty <quic_rlaggysh@quicinc.com> --- Changes in v2: - Removed the qos_clk_required rename change and posted it as separate patch. - As suggested, dev_err_probe is used for reporting the probe defer error message. --- drivers/interconnect/qcom/icc-rpmh.c | 3 +++ 1 file changed, 3 insertions(+)