Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1499833

[PATCH v3 06/20] remoteproc: core: Associate action to resource request

Show all headers | View raw

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

Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
 drivers/remoteproc/remoteproc_core.c |  6 +++++-
 include/linux/remoteproc.h           | 23 ++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 9bf48ba..4c6314e 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -870,7 +870,7 @@ 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;
@@ -880,6 +880,9 @@ int rproc_request_resource(struct rproc *rproc, u32 type, void *resource)
 	if (!request)
 		return -ENOMEM;
 
+	if (action >= RSC_ACT_LAST)
+		return -EINVAL;
+
 	switch (type) {
 	case RSC_CARVEOUT:
 		size = sizeof(struct fw_rsc_carveout);
@@ -902,6 +905,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 dd29776..760f29b 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -324,11 +324,31 @@ 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_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_LAST		= 3,
+};
+
+/**
  * 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
@@ -339,6 +359,7 @@ struct rproc_request_resource {
 	void *resource;
 	u32 type;
 	u32 size;
+	u32 action;
 	struct list_head node;
 };
 
@@ -506,7 +527,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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/20] remoteproc: Allow platform-specific drivers to request resources Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 18:10 +0200
  [PATCH v3 03/20] remoteproc: core: Add function to amend an existing resource table entry Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 18:10 +0200
  [PATCH v3 04/20] remoteproc: core: Add function to append a new resource table entry Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 18:10 +0200
  [PATCH v3 02/20] remoteproc: core: Add function to dump resource table Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 18:10 +0200
    Re: [PATCH v3 02/20] remoteproc: core: Add function to dump resource  table Matt Redfearn <matt.redfearn@imgtec.com> - 2016-10-14 10:40 +0200
      Re: [PATCH v3 02/20] remoteproc: core: Add function to dump resource  table loic pallardy <loic.pallardy@st.com> - 2016-10-17 18:30 +0200
  [PATCH v3 09/20] remoteproc: core: Unify rproc_dump_resource_table debug messages Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 18:30 +0200
  [PATCH v3 10/20] remoteproc: core: Call rproc_dump_resource_table only if debug is activated Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 18:30 +0200
  [PATCH v3 08/20] remoteproc: core: Complete VDEV support in rproc_dump_resource_table function Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 18:30 +0200
  [PATCH v3 15/20] remoteproc: core: Append resource only if .resource_table section is large enough Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:00 +0200
  [PATCH v3 14/20] remoteproc: core: Add force mode to resource amending function Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:00 +0200
  [PATCH v3 12/20] remoteproc: core: Add function to verify an existing resource in rsc table Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:00 +0200
  [PATCH v3 11/20] remoteproc: core: Correction carveout name comparison in rproc_update_resource_table_entry Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:00 +0200
  [PATCH v3 06/20] remoteproc: core: Associate action to resource request Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:10 +0200
  [PATCH v3 13/20] remoteproc: core: Add vdev support to resource amending function Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:30 +0200
  [PATCH v3 05/20] remoteproc: core: Add function to over-ride current resource table Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:30 +0200
  [PATCH v3 19/20] remotecore: core: Add resource table pointer argument to rproc_handle_resource Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:40 +0200
  [PATCH v3 18/20] remoteproc: core: Clean-up resource table sanity checks Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 19:50 +0200
  [PATCH v3 16/20] remoteproc: core: Add resource request action support Loic Pallardy <loic.pallardy@st.com> - 2016-10-12 20:00 +0200

csiph-web