raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

ntb: perf test: fix address space confusion

Browse Source 
commit 1985a88107 upstream.

The ntb driver assigns between pointers an __iomem tokens, and
also casts them to 64-bit integers, which results in compiler
warnings on 32-bit systems:

drivers/ntb/test/ntb_perf.c: In function 'perf_copy':
drivers/ntb/test/ntb_perf.c:213:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  vbase = (u64)(u64 *)mw->vbase;
          ^
drivers/ntb/test/ntb_perf.c:214:14: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  dst_vaddr = (u64)(u64 *)dst;
              ^

This adds __iomem annotations where needed and changes the temporary
variables to iomem pointers to avoid casting them to u64. I did not
see the problem in linux-next earlier, but it show showed up in
4.5-rc1.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Dave Jiang <dave.jiang@intel.com>
Fixes: 8a7b6a778a ("ntb: ntb perf tool")
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann
2016-01-26 10:31:45 +01:00
committed by Greg Kroah-Hartman
parent 5749dc2d06
commit 6fb42e94e2
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/ntb/test/ntb_perf.c
View File

@@ -178,7 +178,7 @@ static void perf_copy_callback(void *data)
atomic_dec(&pctx->dma_sync); atomic_dec(&pctx->dma_sync);
} }
static ssize_t perf_copy(struct pthr_ctx *pctx, char *dst, static ssize_t perf_copy(struct pthr_ctx *pctx, char __iomem *dst,
char *src, size_t size) char *src, size_t size)
{ {
struct perf_ctx *perf = pctx->perf; struct perf_ctx *perf = pctx->perf;
@@ -189,7 +189,8 @@ static ssize_t perf_copy(struct pthr_ctx *pctx, char *dst,
dma_cookie_t cookie; dma_cookie_t cookie;
size_t src_off, dst_off; size_t src_off, dst_off;
struct perf_mw *mw = &perf->mw; struct perf_mw *mw = &perf->mw;
u64 vbase, dst_vaddr; void __iomem *vbase;
void __iomem *dst_vaddr;
dma_addr_t dst_phys; dma_addr_t dst_phys;
int retries = 0; int retries = 0;
@@ -204,14 +205,14 @@ static ssize_t perf_copy(struct pthr_ctx *pctx, char *dst,
} }
device = chan->device; device = chan->device;
src_off = (size_t)src & ~PAGE_MASK; src_off = (uintptr_t)src & ~PAGE_MASK;
dst_off = (size_t)dst & ~PAGE_MASK; dst_off = (uintptr_t __force)dst & ~PAGE_MASK;
if (!is_dma_copy_aligned(device, src_off, dst_off, size)) if (!is_dma_copy_aligned(device, src_off, dst_off, size))
return -ENODEV; return -ENODEV;
vbase = (u64)(u64 *)mw->vbase; vbase = mw->vbase;
dst_vaddr = (u64)(u64 *)dst; dst_vaddr = dst;
dst_phys = mw->phys_addr + (dst_vaddr - vbase); dst_phys = mw->phys_addr + (dst_vaddr - vbase);
unmap = dmaengine_get_unmap_data(device->dev, 1, GFP_NOWAIT); unmap = dmaengine_get_unmap_data(device->dev, 1, GFP_NOWAIT);
@@ -261,13 +262,13 @@ err_get_unmap:
return 0; return 0;
} }
static int perf_move_data(struct pthr_ctx *pctx, char *dst, char *src, static int perf_move_data(struct pthr_ctx *pctx, char __iomem *dst, char *src,
u64 buf_size, u64 win_size, u64 total) u64 buf_size, u64 win_size, u64 total)
{ {
int chunks, total_chunks, i; int chunks, total_chunks, i;
int copied_chunks = 0; int copied_chunks = 0;
u64 copied = 0, result; u64 copied = 0, result;
char *tmp = dst; char __iomem *tmp = dst;
u64 perf, diff_us; u64 perf, diff_us;
ktime_t kstart, kstop, kdiff; ktime_t kstart, kstop, kdiff;
@@ -324,7 +325,7 @@ static int ntb_perf_thread(void *data)
struct perf_ctx *perf = pctx->perf; struct perf_ctx *perf = pctx->perf;
struct pci_dev *pdev = perf->ntb->pdev; struct pci_dev *pdev = perf->ntb->pdev;
struct perf_mw *mw = &perf->mw; struct perf_mw *mw = &perf->mw;
char *dst; char __iomem *dst;
u64 win_size, buf_size, total; u64 win_size, buf_size, total;
void *src; void *src;
int rc, node, i; int rc, node, i;
@@ -364,7 +365,7 @@ static int ntb_perf_thread(void *data)
if (buf_size > MAX_TEST_SIZE) if (buf_size > MAX_TEST_SIZE)
buf_size = MAX_TEST_SIZE; buf_size = MAX_TEST_SIZE;
dst = (char *)mw->vbase; dst = (char __iomem *)mw->vbase;
atomic_inc(&perf->tsync); atomic_inc(&perf->tsync);
while (atomic_read(&perf->tsync) != perf->perf_threads) while (atomic_read(&perf->tsync) != perf->perf_threads)