From: Loic Pallardy <loic.pallardy@st.com>
To: <bjorn.andersson@linaro.org>, <ohad@wizery.com>, <lee.jones@linaro.org>
Cc: <loic.pallardy@st.com>, <linux-remoteproc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <kernel@stlinux.com>
Subject: [PATCH v3 16/20] remoteproc: core: Add resource request action support
Date: Wed, 12 Oct 2016 18:00:34 +0200 [thread overview]
Message-ID: <1476288038-24909-17-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1476288038-24909-1-git-send-email-loic.pallardy@st.com>
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
next prev parent reply other threads:[~2016-10-12 17:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-12 16:00 [PATCH v3 00/20] remoteproc: Allow platform-specific drivers to request resources Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 01/20] remoteproc: core: New API to add new resources to the resource table Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 02/20] remoteproc: core: Add function to dump " Loic Pallardy
2016-10-14 8:37 ` Matt Redfearn
2016-10-17 16:26 ` loic pallardy
2016-10-12 16:00 ` [PATCH v3 03/20] remoteproc: core: Add function to amend an existing resource table entry Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 04/20] remoteproc: core: Add function to append a new " Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 05/20] remoteproc: core: Add function to over-ride current resource table Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 06/20] remoteproc: core: Associate action to resource request Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 07/20] remoteproc: core: Add RSC_VDEV support to rproc_request_resource Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 08/20] remoteproc: core: Complete VDEV support in rproc_dump_resource_table function Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 09/20] remoteproc: core: Unify rproc_dump_resource_table debug messages Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 10/20] remoteproc: core: Call rproc_dump_resource_table only if debug is activated Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 11/20] remoteproc: core: Correction carveout name comparison in rproc_update_resource_table_entry Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 12/20] remoteproc: core: Add function to verify an existing resource in rsc table Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 13/20] remoteproc: core: Add vdev support to resource amending function Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 14/20] remoteproc: core: Add force mode " Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 15/20] remoteproc: core: Append resource only if .resource_table section is large enough Loic Pallardy
2016-10-12 16:00 ` Loic Pallardy [this message]
2016-10-12 16:00 ` [PATCH v3 17/20] remoteproc: core: Add function to verify resource table consistency Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 18/20] remoteproc: core: Clean-up resource table sanity checks Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 19/20] remotecore: core: Add resource table pointer argument to rproc_handle_resource Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 20/20] remoteproc: core: Support empty resource tables Loic Pallardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476288038-24909-17-git-send-email-loic.pallardy@st.com \
--to=loic.pallardy@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=kernel@stlinux.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®