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 v2 05/19] remoteproc: core: Add function to over-ride current resource table Date: Wed, 31 Aug 2016 22:50:08 +0200 [thread overview] Message-ID: <1472676622-32533-6-git-send-email-loic.pallardy@st.com> (raw) In-Reply-To: <1472676622-32533-1-git-send-email-loic.pallardy@st.com> From: Lee Jones <lee.jones@linaro.org> Most of the new resource table handling function are now in place, so it's time to put it all together. Once new resource table information has been requested, the structures will be held in a holding pen until boot-time. During boot-time rproc_apply_resource_overrides() will be invoked which in turn will pull the new information out of the holding pen and edit the table accordingly. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Loic Pallardy <loic.pallardy@st.com> --- drivers/remoteproc/remoteproc_core.c | 63 ++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index c2887be..96bc8c644 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1033,6 +1033,63 @@ rproc_add_resource_table_entry(struct rproc *rproc, return table; } +static struct resource_table* +rproc_apply_resource_overrides(struct rproc *rproc, + struct resource_table **orig_table, + int *tablesz) +{ + struct rproc_request_resource *resource; + struct resource_table *table = *orig_table; + int size = *tablesz; + + if (!table && size != 0) { + dev_err(&rproc->dev, "No table present but table size is set\n"); + return ERR_PTR(-EINVAL); + } + + + 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; + } + + list_for_each_entry(resource, &rproc->override_resources, node) { + int updated = 0; + + /* If we already have a table, update it with the new values. */ + updated = rproc_update_resource_table_entry(rproc, resource, + table, size); + if (updated < 0) { + table = ERR_PTR(updated); + goto out; + } + if (updated) + continue; + + /* Didn't find matching resource entry -- creating a new one. */ + table = rproc_add_resource_table_entry(rproc, resource, + table, &size); + if (IS_ERR(table)) + goto out; + + *orig_table = table; + } + + rproc_dump_resource_table(rproc, table, size); + + *tablesz = size; + + out: + return table; +} + /* * take a firmware and boot a remote processor with it. */ @@ -1069,6 +1126,12 @@ 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 -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
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 v2 05/19] remoteproc: core: Add function to over-ride current resource table Date: Wed, 31 Aug 2016 22:50:08 +0200 [thread overview] Message-ID: <1472676622-32533-6-git-send-email-loic.pallardy@st.com> (raw) In-Reply-To: <1472676622-32533-1-git-send-email-loic.pallardy@st.com> From: Lee Jones <lee.jones@linaro.org> Most of the new resource table handling function are now in place, so it's time to put it all together. Once new resource table information has been requested, the structures will be held in a holding pen until boot-time. During boot-time rproc_apply_resource_overrides() will be invoked which in turn will pull the new information out of the holding pen and edit the table accordingly. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Loic Pallardy <loic.pallardy@st.com> --- drivers/remoteproc/remoteproc_core.c | 63 ++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index c2887be..96bc8c644 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1033,6 +1033,63 @@ rproc_add_resource_table_entry(struct rproc *rproc, return table; } +static struct resource_table* +rproc_apply_resource_overrides(struct rproc *rproc, + struct resource_table **orig_table, + int *tablesz) +{ + struct rproc_request_resource *resource; + struct resource_table *table = *orig_table; + int size = *tablesz; + + if (!table && size != 0) { + dev_err(&rproc->dev, "No table present but table size is set\n"); + return ERR_PTR(-EINVAL); + } + + + 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; + } + + list_for_each_entry(resource, &rproc->override_resources, node) { + int updated = 0; + + /* If we already have a table, update it with the new values. */ + updated = rproc_update_resource_table_entry(rproc, resource, + table, size); + if (updated < 0) { + table = ERR_PTR(updated); + goto out; + } + if (updated) + continue; + + /* Didn't find matching resource entry -- creating a new one. */ + table = rproc_add_resource_table_entry(rproc, resource, + table, &size); + if (IS_ERR(table)) + goto out; + + *orig_table = table; + } + + rproc_dump_resource_table(rproc, table, size); + + *tablesz = size; + + out: + return table; +} + /* * take a firmware and boot a remote processor with it. */ @@ -1069,6 +1126,12 @@ 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 -- 1.9.1
next prev parent reply other threads:[~2016-08-31 20:50 UTC|newest] Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-31 20:50 [PATCH v2 00/19] remoteproc: Allow platform-specific drivers to request resources Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 01/19] remoteproc: core: New API to add new resources to the resource table Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 02/19] remoteproc: core: Add function to dump " Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 03/19] remoteproc: core: Add function to amend an existing resource table entry Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 04/19] remoteproc: core: Add function to append a new " Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy [this message] 2016-08-31 20:50 ` [PATCH v2 05/19] remoteproc: core: Add function to over-ride current resource table Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 06/19] remoteproc: core: Add explicit message error if cached table failed Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-09-01 7:09 ` Lee Jones 2016-09-08 9:40 ` loic pallardy 2016-09-08 9:40 ` loic pallardy 2016-08-31 20:50 ` [PATCH v2 07/19] remoteproc: Add new resource type for resource table spare bytes Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-09-15 17:54 ` Bjorn Andersson 2016-09-16 9:02 ` loic pallardy 2016-09-16 9:02 ` loic pallardy 2016-09-16 17:12 ` Bjorn Andersson 2016-09-19 7:50 ` loic pallardy 2016-09-19 7:50 ` loic pallardy 2016-08-31 20:50 ` [PATCH v2 08/19] remoteproc: core: Associate action to resource request Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-09-01 7:23 ` Lee Jones 2016-09-08 9:43 ` loic pallardy 2016-09-08 9:43 ` loic pallardy 2016-09-08 11:03 ` Lee Jones 2016-08-31 20:50 ` [PATCH v2 09/19] remoteproc: core: Finalize dump resource table function Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-09-08 8:26 ` Lee Jones 2016-09-08 9:46 ` loic pallardy 2016-09-08 9:46 ` loic pallardy 2016-08-31 20:50 ` [PATCH v2 10/19] remoteproc: core: Add function to verify an existing resource in rsc table Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 11/19] remoteproc: core: Add function to get resource table spare bytes information Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-09-08 8:32 ` Lee Jones 2016-09-08 9:47 ` loic pallardy 2016-09-08 9:47 ` loic pallardy 2016-08-31 20:50 ` [PATCH v2 12/19] remoteproc: core: Add vdev support and force mode to resource amending function Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-09-08 8:48 ` Lee Jones 2016-09-08 9:49 ` loic pallardy 2016-09-08 9:49 ` loic pallardy 2016-09-08 11:02 ` Lee Jones 2016-09-08 13:11 ` loic pallardy 2016-09-08 13:11 ` loic pallardy 2016-08-31 20:50 ` [PATCH v2 13/19] remoteproc: core: Append resource only if spare resource present Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-09-08 9:33 ` Lee Jones 2016-09-08 9:54 ` loic pallardy 2016-09-08 9:54 ` loic pallardy 2016-09-08 11:00 ` Lee Jones 2016-08-31 20:50 ` [PATCH v2 14/19] remoteproc: core: Add resource request action support Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 15/19] remoteproc: core: Add function to verify resource table consistency Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 16/19] remoteproc: core: Clean-up resource table sanity checks Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 17/19] remotecore: core: Add resource table pointer argument to rproc_handle_resource Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-08-31 20:50 ` [PATCH v2 18/19] remoteproc: core: Add function to create remoteproc local resource table Loic Pallardy 2016-08-31 20:50 ` Loic Pallardy 2016-09-08 10:20 ` Lee Jones 2016-09-08 13:15 ` loic pallardy 2016-09-08 13:15 ` loic pallardy 2016-09-15 18:58 ` Bjorn Andersson 2016-09-19 7:46 ` loic pallardy 2016-09-19 7:46 ` loic pallardy 2016-08-31 20:50 ` [PATCH v2 19/19] remoteproc: core: Support empty resource tables Loic Pallardy 2016-08-31 20:50 ` 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=1472676622-32533-6-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.