]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
remoteproc: add warning on resource table cast
authorLoic Pallardy <loic.pallardy@st.com>
Thu, 10 Jan 2019 13:49:08 +0000 (14:49 +0100)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Thu, 21 Feb 2019 05:34:18 +0000 (21:34 -0800)
Today resource table supports only 32bit address fields.
This is not compliant with 64bit platform for which addresses
are cast in 32bit.
This patch adds warn messages when address cast is done.

Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
drivers/remoteproc/remoteproc_core.c

index 91d7788b1210a2f846e04d869c7b6e936381a16f..862c3728fa6412b6b9191b916c0c9b3d2318cb00 100644 (file)
@@ -47,6 +47,8 @@
 
 #include "remoteproc_internal.h"
 
+#define HIGH_BITS_MASK 0xFFFFFFFF00000000ULL
+
 static DEFINE_MUTEX(rproc_list_mutex);
 static LIST_HEAD(rproc_list);
 
@@ -816,6 +818,10 @@ static int rproc_alloc_carveout(struct rproc *rproc,
                dev_dbg(dev, "carveout mapped 0x%x to %pad\n",
                        mem->da, &dma);
        } else {
+               /* Update device address as undefined by requester */
+               if ((u64)dma & HIGH_BITS_MASK)
+                       dev_warn(dev, "DMA address cast in 32bit to fit resource table format\n");
+
                mem->da = (u32)dma;
        }
 
@@ -1159,6 +1165,7 @@ static int rproc_alloc_registered_carveouts(struct rproc *rproc)
        struct rproc_mem_entry *entry, *tmp;
        struct fw_rsc_carveout *rsc;
        struct device *dev = &rproc->dev;
+       u64 pa;
        int ret;
 
        list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) {
@@ -1195,10 +1202,15 @@ static int rproc_alloc_registered_carveouts(struct rproc *rproc)
 
                        /* Use va if defined else dma to generate pa */
                        if (entry->va)
-                               rsc->pa = (u32)rproc_va_to_pa(entry->va);
+                               pa = (u64)rproc_va_to_pa(entry->va);
                        else
-                               rsc->pa = (u32)entry->dma;
+                               pa = (u64)entry->dma;
+
+                       if (((u64)pa) & HIGH_BITS_MASK)
+                               dev_warn(dev,
+                                        "Physical address cast in 32bit to fit resource table format\n");
 
+                       rsc->pa = (u32)pa;
                        rsc->da = entry->da;
                        rsc->len = entry->len;
                }