Commit 3a4c6f0b authored by Mark Nelson's avatar Mark Nelson Committed by Benjamin Herrenschmidt

powerpc: move device_to_mask() to dma-mapping.h

Move device_to_mask() to dma-mapping.h because we need to use it from
outside dma_64.c in a later patch.
Signed-off-by: default avatarMark Nelson <markn@au1.ibm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 7e5f8105
...@@ -15,15 +15,6 @@ ...@@ -15,15 +15,6 @@
* Generic iommu implementation * Generic iommu implementation
*/ */
static inline unsigned long device_to_mask(struct device *dev)
{
if (dev->dma_mask && *dev->dma_mask)
return *dev->dma_mask;
/* Assume devices without mask can take 32 bit addresses */
return 0xfffffffful;
}
/* Allocates a contiguous real buffer and creates mappings over it. /* Allocates a contiguous real buffer and creates mappings over it.
* Returns the virtual address of the buffer and sets dma_handle * Returns the virtual address of the buffer and sets dma_handle
* to the dma address (mapping) of the first page. * to the dma address (mapping) of the first page.
......
...@@ -45,6 +45,15 @@ extern void __dma_sync_page(struct page *page, unsigned long offset, ...@@ -45,6 +45,15 @@ extern void __dma_sync_page(struct page *page, unsigned long offset,
#endif /* ! CONFIG_NOT_COHERENT_CACHE */ #endif /* ! CONFIG_NOT_COHERENT_CACHE */
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
static inline unsigned long device_to_mask(struct device *dev)
{
if (dev->dma_mask && *dev->dma_mask)
return *dev->dma_mask;
/* Assume devices without mask can take 32 bit addresses */
return 0xfffffffful;
}
/* /*
* DMA operations are abstracted for G5 vs. i/pSeries, PCI vs. VIO * DMA operations are abstracted for G5 vs. i/pSeries, PCI vs. VIO
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment