Merge tag 'v5.18' into next

[linux-2.6-microblaze.git] / drivers / remoteproc / qcom_q6v5.c

diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c
index 442a388..5280ec9 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5.c
+++ b/drivers/remoteproc/qcom_q6v5.c
@@ -8,6 +8,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+#include <linux/interconnect.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/soc/qcom/qcom_aoss.h>
@@ -51,9 +52,17 @@ int qcom_q6v5_prepare(struct qcom_q6v5 *q6v5)
 {
        int ret;
 
+       ret = icc_set_bw(q6v5->path, 0, UINT_MAX);
+       if (ret < 0) {
+               dev_err(q6v5->dev, "failed to set bandwidth request\n");
+               return ret;
+       }
+
        ret = q6v5_load_state_toggle(q6v5, true);
-       if (ret)
+       if (ret) {
+               icc_set_bw(q6v5->path, 0, 0);
                return ret;
+       }
 
        reinit_completion(&q6v5->start_done);
        reinit_completion(&q6v5->stop_done);
@@ -78,6 +87,9 @@ int qcom_q6v5_unprepare(struct qcom_q6v5 *q6v5)
        disable_irq(q6v5->handover_irq);
        q6v5_load_state_toggle(q6v5, false);
 
+       /* Disable interconnect vote, in case handover never happened */
+       icc_set_bw(q6v5->path, 0, 0);
+
        return !q6v5->handover_issued;
 }
 EXPORT_SYMBOL_GPL(qcom_q6v5_unprepare);
@@ -160,6 +172,8 @@ static irqreturn_t q6v5_handover_interrupt(int irq, void *data)
        if (q6v5->handover)
                q6v5->handover(q6v5);
 
+       icc_set_bw(q6v5->path, 0, 0);
+
        q6v5->handover_issued = true;
 
        return IRQ_HANDLED;
@@ -332,6 +346,11 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
                return load_state ? -ENOMEM : -EINVAL;
        }
 
+       q6v5->path = devm_of_icc_get(&pdev->dev, NULL);
+       if (IS_ERR(q6v5->path))
+               return dev_err_probe(&pdev->dev, PTR_ERR(q6v5->path),
+                                    "failed to acquire interconnect path\n");
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(qcom_q6v5_init);