d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add inthand_add() and inthand_remove() for use by the MD bus code and

Browse Source 
some glue code.
This commit is contained in:
tmm 2001-10-12 16:06:41 +00:00
parent 05cbaa6ba0
commit 369a58f711
4 changed files with 197 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/sparc64/include/intr_machdep.h
View File

@ -39,6 +39,9 @@
#define IQE_SHIFT 5
#define IV_SHIFT 5
#define PIL_LOW 1 /* stray interrupts */
#define PIL_ITHREAD 2 /* interrupts that use ithreads */
#define PIL_FAST 13 /* fast interrupts */
#define PIL_TICK 14
typedef void ih_func_t(struct trapframe *);
@ -62,11 +65,14 @@ struct intr_queue {
u_long iq_tail;
};
struct ithd;
struct intr_vector {
iv_func_t *iv_func; /* must be first */
void *iv_arg;
struct ithd *iv_ithd;
u_int iv_pri;
u_int iv_pad[3];
int iv_stray;
};
extern struct intr_handler intr_handlers[];
@ -81,6 +87,10 @@ intr_dispatch(int level, struct trapframe *tf)
void intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf,
void *iva);
void intr_init(void);
int inthand_add(const char *name, int vec, void (*handler)(void *),
void *arg, int flags, void **cookiep);
int inthand_remove(int vec, void *cookie);
ih_func_t intr_dequeue;

181
sys/sparc64/sparc64/intr_machdep.c
View File

@ -1,3 +1,38 @@
/*-
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* William Jolitz.
*
* 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.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
*/
/*-
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
@ -23,36 +58,58 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* form: src/sys/i386/isa/intr_machdep.c,v 1.57 2001/07/20
*
* $FreeBSD$
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/queue.h>
#include <sys/bus.h>
#include <sys/interrupt.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/pcpu.h>
#include <sys/vmmeter.h>
#include <machine/frame.h>
#include <machine/globals.h>
#include <machine/intr_machdep.h>
#define NCPU MAXCPU
#define MAX_STRAY_LOG 5
struct intr_handler intr_handlers[NPIL];
struct intr_queue intr_queues[NCPU];
struct intr_vector intr_vectors[NIV];
/* protect the intr_vectors table */
static struct mtx intr_table_lock;
static void intr_stray(void *cookie);
void
intr_dequeue(struct trapframe *tf)
{
struct intr_queue *iq;
struct iqe *iqe;
critical_t crit;
u_long head;
u_long next;
u_long tail;
crit = critical_enter();
iq = PCPU_GET(iq);
for (head = iq->iq_head;; head = next) {
for (tail = iq->iq_tail; tail != head;) {
iqe = &iq->iq_queue[tail];
/* XXX: add per-vector counts... */
atomic_add_int(&cnt.v_intr, 1);
if (iqe->iqe_func != NULL)
iqe->iqe_func(iqe->iqe_arg);
tail = (tail + 1) & IQ_MASK;
@ -62,6 +119,7 @@ intr_dequeue(struct trapframe *tf)
if (head == next)
break;
}
critical_exit(crit);
}
void
@ -74,3 +132,126 @@ intr_setup(int pri, ih_func_t *ihf, int vec, iv_func_t *ivf, void *iva)
}
intr_handlers[pri].ih_func = ihf;
}
static void
intr_stray(void *cookie)
{
int vec;
vec = (int)(uintptr_t)cookie;
if (intr_vectors[vec].iv_stray < MAX_STRAY_LOG) {
printf("stray interrupt %d\n", vec);
atomic_add_int(&intr_vectors[vec].iv_stray, 1);
if (intr_vectors[vec].iv_stray == MAX_STRAY_LOG)
printf("got %d stray interrupt %d's: not logging "
"anymore\n", MAX_STRAY_LOG, vec);
}
}
void
intr_init()
{
int i;
mtx_init(&intr_table_lock, "ithread table lock", MTX_SPIN);
/* Mark all interrupts as being stray. */
for (i = 0; i < NIV; i++)
intr_setup(PIL_LOW, intr_dequeue, i, intr_stray,
(void *)(uintptr_t)i);
}
/* Schedule a heavyweight interrupt process. */
static void
sched_ithd(void *cookie)
{
int vec;
int error;
vec = (uintptr_t)cookie;
#ifdef notyet
error = ithread_schedule(intr_vectors[vec].iv_ithd);
#else
error = ithread_schedule(intr_vectors[vec].iv_ithd, 0);
#endif
if (error == EINVAL)
intr_stray(cookie);
}
int
inthand_add(const char *name, int vec, void (*handler)(void *), void *arg,
int flags, void **cookiep)
{
struct ithd *ithd; /* descriptor for the IRQ */
int errcode = 0;
int created_ithd = 0;
/*
* Work around a race where more than one CPU may be registering
* handlers on the same IRQ at the same time.
*/
mtx_lock_spin(&intr_table_lock);
ithd = intr_vectors[vec].iv_ithd;
mtx_unlock_spin(&intr_table_lock);
if (ithd == NULL) {
errcode = ithread_create(&ithd, vec, 0, NULL, NULL, "intr%d:",
vec);
if (errcode)
return (errcode);
mtx_lock_spin(&intr_table_lock);
if (intr_vectors[vec].iv_ithd == NULL) {
intr_vectors[vec].iv_ithd = ithd;
created_ithd++;
mtx_unlock_spin(&intr_table_lock);
} else {
struct ithd *orphan;
orphan = ithd;
ithd = intr_vectors[vec].iv_ithd;
mtx_unlock_spin(&intr_table_lock);
ithread_destroy(orphan);
}
}
errcode = ithread_add_handler(ithd, name, handler, arg,
ithread_priority(flags), flags, cookiep);
if ((flags & INTR_FAST) == 0 || errcode) {
intr_setup(PIL_ITHREAD, intr_dequeue, vec, sched_ithd,
(void *)(uintptr_t)vec);
errcode = 0;
}
if (errcode)
return (errcode);
if (flags & INTR_FAST)
intr_setup(PIL_FAST, intr_dequeue, vec, handler, arg);
intr_vectors[vec].iv_stray = 0;
/* XXX: name is not yet used. */
return (0);
}
int
inthand_remove(int vec, void *cookie)
{
int error;
error = ithread_remove_handler(cookie);
if (error == 0) {
/*
* XXX: maybe this should be done regardless of whether
* ithread_remove_handler() succeeded?
*/
mtx_lock_spin(&intr_table_lock);
if (intr_vectors[vec].iv_ithd == NULL) {
intr_setup(PIL_ITHREAD, intr_dequeue, vec, intr_stray,
(void *)(uintptr_t)vec);
} else {
intr_setup(PIL_LOW, intr_dequeue, vec, sched_ithd,
(void *)(uintptr_t)vec);
}
mtx_unlock_spin(&intr_table_lock);
}
return (error);
}

3
sys/sparc64/sparc64/machdep.c
View File

@ -53,6 +53,8 @@
#include <sys/proc.h>
#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/interrupt.h>
#include <sys/ptrace.h>
#include <sys/signalvar.h>
#include <sys/sysent.h>
@ -163,6 +165,7 @@ cpu_startup(void *arg)
globaldata_register(globalp);
intr_init();
tick_start(clock, tick_hardclock);
}

2
sys/sparc64/sparc64/trap.c
View File

@ -44,6 +44,8 @@
#include "opt_ktr.h"
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/interrupt.h>
#include <sys/ktr.h>
#include <sys/lock.h>
#include <sys/mutex.h>