Commit 29cb8d0d authored by Russell King's avatar Russell King
Browse files

ARM: dma-mapping: split dma_unmap_page() from dma_unmap_single() 



We will need to treat dma_unmap_page() differently from dma_unmap_single()

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-By: default avatarJamie Iles <jamie@jamieiles.com>
parent ef1baed8

arch/arm/common/dmabounce.c

+18 −3
Original line number Diff line number Diff line
@@ -342,6 +342,22 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, 
}

EXPORT_SYMBOL(dma_map_single);



/*

 * see if a mapped address was really a "safe" buffer and if so, copy

 * the data from the safe buffer back to the unsafe buffer and free up

 * the safe buffer.  (basically return things back to the way they

 * should be)

 */

void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,

		enum dma_data_direction dir)

{

	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",

		__func__, (void *) dma_addr, size, dir);



	unmap_single(dev, dma_addr, size, dir);

}

EXPORT_SYMBOL(dma_unmap_single);



dma_addr_t dma_map_page(struct device *dev, struct page *page,

		unsigned long offset, size_t size, enum dma_data_direction dir)

{
@@ -366,8 +382,7 @@ EXPORT_SYMBOL(dma_map_page); 
 * the safe buffer.  (basically return things back to the way they

 * should be)

 */



void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,

void dma_unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size,

		enum dma_data_direction dir)

{

	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
@@ -375,7 +390,7 @@ void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, 


	unmap_single(dev, dma_addr, size, dir);

}

EXPORT_SYMBOL(dma_unmap_single);

EXPORT_SYMBOL(dma_unmap_page);



int dmabounce_sync_for_cpu(struct device *dev, dma_addr_t addr,

		unsigned long off, size_t sz, enum dma_data_direction dir)

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

+5 −3
Original line number Diff line number Diff line
@@ -257,9 +257,11 @@ extern int dma_needs_bounce(struct device*, dma_addr_t, size_t); 
 */

extern dma_addr_t dma_map_single(struct device *, void *, size_t,

		enum dma_data_direction);

extern void dma_unmap_single(struct device *, dma_addr_t, size_t,

		enum dma_data_direction);

extern dma_addr_t dma_map_page(struct device *, struct page *,

		unsigned long, size_t, enum dma_data_direction);

extern void dma_unmap_single(struct device *, dma_addr_t, size_t,

extern void dma_unmap_page(struct device *, dma_addr_t, size_t,

		enum dma_data_direction);



/*
@@ -352,7 +354,6 @@ static inline void dma_unmap_single(struct device *dev, dma_addr_t handle, 
{

	/* nothing to do */

}

#endif /* CONFIG_DMABOUNCE */



/**

 * dma_unmap_page - unmap a buffer previously mapped through dma_map_page()
@@ -371,8 +372,9 @@ static inline void dma_unmap_single(struct device *dev, dma_addr_t handle, 
static inline void dma_unmap_page(struct device *dev, dma_addr_t handle,

		size_t size, enum dma_data_direction dir)

{

	dma_unmap_single(dev, handle, size, dir);

	/* nothing to do */

}

#endif /* CONFIG_DMABOUNCE */



/**

 * dma_sync_single_range_for_cpu