@@ -951,6 +951,53 @@ int rproc_request_resource(struct rproc *rproc, u32 type, u32 action, void *reso
}
EXPORT_SYMBOL(rproc_request_resource);
+static int __verify_rsc_tbl_entry(struct rproc *rproc,
+ struct rproc_request_resource *request,
+ struct resource_table *table, int size)
+{
+ struct fw_rsc_carveout *tblc, *newc;
+ int i;
+
+ for (i = 0; i < table->num; i++) {
+ int offset = table->offset[i];
+ struct fw_rsc_hdr *hdr = (void *)table + offset;
+ void *rsc = (void *)hdr + sizeof(*hdr);
+
+ if (request->type != hdr->type)
+ continue;
+
+ switch (hdr->type) {
+ case RSC_CARVEOUT:
+ tblc = rsc;
+ newc = request->resource;
+
+ if (strncmp(newc->name, tblc->name,
+ sizeof(*tblc->name)))
+ break;
+
+ /* verify firmware resource is part of rproc one */
+ if (tblc->pa != FW_RSC_ADDR_ANY) {
+ int pa_offset = tblc->pa - newc->pa;
+
+ /* is carevout too small ? */
+ if (pa_offset < 0)
+ return -EINVAL;
+
+ if (pa_offset + tblc->len > newc->len)
+ return -EINVAL;
+ }
+ return 0;
+ default:
+ dev_err(&rproc->dev,
+ "Unsupported resource type: %d\n",
+ hdr->type);
+ return -EINVAL;
+ }
+ }
+
+ return -EINVAL;
+}
+
static int rproc_update_resource_table_entry(struct rproc *rproc,
struct rproc_request_resource *request,
struct resource_table *table, int size)
When a firmware is build, it can be loaded with a resource usually detailing shared; memory, virtual device, trace log information etc. However, some SoCs or platforms require some hard-coded information. Information may be fixed on both sides: firmware and rproc. Until now, no method exists which allows to compare resource table fixed resources and rproc driver configuration. This new function changes that performing comparison between resources. Only carveout resource supported for the moment. It is rproc driver responsibility to provide list of resources to verify during boot. Signed-off-by: Loic Pallardy <loic.pallardy@st.com> --- drivers/remoteproc/remoteproc_core.c | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) -- 1.9.1