Substantially revamp the way that we determine the amount of memory available

for our use.  Use the same search order for BIOS memory size functions
as the kernel will later use.

Allow the loader to use all of the detected physical memory (this will
greatly help people trying to load enormous memory disk images).

More correctly handle running out of memory when loading an object.

Use the end of base memory for the top of the heap, rather than
blindly hoping that there is 384k left.

Add copyrights to a couple of files I forgot.

8 files changed, 165 insertions, 58 deletions

diff --git a/sys/boot/i386/libi386/biosmem.c b/sys/boot/i386/libi386/biosmem.c
index 1e4e540..4bab178 100644
--- a/sys/boot/i386/libi386/biosmem.c
+++ b/sys/boot/i386/libi386/biosmem.c
@@ -1,52 +1,105 @@
-/*
- * mjs copyright
+/*-
+ * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 /*
  * Obtain memory configuration information from the BIOS
- *
- * Note that we don't try too hard here; knowing the size of
- * base memory and extended memory out to 16 or 64M is enough for
- * the requirements of the bootstrap.
- *
- * We also maintain a pointer to the top of physical memory
- * once called to allow rangechecking of load/copy requests.
  */
 #include <stand.h>
 #include "btxv86.h"
 
 vm_offset_t	memtop;
+u_int32_t	bios_basemem, bios_extmem;
 
-/*
- * Return base memory size in kB.
- */
-int
-getbasemem(void)
-{
-    v86.ctl = 0;
-    v86.addr = 0x12;		/* int 0x12 */
-    v86int();
+#define SMAPSIG	0x534D4150
 
-    return(v86.eax & 0xffff);
-}
+struct smap {
+    u_int64_t	base;
+    u_int64_t	length;
+    u_int32_t	type;
+} __attribute__ ((packed));
 
-/*
- * Return extended memory size in kB
- */
-int
-getextmem(void)
+static struct smap smap;
+
+void
+bios_getmem(void)
 {
-    int		extkb;
-    
-    v86.ctl = 0;
-    v86.addr = 0x15;		/* int 0x15 function 0x88*/
-    v86.eax = 0x8800;
-    v86int();
-    extkb = v86.eax & 0xffff;
-
-    /* Set memtop to actual top or 16M, whicheve is less */
-    memtop = min((0x100000 + (extkb * 1024)), (16 * 1024 * 1024));
-    
-    return(extkb);
-}
+
+    /* Parse system memory map */
+    v86.ebx = 0;
+    do {
+	v86.ctl = V86_FLAGS;
+	v86.addr = 0x15;		/* int 0x15 function 0xe820*/
+	v86.eax = 0xe820;
+	v86.ecx = sizeof(struct smap);
+	v86.edx = SMAPSIG;
+	v86.es = VTOPSEG(&smap);
+	v86.edi = VTOPOFF(&smap);
+	v86int();
+	if ((v86.efl & 1) || (v86.eax != SMAPSIG))
+	    break;
+	/* look for a low-memory segment that's large enough */
+	if ((smap.type == 1) && (smap.base == 0) && (smap.length >= (512 * 1024)))
+	    bios_basemem = smap.length;
+	/* look for the first segment in 'extended' memory */
+	if ((smap.type == 1) && (smap.base == 0x100000)) {
+	    bios_extmem = smap.length;
+	}
+    } while (v86.ebx != 0);
+
+    /* Fall back to the old compatibility function for base memory */
+    if (bios_basemem == 0) {
+	v86.ctl = 0;
+	v86.addr = 0x12;		/* int 0x12 */
+	v86int();
+	
+	bios_basemem = (v86.eax & 0xffff) * 1024;
+    }
+
+    /* Fall back through several compatibility functions for extended memory */
+    if (bios_extmem == 0) {
+	v86.ctl = V86_FLAGS;
+	v86.addr = 0x15;		/* int 0x15 function 0xe801*/
+	v86.eax = 0xe801;
+	v86int();
+	if (!(v86.efl & 1)) {
+	    bios_extmem = ((v86.ecx & 0xffff) + ((v86.edx & 0xffff) * 64)) * 1024;
+	}
+    }
+    if (bios_extmem == 0) {
+	v86.ctl = 0;
+	v86.addr = 0x15;		/* int 0x15 function 0x88*/
+	v86.eax = 0x8800;
+	v86int();
+	bios_extmem = (v86.eax & 0xffff) * 1024;
+    }
+
+    /* Set memtop to actual top of memory */
+    memtop = 0x100000 + bios_extmem;
+
+}    
 
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 8363b9f..a8738e1 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -287,8 +287,8 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
         bi.bi_bios_geom[i] = bd_getbigeom(i);
     bi.bi_size = sizeof(bi);
     bi.bi_memsizes_valid = 1;
