2018-05-29 17:48 GMT+08:00 Christoph Hellwig <h...@lst.de>:
> Switch to the generic noncoherent direct mapping implementation.
>
> Signed-off-by: Christoph Hellwig <h...@lst.de>
> ---
> arch/nds32/Kconfig | 3 +
> arch/nds32/include/asm/Kbuild | 1 +
> arch/nds32/include/asm/dma-mapping.h | 14 ----
> arch/nds32/kernel/dma.c | 113 +++------------------------
> 4 files changed, 15 insertions(+), 116 deletions(-)
> delete mode 100644 arch/nds32/include/asm/dma-mapping.h
>
> diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
> index 249f38d3388f..67d0ac0a989c 100644
> --- a/arch/nds32/Kconfig
> +++ b/arch/nds32/Kconfig
> @@ -5,10 +5,13 @@
>
> config NDS32
> def_bool y
> + select ARCH_HAS_SYNC_DMA_FOR_CPU
> + select ARCH_HAS_SYNC_DMA_FOR_DEVICE
> select ARCH_WANT_FRAME_POINTERS if FTRACE
> select CLKSRC_MMIO
> select CLONE_BACKWARDS
> select COMMON_CLK
> + select DMA_NONCOHERENT_OPS
> select GENERIC_ATOMIC64
> select GENERIC_CPU_DEVICES
> select GENERIC_CLOCKEVENTS
> diff --git a/arch/nds32/include/asm/Kbuild b/arch/nds32/include/asm/Kbuild
> index 06bdf8167f5a..b3e951f805f8 100644
> --- a/arch/nds32/include/asm/Kbuild
> +++ b/arch/nds32/include/asm/Kbuild
> @@ -13,6 +13,7 @@ generic-y += cputime.h
> generic-y += device.h
> generic-y += div64.h
> generic-y += dma.h
> +generic-y += dma-mapping.h
> generic-y += emergency-restart.h
> generic-y += errno.h
> generic-y += exec.h
> diff --git a/arch/nds32/include/asm/dma-mapping.h
> b/arch/nds32/include/asm/dma-mapping.h
> deleted file mode 100644
> index 2dd47d245c25..000000000000
> --- a/arch/nds32/include/asm/dma-mapping.h
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -// Copyright (C) 2005-2017 Andes Technology Corporation
> -
> -#ifndef ASMNDS32_DMA_MAPPING_H
> -#define ASMNDS32_DMA_MAPPING_H
> -
> -extern struct dma_map_ops nds32_dma_ops;
> -
> -static inline struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
> -{
> - return &nds32_dma_ops;
> -}
> -
> -#endif
> diff --git a/arch/nds32/kernel/dma.c b/arch/nds32/kernel/dma.c
> index b9973317c734..d0dbd4fe9645 100644
> --- a/arch/nds32/kernel/dma.c
> +++ b/arch/nds32/kernel/dma.c
> @@ -3,17 +3,14 @@
>
> #include <linux/types.h>
> #include <linux/mm.h>
> -#include <linux/export.h>
> #include <linux/string.h>
> -#include <linux/scatterlist.h>
> -#include <linux/dma-mapping.h>
> +#include <linux/dma-noncoherent.h>
> #include <linux/io.h>
> #include <linux/cache.h>
> #include <linux/highmem.h>
> #include <linux/slab.h>
> #include <asm/cacheflush.h>
> #include <asm/tlbflush.h>
> -#include <asm/dma-mapping.h>
> #include <asm/proc-fns.h>
>
> /*
> @@ -119,10 +116,8 @@ static struct arch_vm_region *vm_region_find(struct
> arch_vm_region *head,
> return c;
> }
>
> -/* FIXME: attrs is not used. */
> -static void *nds32_dma_alloc_coherent(struct device *dev, size_t size,
> - dma_addr_t * handle, gfp_t gfp,
> - unsigned long attrs)
> +void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
> + gfp_t gfp, unsigned long attrs)
> {
> struct page *page;
> struct arch_vm_region *c;
> @@ -227,8 +222,8 @@ static void *nds32_dma_alloc_coherent(struct device *dev,
> size_t size,
> return NULL;
> }
>
> -static void nds32_dma_free(struct device *dev, size_t size, void *cpu_addr,
> - dma_addr_t handle, unsigned long attrs)
> +void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,
> + dma_addr_t handle, unsigned long attrs)
> {
> struct arch_vm_region *c;
> unsigned long flags, addr;
> @@ -365,118 +360,32 @@ static inline void cache_op(phys_addr_t paddr, size_t
> size,
> } while (left);
> }
>
> -static void
> -nds32_dma_sync_single_for_device(struct device *dev, dma_addr_t handle,
> - size_t size, enum dma_data_direction dir)
> +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,
> + size_t size, enum dma_data_direction dir)
> {
> switch (dir) {
> case DMA_FROM_DEVICE:
> break;
> case DMA_TO_DEVICE:
> case DMA_BIDIRECTIONAL:
> - cache_op(handle, size, cpu_dma_wb_range);
> + cache_op(paddr, size, cpu_dma_wb_range);
> break;
> default:
> BUG();
> }
> }
>
> -static void
> -nds32_dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,
> - size_t size, enum dma_data_direction dir)
> +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
> + size_t size, enum dma_data_direction dir)
> {
> switch (dir) {
> case DMA_TO_DEVICE:
> break;
> case DMA_FROM_DEVICE:
> case DMA_BIDIRECTIONAL:
> - cache_op(handle, size, cpu_dma_inval_range);
> + cache_op(paddr, size, cpu_dma_inval_range);
> break;
> default:
> BUG();
> }
> }
> -
> -static dma_addr_t nds32_dma_map_page(struct device *dev, struct page *page,
> - unsigned long offset, size_t size,
> - enum dma_data_direction dir,
> - unsigned long attrs)
> -{
> - dma_addr_t dma_addr = page_to_phys(page) + offset;
> -
> - if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
> - nds32_dma_sync_single_for_device(dev, handle, size, dir);
> - return dma_addr;
> -}
> -
> -static void nds32_dma_unmap_page(struct device *dev, dma_addr_t handle,
> - size_t size, enum dma_data_direction dir,
> - unsigned long attrs)
> -{
> - if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
> - nds32_dma_sync_single_for_cpu(dev, handle, size, dir);
> -}
> -
> -static void
> -nds32_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
> - int nents, enum dma_data_direction dir)
> -{
> - int i;
> -
> - for (i = 0; i < nents; i++, sg++) {
> - nds32_dma_sync_single_for_device(dev, sg_dma_address(sg),
> - sg->length, dir);
> - }
> -}
> -
> -static void
> -nds32_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int
> nents,
> - enum dma_data_direction dir)
> -{
> - int i;
> -
> - for (i = 0; i < nents; i++, sg++) {
> - nds32_dma_sync_single_for_cpu(dev, sg_dma_address(sg),
> - sg->length, dir);
> - }
> -}
> -
> -static int nds32_dma_map_sg(struct device *dev, struct scatterlist *sg,
> - int nents, enum dma_data_direction dir,
> - unsigned long attrs)
> -{
> - int i;
> -
> - for (i = 0; i < nents; i++, sg++) {
> - nds32_dma_sync_single_for_device(dev, sg_dma_address(sg),
> - sg->length, dir);
> - }
> - return nents;
> -}
> -
> -static void nds32_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
> - int nhwentries, enum dma_data_direction dir,
> - unsigned long attrs)
> -{
> - int i;
> -
> - for (i = 0; i < nhwentries; i++, sg++) {
> - nds32_dma_sync_single_for_cpu(dev, sg_dma_address(sg),
> - sg->length, dir);
> - }
> -}
> -
> -struct dma_map_ops nds32_dma_ops = {
> - .alloc = nds32_dma_alloc_coherent,
> - .free = nds32_dma_free,
> - .map_page = nds32_dma_map_page,
> - .unmap_page = nds32_dma_unmap_page,
> - .map_sg = nds32_dma_map_sg,
> - .unmap_sg = nds32_dma_unmap_sg,
> - .sync_single_for_device = nds32_dma_sync_single_for_device,
> - .sync_single_for_cpu = nds32_dma_sync_single_for_cpu,
> - .sync_sg_for_cpu = nds32_dma_sync_sg_for_cpu,
> - .sync_sg_for_device = nds32_dma_sync_sg_for_device,
> -};
> -
> -EXPORT_SYMBOL(nds32_dma_ops);
Acked-by: Greentime Hu <greent...@andestech.com>
Tested-by: Greentime Hu <greent...@andestech.com>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
