Hi Bjorn,
On 08/01/2016 08:58 PM, Bjorn Andersson wrote:
The newly introduced "always-on" flag allows us to stop giving the vdevs
special treatment. The ordering of resource allocation and life cycle of
the remote processor is kept intact.
This allows us to mark a remote processor with vdevs to not boot unless
explicitly requested to do so by a client driver.
Cc: Lee Jones <lee.jo...@linaro.org>
Cc: Loic Pallardy <loic.palla...@st.com>
Signed-off-by: Bjorn Andersson <bjorn.anders...@linaro.org>
---
drivers/remoteproc/remoteproc_core.c | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c
b/drivers/remoteproc/remoteproc_core.c
index 084ebffdfc47..9d64409f3839 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -753,6 +753,7 @@ static int rproc_handle_resources(struct rproc *rproc, int
len,
static void rproc_resource_cleanup(struct rproc *rproc)
{
struct rproc_mem_entry *entry, *tmp;
+ struct rproc_vdev *rvdev, *rvtmp;
struct device *dev = &rproc->dev;
/* clean up debugfs trace entries */
@@ -785,6 +786,10 @@ static void rproc_resource_cleanup(struct rproc *rproc)
list_del(&entry->node);
kfree(entry);
}
+
+ /* clean up remote vdev entries */
+ list_for_each_entry_safe(rvdev, rvtmp, &rproc->rvdevs, node)
+ rproc_remove_virtio_dev(rvdev);
}
/*
@@ -835,6 +840,13 @@ static int rproc_fw_boot(struct rproc *rproc, const struct
firmware *fw)
/* reset max_notifyid */
rproc->max_notifyid = -1;
+ /* look for virtio devices and register them */
+ ret = rproc_handle_resources(rproc, tablesz, rproc_vdev_handler);
+ if (ret) {
+ dev_err(dev, "Failed to handle vdev resources: %d\n", ret);
+ goto clean_up;
+ }
+
/* handle fw resources which are required to boot rproc */
ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers);
if (ret) {
@@ -898,7 +910,7 @@ static void rproc_fw_config_virtio(const struct firmware
*fw, void *context)
{
struct rproc *rproc = context;
struct resource_table *table;
- int ret, tablesz;
+ int tablesz;
if (rproc_fw_sanity_check(rproc, fw) < 0)
goto out;
@@ -922,9 +934,6 @@ static void rproc_fw_config_virtio(const struct firmware
*fw, void *context)
rproc->table_ptr = rproc->cached_table;
- /* look for virtio devices and register them */
- ret = rproc_handle_resources(rproc, tablesz, rproc_vdev_handler);
-
/* if rproc is marked always-on, request it to boot */
if (rproc->always_on)
rproc_boot_nowait(rproc);
@@ -973,9 +982,6 @@ static int rproc_add_virtio_devices(struct rproc *rproc)
*/
int rproc_trigger_recovery(struct rproc *rproc)
{
- struct rproc_vdev *rvdev, *rvtmp;
- int ret;
-
dev_err(&rproc->dev, "recovering %s\n", rproc->name);
init_completion(&rproc->crash_comp);
@@ -984,23 +990,11 @@ int rproc_trigger_recovery(struct rproc *rproc)
/* TODO: make sure this works with rproc->power > 1 */
rproc_shutdown(rproc);
- /* clean up remote vdev entries */
- list_for_each_entry_safe(rvdev, rvtmp, &rproc->rvdevs, node)
- rproc_remove_virtio_dev(rvdev);
-
/* wait until there is no more rproc users */
wait_for_completion(&rproc->crash_comp);
- /* Free the copy of the resource table */
- kfree(rproc->cached_table);
I think this line should be part of patch 4 "Move handling of cached
table to boot/shutdown"
Regards,
Loic
-
- ret = rproc_add_virtio_devices(rproc);
- if (ret)
- return ret;
-
/*
- * boot the remote processor up again, waiting for the async fw load to
- * finish
+ * boot the remote processor up again
*/
rproc_boot(rproc);
