Author: jhb
Date: Sun Oct 7 18:19:13 2012
New Revision: 241315
URL: http://svn.freebsd.org/changeset/base/241315
Log:
MFC 239913:
Attach interrupt handlers during attach instead of during the first time
the interface is brought up. Without this, the boot time interrupt
round-robin assignment does not think the allocated interrupt resources
are active and leaves them assigned to CPU 0.
While here, add descriptive tags to each interrupt handler when MSI-X
is used.
Modified:
stable/8/sys/dev/cxgb/cxgb_main.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/cxgb/ (props changed)
Modified: stable/8/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/8/sys/dev/cxgb/cxgb_main.c Sun Oct 7 18:18:59 2012
(r241314)
+++ stable/8/sys/dev/cxgb/cxgb_main.c Sun Oct 7 18:19:13 2012
(r241315)
@@ -662,6 +662,9 @@ cxgb_controller_attach(device_t dev)
device_printf(sc->dev, "Firmware Version %s\n", &sc->fw_version[0]);
callout_reset(&sc->cxgb_tick_ch, hz, cxgb_tick, sc);
t3_add_attach_sysctls(sc);
+
+ t3_intr_clear(sc);
+ error = cxgb_setup_interrupts(sc);
out:
if (error)
cxgb_free(sc);
@@ -917,6 +920,7 @@ cxgb_setup_interrupts(adapter_t *sc)
if (!(intr_flag & USING_MSIX) || err)
return (err);
+ bus_describe_intr(sc->dev, sc->irq_res, sc->intr_tag, "err");
for (i = 0; i < sc->msi_count - 1; i++) {
rid = i + 2;
res = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, &rid,
@@ -940,6 +944,7 @@ cxgb_setup_interrupts(adapter_t *sc)
sc->msix_irq_rid[i] = rid;
sc->msix_irq_res[i] = res;
sc->msix_intr_tag[i] = tag;
+ bus_describe_intr(sc->dev, res, tag, "qs%d", i);
}
if (err)
@@ -1660,11 +1665,6 @@ cxgb_up(struct adapter *sc)
alloc_filters(sc);
setup_rss(sc);
- t3_intr_clear(sc);
- err = cxgb_setup_interrupts(sc);
- if (err)
- goto out;
-
t3_add_configured_sysctls(sc);
sc->flags |= FULL_INIT_DONE;
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
