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/vio.c | |
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/vio.c')
-rw-r--r-- | arch/powerpc/kernel/vio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index cb87301ccd55..dda3d9ad1094 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, |