summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/include/bus.h3
-rw-r--r--sys/arch/amd64/include/bus.h3
-rw-r--r--sys/arch/arm/include/bus.h29
-rw-r--r--sys/arch/arm64/include/bus.h3
-rw-r--r--sys/arch/hppa/include/bus.h3
-rw-r--r--sys/arch/i386/include/bus.h3
-rw-r--r--sys/arch/landisk/include/bus.h29
-rw-r--r--sys/arch/loongson/include/bus.h3
-rw-r--r--sys/arch/macppc/include/bus.h3
-rw-r--r--sys/arch/octeon/include/bus.h3
-rw-r--r--sys/arch/sgi/include/bus.h3
-rw-r--r--sys/arch/socppc/include/bus.h3
-rw-r--r--sys/arch/sparc64/include/bus.h3
13 files changed, 52 insertions, 39 deletions
diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h
index 2d040b4861d..3f623feee93 100644
--- a/sys/arch/alpha/include/bus.h
+++ b/sys/arch/alpha/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.30 2016/05/03 11:22:08 dlg Exp $ */
+/* $OpenBSD: bus.h,v 1.31 2017/05/08 00:27:45 dlg Exp $ */
/* $NetBSD: bus.h,v 1.10 1996/12/02 22:19:32 cgd Exp $ */
/*
@@ -464,6 +464,7 @@ struct alpha_bus_space {
#define BUS_DMA_READ 0x0200 /* mapping is device -> memory only */
#define BUS_DMA_WRITE 0x0400 /* mapping is memory -> device only */
#define BUS_DMA_ZERO 0x1000 /* zero memory in dmamem_alloc */
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/*
* Private flags stored in the DMA map.
diff --git a/sys/arch/amd64/include/bus.h b/sys/arch/amd64/include/bus.h
index 92a80a37e1c..0463edbd0d3 100644
--- a/sys/arch/amd64/include/bus.h
+++ b/sys/arch/amd64/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.32 2015/01/24 15:13:55 kettenis Exp $ */
+/* $OpenBSD: bus.h,v 1.33 2017/05/08 00:27:45 dlg Exp $ */
/* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */
/*-
@@ -525,6 +525,7 @@ extern const struct x86_bus_space_ops x86_bus_space_mem_ops;
#define BUS_DMA_WRITE 0x0400 /* mapping is memory -> device only */
#define BUS_DMA_NOCACHE 0x0800 /* map memory uncached */
#define BUS_DMA_ZERO 0x1000 /* zero memory in dmamem_alloc */
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
struct mbuf;
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index 10b214a7579..bb540d8acac 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.16 2016/10/05 07:44:24 patrick Exp $ */
+/* $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 $ */
/*-
@@ -604,19 +604,20 @@ bs_c_8_proto(f);
/*
* Flags used in various bus DMA methods.
*/
-#define BUS_DMA_WAITOK 0x000 /* safe to sleep (pseudo-flag) */
-#define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */
-#define BUS_DMA_ALLOCNOW 0x002 /* perform resource allocation now */
-#define BUS_DMA_COHERENT 0x004 /* hint: map memory DMA coherent */
-#define BUS_DMA_STREAMING 0x008 /* hint: sequential, unidirectional */
-#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
-#define BUS_DMA_BUS2 0x020
-#define BUS_DMA_BUS3 0x040
-#define BUS_DMA_BUS4 0x080
-#define BUS_DMA_READ 0x100 /* mapping is device -> memory only */
-#define BUS_DMA_WRITE 0x200 /* mapping is memory -> device only */
-#define BUS_DMA_NOCACHE 0x400 /* hint: map non-cached memory */
-#define BUS_DMA_ZERO 0x800 /* dmamem_alloc returns zeroed mem */
+#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.
diff --git a/sys/arch/arm64/include/bus.h b/sys/arch/arm64/include/bus.h
index 786bcaab52e..4422f424efb 100644
--- a/sys/arch/arm64/include/bus.h
+++ b/sys/arch/arm64/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.2 2017/02/22 22:55:27 patrick Exp $ */
+/* $OpenBSD: bus.h,v 1.3 2017/05/08 00:27:45 dlg Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved.
*
@@ -315,6 +315,7 @@ bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offset,
#define BUS_DMA_STREAMING 0x0400 /* hint: sequential, unidirectional */
#define BUS_DMA_ZERO 0x0800 /* zero memory in dmamem_alloc */
#define BUS_DMA_NOCACHE 0x1000
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
struct mbuf;
diff --git a/sys/arch/hppa/include/bus.h b/sys/arch/hppa/include/bus.h
index 6d14a0df439..c4dbd6835a9 100644
--- a/sys/arch/hppa/include/bus.h
+++ b/sys/arch/hppa/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.31 2011/11/14 14:29:53 deraadt Exp $ */
+/* $OpenBSD: bus.h,v 1.32 2017/05/08 00:27:45 dlg Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -299,6 +299,7 @@ extern const struct hppa_bus_space_tag hppa_bustag;
#define BUS_DMA_READ 0x0400 /* mapping is device -> memory only */
#define BUS_DMA_WRITE 0x0800 /* mapping is memory -> device only */
#define BUS_DMA_ZERO 0x1000 /* zero memory in dmamem_alloc */
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
struct mbuf;
diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h
index 2e25b765ea7..35a31e38b3c 100644
--- a/sys/arch/i386/include/bus.h
+++ b/sys/arch/i386/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.66 2015/02/27 18:59:43 guenther Exp $ */
+/* $OpenBSD: bus.h,v 1.67 2017/05/08 00:27:45 dlg Exp $ */
/* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */
/*-
@@ -528,6 +528,7 @@ extern const struct i386_bus_space_ops i386_bus_space_mem_ops;
#define BUS_DMA_WRITE 0x0400 /* mapping is memory -> device only */
#define BUS_DMA_NOCACHE 0x0800 /* map memory uncached */
#define BUS_DMA_ZERO 0x1000 /* dmamem_alloc return zeroed mem */
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
struct mbuf;
diff --git a/sys/arch/landisk/include/bus.h b/sys/arch/landisk/include/bus.h
index 5514c446910..ac2a21e66f1 100644
--- a/sys/arch/landisk/include/bus.h
+++ b/sys/arch/landisk/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $ */
+/* $OpenBSD: bus.h,v 1.9 2017/05/08 00:27:45 dlg Exp $ */
/* $NetBSD: bus.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*-
@@ -421,19 +421,20 @@ struct _bus_space {
/*
* Flags used in various bus DMA methods.
*/
-#define BUS_DMA_WAITOK 0x000 /* safe to sleep (pseudo-flag) */
-#define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */
-#define BUS_DMA_ALLOCNOW 0x002 /* perform resource allocation now */
-#define BUS_DMA_COHERENT 0x004 /* map memory to not require sync */
-#define BUS_DMA_STREAMING 0x008 /* hint: sequential, unidirectional */
-#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
-#define BUS_DMA_BUS2 0x020
-#define BUS_DMA_BUS3 0x040
-#define BUS_DMA_BUS4 0x080
-#define BUS_DMA_READ 0x100 /* mapping is device -> memory only */
-#define BUS_DMA_WRITE 0x200 /* mapping is memory -> device only */
-#define BUS_DMA_NOCACHE 0x400 /* hint: map non-cached memory */
-#define BUS_DMA_ZERO 0x800 /* zero memory in dmamem_alloc */
+#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 /* map memory to not require sync */
+#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 /* zero memory in dmamem_alloc */
+#define BUS_DMA_64BIT 0x1000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
struct mbuf;
diff --git a/sys/arch/loongson/include/bus.h b/sys/arch/loongson/include/bus.h
index aa0ada589d0..965418dd63f 100644
--- a/sys/arch/loongson/include/bus.h
+++ b/sys/arch/loongson/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.6 2014/05/24 21:11:01 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.7 2017/05/08 00:27:45 dlg Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved.
@@ -350,6 +350,7 @@ bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offset,
#define BUS_DMA_STREAMING 0x0400 /* hint: sequential, unidirectional */
#define BUS_DMA_ZERO 0x0800 /* zero memory in dmamem_alloc */
#define BUS_DMA_NOCACHE 0x1000
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
struct mbuf;
diff --git a/sys/arch/macppc/include/bus.h b/sys/arch/macppc/include/bus.h
index 704901adba7..c212e77ae33 100644
--- a/sys/arch/macppc/include/bus.h
+++ b/sys/arch/macppc/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.25 2016/05/03 12:23:25 dlg Exp $ */
+/* $OpenBSD: bus.h,v 1.26 2017/05/08 00:27:45 dlg Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom. All rights reserved.
@@ -489,6 +489,7 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2,
#define BUS_DMA_STREAMING 0x0400 /* hint: sequential, unidirectional */
#define BUS_DMA_ZERO 0x0800 /* zero memory in dmamem_alloc */
#define BUS_DMA_NOCACHE 0x1000 /* map memory uncached */
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
diff --git a/sys/arch/octeon/include/bus.h b/sys/arch/octeon/include/bus.h
index efe398f5da9..3ae2273edf3 100644
--- a/sys/arch/octeon/include/bus.h
+++ b/sys/arch/octeon/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.6 2014/03/29 18:09:30 guenther Exp $ */
+/* $OpenBSD: bus.h,v 1.7 2017/05/08 00:27:45 dlg Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved.
@@ -316,6 +316,7 @@ bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offset,
#define BUS_DMA_STREAMING 0x0400 /* hint: sequential, unidirectional */
#define BUS_DMA_ZERO 0x0800 /* zero memory in dmamem_alloc */
#define BUS_DMA_NOCACHE 0x1000
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
struct mbuf;
diff --git a/sys/arch/sgi/include/bus.h b/sys/arch/sgi/include/bus.h
index 7f2a067c2ab..7a017dc5d17 100644
--- a/sys/arch/sgi/include/bus.h
+++ b/sys/arch/sgi/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.26 2014/03/10 21:32:15 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.27 2017/05/08 00:27:45 dlg Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved.
@@ -318,6 +318,7 @@ bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offs,
#define BUS_DMA_STREAMING 0x0400 /* hint: sequential, unidirectional */
#define BUS_DMA_ZERO 0x0800 /* zero memory in dmamem_alloc */
#define BUS_DMA_NOCACHE 0x1000
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
struct mbuf;
diff --git a/sys/arch/socppc/include/bus.h b/sys/arch/socppc/include/bus.h
index 6c782eba8a2..dcfc46f23f0 100644
--- a/sys/arch/socppc/include/bus.h
+++ b/sys/arch/socppc/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.11 2015/01/24 20:59:42 kettenis Exp $ */
+/* $OpenBSD: bus.h,v 1.12 2017/05/08 00:27:45 dlg Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom. All rights reserved.
@@ -461,6 +461,7 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2,
#define BUS_DMA_STREAMING 0x0400 /* hint: sequential, unidirectional */
#define BUS_DMA_ZERO 0x0800 /* zero memory in dmamem_alloc */
#define BUS_DMA_NOCACHE 0x1000 /* map memory uncached */
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
/* Forwards needed by prototypes below. */
diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h
index bbb52768a6e..497b5843f7c 100644
--- a/sys/arch/sparc64/include/bus.h
+++ b/sys/arch/sparc64/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.31 2017/02/13 01:34:37 dlg Exp $ */
+/* $OpenBSD: bus.h,v 1.32 2017/05/08 00:27:45 dlg Exp $ */
/* $NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $ */
/*-
@@ -370,6 +370,7 @@ bus_space_barrier(t, h, o, s, f)
#define BUS_DMA_WRITE 0x0400 /* mapping is memory -> device only */
#define BUS_DMA_ZERO 0x0800 /* zero memory in dmamem_alloc */
#define BUS_DMA_OVERRUN 0x1000 /* tolerate DMA overruns */
+#define BUS_DMA_64BIT 0x2000 /* device handles 64bit dva */
#define BUS_DMA_NOCACHE BUS_DMA_BUS1
#define BUS_DMA_DVMA BUS_DMA_BUS2 /* Don't bother with alignment */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 13:29:05 +0000