summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2004-01-26 22:58:16 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2004-01-26 22:58:16 +0000
commitc658dbd468a2f7a4d160f6711db1796c8b6dbbbc (patch)
tree38fa955083b7d1ca4e1f639bdc35b2c1441b07d1
parentfc544632966d52e6a500b4b43dae6a159c426d68 (diff)
Map segment 8 with a BAT again for now, for NVRAM access. This is only
temporary.
-rw-r--r--sys/arch/mvmeppc/mvmeppc/machdep.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index f83c4828a2b..c9a96af4525 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.41 2004/01/25 23:04:11 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.42 2004/01/26 22:58:15 miod Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -163,7 +163,7 @@ struct extent *devio_ex;
static int devio_malloc_safe = 0;
/* HACK - XXX */
-int segment8_mapped = 0;
+int segment8_mapped = 1;
int segmentC_mapped = 0;
void
@@ -217,6 +217,8 @@ initppc(startkernel, endkernel, args)
*/
battable[0].batl = BATL(0x00000000, BAT_M);
battable[0].batu = BATU(0x00000000);
+ battable[8].batl = BATL(0x80000000, BAT_I);
+ battable[8].batu = BATU(0x80000000);
/*
* Now setup fixed bat registers
@@ -232,6 +234,10 @@ initppc(startkernel, endkernel, args)
ppc_mtdbat0l(battable[0].batl);
ppc_mtdbat0u(battable[0].batu);
+ /* DBAT2 used for ISA space */
+ ppc_mtdbat2l(battable[8].batl);
+ ppc_mtdbat2u(battable[8].batu);
+
/*
* Set up trap vectors
*/
@@ -298,7 +304,7 @@ initppc(startkernel, endkernel, args)
pmap_bootstrap(startkernel, endkernel);
#if 1
- /* MVME2[67]00 max out at 256MB */
+ /* MVME2[67]00 max out at 256MB, and we need BAT2 for now. */
#else
/* use BATs to map 1GB memory, no pageable BATs now */
if (physmem > btoc(0x10000000)) {