283 lines
8.7 KiB
Diff
283 lines
8.7 KiB
Diff
arch/m68k/kernel/Makefile | 4 -
|
|
arch/m68k/kernel/dma.c | 112 +++++++++++++++++++++++++++++++++++++++++
|
|
include/asm-m68k/dma-mapping.h | 63 ++++++++++++++++++++---
|
|
include/asm-m68k/scatterlist.h | 9 +--
|
|
4 files changed, 175 insertions(+), 13 deletions(-)
|
|
|
|
Index: linux-tmp/include/asm-m68k/scatterlist.h
|
|
===================================================================
|
|
--- linux-tmp.orig/include/asm-m68k/scatterlist.h 2005-06-04 21:57:39.000000000 +0200
|
|
+++ linux-tmp/include/asm-m68k/scatterlist.h 2005-06-04 21:57:50.000000000 +0200
|
|
@@ -2,18 +2,17 @@
|
|
#define _M68K_SCATTERLIST_H
|
|
|
|
struct scatterlist {
|
|
- /* These two are only valid if ADDRESS member of this
|
|
- * struct is NULL.
|
|
- */
|
|
struct page *page;
|
|
unsigned int offset;
|
|
-
|
|
unsigned int length;
|
|
|
|
- __u32 dvma_address; /* A place to hang host-specific addresses at. */
|
|
+ __u32 dma_address; /* A place to hang host-specific addresses at. */
|
|
};
|
|
|
|
/* This is bogus and should go away. */
|
|
#define ISA_DMA_THRESHOLD (0x00ffffff)
|
|
|
|
+#define sg_dma_address(sg) ((sg)->dma_address)
|
|
+#define sg_dma_len(sg) ((sg)->length)
|
|
+
|
|
#endif /* !(_M68K_SCATTERLIST_H) */
|
|
Index: linux-tmp/arch/m68k/kernel/Makefile
|
|
===================================================================
|
|
--- linux-tmp.orig/arch/m68k/kernel/Makefile 2005-06-04 21:57:39.000000000 +0200
|
|
+++ linux-tmp/arch/m68k/kernel/Makefile 2005-06-04 21:57:50.000000000 +0200
|
|
@@ -9,8 +9,8 @@ else
|
|
endif
|
|
extra-y += vmlinux.lds
|
|
|
|
-obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \
|
|
- sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
|
|
+obj-y := entry.o process.o traps.o ints.o dma.o signal.o ptrace.o \
|
|
+ sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
|
|
|
|
obj-$(CONFIG_PCI) += bios32.o
|
|
obj-$(CONFIG_MODULES) += module.o
|
|
Index: linux-tmp/arch/m68k/kernel/dma.c
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ linux-tmp/arch/m68k/kernel/dma.c 2005-06-04 22:30:41.495377370 +0200
|
|
@@ -0,0 +1,112 @@
|
|
+
|
|
+#include <linux/dma-mapping.h>
|
|
+#include <linux/device.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/vmalloc.h>
|
|
+
|
|
+#include <asm/pgalloc.h>
|
|
+#include <asm/scatterlist.h>
|
|
+
|
|
+void *dma_alloc_coherent(struct device *dev, size_t size,
|
|
+ dma_addr_t *handle, int 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);
|
|
+ if (!map) {
|
|
+ __free_pages(page, order);
|
|
+ return NULL;
|
|
+ }
|
|
+ order = 1 << order;
|
|
+ size >>= PAGE_SHIFT;
|
|
+ map[0] = page;
|
|
+ for (i = 1; i < size; i++) {
|
|
+ map[i] = page + i;
|
|
+ get_page(map[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, flag, pgprot);
|
|
+ kfree(map);
|
|
+
|
|
+ return addr;
|
|
+}
|
|
+
|
|
+void dma_free_coherent(struct device *dev, size_t size,
|
|
+ void *addr, dma_addr_t handle)
|
|
+{
|
|
+ vfree(addr);
|
|
+}
|
|
+
|
|
+inline void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,
|
|
+ enum dma_data_direction dir)
|
|
+{
|
|
+ if (dir == DMA_TO_DEVICE)
|
|
+ cache_push(handle, size);
|
|
+ else if (dir == DMA_FROM_DEVICE)
|
|
+ cache_clear(handle, size);
|
|
+}
|
|
+
|
|
+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);
|
|
+}
|
|
+
|
|
+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;
|
|
+}
|
|
+
|
|
+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;
|
|
+}
|
|
+
|
|
+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 = page_to_phys(sg->page) + sg->offset;
|
|
+ dma_sync_single_for_device(dev, sg->dma_address, sg->length, dir);
|
|
+ }
|
|
+ return nents;
|
|
+}
|
|
+
|
|
+EXPORT_SYMBOL(dma_alloc_coherent);
|
|
+EXPORT_SYMBOL(dma_free_coherent);
|
|
+EXPORT_SYMBOL(dma_map_single);
|
|
+EXPORT_SYMBOL(dma_map_page);
|
|
+EXPORT_SYMBOL(dma_map_sg);
|
|
+EXPORT_SYMBOL(dma_sync_single_for_device);
|
|
+EXPORT_SYMBOL(dma_sync_sg_for_device);
|
|
Index: linux-tmp/include/asm-m68k/dma-mapping.h
|
|
===================================================================
|
|
--- linux-tmp.orig/include/asm-m68k/dma-mapping.h 2005-06-04 21:57:39.000000000 +0200
|
|
+++ linux-tmp/include/asm-m68k/dma-mapping.h 2005-06-04 21:57:50.000000000 +0200
|
|
@@ -1,12 +1,63 @@
|
|
#ifndef _M68K_DMA_MAPPING_H
|
|
#define _M68K_DMA_MAPPING_H
|
|
|
|
-#include <linux/config.h>
|
|
+struct scatterlist;
|
|
|
|
-#ifdef CONFIG_PCI
|
|
-#include <asm-generic/dma-mapping.h>
|
|
-#else
|
|
-#include <asm-generic/dma-mapping-broken.h>
|
|
-#endif
|
|
+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;
|
|
+}
|
|
+
|
|
+extern void *dma_alloc_coherent(struct device *, size_t,
|
|
+ dma_addr_t *, int);
|
|
+extern void dma_free_coherent(struct device *, size_t,
|
|
+ void *, dma_addr_t);
|
|
+
|
|
+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_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 int dma_mapping_error(dma_addr_t handle)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
|
|
#endif /* _M68K_DMA_MAPPING_H */
|
|
diff -pur -X /home/roman/nodiff linux-tmp/arch/m68k/apollo/Makefile linux/arch/m68k/apollo/Makefile
|
|
--- linux-tmp/arch/m68k/apollo/Makefile 2002-12-17 00:58:44.000000000 +0100
|
|
+++ linux/arch/m68k/apollo/Makefile 2005-06-10 23:28:12.000000000 +0200
|
|
@@ -2,4 +2,4 @@
|
|
# Makefile for Linux arch/m68k/amiga source directory
|
|
#
|
|
|
|
-obj-y := config.o dn_ints.o dma.o
|
|
+obj-y := config.o dn_ints.o
|
|
diff -pur -X /home/roman/nodiff linux-tmp/drivers/scsi/sun3x_esp.c linux/drivers/scsi/sun3x_esp.c
|
|
--- linux-tmp/drivers/scsi/sun3x_esp.c 2004-12-30 00:48:46.000000000 +0100
|
|
+++ linux/drivers/scsi/sun3x_esp.c 2005-06-11 02:43:27.000000000 +0200
|
|
@@ -334,11 +334,11 @@ static void dma_mmu_get_scsi_sgl (struct
|
|
struct scatterlist *sg = sp->SCp.buffer;
|
|
|
|
while (sz >= 0) {
|
|
- sg[sz].dvma_address = dvma_map((unsigned long)page_address(sg[sz].page) +
|
|
+ sg[sz].dma_address = dvma_map((unsigned long)page_address(sg[sz].page) +
|
|
sg[sz].offset, sg[sz].length);
|
|
sz--;
|
|
}
|
|
- sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dvma_address);
|
|
+ sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_address);
|
|
}
|
|
|
|
static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)
|
|
@@ -352,14 +352,14 @@ static void dma_mmu_release_scsi_sgl (st
|
|
struct scatterlist *sg = (struct scatterlist *)sp->buffer;
|
|
|
|
while(sz >= 0) {
|
|
- dvma_unmap((char *)sg[sz].dvma_address);
|
|
+ dvma_unmap((char *)sg[sz].dma_address);
|
|
sz--;
|
|
}
|
|
}
|
|
|
|
static void dma_advance_sg (Scsi_Cmnd *sp)
|
|
{
|
|
- sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dvma_address);
|
|
+ sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dma_address);
|
|
}
|
|
|
|
static int sun3x_esp_release(struct Scsi_Host *instance)
|