-    bi.bi_basemem = getbasemem();
-    bi.bi_extmem = getextmem();
+    bi.bi_basemem = bios_basemem / 1024;
+    bi.bi_extmem = bios_extmem / 1024;
 
     /* find the last module in the chain */
     addr = 0;
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index 8363b9f..a8738e1 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -287,8 +287,8 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
         bi.bi_bios_geom[i] = bd_getbigeom(i);
     bi.bi_size = sizeof(bi);
     bi.bi_memsizes_valid = 1;
-    bi.bi_basemem = getbasemem();
-    bi.bi_extmem = getextmem();
+    bi.bi_basemem = bios_basemem / 1024;
+    bi.bi_extmem = bios_extmem / 1024;
 
     /* find the last module in the chain */
     addr = 0;
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index 8363b9f..a8738e1 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -287,8 +287,8 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
         bi.bi_bios_geom[i] = bd_getbigeom(i);
     bi.bi_size = sizeof(bi);
     bi.bi_memsizes_valid = 1;
-    bi.bi_basemem = getbasemem();
-    bi.bi_extmem = getextmem();
+    bi.bi_basemem = bios_basemem / 1024;
+    bi.bi_extmem = bios_extmem / 1024;
 
     /* find the last module in the chain */
     addr = 0;
diff --git a/sys/boot/i386/libi386/i386_copy.c b/sys/boot/i386/libi386/i386_copy.c
index d0903f1..02f8b87 100644
--- a/sys/boot/i386/libi386/i386_copy.c
+++ b/sys/boot/i386/libi386/i386_copy.c
@@ -1,6 +1,31 @@
-/*
- * mjs copyright
+/*-
+ * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
+
 /*
  * MD primitives supporting placement of module data 
  *
@@ -16,8 +41,10 @@
 int
 i386_copyin(void *src, vm_offset_t dest, size_t len)
 {
-    if (dest + len >= memtop)
-	return(0);
+    if (dest + len >= memtop) {
+	errno = EFBIG;
+	return(-1);
+    }
 
     bcopy(src, PTOV(dest), len);
     return(len);
@@ -26,8 +53,10 @@ i386_copyin(void *src, vm_offset_t dest, size_t len)
 int
 i386_copyout(vm_offset_t src, void *dest, size_t len)
 {
-    if (src + len >= memtop)
-	return(0);
+    if (src + len >= memtop) {
+	errno = EFBIG;
+	return(-1);
+    }
     
     bcopy(PTOV(src), dest, len);
     return(len);
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index 1868faa..479f95c 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -72,8 +72,9 @@ extern int		i386_copyin(void *src, vm_offset_t dest, size_t len);
 extern int		i386_copyout(vm_offset_t src, void *dest, size_t len);
 extern int		i386_readin(int fd, vm_offset_t dest, size_t len);
 
-extern int		getbasemem(void);
-extern int		getextmem(void);
+extern void		bios_getmem(void);
+extern u_int32_t	bios_basemem;				/* base memory in bytes */
+extern u_int32_t	bios_extmem;				/* extended memory in bytes */
 extern vm_offset_t	memtop;
 
 extern void		gateA20(void);
diff --git a/sys/boot/i386/libi386/time.c b/sys/boot/i386/libi386/time.c
index a3f0f72..0a3981f 100644
--- a/sys/boot/i386/libi386/time.c
+++ b/sys/boot/i386/libi386/time.c
@@ -1,5 +1,29 @@
-/*
- * mjs copyright
+/*-
+ * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index 3277738..3e3771e 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -80,10 +80,9 @@ main(void)
 
     /* 
      * Initialise the heap as early as possible.  Once this is done, malloc() is usable.
-     *
-     * XXX better to locate end of memory and use that
      */
-    setheap((void *)end, (void *)(end + (384 * 1024)));
+    bios_getmem();
+    setheap((void *)end, (void *)bios_basemem);
     
     /* 
      * XXX Chicken-and-egg problem; we want to have console output early, but some
@@ -108,9 +107,10 @@ main(void)
     for (i = 0; devsw[i] != NULL; i++)
 	if (devsw[i]->dv_init != NULL)
 	    (devsw[i]->dv_init)();
+    printf("BIOS %dkB/%dkB available memory\n", bios_basemem / 1024, bios_extmem / 1024);
 
     printf("\n");
-    printf("%s, Revision %s  %d/%dkB\n", bootprog_name, bootprog_rev, getbasemem(), getextmem());
+    printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
     printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 
     extract_currdev();				/* set $currdev and $loaddev */