In current version rproc_handle_carveout function support only dynamic
region allocation.
This patch extends rproc_handle_carveout function to support pre-registered
region. Match is done on region name, then requested device address and
length are checked.
If no name match found, original allocation is used.
Signed-off-by: Loic Pallardy <loic.pallardy@xxxxxx>
---
drivers/remoteproc/remoteproc_core.c | 49 +++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 0ebbc4f..49b28a0 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -679,7 +679,7 @@ static int rproc_handle_carveout(struct rproc *rproc,
struct fw_rsc_carveout *rsc,
int offset, int avail)
{
- struct rproc_mem_entry *carveout, *mapping = NULL;
+ struct rproc_mem_entry *carveout, *mapping = NULL, *mem;
struct device *dev = &rproc->dev;
dma_addr_t dma;
void *va;
@@ -699,6 +699,51 @@ static int rproc_handle_carveout(struct rproc *rproc,
dev_dbg(dev, "carveout rsc: name: %s, da 0x%x, pa 0x%x, len 0x%x, flags 0x%x\n",
rsc->name, rsc->da, rsc->pa, rsc->len, rsc->flags);
+ /* Check carveout rsc already part of a registered carveout */
+ /* Search by name */
+ mem = rproc_find_carveout_by_name(rproc, rsc->name);
+ if (mem) {
+ int delta = 0;
+
+ if (rsc->da != FW_RSC_ADDR_ANY) {
+ delta = rsc->da - mem->da;
+
+ /* Check requested resource belongs to registered carveout */
+ if (delta < 0) {
+ dev_err(dev->parent,
+ "Registered carveout doesn't fit da request\n");
+ return -ENOMEM;
+ }
+
+ if (delta + rsc->len > mem->len) {
+ dev_err(dev->parent,
+ "Registered carveout doesn't fit len request\n");
+ return -ENOMEM;
+ }
+ } else {
+ /* Check requested resource length */
+ if (rsc->len > mem->len) {
+ dev_err(dev->parent,
+ "Registered carveout doesn't fit len request\n");
+ return -ENOMEM;
+ }
+ /* Update resource da with registered resource value */
+ rsc->da = mem->da;
+ }
+
+ /*
+ * Update resource pa
+ * Use va if defined else dma to generate pa
+ */
+ if (mem->va)
+ rsc->pa = rproc_va_to_pa(mem->va) + delta;
+ else
+ rsc->pa = (u32)mem->dma + delta;
+
+ return 0;
+ }
+
+ /* No registered carveout found, allocate a new one */
va = dma_alloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL);
if (!va) {
dev_err(dev->parent,
@@ -761,6 +806,8 @@ static int rproc_handle_carveout(struct rproc *rproc,
dev_dbg(dev, "carveout mapped 0x%x to %pad\n",
rsc->da, &dma);
+ } else {
+ rsc->da = (u32)dma;
}
/*
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-remoteproc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
