Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-4]: src/sys/arch/alpha/pci Pull up 1.10 -> 1.12.
details: https://anonhg.NetBSD.org/src/rev/5a89d73adb2f
branches: netbsd-1-4
changeset: 468319:5a89d73adb2f
user: thorpej <thorpej%NetBSD.org@localhost>
date: Fri Apr 16 23:39:45 1999 +0000
description:
Pull up 1.10 -> 1.12.
diffstat:
sys/arch/alpha/pci/mcpcia_dma.c | 154 ++++++++++++++++++++++++---------------
1 files changed, 93 insertions(+), 61 deletions(-)
diffs (287 lines):
diff -r 1b1c65ffe08a -r 5a89d73adb2f sys/arch/alpha/pci/mcpcia_dma.c
--- a/sys/arch/alpha/pci/mcpcia_dma.c Fri Apr 16 23:37:55 1999 +0000
+++ b/sys/arch/alpha/pci/mcpcia_dma.c Fri Apr 16 23:39:45 1999 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: mcpcia_dma.c,v 1.9.2.1 1999/04/07 08:12:40 pk Exp $ */
+/* $NetBSD: mcpcia_dma.c,v 1.9.2.2 1999/04/16 23:39:45 thorpej Exp $ */
/*-
- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.9.2.1 1999/04/07 08:12:40 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.9.2.2 1999/04/16 23:39:45 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,13 +79,16 @@
void mcpcia_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
/*
- * Direct-mapped window: 1G at 2G
- *
- * XXX Should consider making this 2G at 2G, and creating a 1G at 1G
- * XXX SGMAP window for fallback if we have more than 2G of RAM.
+ * Direct-mapped window: 2G at 2G
*/
#define MCPCIA_DIRECT_MAPPED_BASE (2UL*1024UL*1024UL*1024UL)
-#define MCPCIA_DIRECT_MAPPED_SIZE (1UL*1024UL*1024UL*1024UL)
+#define MCPCIA_DIRECT_MAPPED_SIZE (2UL*1024UL*1024UL*1024UL)
+
+/*
+ * SGMAP window for PCI: 1G at 1G
+ */
+#define MCPCIA_PCI_SG_MAPPED_BASE (1UL*1024UL*1024UL*1024UL)
+#define MCPCIA_PCI_SG_MAPPED_SIZE (1UL*1024UL*1024UL*1024UL)
/*
* SGMAP window for ISA: 8M at 8M
@@ -93,10 +96,12 @@
#define MCPCIA_ISA_SG_MAPPED_BASE (8*1024*1024)
#define MCPCIA_ISA_SG_MAPPED_SIZE (8*1024*1024)
-#define MCPCIA_SGTLB_INVALIDATE(mcp) \
- alpha_mb(), \
- REGVAL(MCPCIA_SG_TBIA(mcp)) = 0xdeadbeef, \
- alpha_mb()
+#define MCPCIA_SGTLB_INVALIDATE(ccp) \
+do { \
+ alpha_mb(); \
+ REGVAL(MCPCIA_SG_TBIA(ccp)) = 0xdeadbeef; \
+ alpha_mb(); \
+} while (0)
void
mcpcia_dma_init(ccp)
@@ -111,7 +116,7 @@
t->_cookie = ccp;
t->_wbase = MCPCIA_DIRECT_MAPPED_BASE;
t->_wsize = MCPCIA_DIRECT_MAPPED_SIZE;
- t->_next_window = NULL; /* XXX See above. */
+ t->_next_window = &ccp->cc_dmat_pci_sgmap;
t->_boundary = 0;
t->_sgmap = NULL;
t->_get_tag = mcpcia_dma_get_tag;
@@ -131,15 +136,41 @@
t->_dmamem_mmap = _bus_dmamem_mmap;
/*
+ * Initialize the DMA tag used for sgmap-mapped PCI DMA.
+ */
+ t = &ccp->cc_dmat_pci_sgmap;
+ t->_cookie = ccp;
+ t->_wbase = MCPCIA_PCI_SG_MAPPED_BASE;
+ t->_wsize = MCPCIA_PCI_SG_MAPPED_SIZE;
+ t->_next_window = NULL;
+ t->_boundary = 0;
+ t->_sgmap = &ccp->cc_pci_sgmap;
+ t->_get_tag = mcpcia_dma_get_tag;
+ t->_dmamap_create = mcpcia_bus_dmamap_create_sgmap;
+ t->_dmamap_destroy = mcpcia_bus_dmamap_destroy_sgmap;
+ t->_dmamap_load = mcpcia_bus_dmamap_load_sgmap;
+ t->_dmamap_load_mbuf = mcpcia_bus_dmamap_load_mbuf_sgmap;
+ t->_dmamap_load_uio = mcpcia_bus_dmamap_load_uio_sgmap;
+ t->_dmamap_load_raw = mcpcia_bus_dmamap_load_raw_sgmap;
+ t->_dmamap_unload = mcpcia_bus_dmamap_unload_sgmap;
+ t->_dmamap_sync = _bus_dmamap_sync;
+
+ t->_dmamem_alloc = _bus_dmamem_alloc;
+ t->_dmamem_free = _bus_dmamem_free;
+ t->_dmamem_map = _bus_dmamem_map;
+ t->_dmamem_unmap = _bus_dmamem_unmap;
+ t->_dmamem_mmap = _bus_dmamem_mmap;
+
+ /*
* Initialize the DMA tag used for sgmap-mapped ISA DMA.
*/
- t = &ccp->cc_dmat_sgmap;
+ t = &ccp->cc_dmat_isa_sgmap;
t->_cookie = ccp;
t->_wbase = MCPCIA_ISA_SG_MAPPED_BASE;
t->_wsize = MCPCIA_ISA_SG_MAPPED_SIZE;
t->_next_window = NULL;
t->_boundary = 0;
- t->_sgmap = &ccp->cc_sgmap;
+ t->_sgmap = &ccp->cc_isa_sgmap;
t->_get_tag = mcpcia_dma_get_tag;
t->_dmamap_create = mcpcia_bus_dmamap_create_sgmap;
t->_dmamap_destroy = mcpcia_bus_dmamap_destroy_sgmap;
@@ -157,68 +188,68 @@
t->_dmamem_mmap = _bus_dmamem_mmap;
/*
- * The SRM console is supposed to set up an 8MB direct mapped window
- * at 8MB (window 0) and a 1MB direct mapped window at 1MB. Useless.
- *
- * The DU && OpenVMS convention is to have an 8MB S/G window
- * at 8MB for window 0, a 1GB direct mapped window at 2GB
- * for window 1, a 1 GB S/G window at window 2 and a 512 MB
- * S/G window at window 3. This seems overkill.
- *
- * We'll just go with the 8MB S/G window and one 1GB direct window.
- * XXX See comment above.
+ * Initialize the SGMAPs.
*/
+ alpha_sgmap_init(&ccp->cc_dmat_pci_sgmap, &ccp->cc_pci_sgmap,
+ "mcpcia pci sgmap",
+ MCPCIA_PCI_SG_MAPPED_BASE, 0, MCPCIA_PCI_SG_MAPPED_SIZE,
+ sizeof(u_int64_t), NULL, 0);
- /*
- * Initialize the SGMAP.
- *
- * Must align page table to its size.
- */
- alpha_sgmap_init(t, &ccp->cc_sgmap, "mcpcia_sgmap",
+ alpha_sgmap_init(&ccp->cc_dmat_isa_sgmap, &ccp->cc_isa_sgmap,
+ "mcpcia isa sgmap",
MCPCIA_ISA_SG_MAPPED_BASE, 0, MCPCIA_ISA_SG_MAPPED_SIZE,
sizeof(u_int64_t), NULL, 0);
- if (ccp->cc_sgmap.aps_ptpa & (1024-1)) {
- panic("mcpcia_dma_init: bad page table address 0x%lx",
- ccp->cc_sgmap.aps_ptpa);
- }
-
/*
* Disable windows first.
*/
- REGVAL(MCPCIA_W0_BASE(ccp->cc_sc)) = 0;
- REGVAL(MCPCIA_W1_BASE(ccp->cc_sc)) = 0;
- REGVAL(MCPCIA_W2_BASE(ccp->cc_sc)) = 0;
- REGVAL(MCPCIA_W3_BASE(ccp->cc_sc)) = 0;
- REGVAL(MCPCIA_T0_BASE(ccp->cc_sc)) = 0;
- REGVAL(MCPCIA_T1_BASE(ccp->cc_sc)) = 0;
- REGVAL(MCPCIA_T2_BASE(ccp->cc_sc)) = 0;
- REGVAL(MCPCIA_T3_BASE(ccp->cc_sc)) = 0;
+ REGVAL(MCPCIA_W0_BASE(ccp)) = 0;
+ REGVAL(MCPCIA_W1_BASE(ccp)) = 0;
+ REGVAL(MCPCIA_W2_BASE(ccp)) = 0;
+ REGVAL(MCPCIA_W3_BASE(ccp)) = 0;
+ REGVAL(MCPCIA_T0_BASE(ccp)) = 0;
+ REGVAL(MCPCIA_T1_BASE(ccp)) = 0;
+ REGVAL(MCPCIA_T2_BASE(ccp)) = 0;
+ REGVAL(MCPCIA_T3_BASE(ccp)) = 0;
alpha_mb();
/*
* Set up window 0 as an 8MB SGMAP-mapped window starting at 8MB.
*/
- REGVAL(MCPCIA_W0_MASK(ccp->cc_sc)) = MCPCIA_WMASK_8M;
- REGVAL(MCPCIA_T0_BASE(ccp->cc_sc)) =
- ccp->cc_sgmap.aps_ptpa >> MCPCIA_TBASEX_SHIFT;
- REGVAL(MCPCIA_W0_BASE(ccp->cc_sc)) =
+ REGVAL(MCPCIA_W0_MASK(ccp)) = MCPCIA_WMASK_8M;
+ REGVAL(MCPCIA_T0_BASE(ccp)) =
+ ccp->cc_isa_sgmap.aps_ptpa >> MCPCIA_TBASEX_SHIFT;
+ alpha_mb();
+ REGVAL(MCPCIA_W0_BASE(ccp)) =
MCPCIA_WBASE_EN | MCPCIA_WBASE_SG | MCPCIA_ISA_SG_MAPPED_BASE;
alpha_mb();
- MCPCIA_SGTLB_INVALIDATE(ccp->cc_sc);
+ MCPCIA_SGTLB_INVALIDATE(ccp);
/*
- * Set up window 1 as a 1 GB Direct-mapped window starting at 2GB.
+ * Set up window 1 as a 2 GB Direct-mapped window starting at 2GB.
*/
- REGVAL(MCPCIA_W0_MASK(ccp->cc_sc)) = MCPCIA_WMASK_1G;
- REGVAL(MCPCIA_T0_BASE(ccp->cc_sc)) = 0;
- REGVAL(MCPCIA_W0_BASE(ccp->cc_sc)) =
+ REGVAL(MCPCIA_W1_MASK(ccp)) = MCPCIA_WMASK_2G;
+ REGVAL(MCPCIA_T1_BASE(ccp)) = 0;
+ alpha_mb();
+ REGVAL(MCPCIA_W1_BASE(ccp)) =
MCPCIA_DIRECT_MAPPED_BASE | MCPCIA_WBASE_EN;
alpha_mb();
+ /*
+ * Set up window 2 as a 1G SGMAP-mapped window starting at 1G.
+ */
+
+ REGVAL(MCPCIA_W2_MASK(ccp)) = MCPCIA_WMASK_1G;
+ REGVAL(MCPCIA_T2_BASE(ccp)) =
+ ccp->cc_pci_sgmap.aps_ptpa >> MCPCIA_TBASEX_SHIFT;
+ alpha_mb();
+ 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 */
@@ -242,8 +273,9 @@
case ALPHA_BUS_PCI:
case ALPHA_BUS_EISA:
/*
- * Just always use direct-mapped for now; see comment
- * above about chaining with SGMAPs.
+ * Start off using the direct-mapped window. We will
+ * automatically fall backed onto the chained PCI SGMAP
+ * window if necessary.
*/
return (&ccp->cc_dmat_direct);
@@ -253,7 +285,7 @@
* the direct-mapped DMA window, so we must use
* SGMAPs.
*/
- return (&ccp->cc_dmat_sgmap);
+ return (&ccp->cc_dmat_isa_sgmap);
default:
panic("mcpcia_dma_get_tag: shouldn't be here, really...");
@@ -327,7 +359,7 @@
error = pci_sgmap_pte64_load(t, map, buf, buflen, p, flags,
t->_sgmap);
if (error == 0)
- MCPCIA_SGTLB_INVALIDATE(ccp->cc_sc);
+ MCPCIA_SGTLB_INVALIDATE(ccp);
return (error);
}
@@ -346,7 +378,7 @@
error = pci_sgmap_pte64_load_mbuf(t, map, m, flags, t->_sgmap);
if (error == 0)
- MCPCIA_SGTLB_INVALIDATE(ccp->cc_sc);
+ MCPCIA_SGTLB_INVALIDATE(ccp);
return (error);
}
@@ -365,7 +397,7 @@
error = pci_sgmap_pte64_load_uio(t, map, uio, flags, t->_sgmap);
if (error == 0)
- MCPCIA_SGTLB_INVALIDATE(ccp->cc_sc);
+ MCPCIA_SGTLB_INVALIDATE(ccp);
return (error);
}
@@ -387,7 +419,7 @@
error = pci_sgmap_pte64_load_raw(t, map, segs, nsegs, size, flags,
t->_sgmap);
if (error == 0)
- MCPCIA_SGTLB_INVALIDATE(ccp->cc_sc);
+ MCPCIA_SGTLB_INVALIDATE(ccp);
return (error);
}
@@ -405,7 +437,7 @@
* Invalidate any SGMAP page table entries used by this mapping.
*/
pci_sgmap_pte64_unload(t, map, t->_sgmap);
- MCPCIA_SGTLB_INVALIDATE(ccp->cc_sc);
+ MCPCIA_SGTLB_INVALIDATE(ccp);
/*
* Do the generic bits of the unload.
Home |
Main Index |
Thread Index |
Old Index