svn commit: r227580 - projects/head_mfi/sys/dev/mfi

John Baldwin jhb at FreeBSD.org
Wed Nov 16 18:53:52 UTC 2011


Author: jhb
Date: Wed Nov 16 18:53:52 2011
New Revision: 227580
URL: http://svn.freebsd.org/changeset/base/227580

Log:
  MFC: Add single-message MSI support to mfi(4).
  
  Reviewed by:	ambrisko, delphij

Modified:
  projects/head_mfi/sys/dev/mfi/mfi.c
  projects/head_mfi/sys/dev/mfi/mfi_cam.c
  projects/head_mfi/sys/dev/mfi/mfi_debug.c
  projects/head_mfi/sys/dev/mfi/mfi_disk.c
  projects/head_mfi/sys/dev/mfi/mfi_pci.c
  projects/head_mfi/sys/dev/mfi/mfi_syspd.c
  projects/head_mfi/sys/dev/mfi/mfi_tbolt.c
  projects/head_mfi/sys/dev/mfi/mfivar.h

Modified: projects/head_mfi/sys/dev/mfi/mfi.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi.c	Wed Nov 16 18:43:58 2011	(r227579)
+++ projects/head_mfi/sys/dev/mfi/mfi.c	Wed Nov 16 18:53:52 2011	(r227580)
@@ -675,12 +675,6 @@ mfi_attach(struct mfi_softc *sc)
 
 		if((error = mfi_tbolt_alloc_cmd(sc)) != 0)
 			return error;
