Skip to contentSkip to conversation

nios2: use dma_direct_alloc_pages

PATCH New Christoph Hellwig 1 participant 1 message Dec 14, 2018 NIOS2 architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nios2: use dma_direct_alloc_pages

Use the generic dma allocator to get various quirks and support for CMA allocations (if enabled) for free.

---
 arch/nios2/mm/dma-mapping.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
arch/nios2/mm/dma-mapping.c +5 -12
index 4af9e5b5ba1c..5ecd21555495 100644
@@ -65,15 +65,8 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
 {
 	void *ret;
 
-	/* optimized page clearing */
-	gfp |= __GFP_ZERO;
-
-	if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
-		gfp |= GFP_DMA;
-
-	ret = (void *) __get_free_pages(gfp, get_order(size));
-	if (ret != NULL) {
-		*dma_handle = virt_to_phys(ret);
+	ret = dma_direct_alloc_pages(dev, size, dma_handle, gfp, attrs);
+	if (ret) {
 		flush_dcache_range((unsigned long) ret,
 			(unsigned long) ret + size);
 		ret = UNCAC_ADDR(ret);
@@ -81,11 +74,11 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
 
 	return ret;
 }
+}
 
 void arch_dma_free(struct device *dev, size_t size, void *vaddr,
 		dma_addr_t dma_handle, unsigned long attrs)
 {
-	unsigned long addr = (unsigned long) CAC_ADDR((unsigned long) vaddr);
-
-	free_pages(addr, get_order(size));
+	vaddr = (void *)CAC_ADDR((unsigned long)cpu_addr);
+	dma_direct_free_pages(dev, size, vaddr, dma_handle, attrs);
 }
Signature · 1 line
2.19.2