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

Commit 6f620975 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

blackfin: convert to dma_map_ops 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a34a517a

arch/blackfin/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config BLACKFIN 
	def_bool y

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_ATTRS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

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

+4 −123
Original line number Diff line number Diff line
@@ -8,36 +8,6 @@ 
#define _BLACKFIN_DMA_MAPPING_H



#include <asm/cacheflush.h>

struct scatterlist;



void *dma_alloc_coherent(struct device *dev, size_t size,

			 dma_addr_t *dma_handle, gfp_t gfp);

void dma_free_coherent(struct device *dev, size_t size, void *vaddr,

		       dma_addr_t dma_handle);



/*

 * Now for the API extensions over the pci_ one

 */

#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)

#define dma_supported(d, m)         (1)



static inline int

dma_set_mask(struct device *dev, u64 dma_mask)

{

	if (!dev->dma_mask || !dma_supported(dev, dma_mask))

		return -EIO;



	*dev->dma_mask = dma_mask;



	return 0;

}



static inline int

dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return 0;

}



extern void

__dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir);
@@ -66,102 +36,13 @@ _dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir) 
		__dma_sync(addr, size, dir);

}



static inline dma_addr_t

dma_map_single(struct device *dev, void *ptr, size_t size,

	       enum dma_data_direction dir)

{

	_dma_sync((dma_addr_t)ptr, size, dir);

	return (dma_addr_t) ptr;

}



static inline dma_addr_t

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

	     unsigned long offset, size_t size,

	     enum dma_data_direction dir)

{

	return dma_map_single(dev, page_address(page) + offset, size, dir);

}



static inline void

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

		 enum dma_data_direction dir)

{

	BUG_ON(!valid_dma_direction(dir));

}



static inline void

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

	       enum dma_data_direction dir)

{

	dma_unmap_single(dev, dma_addr, size, dir);

}



extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,

		      enum dma_data_direction dir);



static inline void

dma_unmap_sg(struct device *dev, struct scatterlist *sg,

	     int nhwentries, enum dma_data_direction dir)

{

	BUG_ON(!valid_dma_direction(dir));

}



static inline void

dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t handle,

			      unsigned long offset, size_t size,

			      enum dma_data_direction dir)

{

	BUG_ON(!valid_dma_direction(dir));

}



static inline void

dma_sync_single_range_for_device(struct device *dev, dma_addr_t handle,

				 unsigned long offset, size_t size,

				 enum dma_data_direction dir)

{

	_dma_sync(handle + offset, size, dir);

}

extern struct dma_map_ops bfin_dma_ops;



static inline void

dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size,

			enum dma_data_direction dir)

static inline struct dma_map_ops *get_dma_ops(struct device *dev)

{

	dma_sync_single_range_for_cpu(dev, handle, 0, size, dir);

	return &bfin_dma_ops;

}



static inline void

dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,

			   enum dma_data_direction dir)

{

	dma_sync_single_range_for_device(dev, handle, 0, size, dir);

}



static inline void

dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,

		    enum dma_data_direction dir)

{

	BUG_ON(!valid_dma_direction(dir));

}



extern void

dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,

		       int nents, enum dma_data_direction dir);



static inline void

dma_cache_sync(struct device *dev, void *vaddr, size_t size,

	       enum dma_data_direction dir)

{

	_dma_sync((dma_addr_t)vaddr, size, dir);

}



/* drivers/base/dma-mapping.c */

extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,

			   void *cpu_addr, dma_addr_t dma_addr, size_t size);

extern int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,

				  void *cpu_addr, dma_addr_t dma_addr,

				  size_t size);



#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s)

#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s)

#include <asm-generic/dma-mapping-common.h>



#endif				/* _BLACKFIN_DMA_MAPPING_H */

arch/blackfin/kernel/dma-mapping.c

+38 −14
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages) 
	spin_unlock_irqrestore(&dma_page_lock, flags);

}



void *dma_alloc_coherent(struct device *dev, size_t size,

			 dma_addr_t *dma_handle, gfp_t gfp)

static void *bfin_dma_alloc(struct device *dev, size_t size,

		dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)

{

	void *ret;
@@ -92,15 +92,12 @@ void *dma_alloc_coherent(struct device *dev, size_t size, 


	return ret;

}

EXPORT_SYMBOL(dma_alloc_coherent);



void

dma_free_coherent(struct device *dev, size_t size, void *vaddr,

		  dma_addr_t dma_handle)

static void bfin_dma_free(struct device *dev, size_t size, void *vaddr,

		  dma_addr_t dma_handle, struct dma_attrs *attrs)

{

	__free_dma_pages((unsigned long)vaddr, get_pages(size));

}

EXPORT_SYMBOL(dma_free_coherent);



/*

 * Streaming DMA mappings
@@ -112,9 +109,9 @@ void __dma_sync(dma_addr_t addr, size_t size, 
}

EXPORT_SYMBOL(__dma_sync);



int

dma_map_sg(struct device *dev, struct scatterlist *sg_list, int nents,

	   enum dma_data_direction direction)

static int bfin_dma_map_sg(struct device *dev, struct scatterlist *sg_list,

		int nents, enum dma_data_direction direction,

		struct dma_attrs *attrs)

{

	struct scatterlist *sg;

	int i;
@@ -126,10 +123,10 @@ dma_map_sg(struct device *dev, struct scatterlist *sg_list, int nents, 


	return nents;

}

EXPORT_SYMBOL(dma_map_sg);



void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg_list,

			    int nelems, enum dma_data_direction direction)

static void bfin_dma_sync_sg_for_device(struct device *dev,

		struct scatterlist *sg_list, int nelems,

		enum dma_data_direction direction)

{

	struct scatterlist *sg;

	int i;
@@ -139,4 +136,31 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg_list, 
		__dma_sync(sg_dma_address(sg), sg_dma_len(sg), direction);

	}

}

EXPORT_SYMBOL(dma_sync_sg_for_device);
 


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

		unsigned long offset, size_t size, enum dma_data_direction dir,

		struct dma_attrs *attrs)

{

	dma_addr_t handle = (dma_addr_t)(page_address(page) + offset);



	_dma_sync(handle, size, dir);

	return handle;

}



static inline void bfin_dma_sync_single_for_device(struct device *dev,

		dma_addr_t handle, size_t size, enum dma_data_direction dir)

{

	_dma_sync(handle, size, dir);

}



struct dma_map_ops bfin_dma_ops = {

	.alloc			= bfin_dma_alloc,

	.free			= bfin_dma_free,



	.map_page		= bfin_dma_map_page,

	.map_sg			= bfin_dma_map_sg,



	.sync_single_for_device	= bfin_dma_sync_single_for_device,

	.sync_sg_for_device	= bfin_dma_sync_sg_for_device,

};

EXPORT_SYMBOL(bfin_dma_ops);