svn commit: r202023 - head/sys/sparc64/pci

[Marius Strobl]

Author: marius
Date: Sun Jan 10 18:39:29 2010
New Revision: 202023
URL: http://svn.freebsd.org/changeset/base/202023

Log:
  When setting up MSIs with a filter ensure that the event queue interrupt
  is cleared as it might have triggered before and given we supply NULL
  as ic_clear, inthand_add() won't do this for us in this case.

Modified:
  head/sys/sparc64/pci/fire.c

Modified: head/sys/sparc64/pci/fire.c
==============================================================================
--- head/sys/sparc64/pci/fire.c	Sun Jan 10 18:09:33 2010	(r202022)
+++ head/sys/sparc64/pci/fire.c	Sun Jan 10 18:39:29 2010	(r202023)
@@ -1882,6 +1882,7 @@ fire_setup_intr(device_t dev, device_t c
     void **cookiep)
 {
 	struct fire_softc *sc;
+	struct fire_msiqarg *fmqa;
 	u_long vec;
 	int error;
 	u_int msi, msiq;
@@ -1914,17 +1915,24 @@ fire_setup_intr(device_t dev, device_t c
 		rman_set_end(ires, msi);
 		if (error != 0)
 			return (error);
+		fmqa = intr_vectors[vec].iv_icarg;
 		/*
 		 * XXX inject our event queue handler.
 		 */
 		if (filt != NULL) {
 			intr_vectors[vec].iv_func = fire_msiq_filter;
 			intr_vectors[vec].iv_ic = &fire_msiqc_filter;
+			/*
+			 * Ensure the event queue interrupt is cleared, it
+			 * might have triggered before.  Given we supply NULL
+			 * as ic_clear, inthand_add() won't do this for us.
+			 */
+			FIRE_PCI_WRITE_8(sc, fmqa->fmqa_fica.fica_clr,
+			    INTCLR_IDLE);
 		} else
 			intr_vectors[vec].iv_func = fire_msiq_handler;
 		/* Record the MSI/MSI-X as long as we we use a 1:1 mapping. */
-		((struct fire_msiqarg *)intr_vectors[vec].iv_icarg)->
-		    fmqa_msi = msi;
+		fmqa->fmqa_msi = msi;
 		FIRE_PCI_WRITE_8(sc, FO_PCI_EQ_CTRL_SET_BASE + (msiq << 3),
 		    FO_PCI_EQ_CTRL_SET_EN);
 		msi <<= 3;