lkml.org 
[lkml]   [2016]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 16/20] remoteproc: core: Add resource request action support
    Date
    Handle resource requests according to associated action.

    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    ---
    drivers/remoteproc/remoteproc_core.c | 98 ++++++++++++++++++++----------------
    1 file changed, 55 insertions(+), 43 deletions(-)

    diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
    index f4a02f0..559a63b 100644
    --- a/drivers/remoteproc/remoteproc_core.c
    +++ b/drivers/remoteproc/remoteproc_core.c
    @@ -1145,61 +1145,69 @@ static int rproc_add_resource_table_entry(struct rproc *rproc,
    return 0;
    }

    -static struct resource_table*
    -rproc_apply_resource_overrides(struct rproc *rproc,
    - struct resource_table **orig_table,
    - int *tablesz)
    +static int rproc_apply_resource_overrides(struct rproc *rproc,
    + struct resource_table *table,
    + int tablesz)
    {
    struct rproc_request_resource *resource;
    - struct resource_table *table = *orig_table;
    - int size = *tablesz;
    + int ret = 0, size = tablesz;

    if (!table && size != 0) {
    dev_err(&rproc->dev, "No table present but table size is set\n");
    - return ERR_PTR(-EINVAL);
    + ret = -EINVAL;
    + goto out;
    }

    -
    if (IS_ENABLED(DEBUG) || IS_ENABLED(CONFIG_DYNAMIC_DEBUG))
    - rproc_dump_resource_table(rproc, table, size);
    -
    - if (!table) {
    - size = sizeof(*table);
    - table = devm_kzalloc(&rproc->dev, size, GFP_KERNEL);
    - if (!table) {
    - table = ERR_PTR(-ENOMEM);
    - goto out;
    - }
    - table->ver = 1;
    - }
    + rproc_dump_resource_table(rproc, table, tablesz);

    list_for_each_entry(resource, &rproc->override_resources, node) {
    - int updated = 0;
    + switch (resource->action) {
    + case RSC_ACT_VERIFY:
    + ret = rproc_verify_resource_table_entry(rproc, resource,
    + table, size);
    + if (ret) {
    + ret = -EINVAL;
    + goto out;
    + }
    + break;
    + case RSC_ACT_UPDATE:
    + /* If we already have a table, update it with the new values. */
    + ret = rproc_update_resource_table_entry(rproc, resource,
    + table, size, false);
    + if (ret < 0)
    + goto out;
    + break;
    + case RSC_ACT_FORCE_UPDATE:
    + /* If we already have a table, update it with the new values. */
    + ret = rproc_update_resource_table_entry(rproc, resource,
    + table, size, true);
    + if (ret < 0)
    + goto out;
    +
    + if (ret)
    + break;

    - /* If we already have a table, update it with the new values. */
    - updated = rproc_update_resource_table_entry(rproc, resource,
    - table, size, false);
    - if (updated < 0) {
    - table = ERR_PTR(updated);
    - goto out;
    - }
    - if (updated)
    - continue;
    + /* Didn't find matching resource entry -- creating a new one. */
    + ret = rproc_add_resource_table_entry(rproc, resource,
    + table, size);
    + if (ret)
    + goto out;

    - /* Didn't find matching resource entry -- creating a new one. */
    - updated = rproc_add_resource_table_entry(rproc, resource,
    - table, size);
    - if (updated)
    + break;
    + default:
    + dev_err(&rproc->dev, "Unsupported resource action: %d\n",
    + resource->action);
    + ret = -EINVAL;
    goto out;
    + };
    }

    if (IS_ENABLED(DEBUG) || IS_ENABLED(CONFIG_DYNAMIC_DEBUG))
    - rproc_dump_resource_table(rproc, table, size);
    -
    - *tablesz = size;
    + rproc_dump_resource_table(rproc, table, tablesz);

    out:
    - return table;
    + return ret;
    }

    /*
    @@ -1238,12 +1246,6 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
    goto clean_up;
    }

    - if (!list_empty(&rproc->override_resources)) {
    - table = rproc_apply_resource_overrides(rproc, &table, &tablesz);
    - if (IS_ERR(table))
    - goto clean_up;
    - }
    -
    /*
    * Create a copy of the resource table. When a virtio device starts
    * and calls vring_new_virtqueue() the address of the allocated vring
    @@ -1256,6 +1258,16 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)

    rproc->table_ptr = rproc->cached_table;

    + if (!list_empty(&rproc->override_resources)) {
    + ret = rproc_apply_resource_overrides(rproc, rproc->cached_table,
    + tablesz);
    + if (ret < 0) {
    + dev_err(dev, "Failed to apply overrides resources\n");
    + goto clean_up;
    + }
    +
    + }
    +
    /* reset max_notifyid */
    rproc->max_notifyid = -1;

    --
    1.9.1
    \
     
     \ /
      Last update: 2016-10-12 19:54    [W:2.843 / U:0.932 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site