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 08/19] remoteproc: core: Associate action to resource request Date: Wed, 31 Aug 2016 22:50:11 +0200 [thread overview] Message-ID: <1472676622-32533-9-git-send-email-loic.pallardy@st.com> (raw) In-Reply-To: <1472676622-32533-1-git-send-email-loic.pallardy@st.com> With new rproc_request_resource API, rproc driver has now the capability to provide resources to remoteproc in order to modify firmware resource table. But in some cases, other operations are needed like compatibility check between resources defined at firmware level and those handled by rproc driver, or remoteproc local resource management when firmware has no resource table. This patch associates action to each resource request to: - verify a resource - update/amend a resource in firmware resource table - handle locally a resource Signed-off-by: Loic Pallardy <loic.pallardy@st.com> --- drivers/remoteproc/remoteproc_core.c | 13 ++++++++++++- include/linux/remoteproc.h | 26 +++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 3282a4e..cd64fae 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -876,16 +876,20 @@ static void rproc_dump_resource_table(struct rproc *rproc, } } -int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) +int rproc_request_resource(struct rproc *rproc, u32 type, u32 action, void *resource) { struct device *dev = &rproc->dev; struct rproc_request_resource *request; + struct fw_rsc_vdev *v; int size; request = devm_kzalloc(dev, sizeof(*request), GFP_KERNEL); if (!request) return -ENOMEM; + if (action > RSC_ACT_LAST) + return -EINVAL; + switch (type) { case RSC_CARVEOUT: size = sizeof(struct fw_rsc_carveout); @@ -896,6 +900,12 @@ int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) case RSC_TRACE: size = sizeof(struct fw_rsc_trace); break; + case RSC_VDEV: + v = resource; + size = sizeof(struct fw_rsc_vdev); + size += v->num_of_vrings * sizeof(struct fw_rsc_vdev_vring); + size += v->config_len; + break; default: dev_err(dev, "Unsupported resource type: %d\n", type); return -EINVAL; @@ -908,6 +918,7 @@ int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) memcpy(request->resource, resource, size); request->type = type; request->size = size; + request->action = action; list_add_tail(&request->node, &rproc->override_resources); diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 4e2f822..2b0f1d7 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -335,11 +335,34 @@ struct rproc_mem_entry { }; /** + * enum rproc_request_action - types of actions associated to a resource + * request + * + * @RSC_ACT_CHECK: request to verify this resource with firmware one + * @RSC_ACT_UPDATE: request to update firmware resource table with associated + * resource if possible + * @RSC_ACT_FORCE_UPDATE: force firmware resource table update with associated + * resource + * @RSC_ACT_LOCAL: request to handle this resource localy but not to update + * firmware resource table + * @RSC_ACT_LAST: just keep this one at the end + * + */ +enum rproc_request_action { + RSC_ACT_VERIFY = 0, + RSC_ACT_UPDATE = 1, + RSC_ACT_FORCE_UPDATE = 2, + RSC_ACT_LOCAL = 3, + RSC_ACT_LAST = 4, +}; + +/** * struct rproc_requested_resources - add a resource to the resource table * * @resource: pointer to a 'struct fw_rsc_*' resource * @type: 'fw_resource_type' resource type * @size: size of resource + * @action: action associated the resource * @node: list node * * Resources can be added by platform-specific rproc drivers calling @@ -350,6 +373,7 @@ struct rproc_request_resource { void *resource; u32 type; u32 size; + u32 action; struct list_head node; }; @@ -517,7 +541,7 @@ struct rproc_vdev { u32 rsc_offset; }; -int rproc_request_resource(struct rproc *rproc, u32 type, void *res); +int rproc_request_resource(struct rproc *rproc, u32 type, u32 action, void *res); struct rproc *rproc_get_by_phandle(phandle phandle); struct rproc *rproc_alloc(struct device *dev, const char *name, const struct rproc_ops *ops, -- 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 08/19] remoteproc: core: Associate action to resource request Date: Wed, 31 Aug 2016 22:50:11 +0200 [thread overview] Message-ID: <1472676622-32533-9-git-send-email-loic.pallardy@st.com> (raw) In-Reply-To: <1472676622-32533-1-git-send-email-loic.pallardy@st.com> With new rproc_request_resource API, rproc driver has now the capability to provide resources to remoteproc in order to modify firmware resource table. But in some cases, other operations are needed like compatibility check between resources defined at firmware level and those handled by rproc driver, or remoteproc local resource management when firmware has no resource table. This patch associates action to each resource request to: - verify a resource - update/amend a resource in firmware resource table - handle locally a resource Signed-off-by: Loic Pallardy <loic.pallardy@st.com> --- drivers/remoteproc/remoteproc_core.c | 13 ++++++++++++- include/linux/remoteproc.h | 26 +++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 3282a4e..cd64fae 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -876,16 +876,20 @@ static void rproc_dump_resource_table(struct rproc *rproc, } } -int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) +int rproc_request_resource(struct rproc *rproc, u32 type, u32 action, void *resource) { struct device *dev = &rproc->dev; struct rproc_request_resource *request; + struct fw_rsc_vdev *v; int size; request = devm_kzalloc(dev, sizeof(*request), GFP_KERNEL); if (!request) return -ENOMEM; + if (action > RSC_ACT_LAST) + return -EINVAL; + switch (type) { case RSC_CARVEOUT: size = sizeof(struct fw_rsc_carveout); @@ -896,6 +900,12 @@ int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) case RSC_TRACE: size = sizeof(struct fw_rsc_trace); break; + case RSC_VDEV: + v = resource; + size = sizeof(struct fw_rsc_vdev); + size += v->num_of_vrings * sizeof(struct fw_rsc_vdev_vring); + size += v->config_len; + break; default: dev_err(dev, "Unsupported resource type: %d\n", type); return -EINVAL; @@ -908,6 +918,7 @@ int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) memcpy(request->resource, resource, size); request->type = type; request->size = size; + request->action = action; list_add_tail(&request->node, &rproc->override_resources); diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 4e2f822..2b0f1d7 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -335,11 +335,34 @@ struct rproc_mem_entry { }; /** + * enum rproc_request_action - types of actions associated to a resource + * request + * + * @RSC_ACT_CHECK: request to verify this resource with firmware one + * @RSC_ACT_UPDATE: request to update firmware resource table with associated + * resource if possible + * @RSC_ACT_FORCE_UPDATE: force firmware resource table update with associated + * resource + * @RSC_ACT_LOCAL: request to handle this resource localy but not to update + * firmware resource table + * @RSC_ACT_LAST: just keep this one at the end + * + */ +enum rproc_request_action { + RSC_ACT_VERIFY = 0, + RSC_ACT_UPDATE = 1, + RSC_ACT_FORCE_UPDATE = 2, + RSC_ACT_LOCAL = 3, + RSC_ACT_LAST = 4, +}; + +/** * struct rproc_requested_resources - add a resource to the resource table * * @resource: pointer to a 'struct fw_rsc_*' resource * @type: 'fw_resource_type' resource type * @size: size of resource + * @action: action associated the resource * @node: list node * * Resources can be added by platform-specific rproc drivers calling @@ -350,6 +373,7 @@ struct rproc_request_resource { void *resource; u32 type; u32 size; + u32 action; struct list_head node; }; @@ -517,7 +541,7 @@ struct rproc_vdev { u32 rsc_offset; }; -int rproc_request_resource(struct rproc *rproc, u32 type, void *res); +int rproc_request_resource(struct rproc *rproc, u32 type, u32 action, void *res); struct rproc *rproc_get_by_phandle(phandle phandle); struct rproc *rproc_alloc(struct device *dev, const char *name, const struct rproc_ops *ops, -- 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 ` [PATCH v2 05/19] remoteproc: core: Add function to over-ride current resource table Loic Pallardy 2016-08-31 20:50 ` 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 ` Loic Pallardy [this message] 2016-08-31 20:50 ` [PATCH v2 08/19] remoteproc: core: Associate action to resource request 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-9-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.