diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2014-02-08 09:35:08 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-02-08 09:35:08 +0000 |
commit | 6891f66acd365c3ac555837089726ad52762ab79 (patch) | |
tree | 5b9931d5f06e46c54695e282713873f7b5ebc3bb /sys/arch | |
parent | 88dfd639a6c31fa31c39126013373f12f70a245d (diff) |
Add option MIPS_PTE64 to IP27/IP35 kernels, and no longer ignore memory
beyond 16GB physical.
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP27 | 3 | ||||
-rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP27 | 3 | ||||
-rw-r--r-- | sys/arch/sgi/sgi/autoconf.c | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27 index 2cb414a6131..42794f6d202 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.48 2013/11/15 19:42:20 sasano Exp $ +# $OpenBSD: GENERIC-IP27,v 1.49 2014/02/08 09:35:07 miod Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -27,6 +27,7 @@ option TGT_ORIGIN # IP27/IP35 option TGT_COHERENT # mandatory option ARCBIOS # mandatory option CPU_R10000 # R10000/R12000/R14000/R16000 support +option MIPS_PTE64 config bsd swap generic diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index 70367a9ae2e..4f9c65de9ac 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.28 2013/11/15 19:42:20 sasano Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.29 2014/02/08 09:35:07 miod Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -36,6 +36,7 @@ option TGT_ORIGIN # IP27/IP35 option TGT_COHERENT option ARCBIOS option CPU_R10000 # R10000/R12000/R14000/R16000 support +option MIPS_PTE64 # Specify storage configuration using ramdisk config bsd root on rd0a swap on rd0b diff --git a/sys/arch/sgi/sgi/autoconf.c b/sys/arch/sgi/sgi/autoconf.c index 87ab4e354b4..6abc740d0c0 100644 --- a/sys/arch/sgi/sgi/autoconf.c +++ b/sys/arch/sgi/sgi/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.36 2012/09/29 21:46:02 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.37 2014/02/08 09:35:07 miod Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. * @@ -194,6 +194,8 @@ memrange_register(uint64_t startpfn, uint64_t endpfn, uint64_t bmask) return 0; } #endif + +#ifndef MIPS_PTE64 /* * Prevent use of memory above 16GB physical, until pmap can support * this. @@ -202,6 +204,7 @@ memrange_register(uint64_t startpfn, uint64_t endpfn, uint64_t bmask) return 0; if (endpfn >= atop(16UL * 1024 * 1024 * 1024)) endpfn = atop(16UL * 1024 * 1024 * 1024); +#endif for (i = 0, cur = mem_layout; i < MAXMEMSEGS; i++, cur++) { if (cur->mem_last_page == 0) { @@ -443,7 +446,7 @@ arcs_device_register(struct device *dev, void *aux) #endif #if defined(TGT_INDIGO) || defined(TGT_INDY) || defined(TGT_INDIGO2) /* - * On Ind{igo,y,igo2} systems, the bootpath + * On Ind{igo,y,igo^2} systems, the bootpath * starts at scsi(). */ case SGI_IP20: |