Module Name: src
Committed By: thorpej
Date: Sun Oct 11 00:33:31 UTC 2020
Modified Files:
src/sys/arch/alpha/common: bus_dma.c sgmap_typedep.c
src/sys/arch/alpha/include: bus_funcs.h
src/sys/arch/alpha/pci: apecs_dma.c cia_dma.c dwlpx_dma.c lca_dma.c
mcpcia_dma.c pci_sgmap_pte32.c pci_sgmap_pte64.c tsp_dma.c
ttwoga_dma.c
src/sys/arch/alpha/tc: tc_dma_3000_500.c tc_sgmap.c
Log Message:
Add some bus_dma instrumentation.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/alpha/common/bus_dma.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/alpha/common/sgmap_typedep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/include/bus_funcs.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/pci/apecs_dma.c \
src/sys/arch/alpha/pci/mcpcia_dma.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/pci/cia_dma.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/alpha/pci/dwlpx_dma.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/pci/lca_dma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/pci/pci_sgmap_pte32.c \
src/sys/arch/alpha/pci/pci_sgmap_pte64.c \
src/sys/arch/alpha/pci/ttwoga_dma.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/pci/tsp_dma.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/tc/tc_dma_3000_500.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/tc/tc_sgmap.c
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/alpha/common/bus_dma.c
diff -u src/sys/arch/alpha/common/bus_dma.c:1.69 src/sys/arch/alpha/common/bus_dma.c:1.70
--- src/sys/arch/alpha/common/bus_dma.c:1.69 Tue Oct 2 23:54:51 2012
+++ src/sys/arch/alpha/common/bus_dma.c Sun Oct 11 00:33:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.69 2012/10/02 23:54:51 christos Exp $ */
+/* $NetBSD: bus_dma.c,v 1.70 2020/10/11 00:33:30 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.69 2012/10/02 23:54:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.70 2020/10/11 00:33:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,6 +56,9 @@ int _bus_dmamap_load_buffer_direct(bus_d
extern paddr_t avail_start, avail_end; /* from pmap.c */
+#define DMA_COUNT_DECL(cnt) _DMA_COUNT_DECL(dma_direct, cnt)
+#define DMA_COUNT(cnt) _DMA_COUNT(dma_direct, cnt)
+
/*
* Common function for DMA map creation. May be called by bus-specific
* DMA map creation functions.
@@ -218,6 +221,9 @@ _bus_dmamap_load_buffer_direct(bus_dma_t
return (0);
}
+DMA_COUNT_DECL(load);
+DMA_COUNT_DECL(load_next_window);
+
/*
* Common function for loading a direct-mapped DMA map with a linear
* buffer. Called by bus-specific DMA map load functions with the
@@ -252,6 +258,7 @@ _bus_dmamap_load_direct(bus_dma_tag_t t,
error = _bus_dmamap_load_buffer_direct(t, map, buf, buflen,
vm, flags, &lastaddr, &seg, 1);
if (error == 0) {
+ DMA_COUNT(load);
map->dm_mapsize = buflen;
map->dm_nsegs = seg + 1;
map->_dm_window = t;
@@ -259,12 +266,16 @@ _bus_dmamap_load_direct(bus_dma_tag_t t,
/*
* Give the next window a chance.
*/
+ DMA_COUNT(load_next_window);
error = bus_dmamap_load(t->_next_window, map, buf, buflen,
p, flags);
}
return (error);
}
+DMA_COUNT_DECL(load_mbuf);
+DMA_COUNT_DECL(load_mbuf_next_window);
+
/*
* Like _bus_dmamap_load_direct(), but for mbufs.
*/
@@ -341,6 +352,7 @@ _bus_dmamap_load_mbuf_direct(bus_dma_tag
first = 0;
}
if (error == 0) {
+ DMA_COUNT(load_mbuf);
map->dm_mapsize = m0->m_pkthdr.len;
map->dm_nsegs = seg + 1;
map->_dm_window = t;
@@ -348,11 +360,15 @@ _bus_dmamap_load_mbuf_direct(bus_dma_tag
/*
* Give the next window a chance.
*/
+ DMA_COUNT(load_mbuf_next_window);
error = bus_dmamap_load_mbuf(t->_next_window, map, m0, flags);
}
return (error);
}
+DMA_COUNT_DECL(load_uio);
+DMA_COUNT_DECL(load_uio_next_window);
+
/*
* Like _bus_dmamap_load_direct(), but for uios.
*/
@@ -398,6 +414,7 @@ _bus_dmamap_load_uio_direct(bus_dma_tag_
resid -= minlen;
}
if (error == 0) {
+ DMA_COUNT(load_uio);
map->dm_mapsize = uio->uio_resid;
map->dm_nsegs = seg + 1;
map->_dm_window = t;
@@ -405,6 +422,7 @@ _bus_dmamap_load_uio_direct(bus_dma_tag_
/*
* Give the next window a chance.
*/
+ DMA_COUNT(load_uio_next_window);
error = bus_dmamap_load_uio(t->_next_window, map, uio, flags);
}
return (error);
@@ -426,7 +444,7 @@ _bus_dmamap_load_raw_direct(bus_dma_tag_
* chipset-specific DMA map unload functions.
*/
void
-_bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
+_bus_dmamap_unload_common(bus_dma_tag_t t, bus_dmamap_t map)
{
/*
@@ -440,6 +458,16 @@ _bus_dmamap_unload(bus_dma_tag_t t, bus_
map->_dm_flags &= ~(BUS_DMA_READ|BUS_DMA_WRITE);
}
+DMA_COUNT_DECL(unload);
+
+void
+_bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
+{
+ KASSERT(map->_dm_window == t);
+ DMA_COUNT(unload);
+ _bus_dmamap_unload_common(t, map);
+}
+
/*
* Common function for DMA map synchronization. May be called
* by chipset-specific DMA map synchronization functions.
@@ -449,9 +477,6 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
bus_size_t len, int ops)
{
- /*
- * Flush the store buffer.
- */
alpha_mb();
}
Index: src/sys/arch/alpha/common/sgmap_typedep.c
diff -u src/sys/arch/alpha/common/sgmap_typedep.c:1.39 src/sys/arch/alpha/common/sgmap_typedep.c:1.40
--- src/sys/arch/alpha/common/sgmap_typedep.c:1.39 Wed Jun 17 05:52:13 2020
+++ src/sys/arch/alpha/common/sgmap_typedep.c Sun Oct 11 00:33:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap_typedep.c,v 1.39 2020/06/17 05:52:13 thorpej Exp $ */
+/* $NetBSD: sgmap_typedep.c,v 1.40 2020/10/11 00:33:30 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -31,21 +31,24 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sgmap_typedep.c,v 1.39 2020/06/17 05:52:13 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sgmap_typedep.c,v 1.40 2020/10/11 00:33:30 thorpej Exp $");
#include "opt_ddb.h"
+#include <sys/evcnt.h>
#include <uvm/uvm_extern.h>
+#define DMA_COUNT_DECL(cnt) _DMA_COUNT_DECL(dma_sgmap, cnt)
+#define DMA_COUNT(cnt) _DMA_COUNT(dma_sgmap, cnt)
+
#ifdef SGMAP_DEBUG
int __C(SGMAP_TYPE,_debug) = 0;
#endif
SGMAP_PTE_TYPE __C(SGMAP_TYPE,_prefetch_spill_page_pte);
-int __C(SGMAP_TYPE,_load_buffer)(bus_dma_tag_t,
- bus_dmamap_t, void *buf, size_t buflen,
- struct vmspace *, int, int, struct alpha_sgmap *);
+static void __C(SGMAP_TYPE,_do_unload)(bus_dma_tag_t, bus_dmamap_t,
+ struct alpha_sgmap *);
void
__C(SGMAP_TYPE,_init_spill_page_pte)(void)
@@ -56,7 +59,9 @@ __C(SGMAP_TYPE,_init_spill_page_pte)(voi
SGPTE_PGADDR_SHIFT) | SGPTE_VALID;
}
-int
+DMA_COUNT_DECL(spill_page);
+
+static int
__C(SGMAP_TYPE,_load_buffer)(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
size_t buflen, struct vmspace *vm, int flags, int seg,
struct alpha_sgmap *sgmap)
@@ -109,6 +114,7 @@ __C(SGMAP_TYPE,_load_buffer)(bus_dma_tag
sgvalen = (endva - va);
if (spill) {
+ DMA_COUNT(spill_page);
sgvalen += PAGE_SIZE;
/*
@@ -197,6 +203,9 @@ __C(SGMAP_TYPE,_load_buffer)(bus_dma_tag
return (0);
}
+DMA_COUNT_DECL(load);
+DMA_COUNT_DECL(load_next_window);
+
int
__C(SGMAP_TYPE,_load)(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
bus_size_t buflen, struct proc *p, int flags, struct alpha_sgmap *sgmap)
@@ -236,6 +245,7 @@ __C(SGMAP_TYPE,_load)(bus_dma_tag_t t, b
#endif
if (error == 0) {
+ DMA_COUNT(load);
map->dm_mapsize = buflen;
map->dm_nsegs = 1;
map->_dm_window = t;
@@ -243,6 +253,7 @@ __C(SGMAP_TYPE,_load)(bus_dma_tag_t t, b
map->_dm_flags &= ~(BUS_DMA_READ|BUS_DMA_WRITE);
if (t->_next_window != NULL) {
/* Give the next window a chance. */
+ DMA_COUNT(load_next_window);
error = bus_dmamap_load(t->_next_window, map, buf,
buflen, p, flags);
}
@@ -250,6 +261,9 @@ __C(SGMAP_TYPE,_load)(bus_dma_tag_t t, b
return (error);
}
+DMA_COUNT_DECL(load_mbuf);
+DMA_COUNT_DECL(load_mbuf_next_window);
+
int
__C(SGMAP_TYPE,_load_mbuf)(bus_dma_tag_t t, bus_dmamap_t map,
struct mbuf *m0, int flags, struct alpha_sgmap *sgmap)
@@ -295,16 +309,18 @@ __C(SGMAP_TYPE,_load_mbuf)(bus_dma_tag_t
#endif
if (error == 0) {
+ DMA_COUNT(load_mbuf);
map->dm_mapsize = m0->m_pkthdr.len;
map->dm_nsegs = seg;
map->_dm_window = t;
} else {
/* Need to back out what we've done so far. */
map->dm_nsegs = seg - 1;
- __C(SGMAP_TYPE,_unload)(t, map, sgmap);
+ __C(SGMAP_TYPE,_do_unload)(t, map, sgmap);
map->_dm_flags &= ~(BUS_DMA_READ|BUS_DMA_WRITE);
if (t->_next_window != NULL) {
/* Give the next window a chance. */
+ DMA_COUNT(load_mbuf_next_window);
error = bus_dmamap_load_mbuf(t->_next_window, map,
m0, flags);
}
@@ -313,6 +329,9 @@ __C(SGMAP_TYPE,_load_mbuf)(bus_dma_tag_t
return (error);
}
+DMA_COUNT_DECL(load_uio);
+DMA_COUNT_DECL(load_uio_next_window);
+
int
__C(SGMAP_TYPE,_load_uio)(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio,
int flags, struct alpha_sgmap *sgmap)
@@ -365,16 +384,18 @@ __C(SGMAP_TYPE,_load_uio)(bus_dma_tag_t
#endif
if (error == 0) {
+ DMA_COUNT(load_uio);
map->dm_mapsize = uio->uio_resid;
map->dm_nsegs = seg;
map->_dm_window = t;
} else {
/* Need to back out what we've done so far. */
map->dm_nsegs = seg - 1;
- __C(SGMAP_TYPE,_unload)(t, map, sgmap);
+ __C(SGMAP_TYPE,_do_unload)(t, map, sgmap);
map->_dm_flags &= ~(BUS_DMA_READ|BUS_DMA_WRITE);
if (t->_next_window != NULL) {
/* Give the next window a chance. */
+ DMA_COUNT(load_uio_next_window);
error = bus_dmamap_load_uio(t->_next_window, map,
uio, flags);
}
@@ -396,8 +417,8 @@ __C(SGMAP_TYPE,_load_raw)(bus_dma_tag_t
panic(__S(__C(SGMAP_TYPE,_load_raw)) ": not implemented");
}
-void
-__C(SGMAP_TYPE,_unload)(bus_dma_tag_t t, bus_dmamap_t map,
+static void
+__C(SGMAP_TYPE,_do_unload)(bus_dma_tag_t t, bus_dmamap_t map,
struct alpha_sgmap *sgmap)
{
SGMAP_PTE_TYPE *pte, *page_table = sgmap->aps_pt;
@@ -448,3 +469,14 @@ __C(SGMAP_TYPE,_unload)(bus_dma_tag_t t,
map->dm_nsegs = 0;
map->_dm_window = NULL;
}
+
+DMA_COUNT_DECL(unload);
+
+void
+__C(SGMAP_TYPE,_unload)(bus_dma_tag_t t, bus_dmamap_t map,
+ struct alpha_sgmap *sgmap)
+{
+ KASSERT(map->_dm_window == t);
+ DMA_COUNT(unload);
+ __C(SGMAP_TYPE,_do_unload)(t, map, sgmap);
+}
Index: src/sys/arch/alpha/include/bus_funcs.h
diff -u src/sys/arch/alpha/include/bus_funcs.h:1.2 src/sys/arch/alpha/include/bus_funcs.h:1.3
--- src/sys/arch/alpha/include/bus_funcs.h:1.2 Mon Feb 6 02:14:13 2012
+++ src/sys/arch/alpha/include/bus_funcs.h Sun Oct 11 00:33:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_funcs.h,v 1.2 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: bus_funcs.h,v 1.3 2020/10/11 00:33:30 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -340,6 +340,7 @@ int _bus_dmamap_load_raw_direct(bus_dma_
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_unload_common(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);
@@ -358,6 +359,14 @@ void _bus_dmamem_unmap(bus_dma_tag_t tag
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);
+
+#define _DMA_COUNT_DECL(type, cnt) \
+ static struct evcnt dma_stat_##type##_##cnt = \
+ EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, #type, #cnt); \
+ EVCNT_ATTACH_STATIC(dma_stat_##type##_##cnt)
+#define _DMA_COUNT(type, cnt) \
+ atomic_inc_64(&dma_stat_##type##_##cnt .ev_count)
+
#endif /* _ALPHA_BUS_DMA_PRIVATE */
#endif /* _KERNEL */
Index: src/sys/arch/alpha/pci/apecs_dma.c
diff -u src/sys/arch/alpha/pci/apecs_dma.c:1.22 src/sys/arch/alpha/pci/apecs_dma.c:1.23
--- src/sys/arch/alpha/pci/apecs_dma.c:1.22 Sat Oct 10 21:59:04 2020
+++ src/sys/arch/alpha/pci/apecs_dma.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $ */
+/* $NetBSD: apecs_dma.c,v 1.23 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.23 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -294,5 +294,5 @@ apecs_bus_dmamap_unload_sgmap(bus_dma_ta
/*
* Do the generic bits of the unload.
*/
- _bus_dmamap_unload(t, map);
+ _bus_dmamap_unload_common(t, map);
}
Index: src/sys/arch/alpha/pci/mcpcia_dma.c
diff -u src/sys/arch/alpha/pci/mcpcia_dma.c:1.22 src/sys/arch/alpha/pci/mcpcia_dma.c:1.23
--- src/sys/arch/alpha/pci/mcpcia_dma.c:1.22 Sat Oct 10 21:59:04 2020
+++ src/sys/arch/alpha/pci/mcpcia_dma.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $ */
+/* $NetBSD: mcpcia_dma.c,v 1.23 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.23 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -353,5 +353,5 @@ mcpcia_bus_dmamap_unload_sgmap(bus_dma_t
/*
* Do the generic bits of the unload.
*/
- _bus_dmamap_unload(t, map);
+ _bus_dmamap_unload_common(t, map);
}
Index: src/sys/arch/alpha/pci/cia_dma.c
diff -u src/sys/arch/alpha/pci/cia_dma.c:1.30 src/sys/arch/alpha/pci/cia_dma.c:1.31
--- src/sys/arch/alpha/pci/cia_dma.c:1.30 Sat Oct 10 21:59:04 2020
+++ src/sys/arch/alpha/pci/cia_dma.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_dma.c,v 1.30 2020/10/10 21:59:04 thorpej Exp $ */
+/* $NetBSD: cia_dma.c,v 1.31 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.30 2020/10/10 21:59:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.31 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -396,7 +396,7 @@ cia_bus_dmamap_unload_sgmap(bus_dma_tag_
/*
* Do the generic bits of the unload.
*/
- _bus_dmamap_unload(t, map);
+ _bus_dmamap_unload_common(t, map);
}
/*
Index: src/sys/arch/alpha/pci/dwlpx_dma.c
diff -u src/sys/arch/alpha/pci/dwlpx_dma.c:1.26 src/sys/arch/alpha/pci/dwlpx_dma.c:1.27
--- src/sys/arch/alpha/pci/dwlpx_dma.c:1.26 Sat Oct 10 21:59:04 2020
+++ src/sys/arch/alpha/pci/dwlpx_dma.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_dma.c,v 1.26 2020/10/10 21:59:04 thorpej Exp $ */
+/* $NetBSD: dwlpx_dma.c,v 1.27 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.26 2020/10/10 21:59:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.27 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -338,5 +338,5 @@ dwlpx_bus_dmamap_unload_sgmap(bus_dma_ta
/*
* Do the generic bits of the unload.
*/
- _bus_dmamap_unload(t, map);
+ _bus_dmamap_unload_common(t, map);
}
Index: src/sys/arch/alpha/pci/lca_dma.c
diff -u src/sys/arch/alpha/pci/lca_dma.c:1.24 src/sys/arch/alpha/pci/lca_dma.c:1.25
--- src/sys/arch/alpha/pci/lca_dma.c:1.24 Sat Oct 10 21:59:04 2020
+++ src/sys/arch/alpha/pci/lca_dma.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_dma.c,v 1.24 2020/10/10 21:59:04 thorpej Exp $ */
+/* $NetBSD: lca_dma.c,v 1.25 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.24 2020/10/10 21:59:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.25 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -299,5 +299,5 @@ lca_bus_dmamap_unload_sgmap(bus_dma_tag_
/*
* Do the generic bits of the unload.
*/
- _bus_dmamap_unload(t, map);
+ _bus_dmamap_unload_common(t, map);
}
Index: src/sys/arch/alpha/pci/pci_sgmap_pte32.c
diff -u src/sys/arch/alpha/pci/pci_sgmap_pte32.c:1.8 src/sys/arch/alpha/pci/pci_sgmap_pte32.c:1.9
--- src/sys/arch/alpha/pci/pci_sgmap_pte32.c:1.8 Fri Jul 1 19:19:50 2011
+++ src/sys/arch/alpha/pci/pci_sgmap_pte32.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_sgmap_pte32.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $ */
+/* $NetBSD: pci_sgmap_pte32.c,v 1.9 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte32.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte32.c,v 1.9 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,6 +42,7 @@ __KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pt
#include <sys/mbuf.h>
#include <sys/proc.h>
+#define _ALPHA_BUS_DMA_PRIVATE
#include <sys/bus.h>
#include <alpha/pci/pci_sgmap_pte32.h>
Index: src/sys/arch/alpha/pci/pci_sgmap_pte64.c
diff -u src/sys/arch/alpha/pci/pci_sgmap_pte64.c:1.8 src/sys/arch/alpha/pci/pci_sgmap_pte64.c:1.9
--- src/sys/arch/alpha/pci/pci_sgmap_pte64.c:1.8 Fri Jul 1 19:19:50 2011
+++ src/sys/arch/alpha/pci/pci_sgmap_pte64.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_sgmap_pte64.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $ */
+/* $NetBSD: pci_sgmap_pte64.c,v 1.9 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte64.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte64.c,v 1.9 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,6 +42,7 @@ __KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pt
#include <sys/mbuf.h>
#include <sys/proc.h>
+#define _ALPHA_BUS_DMA_PRIVATE
#include <sys/bus.h>
#include <alpha/pci/pci_sgmap_pte64.h>
Index: src/sys/arch/alpha/pci/ttwoga_dma.c
diff -u src/sys/arch/alpha/pci/ttwoga_dma.c:1.8 src/sys/arch/alpha/pci/ttwoga_dma.c:1.9
--- src/sys/arch/alpha/pci/ttwoga_dma.c:1.8 Sat Oct 10 21:59:04 2020
+++ src/sys/arch/alpha/pci/ttwoga_dma.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga_dma.c,v 1.8 2020/10/10 21:59:04 thorpej Exp $ */
+/* $NetBSD: ttwoga_dma.c,v 1.9 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c,v 1.8 2020/10/10 21:59:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c,v 1.9 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -355,5 +355,5 @@ ttwoga_bus_dmamap_unload_sgmap(bus_dma_t
/*
* Do the generic bits of the unload.
*/
- _bus_dmamap_unload(t, map);
+ _bus_dmamap_unload_common(t, map);
}
Index: src/sys/arch/alpha/pci/tsp_dma.c
diff -u src/sys/arch/alpha/pci/tsp_dma.c:1.14 src/sys/arch/alpha/pci/tsp_dma.c:1.15
--- src/sys/arch/alpha/pci/tsp_dma.c:1.14 Sat Oct 10 21:59:04 2020
+++ src/sys/arch/alpha/pci/tsp_dma.c Sun Oct 11 00:33:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_dma.c,v 1.14 2020/10/10 21:59:04 thorpej Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.15 2020/10/11 00:33:31 thorpej Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.14 2020/10/10 21:59:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.15 2020/10/11 00:33:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -344,7 +344,7 @@ tsp_bus_dmamap_unload_sgmap(bus_dma_tag_
/*
* Do the generic bits of the unload.
*/
- _bus_dmamap_unload(t, map);
+ _bus_dmamap_unload_common(t, map);
}
/*
Index: src/sys/arch/alpha/tc/tc_dma_3000_500.c
diff -u src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.21 src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.22
--- src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.21 Sun Nov 10 21:16:22 2019
+++ src/sys/arch/alpha/tc/tc_dma_3000_500.c Sun Oct 11 00:33:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma_3000_500.c,v 1.21 2019/11/10 21:16:22 chs Exp $ */
+/* $NetBSD: tc_dma_3000_500.c,v 1.22 2020/10/11 00:33:30 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.21 2019/11/10 21:16:22 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.22 2020/10/11 00:33:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -206,5 +206,5 @@ tc_bus_dmamap_unload_sgmap(bus_dma_tag_t
/*
* Do the generic bits of the unload.
*/
- _bus_dmamap_unload(t, map);
+ _bus_dmamap_unload_common(t, map);
}
Index: src/sys/arch/alpha/tc/tc_sgmap.c
diff -u src/sys/arch/alpha/tc/tc_sgmap.c:1.8 src/sys/arch/alpha/tc/tc_sgmap.c:1.9
--- src/sys/arch/alpha/tc/tc_sgmap.c:1.8 Fri Jul 1 19:19:50 2011
+++ src/sys/arch/alpha/tc/tc_sgmap.c Sun Oct 11 00:33:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_sgmap.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $ */
+/* $NetBSD: tc_sgmap.c,v 1.9 2020/10/11 00:33:30 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: tc_sgmap.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tc_sgmap.c,v 1.9 2020/10/11 00:33:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,6 +42,7 @@ __KERNEL_RCSID(1, "$NetBSD: tc_sgmap.c,v
#include <sys/mbuf.h>
#include <sys/proc.h>
+#define _ALPHA_BUS_DMA_PRIVATE
#include <sys/bus.h>
#include <alpha/tc/tc_sgmap.h>
