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>
131 lines
3.0 KiB
C
131 lines
3.0 KiB
C
/*
|
|
* 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.
|
|
*/
|
|
|
|
#undef DEBUG
|
|
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/device.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/scatterlist.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/vmalloc.h>
|
|
|
|
#include <asm/pgalloc.h>
|
|
|
|
void *dma_alloc_coherent(struct device *dev, size_t size,
|
|
dma_addr_t *handle, gfp_t flag)
|
|
{
|
|
struct page *page, **map;
|
|
pgprot_t pgprot;
|
|
void *addr;
|
|
int i, order;
|
|
|
|
pr_debug("dma_alloc_coherent: %d,%x\n", size, flag);
|
|
|
|
size = PAGE_ALIGN(size);
|
|
order = get_order(size);
|
|
|
|
page = alloc_pages(flag, order);
|
|
if (!page)
|
|
return NULL;
|
|
|
|
*handle = page_to_phys(page);
|
|
map = kmalloc(sizeof(struct page *) << order, flag & ~__GFP_DMA);
|
|
if (!map) {
|
|
__free_pages(page, order);
|
|
return NULL;
|
|
}
|
|
split_page(page, order);
|
|
|
|
order = 1 << order;
|
|
size >>= PAGE_SHIFT;
|
|
map[0] = page;
|
|
for (i = 1; i < size; i++)
|
|
map[i] = page + i;
|
|
for (; i < order; i++)
|
|
__free_page(page + i);
|
|
pgprot = __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);
|
|
if (CPU_IS_040_OR_060)
|
|
pgprot_val(pgprot) |= _PAGE_GLOBAL040 | _PAGE_NOCACHE_S;
|
|
else
|
|
pgprot_val(pgprot) |= _PAGE_NOCACHE030;
|
|
addr = vmap(map, size, VM_MAP, pgprot);
|
|
kfree(map);
|
|
|
|
return addr;
|
|
}
|
|
EXPORT_SYMBOL(dma_alloc_coherent);
|
|
|
|
void dma_free_coherent(struct device *dev, size_t size,
|
|
void *addr, dma_addr_t handle)
|
|
{
|
|
pr_debug("dma_free_coherent: %p, %x\n", addr, handle);
|
|
vfree(addr);
|
|
}
|
|
EXPORT_SYMBOL(dma_free_coherent);
|
|
|
|
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:
|
|
cache_push(handle, size);
|
|
break;
|
|
case DMA_FROM_DEVICE:
|
|
cache_clear(handle, size);
|
|
break;
|
|
default:
|
|
if (printk_ratelimit())
|
|
printk("dma_sync_single_for_device: unsupported dir %u\n", dir);
|
|
break;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(dma_sync_single_for_device);
|
|
|
|
void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,
|
|
enum dma_data_direction dir)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < nents; sg++, i++)
|
|
dma_sync_single_for_device(dev, sg->dma_address, sg->length, 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,
|
|
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);
|
|
|
|
int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
|
|
enum dma_data_direction dir)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < nents; sg++, i++) {
|
|
sg->dma_address = sg_phys(sg);
|
|
dma_sync_single_for_device(dev, sg->dma_address, sg->length, dir);
|
|
}
|
|
return nents;
|
|
}
|
|
EXPORT_SYMBOL(dma_map_sg);
|