diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-06-14 16:17:27 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-06-25 14:28:05 +0200 |
| commit | d98849aff87911013aadb730138ab728b52fc547 (patch) | |
| tree | 14dbf44779970bf7754648fb04c5b2c9bf40ba6f /arch/xtensa/kernel/pci-dma.c | |
| parent | c2f2124e0d447ad02a41a92361b3734366797680 (diff) | |
| download | linux-d98849aff87911013aadb730138ab728b52fc547.tar.gz linux-d98849aff87911013aadb730138ab728b52fc547.tar.bz2 linux-d98849aff87911013aadb730138ab728b52fc547.zip | |
dma-direct: handle DMA_ATTR_NO_KERNEL_MAPPING in common code
DMA_ATTR_NO_KERNEL_MAPPING is generally implemented by allocating
normal cacheable pages or CMA memory, and then returning the page
pointer as the opaque handle. Lift that code from the xtensa and
generic dma remapping implementations into the generic dma-direct
code so that we don't even call arch_dma_alloc for these allocations.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/xtensa/kernel/pci-dma.c')
| -rw-r--r-- | arch/xtensa/kernel/pci-dma.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c index 9171bff76fc4..206771277dff 100644 --- a/arch/xtensa/kernel/pci-dma.c +++ b/arch/xtensa/kernel/pci-dma.c @@ -167,10 +167,6 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, *handle = phys_to_dma(dev, page_to_phys(page)); - if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) { - return page; - } - #ifdef CONFIG_MMU if (PageHighMem(page)) { void *p; @@ -196,9 +192,7 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; struct page *page; - if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) { - page = vaddr; - } else if (platform_vaddr_uncached(vaddr)) { + if (platform_vaddr_uncached(vaddr)) { page = virt_to_page(platform_vaddr_to_cached(vaddr)); } else { #ifdef CONFIG_MMU |