remoteproc: k3-r5: Refactor mbox request code in start

Refactor out the mailbox request and associated ping logic code
from k3_r5_rproc_start() function into its own separate function
so that it can be re-used in the soon to be added .attach() ops
callback.

Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220213201246.25952-3-s-anna@ti.com

diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
index 969531c05b13a36fa7d7ece9f822b1edf124f352..ff4e1fac1c7fb5d80f4b5735fd76fea95bf6820d 100644 (file)
--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
@@ -2,7 +2,7 @@
 /*
  * TI K3 R5F (MCU) Remote Processor driver
  *
- * Copyright (C) 2017-2020 Texas Instruments Incorporated - https://www.ti.com/
+ * Copyright (C) 2017-2022 Texas Instruments Incorporated - https://www.ti.com/
  *     Suman Anna <s-anna@ti.com>
  */
 
@@ -376,6 +376,44 @@ static inline int k3_r5_core_run(struct k3_r5_core *core)
                                       0, PROC_BOOT_CTRL_FLAG_R5_CORE_HALT);
 }
 
+static int k3_r5_rproc_request_mbox(struct rproc *rproc)
+{
+       struct k3_r5_rproc *kproc = rproc->priv;
+       struct mbox_client *client = &kproc->client;
+       struct device *dev = kproc->dev;
+       int ret;
+
+       client->dev = dev;
+       client->tx_done = NULL;
+       client->rx_callback = k3_r5_rproc_mbox_callback;
+       client->tx_block = false;
+       client->knows_txdone = false;
+
+       kproc->mbox = mbox_request_channel(client, 0);
+       if (IS_ERR(kproc->mbox)) {
+               ret = -EBUSY;
+               dev_err(dev, "mbox_request_channel failed: %ld\n",
+                       PTR_ERR(kproc->mbox));
+               return ret;
+       }
+
+       /*
+        * Ping the remote processor, this is only for sanity-sake for now;
+        * there is no functional effect whatsoever.
+        *
+        * Note that the reply will _not_ arrive immediately: this message
+        * will wait in the mailbox fifo until the remote processor is booted.
+        */
+       ret = mbox_send_message(kproc->mbox, (void *)RP_MBOX_ECHO_REQUEST);
+       if (ret < 0) {
+               dev_err(dev, "mbox_send_message failed: %d\n", ret);
+               mbox_free_channel(kproc->mbox);
+               return ret;
+       }
+
+       return 0;
+}
+
 /*
  * The R5F cores have controls for both a reset and a halt/run. The code
  * execution from DDR requires the initial boot-strapping code to be run
@@ -495,38 +533,14 @@ static int k3_r5_rproc_start(struct rproc *rproc)
 {
        struct k3_r5_rproc *kproc = rproc->priv;
        struct k3_r5_cluster *cluster = kproc->cluster;
-       struct mbox_client *client = &kproc->client;
        struct device *dev = kproc->dev;
        struct k3_r5_core *core;
        u32 boot_addr;
        int ret;
 
-       client->dev = dev;
-       client->tx_done = NULL;
-       client->rx_callback = k3_r5_rproc_mbox_callback;
-       client->tx_block = false;
-       client->knows_txdone = false;
-
-       kproc->mbox = mbox_request_channel(client, 0);
-       if (IS_ERR(kproc->mbox)) {
-               ret = -EBUSY;
-               dev_err(dev, "mbox_request_channel failed: %ld\n",
-                       PTR_ERR(kproc->mbox));
+       ret = k3_r5_rproc_request_mbox(rproc);
+       if (ret)
                return ret;
-       }
-
-       /*
-        * Ping the remote processor, this is only for sanity-sake for now;
-        * there is no functional effect whatsoever.
-        *
-        * Note that the reply will _not_ arrive immediately: this message
-        * will wait in the mailbox fifo until the remote processor is booted.
-        */
-       ret = mbox_send_message(kproc->mbox, (void *)RP_MBOX_ECHO_REQUEST);
-       if (ret < 0) {
-               dev_err(dev, "mbox_send_message failed: %d\n", ret);
-               goto put_mbox;
-       }
 
        boot_addr = rproc->bootaddr;
        /* TODO: add boot_addr sanity checking */