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

Move the code that does the deferred (post-autoconfiguration) buffer

Browse Source 
cache allocation to its own function, and call it at the end of configure().
This commit is contained in:
thorpej 1998-10-06 21:42:08 +00:00
parent abaeca8063
commit d374462dfc
3 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/i386/i386/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.29 1998/01/09 16:01:27 drochner Exp $ */
/* $NetBSD: autoconf.c,v 1.30 1998/10/06 21:42:08 thorpej Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -101,6 +101,9 @@ configure()
spl0();
cold = 0;
/* XXX Finish deferred buffer cache allocation. */
i386_bufinit();
}
void

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

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.325 1998/10/03 21:38:49 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.326 1998/10/06 21:42:08 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -384,7 +384,6 @@ cpu_startup()
unsigned i;
caddr_t v;
int sz;
int base, residual;
vaddr_t minaddr, maxaddr;
vsize_t size;
struct pcb *pcb;
@ -562,8 +561,37 @@ cpu_startup()
configure();
/*
* XXX Allocate physical pages for buffers; see above.
* Set up proc0's TSS and LDT.
*/
gdt_init();
curpcb = pcb = &proc0.p_addr->u_pcb;
pcb->pcb_flags = 0;
pcb->pcb_tss.tss_ioopt =
((caddr_t)pcb->pcb_iomap - (caddr_t)&pcb->pcb_tss) << 16;
for (x = 0; x < sizeof(pcb->pcb_iomap) / 4; x++)
pcb->pcb_iomap[x] = 0xffffffff;
pcb->pcb_ldt_sel = GSEL(GLDT_SEL, SEL_KPL);
pcb->pcb_cr0 = rcr0();
pcb->pcb_tss.tss_ss0 = GSEL(GDATA_SEL, SEL_KPL);
pcb->pcb_tss.tss_esp0 = (int)proc0.p_addr + USPACE - 16;
tss_alloc(pcb);
ltr(pcb->pcb_tss_sel);
lldt(pcb->pcb_ldt_sel);
proc0.p_md.md_regs = (struct trapframe *)pcb->pcb_tss.tss_esp0 - 1;
}
/*
* XXX Finish up the deferred buffer cache allocation and initialization.
*/
void
i386_bufinit()
{
int i, base, residual;
base = bufpages / nbuf;
residual = bufpages % nbuf;
for (i = 0; i < nbuf; i++) {
@ -623,29 +651,6 @@ cpu_startup()
* Set up buffers, so they can be used to read disk labels.
*/
bufinit();
/*
* Set up proc0's TSS and LDT.
*/
gdt_init();
curpcb = pcb = &proc0.p_addr->u_pcb;
pcb->pcb_flags = 0;
pcb->pcb_tss.tss_ioopt =
((caddr_t)pcb->pcb_iomap - (caddr_t)&pcb->pcb_tss) << 16;
for (x = 0; x < sizeof(pcb->pcb_iomap) / 4; x++)
pcb->pcb_iomap[x] = 0xffffffff;
pcb->pcb_ldt_sel = GSEL(GLDT_SEL, SEL_KPL);
pcb->pcb_cr0 = rcr0();
pcb->pcb_tss.tss_ss0 = GSEL(GDATA_SEL, SEL_KPL);
pcb->pcb_tss.tss_esp0 = (int)proc0.p_addr + USPACE - 16;
tss_alloc(pcb);
ltr(pcb->pcb_tss_sel);
lldt(pcb->pcb_ldt_sel);
proc0.p_md.md_regs = (struct trapframe *)pcb->pcb_tss.tss_esp0 - 1;
}
/*

3
sys/arch/i386/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.45 1998/10/06 20:50:16 thorpej Exp $ */
/* $NetBSD: cpu.h,v 1.46 1998/10/06 21:42:09 thorpej Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -132,6 +132,7 @@ extern struct cpu_cpuid_nameclass i386_cpuid_cpus[];
void delay __P((int));
void dumpconf __P((void));
void cpu_reset __P((void));
void i386_bufinit __P((void));
/* locore.s */
struct region_descriptor;