svn commit: r241314 - stable/9/sys/dev/cxgb

[John Baldwin]

Author: jhb
Date: Sun Oct  7 18:18:59 2012
New Revision: 241314
URL: http://svn.freebsd.org/changeset/base/241314

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/9/sys/dev/cxgb/cxgb_main.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/9/sys/dev/cxgb/cxgb_main.c	Sun Oct  7 18:07:45 2012	(r241313)
+++ stable/9/sys/dev/cxgb/cxgb_main.c	Sun Oct  7 18:18:59 2012	(r241314)
@@ -675,6 +675,9 @@ cxgb_controller_attach(device_t dev)
 	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 @@ 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,
@@ -945,6 +949,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)
@@ -1611,11 +1616,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;
 	}