mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
powerpc/dma: trim the fat from <asm/dma-mapping.h>
There is no need to provide anything but get_arch_dma_ops to <linux/dma-mapping.h>. More the remaining declarations to <asm/iommu.h> and drop all the includes. Signed-off-by: Christoph Hellwig <hch@lst.de> Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
0617fc0ca4
commit
4a605e2d1a
6 changed files with 14 additions and 29 deletions
|
@ -1,37 +1,9 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2004 IBM
|
* Copyright (C) 2004 IBM
|
||||||
*
|
|
||||||
* Implements the generic device dma API for powerpc.
|
|
||||||
* the pci and vio busses
|
|
||||||
*/
|
*/
|
||||||
#ifndef _ASM_DMA_MAPPING_H
|
#ifndef _ASM_DMA_MAPPING_H
|
||||||
#define _ASM_DMA_MAPPING_H
|
#define _ASM_DMA_MAPPING_H
|
||||||
#ifdef __KERNEL__
|
|
||||||
|
|
||||||
#include <linux/types.h>
|
|
||||||
#include <linux/cache.h>
|
|
||||||
/* need struct page definitions */
|
|
||||||
#include <linux/mm.h>
|
|
||||||
#include <linux/scatterlist.h>
|
|
||||||
#include <linux/dma-debug.h>
|
|
||||||
#include <asm/io.h>
|
|
||||||
#include <asm/swiotlb.h>
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Available generic sets of operations
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_PPC64
|
|
||||||
extern const struct dma_map_ops dma_iommu_ops;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
|
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
|
||||||
{
|
{
|
||||||
|
@ -43,5 +15,4 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
|
||||||
#endif /* _ASM_DMA_MAPPING_H */
|
#endif /* _ASM_DMA_MAPPING_H */
|
||||||
|
|
|
@ -325,5 +325,15 @@ extern bool iommu_fixed_is_weak;
|
||||||
#define iommu_fixed_is_weak false
|
#define iommu_fixed_is_weak false
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
extern const struct dma_map_ops dma_iommu_ops;
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
#endif /* _ASM_IOMMU_H */
|
#endif /* _ASM_IOMMU_H */
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include <asm/ppc4xx.h>
|
#include <asm/ppc4xx.h>
|
||||||
#include <asm/mpic.h>
|
#include <asm/mpic.h>
|
||||||
#include <asm/mmu.h>
|
#include <asm/mmu.h>
|
||||||
|
#include <asm/swiotlb.h>
|
||||||
|
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include <asm/udbg.h>
|
#include <asm/udbg.h>
|
||||||
#include <asm/mpic.h>
|
#include <asm/mpic.h>
|
||||||
#include <asm/ehv_pic.h>
|
#include <asm/ehv_pic.h>
|
||||||
|
#include <asm/swiotlb.h>
|
||||||
#include <soc/fsl/qe/qe_ic.h>
|
#include <soc/fsl/qe/qe_ic.h>
|
||||||
|
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include <asm/time.h>
|
#include <asm/time.h>
|
||||||
#include <asm/udbg.h>
|
#include <asm/udbg.h>
|
||||||
#include <asm/mpic.h>
|
#include <asm/mpic.h>
|
||||||
|
#include <asm/swiotlb.h>
|
||||||
#include <sysdev/fsl_soc.h>
|
#include <sysdev/fsl_soc.h>
|
||||||
#include <sysdev/fsl_pci.h>
|
#include <sysdev/fsl_pci.h>
|
||||||
#include "smp.h"
|
#include "smp.h"
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#include <asm/mpc85xx.h>
|
#include <asm/mpc85xx.h>
|
||||||
#include <asm/disassemble.h>
|
#include <asm/disassemble.h>
|
||||||
#include <asm/ppc-opcode.h>
|
#include <asm/ppc-opcode.h>
|
||||||
|
#include <asm/swiotlb.h>
|
||||||
#include <sysdev/fsl_soc.h>
|
#include <sysdev/fsl_soc.h>
|
||||||
#include <sysdev/fsl_pci.h>
|
#include <sysdev/fsl_pci.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue