Module Name: src
Committed By: thorpej
Date: Fri Aug 21 03:50:01 UTC 2009
Modified Files:
src/sys/arch/cobalt/cobalt: bus.c
src/sys/arch/cobalt/conf: files.cobalt
Log Message:
Use bus_dmamem_common.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/cobalt/cobalt/bus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/cobalt/conf/files.cobalt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cobalt/cobalt/bus.c
diff -u src/sys/arch/cobalt/cobalt/bus.c:1.36 src/sys/arch/cobalt/cobalt/bus.c:1.37
--- src/sys/arch/cobalt/cobalt/bus.c:1.36 Thu Aug 20 11:50:11 2009
+++ src/sys/arch/cobalt/cobalt/bus.c Fri Aug 21 03:50:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.36 2009/08/20 11:50:11 tsutsui Exp $ */
+/* $NetBSD: bus.c,v 1.37 2009/08/21 03:50:01 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.36 2009/08/20 11:50:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.37 2009/08/21 03:50:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,6 +44,8 @@
#define _COBALT_BUS_DMA_PRIVATE
#include <machine/bus.h>
+#include <common/bus_dma/bus_dmamem_common.h>
+
#include <uvm/uvm_extern.h>
#include <mips/cache.h>
@@ -603,57 +605,11 @@
int flags)
{
extern paddr_t avail_start, avail_end;
- vaddr_t curaddr, lastaddr;
- psize_t high;
- struct vm_page *m;
- struct pglist mlist;
- int curseg, error;
-
- /* Always round the size. */
- size = round_page(size);
-
- high = avail_end - PAGE_SIZE;
-
- /*
- * Allocate pages from the VM system.
- */
- error = uvm_pglistalloc(size, avail_start, high, alignment, boundary,
- &mlist, nsegs, (flags & BUS_DMA_NOWAIT) == 0);
- if (error)
- return error;
- /*
- * Compute the location, size, and number of segments actually
- * returned by the VM code.
- */
- m = mlist.tqh_first;
- curseg = 0;
- lastaddr = segs[curseg].ds_addr = VM_PAGE_TO_PHYS(m);
- segs[curseg].ds_len = PAGE_SIZE;
- m = m->pageq.queue.tqe_next;
-
- for (; m != NULL; m = m->pageq.queue.tqe_next) {
- curaddr = VM_PAGE_TO_PHYS(m);
-#ifdef DIAGNOSTIC
- if (curaddr < avail_start || curaddr >= high) {
- printf("uvm_pglistalloc returned non-sensical"
- " address 0x%lx\n", curaddr);
- panic("_bus_dmamem_alloc");
- }
-#endif
- if (curaddr == (lastaddr + PAGE_SIZE))
- segs[curseg].ds_len += PAGE_SIZE;
- else {
- curseg++;
- segs[curseg].ds_addr = curaddr;
- segs[curseg].ds_len = PAGE_SIZE;
- }
- lastaddr = curaddr;
- }
-
- *rsegs = curseg + 1;
-
- return 0;
+ return (_bus_dmamem_alloc_range_common(t, size, alignment, boundary,
+ segs, nsegs, rsegs, flags,
+ avail_start /*low*/,
+ avail_end - PAGE_SIZE /*high*/));
}
/*
@@ -663,25 +619,8 @@
void
_bus_dmamem_free(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs)
{
- struct vm_page *m;
- bus_addr_t addr;
- struct pglist mlist;
- int curseg;
-
- /*
- * Build a list of pages to free back to the VM system.
- */
- TAILQ_INIT(&mlist);
- for (curseg = 0; curseg < nsegs; curseg++) {
- for (addr = segs[curseg].ds_addr;
- addr < (segs[curseg].ds_addr + segs[curseg].ds_len);
- addr += PAGE_SIZE) {
- m = PHYS_TO_VM_PAGE(addr);
- TAILQ_INSERT_TAIL(&mlist, m, pageq.queue);
- }
- }
- uvm_pglistfree(&mlist);
+ _bus_dmamem_free_common(t, segs, nsegs);
}
/*
@@ -692,11 +631,6 @@
_bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
size_t size, void **kvap, int flags)
{
- vaddr_t va;
- bus_addr_t addr;
- int curseg;
- const uvm_flag_t kmflags =
- (flags & BUS_DMA_NOWAIT) != 0 ? UVM_KMF_NOWAIT : 0;
/*
* If we're only mapping 1 segment, use KSEG0 or KSEG1, to avoid
@@ -710,31 +644,8 @@
return 0;
}
- size = round_page(size);
-
- va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY | kmflags);
-
- if (va == 0)
- return (ENOMEM);
-
- *kvap = (void *)va;
-
- for (curseg = 0; curseg < nsegs; curseg++) {
- for (addr = segs[curseg].ds_addr;
- addr < (segs[curseg].ds_addr + segs[curseg].ds_len);
- addr += PAGE_SIZE, va += PAGE_SIZE, size -= PAGE_SIZE) {
- if (size == 0)
- panic("_bus_dmamem_map: size botch");
- pmap_enter(pmap_kernel(), va, addr,
- VM_PROT_READ | VM_PROT_WRITE,
- VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED);
-
- /* XXX Do something about COHERENT here. */
- }
- }
- pmap_update(pmap_kernel());
-
- return 0;
+ /* XXX BUS_DMA_COHERENT */
+ return (_bus_dmamem_map_common(t, segs, nsegs, size, kvap, flags, 0));
}
/*
@@ -745,11 +656,6 @@
_bus_dmamem_unmap(bus_dma_tag_t t, void *kva, size_t size)
{
-#ifdef DIAGNOSTIC
- if ((u_long)kva & PGOFSET)
- panic("_bus_dmamem_unmap");
-#endif
-
/*
* Nothing to do if we mapped it with KSEG0 or KSEG1 (i.e.
* not in KSEG2).
@@ -758,10 +664,7 @@
kva < (void *)MIPS_KSEG2_START)
return;
- size = round_page(size);
- pmap_remove(pmap_kernel(), (vaddr_t)kva, (vaddr_t)kva + size);
- pmap_update(pmap_kernel());
- uvm_km_free(kernel_map, (vaddr_t)kva, size, UVM_KMF_VAONLY);
+ _bus_dmamem_unmap_common(t, kva, size);
}
/*
@@ -772,26 +675,11 @@
_bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
off_t off, int prot, int flags)
{
- int i;
-
- for (i = 0; i < nsegs; i++) {
-#ifdef DIAGNOSTIC
- if (off & PGOFSET)
- panic("_bus_dmamem_mmap: offset unaligned");
- if (segs[i].ds_addr & PGOFSET)
- panic("_bus_dmamem_mmap: segment unaligned");
- if (segs[i].ds_len & PGOFSET)
- panic("_bus_dmamem_mmap: segment size not multiple"
- " of page size");
-#endif
- if (off >= segs[i].ds_len) {
- off -= segs[i].ds_len;
- continue;
- }
+ bus_addr_t rv;
- return mips_btop((char *)segs[i].ds_addr + off);
- }
-
- /* Page not found. */
- return -1;
+ rv = _bus_dmamem_mmap_common(t, segs, nsegs, off, prot, flags);
+ if (rv == (bus_addr_t)-1)
+ return (-1);
+
+ return (mips_btop((char *)rv));
}
Index: src/sys/arch/cobalt/conf/files.cobalt
diff -u src/sys/arch/cobalt/conf/files.cobalt:1.33 src/sys/arch/cobalt/conf/files.cobalt:1.34
--- src/sys/arch/cobalt/conf/files.cobalt:1.33 Wed May 28 14:05:14 2008
+++ src/sys/arch/cobalt/conf/files.cobalt Fri Aug 21 03:50:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.cobalt,v 1.33 2008/05/28 14:05:14 tsutsui Exp $
+# $NetBSD: files.cobalt,v 1.34 2009/08/21 03:50:01 thorpej Exp $
maxpartitions 16
@@ -48,6 +48,8 @@
file arch/mips/mips/softintr.c
+file common/bus_dma/bus_dmamem_common.c
+
file dev/md_root.c memory_disk_hooks
file dev/cons.c
