d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add single-message MSI support to mfi(4). It is disabled by default but

Browse Source 
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.

MFC after:	2 weeks
This commit is contained in:
John Baldwin 2011-11-16 15:39:27 +00:00
parent 50546f8ffe
commit d1c5fc763a
5 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/mfi/mfi.c
View File

@ -117,7 +117,7 @@ static int mfi_check_clear_intr_ppc(struct mfi_softc *sc);
static void mfi_issue_cmd_xscale(struct mfi_softc *sc,uint32_t bus_add,uint32_t frame_cnt);
static void mfi_issue_cmd_ppc(struct mfi_softc *sc,uint32_t bus_add,uint32_t frame_cnt);
static SYSCTL_NODE(_hw, OID_AUTO, mfi, CTLFLAG_RD, 0, "MFI driver parameters");
SYSCTL_NODE(_hw, OID_AUTO, mfi, CTLFLAG_RD, 0, "MFI driver parameters");
static int mfi_event_locale = MFI_EVT_LOCALE_ALL;
TUNABLE_INT("hw.mfi.event_locale", &mfi_event_locale);
SYSCTL_INT(_hw_mfi, OID_AUTO, event_locale, CTLFLAG_RW, &mfi_event_locale,
@ -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");

1
sys/dev/mfi/mfi_cam.c
View File

@ -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>

1
sys/dev/mfi/mfi_disk.c
View File

@ -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>

24
sys/dev/mfi/mfi_pci.c
View File

@ -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;
@ -169,7 +175,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));
@ -226,6 +232,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) {
@ -280,6 +300,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;
}

1
sys/dev/mfi/mfivar.h
View File

@ -395,6 +395,7 @@ mfi_print_sense(struct mfi_softc *sc, void *sense)
(sc)->mfi_bhandle, (reg))
MALLOC_DECLARE(M_MFIBUF);
SYSCTL_DECL(_hw_mfi);
#define MFI_CMD_TIMEOUT 30
#define MFI_MAXPHYS (128 * 1024)