remoteproc: Remove firmware_loading_complete

Commit Message

Sarangdhar Joshi Dec. 13, 2016, 11:23 p.m. UTC

rproc_del() waits on firmware_loading_complete in order to
make sure rproc_add() completed successfully before calling
rproc_shutdown().  However since rproc_add() will always be
called before rproc_del(), we do not need to wait on
firmware_loading_complete. Drop this completion variable
altogether.

Signed-off-by: Sarangdhar Joshi <[e-mail]>
---

This patch depends on e9b4f9efff5021 ("remoteproc: Drop wait in __rproc_boot()")

 drivers/remoteproc/remoteproc_core.c | 12 +-----------
 include/linux/remoteproc.h           |  2 --
 2 files changed, 1 insertion(+), 13 deletions(-)

Comments

kernel test robot Dec. 14, 2016, 4:50 a.m. UTC | #1

Hi Sarangdhar,

[auto build test ERROR on next-20161213]
[also build test ERROR on v4.9]
[cannot apply to remoteproc/for-next v4.9-rc8 v4.9-rc7 v4.9-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Sarangdhar-Joshi/remoteproc-Remove-firmware_loading_complete/20161214-075027
config: arm-allmodconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   drivers/soc/ti/wkup_m3_ipc.c: In function 'wkup_m3_rproc_boot_thread':
>> drivers/soc/ti/wkup_m3_ipc.c:373:36: error: 'struct rproc' has no member named 'firmware_loading_complete'
     wait_for_completion(&m3_ipc->rproc->firmware_loading_complete);
                                       ^~

vim +373 drivers/soc/ti/wkup_m3_ipc.c

cdd5de50 Dave Gerlach 2015-09-22  367  
cdd5de50 Dave Gerlach 2015-09-22  368  static void wkup_m3_rproc_boot_thread(struct wkup_m3_ipc *m3_ipc)
cdd5de50 Dave Gerlach 2015-09-22  369  {
cdd5de50 Dave Gerlach 2015-09-22  370  	struct device *dev = m3_ipc->dev;
cdd5de50 Dave Gerlach 2015-09-22  371  	int ret;
cdd5de50 Dave Gerlach 2015-09-22  372  
cdd5de50 Dave Gerlach 2015-09-22 @373  	wait_for_completion(&m3_ipc->rproc->firmware_loading_complete);
cdd5de50 Dave Gerlach 2015-09-22  374  
cdd5de50 Dave Gerlach 2015-09-22  375  	init_completion(&m3_ipc->sync_complete);
cdd5de50 Dave Gerlach 2015-09-22  376  

:::::: The code at line 373 was first introduced by commit
:::::: cdd5de500b2c90d5181ebc963826019a0a4234ba soc: ti: Add wkup_m3_ipc driver

:::::: TO: Dave Gerlach <[e-mail]>
:::::: CC: Tony Lindgren <[e-mail]>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 953ee29..862fa4e 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -975,17 +975,12 @@  static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
 		rproc_boot(rproc);
 
 	release_firmware(fw);
-	/* allow rproc_del() contexts, if any, to proceed */
-	complete_all(&rproc->firmware_loading_complete);
 }
 
 static int rproc_add_virtio_devices(struct rproc *rproc)
 {
 	int ret;
 
-	/* rproc_del() calls must wait until async loader completes */
-	init_completion(&rproc->firmware_loading_complete);
-
 	/*
 	 * We must retrieve early virtio configuration info from
 	 * the firmware (e.g. whether to register a virtio device,
@@ -997,10 +992,8 @@  static int rproc_add_virtio_devices(struct rproc *rproc)
 	ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG,
 				      rproc->firmware, &rproc->dev, GFP_KERNEL,
 				      rproc, rproc_fw_config_virtio);
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&rproc->dev, "request_firmware_nowait err: %d\n", ret);
-		complete_all(&rproc->firmware_loading_complete);
-	}
 
 	return ret;
 }
@@ -1483,9 +1476,6 @@  int rproc_del(struct rproc *rproc)
 	if (!rproc)
 		return -EINVAL;
 
-	/* if rproc is just being registered, wait */
-	wait_for_completion(&rproc->firmware_loading_complete);
-
 	/* if rproc is marked always-on, rproc_add() booted it */
 	/* TODO: make sure this works with rproc->power > 1 */
 	if (rproc->auto_boot)
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index e2f3a32..19d84a0 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -397,7 +397,6 @@  enum rproc_crash_type {
  * @num_traces: number of trace buffers
  * @carveouts: list of physically contiguous memory allocations
  * @mappings: list of iommu mappings we initiated, needed on shutdown
- * @firmware_loading_complete: marks e/o asynchronous firmware loading
  * @bootaddr: address of first instruction to boot rproc with (optional)
  * @rvdevs: list of remote virtio devices
  * @subdevs: list of subdevices, to following the running state
@@ -428,7 +427,6 @@  struct rproc {
 	int num_traces;
 	struct list_head carveouts;
 	struct list_head mappings;
-	struct completion firmware_loading_complete;
 	u32 bootaddr;
 	struct list_head rvdevs;
 	struct list_head subdevs;