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

Groups > linux.kernel > #1499827

[PATCH v3 14/20] remoteproc: core: Add force mode to resource amending function

Show all headers | View raw

This patch adds force mode to rproc_update_resource_table_entry function.
When force is unset, resource will be updated only if no specific
addresses are requested by firmware.
When force is set, resource is directly overwritten.

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

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 26fc647..3847fd4 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -980,7 +980,8 @@ static int rproc_verify_resource_table_entry(struct rproc *rproc,
 
 static int rproc_update_resource_table_entry(struct rproc *rproc,
 				struct rproc_request_resource *request,
-				struct resource_table *table, int size)
+				struct resource_table *table, int size,
+				bool force)
 {
 	struct fw_rsc_carveout *tblc, *newc;
 	struct fw_rsc_devmem *tbld, *newd;
@@ -1005,7 +1006,8 @@ static int rproc_update_resource_table_entry(struct rproc *rproc,
 			if (strncmp(newc->name, tblc->name, 32))
 				break;
 
-			memcpy(tblc, newc, request->size);
+			if (tblc->pa == FW_RSC_ADDR_ANY || force)
+				memcpy(tblc, newc, request->size);
 
 			return updated;
 		case RSC_DEVMEM:
@@ -1143,7 +1145,7 @@ rproc_apply_resource_overrides(struct rproc *rproc,
 
 		/* If we already have a table, update it with the new values. */
 		updated = rproc_update_resource_table_entry(rproc, resource,
-							    table, size);
+						table, size, false);
 		if (updated < 0) {
 			table = ERR_PTR(updated);
 			goto out;
-- 
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