aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSarangdhar Joshi <spjoshi@codeaurora.org>2017-01-24 18:13:00 -0500
committerBjorn Andersson <bjorn.andersson@linaro.org>2017-02-06 16:05:22 -0500
commit7a20c64ddb3deeb08bbe1ca8e9bcafd3241a5e0e (patch)
tree604176fe4a825ec518be9da928b533a13a416c48
parent66a66aa74ee262f03432f84de55ae314c391d9f5 (diff)
remoteproc: Reduce asynchronous request_firmware to auto-boot only
The rproc_add_virtio_devices() requests firmware asynchronously and triggers boot if the auto_boot flag is set. However, this asynchronous call seems to be redundant for non auto-boot scenario since the rproc_boot() would call request_firmware() anyways. Move the auto_boot check to rproc_add() so that a redundant call to _request_firmware can be avoided for non auto-boot case. Signed-off-by: Sarangdhar Joshi <spjoshi@codeaurora.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-rw-r--r--drivers/remoteproc/remoteproc_core.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index a7ee05006cca..a112f5969d4a 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -972,9 +972,7 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
972{ 972{
973 struct rproc *rproc = context; 973 struct rproc *rproc = context;
974 974
975 /* if rproc is marked always-on, request it to boot */ 975 rproc_boot(rproc);
976 if (rproc->auto_boot)
977 rproc_boot(rproc);
978 976
979 release_firmware(fw); 977 release_firmware(fw);
980} 978}
@@ -1286,9 +1284,13 @@ int rproc_add(struct rproc *rproc)
1286 1284
1287 /* create debugfs entries */ 1285 /* create debugfs entries */
1288 rproc_create_debug_dir(rproc); 1286 rproc_create_debug_dir(rproc);
1289 ret = rproc_add_virtio_devices(rproc); 1287
1290 if (ret < 0) 1288 /* if rproc is marked always-on, request it to boot */
1291 return ret; 1289 if (rproc->auto_boot) {
1290 ret = rproc_add_virtio_devices(rproc);
1291 if (ret < 0)
1292 return ret;
1293 }
1292 1294
1293 /* expose to rproc_get_by_phandle users */ 1295 /* expose to rproc_get_by_phandle users */
1294 mutex_lock(&rproc_list_mutex); 1296 mutex_lock(&rproc_list_mutex);