Commit 8e3a68fb authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: make dma_atomic_pool_init self-contained 



The memory allocated for the atomic pool needs to have the same
mapping attributes that we use for remapping, so use
pgprot_dmacoherent instead of open coding it.  Also deduct a
suitable zone to allocate the memory from based on the presence
of the DMA zones.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 419e2f18

arch/arc/mm/dma.c

+0 −6
Original line number Diff line number Diff line
@@ -104,9 +104,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, 
	dev_info(dev, "use %sncoherent DMA ops\n",

		 dev->dma_coherent ? "" : "non");

}
 


static int __init atomic_pool_init(void)

{

	return dma_atomic_pool_init(GFP_KERNEL, pgprot_noncached(PAGE_KERNEL));

}

postcore_initcall(atomic_pool_init);

arch/arm64/mm/dma-mapping.c

+0 −6
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ void arch_dma_prep_coherent(struct page *page, size_t size) 
	__dma_flush_area(page_address(page), size);

}



static int __init arm64_dma_init(void)

{

	return dma_atomic_pool_init(GFP_DMA32, __pgprot(PROT_NORMAL_NC));

}

arch_initcall(arm64_dma_init);



#ifdef CONFIG_IOMMU_DMA

void arch_teardown_dma_ops(struct device *dev)

{

arch/csky/mm/dma-mapping.c

+0 −6
Original line number Diff line number Diff line
@@ -14,12 +14,6 @@ 
#include <linux/version.h>

#include <asm/cache.h>



static int __init atomic_pool_init(void)

{

	return dma_atomic_pool_init(GFP_KERNEL, pgprot_noncached(PAGE_KERNEL));

}

postcore_initcall(atomic_pool_init);



void arch_dma_prep_coherent(struct page *page, size_t size)

{

	if (PageHighMem(page)) {

arch/nds32/kernel/dma.c

+0 −6
Original line number Diff line number Diff line
@@ -80,9 +80,3 @@ void arch_dma_prep_coherent(struct page *page, size_t size) 
{

	cache_op(page_to_phys(page), size, cpu_dma_wbinval_range);

}
 


static int __init atomic_pool_init(void)

{

	return dma_atomic_pool_init(GFP_KERNEL, pgprot_noncached(PAGE_KERNEL));

}

postcore_initcall(atomic_pool_init);

include/linux/dma-mapping.h

+0 −1
Original line number Diff line number Diff line
@@ -624,7 +624,6 @@ void *dma_common_pages_remap(struct page **pages, size_t size, 
			const void *caller);

void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags);



int __init dma_atomic_pool_init(gfp_t gfp, pgprot_t prot);

bool dma_in_atomic_pool(void *start, size_t size);

void *dma_alloc_from_pool(size_t size, struct page **ret_page, gfp_t flags);

bool dma_free_from_pool(void *start, size_t size);

CRA Git | Maintained and supported by SUSTech CRA and CCSE