Commit 3799e402 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

ARM/dma-mapping: move various helpers from dma-mapping.h to dma-direct.h 



Move the helpers to translate to and from direct mapping DMA addresses
to dma-direct.h.  This not only is the most logical place, but the new
placement also avoids dependency loops with pending commits.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
parent 002a26fb

arch/arm/common/dmabounce.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/slab.h>

#include <linux/page-flags.h>

#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/dma-direct.h>

#include <linux/dmapool.h>

#include <linux/list.h>

#include <linux/scatterlist.h>

arch/arm/include/asm/dma-direct.h

+50 −0
Original line number Diff line number Diff line
@@ -2,6 +2,56 @@ 
#ifndef ASM_ARM_DMA_DIRECT_H

#define ASM_ARM_DMA_DIRECT_H 1



#include <asm/memory.h>



/*

 * dma_to_pfn/pfn_to_dma/virt_to_dma are architecture private

 * functions used internally by the DMA-mapping API to provide DMA

 * addresses. They must not be used by drivers.

 */

#ifndef __arch_pfn_to_dma

static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)

{

	if (dev)

		pfn -= dev->dma_pfn_offset;

	return (dma_addr_t)__pfn_to_bus(pfn);

}



static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)

{

	unsigned long pfn = __bus_to_pfn(addr);



	if (dev)

		pfn += dev->dma_pfn_offset;



	return pfn;

}



static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)

{

	if (dev)

		return pfn_to_dma(dev, virt_to_pfn(addr));



	return (dma_addr_t)__virt_to_bus((unsigned long)(addr));

}



#else

static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)

{

	return __arch_pfn_to_dma(dev, pfn);

}



static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)

{

	return __arch_dma_to_pfn(dev, addr);

}



static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)

{

	return __arch_virt_to_dma(dev, addr);

}

#endif



static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)

{

	unsigned int offset = paddr & ~PAGE_MASK;

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

+0 −50
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include <linux/scatterlist.h>

#include <linux/dma-debug.h>



#include <asm/memory.h>



#include <xen/xen.h>

#include <asm/xen/hypervisor.h>
@@ -23,54 +21,6 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
	return NULL;

}



/*

 * dma_to_pfn/pfn_to_dma/virt_to_dma are architecture private

 * functions used internally by the DMA-mapping API to provide DMA

 * addresses. They must not be used by drivers.

 */

#ifndef __arch_pfn_to_dma

static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)

{

	if (dev)

		pfn -= dev->dma_pfn_offset;

	return (dma_addr_t)__pfn_to_bus(pfn);

}



static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)

{

	unsigned long pfn = __bus_to_pfn(addr);



	if (dev)

		pfn += dev->dma_pfn_offset;



	return pfn;

}



static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)

{

	if (dev)

		return pfn_to_dma(dev, virt_to_pfn(addr));



	return (dma_addr_t)__virt_to_bus((unsigned long)(addr));

}



#else

static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)

{

	return __arch_pfn_to_dma(dev, pfn);

}



static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)

{

	return __arch_dma_to_pfn(dev, addr);

}



static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)

{

	return __arch_virt_to_dma(dev, addr);

}

#endif



/**

 * arm_dma_alloc - allocate consistent memory for DMA

 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices

CRA Git | Maintained and supported by SUSTech CRA and CCSE