Module Name: src
Committed By: thorpej
Date: Sat Oct 10 21:59:04 UTC 2020
Modified Files:
src/sys/arch/alpha/alpha: machdep.c
src/sys/arch/alpha/include: param.h
src/sys/arch/alpha/jensenio: jensenio_dma.c
src/sys/arch/alpha/pci: apecs_dma.c cia_dma.c dwlpx_dma.c
irongate_dma.c lca_dma.c mcpcia_dma.c tsp_dma.c ttwoga_dma.c
src/sys/arch/alpha/tc: tc_dma.c
Log Message:
G/C alpha_XXX_dmamap() / alpha_XXX_dmamap_or. They haven't been needed
for a long time.
To generate a diff of this commit:
cvs rdiff -u -r1.366 -r1.367 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/alpha/include/param.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/jensenio/jensenio_dma.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/pci/apecs_dma.c \
src/sys/arch/alpha/pci/mcpcia_dma.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/pci/cia_dma.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/pci/dwlpx_dma.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/pci/irongate_dma.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/alpha/pci/lca_dma.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/pci/tsp_dma.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/pci/ttwoga_dma.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/tc/tc_dma.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/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.366 src/sys/arch/alpha/alpha/machdep.c:1.367
--- src/sys/arch/alpha/alpha/machdep.c:1.366 Sat Oct 3 17:31:46 2020
+++ src/sys/arch/alpha/alpha/machdep.c Sat Oct 10 21:59:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.366 2020/10/03 17:31:46 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.367 2020/10/10 21:59:03 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2019 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.366 2020/10/03 17:31:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.367 2020/10/10 21:59:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1735,17 +1735,6 @@ mm_md_direct_mapped_phys(paddr_t paddr,
return true;
}
-/* XXX XXX BEGIN XXX XXX */
-paddr_t alpha_XXX_dmamap_or; /* XXX */
- /* XXX */
-paddr_t /* XXX */
-alpha_XXX_dmamap(vaddr_t v) /* XXX */
-{ /* XXX */
- /* XXX */
- return (vtophys(v) | alpha_XXX_dmamap_or); /* XXX */
-} /* XXX */
-/* XXX XXX END XXX XXX */
-
char *
dot_conv(unsigned long x)
{
Index: src/sys/arch/alpha/include/param.h
diff -u src/sys/arch/alpha/include/param.h:1.46 src/sys/arch/alpha/include/param.h:1.47
--- src/sys/arch/alpha/include/param.h:1.46 Thu Sep 3 22:56:11 2020
+++ src/sys/arch/alpha/include/param.h Sat Oct 10 21:59:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.46 2020/09/03 22:56:11 thorpej Exp $ */
+/* $NetBSD: param.h,v 1.47 2020/10/10 21:59:03 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -117,9 +117,5 @@
void delay(unsigned long);
#define DELAY(n) delay(n)
-/* XXX THE FOLLOWING PROTOTYPE SHOULD BE A BUS.H INTERFACE */
-paddr_t alpha_XXX_dmamap(vaddr_t);
-/* XXX END BUS.H */
-
#endif
#endif /* !_KERNEL */
Index: src/sys/arch/alpha/jensenio/jensenio_dma.c
diff -u src/sys/arch/alpha/jensenio/jensenio_dma.c:1.5 src/sys/arch/alpha/jensenio/jensenio_dma.c:1.6
--- src/sys/arch/alpha/jensenio/jensenio_dma.c:1.5 Mon Feb 6 02:14:14 2012
+++ src/sys/arch/alpha/jensenio/jensenio_dma.c Sat Oct 10 21:59:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio_dma.c,v 1.5 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: jensenio_dma.c,v 1.6 2020/10/10 21:59:03 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio_dma.c,v 1.5 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio_dma.c,v 1.6 2020/10/10 21:59:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,12 +123,6 @@ jensenio_dma_init(struct jensenio_config
t->_dmamem_map = _bus_dmamem_map;
t->_dmamem_unmap = _bus_dmamem_unmap;
t->_dmamem_mmap = _bus_dmamem_mmap;
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = 0; /* XXX */
- }
}
/*
Index: src/sys/arch/alpha/pci/apecs_dma.c
diff -u src/sys/arch/alpha/pci/apecs_dma.c:1.21 src/sys/arch/alpha/pci/apecs_dma.c:1.22
--- src/sys/arch/alpha/pci/apecs_dma.c:1.21 Mon Feb 6 02:14:14 2012
+++ src/sys/arch/alpha/pci/apecs_dma.c Sat Oct 10 21:59:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_dma.c,v 1.21 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: apecs_dma.c,v 1.22 2020/10/10 21:59:04 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.21 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -181,13 +181,6 @@ apecs_dma_init(struct apecs_config *acp)
alpha_mb();
APECS_TLB_INVALIDATE();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = APECS_DIRECT_MAPPED_BASE; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
Index: src/sys/arch/alpha/pci/mcpcia_dma.c
diff -u src/sys/arch/alpha/pci/mcpcia_dma.c:1.21 src/sys/arch/alpha/pci/mcpcia_dma.c:1.22
--- src/sys/arch/alpha/pci/mcpcia_dma.c:1.21 Mon Feb 6 02:14:14 2012
+++ src/sys/arch/alpha/pci/mcpcia_dma.c Sat Oct 10 21:59:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_dma.c,v 1.21 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: mcpcia_dma.c,v 1.22 2020/10/10 21:59:04 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.21 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,13 +240,6 @@ mcpcia_dma_init(struct mcpcia_config *cc
REGVAL(MCPCIA_W2_BASE(ccp)) =
MCPCIA_WBASE_EN | MCPCIA_WBASE_SG | MCPCIA_PCI_SG_MAPPED_BASE;
alpha_mb();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = MCPCIA_DIRECT_MAPPED_BASE;/* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
Index: src/sys/arch/alpha/pci/cia_dma.c
diff -u src/sys/arch/alpha/pci/cia_dma.c:1.29 src/sys/arch/alpha/pci/cia_dma.c:1.30
--- src/sys/arch/alpha/pci/cia_dma.c:1.29 Mon Nov 4 16:58:14 2013
+++ src/sys/arch/alpha/pci/cia_dma.c Sat Oct 10 21:59:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_dma.c,v 1.29 2013/11/04 16:58:14 christos Exp $ */
+/* $NetBSD: cia_dma.c,v 1.30 2020/10/10 21:59:04 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.29 2013/11/04 16:58:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.30 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,13 +234,6 @@ cia_dma_init(struct cia_config *ccp)
cia_tlb_invalidate_fn = cia_tlb_invalidate;
CIA_TLB_INVALIDATE();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = CIA_DIRECT_MAPPED_BASE; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
Index: src/sys/arch/alpha/pci/dwlpx_dma.c
diff -u src/sys/arch/alpha/pci/dwlpx_dma.c:1.25 src/sys/arch/alpha/pci/dwlpx_dma.c:1.26
--- src/sys/arch/alpha/pci/dwlpx_dma.c:1.25 Sun Nov 10 21:16:22 2019
+++ src/sys/arch/alpha/pci/dwlpx_dma.c Sat Oct 10 21:59:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_dma.c,v 1.25 2019/11/10 21:16:22 chs Exp $ */
+/* $NetBSD: dwlpx_dma.c,v 1.26 2020/10/10 21:59:04 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.25 2019/11/10 21:16:22 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.26 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,13 +239,6 @@ dwlpx_dma_init(struct dwlpx_config *ccp)
DWLPx_SG_MAPPED_BASE | PCIA_WBASE_W_EN | PCIA_WBASE_SG_EN;
alpha_mb();
}
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = DWLPx_DIRECT_MAPPED_BASE; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
Index: src/sys/arch/alpha/pci/irongate_dma.c
diff -u src/sys/arch/alpha/pci/irongate_dma.c:1.6 src/sys/arch/alpha/pci/irongate_dma.c:1.7
--- src/sys/arch/alpha/pci/irongate_dma.c:1.6 Fri Jul 1 19:19:49 2011
+++ src/sys/arch/alpha/pci/irongate_dma.c Sat Oct 10 21:59:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_dma.c,v 1.6 2011/07/01 19:19:49 dyoung Exp $ */
+/* $NetBSD: irongate_dma.c,v 1.7 2020/10/10 21:59:04 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.6 2011/07/01 19:19:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.7 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,13 +122,6 @@ irongate_dma_init(struct irongate_config
t->_dmamem_map = _bus_dmamem_map;
t->_dmamem_unmap = _bus_dmamem_unmap;
t->_dmamem_mmap = _bus_dmamem_mmap;
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = 0; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
Index: src/sys/arch/alpha/pci/lca_dma.c
diff -u src/sys/arch/alpha/pci/lca_dma.c:1.23 src/sys/arch/alpha/pci/lca_dma.c:1.24
--- src/sys/arch/alpha/pci/lca_dma.c:1.23 Mon Feb 6 02:14:14 2012
+++ src/sys/arch/alpha/pci/lca_dma.c Sat Oct 10 21:59:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_dma.c,v 1.23 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: lca_dma.c,v 1.24 2020/10/10 21:59:04 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.23 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.24 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,13 +186,6 @@ lca_dma_init(struct lca_config *lcp)
alpha_mb();
LCA_TLB_INVALIDATE();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = LCA_DIRECT_MAPPED_BASE; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
Index: src/sys/arch/alpha/pci/tsp_dma.c
diff -u src/sys/arch/alpha/pci/tsp_dma.c:1.13 src/sys/arch/alpha/pci/tsp_dma.c:1.14
--- src/sys/arch/alpha/pci/tsp_dma.c:1.13 Mon Sep 23 16:41:57 2013
+++ src/sys/arch/alpha/pci/tsp_dma.c Sat Oct 10 21:59:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_dma.c,v 1.13 2013/09/23 16:41:57 tsutsui Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.14 2020/10/10 21:59:04 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.13 2013/09/23 16:41:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.14 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -231,13 +231,6 @@ tsp_dma_init(struct tsp_config *pcp)
tsp_tlb_invalidate(pcp);
alpha_mb();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = dwbase; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
Index: src/sys/arch/alpha/pci/ttwoga_dma.c
diff -u src/sys/arch/alpha/pci/ttwoga_dma.c:1.7 src/sys/arch/alpha/pci/ttwoga_dma.c:1.8
--- src/sys/arch/alpha/pci/ttwoga_dma.c:1.7 Mon Feb 6 02:14:15 2012
+++ src/sys/arch/alpha/pci/ttwoga_dma.c Sat Oct 10 21:59:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga_dma.c,v 1.7 2012/02/06 02:14:15 matt Exp $ */
+/* $NetBSD: ttwoga_dma.c,v 1.8 2020/10/10 21:59:04 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.7 2012/02/06 02:14:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c,v 1.8 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -230,13 +230,6 @@ ttwoga_dma_init(struct ttwoga_config *tc
alpha_mb(); /* MAGIC */
tcp->tc_use_tlb = 1;
}
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = TTWOGA_DIRECT_MAPPED_BASE;/* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
Index: src/sys/arch/alpha/tc/tc_dma.c
diff -u src/sys/arch/alpha/tc/tc_dma.c:1.13 src/sys/arch/alpha/tc/tc_dma.c:1.14
--- src/sys/arch/alpha/tc/tc_dma.c:1.13 Fri Jul 1 19:19:50 2011
+++ src/sys/arch/alpha/tc/tc_dma.c Sat Oct 10 21:59:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma.c,v 1.13 2011/07/01 19:19:50 dyoung Exp $ */
+/* $NetBSD: tc_dma.c,v 1.14 2020/10/10 21:59:03 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.c,v 1.13 2011/07/01 19:19:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma.c,v 1.14 2020/10/10 21:59:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -69,11 +69,5 @@ struct alpha_bus_dma_tag tc_dmat_direct
void
tc_dma_init(void)
{
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = 0; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
+ /* Nada. */
}
