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

Groups > linux.kernel > #1499845

[PATCH v3 05/20] remoteproc: core: Add function to over-ride current resource table

Show all headers | View raw

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 3a26d4e..9bf48ba 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1027,6 +1027,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.
  */
@@ -1063,6 +1120,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

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