m68k: convert to dma_map_ops (340f3039) · Commits · jan.koester / Linux

arch/m68k/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ config M68K
	select MODULES_USE_ELF_RELA		select MODULES_USE_ELF_RELA
	select OLD_SIGSUSPEND3		select OLD_SIGSUSPEND3
	select OLD_SIGACTION		select OLD_SIGACTION
			select HAVE_DMA_ATTRS

	config RWSEM_GENERIC_SPINLOCK		config RWSEM_GENERIC_SPINLOCK
	bool		bool

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

+4 −108

Original line number	Original line	Diff line number	Diff line
	#ifndef _M68K_DMA_MAPPING_H		#ifndef _M68K_DMA_MAPPING_H
	#define _M68K_DMA_MAPPING_H		#define _M68K_DMA_MAPPING_H

	#include <asm/cache.h>		extern struct dma_map_ops m68k_dma_ops;

	struct scatterlist;		static inline struct dma_map_ops get_dma_ops(struct device dev)

	static inline int dma_supported(struct device *dev, u64 mask)
	{
	return 1;
	}

	static inline int dma_set_mask(struct device *dev, u64 mask)
	{		{
	return 0;		return &m68k_dma_ops;
	}		}

	extern void dma_alloc_coherent(struct device , size_t,		#include <asm-generic/dma-mapping-common.h>
	dma_addr_t *, gfp_t);
	extern void dma_free_coherent(struct device *, size_t,
	void *, dma_addr_t);

	static inline void dma_alloc_attrs(struct device dev, size_t size,
	dma_addr_t *dma_handle, gfp_t flag,
	struct dma_attrs *attrs)
	{
	/* attrs is not supported and ignored */
	return dma_alloc_coherent(dev, size, dma_handle, flag);
	}

	static inline void dma_free_attrs(struct device *dev, size_t size,
	void *cpu_addr, dma_addr_t dma_handle,
	struct dma_attrs *attrs)
	{
	/* attrs is not supported and ignored */
	dma_free_coherent(dev, size, cpu_addr, dma_handle);
	}

	static inline void dma_alloc_noncoherent(struct device dev, size_t size,
	dma_addr_t *handle, gfp_t flag)
	{
	return dma_alloc_coherent(dev, size, handle, flag);
	}
	static inline void dma_free_noncoherent(struct device *dev, size_t size,
	void *addr, dma_addr_t handle)
	{
	dma_free_coherent(dev, size, addr, handle);
	}
	static inline void dma_cache_sync(struct device dev, void vaddr, size_t size,		static inline void dma_cache_sync(struct device dev, void vaddr, size_t size,
	enum dma_data_direction dir)		enum dma_data_direction dir)
	{		{
	/* we use coherent allocation, so not much to do here. */		/* we use coherent allocation, so not much to do here. */
	}		}

	extern dma_addr_t dma_map_single(struct device , void , size_t,
	enum dma_data_direction);
	static inline void dma_unmap_single(struct device *dev, dma_addr_t addr,
	size_t size, enum dma_data_direction dir)
	{
	}

	extern dma_addr_t dma_map_page(struct device , struct page ,
	unsigned long, size_t size,
	enum dma_data_direction);
	static inline void dma_unmap_page(struct device *dev, dma_addr_t address,
	size_t size, enum dma_data_direction dir)
	{
	}

	extern int dma_map_sg(struct device , struct scatterlist , int,
	enum dma_data_direction);
	static inline void dma_unmap_sg(struct device dev, struct scatterlist sg,
	int nhwentries, enum dma_data_direction dir)
	{
	}

	extern void dma_sync_single_for_device(struct device *, dma_addr_t, size_t,
	enum dma_data_direction);
	extern void dma_sync_sg_for_device(struct device , struct scatterlist , int,
	enum dma_data_direction);

	static inline void dma_sync_single_range_for_device(struct device *dev,
	dma_addr_t dma_handle, unsigned long offset, size_t size,
	enum dma_data_direction direction)
	{
	/* just sync everything for now */
	dma_sync_single_for_device(dev, dma_handle, offset + size, direction);
	}

	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 void dma_sync_sg_for_cpu(struct device dev, struct scatterlist sg,
	int nents, enum dma_data_direction dir)
	{
	}

	static inline void dma_sync_single_range_for_cpu(struct device *dev,
	dma_addr_t dma_handle, unsigned long offset, size_t size,
	enum dma_data_direction direction)
	{
	/* just sync everything for now */
	dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction);
	}

	static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)
	{
	return 0;
	}

	/* 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)

	#endif /* _M68K_DMA_MAPPING_H */		#endif /* _M68K_DMA_MAPPING_H */

arch/m68k/kernel/dma.c

