Commit f9226d57 authored by Mark Nelson's avatar Mark Nelson Committed by Paul Mackerras
Browse files

powerpc: Update remaining dma_mapping_ops to use map/unmap_page 



After the merge of the 32 and 64bit DMA code, dma_direct_ops lost
their map/unmap_single() functions but gained map/unmap_page().  This
caused a problem for Cell because Cell's dma_iommu_fixed_ops called
the dma_direct_ops if the fixed linear mapping was to be used or the
iommu ops if the dynamic window was to be used.  So in order to fix
this problem we need to update the 64bit DMA code to use
map/unmap_page.

First, we update the generic IOMMU code so that iommu_map_single()
becomes iommu_map_page() and iommu_unmap_single() becomes
iommu_unmap_page().  Then we propagate these changes up through all
the callers of these two functions and in the process update all the
dma_mapping_ops so that they have map/unmap_page rahter than
map/unmap_single.  We can do this because on 64bit there is no HIGHMEM
memory so map/unmap_page ends up performing exactly the same function
as map/unmap_single, just taking different arguments.

This has no affect on drivers because the dma_map_single_attrs() just
ends up calling the map_page() function of the appropriate
dma_mapping_ops and similarly the dma_unmap_single_attrs() calls
unmap_page().

This fixes an oops on Cell blades, which oops on boot without this
because they call dma_direct_ops.map_single, which is NULL.

Signed-off-by: default avatarMark Nelson <markn@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b30115ea

arch/powerpc/include/asm/iommu.h

+8 −7
Original line number Diff line number Diff line
@@ -92,11 +92,12 @@ extern void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl, 
				  unsigned long mask, gfp_t flag, int node);

extern void iommu_free_coherent(struct iommu_table *tbl, size_t size,

				void *vaddr, dma_addr_t dma_handle);

extern dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl,

				   void *vaddr, size_t size, unsigned long mask,

extern dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl,

				 struct page *page, unsigned long offset,

				 size_t size, unsigned long mask,

				 enum dma_data_direction direction,

				 struct dma_attrs *attrs);

extern void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle,

extern void iommu_unmap_page(struct iommu_table *tbl, dma_addr_t dma_handle,

			     size_t size, enum dma_data_direction direction,

			     struct dma_attrs *attrs);

arch/powerpc/kernel/dma-iommu.c

+16 −18
Original line number Diff line number Diff line
@@ -30,27 +30,25 @@ static void dma_iommu_free_coherent(struct device *dev, size_t size, 
}



/* Creates TCEs for a user provided buffer.  The user buffer must be

 * contiguous real kernel storage (not vmalloc).  The address of the buffer

 * passed here is the kernel (virtual) address of the buffer.  The buffer

 * need not be page aligned, the dma_addr_t returned will point to the same

 * byte within the page as vaddr.

 * contiguous real kernel storage (not vmalloc).  The address passed here

 * comprises a page address and offset into that page. The dma_addr_t

 * returned will point to the same byte within the page as was passed in.

 */

static dma_addr_t dma_iommu_map_single(struct device *dev, void *vaddr,

				       size_t size,

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

				     unsigned long offset, size_t size,

				     enum dma_data_direction direction,

				     struct dma_attrs *attrs)

{

	return iommu_map_single(dev, dev->archdata.dma_data, vaddr, size,

	return iommu_map_page(dev, dev->archdata.dma_data, page, offset, size,

			      device_to_mask(dev), direction, attrs);

}





static void dma_iommu_unmap_single(struct device *dev, dma_addr_t dma_handle,

				   size_t size,

				   enum dma_data_direction direction,

static void dma_iommu_unmap_page(struct device *dev, dma_addr_t dma_handle,

				 size_t size, enum dma_data_direction direction,

				 struct dma_attrs *attrs)

{

	iommu_unmap_single(dev->archdata.dma_data, dma_handle, size, direction,

	iommu_unmap_page(dev->archdata.dma_data, dma_handle, size, direction,

			 attrs);

}
@@ -94,10 +92,10 @@ static int dma_iommu_dma_supported(struct device *dev, u64 mask) 
struct dma_mapping_ops dma_iommu_ops = {

	.alloc_coherent	= dma_iommu_alloc_coherent,

	.free_coherent	= dma_iommu_free_coherent,

	.map_single	= dma_iommu_map_single,

	.unmap_single	= dma_iommu_unmap_single,

	.map_sg		= dma_iommu_map_sg,

	.unmap_sg	= dma_iommu_unmap_sg,

	.dma_supported	= dma_iommu_dma_supported,

	.map_page	= dma_iommu_map_page,

	.unmap_page	= dma_iommu_unmap_page,

};

EXPORT_SYMBOL(dma_iommu_ops);

arch/powerpc/kernel/ibmebus.c

+14 −13
Original line number Diff line number Diff line
@@ -79,16 +79,17 @@ static void ibmebus_free_coherent(struct device *dev, 
	kfree(vaddr);

}



static dma_addr_t ibmebus_map_single(struct device *dev,

				     void *ptr,

static dma_addr_t ibmebus_map_page(struct device *dev,

				   struct page *page,

				   unsigned long offset,

				   size_t size,

				   enum dma_data_direction direction,

				   struct dma_attrs *attrs)

{

	return (dma_addr_t)(ptr);

	return (dma_addr_t)(page_address(page) + offset);

}



static void ibmebus_unmap_single(struct device *dev,

static void ibmebus_unmap_page(struct device *dev,

			       dma_addr_t dma_addr,

			       size_t size,

			       enum dma_data_direction direction,
@@ -129,11 +130,11 @@ static int ibmebus_dma_supported(struct device *dev, u64 mask) 
static struct dma_mapping_ops ibmebus_dma_ops = {

	.alloc_coherent = ibmebus_alloc_coherent,

	.free_coherent  = ibmebus_free_coherent,

	.map_single     = ibmebus_map_single,

	.unmap_single   = ibmebus_unmap_single,

	.map_sg         = ibmebus_map_sg,

	.unmap_sg       = ibmebus_unmap_sg,

	.dma_supported  = ibmebus_dma_supported,

	.map_page       = ibmebus_map_page,

	.unmap_page     = ibmebus_unmap_page,

};



static int ibmebus_match_path(struct device *dev, void *data)

arch/powerpc/kernel/iommu.c

+12 −10
Original line number Diff line number Diff line
@@ -565,21 +565,23 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name) 
}



/* Creates TCEs for a user provided buffer.  The user buffer must be

 * contiguous real kernel storage (not vmalloc).  The address of the buffer

 * passed here is the kernel (virtual) address of the buffer.  The buffer

 * need not be page aligned, the dma_addr_t returned will point to the same

 * byte within the page as vaddr.

 * contiguous real kernel storage (not vmalloc).  The address passed here

 * comprises a page address and offset into that page. The dma_addr_t

 * returned will point to the same byte within the page as was passed in.

 */

dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl,

			    void *vaddr, size_t size, unsigned long mask,

		enum dma_data_direction direction, struct dma_attrs *attrs)

dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl,

			  struct page *page, unsigned long offset, size_t size,

			  unsigned long mask, enum dma_data_direction direction,

			  struct dma_attrs *attrs)

{

	dma_addr_t dma_handle = DMA_ERROR_CODE;

	void *vaddr;

	unsigned long uaddr;

	unsigned int npages, align;



	BUG_ON(direction == DMA_NONE);



	vaddr = page_address(page) + offset;

	uaddr = (unsigned long)vaddr;

	npages = iommu_num_pages(uaddr, size, IOMMU_PAGE_SIZE);
@@ -605,7 +607,7 @@ dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl, 
	return dma_handle;

}



void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle,

void iommu_unmap_page(struct iommu_table *tbl, dma_addr_t dma_handle,

		      size_t size, enum dma_data_direction direction,

		      struct dma_attrs *attrs)

{

arch/powerpc/kernel/vio.c

+13 −12
Original line number Diff line number Diff line
@@ -516,8 +516,8 @@ static void vio_dma_iommu_free_coherent(struct device *dev, size_t size, 
	vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE));

}



static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr,

                                           size_t size,

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

                                         unsigned long offset, size_t size,

                                         enum dma_data_direction direction,

                                         struct dma_attrs *attrs)

{
@@ -529,7 +529,7 @@ static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr, 
		return ret;

	}



	ret = dma_iommu_ops.map_single(dev, vaddr, size, direction, attrs);

	ret = dma_iommu_ops.map_page(dev, page, offset, size, direction, attrs);

	if (unlikely(dma_mapping_error(dev, ret))) {

		vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE));

		atomic_inc(&viodev->cmo.allocs_failed);
@@ -538,14 +538,14 @@ static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr, 
	return ret;

}



static void vio_dma_iommu_unmap_single(struct device *dev,

		dma_addr_t dma_handle, size_t size,

static void vio_dma_iommu_unmap_page(struct device *dev, dma_addr_t dma_handle,

				     size_t size,

				     enum dma_data_direction direction,

				     struct dma_attrs *attrs)

{

	struct vio_dev *viodev = to_vio_dev(dev);



	dma_iommu_ops.unmap_single(dev, dma_handle, size, direction, attrs);

	dma_iommu_ops.unmap_page(dev, dma_handle, size, direction, attrs);



	vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE));

}
@@ -603,10 +603,11 @@ static void vio_dma_iommu_unmap_sg(struct device *dev, 
struct dma_mapping_ops vio_dma_mapping_ops = {

	.alloc_coherent = vio_dma_iommu_alloc_coherent,

	.free_coherent  = vio_dma_iommu_free_coherent,

	.map_single     = vio_dma_iommu_map_single,

	.unmap_single   = vio_dma_iommu_unmap_single,

	.map_sg         = vio_dma_iommu_map_sg,

	.unmap_sg       = vio_dma_iommu_unmap_sg,

	.map_page       = vio_dma_iommu_map_page,

	.unmap_page     = vio_dma_iommu_unmap_page,



};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE