[Midnightbsd-cvs] src [8176] trunk/sys/dev/cxgb/cxgb_main.c: Attach interrupt handlers during attach instead of during the first time

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 16 22:46:46 EDT 2016


Revision: 8176
          http://svnweb.midnightbsd.org/src/?rev=8176
Author:   laffer1
Date:     2016-09-16 22:46:45 -0400 (Fri, 16 Sep 2016)
Log Message:
-----------
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 Paths:
--------------
    trunk/sys/dev/cxgb/cxgb_main.c

Modified: trunk/sys/dev/cxgb/cxgb_main.c
===================================================================
--- trunk/sys/dev/cxgb/cxgb_main.c	2016-09-17 02:45:52 UTC (rev 8175)
+++ trunk/sys/dev/cxgb/cxgb_main.c	2016-09-17 02:46:45 UTC (rev 8176)
@@ -675,6 +675,9 @@
 	for (i = 0; i < NUM_CPL_HANDLERS; i++)
 		sc->cpl_handler[i] = cpl_not_handled;
 #endif
+
+	t3_intr_clear(sc);
+	error = cxgb_setup_interrupts(sc);
 out:
 	if (error)
 		cxgb_free(sc);
@@ -922,6 +925,7 @@
 	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,
@@ -945,6 +949,7 @@
 		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)
@@ -1611,11 +1616,6 @@
 		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;
 	}



More information about the Midnightbsd-cvs mailing list