+27 −34

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,8 @@

	#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)		#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)

	void dma_alloc_coherent(struct device dev, size_t size,		static void m68k_dma_alloc(struct device dev, size_t size, dma_addr_t *handle,
	dma_addr_t *handle, gfp_t flag)		gfp_t flag, struct dma_attrs *attrs)
	{		{
	struct page page, *map;		struct page page, *map;
	pgprot_t pgprot;		pgprot_t pgprot;
	@@ -61,8 +61,8 @@ void dma_alloc_coherent(struct device dev, size_t size,
	return addr;		return addr;
	}		}

	void dma_free_coherent(struct device *dev, size_t size,		static void m68k_dma_free(struct device dev, size_t size, void addr,
	void *addr, dma_addr_t handle)		dma_addr_t handle, struct dma_attrs *attrs)
	{		{
	pr_debug("dma_free_coherent: %p, %x\n", addr, handle);		pr_debug("dma_free_coherent: %p, %x\n", addr, handle);
	vfree(addr);		vfree(addr);
	@@ -72,8 +72,8 @@ void dma_free_coherent(struct device *dev, size_t size,

	#include <asm/cacheflush.h>		#include <asm/cacheflush.h>

	void dma_alloc_coherent(struct device dev, size_t size,		static void m68k_dma_alloc(struct device dev, size_t size,
	dma_addr_t *dma_handle, gfp_t gfp)		dma_addr_t dma_handle, gfp_t gfp, struct dma_attrs attrs)
	{		{
	void *ret;		void *ret;
	/* ignore region specifiers */		/* ignore region specifiers */
	@@ -90,19 +90,16 @@ void dma_alloc_coherent(struct device dev, size_t size,
	return ret;		return ret;
	}		}

	void dma_free_coherent(struct device *dev, size_t size,		static void m68k_dma_free(struct device dev, size_t size, void vaddr,
	void *vaddr, dma_addr_t dma_handle)		dma_addr_t dma_handle, struct dma_attrs *attrs)
	{		{
	free_pages((unsigned long)vaddr, get_order(size));		free_pages((unsigned long)vaddr, get_order(size));
	}		}

	#endif /* CONFIG_MMU && !CONFIG_COLDFIRE */		#endif /* CONFIG_MMU && !CONFIG_COLDFIRE */

	EXPORT_SYMBOL(dma_alloc_coherent);		static void m68k_dma_sync_single_for_device(struct device *dev,
	EXPORT_SYMBOL(dma_free_coherent);		dma_addr_t handle, size_t size, enum dma_data_direction dir)

	void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,
	size_t size, enum dma_data_direction dir)
	{		{
	switch (dir) {		switch (dir) {
	case DMA_BIDIRECTIONAL:		case DMA_BIDIRECTIONAL:
	@@ -118,10 +115,9 @@ void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,
	break;		break;
	}		}
	}		}
	EXPORT_SYMBOL(dma_sync_single_for_device);

	void dma_sync_sg_for_device(struct device dev, struct scatterlist sglist,		static void m68k_dma_sync_sg_for_device(struct device *dev,
	int nents, enum dma_data_direction dir)		struct scatterlist *sglist, int nents, enum dma_data_direction dir)
	{		{
	int i;		int i;
	struct scatterlist *sg;		struct scatterlist *sg;
	@@ -131,31 +127,19 @@ void dma_sync_sg_for_device(struct device dev, struct scatterlist sglist,
	dir);		dir);
	}		}
	}		}
	EXPORT_SYMBOL(dma_sync_sg_for_device);

	dma_addr_t dma_map_single(struct device dev, void addr, size_t size,
	enum dma_data_direction dir)
	{
	dma_addr_t handle = virt_to_bus(addr);

	dma_sync_single_for_device(dev, handle, size, dir);
	return handle;
	}
	EXPORT_SYMBOL(dma_map_single);

	dma_addr_t dma_map_page(struct device dev, struct page page,		static dma_addr_t m68k_dma_map_page(struct device dev, struct page page,
	unsigned long offset, size_t size,		unsigned long offset, size_t size, enum dma_data_direction dir,
	enum dma_data_direction dir)		struct dma_attrs *attrs)
	{		{
	dma_addr_t handle = page_to_phys(page) + offset;		dma_addr_t handle = page_to_phys(page) + offset;

	dma_sync_single_for_device(dev, handle, size, dir);		dma_sync_single_for_device(dev, handle, size, dir);
	return handle;		return handle;
	}		}
	EXPORT_SYMBOL(dma_map_page);

	int dma_map_sg(struct device dev, struct scatterlist sglist, int nents,		static int m68k_dma_map_sg(struct device dev, struct scatterlist sglist,
	enum dma_data_direction dir)		int nents, enum dma_data_direction dir, struct dma_attrs *attrs)
	{		{
	int i;		int i;
	struct scatterlist *sg;		struct scatterlist *sg;
	@@ -167,4 +151,13 @@ int dma_map_sg(struct device dev, struct scatterlist sglist, int nents,
	}		}
	return nents;		return nents;
	}		}
	EXPORT_SYMBOL(dma_map_sg);
			struct dma_map_ops m68k_dma_ops = {
			.alloc = m68k_dma_alloc,
			.free = m68k_dma_free,
			.map_page = m68k_dma_map_page,
			.map_sg = m68k_dma_map_sg,
			.sync_single_for_device = m68k_dma_sync_single_for_device,
			.sync_sg_for_device = m68k_dma_sync_sg_for_device,
			};
			EXPORT_SYMBOL(m68k_dma_ops);