[PATCH v4 3/4] remoteproc: stm32: Create sub-functions to request shutdown and release

[Arnaud Pouliquen]

To prepare for the support of TEE remoteproc, create sub-functions
that can be used in both cases, with and without TEE support.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliq...@foss.st.com>
---
 drivers/remoteproc/stm32_rproc.c | 84 +++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 33 deletions(-)

diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index 88623df7d0c3..8cd838df4e92 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -209,6 +209,54 @@ static int stm32_rproc_mbox_idx(struct rproc *rproc, const 
unsigned char *name)
        return -EINVAL;
 }
 
+static void stm32_rproc_request_shutdown(struct rproc *rproc)
+{
+       struct stm32_rproc *ddata = rproc->priv;
+       int err, dummy_data, idx;
+
+       /* Request shutdown of the remote processor */
+       if (rproc->state != RPROC_OFFLINE && rproc->state != RPROC_CRASHED) {
+               idx = stm32_rproc_mbox_idx(rproc, STM32_MBX_SHUTDOWN);
+               if (idx >= 0 && ddata->mb[idx].chan) {
+                       /* A dummy data is sent to allow to block on transmit. 
*/
+                       err = mbox_send_message(ddata->mb[idx].chan,
+                                               &dummy_data);
+                       if (err < 0)
+                               dev_warn(&rproc->dev, "warning: remote FW 
shutdown without ack\n");
+               }
+       }
+}
+
+static int stm32_rproc_release(struct rproc *rproc)
+{
+       struct stm32_rproc *ddata = rproc->priv;
+       unsigned int err = 0;
+
+       /* To allow platform Standby power mode, set remote proc Deep Sleep. */
+       if (ddata->pdds.map) {
+               err = regmap_update_bits(ddata->pdds.map, ddata->pdds.reg,
+                                        ddata->pdds.mask, 1);
+               if (err) {
+                       dev_err(&rproc->dev, "failed to set pdds\n");
+                       return err;
+               }
+       }
+
+       /* Update coprocessor state to OFF if available. */
+       if (ddata->m4_state.map) {
+               err = regmap_update_bits(ddata->m4_state.map,
+                                        ddata->m4_state.reg,
+                                        ddata->m4_state.mask,
+                                        M4_STATE_OFF);
+               if (err) {
+                       dev_err(&rproc->dev, "failed to set copro state\n");
+                       return err;
+               }
+       }
+
+       return 0;
+}
+
 static int stm32_rproc_prepare(struct rproc *rproc)
 {
        struct device *dev = rproc->dev.parent;
@@ -519,17 +567,9 @@ static int stm32_rproc_detach(struct rproc *rproc)
 static int stm32_rproc_stop(struct rproc *rproc)
 {
        struct stm32_rproc *ddata = rproc->priv;
-       int err, idx;
+       int err;
 
-       /* request shutdown of the remote processor */
-       if (rproc->state != RPROC_OFFLINE && rproc->state != RPROC_CRASHED) {
-               idx = stm32_rproc_mbox_idx(rproc, STM32_MBX_SHUTDOWN);
-               if (idx >= 0 && ddata->mb[idx].chan) {
-                       err = mbox_send_message(ddata->mb[idx].chan, "detach");
-                       if (err < 0)
-                               dev_warn(&rproc->dev, "warning: remote FW 
shutdown without ack\n");
-               }
-       }
+       stm32_rproc_request_shutdown(rproc);
 
        err = stm32_rproc_set_hold_boot(rproc, true);
        if (err)
@@ -541,29 +581,7 @@ static int stm32_rproc_stop(struct rproc *rproc)
                return err;
        }
 
-       /* to allow platform Standby power mode, set remote proc Deep Sleep */
-       if (ddata->pdds.map) {
-               err = regmap_update_bits(ddata->pdds.map, ddata->pdds.reg,
-                                        ddata->pdds.mask, 1);
-               if (err) {
-                       dev_err(&rproc->dev, "failed to set pdds\n");
-                       return err;
-               }
-       }
-
-       /* update coprocessor state to OFF if available */
-       if (ddata->m4_state.map) {
-               err = regmap_update_bits(ddata->m4_state.map,
-                                        ddata->m4_state.reg,
-                                        ddata->m4_state.mask,
-                                        M4_STATE_OFF);
-               if (err) {
-                       dev_err(&rproc->dev, "failed to set copro state\n");
-                       return err;
-               }
-       }
-
-       return 0;
+       return stm32_rproc_release(rproc);
 }
 
 static void stm32_rproc_kick(struct rproc *rproc, int vqid)
-- 
2.25.1