-		sc->mfi_irq_rid = 0;
-		if ((sc->mfi_irq = bus_alloc_resource_any(sc->mfi_dev, SYS_RES_IRQ,
-			&sc->mfi_irq_rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) {
-			device_printf(sc->mfi_dev, "Cannot allocate interrupt\n");
-			return (EINVAL);
-		}
 		if (bus_setup_intr(sc->mfi_dev, sc->mfi_irq, INTR_MPSAFE|INTR_TYPE_BIO,
 	   			NULL, mfi_intr_tbolt, sc, &sc->mfi_intr)) {
 			device_printf(sc->mfi_dev, "Cannot set up interrupt\n");
@@ -695,12 +689,6 @@ mfi_attach(struct mfi_softc *sc)
 		if ((error = mfi_comms_init(sc)) != 0)
 			return (error);
 
-		sc->mfi_irq_rid = 0;
-		if ((sc->mfi_irq = bus_alloc_resource_any(sc->mfi_dev, SYS_RES_IRQ,
-			&sc->mfi_irq_rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) {
-			device_printf(sc->mfi_dev, "Cannot allocate interrupt\n");
-			return (EINVAL);
-		}
 		if (bus_setup_intr(sc->mfi_dev, sc->mfi_irq, INTR_MPSAFE|INTR_TYPE_BIO,
 	    		NULL, mfi_intr, sc, &sc->mfi_intr)) {
 			device_printf(sc->mfi_dev, "Cannot set up interrupt\n");

Modified: projects/head_mfi/sys/dev/mfi/mfi_cam.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi_cam.c	Wed Nov 16 18:43:58 2011	(r227579)
+++ projects/head_mfi/sys/dev/mfi/mfi_cam.c	Wed Nov 16 18:53:52 2011	(r227580)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
+#include <sys/sysctl.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>

Modified: projects/head_mfi/sys/dev/mfi/mfi_debug.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi_debug.c	Wed Nov 16 18:43:58 2011	(r227579)
+++ projects/head_mfi/sys/dev/mfi/mfi_debug.c	Wed Nov 16 18:53:52 2011	(r227580)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/malloc.h>
 #include <sys/selinfo.h>
+#include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 #include <sys/uio.h>
 #include <machine/resource.h>

Modified: projects/head_mfi/sys/dev/mfi/mfi_disk.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi_disk.c	Wed Nov 16 18:43:58 2011	(r227579)
+++ projects/head_mfi/sys/dev/mfi/mfi_disk.c	Wed Nov 16 18:53:52 2011	(r227580)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/selinfo.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
+#include <sys/sysctl.h>
 #include <sys/uio.h>
 
 #include <sys/bio.h>

Modified: projects/head_mfi/sys/dev/mfi/mfi_pci.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi_pci.c	Wed Nov 16 18:43:58 2011	(r227579)
+++ projects/head_mfi/sys/dev/mfi/mfi_pci.c	Wed Nov 16 18:53:52 2011	(r227580)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/bio.h>
 #include <sys/malloc.h>
+#include <sys/sysctl.h>
 #include <sys/uio.h>
 
 #include <machine/bus.h>
@@ -107,6 +108,11 @@ static devclass_t	mfi_devclass;
 DRIVER_MODULE(mfi, pci, mfi_pci_driver, mfi_devclass, 0, 0);
 MODULE_VERSION(mfi, 1);
 
+static int	mfi_msi = 0;
+TUNABLE_INT("hw.mfi.msi", &mfi_msi);
+SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, &mfi_msi, 0,
+    "Enable use of MSI interrupts");
+
 struct mfi_ident {
 	uint16_t	vendor;
 	uint16_t	device;
@@ -175,7 +181,7 @@ mfi_pci_attach(device_t dev)
 	struct mfi_softc *sc;
 	struct mfi_ident *m;
 	uint32_t command;
-	int error;
+	int count, error;
 
 	sc = device_get_softc(dev);
 	bzero(sc, sizeof(*sc));
@@ -235,6 +241,20 @@ mfi_pci_attach(device_t dev)
 		goto out;
 	}
 
+	/* Allocate IRQ resource. */
+	sc->mfi_irq_rid = 0;
+	count = 1;
+	if (mfi_msi && pci_alloc_msi(sc->mfi_dev, &count) == 0) {
+		device_printf(sc->mfi_dev, "Using MSI\n");
+		sc->mfi_irq_rid = 1;
+	}
+	if ((sc->mfi_irq = bus_alloc_resource_any(sc->mfi_dev, SYS_RES_IRQ,
+	    &sc->mfi_irq_rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) {
+		device_printf(sc->mfi_dev, "Cannot allocate interrupt\n");
+		error = EINVAL;
+		goto out;
+	}
+
 	error = mfi_attach(sc);
 out:
 	if (error) {
@@ -318,6 +338,8 @@ mfi_pci_free(struct mfi_softc *sc)
 		bus_release_resource(sc->mfi_dev, SYS_RES_MEMORY,
 		    sc->mfi_regs_rid, sc->mfi_regs_resource);
 	}
+	if (sc->mfi_irq_rid != 0)
+		pci_release_msi(sc->mfi_dev);
 
 	return;
 }

Modified: projects/head_mfi/sys/dev/mfi/mfi_syspd.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi_syspd.c	Wed Nov 16 18:43:58 2011	(r227579)
+++ projects/head_mfi/sys/dev/mfi/mfi_syspd.c	Wed Nov 16 18:53:52 2011	(r227580)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD: src/sys/dev/mfi/mfi_
 #include <sys/selinfo.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
+#include <sys/sysctl.h>
 #include <sys/uio.h>
 
 #include <sys/bio.h>

Modified: projects/head_mfi/sys/dev/mfi/mfi_tbolt.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi_tbolt.c	Wed Nov 16 18:43:58 2011	(r227579)
+++ projects/head_mfi/sys/dev/mfi/mfi_tbolt.c	Wed Nov 16 18:53:52 2011	(r227580)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD: src/sys/dev/mfi/mfi_
 #include <sys/callout.h>
 #include <sys/uio.h>
 #include <machine/bus.h>
+#include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 

Modified: projects/head_mfi/sys/dev/mfi/mfivar.h
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfivar.h	Wed Nov 16 18:43:58 2011	(r227579)
+++ projects/head_mfi/sys/dev/mfi/mfivar.h	Wed Nov 16 18:53:52 2011	(r227580)
@@ -568,6 +568,7 @@ mfi_print_sense(struct mfi_softc *sc, vo
 	(sc)->mfi_bhandle, (reg))
 
 MALLOC_DECLARE(M_MFIBUF);
+SYSCTL_DECL(_hw_mfi);
 
 #define MFI_RESET_WAIT_TIME 180
 #define MFI_CMD_TIMEOUT 30


More information about the svn-src-projects mailing list