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

Commit 73c926be authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Convert to asm-generic/dma-mapping-common.h 



This converts the old DMA mapping support to the new generic
dma-mapping-common.h abstraction.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 14c011de

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config SUPERH 
	select HAVE_IOREMAP_PROT if MMU

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS

	select HAVE_PERF_EVENTS

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

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

+26 −174
Original line number Diff line number Diff line 
#ifndef __ASM_SH_DMA_MAPPING_H

#define __ASM_SH_DMA_MAPPING_H



#include <linux/mm.h>

#include <linux/scatterlist.h>

#include <linux/dma-debug.h>

#include <asm/cacheflush.h>

#include <asm/io.h>

#include <asm-generic/dma-coherent.h>

extern struct dma_map_ops *dma_ops;

extern void no_iommu_init(void);



extern struct bus_type pci_bus_type;

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

{

	return dma_ops;

}



static inline int dma_supported(struct device *dev, u64 mask)

{

	struct dma_map_ops *ops = get_dma_ops(dev);



#define dma_supported(dev, mask)	(1)

	if (ops->dma_supported)

		return ops->dma_supported(dev, mask);



	return 1;

}



static inline int dma_set_mask(struct device *dev, u64 mask)

{

	struct dma_map_ops *ops = get_dma_ops(dev);



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

		return -EIO;

	if (ops->set_dma_mask)

		return ops->set_dma_mask(dev, mask);



	*dev->dma_mask = mask;
@@ -35,160 +46,6 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, 
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)

#define dma_is_consistent(d, h) (1)



static inline dma_addr_t dma_map_single(struct device *dev,

					void *ptr, size_t size,

					enum dma_data_direction dir)

{

	dma_addr_t addr = virt_to_phys(ptr);



#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)

	if (dev->bus == &pci_bus_type)

		return addr;

#endif

	dma_cache_sync(dev, ptr, size, dir);



	debug_dma_map_page(dev, virt_to_page(ptr),

			   (unsigned long)ptr & ~PAGE_MASK, size,

			   dir, addr, true);



	return addr;

}



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

				    size_t size, enum dma_data_direction dir)

{

	debug_dma_unmap_page(dev, addr, size, dir, true);

}



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

			     int nents, enum dma_data_direction dir)

{

	int i;



	for (i = 0; i < nents; i++) {

#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)

		dma_cache_sync(dev, sg_virt(&sg[i]), sg[i].length, dir);

#endif

		sg[i].dma_address = sg_phys(&sg[i]);

		sg[i].dma_length = sg[i].length;

	}



	debug_dma_map_sg(dev, sg, nents, i, dir);



	return nents;

}



static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,

				int nents, enum dma_data_direction dir)

{

	debug_dma_unmap_sg(dev, sg, nents, dir);

}



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_page(struct device *dev, dma_addr_t dma_address,

				  size_t size, enum dma_data_direction dir)

{

	dma_unmap_single(dev, dma_address, size, dir);

}



static inline void __dma_sync_single(struct device *dev, dma_addr_t dma_handle,

				   size_t size, enum dma_data_direction dir)

{

#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)

	if (dev->bus == &pci_bus_type)

		return;

#endif

	dma_cache_sync(dev, phys_to_virt(dma_handle), size, dir);

}



static inline void dma_sync_single_range(struct device *dev,

					 dma_addr_t dma_handle,

					 unsigned long offset, size_t size,

					 enum dma_data_direction dir)

{

#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)

	if (dev->bus == &pci_bus_type)

		return;

#endif

	dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir);

}



static inline void __dma_sync_sg(struct device *dev, struct scatterlist *sg,

			       int nelems, enum dma_data_direction dir)

{

	int i;



	for (i = 0; i < nelems; i++) {

#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)

		dma_cache_sync(dev, sg_virt(&sg[i]), sg[i].length, dir);

#endif

		sg[i].dma_address = sg_phys(&sg[i]);

		sg[i].dma_length = sg[i].length;

	}

}



static inline void dma_sync_single_for_cpu(struct device *dev,

					   dma_addr_t dma_handle, size_t size,

					   enum dma_data_direction dir)

{

	__dma_sync_single(dev, dma_handle, size, dir);

	debug_dma_sync_single_for_cpu(dev, dma_handle, size, dir);

}



static inline void dma_sync_single_for_device(struct device *dev,

					      dma_addr_t dma_handle,

					      size_t size,

					      enum dma_data_direction dir)

{

	__dma_sync_single(dev, dma_handle, size, dir);

