diff options
Diffstat (limited to 'sys/mips/nlm')
-rw-r--r-- | sys/mips/nlm/interrupt.h | 4 | ||||
-rw-r--r-- | sys/mips/nlm/intr_machdep.c | 50 | ||||
-rw-r--r-- | sys/mips/nlm/xlp_pci.c | 14 |
3 files changed, 35 insertions, 33 deletions
diff --git a/sys/mips/nlm/interrupt.h b/sys/mips/nlm/interrupt.h index e2aeb69..f50d682 100644 --- a/sys/mips/nlm/interrupt.h +++ b/sys/mips/nlm/interrupt.h @@ -68,9 +68,7 @@ * XLR needs custom pre and post handlers for PCI/PCI-e interrupts * XXX: maybe follow i386 intsrc model */ -void xlp_establish_intr(const char *name, driver_filter_t filt, - driver_intr_t handler, void *arg, int irq, int flags, - void **cookiep, void (*busack)(int)); void xlp_enable_irq(int irq); +void xlp_set_bus_ack(int irq, void (*ack)(int, void *), void *arg); #endif /* _RMI_INTERRUPT_H_ */ diff --git a/sys/mips/nlm/intr_machdep.c b/sys/mips/nlm/intr_machdep.c index 3d9c902..6b53d80 100644 --- a/sys/mips/nlm/intr_machdep.c +++ b/sys/mips/nlm/intr_machdep.c @@ -58,7 +58,8 @@ __FBSDID("$FreeBSD$"); #include <mips/nlm/xlp.h> struct xlp_intrsrc { - void (*busack)(int); /* Additional ack */ + void (*bus_ack)(int, void *); /* Additional ack */ + void *bus_ack_arg; /* arg for additional ack */ struct intr_event *ie; /* event corresponding to intr */ int irq; int irt; @@ -119,23 +120,13 @@ cpu_establish_softintr(const char *name, driver_filter_t * filt, panic("Soft interrupts unsupported!\n"); } -void -cpu_establish_hardintr(const char *name, driver_filter_t * filt, - void (*handler) (void *), void *arg, int irq, int flags, - void **cookiep) -{ - - xlp_establish_intr(name, filt, handler, arg, irq, flags, - cookiep, NULL); -} - static void xlp_post_filter(void *source) { struct xlp_intrsrc *src = source; - if (src->busack) - src->busack(src->irq); + if (src->bus_ack) + src->bus_ack(src->irq, src->bus_ack_arg); nlm_pic_ack(xlp_pic_base, src->irt); } @@ -144,8 +135,8 @@ xlp_pre_ithread(void *source) { struct xlp_intrsrc *src = source; - if (src->busack) - src->busack(src->irq); + if (src->bus_ack) + src->bus_ack(src->irq, src->bus_ack_arg); } static void @@ -157,19 +148,35 @@ xlp_post_ithread(void *source) } void -xlp_establish_intr(const char *name, driver_filter_t filt, - driver_intr_t handler, void *arg, int irq, int flags, - void **cookiep, void (*busack)(int)) +xlp_set_bus_ack(int irq, void (*ack)(int, void *), void *arg) +{ + struct xlp_intrsrc *src; + + KASSERT(irq > 0 && irq <= XLR_MAX_INTR, + ("%s called for bad hard intr %d", __func__, irq)); + + /* no locking needed - this will called early in boot */ + src = &xlp_interrupts[irq]; + KASSERT(src->ie != NULL, + ("%s called after IRQ enable for %d.", __func__, irq)); + src->bus_ack_arg = arg; + src->bus_ack = ack; +} + +void +cpu_establish_hardintr(const char *name, driver_filter_t * filt, + void (*handler) (void *), void *arg, int irq, int flags, + void **cookiep) { struct intr_event *ie; /* descriptor for the IRQ */ struct xlp_intrsrc *src = NULL; int errcode; - if (irq < 0 || irq > XLR_MAX_INTR) - panic("%s called for unknown hard intr %d", __func__, irq); + KASSERT(irq > 0 && irq <= XLR_MAX_INTR , + ("%s called for bad hard intr %d", __func__, irq)); /* - * FIXME locking - not needed now, because we do this only on + * Locking - not needed now, because we do this only on * startup from CPU0 */ src = &xlp_interrupts[irq]; @@ -194,7 +201,6 @@ xlp_establish_intr(const char *name, driver_filter_t filt, return; } src->irq = irq; - src->busack = busack; src->ie = ie; } if (XLP_IRQ_IS_PICINTR(irq)) { diff --git a/sys/mips/nlm/xlp_pci.c b/sys/mips/nlm/xlp_pci.c index 3c5f968..4e5957f 100644 --- a/sys/mips/nlm/xlp_pci.c +++ b/sys/mips/nlm/xlp_pci.c @@ -561,7 +561,7 @@ xlp_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr, } static void -bridge_pcie_ack(int irq) +bridge_pcie_ack(int irq, void *arg) { uint32_t node,reg; uint64_t base; @@ -597,7 +597,6 @@ mips_platform_pcib_setup_intr(device_t dev, device_t child, { int error = 0; int xlpirq; - void *extra_ack; error = rman_activate_resource(irq); if (error) @@ -656,12 +655,11 @@ mips_platform_pcib_setup_intr(device_t dev, device_t child, xlpirq = PIC_PCIE_IRQ(link); } - if (xlpirq >= PIC_PCIE_0_IRQ && xlpirq <= PIC_PCIE_3_IRQ) - extra_ack = bridge_pcie_ack; - else - extra_ack = NULL; - xlp_establish_intr(device_get_name(child), filt, - intr, arg, xlpirq, flags, cookiep, extra_ack); + /* if it is for real PCIe, we need to ack at bridge too */ + if (xlpirq >= PIC_PCIE_IRQ(0) && xlpirq <= PIC_PCIE_IRQ(3)) + xlp_set_bus_ack(xlpirq, bridge_pcie_ack, NULL); + cpu_establish_hardintr(device_get_name(child), filt, intr, arg, + xlpirq, flags, cookiep); return (0); } |