PERFORCE change 117614 for review

[Matt Jacob]

http://perforce.freebsd.org/chv.cgi?CH=117614

Change 117614 by mjacob at mjexp on 2007/04/08 00:57:52

	Remove the msi_enable hint- now that all and sundry have
	started filtering out motherboards with broken MSI implementations
	it's time to let the default actions of trying to acquire MSI
	type interrupts works as designed.
	MFP4 after:	1 day

Affected files ...

.. //depot/projects/mjexp/sys/dev/mpt/mpt.h#9 edit
.. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#8 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/mpt/mpt.h#9 (text+ko) ====

@@ -527,7 +527,7 @@
 		unit		: 8,
 		ready		: 1,
 		fw_uploaded	: 1,
-		msi_enable	: 1,
+				: 1,
 		twildcard	: 1,
 		tenabled	: 1,
 		do_cfg_role	: 1,

==== //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#8 (text+ko) ====

@@ -334,7 +334,6 @@
 		}
 		mpt->do_cfg_role = 1;
 	}
-	mpt->msi_enable = 0;
 }
 #else
 static void
@@ -361,11 +360,6 @@
 	}
 
 	tval = 0;
-	mpt->msi_enable = 0;
-	if (resource_int_value(device_get_name(mpt->dev),
-	    device_get_unit(mpt->dev), "msi_enable", &tval) == 0 && tval == 1) {
-		mpt->msi_enable = 1;
-	}
 }
 #endif
 
@@ -528,26 +522,24 @@
 
 	/* Get a handle to the interrupt */
 	iqd = 0;
-	if (mpt->msi_enable) {
-		/*
-		 * First try to alloc an MSI-X message.  If that
-		 * fails, then try to alloc an MSI message instead.
-		 */
-		if (pci_msix_count(dev) == 1) {
-			mpt->pci_msi_count = 1;
-			if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) {
-				iqd = 1;
-			} else {
-				mpt->pci_msi_count = 0;
-			}
+	/*
+	 * First try to alloc an MSI-X message.  If that
+	 * fails, then try to alloc an MSI message instead.
+	 */
+	if (pci_msix_count(dev) == 1) {
+		mpt->pci_msi_count = 1;
+		if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) {
+			iqd = 1;
+		} else {
+			mpt->pci_msi_count = 0;
 		}
-		if (iqd == 0 && pci_msi_count(dev) == 1) {
-			mpt->pci_msi_count = 1;
-			if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) {
-				iqd = 1;
-			} else {
-				mpt->pci_msi_count = 0;
-			}
+	}
+	if (iqd == 0 && pci_msi_count(dev) == 1) {
+		mpt->pci_msi_count = 1;
+		if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) {
+			iqd = 1;
+		} else {
+			mpt->pci_msi_count = 0;
 		}
 	}
 	mpt->pci_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &iqd,