remoteproc: Calculate max_notifyid during load

The calculation of max_notifyid must only be done before we call start()
on the remoteproc drivers, so move the calculation to be part of the
loading steps.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index d3b812e85250ed23ed5287314c496493cb0ae8c4..a6a8eba9da8c5c3b0f67f28a6f7f0a41733835df 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -696,17 +696,13 @@ static rproc_handle_resource_t rproc_loading_handlers[RSC_LAST] = {
        [RSC_CARVEOUT] = (rproc_handle_resource_t)rproc_handle_carveout,
        [RSC_DEVMEM] = (rproc_handle_resource_t)rproc_handle_devmem,
        [RSC_TRACE] = (rproc_handle_resource_t)rproc_handle_trace,
-       [RSC_VDEV] = NULL, /* VDEVs were handled upon registration */
+       [RSC_VDEV] = (rproc_handle_resource_t)rproc_count_vrings,
 };
 
 static rproc_handle_resource_t rproc_vdev_handler[RSC_LAST] = {
        [RSC_VDEV] = (rproc_handle_resource_t)rproc_handle_vdev,
 };
 
-static rproc_handle_resource_t rproc_count_vrings_handler[RSC_LAST] = {
-       [RSC_VDEV] = (rproc_handle_resource_t)rproc_count_vrings,
-};
-
 /* handle firmware resource entries before booting the remote processor */
 static int rproc_handle_resources(struct rproc *rproc, int len,
                                  rproc_handle_resource_t handlers[RSC_LAST])
@@ -835,6 +831,9 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
                goto clean_up;
        }
 
+       /* reset max_notifyid */
+       rproc->max_notifyid = -1;
+
        /* handle fw resources which are required to boot rproc */
        ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers);
        if (ret) {
@@ -922,13 +921,6 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
 
        rproc->table_ptr = rproc->cached_table;
 
-       /* count the number of notify-ids */
-       rproc->max_notifyid = -1;
-       ret = rproc_handle_resources(rproc, tablesz,
-                                    rproc_count_vrings_handler);
-       if (ret)
-               goto out;
-
        /* look for virtio devices and register them */
        ret = rproc_handle_resources(rproc, tablesz, rproc_vdev_handler);