| Message ID | 20180618172230.241960-1-dianders@chromium.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On Mon, Jun 18 2018 at 11:23 -0600, Douglas Anderson wrote: >Children of RPMh will need access to cmd_db. Rather than having each >child have code to check if cmd_db is ready let's add the check to >RPMh. > >Suggested-by: Stephen Boyd <sboyd@kernel.org> >Signed-off-by: Douglas Anderson <dianders@chromium.org> Acked-by: Lina Iyer <ilina@codeaurora.org> >--- >This code is based upon v11 of Lina and Raju's RPMh series. > >With this we'll be able to remove this boilerplate code from >clk-rpmh.c and qcom-rpmh-regulator.c. Neither of these files has >landed upstream yet but patches are pretty far along. > > drivers/soc/qcom/rpmh-rsc.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > >diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c >index 144a058407c0..ad85523bdd3b 100644 >--- a/drivers/soc/qcom/rpmh-rsc.c >+++ b/drivers/soc/qcom/rpmh-rsc.c >@@ -18,6 +18,7 @@ > #include <linux/slab.h> > #include <linux/spinlock.h> > >+#include <soc/qcom/cmd-db.h> > #include <soc/qcom/tcs.h> > #include <dt-bindings/soc/qcom,rpmh-rsc.h> > >@@ -621,6 +622,18 @@ static int rpmh_rsc_probe(struct platform_device *pdev) > struct rsc_drv *drv; > int ret, irq; > >+ /* >+ * Even though RPMh doesn't directly use cmd-db, all of its children >+ * do. To avoid adding this check to our children we'll do it now. nit: Double space before To >+ */ >+ ret = cmd_db_ready(); >+ if (ret) { >+ if (ret != -EPROBE_DEFER) >+ dev_err(&pdev->dev, "Command DB not available (%d)\n", >+ ret); >+ return ret; >+ } >+ > drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL); > if (!drv) > return -ENOMEM; >-- >2.18.0.rc1.244.gcf134e6275-goog > -- 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 Mon 18 Jun 10:22 PDT 2018, Douglas Anderson wrote: > Children of RPMh will need access to cmd_db. Rather than having each > child have code to check if cmd_db is ready let's add the check to > RPMh. > > Suggested-by: Stephen Boyd <sboyd@kernel.org> > Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > This code is based upon v11 of Lina and Raju's RPMh series. > > With this we'll be able to remove this boilerplate code from > clk-rpmh.c and qcom-rpmh-regulator.c. Neither of these files has > landed upstream yet but patches are pretty far along. > > drivers/soc/qcom/rpmh-rsc.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c > index 144a058407c0..ad85523bdd3b 100644 > --- a/drivers/soc/qcom/rpmh-rsc.c > +++ b/drivers/soc/qcom/rpmh-rsc.c > @@ -18,6 +18,7 @@ > #include <linux/slab.h> > #include <linux/spinlock.h> > > +#include <soc/qcom/cmd-db.h> > #include <soc/qcom/tcs.h> > #include <dt-bindings/soc/qcom,rpmh-rsc.h> > > @@ -621,6 +622,18 @@ static int rpmh_rsc_probe(struct platform_device *pdev) > struct rsc_drv *drv; > int ret, irq; > > + /* > + * Even though RPMh doesn't directly use cmd-db, all of its children > + * do. To avoid adding this check to our children we'll do it now. > + */ > + ret = cmd_db_ready(); > + if (ret) { > + if (ret != -EPROBE_DEFER) > + dev_err(&pdev->dev, "Command DB not available (%d)\n", > + ret); > + return ret; > + } > + > drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL); > if (!drv) > return -ENOMEM; > -- > 2.18.0.rc1.244.gcf134e6275-goog > > -- > 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 -- 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
diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index 144a058407c0..ad85523bdd3b 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -18,6 +18,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> +#include <soc/qcom/cmd-db.h> #include <soc/qcom/tcs.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> @@ -621,6 +622,18 @@ static int rpmh_rsc_probe(struct platform_device *pdev) struct rsc_drv *drv; int ret, irq; + /* + * Even though RPMh doesn't directly use cmd-db, all of its children + * do. To avoid adding this check to our children we'll do it now. + */ + ret = cmd_db_ready(); + if (ret) { + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "Command DB not available (%d)\n", + ret); + return ret; + } + drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL); if (!drv) return -ENOMEM;
Children of RPMh will need access to cmd_db. Rather than having each child have code to check if cmd_db is ready let's add the check to RPMh. Suggested-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> --- This code is based upon v11 of Lina and Raju's RPMh series. With this we'll be able to remove this boilerplate code from clk-rpmh.c and qcom-rpmh-regulator.c. Neither of these files has landed upstream yet but patches are pretty far along. drivers/soc/qcom/rpmh-rsc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)