Module Name: src
Committed By: christos
Date: Thu Sep 1 15:10:32 UTC 2011
Modified Files:
src/sys/arch/i386/eisa: eisa_machdep.c
src/sys/arch/i386/mca: mca_machdep.c
src/sys/arch/x86/include: bus_private.h
src/sys/arch/x86/isa: isa_machdep.c
src/sys/arch/x86/pci: pci_machdep.c
src/sys/arch/x86/x86: bus_dma.c
src/sys/arch/xen/xen: isa_machdep.c xpci_xenbus.c
src/sys/sys: bus.h
Log Message:
Add bus_dma overrides. From dyoung
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/eisa/eisa_machdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/mca/mca_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/include/bus_private.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x86/isa/isa_machdep.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/x86/pci/pci_machdep.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/xen/xen/isa_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/xen/xen/xpci_xenbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/sys/bus.h
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/i386/eisa/eisa_machdep.c
diff -u src/sys/arch/i386/eisa/eisa_machdep.c:1.36 src/sys/arch/i386/eisa/eisa_machdep.c:1.37
--- src/sys/arch/i386/eisa/eisa_machdep.c:1.36 Sat Aug 27 05:32:12 2011
+++ src/sys/arch/i386/eisa/eisa_machdep.c Thu Sep 1 11:10:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.c,v 1.36 2011/08/27 09:32:12 christos Exp $ */
+/* $NetBSD: eisa_machdep.c,v 1.37 2011/09/01 15:10:31 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.36 2011/08/27 09:32:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.37 2011/09/01 15:10:31 christos Exp $");
#include "ioapic.h"
@@ -91,6 +91,8 @@
/*
* EISA doesn't have any special needs; just use the generic versions
* of these funcions.
+ *
+ * XXX really doesn't use bounce buffers? --dyoung
*/
struct x86_bus_dma_tag eisa_bus_dma_tag = {
._tag_needs_free = 0,
@@ -98,24 +100,6 @@
._bounce_alloc_lo = 0,
._bounce_alloc_hi = 0,
._may_bounce = NULL,
-
- ._dmamap_create = _bus_dmamap_create,
- ._dmamap_destroy = _bus_dmamap_destroy,
- ._dmamap_load = _bus_dmamap_load,
- ._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
- ._dmamap_load_uio = _bus_dmamap_load_uio,
- ._dmamap_load_raw = _bus_dmamap_load_raw,
- ._dmamap_unload = _bus_dmamap_unload,
- ._dmamap_sync = NULL,
-
- ._dmamem_alloc = _bus_dmamem_alloc,
- ._dmamem_free = _bus_dmamem_free,
- ._dmamem_map = _bus_dmamem_map,
- ._dmamem_unmap = _bus_dmamem_unmap,
- ._dmamem_mmap = _bus_dmamem_mmap,
-
- ._dmatag_subregion = _bus_dmatag_subregion,
- ._dmatag_destroy = _bus_dmatag_destroy,
};
void
Index: src/sys/arch/i386/mca/mca_machdep.c
diff -u src/sys/arch/i386/mca/mca_machdep.c:1.42 src/sys/arch/i386/mca/mca_machdep.c:1.43
--- src/sys/arch/i386/mca/mca_machdep.c:1.42 Sat Aug 27 05:32:12 2011
+++ src/sys/arch/i386/mca/mca_machdep.c Thu Sep 1 11:10:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_machdep.c,v 1.42 2011/08/27 09:32:12 christos Exp $ */
+/* $NetBSD: mca_machdep.c,v 1.43 2011/09/01 15:10:31 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.42 2011/08/27 09:32:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.43 2011/09/01 15:10:31 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -106,24 +106,6 @@
._bounce_alloc_lo = 0,
._bounce_alloc_hi = MCA_DMA_BOUNCE_THRESHOLD,
._may_bounce = NULL,
-
- ._dmamap_create = _bus_dmamap_create,
- ._dmamap_destroy = _bus_dmamap_destroy,
- ._dmamap_load = _bus_dmamap_load,
- ._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
- ._dmamap_load_uio = _bus_dmamap_load_uio,
- ._dmamap_load_raw = _bus_dmamap_load_raw,
- ._dmamap_unload = _bus_dmamap_unload,
- ._dmamap_sync = _bus_dmamap_sync,
-
- ._dmamem_alloc = _bus_dmamem_alloc,
- ._dmamem_free = _bus_dmamem_free,
- ._dmamem_map = _bus_dmamem_map,
- ._dmamem_unmap = _bus_dmamem_unmap,
- ._dmamem_mmap = _bus_dmamem_mmap,
-
- ._dmatag_subregion = _bus_dmatag_subregion,
- ._dmatag_destroy = _bus_dmatag_destroy,
};
/* Updated in mca_busprobe() if appropriate. */
@@ -477,7 +459,7 @@
* MCA DMA transfer can be maximum 65536 bytes long and must
* be in one chunk. No specific boundary constraints are present.
*/
- if ((error = _bus_dmamap_create(t, size, 1, 65536, 0, flags, dmamp)))
+ if ((error = bus_dmamap_create(t, size, 1, 65536, 0, flags, dmamp)))
return (error);
cookie = (struct x86_isa_dma_cookie *) (*dmamp)->_dm_cookie;
Index: src/sys/arch/x86/include/bus_private.h
diff -u src/sys/arch/x86/include/bus_private.h:1.13 src/sys/arch/x86/include/bus_private.h:1.14
--- src/sys/arch/x86/include/bus_private.h:1.13 Wed Aug 31 16:21:06 2011
+++ src/sys/arch/x86/include/bus_private.h Thu Sep 1 11:10:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_private.h,v 1.13 2011/08/31 20:21:06 dyoung Exp $ */
+/* $NetBSD: bus_private.h,v 1.14 2011/09/01 15:10:31 christos Exp $ */
/* NetBSD: bus.h,v 1.8 2005/03/09 19:04:46 matt Exp */
/*-
@@ -65,43 +65,6 @@
#if !defined(_X86_BUS_PRIVATE_H_)
#define _X86_BUS_PRIVATE_H_
-int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
- bus_size_t, int, bus_dmamap_t *);
-void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
-int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
-int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
-int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
-int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
-void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
-void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
- bus_size_t, int);
-
-int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
- bus_size_t alignment, bus_size_t boundary,
- bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
-void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs);
-int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, size_t size, void **kvap, int flags);
-void _bus_dmamem_unmap(bus_dma_tag_t tag, void *kva, size_t size);
-paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, off_t off, int prot, int flags);
-
-int _bus_dmatag_subregion(bus_dma_tag_t tag, bus_addr_t min_addr,
- bus_addr_t max_addr, bus_dma_tag_t *newtag, int flags);
-void _bus_dmatag_destroy(bus_dma_tag_t tag);
-
-#ifndef _BUS_DMAMEM_ALLOC_RANGE
-int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
- bus_size_t alignment, bus_size_t boundary,
- bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
- bus_addr_t low, bus_addr_t high);
-#endif
-
/*
* Cookie used for bounce buffers. A pointer to one of these it stashed in
* the DMA map.
@@ -214,39 +177,6 @@
bus_addr_t _bounce_alloc_lo;
bus_addr_t _bounce_alloc_hi;
int (*_may_bounce)(bus_dma_tag_t, bus_dmamap_t, int, int *);
-
- /*
- * DMA mapping methods.
- */
- int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *);
- void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
- int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
- int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
- int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
- int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
- void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
- void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int);
-
- /*
- * DMA memory utility functions.
- */
- int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int);
- void (*_dmamem_free)(bus_dma_tag_t, bus_dma_segment_t *, int);
- int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
- int, size_t, void **, int);
- void (*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
- paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int);
- int (*_dmatag_subregion)(bus_dma_tag_t, bus_addr_t, bus_addr_t,
- bus_dma_tag_t *, int);
- void (*_dmatag_destroy)(bus_dma_tag_t);
};
#endif /* !defined(_X86_BUS_PRIVATE_H_) */
Index: src/sys/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.29 src/sys/arch/x86/isa/isa_machdep.c:1.30
--- src/sys/arch/x86/isa/isa_machdep.c:1.29 Sat Aug 27 05:32:11 2011
+++ src/sys/arch/x86/isa/isa_machdep.c Thu Sep 1 11:10:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.29 2011/08/27 09:32:11 christos Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.30 2011/09/01 15:10:31 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.29 2011/08/27 09:32:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.30 2011/09/01 15:10:31 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,24 +101,6 @@
._bounce_alloc_lo = 0,
._bounce_alloc_hi = ISA_DMA_BOUNCE_THRESHOLD,
._may_bounce = _isa_dma_may_bounce,
-
- ._dmamap_create = _bus_dmamap_create,
- ._dmamap_destroy = _bus_dmamap_destroy,
- ._dmamap_load = _bus_dmamap_load,
- ._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
- ._dmamap_load_uio = _bus_dmamap_load_uio,
- ._dmamap_load_raw = _bus_dmamap_load_raw,
- ._dmamap_unload = _bus_dmamap_unload,
- ._dmamap_sync = _bus_dmamap_sync,
-
- ._dmamem_alloc = _bus_dmamem_alloc,
- ._dmamem_free = _bus_dmamem_free,
- ._dmamem_map = _bus_dmamem_map,
- ._dmamem_unmap = _bus_dmamem_unmap,
- ._dmamem_mmap = _bus_dmamem_mmap,
-
- ._dmatag_subregion = _bus_dmatag_subregion,
- ._dmatag_destroy = _bus_dmatag_destroy,
};
#define IDTVEC(name) __CONCAT(X,name)
Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.49 src/sys/arch/x86/pci/pci_machdep.c:1.50
--- src/sys/arch/x86/pci/pci_machdep.c:1.49 Mon Aug 29 18:46:04 2011
+++ src/sys/arch/x86/pci/pci_machdep.c Thu Sep 1 11:10:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.49 2011/08/29 22:46:04 dyoung Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.50 2011/09/01 15:10:31 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.49 2011/08/29 22:46:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.50 2011/09/01 15:10:31 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -202,24 +202,6 @@
._bounce_alloc_hi = 0,
#endif
._may_bounce = NULL,
-
- ._dmamap_create = _bus_dmamap_create,
- ._dmamap_destroy = _bus_dmamap_destroy,
- ._dmamap_load = _bus_dmamap_load,
- ._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
- ._dmamap_load_uio = _bus_dmamap_load_uio,
- ._dmamap_load_raw = _bus_dmamap_load_raw,
- ._dmamap_unload = _bus_dmamap_unload,
- ._dmamap_sync = _bus_dmamap_sync,
-
- ._dmamem_alloc = _bus_dmamem_alloc,
- ._dmamem_free = _bus_dmamem_free,
- ._dmamem_map = _bus_dmamem_map,
- ._dmamem_unmap = _bus_dmamem_unmap,
- ._dmamem_mmap = _bus_dmamem_mmap,
-
- ._dmatag_subregion = _bus_dmatag_subregion,
- ._dmatag_destroy = _bus_dmatag_destroy,
};
#ifdef _LP64
@@ -229,24 +211,6 @@
._bounce_alloc_lo = 0,
._bounce_alloc_hi = 0,
._may_bounce = NULL,
-
- ._dmamap_create = _bus_dmamap_create,
- ._dmamap_destroy = _bus_dmamap_destroy,
- ._dmamap_load = _bus_dmamap_load,
- ._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
- ._dmamap_load_uio = _bus_dmamap_load_uio,
- ._dmamap_load_raw = _bus_dmamap_load_raw,
- ._dmamap_unload = _bus_dmamap_unload,
- ._dmamap_sync = NULL,
-
- ._dmamem_alloc = _bus_dmamem_alloc,
- ._dmamem_free = _bus_dmamem_free,
- ._dmamem_map = _bus_dmamem_map,
- ._dmamem_unmap = _bus_dmamem_unmap,
- ._dmamem_mmap = _bus_dmamem_mmap,
-
- ._dmatag_subregion = _bus_dmatag_subregion,
- ._dmatag_destroy = _bus_dmatag_destroy,
};
#endif
Index: src/sys/arch/x86/x86/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.58 src/sys/arch/x86/x86/bus_dma.c:1.59
--- src/sys/arch/x86/x86/bus_dma.c:1.58 Mon Jul 25 16:33:20 2011
+++ src/sys/arch/x86/x86/bus_dma.c Thu Sep 1 11:10:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.58 2011/07/25 20:33:20 dyoung Exp $ */
+/* $NetBSD: bus_dma.c,v 1.59 2011/09/01 15:10:31 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.58 2011/07/25 20:33:20 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.59 2011/09/01 15:10:31 christos Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -89,6 +89,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
+#include <sys/kmem.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/proc.h>
@@ -130,6 +131,36 @@
#define STAT_DECR(x)
#endif
+static int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+ bus_size_t, int, bus_dmamap_t *);
+static void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+static int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+static int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+static int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+static int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+static void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+static void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+ bus_size_t, int);
+
+static int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
+ bus_size_t alignment, bus_size_t boundary,
+ bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
+static void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs);
+static int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, size_t size, void **kvap, int flags);
+static void _bus_dmamem_unmap(bus_dma_tag_t tag, void *kva, size_t size);
+static paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, off_t off, int prot, int flags);
+
+static int _bus_dmatag_subregion(bus_dma_tag_t tag, bus_addr_t min_addr,
+ bus_addr_t max_addr, bus_dma_tag_t *newtag, int flags);
+static void _bus_dmatag_destroy(bus_dma_tag_t tag);
+
static int _bus_dma_uiomove(void *, struct uio *, size_t, int);
static int _bus_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map,
bus_size_t size, int flags);
@@ -140,13 +171,18 @@
bus_addr_t, int);
#ifndef _BUS_DMAMEM_ALLOC_RANGE
+static int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
+ bus_size_t alignment, bus_size_t boundary,
+ bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
+ bus_addr_t low, bus_addr_t high);
+
#define _BUS_DMAMEM_ALLOC_RANGE _bus_dmamem_alloc_range
/*
* Allocate physical memory from the given physical address range.
* Called by DMA-safe memory allocation methods.
*/
-int
+static int
_bus_dmamem_alloc_range(bus_dma_tag_t t, bus_size_t size,
bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs,
int nsegs, int *rsegs, int flags, bus_addr_t low, bus_addr_t high)
@@ -222,7 +258,7 @@
/*
* Create a DMA map.
*/
-int
+static int
_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
@@ -308,7 +344,7 @@
/*
* Destroy a DMA map.
*/
-void
+static void
_bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
{
struct x86_bus_dma_cookie *cookie = map->_dm_cookie;
@@ -328,7 +364,7 @@
/*
* Load a DMA map with a linear buffer.
*/
-int
+static int
_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
bus_size_t buflen, struct proc *p, int flags)
{
@@ -458,7 +494,7 @@
/*
* Like _bus_dmamap_load(), but for mbufs.
*/
-int
+static int
_bus_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m0,
int flags)
{
@@ -597,7 +633,7 @@
/*
* Like _bus_dmamap_load(), but for uios.
*/
-int
+static int
_bus_dmamap_load_uio(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio,
int flags)
{
@@ -678,7 +714,7 @@
* Like _bus_dmamap_load(), but for raw memory allocated with
* bus_dmamem_alloc().
*/
-int
+static int
_bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map,
bus_dma_segment_t *segs, int nsegs,
bus_size_t size, int flags)
@@ -690,7 +726,7 @@
/*
* Unload a DMA map.
*/
-void
+static void
_bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
{
struct x86_bus_dma_cookie *cookie = map->_dm_cookie;
@@ -711,7 +747,7 @@
/*
* Synchronize a DMA map.
*/
-void
+static void
_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
bus_size_t len, int ops)
{
@@ -880,7 +916,7 @@
/*
* Allocate memory safe for DMA.
*/
-int
+static int
_bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
int flags)
@@ -1003,7 +1039,7 @@
* Common function for freeing DMA-safe memory. May be called by
* bus-specific DMA memory free functions.
*/
-void
+static void
_bus_dmamem_free(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs)
{
struct vm_page *m;
@@ -1032,7 +1068,7 @@
* bus-specific DMA memory map functions.
* This supports BUS_DMA_NOCACHE.
*/
-int
+static int
_bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
size_t size, void **kvap, int flags)
{
@@ -1075,7 +1111,7 @@
* bus-specific DMA memory unmapping functions.
*/
-void
+static void
_bus_dmamem_unmap(bus_dma_tag_t t, void *kva, size_t size)
{
pt_entry_t *pte, opte;
@@ -1108,7 +1144,7 @@
* Common function for mmap(2)'ing DMA-safe memory. May be called by
* bus-specific DMA mmap(2)'ing functions.
*/
-paddr_t
+static paddr_t
_bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
off_t off, int prot, int flags)
{
@@ -1191,7 +1227,7 @@
return (0);
}
-int
+static int
_bus_dmatag_subregion(bus_dma_tag_t tag, bus_addr_t min_addr,
bus_addr_t max_addr, bus_dma_tag_t *newtag, int flags)
{
@@ -1223,7 +1259,7 @@
return 0;
}
-void
+static void
_bus_dmatag_destroy(bus_dma_tag_t tag)
{
@@ -1243,123 +1279,358 @@
bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t p, bus_addr_t o, bus_size_t l,
int ops)
{
+ bus_dma_tag_t it;
+
+ if ((t->bdt_exists & BUS_DMAMAP_OVERRIDE_SYNC) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMAP_OVERRIDE_SYNC) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamap_sync)(it->bdt_ctx, t, p, o,
+ l, ops);
+ }
if (ops & BUS_DMASYNC_POSTREAD)
x86_lfence();
- if (t->_dmamap_sync)
- (*t->_dmamap_sync)(t, p, o, l, ops);
+
+ _bus_dmamap_sync(t, p, o, l, ops);
}
int
-bus_dmamap_create(bus_dma_tag_t tag, bus_size_t size, int nsegments,
+bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
bus_size_t maxsegsz, bus_size_t boundary, int flags,
bus_dmamap_t *dmamp)
{
+ bus_dma_tag_t it;
+
+ if ((t->bdt_exists & BUS_DMAMAP_OVERRIDE_CREATE) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMAP_OVERRIDE_CREATE) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamap_create)(it->bdt_ctx, t, size,
+ nsegments, maxsegsz, boundary, flags, dmamp);
+ }
- return (*tag->_dmamap_create)(tag, size, nsegments, maxsegsz,
+ return _bus_dmamap_create(t, size, nsegments, maxsegsz,
boundary, flags, dmamp);
}
void
-bus_dmamap_destroy(bus_dma_tag_t tag, bus_dmamap_t dmam)
+bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t dmam)
{
+ bus_dma_tag_t it;
- (*tag->_dmamap_destroy)(tag, dmam);
+ if ((t->bdt_exists & BUS_DMAMAP_OVERRIDE_DESTROY) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMAP_OVERRIDE_DESTROY) == 0)
+ continue;
+ (*it->bdt_ov->ov_dmamap_destroy)(it->bdt_ctx, t, dmam);
+ return;
+ }
+
+ _bus_dmamap_destroy(t, dmam);
}
int
-bus_dmamap_load(bus_dma_tag_t tag, bus_dmamap_t dmam, void *buf,
+bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t dmam, void *buf,
bus_size_t buflen, struct proc *p, int flags)
{
+ bus_dma_tag_t it;
- return (*tag->_dmamap_load)(tag, dmam, buf, buflen, p, flags);
+ if ((t->bdt_exists & BUS_DMAMAP_OVERRIDE_LOAD) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMAP_OVERRIDE_LOAD) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamap_load)(it->bdt_ctx, t, dmam,
+ buf, buflen, p, flags);
+ }
+
+ return _bus_dmamap_load(t, dmam, buf, buflen, p, flags);
}
int
-bus_dmamap_load_mbuf(bus_dma_tag_t tag, bus_dmamap_t dmam,
+bus_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t dmam,
struct mbuf *chain, int flags)
{
+ bus_dma_tag_t it;
- return (*tag->_dmamap_load_mbuf)(tag, dmam, chain, flags);
+ if ((t->bdt_exists & BUS_DMAMAP_OVERRIDE_LOAD_MBUF) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMAP_OVERRIDE_LOAD_MBUF) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamap_load_mbuf)(it->bdt_ctx, t, dmam,
+ chain, flags);
+ }
+
+ return _bus_dmamap_load_mbuf(t, dmam, chain, flags);
}
int
-bus_dmamap_load_uio(bus_dma_tag_t tag, bus_dmamap_t dmam,
+bus_dmamap_load_uio(bus_dma_tag_t t, bus_dmamap_t dmam,
struct uio *uio, int flags)
{
+ bus_dma_tag_t it;
+
+ if ((t->bdt_exists & BUS_DMAMAP_OVERRIDE_LOAD_UIO) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMAP_OVERRIDE_LOAD_UIO) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamap_load_uio)(it->bdt_ctx, t, dmam,
+ uio, flags);
+ }
- return (*tag->_dmamap_load_uio)(tag, dmam, uio, flags);
+ return _bus_dmamap_load_uio(t, dmam, uio, flags);
}
int
-bus_dmamap_load_raw(bus_dma_tag_t tag, bus_dmamap_t dmam,
+bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t dmam,
bus_dma_segment_t *segs, int nsegs,
bus_size_t size, int flags)
{
+ bus_dma_tag_t it;
- return (*tag->_dmamap_load_raw)(tag, dmam, segs, nsegs,
- size, flags);
+ if ((t->bdt_exists & BUS_DMAMAP_OVERRIDE_LOAD_RAW) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMAP_OVERRIDE_LOAD_RAW) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamap_load_raw)(it->bdt_ctx, t, dmam,
+ segs, nsegs, size, flags);
+ }
+
+ return _bus_dmamap_load_raw(t, dmam, segs, nsegs, size, flags);
}
void
-bus_dmamap_unload(bus_dma_tag_t tag, bus_dmamap_t dmam)
+bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t dmam)
{
+ bus_dma_tag_t it;
- (*tag->_dmamap_unload)(tag, dmam);
+ if ((t->bdt_exists & BUS_DMAMAP_OVERRIDE_UNLOAD) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMAP_OVERRIDE_UNLOAD) == 0)
+ continue;
+ (*it->bdt_ov->ov_dmamap_unload)(it->bdt_ctx, t, dmam);
+ return;
+ }
+
+ _bus_dmamap_unload(t, dmam);
}
int
-bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment,
+bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
bus_size_t boundary, bus_dma_segment_t *segs, int nsegs,
int *rsegs, int flags)
{
+ bus_dma_tag_t it;
- return (*tag->_dmamem_alloc)(tag, size, alignment, boundary, segs,
+ if ((t->bdt_exists & BUS_DMAMEM_OVERRIDE_ALLOC) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMEM_OVERRIDE_ALLOC) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamem_alloc)(it->bdt_ctx, t, size,
+ alignment, boundary, segs, nsegs, rsegs, flags);
+ }
+
+ return _bus_dmamem_alloc(t, size, alignment, boundary, segs,
nsegs, rsegs, flags);
}
void
-bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs, int nsegs)
+bus_dmamem_free(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs)
{
+ bus_dma_tag_t it;
+
+ if ((t->bdt_exists & BUS_DMAMEM_OVERRIDE_FREE) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMEM_OVERRIDE_FREE) == 0)
+ continue;
+ (*it->bdt_ov->ov_dmamem_free)(it->bdt_ctx, t, segs, nsegs);
+ return;
+ }
- (*tag->_dmamem_free)(tag, segs, nsegs);
+ _bus_dmamem_free(t, segs, nsegs);
}
int
-bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, int nsegs,
+bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
size_t size, void **kvap, int flags)
{
+ bus_dma_tag_t it;
+
+ if ((t->bdt_exists & BUS_DMAMEM_OVERRIDE_MAP) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMEM_OVERRIDE_MAP) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamem_map)(it->bdt_ctx, t,
+ segs, nsegs, size, kvap, flags);
+ }
- return (*tag->_dmamem_map)(tag, segs, nsegs, size, kvap, flags);
+ return _bus_dmamem_map(t, segs, nsegs, size, kvap, flags);
}
void
-bus_dmamem_unmap(bus_dma_tag_t tag, void *kva, size_t size)
+bus_dmamem_unmap(bus_dma_tag_t t, void *kva, size_t size)
{
+ bus_dma_tag_t it;
+
+ if ((t->bdt_exists & BUS_DMAMEM_OVERRIDE_UNMAP) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMEM_OVERRIDE_UNMAP) == 0)
+ continue;
+ (*it->bdt_ov->ov_dmamem_unmap)(it->bdt_ctx, t, kva, size);
+ return;
+ }
- (*tag->_dmamem_unmap)(tag, kva, size);
+ _bus_dmamem_unmap(t, kva, size);
}
paddr_t
-bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs, int nsegs,
+bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
off_t off, int prot, int flags)
{
+ bus_dma_tag_t it;
+
+ if ((t->bdt_exists & BUS_DMAMEM_OVERRIDE_MMAP) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMAMEM_OVERRIDE_MMAP) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmamem_mmap)(it->bdt_ctx, t, segs,
+ nsegs, off, prot, flags);
+ }
- return (*tag->_dmamem_mmap)(tag, segs, nsegs, off, prot, flags);
+ return _bus_dmamem_mmap(t, segs, nsegs, off, prot, flags);
}
int
-bus_dmatag_subregion(bus_dma_tag_t tag, bus_addr_t min_addr,
+bus_dmatag_subregion(bus_dma_tag_t t, bus_addr_t min_addr,
bus_addr_t max_addr, bus_dma_tag_t *newtag, int flags)
{
+ bus_dma_tag_t it;
+
+ if ((t->bdt_exists & BUS_DMATAG_OVERRIDE_SUBREGION) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMATAG_OVERRIDE_SUBREGION) == 0)
+ continue;
+ return (*it->bdt_ov->ov_dmatag_subregion)(it->bdt_ctx, t,
+ min_addr, max_addr, newtag, flags);
+ }
+
+ return _bus_dmatag_subregion(t, min_addr, max_addr, newtag, flags);
+}
+
+void
+bus_dmatag_destroy(bus_dma_tag_t t)
+{
+ bus_dma_tag_t it;
- return (*tag->_dmatag_subregion)(tag, min_addr, max_addr, newtag,
- flags);
+ if ((t->bdt_exists & BUS_DMATAG_OVERRIDE_DESTROY) == 0)
+ ; /* skip override */
+ else for (it = t; it != NULL; it = it->bdt_super) {
+ if ((it->bdt_present & BUS_DMATAG_OVERRIDE_DESTROY) == 0)
+ continue;
+ (*it->bdt_ov->ov_dmatag_destroy)(it->bdt_ctx, t);
+ return;
+ }
+
+ _bus_dmatag_destroy(t);
+}
+
+static const void *
+bit_to_function_pointer(const struct bus_dma_overrides *ov, uint64_t bit)
+{
+ switch (bit) {
+ case BUS_DMAMAP_OVERRIDE_CREATE:
+ return ov->ov_dmamap_create;
+ case BUS_DMAMAP_OVERRIDE_DESTROY:
+ return ov->ov_dmamap_destroy;
+ case BUS_DMAMAP_OVERRIDE_LOAD:
+ return ov->ov_dmamap_load;
+ case BUS_DMAMAP_OVERRIDE_LOAD_MBUF:
+ return ov->ov_dmamap_load_mbuf;
+ case BUS_DMAMAP_OVERRIDE_LOAD_UIO:
+ return ov->ov_dmamap_load_uio;
+ case BUS_DMAMAP_OVERRIDE_LOAD_RAW:
+ return ov->ov_dmamap_load_raw;
+ case BUS_DMAMAP_OVERRIDE_UNLOAD:
+ return ov->ov_dmamap_unload;
+ case BUS_DMAMAP_OVERRIDE_SYNC:
+ return ov->ov_dmamap_sync;
+ case BUS_DMAMEM_OVERRIDE_ALLOC:
+ return ov->ov_dmamem_alloc;
+ case BUS_DMAMEM_OVERRIDE_FREE:
+ return ov->ov_dmamem_free;
+ case BUS_DMAMEM_OVERRIDE_MAP:
+ return ov->ov_dmamem_map;
+ case BUS_DMAMEM_OVERRIDE_UNMAP:
+ return ov->ov_dmamem_unmap;
+ case BUS_DMAMEM_OVERRIDE_MMAP:
+ return ov->ov_dmamem_mmap;
+ case BUS_DMATAG_OVERRIDE_SUBREGION:
+ return ov->ov_dmatag_subregion;
+ case BUS_DMATAG_OVERRIDE_DESTROY:
+ return ov->ov_dmatag_destroy;
+ default:
+ return NULL;
+ }
}
void
-bus_dmatag_destroy(bus_dma_tag_t tag)
+bus_dma_tag_destroy(bus_dma_tag_t bst)
+{
+ kmem_free(bst, sizeof(struct x86_bus_dma_tag));
+}
+
+int
+bus_dma_tag_create(bus_dma_tag_t obdt, const uint64_t present,
+ const struct bus_dma_overrides *ov, void *ctx, bus_dma_tag_t *bdtp)
{
+ uint64_t bit, bits, nbits;
+ bus_dma_tag_t bdt;
+ const void *fp;
- (*tag->_dmatag_destroy)(tag);
+ if (ov == NULL || present == 0)
+ return EINVAL;
+
+ bdt = kmem_alloc(sizeof(struct x86_bus_dma_tag), KM_SLEEP);
+
+ if (bdt == NULL)
+ return ENOMEM;
+
+ bdt->bdt_super = obdt;
+
+ for (bits = present; bits != 0; bits = nbits) {
+ nbits = bits & (bits - 1);
+ bit = nbits ^ bits;
+ if ((fp = bit_to_function_pointer(ov, bit)) == NULL) {
+#ifdef DEBUG
+ printf("%s: missing bit %" PRIx64 "\n", __func__, bit);
+#endif
+ goto einval;
+ }
+ }
+
+ bdt->bdt_ov = ov;
+ bdt->bdt_exists = obdt->bdt_exists | present;
+ bdt->bdt_present = present;
+ bdt->bdt_ctx = ctx;
+
+ *bdtp = bdt;
+
+ return 0;
+einval:
+ kmem_free(bdt, sizeof(struct x86_bus_dma_tag));
+ return EINVAL;
}
Index: src/sys/arch/xen/xen/isa_machdep.c
diff -u src/sys/arch/xen/xen/isa_machdep.c:1.25 src/sys/arch/xen/xen/isa_machdep.c:1.26
--- src/sys/arch/xen/xen/isa_machdep.c:1.25 Sat Aug 27 05:32:12 2011
+++ src/sys/arch/xen/xen/isa_machdep.c Thu Sep 1 11:10:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.25 2011/08/27 09:32:12 christos Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.26 2011/09/01 15:10:31 christos Exp $ */
/* NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.25 2011/08/27 09:32:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.26 2011/09/01 15:10:31 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,24 +102,6 @@
._bounce_alloc_lo = 0,
._bounce_alloc_hi = ISA_DMA_BOUNCE_THRESHOLD,
._may_bounce = _isa_dma_may_bounce,
-
- ._dmamap_create = _bus_dmamap_create,
- ._dmamap_destroy = _bus_dmamap_destroy,
- ._dmamap_load = _bus_dmamap_load,
- ._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
- ._dmamap_load_uio = _bus_dmamap_load_uio,
- ._dmamap_load_raw = _bus_dmamap_load_raw,
- ._dmamap_unload = _bus_dmamap_unload,
- ._dmamap_sync = _bus_dmamap_sync,
-
- ._dmamem_alloc = _bus_dmamem_alloc,
- ._dmamem_free = _bus_dmamem_free,
- ._dmamem_map = _bus_dmamem_map,
- ._dmamem_unmap = _bus_dmamem_unmap,
- ._dmamem_mmap = _bus_dmamem_mmap,
-
- ._dmatag_subregion = _bus_dmatag_subregion,
- ._dmatag_destroy = _bus_dmatag_destroy,
};
#define IDTVEC(name) __CONCAT(X,name)
Index: src/sys/arch/xen/xen/xpci_xenbus.c
diff -u src/sys/arch/xen/xen/xpci_xenbus.c:1.7 src/sys/arch/xen/xen/xpci_xenbus.c:1.8
--- src/sys/arch/xen/xen/xpci_xenbus.c:1.7 Sat Aug 27 05:32:12 2011
+++ src/sys/arch/xen/xen/xpci_xenbus.c Thu Sep 1 11:10:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xpci_xenbus.c,v 1.7 2011/08/27 09:32:12 christos Exp $ */
+/* $NetBSD: xpci_xenbus.c,v 1.8 2011/09/01 15:10:31 christos Exp $ */
/*
* Copyright (c) 2009 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.7 2011/08/27 09:32:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.8 2011/09/01 15:10:31 christos Exp $");
#include "opt_xen.h"
#include "rnd.h"
@@ -102,24 +102,6 @@
._bounce_alloc_hi = 0,
#endif
._may_bounce = NULL,
-
- ._dmamap_create = _bus_dmamap_create,
- ._dmamap_destroy = _bus_dmamap_destroy,
- ._dmamap_load = _bus_dmamap_load,
- ._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
- ._dmamap_load_uio = _bus_dmamap_load_uio,
- ._dmamap_load_raw = _bus_dmamap_load_raw,
- ._dmamap_unload = _bus_dmamap_unload,
- ._dmamap_sync = _bus_dmamap_sync,
-
- ._dmamem_alloc = _bus_dmamem_alloc,
- ._dmamem_free = _bus_dmamem_free,
- ._dmamem_map = _bus_dmamem_map,
- ._dmamem_unmap = _bus_dmamem_unmap,
- ._dmamem_mmap = _bus_dmamem_mmap,
-
- ._dmatag_subregion = _bus_dmatag_subregion,
- ._dmatag_destroy = _bus_dmatag_destroy,
};
#ifdef _LP64
@@ -129,24 +111,6 @@
._bounce_alloc_lo = 0,
._bounce_alloc_hi = 0,
._may_bounce = NULL,
-
- ._dmamap_create = _bus_dmamap_create,
- ._dmamap_destroy = _bus_dmamap_destroy,
- ._dmamap_load = _bus_dmamap_load,
- ._dmamap_load_mbuf = _bus_dmamap_load_mbuf,
- ._dmamap_load_uio = _bus_dmamap_load_uio,
- ._dmamap_load_raw = _bus_dmamap_load_raw,
- ._dmamap_unload = _bus_dmamap_unload,
- ._dmamap_sync = NULL,
-
- ._dmamem_alloc = _bus_dmamem_alloc,
- ._dmamem_free = _bus_dmamem_free,
- ._dmamem_map = _bus_dmamem_map,
- ._dmamem_unmap = _bus_dmamem_unmap,
- ._dmamem_mmap = _bus_dmamem_mmap,
-
- ._dmatag_subregion = _bus_dmatag_subregion,
- ._dmatag_destroy = _bus_dmatag_destroy,
};
#endif
Index: src/sys/sys/bus.h
diff -u src/sys/sys/bus.h:1.9 src/sys/sys/bus.h:1.10
--- src/sys/sys/bus.h:1.9 Wed Aug 31 16:04:51 2011
+++ src/sys/sys/bus.h Thu Sep 1 11:10:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.9 2011/08/31 20:04:51 dyoung Exp $ */
+/* $NetBSD: bus.h,v 1.10 2011/09/01 15:10:32 christos Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -88,6 +88,13 @@
, BUS_DMAMAP_OVERRIDE_LOAD_RAW = __BIT(5)
, BUS_DMAMAP_OVERRIDE_UNLOAD = __BIT(6)
, BUS_DMAMAP_OVERRIDE_SYNC = __BIT(7)
+ , BUS_DMAMEM_OVERRIDE_ALLOC = __BIT(8)
+ , BUS_DMAMEM_OVERRIDE_FREE = __BIT(9)
+ , BUS_DMAMEM_OVERRIDE_MAP = __BIT(10)
+ , BUS_DMAMEM_OVERRIDE_UNMAP = __BIT(11)
+ , BUS_DMAMEM_OVERRIDE_MMAP = __BIT(12)
+ , BUS_DMATAG_OVERRIDE_SUBREGION = __BIT(13)
+ , BUS_DMATAG_OVERRIDE_DESTROY = __BIT(14)
};
/* Only add new members at the end of this struct! */
@@ -139,7 +146,7 @@
bus_size_t, bus_size_t, int, bus_dmamap_t *);
void (*ov_dmamap_destroy)(void *, bus_dma_tag_t, bus_dmamap_t);
int (*ov_dmamap_load)(void *, bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct lwp *, int);
+ bus_size_t, struct proc *, int);
int (*ov_dmamap_load_mbuf)(void *, bus_dma_tag_t, bus_dmamap_t,
struct mbuf *, int);
int (*ov_dmamap_load_uio)(void *, bus_dma_tag_t, bus_dmamap_t,
@@ -149,6 +156,17 @@
void (*ov_dmamap_unload)(void *, bus_dma_tag_t, bus_dmamap_t);
void (*ov_dmamap_sync)(void *, bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
bus_size_t, int);
+ int (*ov_dmamem_alloc)(void *, bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+ void (*ov_dmamem_free)(void *, bus_dma_tag_t, bus_dma_segment_t *, int);
+ int (*ov_dmamem_map)(void *, bus_dma_tag_t, bus_dma_segment_t *, int,
+ size_t, void **, int);
+ void (*ov_dmamem_unmap)(void *, bus_dma_tag_t, void *, size_t);
+ paddr_t (*ov_dmamem_mmap)(void *, bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
+ int (*ov_dmatag_subregion)(void *, bus_dma_tag_t, bus_addr_t,
+ bus_addr_t, bus_dma_tag_t *, int);
+ void (*ov_dmatag_destroy)(void *, bus_dma_tag_t);
};
int bus_space_tag_create(bus_space_tag_t, uint64_t, uint64_t,
