follow-up to r336635, update TAILQ to CK_SLIST for ie_handlers
arm, mips and sparc64 were affected.
This commit is contained in:
parent
d05db9a4ff
commit
2559473944
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336639
@ -170,7 +170,7 @@ arm_remove_irqhandler(int irq, void *cookie)
|
|||||||
|
|
||||||
error = intr_event_remove_handler(cookie);
|
error = intr_event_remove_handler(cookie);
|
||||||
|
|
||||||
if (!TAILQ_EMPTY(&event->ie_handlers))
|
if (!CK_SLIST_EMPTY(&event->ie_handlers))
|
||||||
arm_unmask_irq(irq);
|
arm_unmask_irq(irq);
|
||||||
return (error);
|
return (error);
|
||||||
}
|
}
|
||||||
|
@ -515,7 +515,8 @@ mv_gpio_intr_handler(device_t dev, int pin)
|
|||||||
#endif
|
#endif
|
||||||
isrc.isrc_event = sc->gpio_events[pin];
|
isrc.isrc_event = sc->gpio_events[pin];
|
||||||
|
|
||||||
if (isrc.isrc_event == NULL || TAILQ_EMPTY(&isrc.isrc_event->ie_handlers))
|
if (isrc.isrc_event == NULL ||
|
||||||
|
CK_SLIST_EMPTY(&isrc.isrc_event->ie_handlers))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
intr_isrc_dispatch(&isrc, NULL);
|
intr_isrc_dispatch(&isrc, NULL);
|
||||||
|
@ -382,7 +382,7 @@ apb_filter(void *arg)
|
|||||||
event = sc->sc_eventstab[irq];
|
event = sc->sc_eventstab[irq];
|
||||||
/* always count interrupts; spurious or otherwise */
|
/* always count interrupts; spurious or otherwise */
|
||||||
mips_intrcnt_inc(sc->sc_intr_counter[irq]);
|
mips_intrcnt_inc(sc->sc_intr_counter[irq]);
|
||||||
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
|
if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
|
||||||
if (irq == APB_INTR_PMC) {
|
if (irq == APB_INTR_PMC) {
|
||||||
td = PCPU_GET(curthread);
|
td = PCPU_GET(curthread);
|
||||||
tf = td->td_intr_frame;
|
tf = td->td_intr_frame;
|
||||||
|
@ -508,7 +508,7 @@ apb_filter(void *arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
event = sc->sc_eventstab[irq];
|
event = sc->sc_eventstab[irq];
|
||||||
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
|
if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
|
||||||
if(irq == 1 && ar531x_soc < AR531X_SOC_AR5315) {
|
if(irq == 1 && ar531x_soc < AR531X_SOC_AR5315) {
|
||||||
ATH_READ_REG(AR5312_SYSREG_BASE +
|
ATH_READ_REG(AR5312_SYSREG_BASE +
|
||||||
AR5312_SYSREG_AHBPERR);
|
AR5312_SYSREG_AHBPERR);
|
||||||
|
@ -630,7 +630,7 @@ ar71xx_pci_intr(void *arg)
|
|||||||
for (irq = AR71XX_PCI_IRQ_START; irq <= AR71XX_PCI_IRQ_END; irq++) {
|
for (irq = AR71XX_PCI_IRQ_START; irq <= AR71XX_PCI_IRQ_END; irq++) {
|
||||||
if (reg & (1 << irq)) {
|
if (reg & (1 << irq)) {
|
||||||
event = sc->sc_eventstab[irq];
|
event = sc->sc_eventstab[irq];
|
||||||
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
|
if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
|
||||||
/* Ignore timer interrupts */
|
/* Ignore timer interrupts */
|
||||||
if (irq != 0)
|
if (irq != 0)
|
||||||
printf("Stray IRQ %d\n", irq);
|
printf("Stray IRQ %d\n", irq);
|
||||||
|
@ -605,7 +605,7 @@ ar724x_pci_intr(void *arg)
|
|||||||
|
|
||||||
irq = AR71XX_PCI_IRQ_START;
|
irq = AR71XX_PCI_IRQ_START;
|
||||||
event = sc->sc_eventstab[irq];
|
event = sc->sc_eventstab[irq];
|
||||||
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
|
if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
|
||||||
printf("Stray IRQ %d\n", irq);
|
printf("Stray IRQ %d\n", irq);
|
||||||
return (FILTER_STRAY);
|
return (FILTER_STRAY);
|
||||||
}
|
}
|
||||||
|
@ -539,7 +539,7 @@ qca955x_pci_intr(void *arg)
|
|||||||
if (reg & QCA955X_PCI_INTR_DEV0) {
|
if (reg & QCA955X_PCI_INTR_DEV0) {
|
||||||
irq = AR71XX_PCI_IRQ_START;
|
irq = AR71XX_PCI_IRQ_START;
|
||||||
event = sc->sc_eventstab[irq];
|
event = sc->sc_eventstab[irq];
|
||||||
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
|
if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
|
||||||
printf("Stray IRQ %d\n", irq);
|
printf("Stray IRQ %d\n", irq);
|
||||||
return (FILTER_STRAY);
|
return (FILTER_STRAY);
|
||||||
}
|
}
|
||||||
|
@ -231,7 +231,7 @@ gt_pci_intr(void *v)
|
|||||||
|
|
||||||
event = sc->sc_eventstab[irq];
|
event = sc->sc_eventstab[irq];
|
||||||
|
|
||||||
if (!event || TAILQ_EMPTY(&event->ie_handlers))
|
if (!event || CK_SLIST_EMPTY(&event->ie_handlers))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* TODO: frame instead of NULL? */
|
/* TODO: frame instead of NULL? */
|
||||||
|
@ -762,7 +762,7 @@ mtk_pci_intr(void *arg)
|
|||||||
if (reg & (1u<<irq)) {
|
if (reg & (1u<<irq)) {
|
||||||
irqidx = irq - sc->sc_irq_start;
|
irqidx = irq - sc->sc_irq_start;
|
||||||
event = sc->sc_eventstab[irqidx];
|
event = sc->sc_eventstab[irqidx];
|
||||||
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
|
if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
|
||||||
if (irq != 0)
|
if (irq != 0)
|
||||||
printf("Stray PCI IRQ %d\n", irq);
|
printf("Stray PCI IRQ %d\n", irq);
|
||||||
continue;
|
continue;
|
||||||
|
@ -257,7 +257,7 @@ cpu_intr(struct trapframe *tf)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
|
if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
|
||||||
printf("stray %s interrupt %d\n",
|
printf("stray %s interrupt %d\n",
|
||||||
hard ? "hard" : "soft", i);
|
hard ? "hard" : "soft", i);
|
||||||
continue;
|
continue;
|
||||||
|
@ -375,7 +375,7 @@ inthand_add(const char *name, int vec, driver_filter_t *filt,
|
|||||||
* pretty rare in practice.
|
* pretty rare in practice.
|
||||||
*/
|
*/
|
||||||
filter = 0;
|
filter = 0;
|
||||||
TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
|
CK_SLIST_FOREACH(ih, &ie->ie_handlers, ih_next) {
|
||||||
if (ih->ih_filter != NULL && ih->ih_filter != filt) {
|
if (ih->ih_filter != NULL && ih->ih_filter != filt) {
|
||||||
filter = 1;
|
filter = 1;
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user