Skip to content

Commit

Permalink
ARM: dma-mapping: add support for DMA_ATTR_NO_KERNEL_MAPPING attribute
Browse files Browse the repository at this point in the history
This patch adds support for DMA_ATTR_NO_KERNEL_MAPPING attribute for
IOMMU allocations, what let drivers to save precious kernel virtual
address space for large buffers that are intended to be accessed only
from userspace.

This patch is heavily based on initial work kindly provided by Abhinav
Kochhar <abhinav.k@samsung.com>.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com>
  • Loading branch information
Marek Szyprowski committed Jul 30, 2012
1 parent d5724f1 commit 955c757
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions arch/arm/mm/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -1074,10 +1074,13 @@ static int __iommu_remove_mapping(struct device *dev, dma_addr_t iova, size_t si
return 0;
}

static struct page **__iommu_get_pages(void *cpu_addr)
static struct page **__iommu_get_pages(void *cpu_addr, struct dma_attrs *attrs)
{
struct vm_struct *area;

if (dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING, attrs))
return cpu_addr;

area = find_vm_area(cpu_addr);
if (area && (area->flags & VM_ARM_DMA_CONSISTENT))
return area->pages;
Expand All @@ -1102,6 +1105,9 @@ static void *arm_iommu_alloc_attrs(struct device *dev, size_t size,
if (*handle == DMA_ERROR_CODE)
goto err_buffer;

if (dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING, attrs))
return pages;

addr = __iommu_alloc_remap(pages, size, gfp, prot,
__builtin_return_address(0));
if (!addr)
Expand All @@ -1122,7 +1128,7 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma,
{
unsigned long uaddr = vma->vm_start;
unsigned long usize = vma->vm_end - vma->vm_start;
struct page **pages = __iommu_get_pages(cpu_addr);
struct page **pages = __iommu_get_pages(cpu_addr, attrs);

vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot);

Expand All @@ -1149,16 +1155,18 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma,
void arm_iommu_free_attrs(struct device *dev, size_t size, void *cpu_addr,
dma_addr_t handle, struct dma_attrs *attrs)
{
struct page **pages = __iommu_get_pages(cpu_addr);
struct page **pages = __iommu_get_pages(cpu_addr, attrs);
size = PAGE_ALIGN(size);

if (!pages) {
WARN(1, "trying to free invalid coherent area: %p\n", cpu_addr);
return;
}

unmap_kernel_range((unsigned long)cpu_addr, size);
vunmap(cpu_addr);
if (!dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING, attrs)) {
unmap_kernel_range((unsigned long)cpu_addr, size);
vunmap(cpu_addr);
}

__iommu_remove_mapping(dev, handle, size);
__iommu_free_buffer(dev, pages, size);
Expand Down

0 comments on commit 955c757

Please sign in to comment.