aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arc/plat-arcfpga
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2013-01-22 06:23:57 -0500
committerVineet Gupta <vgupta@synopsys.com>2013-02-15 12:46:15 -0500
commitfc7943d29e9f6f5f6d4b111120b66ec86501673e (patch)
tree04a0c556489438b9c25613345bc1a25cef38819b /arch/arc/plat-arcfpga
parentdecae9d3e87b5454b3b190d8e00b063175a3a091 (diff)
ARC: [Review] Multi-platform image #6: cpu-to-dma-addr optional
All the current platforms can work with 0x8000_0000 based dma_addr_t since the Bus Bridges typically ignore the top bit (the only excpetion was Angel4 PCI-AHB bridge which we no longer care for). That way we don't need plat-specific cpu-addr to bus-addr conversion. Hooks still provided - just in case a platform has an obscure device which say needs 0 based bus address. That way <asm/dma_mapping.h> no longer needs to unconditinally include <plat/dma_addr.h> Also verfied that on Angel4 board, other peripherals (IDE-disk / EMAC) work fine with 0x8000_0000 based dma addresses. Signed-off-by: Vineet Gupta <vgupta@synopsys.com> Cc: Arnd Bergmann <arnd@arndb.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arc/plat-arcfpga')
-rw-r--r--arch/arc/plat-arcfpga/include/plat/dma_addr.h45
1 files changed, 0 insertions, 45 deletions
diff --git a/arch/arc/plat-arcfpga/include/plat/dma_addr.h b/arch/arc/plat-arcfpga/include/plat/dma_addr.h
deleted file mode 100644
index 0e963431b729..000000000000
--- a/arch/arc/plat-arcfpga/include/plat/dma_addr.h
+++ /dev/null
@@ -1,45 +0,0 @@
1/*
2 * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 *
8 * vineetg: Feb 2009
9 * -For AA4 board, kernel to DMA address APIs
10 */
11
12/*
13 * kernel addresses are 0x800_000 based, while Bus addr are 0 based
14 */
15
16#ifndef __PLAT_DMA_ADDR_H
17#define __PLAT_DMA_ADDR_H
18
19#include <linux/device.h>
20
21static inline unsigned long plat_dma_addr_to_kernel(struct device *dev,
22 dma_addr_t dma_addr)
23{
24 return dma_addr + PAGE_OFFSET;
25}
26
27static inline dma_addr_t plat_kernel_addr_to_dma(struct device *dev, void *ptr)
28{
29 unsigned long addr = (unsigned long)ptr;
30 /*
31 * To Catch buggy drivers which can call DMA map API with kernel vaddr
32 * i.e. for buffers alloc via vmalloc or ioremap which are not
33 * gaurnateed to be PHY contiguous and hence unfit for DMA anyways.
34 * On ARC kernel virtual address is 0x7000_0000 to 0x7FFF_FFFF, so
35 * ideally we want to check this range here, but our implementation is
36 * better as it checks for even worse user virtual address as well.
37 */
38 if (likely(addr >= PAGE_OFFSET))
39 return addr - PAGE_OFFSET;
40
41 BUG();
42 return addr;
43}
44
45#endif