diff options
| -rw-r--r-- | sys/arch/alpha/include/cpu.h | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/apecs.c | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/cia.c | 12 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/irongate.c | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/lca.c | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/pci_machdep.c | 7 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/pci_machdep.h | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/tsc.c | 3 |
8 files changed, 26 insertions, 11 deletions
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h index 79bbc8cc65f..acb607304ec 100644 --- a/sys/arch/alpha/include/cpu.h +++ b/sys/arch/alpha/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.12 2001/06/26 20:25:50 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.13 2001/06/26 21:13:43 art Exp $ */ /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */ /*- @@ -316,6 +316,7 @@ do { \ #define CPU_CHIPSET_MEM 1 /* PCI memory address */ #define CPU_CHIPSET_BWX 2 /* PCI supports BWX */ #define CPU_CHIPSET_TYPE 3 /* PCI chipset name */ +#define CPU_CHIPSET_DENSE 4 /* PCI chipset dense memory addr */ #define CTL_MACHDEP_NAMES { \ { 0, 0 }, \ diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c index 1a6d1d561ef..254fc3fea4b 100644 --- a/sys/arch/alpha/pci/apecs.c +++ b/sys/arch/alpha/pci/apecs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apecs.c,v 1.12 2001/06/26 20:46:18 art Exp $ */ +/* $OpenBSD: apecs.c,v 1.13 2001/06/26 21:13:43 art Exp $ */ /* $NetBSD: apecs.c,v 1.16 1996/12/05 01:39:34 cgd Exp $ */ /*- @@ -167,6 +167,7 @@ apecs_init(acp, mallocsafe) alpha_pci_chipset = &acp->ac_pc; alpha_pci_chipset->pc_name = "apecs"; alpha_pci_chipset->pc_mem = APECS_PCI_SPARSE; + alpha_pci_chipset->pc_dense = APECS_PCI_DENSE; alpha_pci_chipset->pc_bwx = 0; acp->ac_initted = 1; diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c index 10dadb1a97f..c382144d8f9 100644 --- a/sys/arch/alpha/pci/cia.c +++ b/sys/arch/alpha/pci/cia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cia.c,v 1.13 2001/06/26 20:46:18 art Exp $ */ +/* $OpenBSD: cia.c,v 1.14 2001/06/26 21:13:43 art Exp $ */ /* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */ /*- @@ -248,8 +248,14 @@ cia_init(ccp, mallocsafe) cia_pci_init(&ccp->cc_pc, ccp); alpha_pci_chipset = &ccp->cc_pc; alpha_pci_chipset->pc_name = "cia"; - alpha_pci_chipset->pc_mem = CIA_EV56_BWMEM; - alpha_pci_chipset->pc_bwx = pci_use_bwx; + alpha_pci_chipset->pc_dense = CIA_PCI_DENSE; + if (ccp->cc_flags & CCF_BUS_USE_BWX) { + alpha_pci_chipset->pc_mem = CIA_EV56_BWMEM; + alpha_pci_chipset->pc_bwx = 1; + } else { + alpha_pci_chipset->pc_mem = CIA_PCI_SMEM1; + alpha_pci_chipset->pc_bwx = 0; + } ccp->cc_initted = 1; } diff --git a/sys/arch/alpha/pci/irongate.c b/sys/arch/alpha/pci/irongate.c index 0438ff5107a..7d6d9dec87b 100644 --- a/sys/arch/alpha/pci/irongate.c +++ b/sys/arch/alpha/pci/irongate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: irongate.c,v 1.3 2001/06/26 20:46:18 art Exp $ */ +/* $OpenBSD: irongate.c,v 1.4 2001/06/26 21:13:43 art Exp $ */ /* $NetBSD: irongate.c,v 1.3 2000/11/29 06:29:10 thorpej Exp $ */ /*- @@ -98,6 +98,7 @@ irongate_init(struct irongate_config *icp, int mallocsafe) alpha_pci_chipset = &icp->ic_pc; alpha_pci_chipset->pc_name = "irongate"; alpha_pci_chipset->pc_mem = IRONGATE_MEM_BASE; + alpha_pci_chipset->pc_mem = IRONGATE_MEM_BASE; alpha_pci_chipset->pc_bwx = 1; tag = pci_make_tag(&icp->ic_pc, 0, IRONGATE_PCIHOST_DEV, 0); diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c index 5564c3ccf0a..12bd63be79f 100644 --- a/sys/arch/alpha/pci/lca.c +++ b/sys/arch/alpha/pci/lca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lca.c,v 1.11 2001/06/26 20:46:18 art Exp $ */ +/* $OpenBSD: lca.c,v 1.12 2001/06/26 21:13:43 art Exp $ */ /* $NetBSD: lca.c,v 1.14 1996/12/05 01:39:35 cgd Exp $ */ /*- @@ -169,6 +169,7 @@ lca_init(lcp, mallocsafe) alpha_pci_chipset = &lcp->lc_pc; alpha_pci_chipset->pc_name = "lca"; alpha_pci_chipset->pc_mem = LCA_PCI_SPARSE; + alpha_pci_chipset->pc_dense = LCA_PCI_DENSE; alpha_pci_chipset->pc_bwx = 0; /* diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c index c1aa3144c65..a4b45a153b2 100644 --- a/sys/arch/alpha/pci/pci_machdep.c +++ b/sys/arch/alpha/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.11 2001/06/26 20:25:51 art Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.12 2001/06/26 21:13:43 art Exp $ */ /* $NetBSD: pci_machdep.c,v 1.7 1996/11/19 04:57:32 cgd Exp $ */ /* @@ -124,7 +124,10 @@ alpha_sysctl_chipset(int *name, u_int namelen, char *where, size_t *sizep) alpha_pci_chipset->pc_bwx)); case CPU_CHIPSET_MEM: return (sysctl_rdquad(where, sizep, NULL, - alpha_pci_chipset->pc_bwx)); + alpha_pci_chipset->pc_mem)); + case CPU_CHIPSET_DENSE: + return (sysctl_rdquad(where, sizep, NULL, + alpha_pci_chipset->pc_dense)); default: return (EOPNOTSUPP); } diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h index b3d7df1451f..49d25d81145 100644 --- a/sys/arch/alpha/pci/pci_machdep.h +++ b/sys/arch/alpha/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.13 2001/06/26 20:25:51 art Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.14 2001/06/26 21:13:44 art Exp $ */ /* $NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $ */ /* @@ -75,6 +75,7 @@ struct alpha_pci_chipset { void *)); char *pc_name; /* PCI chipset name */ vaddr_t pc_mem; /* PCI memory address */ + vaddr_t pc_dense; /* PCI dense memory address */ int pc_bwx; /* chipset supports BWX */ }; diff --git a/sys/arch/alpha/pci/tsc.c b/sys/arch/alpha/pci/tsc.c index ae4a444af13..2a151f3b2c2 100644 --- a/sys/arch/alpha/pci/tsc.c +++ b/sys/arch/alpha/pci/tsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tsc.c,v 1.3 2001/06/26 20:46:18 art Exp $ */ +/* $OpenBSD: tsc.c,v 1.4 2001/06/26 21:13:44 art Exp $ */ /* $NetBSD: tsc.c,v 1.3 2000/06/25 19:17:40 thorpej Exp $ */ /*- @@ -234,6 +234,7 @@ tsp_init(mallocsafe, n) alpha_pci_chipset = &pcp->pc_pc; alpha_pci_chipset->pc_name = "tsunami"; alpha_pci_chipset->pc_mem = TS_P0(0); + alpha_pci_chipset->pc_dense = TS_P0(0); alpha_pci_chipset->pc_bwx = 1; pcp->pc_initted = 1; return pcp; |