remoteproc: qcom: q6v5: Query sysmon before graceful shutdown

Requesting a graceful shutdown through the shared memory state signals
will not be acked in the event that sysmon has already successfully shut
down the remote firmware. So extend the stop request API to optionally
take the remoteproc's sysmon instance and query if there's already been
a successful shutdown attempt, before doing the signal dance.

Tested-by: Steev Klimaszewski <steev@kali.org>
Reviewed-by: Rishabh Bhatnagar <rishabhb@codeaurora.org>
Link: https://lore.kernel.org/r/20201122054135.802935-4-bjorn.andersson@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c
index fd6fd36268d9310cb469c03558fe3306b47b34f6..9627a950928e16b188d25fb6f13bf3e3b159b725 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5.c
+++ b/drivers/remoteproc/qcom_q6v5.c
@@ -13,6 +13,7 @@
 #include <linux/soc/qcom/smem.h>
 #include <linux/soc/qcom/smem_state.h>
 #include <linux/remoteproc.h>
+#include "qcom_common.h"
 #include "qcom_q6v5.h"
 
 #define Q6V5_PANIC_DELAY_MS    200
@@ -146,15 +147,20 @@ static irqreturn_t q6v5_stop_interrupt(int irq, void *data)
 /**
  * qcom_q6v5_request_stop() - request the remote processor to stop
  * @q6v5:      reference to qcom_q6v5 context
+ * @sysmon:    reference to the remote's sysmon instance, or NULL
  *
  * Return: 0 on success, negative errno on failure
  */
-int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5)
+int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5, struct qcom_sysmon *sysmon)
 {
        int ret;
 
        q6v5->running = false;
 
+       /* Don't perform SMP2P dance if sysmon already shut down the remote */
+       if (qcom_sysmon_shutdown_acked(sysmon))
+               return 0;
+
        qcom_smem_state_update_bits(q6v5->state,
                                    BIT(q6v5->stop_bit), BIT(q6v5->stop_bit));
 

diff --git a/drivers/remoteproc/qcom_q6v5.h b/drivers/remoteproc/qcom_q6v5.h
index c4ed887c1499b053d1c5aaaaff1784d59a924045..1c212f670cbc58db30e692ea5ca1d3e8ef716820 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5.h
+++ b/drivers/remoteproc/qcom_q6v5.h
@@ -8,6 +8,7 @@
 
 struct rproc;
 struct qcom_smem_state;
+struct qcom_sysmon;
 
 struct qcom_q6v5 {
        struct device *dev;
@@ -40,7 +41,7 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
 
 int qcom_q6v5_prepare(struct qcom_q6v5 *q6v5);
 int qcom_q6v5_unprepare(struct qcom_q6v5 *q6v5);
-int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5);
+int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5, struct qcom_sysmon *sysmon);
 int qcom_q6v5_wait_for_start(struct qcom_q6v5 *q6v5, int timeout);
 unsigned long qcom_q6v5_panic(struct qcom_q6v5 *q6v5);
 

diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index efb2c1aa80a3c7b08e204e402b4867efc7fe0859..9db0380236e795794d92897067ba9e7ea3bcee6c 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -264,7 +264,7 @@ static int adsp_stop(struct rproc *rproc)
        int handover;
        int ret;
 
-       ret = qcom_q6v5_request_stop(&adsp->q6v5);
+       ret = qcom_q6v5_request_stop(&adsp->q6v5, adsp->sysmon);
        if (ret == -ETIMEDOUT)
                dev_err(adsp->dev, "timed out on wait\n");
 

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index 3e2b16ac2e32d58c873549415f887ebc0b4c921d..a156a2a2a18d4fd2e3aca21a596cbb6b5fd7d5fa 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -1383,7 +1383,7 @@ static int q6v5_stop(struct rproc *rproc)
        struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
        int ret;
 
-       ret = qcom_q6v5_request_stop(&qproc->q6v5);
+       ret = qcom_q6v5_request_stop(&qproc->q6v5, qproc->sysmon);
        if (ret == -ETIMEDOUT)
                dev_err(qproc->dev, "timed out on wait\n");
 

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 3837f23995e056f8f45f9ae2e4888ebdf798e39b..ed1772bfa55d3a958422e35cfa63843a55651990 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -214,7 +214,7 @@ static int adsp_stop(struct rproc *rproc)
        int handover;
        int ret;
 
-       ret = qcom_q6v5_request_stop(&adsp->q6v5);
+       ret = qcom_q6v5_request_stop(&adsp->q6v5, adsp->sysmon);
        if (ret == -ETIMEDOUT)
                dev_err(adsp->dev, "timed out on wait\n");
 

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index 8846ef0b0f1a23d9ee347907fa70173a970340cd..78ebe1168b3328f60fd4e5f2a30aa20e4556bfba 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -390,7 +390,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
        int ret;
 
        /* WCSS powerdown */
-       ret = qcom_q6v5_request_stop(&wcss->q6v5);
+       ret = qcom_q6v5_request_stop(&wcss->q6v5, NULL);
        if (ret == -ETIMEDOUT) {
                dev_err(wcss->dev, "timed out on wait\n");
                return ret;