Skip to content

Commit

Permalink
remoteproc: add warning on resource table cast
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Loic Pallardy authored and Bjorn Andersson committed Feb 21, 2019
1 parent 80137b4 commit b36de8c
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions drivers/remoteproc/remoteproc_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@

#include "remoteproc_internal.h"

#define HIGH_BITS_MASK 0xFFFFFFFF00000000ULL

static DEFINE_MUTEX(rproc_list_mutex);
static LIST_HEAD(rproc_list);

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit b36de8c

Please sign in to comment.