diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2011-04-03 22:34:55 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2011-04-03 22:34:55 +0000 |
| commit | 8a01737568aadf29ce62b74daf5982a820159a03 (patch) | |
| tree | a2885ea7bb36a656be0d99fdae99a33feaace543 | |
| parent | 272356258203cb77fea78a806845ea785e21a7d8 (diff) | |
Enable the use of all the memory found on IP27 and IP30 kernels. Committed
from an IP35 system with half its memory outside the dma_constraint range.
| -rw-r--r-- | sys/arch/sgi/sgi/ip30_machdep.c | 15 | ||||
| -rw-r--r-- | sys/arch/sgi/sgi/sginode.c | 25 |
2 files changed, 2 insertions, 38 deletions
diff --git a/sys/arch/sgi/sgi/ip30_machdep.c b/sys/arch/sgi/sgi/ip30_machdep.c index 9ea9d423b70..5447e2632c2 100644 --- a/sys/arch/sgi/sgi/ip30_machdep.c +++ b/sys/arch/sgi/sgi/ip30_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip30_machdep.c,v 1.44 2010/09/09 10:59:02 syuu Exp $ */ +/* $OpenBSD: ip30_machdep.c,v 1.45 2011/04/03 22:34:54 miod Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -137,19 +137,6 @@ ip30_setup() * Add memory not obtained through ARCBios. */ if (start >= IP30_MEMORY_BASE + IP30_MEMORY_ARCBIOS_LIMIT) { - /* - * XXX Temporary until there is a way to cope with - * XXX xbridge ATE shortage. - */ - if (end > (2UL << 30)) { -#if 0 - physmem += atop(end - (2UL << 30)); -#endif - end = 2UL << 30; - } - if (end <= start) - continue; - memrange_register(atop(start), atop(end), 0, VM_FREELIST_DEFAULT); } diff --git a/sys/arch/sgi/sgi/sginode.c b/sys/arch/sgi/sgi/sginode.c index d778d6576b2..2c3a450794b 100644 --- a/sys/arch/sgi/sgi/sginode.c +++ b/sys/arch/sgi/sgi/sginode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sginode.c,v 1.20 2010/09/17 00:04:30 miod Exp $ */ +/* $OpenBSD: sginode.c,v 1.21 2011/04/03 22:34:54 miod Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. * @@ -505,17 +505,6 @@ kl_add_memory_ip27(int16_t nasid, int16_t *sizes, unsigned int cnt) physmem += atop(32 << 20); } - /* - * XXX Temporary until there is a way to cope with - * XXX xbridge ATE shortage. - */ - if (fp >= atop(2UL << 30)) { -#if 0 - physmem += lp - fp; -#endif - continue; - } - if (memrange_register(fp, lp, ~(atop(1UL << kl_n_shift) - 1), lp <= atop(2UL << 30) ? @@ -566,17 +555,6 @@ kl_add_memory_ip35(int16_t nasid, int16_t *sizes, unsigned int cnt) physmem += atop(64 << 20); } - /* - * XXX Temporary until there is a way to cope with - * XXX xbridge ATE shortage. - */ - if (fp >= atop(2UL << 30)) { -#if 0 - physmem += lp - fp; -#endif - goto skip; - } - if (memrange_register(fp, lp, ~(atop(1UL << kl_n_shift) - 1), lp <= atop(2UL << 30) ? @@ -590,7 +568,6 @@ kl_add_memory_ip35(int16_t nasid, int16_t *sizes, unsigned int cnt) ptoa(np) >> 20); } } -skip: basepa += 1UL << 30; /* 1 GB */ } } |