From owner-svn-src-projects@FreeBSD.ORG Wed Nov 16 18:53:52 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80996106564A; Wed, 16 Nov 2011 18:53:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 705908FC12; Wed, 16 Nov 2011 18:53:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAGIrqFx062236; Wed, 16 Nov 2011 18:53:52 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAGIrqSR062227; Wed, 16 Nov 2011 18:53:52 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201111161853.pAGIrqSR062227@svn.freebsd.org> From: John Baldwin Date: Wed, 16 Nov 2011 18:53:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227580 - projects/head_mfi/sys/dev/mfi X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Nov 2011 18:53:52 -0000 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 #include #include +#include #include #include 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 #include #include +#include #include #include #include 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 #include #include +#include #include #include 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 #include #include +#include #include #include @@ -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 #include #include +#include #include #include 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 #include #include +#include #include #include 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