aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh64/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-10-01 04:43:11 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-10-01 04:43:11 -0400
commit049aa166b112beab77b9a2f8d9caa03b74843eab (patch)
treeeac8104b1271c7ff2c3bc3f4f0a49089e5fc4cd4 /arch/sh64/mm
parent749c84966c990092da20203a80e0749b614c79a6 (diff)
sh64: Move consistent DMA routines to arch/sh64/mm/.
The consistent DMA stuff was evolved from the old PCI DMA mapping functions. As this has been overhauled, it's something that is used by the generic DMA mapping code, and thus, has no intrinsic PCI dependence. Move the routines somewhere more sensible (same place as sh), and fix up the build for CONFIG_PCI=n in the process. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh64/mm')
-rw-r--r--arch/sh64/mm/Makefile4
-rw-r--r--arch/sh64/mm/consistent.c52
2 files changed, 54 insertions, 2 deletions
diff --git a/arch/sh64/mm/Makefile b/arch/sh64/mm/Makefile
index ff19378ac90a..d0e813632480 100644
--- a/arch/sh64/mm/Makefile
+++ b/arch/sh64/mm/Makefile
@@ -13,7 +13,8 @@
13# unless it's something special (ie not a .c file). 13# unless it's something special (ie not a .c file).
14# 14#
15 15
16obj-y := init.o fault.o ioremap.o extable.o cache.o tlbmiss.o tlb.o 16obj-y := cache.o consistent.o extable.o fault.o init.o ioremap.o \
17 tlbmiss.o tlb.o
17 18
18obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o 19obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
19 20
@@ -41,4 +42,3 @@ CFLAGS_tlbmiss.o += -ffixed-r7 \
41 -ffixed-r41 -ffixed-r42 -ffixed-r43 \ 42 -ffixed-r41 -ffixed-r42 -ffixed-r43 \
42 -ffixed-r60 -ffixed-r61 -ffixed-r62 \ 43 -ffixed-r60 -ffixed-r61 -ffixed-r62 \
43 -fomit-frame-pointer 44 -fomit-frame-pointer
44
diff --git a/arch/sh64/mm/consistent.c b/arch/sh64/mm/consistent.c
new file mode 100644
index 000000000000..8875a2a40da7
--- /dev/null
+++ b/arch/sh64/mm/consistent.c
@@ -0,0 +1,52 @@
1/*
2 * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
3 * Copyright (C) 2003 Paul Mundt (lethal@linux-sh.org)
4 *
5 * May be copied or modified under the terms of the GNU General Public
6 * License. See linux/COPYING for more information.
7 *
8 * Dynamic DMA mapping support.
9 */
10#include <linux/types.h>
11#include <linux/mm.h>
12#include <linux/string.h>
13#include <linux/pci.h>
14#include <linux/module.h>
15#include <asm/io.h>
16
17void *consistent_alloc(struct pci_dev *hwdev, size_t size,
18 dma_addr_t *dma_handle)
19{
20 void *ret;
21 int gfp = GFP_ATOMIC;
22 void *vp;
23
24 if (hwdev == NULL || hwdev->dma_mask != 0xffffffff)
25 gfp |= GFP_DMA;
26
27 ret = (void *)__get_free_pages(gfp, get_order(size));
28
29 /* now call our friend ioremap_nocache to give us an uncached area */
30 vp = ioremap_nocache(virt_to_phys(ret), size);
31
32 if (vp != NULL) {
33 memset(vp, 0, size);
34 *dma_handle = virt_to_phys(ret);
35 dma_cache_wback_inv((unsigned long)ret, size);
36 }
37
38 return vp;
39}
40EXPORT_SYMBOL(consistent_alloc);
41
42void consistent_free(struct pci_dev *hwdev, size_t size,
43 void *vaddr, dma_addr_t dma_handle)
44{
45 void *alloc;
46
47 alloc = phys_to_virt((unsigned long)dma_handle);
48 free_pages((unsigned long)alloc, get_order(size));
49
50 iounmap(vaddr);
51}
52EXPORT_SYMBOL(consistent_free);