Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a605e2d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 0617fc0c

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

+0 −29
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2004 IBM

 *

 * Implements the generic device dma API for powerpc.

 * the pci and vio busses

 */

#ifndef _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)

{
@@ -43,5 +15,4 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
	return NULL;

}



#endif /* __KERNEL__ */

#endif	/* _ASM_DMA_MAPPING_H */

arch/powerpc/include/asm/iommu.h

+10 −0
Original line number Diff line number Diff line
@@ -325,5 +325,15 @@ extern bool iommu_fixed_is_weak; 
#define iommu_fixed_is_weak false

#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 /* _ASM_IOMMU_H */

arch/powerpc/platforms/44x/ppc476.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/ppc4xx.h>

#include <asm/mpic.h>

#include <asm/mmu.h>

#include <asm/swiotlb.h>



#include <linux/pci.h>

#include <linux/i2c.h>

arch/powerpc/platforms/85xx/corenet_generic.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/udbg.h>

#include <asm/mpic.h>

#include <asm/ehv_pic.h>

#include <asm/swiotlb.h>

#include <soc/fsl/qe/qe_ic.h>



#include <linux/of_platform.h>

arch/powerpc/platforms/85xx/qemu_e500.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/time.h>

#include <asm/udbg.h>

#include <asm/mpic.h>

#include <asm/swiotlb.h>

#include <sysdev/fsl_soc.h>

#include <sysdev/fsl_pci.h>

#include "smp.h"