From a4db62b632414fd1505e47f0be9e96f0cacd354c Mon Sep 17 00:00:00 2001 From: imp Date: Fri, 19 Sep 2008 04:16:13 +0000 Subject: MFp4: Merge interrupt code from p4 Submitted by: gonzo@ --- sys/mips/malta/gt_pci.c | 24 +++++++----------------- sys/mips/mips/intr_machdep.c | 28 ++++++++-------------------- 2 files changed, 15 insertions(+), 37 deletions(-) (limited to 'sys/mips') diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c index c999590..2bb8958 100644 --- a/sys/mips/malta/gt_pci.c +++ b/sys/mips/malta/gt_pci.c @@ -142,8 +142,7 @@ gt_pci_intr(void *v) { struct gt_pci_softc *sc = v; struct intr_event *event; - struct intr_handler *ih; - int irq, thread; + int irq; for (;;) { bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, PIC_OCW3, @@ -168,22 +167,13 @@ gt_pci_intr(void *v) } event = sc->sc_eventstab[irq]; - thread = 0; - if (event && !TAILQ_EMPTY(&event->ie_handlers)) - { - /* Execute fast handlers. */ - TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { - if (ih->ih_filter == NULL) - thread = 1; - else - ih->ih_filter(ih->ih_argument); - } - } + if (!event || TAILQ_EMPTY(&event->ie_handlers)) + continue; - /* Schedule thread if needed. */ - if (thread) - intr_event_schedule_thread(event); + /* TODO: frame instead of NULL? */ + intr_event_handle(event, NULL); + /* XXX: Log stray IRQs */ /* Send a specific EOI to the 8259. */ if (irq > 7) { @@ -657,7 +647,7 @@ gt_pci_setup_intr(device_t dev, device_t child, struct resource *ires, event = sc->sc_eventstab[irq]; if (event == NULL) { - error = intr_event_create(&event, (void *)irq, 0, 0, + error = intr_event_create(&event, (void *)irq, 0, irq, (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, (mask_fn)mips_unmask_irq, NULL, "gt_pci intr%d:", irq); if (error) diff --git a/sys/mips/mips/intr_machdep.c b/sys/mips/mips/intr_machdep.c index a487500..6725975 100644 --- a/sys/mips/mips/intr_machdep.c +++ b/sys/mips/mips/intr_machdep.c @@ -57,14 +57,12 @@ void mips_mask_irq(void) { - printf("Unimplemented: %s\n", __func__); } void mips_unmask_irq(void) { - printf("Unimplemented: %s\n", __func__); } void @@ -84,9 +82,9 @@ cpu_establish_hardintr(const char *name, driver_filter_t *filt, event = hardintr_events[irq]; if (event == NULL) { - error = intr_event_create(&event, (void *)irq, 0, 0, + error = intr_event_create(&event, (void *)irq, 0, irq, (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, - (mask_fn)mips_unmask_irq, NULL, "hard intr%d:", irq); + NULL, NULL, "hard intr%d:", irq); if (error) return; hardintr_events[irq] = event; @@ -121,9 +119,9 @@ cpu_establish_softintr(const char *name, driver_filter_t *filt, event = softintr_events[irq]; if (event == NULL) { - error = intr_event_create(&event, (void *)irq, 0, 0, + error = intr_event_create(&event, (void *)irq, 0, irq, (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, - (mask_fn)mips_unmask_irq, NULL, "intr%d:", irq); + NULL, NULL, "intr%d:", irq); if (error) return; softintr_events[irq] = event; @@ -138,10 +136,9 @@ cpu_establish_softintr(const char *name, driver_filter_t *filt, void cpu_intr(struct trapframe *tf) { - struct intr_handler *ih; struct intr_event *event; register_t cause; - int hard, i, intr, thread; + int hard, i, intr; critical_enter(); @@ -173,19 +170,10 @@ cpu_intr(struct trapframe *tf) continue; } - /* Execute fast handlers. */ - thread = 0; - TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { - if (ih->ih_filter == NULL) - thread = 1; - else - ih->ih_filter(ih->ih_argument ? - ih->ih_argument : tf); + if (intr_event_handle(event, tf) != 0) { + printf("stray %s interrupt %d\n", + hard ? "hard" : "soft", i); } - - /* Schedule thread if needed. */ - if (thread) - intr_event_schedule_thread(event); } KASSERT(i == 0, ("all interrupts handled")); -- cgit v1.1