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

Commit 797a7568 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by David S. Miller
Browse files

sparc: use dma_map_page instead of dma_map_single 



This patch converts dma_map_single and dma_unmap_single to use
map_page and unmap_page respectively and removes unnecessary
map_single and unmap_single. map_page can be used to implement
map_single but the opposite is impossible. Having only dma_map_page in
struct dma_ops is enough.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: default avatarRobert Reif <reif@earthlink.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2e8fcfe2

arch/sparc/include/asm/dma-mapping_64.h

+12 −11
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ struct dma_ops { 
				dma_addr_t *dma_handle, gfp_t flag);

	void (*free_coherent)(struct device *dev, size_t size,

			      void *cpu_addr, dma_addr_t dma_handle);

	dma_addr_t (*map_single)(struct device *dev, void *cpu_addr,

				 size_t size,

	dma_addr_t (*map_page)(struct device *dev, struct page *page,

			       unsigned long offset, size_t size,

			       enum dma_data_direction direction);

	void (*unmap_single)(struct device *dev, dma_addr_t dma_addr,

	void (*unmap_page)(struct device *dev, dma_addr_t dma_addr,

			   size_t size,

			   enum dma_data_direction direction);

	int (*map_sg)(struct device *dev, struct scatterlist *sg, int nents,
@@ -51,29 +51,30 @@ static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, 
					size_t size,

					enum dma_data_direction direction)

{

	return dma_ops->map_single(dev, cpu_addr, size, direction);

	return dma_ops->map_page(dev, virt_to_page(cpu_addr),

				 (unsigned long)cpu_addr & ~PAGE_MASK, size,

				 direction);

}



static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,

				    size_t size,

				    enum dma_data_direction direction)

{

	dma_ops->unmap_single(dev, dma_addr, size, direction);

	dma_ops->unmap_page(dev, dma_addr, size, direction);

}



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

				      unsigned long offset, size_t size,

				      enum dma_data_direction direction)

{

	return dma_ops->map_single(dev, page_address(page) + offset,

				   size, direction);

	return dma_ops->map_page(dev, page, offset, size, direction);

}



static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,

				  size_t size,

				  enum dma_data_direction direction)

{

	dma_ops->unmap_single(dev, dma_address, size, direction);

	dma_ops->unmap_page(dev, dma_address, size, direction);

}



static inline int dma_map_sg(struct device *dev, struct scatterlist *sg,

arch/sparc/kernel/iommu.c

+8 −7
Original line number Diff line number Diff line
@@ -351,7 +351,8 @@ static void dma_4u_free_coherent(struct device *dev, size_t size, 
		free_pages((unsigned long)cpu, order);

}



static dma_addr_t dma_4u_map_single(struct device *dev, void *ptr, size_t sz,

static dma_addr_t dma_4u_map_page(struct device *dev, struct page *page,

				  unsigned long offset, size_t sz,

				  enum dma_data_direction direction)

{

	struct iommu *iommu;
@@ -368,7 +369,7 @@ static dma_addr_t dma_4u_map_single(struct device *dev, void *ptr, size_t sz, 
	if (unlikely(direction == DMA_NONE))

		goto bad_no_ctx;



	oaddr = (unsigned long)ptr;

	oaddr = (unsigned long)(page_address(page) + offset);

	npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);

	npages >>= IO_PAGE_SHIFT;
@@ -472,7 +473,7 @@ do_flush_sync: 
		       vaddr, ctx, npages);

}



static void dma_4u_unmap_single(struct device *dev, dma_addr_t bus_addr,

static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr,

			      size_t sz, enum dma_data_direction direction)

{

	struct iommu *iommu;
@@ -824,8 +825,8 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev, 
static const struct dma_ops sun4u_dma_ops = {

	.alloc_coherent		= dma_4u_alloc_coherent,

	.free_coherent		= dma_4u_free_coherent,

	.map_single		= dma_4u_map_single,

	.unmap_single		= dma_4u_unmap_single,

	.map_page		= dma_4u_map_page,

	.unmap_page		= dma_4u_unmap_page,

	.map_sg			= dma_4u_map_sg,

	.unmap_sg		= dma_4u_unmap_sg,

	.sync_single_for_cpu	= dma_4u_sync_single_for_cpu,

arch/sparc/kernel/pci_sun4v.c

+8 −7
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu, 
		free_pages((unsigned long)cpu, order);

}



static dma_addr_t dma_4v_map_single(struct device *dev, void *ptr, size_t sz,

static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,

				  unsigned long offset, size_t sz,

				  enum dma_data_direction direction)

{

	struct iommu *iommu;
@@ -245,7 +246,7 @@ static dma_addr_t dma_4v_map_single(struct device *dev, void *ptr, size_t sz, 
	if (unlikely(direction == DMA_NONE))

		goto bad;



	oaddr = (unsigned long)ptr;

	oaddr = (unsigned long)(page_address(page) + offset);

	npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);

	npages >>= IO_PAGE_SHIFT;
@@ -294,7 +295,7 @@ iommu_map_fail: 
	return DMA_ERROR_CODE;

}



static void dma_4v_unmap_single(struct device *dev, dma_addr_t bus_addr,

static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr,

			      size_t sz, enum dma_data_direction direction)

{

	struct pci_pbm_info *pbm;
@@ -537,8 +538,8 @@ static void dma_4v_sync_sg_for_cpu(struct device *dev, 
static const struct dma_ops sun4v_dma_ops = {

	.alloc_coherent			= dma_4v_alloc_coherent,

	.free_coherent			= dma_4v_free_coherent,

	.map_single			= dma_4v_map_single,

	.unmap_single			= dma_4v_unmap_single,

	.map_page			= dma_4v_map_page,

	.unmap_page			= dma_4v_unmap_page,

	.map_sg				= dma_4v_map_sg,

	.unmap_sg			= dma_4v_unmap_sg,

	.sync_single_for_cpu		= dma_4v_sync_single_for_cpu,