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

Disable the NMI clock earlier, so the PROM does not touch the ZS chip 

while we are using it.  (No need to preserve orig_nmi_vect either).
This commit is contained in:
gwr 1995-01-18 17:22:40 +00:00
parent d6a8e3c88f
commit f110c449d8
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/sun3/sun3/isr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isr.c,v 1.15 1995/01/11 20:31:32 gwr Exp $ */
/* $NetBSD: isr.c,v 1.16 1995/01/18 17:22:40 gwr Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@ -71,9 +71,11 @@ void isr_init()
interrupt_reg = obio_find_mapping(OBIO_INTERREG, 1);
if (!interrupt_reg)
mon_panic("interrupt reg VA not found\n");
/* Turn off all interrupts until clock_attach */
*interrupt_reg = 0;
}
void isr_add_custom(level, handler) /* XXX */
void isr_add_custom(level, handler)
int level;
void (*handler)();
{

23
sys/arch/sun3/sun3/locore2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore2.c,v 1.30 1995/01/11 20:39:19 gwr Exp $ */
/* $NetBSD: locore2.c,v 1.31 1995/01/18 17:22:42 gwr Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@ -80,22 +80,17 @@ struct msgbuf *msgbufp = NULL;
extern vm_offset_t tmp_vpages[];
extern int physmem;
unsigned char *interrupt_reg;
unsigned int orig_nmi_vector;
vm_offset_t proc0_user_pa;
struct user *proc0paddr; /* proc[0] pcb address (u-area VA) */
extern struct pcb *curpcb;
/*
* Switch to our own interrupt vector table, but
* keep the PROM's NMI handler until clock_init
* Switch to our own interrupt vector table.
*/
static void initialize_vector_table()
{
int nmivec = AUTO_VECTOR_BASE + 7;
old_vector_table = getvbr();
orig_nmi_vector = old_vector_table[nmivec];
vector_table[nmivec] = (void (*)()) orig_nmi_vector;
setvbr((unsigned int *) vector_table);
}
@ -809,8 +804,8 @@ void internal_configure()
/* now other obio devices */
zs_init();
eeprom_init();
clock_init();
isr_init();
clock_init();
}
/*
@ -834,11 +829,17 @@ sun3_bootstrap()
sun3_verify_hardware();
initialize_vector_table(); /* point interrupts/exceptions to our table */
sun3_vm_init(); /* handle kernel mapping problems, etc */
pmap_bootstrap(); /* bootstrap pmap module */
internal_configure(); /* stuff that can't wait for configure() */
/*
* Point interrupts/exceptions to our table.
* This is done after internal_configure/isr_init finds
* the interrupt register and disables the NMI clock so
* it will not cause "spurrious level 7" complaints.
*/
initialize_vector_table();
}

23
sys/arch/sun3/sun3/sun3_startup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sun3_startup.c,v 1.30 1995/01/11 20:39:19 gwr Exp $ */
/* $NetBSD: sun3_startup.c,v 1.31 1995/01/18 17:22:42 gwr Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@ -80,22 +80,17 @@ struct msgbuf *msgbufp = NULL;
extern vm_offset_t tmp_vpages[];
extern int physmem;
unsigned char *interrupt_reg;
unsigned int orig_nmi_vector;
vm_offset_t proc0_user_pa;
struct user *proc0paddr; /* proc[0] pcb address (u-area VA) */
extern struct pcb *curpcb;
/*
* Switch to our own interrupt vector table, but
* keep the PROM's NMI handler until clock_init
* Switch to our own interrupt vector table.
*/
static void initialize_vector_table()
{
int nmivec = AUTO_VECTOR_BASE + 7;
old_vector_table = getvbr();
orig_nmi_vector = old_vector_table[nmivec];
vector_table[nmivec] = (void (*)()) orig_nmi_vector;
setvbr((unsigned int *) vector_table);
}
@ -809,8 +804,8 @@ void internal_configure()
/* now other obio devices */
zs_init();
eeprom_init();
clock_init();
isr_init();
clock_init();
}
/*
@ -834,11 +829,17 @@ sun3_bootstrap()
sun3_verify_hardware();
initialize_vector_table(); /* point interrupts/exceptions to our table */
sun3_vm_init(); /* handle kernel mapping problems, etc */
pmap_bootstrap(); /* bootstrap pmap module */
internal_configure(); /* stuff that can't wait for configure() */
/*
* Point interrupts/exceptions to our table.
* This is done after internal_configure/isr_init finds
* the interrupt register and disables the NMI clock so
* it will not cause "spurrious level 7" complaints.
*/
initialize_vector_table();
}