Commit 31dde116 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: Replace set_arch_dma_coherent_ops with arch_setup_dma_ops 



Commit a3a60f81 (dma-mapping: replace set_arch_dma_coherent_ops with
arch_setup_dma_ops) changes the of_dma_configure() arch dma_ops callback
to arch_setup_dma_ops but only the arch/arm code is updated. Subsequent
commit 97890ba9 (dma-mapping: detect and configure IOMMU in
of_dma_configure) changes the arch_setup_dma_ops() prototype further to
handle iommu. The patch makes the corresponding arm64 changes.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
parent 97bf6af1

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

+6 −5
Original line number Diff line number Diff line
@@ -52,13 +52,14 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) 
	dev->archdata.dma_ops = ops;

}



static inline int set_arch_dma_coherent_ops(struct device *dev)

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

				      struct iommu_ops *iommu, bool coherent)

{

	dev->archdata.dma_coherent = true;

	dev->archdata.dma_coherent = coherent;

	if (coherent)

		set_dma_ops(dev, &coherent_swiotlb_dma_ops);

	return 0;

}

#define set_arch_dma_coherent_ops	set_arch_dma_coherent_ops

#define arch_setup_dma_ops	arch_setup_dma_ops



/* do not use this function in a driver */

static inline bool is_device_dma_coherent(struct device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE