e0f66ef861
and increase flexibility to allow various different approaches to be tried in the future. - Split struct ithd up into two pieces. struct intr_event holds the list of interrupt handlers associated with interrupt sources. struct intr_thread contains the data relative to an interrupt thread. Currently we still provide a 1:1 relationship of events to threads with the exception that events only have an associated thread if there is at least one threaded interrupt handler attached to the event. This means that on x86 we no longer have 4 bazillion interrupt threads with no handlers. It also means that interrupt events with only INTR_FAST handlers no longer have an associated thread either. - Renamed struct intrhand to struct intr_handler to follow the struct intr_foo naming convention. This did require renaming the powerpc MD struct intr_handler to struct ppc_intr_handler. - INTR_FAST no longer implies INTR_EXCL on all architectures except for powerpc. This means that multiple INTR_FAST handlers can attach to the same interrupt and that INTR_FAST and non-INTR_FAST handlers can attach to the same interrupt. Sharing INTR_FAST handlers may not always be desirable, but having sio(4) and uhci(4) fight over an IRQ isn't fun either. Drivers can always still use INTR_EXCL to ask for an interrupt exclusively. The way this sharing works is that when an interrupt comes in, all the INTR_FAST handlers are executed first, and if any threaded handlers exist, the interrupt thread is scheduled afterwards. This type of layout also makes it possible to investigate using interrupt filters ala OS X where the filter determines whether or not its companion threaded handler should run. - Aside from the INTR_FAST changes above, the impact on MD interrupt code is mostly just 's/ithread/intr_event/'. - A new MI ddb command 'show intrs' walks the list of interrupt events dumping their state. It also has a '/v' verbose switch which dumps info about all of the handlers attached to each event. - We currently don't destroy an interrupt thread when the last threaded handler is removed because it would suck for things like ppbus(8)'s braindead behavior. The code is present, though, it is just under #if 0 for now. - Move the code to actually execute the threaded handlers for an interrrupt event into a separate function so that ithread_loop() becomes more readable. Previously this code was all in the middle of ithread_loop() and indented halfway across the screen. - Made struct intr_thread private to kern_intr.c and replaced td_ithd with a thread private flag TDP_ITHREAD. - In statclock, check curthread against idlethread directly rather than curthread's proc against idlethread's proc. (Not really related to intr changes) Tested on: alpha, amd64, i386, sparc64 Tested on: arm, ia64 (older version of patch by cognet and marcel)
109 lines
3.7 KiB
C
109 lines
3.7 KiB
C
/*-
|
|
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* 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.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef __MACHINE_INTR_MACHDEP_H__
|
|
#define __MACHINE_INTR_MACHDEP_H__
|
|
|
|
#ifdef _KERNEL
|
|
|
|
/* With I/O APIC's we can have up to 191 interrupts. */
|
|
#define NUM_IO_INTS 191
|
|
#define INTRCNT_COUNT (1 + NUM_IO_INTS * 2)
|
|
|
|
#ifndef LOCORE
|
|
|
|
typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
|
|
|
|
#define IDTVEC(name) __CONCAT(X,name)
|
|
|
|
struct intsrc;
|
|
|
|
/*
|
|
* Methods that a PIC provides to mask/unmask a given interrupt source,
|
|
* "turn on" the interrupt on the CPU side by setting up an IDT entry, and
|
|
* return the vector associated with this source.
|
|
*/
|
|
struct pic {
|
|
void (*pic_enable_source)(struct intsrc *);
|
|
void (*pic_disable_source)(struct intsrc *, int);
|
|
void (*pic_eoi_source)(struct intsrc *);
|
|
void (*pic_enable_intr)(struct intsrc *);
|
|
int (*pic_vector)(struct intsrc *);
|
|
int (*pic_source_pending)(struct intsrc *);
|
|
void (*pic_suspend)(struct intsrc *);
|
|
void (*pic_resume)(struct intsrc *);
|
|
int (*pic_config_intr)(struct intsrc *, enum intr_trigger,
|
|
enum intr_polarity);
|
|
};
|
|
|
|
/* Flags for pic_disable_source() */
|
|
enum {
|
|
PIC_EOI,
|
|
PIC_NO_EOI,
|
|
};
|
|
|
|
/*
|
|
* An interrupt source. The upper-layer code uses the PIC methods to
|
|
* control a given source. The lower-layer PIC drivers can store additional
|
|
* private data in a given interrupt source such as an interrupt pin number
|
|
* or an I/O APIC pointer.
|
|
*/
|
|
struct intsrc {
|
|
struct pic *is_pic;
|
|
struct intr_event *is_event;
|
|
u_long *is_count;
|
|
u_long *is_straycount;
|
|
u_int is_index;
|
|
};
|
|
|
|
struct intrframe;
|
|
|
|
extern struct mtx icu_lock;
|
|
extern int elcr_found;
|
|
|
|
/* XXX: The elcr_* prototypes probably belong somewhere else. */
|
|
int elcr_probe(void);
|
|
enum intr_trigger elcr_read_trigger(u_int irq);
|
|
void elcr_resume(void);
|
|
void elcr_write_trigger(u_int irq, enum intr_trigger trigger);
|
|
int intr_add_handler(const char *name, int vector, driver_intr_t handler,
|
|
void *arg, enum intr_type flags, void **cookiep);
|
|
int intr_config_intr(int vector, enum intr_trigger trig,
|
|
enum intr_polarity pol);
|
|
void intr_execute_handlers(struct intsrc *isrc, struct intrframe *iframe);
|
|
struct intsrc *intr_lookup_source(int vector);
|
|
int intr_register_source(struct intsrc *isrc);
|
|
int intr_remove_handler(void *cookie);
|
|
void intr_resume(void);
|
|
void intr_suspend(void);
|
|
void intrcnt_add(const char *name, u_long **countp);
|
|
|
|
#endif /* !LOCORE */
|
|
#endif /* _KERNEL */
|
|
#endif /* !__MACHINE_INTR_MACHDEP_H__ */
|