Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a new "biosmem_implicit" variable that is set when a bootloader

Browse Source 
info parser sets "biosbasemem" and "biosextmem" from.  check for this
when probing memory size, rather than biosbasemem/biosextmem being
zero which is no longer true.  also, make the REALBASEMEM/REALEXTMEM
options work properly with multiboot-booted kernels.  fixes PR#33918.
This commit is contained in:
mrg 2006-07-31 20:59:07 +00:00
parent 19d3be8004
commit 95543a8e6e
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/arch/i386/i386/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.576 2006/07/08 20:30:00 christos Exp $ */
/* $NetBSD: machdep.c,v 1.577 2006/07/31 20:59:07 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.576 2006/07/08 20:30:00 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.577 2006/07/31 20:59:07 mrg Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@ -293,6 +293,9 @@ int biosextmem = 0;
int biosextmem = REALEXTMEM;
#endif
/* Set if any boot-loader set biosbasemem/biosextmem. */
int biosmem_implicit;
/* Representation of the bootinfo structure constructed by a NetBSD native
* boot loader. Only be used by native_loader(). */
struct bootinfo_source {
@ -376,10 +379,14 @@ native_loader(int bl_boothowto, int bl_bootdev,
* Configure biosbasemem and biosextmem only if they were not
* explicitly given during the kernel's build.
*/
if (*RELOC(int *, &biosbasemem) == 0)
if (*RELOC(int *, &biosbasemem) == 0) {
*RELOC(int *, &biosbasemem) = bl_biosbasemem;
if (*RELOC(int *, &biosextmem) == 0)
*RELOC(int *, &biosmem_implicit) = 1;
}
if (*RELOC(int *, &biosextmem) == 0) {
*RELOC(int *, &biosextmem) = bl_biosextmem;
*RELOC(int *, &biosmem_implicit) = 1;
}
#undef RELOC
}
@ -1553,7 +1560,7 @@ init386(paddr_t first_avail)
* Check to see if we have a memory map from the BIOS (passed
* to us by the boot program.
*/
if (biosbasemem == 0 && biosextmem == 0 &&
if ((biosmem_implicit || (biosbasemem == 0 && biosextmem == 0)) &&
(bim = lookup_bootinfo(BTINFO_MEMMAP)) != NULL && bim->num > 0) {
#ifdef DEBUG_MEMLOAD
printf("BIOS MEMORY MAP (%d ENTRIES):\n", bim->num);

19
sys/arch/i386/i386/multiboot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: multiboot.c,v 1.5 2006/07/16 21:16:22 christos Exp $ */
/* $NetBSD: multiboot.c,v 1.6 2006/07/31 20:59:07 mrg Exp $ */
/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: multiboot.c,v 1.5 2006/07/16 21:16:22 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: multiboot.c,v 1.6 2006/07/31 20:59:07 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -59,9 +59,12 @@ __KERNEL_RCSID(0, "$NetBSD: multiboot.c,v 1.5 2006/07/16 21:16:22 christos Exp $
/*
* External variables. All of them, with the exception of 'end', must
* be set at some point within this file.
*
* XXX these should be found in a header file!
*/
extern int biosbasemem;
extern int biosextmem;
extern int biosmem_implicit;
extern int boothowto;
extern struct bootinfo bootinfo;
extern int end;
@ -688,11 +691,19 @@ setup_memmap(struct multiboot_info *mi)
static void
setup_memory(struct multiboot_info *mi)
{
if (!(mi->mi_flags & MULTIBOOT_INFO_HAS_MEMORY))
return;
biosbasemem = mi->mi_mem_lower;
biosextmem = mi->mi_mem_upper;
/* Make sure we don't override user-set variables. */
if (biosbasemem == 0) {
biosbasemem = mi->mi_mem_lower;
biosmem_implicit = 1;
}
if (biosextmem == 0) {
biosextmem = mi->mi_mem_upper;
biosmem_implicit = 1;
}
}
/* --------------------------------------------------------------------- */