mirror of
https://github.com/freebsd/freebsd-src
synced 2024-11-05 18:22:52 +00:00
Removed some more old unused code/comments. Added hack to "fix" the
problem with some chipsets (UMC) remapping the 'hole' memory even when you've got 16MB. People were led to believe that since there was only 16MB of memory in the machine, that they were okay wrt the ISA DMA limit. This hack simply causes the extra memory to be ignored if it appears around the 16MB limit.
This commit is contained in:
David Greenman
parent
4b9f17c5b5
commit
f707f734a6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=988
2 changed files with 36 additions and 28 deletions
|
|
@ -35,7 +35,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.25 1994/01/14 16:23:35 davidg Exp $
|
||||
* $Id: machdep.c,v 1.26 1994/01/20 17:21:28 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
|
|
@ -183,11 +183,7 @@ cpu_startup()
|
|||
(name) = (type *)v; v = (caddr_t)((name)+(num))
|
||||
#define valloclim(name, type, num, lim) \
|
||||
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
|
||||
/* valloc(cfree, struct cblock, nclist); no clists any more!!! - cgd */
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef NetBSD
|
||||
valloc(swapmap, struct map, nswapmap = maxproc * 2);
|
||||
#endif
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
#endif
|
||||
|
|
@ -246,14 +242,6 @@ cpu_startup()
|
|||
*/
|
||||
buffer_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr,
|
||||
/* bufpages * */NBPG, TRUE);
|
||||
/*
|
||||
* Allocate a submap for exec arguments. This map effectively
|
||||
* limits the number of processes exec'ing at any time.
|
||||
*/
|
||||
/* exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr,
|
||||
* 16*NCARGS, TRUE);
|
||||
* NOT CURRENTLY USED -- cgd
|
||||
*/
|
||||
/*
|
||||
* Allocate a submap for physio
|
||||
*/
|
||||
|
|
@ -307,7 +295,7 @@ struct cpu_nameclass i386_cpus[] = {
|
|||
};
|
||||
|
||||
static void
|
||||
identifycpu() /* translated from hp300 -- cgd */
|
||||
identifycpu()
|
||||
{
|
||||
printf("CPU: ");
|
||||
if (cpu >= 0 && cpu < (sizeof i386_cpus/sizeof(struct cpu_nameclass))) {
|
||||
|
|
@ -1072,6 +1060,22 @@ init386(first)
|
|||
pagesinbase = biosbasemem * 1024 / NBPG;
|
||||
pagesinext = biosextmem * 1024 / NBPG;
|
||||
|
||||
/*
|
||||
* Special hack for chipsets that still remap the 384k hole when
|
||||
* there's 16MB of memory - this really confuses people that
|
||||
* are trying to use bus mastering ISA controllers with the
|
||||
* "16MB limit"; they only have 16MB, but the remapping puts
|
||||
* them beyond the limit.
|
||||
* XXX - this should be removed when bounce buffers are
|
||||
* implemented.
|
||||
*/
|
||||
/*
|
||||
* If extended memory is between 15-16MB (16-17MB phys address range),
|
||||
* chop it to 15MB.
|
||||
*/
|
||||
if ((pagesinext > 3840) && (pagesinext < 4096))
|
||||
pagesinext = 3840;
|
||||
|
||||
/*
|
||||
* Maxmem isn't the "maximum memory", it's the highest page of
|
||||
* of the physical address space. It should be "Maxphyspage".
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.25 1994/01/14 16:23:35 davidg Exp $
|
||||
* $Id: machdep.c,v 1.26 1994/01/20 17:21:28 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
|
|
@ -183,11 +183,7 @@ cpu_startup()
|
|||
(name) = (type *)v; v = (caddr_t)((name)+(num))
|
||||
#define valloclim(name, type, num, lim) \
|
||||
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
|
||||
/* valloc(cfree, struct cblock, nclist); no clists any more!!! - cgd */
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef NetBSD
|
||||
valloc(swapmap, struct map, nswapmap = maxproc * 2);
|
||||
#endif
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
#endif
|
||||
|
|
@ -246,14 +242,6 @@ cpu_startup()
|
|||
*/
|
||||
buffer_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr,
|
||||
/* bufpages * */NBPG, TRUE);
|
||||
/*
|
||||
* Allocate a submap for exec arguments. This map effectively
|
||||
* limits the number of processes exec'ing at any time.
|
||||
*/
|
||||
/* exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr,
|
||||
* 16*NCARGS, TRUE);
|
||||
* NOT CURRENTLY USED -- cgd
|
||||
*/
|
||||
/*
|
||||
* Allocate a submap for physio
|
||||
*/
|
||||
|
|
@ -307,7 +295,7 @@ struct cpu_nameclass i386_cpus[] = {
|
|||
};
|
||||
|
||||
static void
|
||||
identifycpu() /* translated from hp300 -- cgd */
|
||||
identifycpu()
|
||||
{
|
||||
printf("CPU: ");
|
||||
if (cpu >= 0 && cpu < (sizeof i386_cpus/sizeof(struct cpu_nameclass))) {
|
||||
|
|
@ -1072,6 +1060,22 @@ init386(first)
|
|||
pagesinbase = biosbasemem * 1024 / NBPG;
|
||||
pagesinext = biosextmem * 1024 / NBPG;
|
||||
|
||||
/*
|
||||
* Special hack for chipsets that still remap the 384k hole when
|
||||
* there's 16MB of memory - this really confuses people that
|
||||
* are trying to use bus mastering ISA controllers with the
|
||||
* "16MB limit"; they only have 16MB, but the remapping puts
|
||||
* them beyond the limit.
|
||||
* XXX - this should be removed when bounce buffers are
|
||||
* implemented.
|
||||
*/
|
||||
/*
|
||||
* If extended memory is between 15-16MB (16-17MB phys address range),
|
||||
* chop it to 15MB.
|
||||
*/
|
||||
if ((pagesinext > 3840) && (pagesinext < 4096))
|
||||
pagesinext = 3840;
|
||||
|
||||
/*
|
||||
* Maxmem isn't the "maximum memory", it's the highest page of
|
||||
* of the physical address space. It should be "Maxphyspage".
|
||||
|
|
|
|||
Loading…
Reference in a new issue