Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 347cb6af authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: add a kconfig symbol for arch_setup_dma_ops availability 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: Paul Burton <paul.burton@mips.com> # MIPS
Acked-by: Catalin Marinas <catalin.marinas@arm.com> # arm64
parent 70ca7ba2

arch/arc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config ARC 
	select ARC_TIMERS

	select ARCH_HAS_DMA_COHERENT_TO_PFN

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SETUP_DMA_OPS

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC

arch/arc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ generic-y += bugs.h 
generic-y += compat.h

generic-y += device.h

generic-y += div64.h

generic-y += dma-mapping.h

generic-y += emergency-restart.h

generic-y += extable.h

generic-y += ftrace.h

arch/arc/include/asm/dma-mapping.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier:  GPL-2.0

// (C) 2018 Synopsys, Inc. (www.synopsys.com)



#ifndef ASM_ARC_DMA_MAPPING_H

#define ASM_ARC_DMA_MAPPING_H



#include <asm-generic/dma-mapping.h>



void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			const struct iommu_ops *iommu, bool coherent);

#define arch_setup_dma_ops arch_setup_dma_ops



#endif

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config ARM 
	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_PTE_SPECIAL if ARM_LPAE

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_SETUP_DMA_OPS

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL

	select ARCH_HAS_STRICT_MODULE_RWX if MMU

arch/arm/include/asm/dma-mapping.h

+0 −4
Original line number Diff line number Diff line
@@ -96,10 +96,6 @@ static inline unsigned long dma_max_pfn(struct device *dev) 
}

#define dma_max_pfn(dev) dma_max_pfn(dev)



#define arch_setup_dma_ops arch_setup_dma_ops

extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			       const struct iommu_ops *iommu, bool coherent);



#ifdef CONFIG_MMU

#define arch_teardown_dma_ops arch_teardown_dma_ops

extern void arch_teardown_dma_ops(struct device *dev);