nios2: use the generic uncached segment support in dma-direct

Stop providing our own arch alloc/free hooks and just expose the segment
offset and use the generic dma-direct allocator.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Ley Foon Tan <ley.foon.tan@intel.com>

1 files changed, 15 insertions, 19 deletions

diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c
index 4af9e5b5ba1c..9cb238664584 100644
--- a/arch/nios2/mm/dma-mapping.c
+++ b/arch/nios2/mm/dma-mapping.c
@@ -60,32 +60,28 @@ void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
         }
 }
 
-void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
-                gfp_t gfp, unsigned long attrs)
+void arch_dma_prep_coherent(struct page *page, size_t size)
 {
-        void *ret;
+        unsigned long start = (unsigned long)page_address(page);
 
-        /* optimized page clearing */
-        gfp |= __GFP_ZERO;
+        flush_dcache_range(start, start + size);
+}
 
-        if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
-                gfp |= GFP_DMA;
+void *uncached_kernel_address(void *ptr)
+{
+        unsigned long addr = (unsigned long)ptr;
 
-        ret = (void *) __get_free_pages(gfp, get_order(size));
-        if (ret != NULL) {
-                *dma_handle = virt_to_phys(ret);
-                flush_dcache_range((unsigned long) ret,
-                        (unsigned long) ret + size);
-                ret = UNCAC_ADDR(ret);
-        }
+        addr |= CONFIG_NIOS2_IO_REGION_BASE;
 
-        return ret;
+        return (void *)ptr;
 }
 
-void arch_dma_free(struct device *dev, size_t size, void *vaddr,
-                dma_addr_t dma_handle, unsigned long attrs)
+void *cached_kernel_address(void *ptr)
 {
-        unsigned long addr = (unsigned long) CAC_ADDR((unsigned long) vaddr);
+        unsigned long addr = (unsigned long)ptr;
+
+        addr &= ~CONFIG_NIOS2_IO_REGION_BASE;
+        addr |= CONFIG_NIOS2_KERNEL_REGION_BASE;
 
-        free_pages(addr, get_order(size));
+        return (void *)ptr;
 }