aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/dma-mapping.h3
-rw-r--r--arch/powerpc/include/asm/machdep.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
index dd70fac57ec..8135e66a4bb 100644
--- a/arch/powerpc/include/asm/dma-mapping.h
+++ b/arch/powerpc/include/asm/dma-mapping.h
@@ -20,6 +20,8 @@
20 20
21#define DMA_ERROR_CODE (~(dma_addr_t)0x0) 21#define DMA_ERROR_CODE (~(dma_addr_t)0x0)
22 22
23#define ARCH_HAS_DMA_GET_REQUIRED_MASK
24
23/* Some dma direct funcs must be visible for use in other dma_ops */ 25/* Some dma direct funcs must be visible for use in other dma_ops */
24extern void *dma_direct_alloc_coherent(struct device *dev, size_t size, 26extern void *dma_direct_alloc_coherent(struct device *dev, size_t size,
25 dma_addr_t *dma_handle, gfp_t flag); 27 dma_addr_t *dma_handle, gfp_t flag);
@@ -69,6 +71,7 @@ static inline unsigned long device_to_mask(struct device *dev)
69 */ 71 */
70#ifdef CONFIG_PPC64 72#ifdef CONFIG_PPC64
71extern struct dma_map_ops dma_iommu_ops; 73extern struct dma_map_ops dma_iommu_ops;
74extern u64 dma_iommu_get_required_mask(struct device *dev);
72#endif 75#endif
73extern struct dma_map_ops dma_direct_ops; 76extern struct dma_map_ops dma_direct_ops;
74 77
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 47cacddb14c..58fc2162301 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -85,8 +85,9 @@ struct machdep_calls {
85 void (*pci_dma_dev_setup)(struct pci_dev *dev); 85 void (*pci_dma_dev_setup)(struct pci_dev *dev);
86 void (*pci_dma_bus_setup)(struct pci_bus *bus); 86 void (*pci_dma_bus_setup)(struct pci_bus *bus);
87 87
88 /* Platform set_dma_mask override */ 88 /* Platform set_dma_mask and dma_get_required_mask overrides */
89 int (*dma_set_mask)(struct device *dev, u64 dma_mask); 89 int (*dma_set_mask)(struct device *dev, u64 dma_mask);
90 u64 (*dma_get_required_mask)(struct device *dev);
90 91
91 int (*probe)(void); 92 int (*probe)(void);
92 void (*setup_arch)(void); /* Optional, may be NULL */ 93 void (*setup_arch)(void); /* Optional, may be NULL */