remoteproc: Drop wait in __rproc_boot()

In the event that rproc_boot() is called before the firmware loaded
completion has been flagged it will wait with the mutex held,
obstructing the request_firmware_nowait() callback from completing the
wait.

As rproc_fw_config_virtio() has been reduced to only triggering
auto-boot there is no longer a reason for waiting in rproc_boot(), so
drop this.

Cc: Sarangdhar Joshi <spjoshi@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 064783cf6b32b0693d8a00c97c9a3e47648ca1ba..adf36b2cdfcc1b3e6a6e1c6e647855d43c39df5d 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1134,7 +1134,7 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
 
        /* if rproc is marked always-on, request it to boot */
        if (rproc->auto_boot)
-               rproc_boot_nowait(rproc);
+               rproc_boot(rproc);
 
        release_firmware(fw);
        /* allow rproc_del() contexts, if any, to proceed */
@@ -1232,7 +1232,6 @@ static void rproc_crash_handler_work(struct work_struct *work)
 /**
  * __rproc_boot() - boot a remote processor
  * @rproc: handle of a remote processor
- * @wait: wait for rproc registration completion
  *
  * Boot a remote processor (i.e. load its firmware, power it on, ...).
  *
@@ -1241,7 +1240,7 @@ static void rproc_crash_handler_work(struct work_struct *work)
  *
  * Returns 0 on success, and an appropriate error value otherwise.
  */
-static int __rproc_boot(struct rproc *rproc, bool wait)
+static int __rproc_boot(struct rproc *rproc)
 {
        const struct firmware *firmware_p;
        struct device *dev;
@@ -1275,10 +1274,6 @@ static int __rproc_boot(struct rproc *rproc, bool wait)
                goto downref_rproc;
        }
 
-       /* if rproc virtio is not yet configured, wait */
-       if (wait)
-               wait_for_completion(&rproc->firmware_loading_complete);
-
        ret = rproc_fw_boot(rproc, firmware_p);
 
        release_firmware(firmware_p);
@@ -1297,21 +1292,10 @@ unlock_mutex:
  */
 int rproc_boot(struct rproc *rproc)
 {
-       return __rproc_boot(rproc, true);
+       return __rproc_boot(rproc);
 }
 EXPORT_SYMBOL(rproc_boot);
 
-/**
- * rproc_boot_nowait() - boot a remote processor
- * @rproc: handle of a remote processor
- *
- * Same as rproc_boot() but don't wait for rproc registration completion
- */
-int rproc_boot_nowait(struct rproc *rproc)
-{
-       return __rproc_boot(rproc, false);
-}
-
 /**
  * rproc_shutdown() - power off the remote processor
  * @rproc: the remote processor