diff options
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/include/bus.h | 15 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/apecs_dma.c | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/cia_dma.c | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/lca_dma.c | 9 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/mcpcia_dma.c | 7 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/tsp_dma.c | 9 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/tc_dma.c | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/tc_dma_3000_500.c | 3 |
8 files changed, 11 insertions, 47 deletions
diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h index adb8c1421fc..64d22ea286d 100644 --- a/sys/arch/alpha/include/bus.h +++ b/sys/arch/alpha/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.24 2006/05/12 20:48:19 brad Exp $ */ +/* $OpenBSD: bus.h,v 1.25 2009/02/01 14:33:58 miod Exp $ */ /* $NetBSD: bus.h,v 1.10 1996/12/02 22:19:32 cgd Exp $ */ /* @@ -218,6 +218,9 @@ struct alpha_bus_space { #define bus_space_subregion(t, h, o, s, hp) \ (*(t)->abs_subregion)((t)->abs_cookie, (h), (o), (s), (hp)) +#define BUS_SPACE_MAP_CACHEABLE 0x01 +#define BUS_SPACE_MAP_LINEAR 0x02 +#define BUS_SPACE_MAP_PREFETCHABLE 0x04 /* * Allocation and deallocation operations. @@ -531,16 +534,6 @@ struct alpha_bus_dma_tag { struct alpha_sgmap *_sgmap; /* - * The SGMAP MMU implements a prefetch FIFO to keep data - * moving down the pipe, when doing host->bus DMA writes. - * The threshold (distance until the next page) used to - * trigger the prefetch is differnet on different chipsets, - * and we need to know what it is in order to know whether - * or not to allocate a spill page. - */ - bus_size_t _pfthresh; - - /* * Internal-use only utility methods. NOT TO BE USED BY * MACHINE-INDEPENDENT CODE! */ diff --git a/sys/arch/alpha/pci/apecs_dma.c b/sys/arch/alpha/pci/apecs_dma.c index 05657867cb2..af23cdf869b 100644 --- a/sys/arch/alpha/pci/apecs_dma.c +++ b/sys/arch/alpha/pci/apecs_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apecs_dma.c,v 1.6 2008/06/26 05:42:08 ray Exp $ */ +/* $OpenBSD: apecs_dma.c,v 1.7 2009/02/01 14:34:00 miod Exp $ */ /* $NetBSD: apecs_dma.c,v 1.13 2000/06/29 08:58:45 mrg Exp $ */ /*- @@ -80,9 +80,6 @@ void apecs_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); #define APECS_SGMAP_MAPPED_BASE (8*1024*1024) #define APECS_SGMAP_MAPPED_SIZE (8*1024*1024) -/* APECS has a 256-byte out-bound DMA prefetch threshold. */ -#define APECS_SGMAP_PFTHRESH 256 - /* * Macro to flush APECS scatter/gather TLB. */ @@ -136,7 +133,6 @@ apecs_dma_init(acp) t->_next_window = NULL; t->_boundary = 0; t->_sgmap = &acp->ac_sgmap; - t->_pfthresh = APECS_SGMAP_PFTHRESH; t->_get_tag = apecs_dma_get_tag; t->_dmamap_create = alpha_sgmap_dmamap_create; t->_dmamap_destroy = alpha_sgmap_dmamap_destroy; diff --git a/sys/arch/alpha/pci/cia_dma.c b/sys/arch/alpha/pci/cia_dma.c index 3ccc1103484..29b3ddae8f2 100644 --- a/sys/arch/alpha/pci/cia_dma.c +++ b/sys/arch/alpha/pci/cia_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cia_dma.c,v 1.9 2008/06/26 05:42:08 ray Exp $ */ +/* $OpenBSD: cia_dma.c,v 1.10 2009/02/01 14:34:00 miod Exp $ */ /* $NetBSD: cia_dma.c,v 1.16 2000/06/29 08:58:46 mrg Exp $ */ /*- @@ -83,9 +83,6 @@ void cia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); #define CIA_SGMAP_MAPPED_BASE (8*1024*1024) #define CIA_SGMAP_MAPPED_SIZE (8*1024*1024) -/* ALCOR/ALGOR2/PYXIS have a 256-byte out-bound DMA prefetch threshold. */ -#define CIA_SGMAP_PFTHRESH 256 - void cia_tlb_invalidate(void); void cia_broken_pyxis_tlb_invalidate(void); @@ -140,7 +137,6 @@ cia_dma_init(ccp) t->_next_window = NULL; t->_boundary = 0; t->_sgmap = &ccp->cc_sgmap; - t->_pfthresh = CIA_SGMAP_PFTHRESH; t->_get_tag = cia_dma_get_tag; t->_dmamap_create = alpha_sgmap_dmamap_create; t->_dmamap_destroy = alpha_sgmap_dmamap_destroy; diff --git a/sys/arch/alpha/pci/lca_dma.c b/sys/arch/alpha/pci/lca_dma.c index 1bc2bb7ffed..32c4215e9fd 100644 --- a/sys/arch/alpha/pci/lca_dma.c +++ b/sys/arch/alpha/pci/lca_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lca_dma.c,v 1.8 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: lca_dma.c,v 1.9 2009/02/01 14:34:00 miod Exp $ */ /* $NetBSD: lca_dma.c,v 1.13 2000/06/29 08:58:47 mrg Exp $ */ /*- @@ -81,12 +81,6 @@ void lca_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); #define LCA_SGMAP_MAPPED_SIZE (8*1024*1024) /* - * The LCA doesn't have a DMA prefetch threshold. However, it is known - * to lose if we don't allocate a spill page. So initialize it to 256. - */ -#define LCA_SGMAP_PFTHRESH 256 - -/* * Macro to flush LCA scatter/gather TLB. */ #define LCA_TLB_INVALIDATE() \ @@ -138,7 +132,6 @@ lca_dma_init(lcp) t->_next_window = NULL; t->_boundary = 0; t->_sgmap = &lcp->lc_sgmap; - t->_pfthresh = LCA_SGMAP_PFTHRESH; t->_get_tag = lca_dma_get_tag; t->_dmamap_create = alpha_sgmap_dmamap_create; diff --git a/sys/arch/alpha/pci/mcpcia_dma.c b/sys/arch/alpha/pci/mcpcia_dma.c index a1f2e96a458..14bdc5c83f2 100644 --- a/sys/arch/alpha/pci/mcpcia_dma.c +++ b/sys/arch/alpha/pci/mcpcia_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcpcia_dma.c,v 1.2 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: mcpcia_dma.c,v 1.3 2009/02/01 14:34:00 miod Exp $ */ /* $NetBSD: mcpcia_dma.c,v 1.15 2001/07/19 18:55:40 thorpej Exp $ */ /*- @@ -85,9 +85,6 @@ void mcpcia_bus_dmamap_unload_sgmap (bus_dma_tag_t, bus_dmamap_t); #define MCPCIA_ISA_SG_MAPPED_BASE (8*1024*1024) #define MCPCIA_ISA_SG_MAPPED_SIZE (8*1024*1024) -/* MCPCIA has a 256-byte out-bound DMA prefetch threshold. */ -#define MCPCIA_SG_MAPPED_PFTHRESH 256 - #define MCPCIA_SGTLB_INVALIDATE(ccp) \ do { \ alpha_mb(); \ @@ -137,7 +134,6 @@ mcpcia_dma_init(ccp) t->_next_window = NULL; t->_boundary = 0; t->_sgmap = &ccp->cc_pci_sgmap; - t->_pfthresh = MCPCIA_SG_MAPPED_PFTHRESH; t->_get_tag = mcpcia_dma_get_tag; t->_dmamap_create = alpha_sgmap_dmamap_create; t->_dmamap_destroy = alpha_sgmap_dmamap_destroy; @@ -164,7 +160,6 @@ mcpcia_dma_init(ccp) t->_next_window = NULL; t->_boundary = 0; t->_sgmap = &ccp->cc_isa_sgmap; - t->_pfthresh = MCPCIA_SG_MAPPED_PFTHRESH; t->_get_tag = mcpcia_dma_get_tag; t->_dmamap_create = alpha_sgmap_dmamap_create; t->_dmamap_destroy = alpha_sgmap_dmamap_destroy; diff --git a/sys/arch/alpha/pci/tsp_dma.c b/sys/arch/alpha/pci/tsp_dma.c index d822965c1cc..06264714dbb 100644 --- a/sys/arch/alpha/pci/tsp_dma.c +++ b/sys/arch/alpha/pci/tsp_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tsp_dma.c,v 1.6 2008/10/17 18:30:20 okan Exp $ */ +/* $OpenBSD: tsp_dma.c,v 1.7 2009/02/01 14:34:00 miod Exp $ */ /* $NetBSD: tsp_dma.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */ /*- @@ -104,12 +104,6 @@ void tsp_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); void tsp_tlb_invalidate(struct tsp_config *); -/* - * XXX Need to figure out what this is, if any. Initialize it to - * XXX something that should be safe. - */ -#define TSP_SGMAP_PFTHRESH 256 - void tsp_dma_init(pcp) struct tsp_config *pcp; @@ -178,7 +172,6 @@ tsp_dma_init(pcp) t->_next_window = NULL; t->_boundary = 0; t->_sgmap = &pcp->pc_sgmap; - t->_pfthresh = TSP_SGMAP_PFTHRESH; t->_get_tag = tsp_dma_get_tag; t->_dmamap_create = alpha_sgmap_dmamap_create; t->_dmamap_destroy = alpha_sgmap_dmamap_destroy; diff --git a/sys/arch/alpha/tc/tc_dma.c b/sys/arch/alpha/tc/tc_dma.c index 6e2bc67f8b4..365efdc655d 100644 --- a/sys/arch/alpha/tc/tc_dma.c +++ b/sys/arch/alpha/tc/tc_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_dma.c,v 1.3 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: tc_dma.c,v 1.4 2009/02/01 14:34:02 miod Exp $ */ /* $NetBSD: tc_dma.c,v 1.10 2001/07/19 06:40:02 thorpej Exp $ */ /*- @@ -47,7 +47,6 @@ struct alpha_bus_dma_tag tc_dmat_direct = { NULL, /* _next_window */ 0, /* _boundary */ NULL, /* _sgmap */ - 0, /* _pfthresh */ NULL, /* _get_tag */ _bus_dmamap_create, _bus_dmamap_destroy, diff --git a/sys/arch/alpha/tc/tc_dma_3000_500.c b/sys/arch/alpha/tc/tc_dma_3000_500.c index 4e511682f4a..a38a848121f 100644 --- a/sys/arch/alpha/tc/tc_dma_3000_500.c +++ b/sys/arch/alpha/tc/tc_dma_3000_500.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_dma_3000_500.c,v 1.4 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: tc_dma_3000_500.c,v 1.5 2009/02/01 14:34:02 miod Exp $ */ /* $NetBSD: tc_dma_3000_500.c,v 1.13 2001/07/19 06:40:03 thorpej Exp $ */ /*- @@ -54,7 +54,6 @@ struct alpha_bus_dma_tag tc_dmat_sgmap = { NULL, /* _next_window */ 0, /* _boundary */ NULL, /* _sgmap */ - 0, /* _pfthresh */ NULL, /* _get_tag */ tc_bus_dmamap_create_sgmap, tc_bus_dmamap_destroy_sgmap, |