66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
74 lines
1.8 KiB
C
74 lines
1.8 KiB
C
/*
|
|
* Dynamic DMA mapping support.
|
|
*
|
|
* We never have any address translations to worry about, so this
|
|
* is just alloc/free.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/device.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <asm/cacheflush.h>
|
|
|
|
void *dma_alloc_coherent(struct device *dev, size_t size,
|
|
dma_addr_t *dma_handle, gfp_t gfp)
|
|
{
|
|
void *ret;
|
|
/* ignore region specifiers */
|
|
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
|
|
|
|
if (dev == NULL || (*dev->dma_mask < 0xffffffff))
|
|
gfp |= GFP_DMA;
|
|
ret = (void *)__get_free_pages(gfp, get_order(size));
|
|
|
|
if (ret != NULL) {
|
|
memset(ret, 0, size);
|
|
*dma_handle = virt_to_phys(ret);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void dma_free_coherent(struct device *dev, size_t size,
|
|
void *vaddr, dma_addr_t dma_handle)
|
|
{
|
|
free_pages((unsigned long)vaddr, get_order(size));
|
|
}
|
|
|
|
void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,
|
|
size_t size, enum dma_data_direction dir)
|
|
{
|
|
switch (dir) {
|
|
case DMA_TO_DEVICE:
|
|
flush_dcache_range(handle, size);
|
|
break;
|
|
case DMA_FROM_DEVICE:
|
|
/* Should be clear already */
|
|
break;
|
|
default:
|
|
if (printk_ratelimit())
|
|
printk("dma_sync_single_for_device: unsupported dir %u\n", dir);
|
|
break;
|
|
}
|
|
}
|
|
|
|
EXPORT_SYMBOL(dma_sync_single_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_phys(addr);
|
|
flush_dcache_range(handle, size);
|
|
return handle;
|
|
}
|
|
EXPORT_SYMBOL(dma_map_single);
|
|
|
|
dma_addr_t dma_map_page(struct device *dev, struct page *page,
|
|
unsigned long offset, size_t size,
|
|
enum dma_data_direction dir)
|
|
{
|
|
dma_addr_t handle = page_to_phys(page) + offset;
|
|
dma_sync_single_for_device(dev, handle, size, dir);
|
|
return handle;
|
|
}
|
|
EXPORT_SYMBOL(dma_map_page);
|