	debug_dma_sync_single_for_device(dev, dma_handle, size, 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)

{

	dma_sync_single_for_cpu(dev, dma_handle+offset, size, direction);

	debug_dma_sync_single_range_for_cpu(dev, dma_handle,

					    offset, size, 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)

{

	dma_sync_single_for_device(dev, dma_handle+offset, size, direction);

	debug_dma_sync_single_range_for_device(dev, dma_handle,

					       offset, size, direction);

}





static inline void dma_sync_sg_for_cpu(struct device *dev,

				       struct scatterlist *sg, int nelems,

				       enum dma_data_direction dir)

{

	__dma_sync_sg(dev, sg, nelems, dir);

	debug_dma_sync_sg_for_cpu(dev, sg, nelems, dir);

}



static inline void dma_sync_sg_for_device(struct device *dev,

					  struct scatterlist *sg, int nelems,

					  enum dma_data_direction dir)

{

	__dma_sync_sg(dev, sg, nelems, dir);

	debug_dma_sync_sg_for_device(dev, sg, nelems, dir);

}



static inline int dma_get_cache_alignment(void)

{

	/*
@@ -200,20 +57,15 @@ static inline int dma_get_cache_alignment(void) 


static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return dma_addr == 0;

}

	struct dma_map_ops *ops = get_dma_ops(dev);



#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY

	if (ops->mapping_error)

		return ops->mapping_error(dev, dma_addr);



extern int

dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,

			    dma_addr_t device_addr, size_t size, int flags);



extern void

dma_release_declared_memory(struct device *dev);

	return dma_addr == 0;

}



extern void *

dma_mark_declared_memory_occupied(struct device *dev,

				  dma_addr_t device_addr, size_t size);

#include <asm-generic/dma-coherent.h>

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



#endif /* __ASM_SH_DMA_MAPPING_H */

arch/sh/include/asm/pci.h

+1 −9
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 


#ifdef __KERNEL__



#include <linux/dma-mapping.h>



/* Can be used to override the logic in pci_scan_bus for skipping

   already-configured bus numbers - to be used for buggy BIOSes

   or architectures with incomplete PCI setup by the loader */
@@ -54,13 +52,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) 
 * address space.  The networking and block device layers use

 * this boolean for bounce buffer decisions.

 */

#define PCI_DMA_BUS_IS_PHYS	(1)



#include <linux/types.h>

#include <linux/slab.h>

#include <asm/scatterlist.h>

#include <linux/string.h>

#include <asm/io.h>

#define PCI_DMA_BUS_IS_PHYS	(dma_ops->is_phys)



/* pci_unmap_{single,page} being a nop depends upon the

 * configuration.

arch/sh/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ endif 


CFLAGS_REMOVE_return_address.o = -pg



obj-y	:= debugtraps.o dumpstack.o idle.o io.o io_generic.o irq.o	\

obj-y	:= debugtraps.o dma-nommu.o dumpstack.o 			\

	   idle.o io.o io_generic.o irq.o				\

	   irq_$(BITS).o machvec.o nmi_debug.o process_$(BITS).o 	\

	   ptrace_$(BITS).o return_address.o				\

	   setup.o signal_$(BITS).o sys_sh.o sys_sh$(BITS).o		\

arch/sh/kernel/dma-nommu.c

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/*

 * DMA mapping support for platforms lacking IOMMUs.

 *

 * Copyright (C) 2009  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/dma-mapping.h>

#include <linux/io.h>



static dma_addr_t nommu_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 addr = page_to_phys(page) + offset;



	WARN_ON(size == 0);

	dma_cache_sync(dev, page_address(page) + offset, size, dir);



	return addr;

}



static int nommu_map_sg(struct device *dev, struct scatterlist *sg,

			int nents, enum dma_data_direction dir,

			struct dma_attrs *attrs)

{

	struct scatterlist *s;

	int i;



	WARN_ON(nents == 0 || sg[0].length == 0);



	for_each_sg(sg, s, nents, i) {

		BUG_ON(!sg_page(s));



		dma_cache_sync(dev, sg_virt(s), s->length, dir);



		s->dma_address = sg_phys(s);

		s->dma_length = s->length;

	}



	return nents;

}



static void nommu_sync_single(struct device *dev, dma_addr_t addr,

			      size_t size, enum dma_data_direction dir)

{

	dma_cache_sync(dev, phys_to_virt(addr), size, dir);

}



static void nommu_sync_sg(struct device *dev, struct scatterlist *sg,

			  int nelems, enum dma_data_direction dir)

{

	struct scatterlist *s;

	int i;



	for_each_sg(sg, s, nelems, i)

		dma_cache_sync(dev, sg_virt(s), s->length, dir);

}



struct dma_map_ops nommu_dma_ops = {

	.map_page		= nommu_map_page,

	.map_sg			= nommu_map_sg,

	.sync_single_for_device	= nommu_sync_single,

	.sync_sg_for_device	= nommu_sync_sg,

	.is_phys		= 1,

};



void __init no_iommu_init(void)

{

	if (dma_ops)

		return;

	dma_ops = &nommu_dma_ops;

}