Hi,
ok, the previous version of this was crap, i must admit having gone
through what i sent, since i got no comments for it.
i'll retry w/version i think should be simple enough, with almost
no cleanup done, so rather minimal, for the simple review needed,
for the comment that's enough for me to drop this diff; "No.",
and if it's not too much to ask, some reasoning why this would
not be wanted or appropriate.
this one does work w/BUS_SPACE_NEW, and without. cubieboard2
exercises the a4x bs hack, + this kind of includes the dsb sy
a4x fixes i sent separately, which might help out w/fifo probes
or whatever, i haven't looked at current com.c, but i recall
something related from experiments i did years ago, maybe.
some compile stats:
________before first diff(-current GENERIC):
________________________________CA7/cubieboard2:
cc -g -Werror -Wall -Wimplicit-function-declaration -Wno-uninitialized
-Wno-pointer-sign -Wframe-larger-than=2047 -msoft-float -march=armv6
-Wa,-march=armv7a -ffreestanding -fno-pie -O2 -pipe -nostdinc -I/usr/src/sys
-I. -I/usr/src/sys/arch -DDDB -DDIAGNOSTIC -DKTRACE -DACCOUNTING -DKMEMSTATS
-DPTRACE -DPOOL_DEBUG -DCRYPTO -DSYSVMSG -DSYSVSEM -DSYSVSHM -DUVM_SWAP_ENCRYPT
-DFFS -DFFS2 -DFFS_SOFTUPDATES -DUFS_DIRHASH -DQUOTA -DEXT2FS -DMFS -DNFSCLIENT
-DNFSSERVER -DCD9660 -DUDF -DMSDOSFS -DFIFO -DFUSE -DSOCKET_SPLICE -DTCP_SACK
-DTCP_ECN -DTCP_SIGNATURE -DART -DINET6 -DIPSEC -DPPP_BSDCOMP -DPPP_DEFLATE
-DPIPEX -DMROUTING -DMPLS -DBOOT_CONFIG -DCPU_ARMv7 -DWSDISPLAY_COMPAT_RAWKBD
-DWSDISPLAY_DEFAULTSCREENS="1" -DCONF_HAVE_GPIO -DUSBVERBOSE -DONEWIREVERBOSE
-DMAXUSERS=32 -D_KERNEL -D__armv7__ -MD -MP -c vers.c
ld -T ld.script --warn-common -nopie -o bsd ${SYSTEM_HEAD} vers.o ${OBJS}
text data bss dec hex
3880128 164656 495352 4540136 4546e8
________________________________CA9/wandboard:
cc -g -Werror -Wall -Wimplicit-function-declaration -Wno-uninitialized
-Wno-pointer-sign -Wframe-larger-than=2047 -msoft-float -march=armv6
-Wa,-march=armv7a -ffreestanding -fno-pie -O2 -pipe -nostdinc -I/usr/src/sys
-I. -I/usr/src/sys/arch -DDDB -DDIAGNOSTIC -DKTRACE -DACCOUNTING -DKMEMSTATS
-DPTRACE -DPOOL_DEBUG -DCRYPTO -DSYSVMSG -DSYSVSEM -DSYSVSHM -DUVM_SWAP_ENCRYPT
-DFFS -DFFS2 -DFFS_SOFTUPDATES -DUFS_DIRHASH -DQUOTA -DEXT2FS -DMFS -DNFSCLIENT
-DNFSSERVER -DCD9660 -DUDF -DMSDOSFS -DFIFO -DFUSE -DSOCKET_SPLICE -DTCP_SACK
-DTCP_ECN -DTCP_SIGNATURE -DART -DINET6 -DIPSEC -DPPP_BSDCOMP -DPPP_DEFLATE
-DPIPEX -DMROUTING -DMPLS -DBOOT_CONFIG -DCPU_ARMv7 -DWSDISPLAY_COMPAT_RAWKBD
-DWSDISPLAY_DEFAULTSCREENS="1" -DCONF_HAVE_GPIO -DUSBVERBOSE -DONEWIREVERBOSE
-DMAXUSERS=32 -D_KERNEL -D__armv7__ -MD -MP -c vers.c
ld -T ld.script --warn-common -nopie -o bsd ${SYSTEM_HEAD} vers.o ${OBJS}
text data bss dec hex
3884076 164724 494160 4542960 4551f0
________before last diff(#option BUS_SPACE_NEW #=disabled):
________________________________CA7/cubieboard2:
cc -g -Werror -Wall -Wimplicit-function-declaration -Wno-uninitialized
-Wno-pointer-sign -Wframe-larger-than=2047 -msoft-float -march=armv6
-Wa,-march=armv7a -ffreestanding -fno-pie -O2 -pipe -nostdinc -I/usr/src/sys
-I. -I/usr/src/sys/arch -DDDB -DDIAGNOSTIC -DKTRACE -DACCOUNTING -DKMEMSTATS
-DPTRACE -DPOOL_DEBUG -DCRYPTO -DSYSVMSG -DSYSVSEM -DSYSVSHM -DUVM_SWAP_ENCRYPT
-DFFS -DFFS2 -DFFS_SOFTUPDATES -DUFS_DIRHASH -DQUOTA -DEXT2FS -DMFS -DNFSCLIENT
-DNFSSERVER -DCD9660 -DUDF -DMSDOSFS -DFIFO -DFUSE -DSOCKET_SPLICE -DTCP_SACK
-DTCP_ECN -DTCP_SIGNATURE -DART -DINET6 -DIPSEC -DPPP_BSDCOMP -DPPP_DEFLATE
-DPIPEX -DMROUTING -DMPLS -DBOOT_CONFIG -DCPU_ARMv7 -DWSDISPLAY_COMPAT_RAWKBD
-DWSDISPLAY_DEFAULTSCREENS="1" -DCONF_HAVE_GPIO -DUSBVERBOSE -DONEWIREVERBOSE
-DMAXUSERS=32 -D_KERNEL -D__armv7__ -MD -MP -c vers.c
ld -T ld.script --warn-common -nopie -o bsd ${SYSTEM_HEAD} vers.o ${OBJS}
text data bss dec hex
3880656 162676 497688 4541020 454a5c
________________________________CA9/wandboard:
cc -g -Werror -Wall -Wimplicit-function-declaration -Wno-uninitialized
-Wno-pointer-sign -Wframe-larger-than=2047 -msoft-float -march=armv6
-Wa,-march=armv7a -ffreestanding -fno-pie -O2 -pipe -nostdinc -I/usr/src/sys
-I. -I/usr/src/sys/arch -DDDB -DDIAGNOSTIC -DKTRACE -DACCOUNTING -DKMEMSTATS
-DPTRACE -DPOOL_DEBUG -DCRYPTO -DSYSVMSG -DSYSVSEM -DSYSVSHM -DUVM_SWAP_ENCRYPT
-DFFS -DFFS2 -DFFS_SOFTUPDATES -DUFS_DIRHASH -DQUOTA -DEXT2FS -DMFS -DNFSCLIENT
-DNFSSERVER -DCD9660 -DUDF -DMSDOSFS -DFIFO -DFUSE -DSOCKET_SPLICE -DTCP_SACK
-DTCP_ECN -DTCP_SIGNATURE -DART -DINET6 -DIPSEC -DPPP_BSDCOMP -DPPP_DEFLATE
-DPIPEX -DMROUTING -DMPLS -DBOOT_CONFIG -DCPU_ARMv7 -DWSDISPLAY_COMPAT_RAWKBD
-DWSDISPLAY_DEFAULTSCREENS="1" -DCONF_HAVE_GPIO -DUSBVERBOSE -DONEWIREVERBOSE
-DMAXUSERS=32 -D_KERNEL -D__armv7__ -MD -MP -c vers.c
ld -T ld.script --warn-common -nopie -o bsd ${SYSTEM_HEAD} vers.o ${OBJS}
text data bss dec hex
3880172 163552 494448 4538172 453f3c
________after last diff(option BUS_SPACE_NEW #=enabled):
________________________________CA7/cubieboard2:
cc -g -Werror -Wall -Wimplicit-function-declaration -Wno-uninitialized
-Wno-pointer-sign -Wframe-larger-than=2047 -msoft-float -march=armv6
-Wa,-march=armv7a -ffreestanding -fno-pie -O2 -pipe -nostdinc -I/usr/src/sys
-I. -I/usr/src/sys/arch -DDDB -DDIAGNOSTIC -DKTRACE -DACCOUNTING -DKMEMSTATS
-DPTRACE -DPOOL_DEBUG -DCRYPTO -DSYSVMSG -DSYSVSEM -DSYSVSHM -DUVM_SWAP_ENCRYPT
-DFFS -DFFS2 -DFFS_SOFTUPDATES -DUFS_DIRHASH -DQUOTA -DEXT2FS -DMFS -DNFSCLIENT
-DNFSSERVER -DCD9660 -DUDF -DMSDOSFS -DFIFO -DFUSE -DSOCKET_SPLICE -DTCP_SACK
-DTCP_ECN -DTCP_SIGNATURE -DART -DINET6 -DIPSEC -DPPP_BSDCOMP -DPPP_DEFLATE
-DPIPEX -DMROUTING -DMPLS -DBOOT_CONFIG -DCPU_ARMv7 -DBUS_SPACE_NEW
-DWSDISPLAY_COMPAT_RAWKBD -DWSDISPLAY_DEFAULTSCREENS="1" -DCONF_HAVE_GPIO
-DUSBVERBOSE -DONEWIREVERBOSE -DMAXUSERS=32 -D_KERNEL -D__armv7__ -MD -MP -c
vers.c
ld -T ld.script --warn-common -nopie -o bsd ${SYSTEM_HEAD} vers.o ${OBJS}
text data bss dec hex
3843676 164732 495528 4503936 44b980
________________________________CA9/wandboard:
cc -g -Werror -Wall -Wimplicit-function-declaration -Wno-uninitialized
-Wno-pointer-sign -Wframe-larger-than=2047 -msoft-float -march=armv6
-Wa,-march=armv7a -ffreestanding -fno-pie -O2 -pipe -nostdinc -I/usr/src/sys
-I. -I/usr/src/sys/arch -DDDB -DDIAGNOSTIC -DKTRACE -DACCOUNTING -DKMEMSTATS
-DPTRACE -DPOOL_DEBUG -DCRYPTO -DSYSVMSG -DSYSVSEM -DSYSVSHM -DUVM_SWAP_ENCRYPT
-DFFS -DFFS2 -DFFS_SOFTUPDATES -DUFS_DIRHASH -DQUOTA -DEXT2FS -DMFS -DNFSCLIENT
-DNFSSERVER -DCD9660 -DUDF -DMSDOSFS -DFIFO -DFUSE -DSOCKET_SPLICE -DTCP_SACK
-DTCP_ECN -DTCP_SIGNATURE -DART -DINET6 -DIPSEC -DPPP_BSDCOMP -DPPP_DEFLATE
-DPIPEX -DMROUTING -DMPLS -DBOOT_CONFIG -DCPU_ARMv7 -DBUS_SPACE_NEW
-DWSDISPLAY_COMPAT_RAWKBD -DWSDISPLAY_DEFAULTSCREENS="1" -DCONF_HAVE_GPIO
-DUSBVERBOSE -DONEWIREVERBOSE -DMAXUSERS=32 -D_KERNEL -D__armv7__ -MD -MP -c
vers.c
ld -T ld.script --warn-common -nopie -o bsd ${SYSTEM_HEAD} vers.o ${OBJS}
text data bss dec hex
3845564 164188 497360 4507112 44c5e8
to my surprise, the sizes didn't get bigger w/inlined bs:)
first diff out of 5 below, rest will come separately, sorry for the noise.
-Artturi
separate bus_dma defines out of arm/bus.h into arm/bus_dma.h, and
include it in from arm/bus.h, no functional change should yet
occur with this diff.
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index bb540d8acac..b2c75cfdf76 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -599,236 +599,8 @@ bs_c_2_proto(f); \
bs_c_4_proto(f); \
bs_c_8_proto(f);
-/* Bus Space DMA macros */
+#include <arm/bus_dma.h>
-/*
- * Flags used in various bus DMA methods.
- */
-#define BUS_DMA_WAITOK 0x0000 /* safe to sleep (pseudo-flag)
*/
-#define BUS_DMA_NOWAIT 0x0001 /* not safe to sleep */
-#define BUS_DMA_ALLOCNOW 0x0002 /* perform resource allocation
now */
-#define BUS_DMA_COHERENT 0x0004 /* hint: map memory DMA
coherent */
-#define BUS_DMA_STREAMING 0x0008 /* hint: sequential,
unidirectional */
-#define BUS_DMA_BUS1 0x0010 /* placeholders for bus
functions... */
-#define BUS_DMA_BUS2 0x0020
-#define BUS_DMA_BUS3 0x0040
-#define BUS_DMA_BUS4 0x0080
-#define BUS_DMA_READ 0x0100 /* mapping is device -> memory
only */
-#define BUS_DMA_WRITE 0x0200 /* mapping is memory -> device
only */
-#define BUS_DMA_NOCACHE 0x0400 /* hint: map non-cached memory
*/
-#define BUS_DMA_ZERO 0x0800 /* dmamem_alloc returns zeroed
mem */
-#define BUS_DMA_64BIT 0x1000 /* device handles 64bit dva */
-
-/*
- * Private flags stored in the DMA map.
- */
-#define ARM32_DMAMAP_COHERENT 0x10000 /* no cache flush necessary on
sync */
-
-/* Forwards needed by prototypes below. */
-struct mbuf;
-struct uio;
-
-/*
- * Operations performed by bus_dmamap_sync().
- */
-#define BUS_DMASYNC_PREREAD 0x01 /* pre-read synchronization */
-#define BUS_DMASYNC_POSTREAD 0x02 /* post-read synchronization */
-#define BUS_DMASYNC_PREWRITE 0x04 /* pre-write synchronization */
-#define BUS_DMASYNC_POSTWRITE 0x08 /* post-write synchronization */
-
-typedef struct arm32_bus_dma_tag *bus_dma_tag_t;
-typedef struct arm32_bus_dmamap *bus_dmamap_t;
-
-#define BUS_DMA_TAG_VALID(t) ((t) != (bus_dma_tag_t)0)
-
-/*
- * bus_dma_segment_t
- *
- * Describes a single contiguous DMA transaction. Values
- * are suitable for programming into DMA registers.
- */
-struct arm32_bus_dma_segment {
- /*
- * PUBLIC MEMBERS: these are used by machine-independent code.
- */
- bus_addr_t ds_addr; /* DMA address */
- bus_size_t ds_len; /* length of transfer */
- /*
- * PRIVATE MEMBERS: not for use by machine-independent code.
- */
- bus_addr_t _ds_vaddr; /* Virtual mapped address
- * Used by bus_dmamem_sync() */
- int _ds_coherent; /* Coherently mapped */
-};
-typedef struct arm32_bus_dma_segment bus_dma_segment_t;
-
-/*
- * arm32_dma_range
- *
- * This structure describes a valid DMA range.
- */
-struct arm32_dma_range {
- bus_addr_t dr_sysbase; /* system base address */
- bus_addr_t dr_busbase; /* appears here on bus */
- bus_size_t dr_len; /* length of range */
-};
-
-/*
- * bus_dma_tag_t
- *
- * A machine-dependent opaque type describing the implementation of
- * DMA for a given bus.
- */
-
-struct arm32_bus_dma_tag {
- /*
- * DMA range for this tag. If the page doesn't fall within
- * one of these ranges, an error is returned. The caller
- * may then decide what to do with the transfer. If the
- * range pointer is NULL, it is ignored.
- */
- struct arm32_dma_range *_ranges;
- int _nranges;
-
- /*
- * Opaque cookie for use by back-end.
- */
- void *_cookie;
-
- /*
- * 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, caddr_t *, int);
- void (*_dmamem_unmap) (bus_dma_tag_t, caddr_t, size_t);
- paddr_t (*_dmamem_mmap) (bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int);
-};
-
-#define bus_dmamap_create(t, s, n, m, b, f, p) \
- (*(t)->_dmamap_create)((t), (s), (n), (m), (b), (f), (p))
-#define bus_dmamap_destroy(t, p) \
- (*(t)->_dmamap_destroy)((t), (p))
-#define bus_dmamap_load(t, m, b, s, p, f) \
- (*(t)->_dmamap_load)((t), (m), (b), (s), (p), (f))
-#define bus_dmamap_load_mbuf(t, m, b, f) \
- (*(t)->_dmamap_load_mbuf)((t), (m), (b), (f))
-#define bus_dmamap_load_uio(t, m, u, f) \
- (*(t)->_dmamap_load_uio)((t), (m), (u), (f))
-#define bus_dmamap_load_raw(t, m, sg, n, s, f) \
- (*(t)->_dmamap_load_raw)((t), (m), (sg), (n), (s), (f))
-#define bus_dmamap_unload(t, p) \
- (*(t)->_dmamap_unload)((t), (p))
-#define bus_dmamap_sync(t, p, o, l, ops) \
- (void)((t)->_dmamap_sync ? \
- (*(t)->_dmamap_sync)((t), (p), (o), (l), (ops)) : (void)0)
-
-#define bus_dmamem_alloc(t, s, a, b, sg, n, r, f) \
- (*(t)->_dmamem_alloc)((t), (s), (a), (b), (sg), (n), (r), (f))
-#define bus_dmamem_free(t, sg, n) \
- (*(t)->_dmamem_free)((t), (sg), (n))
-#define bus_dmamem_map(t, sg, n, s, k, f) \
- (*(t)->_dmamem_map)((t), (sg), (n), (s), (k), (f))
-#define bus_dmamem_unmap(t, k, s) \
- (*(t)->_dmamem_unmap)((t), (k), (s))
-#define bus_dmamem_mmap(t, sg, n, o, p, f) \
- (*(t)->_dmamem_mmap)((t), (sg), (n), (o), (p), (f))
-
-/*
- * bus_dmamap_t
- *
- * Describes a DMA mapping.
- */
-struct arm32_bus_dmamap {
- /*
- * PRIVATE MEMBERS: not for use by machine-independent code.
- */
- bus_size_t _dm_size; /* largest DMA transfer mappable */
- int _dm_segcnt; /* number of segs this map can map */
- bus_size_t _dm_maxsegsz; /* largest possible segment */
- bus_size_t _dm_boundary; /* don't cross this */
- int _dm_flags; /* misc. flags */
-
- void *_dm_origbuf; /* pointer to original buffer */
- int _dm_buftype; /* type of buffer */
- struct proc *_dm_proc; /* proc that owns the mapping */
-
- void *_dm_cookie; /* cookie for bus-specific functions */
-
- /*
- * PUBLIC MEMBERS: these are used by machine-independent code.
- */
- bus_size_t dm_mapsize; /* size of the mapping */
- int dm_nsegs; /* # valid segments in mapping */
- bus_dma_segment_t dm_segs[1]; /* segments; variable length */
-};
-
-#ifdef _ARM32_BUS_DMA_PRIVATE
-
-/* _dm_buftype */
-#define ARM32_BUFTYPE_INVALID 0
-#define ARM32_BUFTYPE_LINEAR 1
-#define ARM32_BUFTYPE_MBUF 2
-#define ARM32_BUFTYPE_UIO 3
-#define ARM32_BUFTYPE_RAW 4
-
-int arm32_dma_range_intersect(struct arm32_dma_range *, int,
- paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep);
-
-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, caddr_t *kvap, int flags);
-void _bus_dmamem_unmap (bus_dma_tag_t tag, caddr_t 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_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,
- vaddr_t low, vaddr_t high);
-#endif /* _ARM32_BUS_DMA_PRIVATE */
/* These are OpenBSD extensions to the general NetBSD bus interface. */
void
bus_space_read_raw_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
diff --git a/sys/arch/arm/include/bus_dma.h b/sys/arch/arm/include/bus_dma.h
new file mode 100644
index 00000000000..29e649f508f
--- /dev/null
+++ b/sys/arch/arm/include/bus_dma.h
@@ -0,0 +1,299 @@
+/* $OpenBSD: bus.h,v 1.17 2017/05/08 00:27:45 dlg Exp $ */
+/* $NetBSD: bus.h,v 1.12 2003/10/23 15:03:24 scw Exp $ */
+
+/*-
+ * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1996 Charles M. Hannum. All rights reserved.
+ * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_BUS_DMA_H_
+#define _ARM_BUS_DMA_H_
+
+/* Bus Space DMA macros */
+
+/*
+ * Flags used in various bus DMA methods.
+ */
+#define BUS_DMA_WAITOK 0x0000 /* safe to sleep (pseudo-flag)
*/
+#define BUS_DMA_NOWAIT 0x0001 /* not safe to sleep */
+#define BUS_DMA_ALLOCNOW 0x0002 /* perform resource allocation
now */
+#define BUS_DMA_COHERENT 0x0004 /* hint: map memory DMA
coherent */
+#define BUS_DMA_STREAMING 0x0008 /* hint: sequential,
unidirectional */
+#define BUS_DMA_BUS1 0x0010 /* placeholders for bus
functions... */
+#define BUS_DMA_BUS2 0x0020
+#define BUS_DMA_BUS3 0x0040
+#define BUS_DMA_BUS4 0x0080
+#define BUS_DMA_READ 0x0100 /* mapping is device -> memory
only */
+#define BUS_DMA_WRITE 0x0200 /* mapping is memory -> device
only */
+#define BUS_DMA_NOCACHE 0x0400 /* hint: map non-cached memory
*/
+#define BUS_DMA_ZERO 0x0800 /* dmamem_alloc returns zeroed
mem */
+#define BUS_DMA_64BIT 0x1000 /* device handles 64bit dva */
+
+/*
+ * Private flags stored in the DMA map.
+ */
+#define ARM32_DMAMAP_COHERENT 0x10000 /* no cache flush necessary on
sync */
+
+/* Forwards needed by prototypes below. */
+struct mbuf;
+struct uio;
+
+/*
+ * Operations performed by bus_dmamap_sync().
+ */
+#define BUS_DMASYNC_PREREAD 0x01 /* pre-read synchronization */
+#define BUS_DMASYNC_POSTREAD 0x02 /* post-read synchronization */
+#define BUS_DMASYNC_PREWRITE 0x04 /* pre-write synchronization */
+#define BUS_DMASYNC_POSTWRITE 0x08 /* post-write synchronization */
+
+typedef struct arm32_bus_dma_tag *bus_dma_tag_t;
+typedef struct arm32_bus_dmamap *bus_dmamap_t;
+
+#define BUS_DMA_TAG_VALID(t) ((t) != (bus_dma_tag_t)0)
+
+/*
+ * bus_dma_segment_t
+ *
+ * Describes a single contiguous DMA transaction. Values
+ * are suitable for programming into DMA registers.
+ */
+struct arm32_bus_dma_segment {
+ /*
+ * PUBLIC MEMBERS: these are used by machine-independent code.
+ */
+ bus_addr_t ds_addr; /* DMA address */
+ bus_size_t ds_len; /* length of transfer */
+ /*
+ * PRIVATE MEMBERS: not for use by machine-independent code.
+ */
+ bus_addr_t _ds_vaddr; /* Virtual mapped address
+ * Used by bus_dmamem_sync() */
+ int _ds_coherent; /* Coherently mapped */
+};
+typedef struct arm32_bus_dma_segment bus_dma_segment_t;
+
+/*
+ * arm32_dma_range
+ *
+ * This structure describes a valid DMA range.
+ */
+struct arm32_dma_range {
+ bus_addr_t dr_sysbase; /* system base address */
+ bus_addr_t dr_busbase; /* appears here on bus */
+ bus_size_t dr_len; /* length of range */
+};
+
+/*
+ * bus_dma_tag_t
+ *
+ * A machine-dependent opaque type describing the implementation of
+ * DMA for a given bus.
+ */
+
+struct arm32_bus_dma_tag {
+ /*
+ * DMA range for this tag. If the page doesn't fall within
+ * one of these ranges, an error is returned. The caller
+ * may then decide what to do with the transfer. If the
+ * range pointer is NULL, it is ignored.
+ */
+ struct arm32_dma_range *_ranges;
+ int _nranges;
+
+ /*
+ * Opaque cookie for use by back-end.
+ */
+ void *_cookie;
+
+ /*
+ * 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, caddr_t *, int);
+ void (*_dmamem_unmap) (bus_dma_tag_t, caddr_t, size_t);
+ paddr_t (*_dmamem_mmap) (bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
+};
+
+#define bus_dmamap_create(t, s, n, m, b, f, p) \
+ (*(t)->_dmamap_create)((t), (s), (n), (m), (b), (f), (p))
+#define bus_dmamap_destroy(t, p) \
+ (*(t)->_dmamap_destroy)((t), (p))
+#define bus_dmamap_load(t, m, b, s, p, f) \
+ (*(t)->_dmamap_load)((t), (m), (b), (s), (p), (f))
+#define bus_dmamap_load_mbuf(t, m, b, f) \
+ (*(t)->_dmamap_load_mbuf)((t), (m), (b), (f))
+#define bus_dmamap_load_uio(t, m, u, f) \
+ (*(t)->_dmamap_load_uio)((t), (m), (u), (f))
+#define bus_dmamap_load_raw(t, m, sg, n, s, f) \
+ (*(t)->_dmamap_load_raw)((t), (m), (sg), (n), (s), (f))
+#define bus_dmamap_unload(t, p) \
+ (*(t)->_dmamap_unload)((t), (p))
+#define bus_dmamap_sync(t, p, o, l, ops) \
+ (void)((t)->_dmamap_sync ? \
+ (*(t)->_dmamap_sync)((t), (p), (o), (l), (ops)) : (void)0)
+
+#define bus_dmamem_alloc(t, s, a, b, sg, n, r, f) \
+ (*(t)->_dmamem_alloc)((t), (s), (a), (b), (sg), (n), (r), (f))
+#define bus_dmamem_free(t, sg, n) \
+ (*(t)->_dmamem_free)((t), (sg), (n))
+#define bus_dmamem_map(t, sg, n, s, k, f) \
+ (*(t)->_dmamem_map)((t), (sg), (n), (s), (k), (f))
+#define bus_dmamem_unmap(t, k, s) \
+ (*(t)->_dmamem_unmap)((t), (k), (s))
+#define bus_dmamem_mmap(t, sg, n, o, p, f) \
+ (*(t)->_dmamem_mmap)((t), (sg), (n), (o), (p), (f))
+
+/*
+ * bus_dmamap_t
+ *
+ * Describes a DMA mapping.
+ */
+struct arm32_bus_dmamap {
+ /*
+ * PRIVATE MEMBERS: not for use by machine-independent code.
+ */
+ bus_size_t _dm_size; /* largest DMA transfer mappable */
+ int _dm_segcnt; /* number of segs this map can map */
+ bus_size_t _dm_maxsegsz; /* largest possible segment */
+ bus_size_t _dm_boundary; /* don't cross this */
+ int _dm_flags; /* misc. flags */
+
+ void *_dm_origbuf; /* pointer to original buffer */
+ int _dm_buftype; /* type of buffer */
+ struct proc *_dm_proc; /* proc that owns the mapping */
+
+ void *_dm_cookie; /* cookie for bus-specific functions */
+
+ /*
+ * PUBLIC MEMBERS: these are used by machine-independent code.
+ */
+ bus_size_t dm_mapsize; /* size of the mapping */
+ int dm_nsegs; /* # valid segments in mapping */
+ bus_dma_segment_t dm_segs[1]; /* segments; variable length */
+};
+
+#ifdef _ARM32_BUS_DMA_PRIVATE
+
+/* _dm_buftype */
+#define ARM32_BUFTYPE_INVALID 0
+#define ARM32_BUFTYPE_LINEAR 1
+#define ARM32_BUFTYPE_MBUF 2
+#define ARM32_BUFTYPE_UIO 3
+#define ARM32_BUFTYPE_RAW 4
+
+int arm32_dma_range_intersect(struct arm32_dma_range *, int,
+ paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep);
+
+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, caddr_t *kvap, int flags);
+void _bus_dmamem_unmap (bus_dma_tag_t tag, caddr_t 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_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,
+ vaddr_t low, vaddr_t high);
+#endif /* _ARM32_BUS_DMA_PRIVATE */
+
+#endif /* !_ARM_BUS_DMA_H_ */
