remoteproc/k3-r5: fix loading into BTCM when using R5 local addresses

[rpmsg/rpmsg.git] / drivers / remoteproc / ti_k3_r5_remoteproc.c

diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
index 90bccae7015ba5a0f121e032007241ee9c183b42..4e915b62342c3cadd644672bbd4c08e5d2773135 100644 (file)
--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
@@ -567,22 +567,21 @@ static void *k3_r5_rproc_da_to_va(struct rproc *rproc, u64 da, int len,
        if (len <= 0)
                return NULL;
 
-       /* handle R5-view of ATCM addresses first using address 0 */
-       size = core->mem[0].size;
-       if (da >= 0 && ((da + len) <= size)) {
-               offset = da;
-               va = core->mem[0].cpu_addr + offset;
-               return (__force void *)va;
-       }
-
-       /* handle SoC-view addresses for ATCM and BTCM */
+       /* handle both R5 and SoC views of ATCM and BTCM */
        for (i = 0; i < core->num_mems; i++) {
                bus_addr = core->mem[i].bus_addr;
                dev_addr = core->mem[i].dev_addr;
                size = core->mem[i].size;
 
-               if (da >= bus_addr &&
-                   ((da + len) <= (bus_addr + size))) {
+               /* handle R5-view addresses of TCMs */
+               if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {
+                       offset = da - dev_addr;
+                       va = core->mem[i].cpu_addr + offset;
+                       return (__force void *)va;
+               }
+
+               /* handle SoC-view addresses of TCMs */
+               if (da >= bus_addr && ((da + len) <= (bus_addr + size))) {
                        offset = da - bus_addr;
                        va = core->mem[i].cpu_addr + offset;
                        return (__force void *)va;
@@ -958,11 +957,28 @@ static int k3_r5_core_of_get_internal_memories(struct platform_device *pdev,
        for (i = 0; i < num_mems; i++) {
                res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
                                                   mem_names[i]);
-               core->mem[i].cpu_addr = devm_ioremap_resource(dev, res);
-               if (IS_ERR(core->mem[i].cpu_addr)) {
-                       dev_err(dev, "failed to parse and map %s memory\n",
+               if (!res) {
+                       dev_err(dev, "found no memory resource for %s\n",
                                mem_names[i]);
+                       ret = -EINVAL;
+                       goto fail;
+               }
+               if (!devm_request_mem_region(dev, res->start,
+                                            resource_size(res),
+                                            dev_name(dev))) {
+                       dev_err(dev, "could not request %s region for resource\n",
+                               mem_names[i]);
+                       ret = -EBUSY;
+                       goto fail;
+               }
+
+               core->mem[i].cpu_addr = devm_ioremap_wc(dev, res->start,
+                                                       resource_size(res));
+               if (IS_ERR(core->mem[i].cpu_addr)) {
+                       dev_err(dev, "failed to map %s memory\n", mem_names[i]);
                        ret = PTR_ERR(core->mem[i].cpu_addr);
+                       devm_release_mem_region(dev, res->start,
+                                               resource_size(res));
                        goto fail;
                }
                core->mem[i].bus_addr = res->start;