diff --git a/sys/boot/pc98/libpc98/biosmem.c b/sys/boot/pc98/libpc98/biosmem.c index 72bfae129437..e7864701266e 100644 --- a/sys/boot/pc98/libpc98/biosmem.c +++ b/sys/boot/pc98/libpc98/biosmem.c @@ -1,62 +1,113 @@ -/* - * mjs copyright +/*- + * Copyright (c) 1998 Michael Smith + * 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 #include "btxv86.h" vm_offset_t memtop; +u_int32_t bios_basemem, bios_extmem; -/* - * Return base memory size in kB. - */ -int -getbasemem(void) +#ifndef PC98 +#define SMAPSIG 0x534D4150 + +struct smap { + u_int64_t base; + u_int64_t length; + u_int32_t type; +} __attribute__ ((packed)); + +static struct smap smap; +#endif + +void +bios_getmem(void) { + #ifdef PC98 - return ((*(u_char *)PTOV(0xA1501)&0x07)+1)*128; + bios_basemem = ((*(u_char *)PTOV(0xA1501) & 0x07) + 1) * 128 * 1024; + bios_extmem = *(u_char *)PTOV(0xA1401) * 128 * 1024 + + *(u_int16_t *)PTOV(0xA1594) * 1024 * 1024; #else - v86.ctl = 0; - v86.addr = 0x12; /* int 0x12 */ - v86int(); + /* 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); - return(v86.eax & 0xffff); -#endif -} + /* 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; + } -/* - * Return extended memory size in kB - */ -int -getextmem(void) -{ - int extkb; - -#ifdef PC98 - extkb = *(u_char *)PTOV(0xA1401)*128 + *(unsigned short *)PTOV(0xA1594)*1024; -#else - v86.ctl = 0; - v86.addr = 0x15; /* int 0x15 function 0x88*/ - v86.eax = 0x8800; - v86int(); - extkb = v86.eax & 0xffff; + /* 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; + } #endif - /* Set memtop to actual top or 16M, whicheve is less */ - memtop = min((0x100000 + (extkb * 1024)), (16 * 1024 * 1024)); - - return(extkb); -} + /* Set memtop to actual top of memory */ + memtop = 0x100000 + bios_extmem; + +} diff --git a/sys/boot/pc98/libpc98/time.c b/sys/boot/pc98/libpc98/time.c index 3895a4278606..72938b0c1ebf 100644 --- a/sys/boot/pc98/libpc98/time.c +++ b/sys/boot/pc98/libpc98/time.c @@ -1,5 +1,27 @@ -/* - * mjs copyright +/*- + * Copyright (c) 1998 Michael Smith + * 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$ */ diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c index 62562c2819a5..1c58c37b589b 100644 --- a/sys/boot/pc98/loader/main.c +++ b/sys/boot/pc98/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 */