diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-06-14 07:03:04 -0400 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-07-30 06:25:46 -0400 |
commit | 64ccc9c033c6089b2d426dad3c56477ab066c999 (patch) | |
tree | ffaec86ca326dfc83b78ce4005bf46c3ad98ceb9 /arch/powerpc/kernel | |
parent | 9fa8af91f0679f2abbebe1382b937264f3a8b981 (diff) |
common: dma-mapping: add support for generic dma_mmap_* calls
Commit 9adc5374 ('common: dma-mapping: introduce mmap method') added a
generic method for implementing mmap user call to dma_map_ops structure.
This patch converts ARM and PowerPC architectures (the only providers of
dma_mmap_coherent/dma_mmap_writecombine calls) to use this generic
dma_map_ops based call and adds a generic cross architecture
definition for dma_mmap_attrs, dma_mmap_coherent, dma_mmap_writecombine
functions.
The generic mmap virt_to_page-based fallback implementation is provided for
architectures which don't provide their own implementation for mmap method.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/dma-iommu.c | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/dma-swiotlb.c | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/dma.c | 36 | ||||
-rw-r--r-- | arch/powerpc/kernel/vio.c | 1 |
4 files changed, 22 insertions, 17 deletions
diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c index bcfdcd22c76..2d7bb8ced13 100644 --- a/arch/powerpc/kernel/dma-iommu.c +++ b/arch/powerpc/kernel/dma-iommu.c | |||
@@ -109,6 +109,7 @@ static u64 dma_iommu_get_required_mask(struct device *dev) | |||
109 | struct dma_map_ops dma_iommu_ops = { | 109 | struct dma_map_ops dma_iommu_ops = { |
110 | .alloc = dma_iommu_alloc_coherent, | 110 | .alloc = dma_iommu_alloc_coherent, |
111 | .free = dma_iommu_free_coherent, | 111 | .free = dma_iommu_free_coherent, |
112 | .mmap = dma_direct_mmap_coherent, | ||
112 | .map_sg = dma_iommu_map_sg, | 113 | .map_sg = dma_iommu_map_sg, |
113 | .unmap_sg = dma_iommu_unmap_sg, | 114 | .unmap_sg = dma_iommu_unmap_sg, |
114 | .dma_supported = dma_iommu_dma_supported, | 115 | .dma_supported = dma_iommu_dma_supported, |
diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c index 4ab88dafb23..46943651da2 100644 --- a/arch/powerpc/kernel/dma-swiotlb.c +++ b/arch/powerpc/kernel/dma-swiotlb.c | |||
@@ -49,6 +49,7 @@ static u64 swiotlb_powerpc_get_required(struct device *dev) | |||
49 | struct dma_map_ops swiotlb_dma_ops = { | 49 | struct dma_map_ops swiotlb_dma_ops = { |
50 | .alloc = dma_direct_alloc_coherent, | 50 | .alloc = dma_direct_alloc_coherent, |
51 | .free = dma_direct_free_coherent, | 51 | .free = dma_direct_free_coherent, |
52 | .mmap = dma_direct_mmap_coherent, | ||
52 | .map_sg = swiotlb_map_sg_attrs, | 53 | .map_sg = swiotlb_map_sg_attrs, |
53 | .unmap_sg = swiotlb_unmap_sg_attrs, | 54 | .unmap_sg = swiotlb_unmap_sg_attrs, |
54 | .dma_supported = swiotlb_dma_supported, | 55 | .dma_supported = swiotlb_dma_supported, |
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index b1ec983dcec..062bf20e6dd 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
@@ -65,6 +65,24 @@ void dma_direct_free_coherent(struct device *dev, size_t size, | |||
65 | #endif | 65 | #endif |
66 | } | 66 | } |
67 | 67 | ||
68 | int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma, | ||
69 | void *cpu_addr, dma_addr_t handle, size_t size, | ||
70 | struct dma_attrs *attrs) | ||
71 | { | ||
72 | unsigned long pfn; | ||
73 | |||
74 | #ifdef CONFIG_NOT_COHERENT_CACHE | ||
75 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | ||
76 | pfn = __dma_get_coherent_pfn((unsigned long)cpu_addr); | ||
77 | #else | ||
78 | pfn = page_to_pfn(virt_to_page(cpu_addr)); | ||
79 | #endif | ||
80 | return remap_pfn_range(vma, vma->vm_start, | ||
81 | pfn + vma->vm_pgoff, | ||
82 | vma->vm_end - vma->vm_start, | ||
83 | vma->vm_page_prot); | ||
84 | } | ||
85 | |||
68 | static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, | 86 | static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, |
69 | int nents, enum dma_data_direction direction, | 87 | int nents, enum dma_data_direction direction, |
70 | struct dma_attrs *attrs) | 88 | struct dma_attrs *attrs) |
@@ -154,6 +172,7 @@ static inline void dma_direct_sync_single(struct device *dev, | |||
154 | struct dma_map_ops dma_direct_ops = { | 172 | struct dma_map_ops dma_direct_ops = { |
155 | .alloc = dma_direct_alloc_coherent, | 173 | .alloc = dma_direct_alloc_coherent, |
156 | .free = dma_direct_free_coherent, | 174 | .free = dma_direct_free_coherent, |
175 | .mmap = dma_direct_mmap_coherent, | ||
157 | .map_sg = dma_direct_map_sg, | 176 | .map_sg = dma_direct_map_sg, |
158 | .unmap_sg = dma_direct_unmap_sg, | 177 | .unmap_sg = dma_direct_unmap_sg, |
159 | .dma_supported = dma_direct_dma_supported, | 178 | .dma_supported = dma_direct_dma_supported, |
@@ -211,20 +230,3 @@ static int __init dma_init(void) | |||
211 | } | 230 | } |
212 | fs_initcall(dma_init); | 231 | fs_initcall(dma_init); |
213 | 232 | ||
214 | int dma_mmap_coherent(struct device *dev, struct vm_area_struct *vma, | ||
215 | void *cpu_addr, dma_addr_t handle, size_t size) | ||
216 | { | ||
217 | unsigned long pfn; | ||
218 | |||
219 | #ifdef CONFIG_NOT_COHERENT_CACHE | ||
220 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | ||
221 | pfn = __dma_get_coherent_pfn((unsigned long)cpu_addr); | ||
222 | #else | ||
223 | pfn = page_to_pfn(virt_to_page(cpu_addr)); | ||
224 | #endif | ||
225 | return remap_pfn_range(vma, vma->vm_start, | ||
226 | pfn + vma->vm_pgoff, | ||
227 | vma->vm_end - vma->vm_start, | ||
228 | vma->vm_page_prot); | ||
229 | } | ||
230 | EXPORT_SYMBOL_GPL(dma_mmap_coherent); | ||
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index cb87301ccd5..dda3d9ad109 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
@@ -613,6 +613,7 @@ static u64 vio_dma_get_required_mask(struct device *dev) | |||
613 | struct dma_map_ops vio_dma_mapping_ops = { | 613 | struct dma_map_ops vio_dma_mapping_ops = { |
614 | .alloc = vio_dma_iommu_alloc_coherent, | 614 | .alloc = vio_dma_iommu_alloc_coherent, |
615 | .free = vio_dma_iommu_free_coherent, | 615 | .free = vio_dma_iommu_free_coherent, |
616 | .mmap = dma_direct_mmap_coherent, | ||
616 | .map_sg = vio_dma_iommu_map_sg, | 617 | .map_sg = vio_dma_iommu_map_sg, |
617 | .unmap_sg = vio_dma_iommu_unmap_sg, | 618 | .unmap_sg = vio_dma_iommu_unmap_sg, |
618 | .map_page = vio_dma_iommu_map_page, | 619 | .map_page = vio_dma_iommu_map_page, |