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

Groups > linux.kernel > #1499847

[PATCH v3 19/20] remotecore: core: Add resource table pointer argument to rproc_handle_resource

Show all headers | View raw

In current version, rproc_handle_resource use rproc->table_ptr
as default resource table, fixing table to handle.
This patch adds resource table as function argument to have more
flexibility and be able to handle resources from any table.

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

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index ee2dc8d..a6062e7 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -672,16 +672,16 @@ static rproc_handle_resource_t rproc_vdev_handler[RSC_LAST] = {
 };
 
 /* handle firmware resource entries before booting the remote processor */
-static int rproc_handle_resources(struct rproc *rproc, int len,
-				  rproc_handle_resource_t handlers[RSC_LAST])
+static int rproc_handle_resources(struct rproc *rproc, struct resource_table *table_ptr,
+				  int len, rproc_handle_resource_t handlers[RSC_LAST])
 {
 	struct device *dev = &rproc->dev;
 	rproc_handle_resource_t handler;
 	int ret = 0, i;
 
-	for (i = 0; i < rproc->table_ptr->num; i++) {
-		int offset = rproc->table_ptr->offset[i];
-		struct fw_rsc_hdr *hdr = (void *)rproc->table_ptr + offset;
+	for (i = 0; i < table_ptr->num; i++) {
+		int offset = table_ptr->offset[i];
+		struct fw_rsc_hdr *hdr = (void *)table_ptr + offset;
 		void *rsc = (void *)hdr + sizeof(*hdr);
 
 		dev_dbg(dev, "rsc: type %d\n", hdr->type);
@@ -1309,14 +1309,16 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
 	rproc->max_notifyid = -1;
 
 	/* look for virtio devices and register them */
-	ret = rproc_handle_resources(rproc, tablesz, rproc_vdev_handler);
+	ret = rproc_handle_resources(rproc, rproc->cached_table, tablesz,
+				     rproc_vdev_handler);
 	if (ret) {
 		dev_err(dev, "Failed to handle vdev resources: %d\n", ret);
 		goto clean_up;
 	}
 
 	/* handle fw resources which are required to boot rproc */
-	ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers);
+	ret = rproc_handle_resources(rproc, rproc->cached_table, tablesz,
+				     rproc_loading_handlers);
 	if (ret) {
 		dev_err(dev, "Failed to process resources: %d\n", ret);
 		goto clean_up_resources;
-- 
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