aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/include/asm/device.h1
-rw-r--r--arch/arm64/include/asm/dma-mapping.h7
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/device.h b/arch/arm64/include/asm/device.h
index cf98b362094b..243ef256b8c9 100644
--- a/arch/arm64/include/asm/device.h
+++ b/arch/arm64/include/asm/device.h
@@ -21,6 +21,7 @@ struct dev_archdata {
21#ifdef CONFIG_IOMMU_API 21#ifdef CONFIG_IOMMU_API
22 void *iommu; /* private IOMMU data */ 22 void *iommu; /* private IOMMU data */
23#endif 23#endif
24 bool dma_coherent;
24}; 25};
25 26
26struct pdev_archdata { 27struct pdev_archdata {
diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
index adeae3f6f0fc..d34189bceff7 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -54,11 +54,18 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
54 54
55static inline int set_arch_dma_coherent_ops(struct device *dev) 55static inline int set_arch_dma_coherent_ops(struct device *dev)
56{ 56{
57 dev->archdata.dma_coherent = true;
57 set_dma_ops(dev, &coherent_swiotlb_dma_ops); 58 set_dma_ops(dev, &coherent_swiotlb_dma_ops);
58 return 0; 59 return 0;
59} 60}
60#define set_arch_dma_coherent_ops set_arch_dma_coherent_ops 61#define set_arch_dma_coherent_ops set_arch_dma_coherent_ops
61 62
63/* do not use this function in a driver */
64static inline bool is_device_dma_coherent(struct device *dev)
65{
66 return dev->archdata.dma_coherent;
67}
68
62#include <asm-generic/dma-mapping-common.h> 69#include <asm-generic/dma-mapping-common.h>
63 70
64static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) 71static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)