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

Adapt to cpu_intr() change.

This commit is contained in:
soren 2000-04-28 15:55:51 +00:00
parent b093a1430b
commit 99e6adf31e
2 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
sys/arch/cobalt/cobalt/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.11 2000/04/12 04:30:35 nisimura Exp $ */ /* $NetBSD: machdep.c,v 1.12 2000/04/28 15:55:51 soren Exp $ */
/* /*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved. * Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@ -112,8 +112,6 @@ int safepri = MIPS1_PSL_LOWIPL;
extern caddr_t esym; extern caddr_t esym;
extern struct user *proc0paddr; extern struct user *proc0paddr;
static int cobalt_hardware_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
/* /*
* Do all the stuff that locore normally does before calling main(). * Do all the stuff that locore normally does before calling main().
*/ */
@ -243,8 +241,6 @@ mach_init(memsize)
if ((allocsys(v, NULL) - v) != size) if ((allocsys(v, NULL) - v) != size)
panic("mach_init: table size inconsistency"); panic("mach_init: table size inconsistency");
mips_hardware_intr = cobalt_hardware_intr;
pmap_bootstrap(); pmap_bootstrap();
} }
@ -490,17 +486,22 @@ cpu_intr_establish(level, ipl, func, arg)
return (void *)-1; return (void *)-1;
} }
static int void cpu_intr (u_int32_t, u_int32_t, u_int32_t, u_int32_t);
cobalt_hardware_intr(mask, pc, status, cause)
u_int32_t mask; void
u_int32_t pc; cpu_intr(status, cause, pc, ipending)
u_int32_t status; u_int32_t status;
u_int32_t cause; u_int32_t cause;
u_int32_t pc;
u_int32_t ipending;
{ {
struct clockframe cf; struct clockframe cf;
static u_int32_t cycles; static u_int32_t cycles;
int i;
if (cause & MIPS_INT_MASK_0) { uvmexp.intrs++;
if (ipending & MIPS_INT_MASK_0) {
volatile u_int32_t *irq_src = volatile u_int32_t *irq_src =
(u_int32_t *)MIPS_PHYS_TO_KSEG1(0x14000c18); (u_int32_t *)MIPS_PHYS_TO_KSEG1(0x14000c18);
@ -515,41 +516,40 @@ cobalt_hardware_intr(mask, pc, status, cause)
cause &= ~MIPS_INT_MASK_0; cause &= ~MIPS_INT_MASK_0;
} }
if (cause & MIPS_INT_MASK_5) { for (i = 0; i < 5; i++) {
if (ipending & (MIPS_INT_MASK_0 << i))
if (intrtab[i].func != NULL)
if ((*intrtab[i].func)(intrtab[i].arg))
cause &= ~(MIPS_INT_MASK_0 << i);
}
if (ipending & MIPS_INT_MASK_5) {
cycles = mips3_cycle_count(); cycles = mips3_cycle_count();
mips3_write_compare(cycles + 1250000); /* XXX */ mips3_write_compare(cycles + 1250000); /* XXX */
#if 0
cf.pc = pc; cf.pc = pc;
cf.sr = status; cf.sr = status;
#if 0
statclock(&cf); statclock(&cf);
#endif #endif
cause &= ~MIPS_INT_MASK_5; cause &= ~MIPS_INT_MASK_5;
} }
if (cause & MIPS_INT_MASK_1) { /* 'softnet' interrupt */
if (intrtab[1].func != NULL) if (ipending & MIPS_SOFT_INT_MASK_1) {
if ((*intrtab[1].func)(intrtab[1].arg)) clearsoftnet();
cause &= ~MIPS_INT_MASK_1; uvmexp.softs++;
netintr();
} }
if (cause & MIPS_INT_MASK_2) { /* 'softclock' interrupt */
if (intrtab[2].func != NULL) if (ipending & MIPS_SOFT_INT_MASK_0) {
if ((*intrtab[2].func)(intrtab[2].arg)) clearsoftclock();
cause &= ~MIPS_INT_MASK_2; uvmexp.softs++;
intrcnt[SOFTCLOCK_INTR]++;
softclock();
} }
if (cause & MIPS_INT_MASK_3) { _splset((status & ~cause & MIPS_HARD_INT_MASK) | MIPS_SR_INT_IE);
if (intrtab[3].func != NULL)
if ((*intrtab[3].func)(intrtab[3].arg))
cause &= ~MIPS_INT_MASK_3;
}
if (cause & MIPS_INT_MASK_4) {
if (intrtab[4].func != NULL)
if ((*intrtab[4].func)(intrtab[4].arg))
cause &= ~MIPS_INT_MASK_4;
}
return ((status & ~cause & MIPS_HARD_INT_MASK) | MIPS_SR_INT_IE);
} }

14
sys/arch/cobalt/include/intr.h
View File

@ -1,7 +1,4 @@
/* $NetBSD: intr.h,v 1.4 2000/04/03 11:44:21 soda Exp $ */ /* $NetBSD: intr.h,v 1.5 2000/04/28 15:55:52 soren Exp $ */
#include <mips/cpuregs.h>
#include <mips/intr.h>
#define IPL_NONE 0 /* Disable only this interrupt. */ #define IPL_NONE 0 /* Disable only this interrupt. */
#define IPL_BIO 1 /* Disable block I/O interrupts. */ #define IPL_BIO 1 /* Disable block I/O interrupts. */
@ -19,9 +16,18 @@
#define IST_EDGE 2 /* edge-triggered */ #define IST_EDGE 2 /* edge-triggered */
#define IST_LEVEL 3 /* level-triggered */ #define IST_LEVEL 3 /* level-triggered */
/* Soft interrupt masks. */
#define SIR_CLOCK 31
#define SIR_NET 30
#define SIR_CLOCKMASK ((1 << SIR_CLOCK))
#define SIR_NETMASK ((1 << SIR_NET) | SIR_CLOCKMASK)
#define SIR_ALLMASK (SIR_CLOCKMASK | SIR_NETMASK)
#ifdef _KERNEL #ifdef _KERNEL
#ifndef _LOCORE #ifndef _LOCORE
#include <mips/cpuregs.h>
extern int _splraise(int); extern int _splraise(int);
extern int _spllower(int); extern int _spllower(int);
extern int _splset(int); extern int _splset(int);