Commit 9de90ac2 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Ingo Molnar
Browse files

Sh: use generic per-device coherent dma allocator 



Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1fe53268

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config SUPERH 
	select EMBEDDED

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_GENERIC_DMA_COHERENT

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast

arch/sh/mm/consistent.c

+3 −95
Original line number Diff line number Diff line
@@ -27,21 +27,10 @@ void *dma_alloc_coherent(struct device *dev, size_t size, 
			   dma_addr_t *dma_handle, gfp_t gfp)

{

	void *ret, *ret_nocache;

	struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;

	int order = get_order(size);



	if (mem) {

		int page = bitmap_find_free_region(mem->bitmap, mem->size,

						     order);

		if (page >= 0) {

			*dma_handle = mem->device_base + (page << PAGE_SHIFT);

			ret = mem->virt_base + (page << PAGE_SHIFT);

			memset(ret, 0, size);

	if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))

		return ret;

		}

		if (mem->flags & DMA_MEMORY_EXCLUSIVE)

			return NULL;

	}



	ret = (void *)__get_free_pages(gfp, order);

	if (!ret)
@@ -71,11 +60,7 @@ void dma_free_coherent(struct device *dev, size_t size, 
	struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;

	int order = get_order(size);



	if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {

		int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;



		bitmap_release_region(mem->bitmap, page, order);

	} else {

	if (!dma_release_from_coherent(dev, order, vaddr)) {

		WARN_ON(irqs_disabled());	/* for portability */

		BUG_ON(mem && mem->flags & DMA_MEMORY_EXCLUSIVE);

		free_pages((unsigned long)phys_to_virt(dma_handle), order);
@@ -84,83 +69,6 @@ void dma_free_coherent(struct device *dev, size_t size, 
}

EXPORT_SYMBOL(dma_free_coherent);



int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,

				dma_addr_t device_addr, size_t size, int flags)

{

	void __iomem *mem_base = NULL;

	int pages = size >> PAGE_SHIFT;

	int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);



	if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)

		goto out;

	if (!size)

		goto out;

	if (dev->dma_mem)

		goto out;



	/* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */



	mem_base = ioremap_nocache(bus_addr, size);

	if (!mem_base)

		goto out;



	dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);

	if (!dev->dma_mem)

		goto out;

	dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);

	if (!dev->dma_mem->bitmap)

		goto free1_out;



	dev->dma_mem->virt_base = mem_base;

	dev->dma_mem->device_base = device_addr;

	dev->dma_mem->size = pages;

	dev->dma_mem->flags = flags;



	if (flags & DMA_MEMORY_MAP)

		return DMA_MEMORY_MAP;



	return DMA_MEMORY_IO;



 free1_out:

	kfree(dev->dma_mem);

 out:

	if (mem_base)

		iounmap(mem_base);

	return 0;

}

EXPORT_SYMBOL(dma_declare_coherent_memory);



void dma_release_declared_memory(struct device *dev)

{

	struct dma_coherent_mem *mem = dev->dma_mem;



	if (!mem)

		return;

	dev->dma_mem = NULL;

	iounmap(mem->virt_base);

	kfree(mem->bitmap);

	kfree(mem);

}

EXPORT_SYMBOL(dma_release_declared_memory);



void *dma_mark_declared_memory_occupied(struct device *dev,

					dma_addr_t device_addr, size_t size)

{

	struct dma_coherent_mem *mem = dev->dma_mem;

	int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1) >> PAGE_SHIFT;

	int pos, err;



	if (!mem)

		return ERR_PTR(-EINVAL);



	pos = (device_addr - mem->device_base) >> PAGE_SHIFT;

	err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));

	if (err != 0)

		return ERR_PTR(err);

	return mem->virt_base + (pos << PAGE_SHIFT);

}

EXPORT_SYMBOL(dma_mark_declared_memory_occupied);



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

		    enum dma_data_direction direction)

{

include/asm-sh/dma-mapping.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/scatterlist.h>

#include <asm/cacheflush.h>

#include <asm/io.h>

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



extern struct bus_type pci_bus_type;