Author: jhb
Date: Thu Jan 5 18:30:48 2012
New Revision: 229611
URL: http://svn.freebsd.org/changeset/base/229611
Log:
MFC 227562:
Add single-message MSI support to mfi(4). It is disabled by default but
can be enabled via the hw.mfi.msi tunable. Many mfi(4) controllers also
support MSI-X, but in testing it seems that many adapters do not work with
MSI-X but do work with MSI.
Modified:
stable/9/sys/dev/mfi/mfi.c
stable/9/sys/dev/mfi/mfi_cam.c
stable/9/sys/dev/mfi/mfi_disk.c
stable/9/sys/dev/mfi/mfi_pci.c
stable/9/sys/dev/mfi/mfivar.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/mfi/mfi.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi.c Thu Jan 5 18:26:44 2012 (r229610)
+++ stable/9/sys/dev/mfi/mfi.c Thu Jan 5 18:30:48 2012 (r229611)
@@ -484,15 +484,8 @@ mfi_attach(struct mfi_softc *sc)
mtx_unlock(&sc->mfi_io_lock);
/*
- * Set up the interrupt handler. XXX This should happen in
- * mfi_pci.c
+ * Set up the interrupt handler.
*/
- 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: stable/9/sys/dev/mfi/mfi_cam.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi_cam.c Thu Jan 5 18:26:44 2012
(r229610)
+++ stable/9/sys/dev/mfi/mfi_cam.c Thu Jan 5 18:30:48 2012
(r229611)
@@ -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: stable/9/sys/dev/mfi/mfi_disk.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi_disk.c Thu Jan 5 18:26:44 2012
(r229610)
+++ stable/9/sys/dev/mfi/mfi_disk.c Thu Jan 5 18:30:48 2012
(r229611)
@@ -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: stable/9/sys/dev/mfi/mfi_pci.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi_pci.c Thu Jan 5 18:26:44 2012
(r229610)
+++ stable/9/sys/dev/mfi/mfi_pci.c Thu Jan 5 18:30:48 2012
(r229611)
@@ -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>
@@ -106,6 +107,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;
@@ -168,7 +174,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));
@@ -225,6 +231,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) {
@@ -279,6 +299,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: stable/9/sys/dev/mfi/mfivar.h
==============================================================================
--- stable/9/sys/dev/mfi/mfivar.h Thu Jan 5 18:26:44 2012
(r229610)
+++ stable/9/sys/dev/mfi/mfivar.h Thu Jan 5 18:30:48 2012
(r229611)
@@ -395,6 +395,7 @@ mfi_print_sense(struct mfi_softc *sc, vo
(sc)->mfi_bhandle, (reg))
MALLOC_DECLARE(M_MFIBUF);
+SYSCTL_DECL(_hw_mfi);
#define MFI_CMD_TIMEOUT 30
#define MFI_MAXPHYS (128 * 1024)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
