soc: qcom: rpmh-rsc: Save base address of drv

Add changes to save drv's base address for rsc. This is
used to read drv's configuration such as solver mode is
supported or to write into CONTROL_TCS registers.

Signed-off-by: Maulik Shah <quic_mkshah@quicinc.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> # SM8450
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221018152837.619426-6-ulf.hansson@linaro.org

diff --git a/drivers/soc/qcom/rpmh-internal.h b/drivers/soc/qcom/rpmh-internal.h
index cd3d6ce137e3eaae139c2335a26c98936376c40f..7866bb1e53614971f245ec9952b27e287cb2572d 100644 (file)
--- a/drivers/soc/qcom/rpmh-internal.h
+++ b/drivers/soc/qcom/rpmh-internal.h
@@ -91,6 +91,7 @@ struct rpmh_ctrlr {
  * Resource State Coordinator controller (RSC)
  *
  * @name:               Controller identifier.
+ * @base:               Start address of the DRV registers in this controller.
  * @tcs_base:           Start address of the TCS registers in this controller.
  * @id:                 Instance id in the controller (Direct Resource Voter).
  * @num_tcs:            Number of TCSes in this DRV.
@@ -114,6 +115,7 @@ struct rpmh_ctrlr {
  */
 struct rsc_drv {
        const char *name;
+       void __iomem *base;
        void __iomem *tcs_base;
        int id;
        int num_tcs;

diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c
index 050b5f5c9f62ce3a4d19ec78b6cff68d581b7cf7..8e01697f59afe0919f62fab5f3c50259377dd91d 100644 (file)
--- a/drivers/soc/qcom/rpmh-rsc.c
+++ b/drivers/soc/qcom/rpmh-rsc.c
@@ -881,8 +881,7 @@ static int rpmh_rsc_pd_attach(struct rsc_drv *drv, struct device *dev)
        return ret;
 }
 
-static int rpmh_probe_tcs_config(struct platform_device *pdev,
-                                struct rsc_drv *drv, void __iomem *base)
+static int rpmh_probe_tcs_config(struct platform_device *pdev, struct rsc_drv *drv)
 {
        struct tcs_type_config {
                u32 type;
@@ -896,9 +895,9 @@ static int rpmh_probe_tcs_config(struct platform_device *pdev,
        ret = of_property_read_u32(dn, "qcom,tcs-offset", &offset);
        if (ret)
                return ret;
-       drv->tcs_base = base + offset;
+       drv->tcs_base = drv->base + offset;
 
-       config = readl_relaxed(base + DRV_PRNT_CHLD_CONFIG);
+       config = readl_relaxed(drv->base + DRV_PRNT_CHLD_CONFIG);
 
        max_tcs = config;
        max_tcs &= DRV_NUM_TCS_MASK << (DRV_NUM_TCS_SHIFT * drv->id);
@@ -960,7 +959,6 @@ static int rpmh_rsc_probe(struct platform_device *pdev)
        char drv_id[10] = {0};
        int ret, irq;
        u32 solver_config;
-       void __iomem *base;
 
        /*
         * Even though RPMh doesn't directly use cmd-db, all of its children
@@ -987,11 +985,11 @@ static int rpmh_rsc_probe(struct platform_device *pdev)
                drv->name = dev_name(&pdev->dev);
 
        snprintf(drv_id, ARRAY_SIZE(drv_id), "drv-%d", drv->id);
-       base = devm_platform_ioremap_resource_byname(pdev, drv_id);
-       if (IS_ERR(base))
-               return PTR_ERR(base);
+       drv->base = devm_platform_ioremap_resource_byname(pdev, drv_id);
+       if (IS_ERR(drv->base))
+               return PTR_ERR(drv->base);
 
-       ret = rpmh_probe_tcs_config(pdev, drv, base);
+       ret = rpmh_probe_tcs_config(pdev, drv);
        if (ret)
                return ret;
 
@@ -1014,7 +1012,7 @@ static int rpmh_rsc_probe(struct platform_device *pdev)
         * 'HW solver' mode where they can be in autonomous mode executing low
         * power mode to power down.
         */
-       solver_config = readl_relaxed(base + DRV_SOLVER_CONFIG);
+       solver_config = readl_relaxed(drv->base + DRV_SOLVER_CONFIG);
        solver_config &= DRV_HW_SOLVER_MASK << DRV_HW_SOLVER_SHIFT;
        solver_config = solver_config >> DRV_HW_SOLVER_SHIFT;
        if (!solver_config) {