GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 06:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remoteproc: Remove depricated crash completion

Browse source 
The crash handling now happens in a single execution context, so there's
no longer a need for a completion to synchronize this.

Reviewed-By: Loic Pallardy <loic.pallardy@st.com>
Tested-By: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson 2018-01-05 15:57:58 -08:00
parent 900a163ede
commit b26210cda6
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/remoteproc/remoteproc_core.c
View file

@ -1028,10 +1028,6 @@ static int rproc_stop(struct rproc *rproc)
return ret; return ret;
} }
/* if in crash state, unlock crash handler */
if (rproc->state == RPROC_CRASHED)
complete_all(&rproc->crash_comp);
rproc->state = RPROC_OFFLINE; rproc->state = RPROC_OFFLINE;
dev_info(dev, "stopped remote processor %s\n", rproc->name); dev_info(dev, "stopped remote processor %s\n", rproc->name);
@ -1057,8 +1053,6 @@ int rproc_trigger_recovery(struct rproc *rproc)
dev_err(dev, "recovering %s\n", rproc->name); dev_err(dev, "recovering %s\n", rproc->name);
init_completion(&rproc->crash_comp);
ret = mutex_lock_interruptible(&rproc->lock); ret = mutex_lock_interruptible(&rproc->lock);
if (ret) if (ret)
return ret; return ret;
@ -1067,9 +1061,6 @@ int rproc_trigger_recovery(struct rproc *rproc)
if (ret) if (ret)
goto unlock_mutex; goto unlock_mutex;
/* wait until there is no more rproc users */
wait_for_completion(&rproc->crash_comp);
/* load firmware */ /* load firmware */
ret = request_firmware(&firmware_p, rproc->firmware, dev); ret = request_firmware(&firmware_p, rproc->firmware, dev);
if (ret < 0) { if (ret < 0) {
@ -1459,7 +1450,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
INIT_LIST_HEAD(&rproc->subdevs); INIT_LIST_HEAD(&rproc->subdevs);
INIT_WORK(&rproc->crash_handler, rproc_crash_handler_work); INIT_WORK(&rproc->crash_handler, rproc_crash_handler_work);
init_completion(&rproc->crash_comp);
rproc->state = RPROC_OFFLINE; rproc->state = RPROC_OFFLINE;

2
include/linux/remoteproc.h
View file

@ -406,7 +406,6 @@ enum rproc_crash_type {
* @index: index of this rproc device * @index: index of this rproc device
* @crash_handler: workqueue for handling a crash * @crash_handler: workqueue for handling a crash
* @crash_cnt: crash counter * @crash_cnt: crash counter
* @crash_comp: completion used to sync crash handler and the rproc reload
* @recovery_disabled: flag that state if recovery was disabled * @recovery_disabled: flag that state if recovery was disabled
* @max_notifyid: largest allocated notify id. * @max_notifyid: largest allocated notify id.
* @table_ptr: pointer to the resource table in effect * @table_ptr: pointer to the resource table in effect
@ -437,7 +436,6 @@ struct rproc {
int index; int index;
struct work_struct crash_handler; struct work_struct crash_handler;
unsigned int crash_cnt; unsigned int crash_cnt;
struct completion crash_comp;
bool recovery_disabled; bool recovery_disabled;
int max_notifyid; int max_notifyid;
struct resource_table *table_ptr; struct resource_table *table_ptr;