Skip to contentSkip to conversation

drivers: qcom: rpmh-rsc: Check cmd_db_ready() to help children

PATCH New Douglas Anderson 1 participant 1 message Jun 18, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drivers: qcom: rpmh-rsc: Check cmd_db_ready() to help children

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.

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.

===
This code is based upon v11 of Lina and Raju's RPMh series.

---

Changes in v2:
- 1 space after a period as per Lina

 drivers/soc/qcom/rpmh-rsc.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/soc/qcom/rpmh-rsc.c +13 -0
index 144a058407c0..c0f9cec92b13 100644
@@ -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;
Signature · 1 line
2.18.0.rc1.244.gcf134e6275-goog