From owner-svn-src-all@FreeBSD.ORG Sun Mar 27 05:09:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E67E4106566C; Sun, 27 Mar 2011 05:09:21 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D4D7F8FC12; Sun, 27 Mar 2011 05:09:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2R59Ldm047183; Sun, 27 Mar 2011 05:09:21 GMT (envelope-from np@svn.freebsd.org) Received: (from np@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2R59LTx047179; Sun, 27 Mar 2011 05:09:21 GMT (envelope-from np@svn.freebsd.org) Message-Id: <201103270509.p2R59LTx047179@svn.freebsd.org> From: Navdeep Parhar Date: Sun, 27 Mar 2011 05:09:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220050 - stable/8/sys/dev/cxgbe X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 05:09:22 -0000 Author: np Date: Sun Mar 27 05:09:21 2011 New Revision: 220050 URL: http://svn.freebsd.org/changeset/base/220050 Log: MFC r219944 Do not over-allocate MSI interrupts for the case where each ingress queue has its own interrupt. If the exact number that we need is not a power of 2 and we're using MSI, then switch to interrupt multiplexing. While here, replace the magic numbers with something more readable. Modified: stable/8/sys/dev/cxgbe/adapter.h stable/8/sys/dev/cxgbe/t4_main.c stable/8/sys/dev/cxgbe/t4_sge.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/cxgbe/adapter.h ============================================================================== --- stable/8/sys/dev/cxgbe/adapter.h Sun Mar 27 03:06:58 2011 (r220049) +++ stable/8/sys/dev/cxgbe/adapter.h Sun Mar 27 05:09:21 2011 (r220050) @@ -128,6 +128,13 @@ enum { }; enum { + /* adapter intr_type */ + INTR_INTX = (1 << 0), + INTR_MSI = (1 << 1), + INTR_MSIX = (1 << 2) +}; + +enum { /* adapter flags */ FULL_INIT_DONE = (1 << 0), FW_OK = (1 << 1), Modified: stable/8/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/8/sys/dev/cxgbe/t4_main.c Sun Mar 27 03:06:58 2011 (r220049) +++ stable/8/sys/dev/cxgbe/t4_main.c Sun Mar 27 05:09:21 2011 (r220050) @@ -205,7 +205,7 @@ SYSCTL_UINT(_hw_cxgbe, OID_AUTO, qsize_r /* * Interrupt types allowed. */ -static int intr_types = 7; +static int intr_types = INTR_MSIX | INTR_MSI | INTR_INTX; TUNABLE_INT("hw.cxgbe.interrupt_types", &intr_types); SYSCTL_UINT(_hw_cxgbe, OID_AUTO, interrupt_types, CTLFLAG_RDTUN, &intr_types, 0, "interrupt types allowed (bits 0, 1, 2 = INTx, MSI, MSI-X respectively)"); @@ -219,7 +219,7 @@ SYSCTL_UINT(_hw_cxgbe, OID_AUTO, interru &intr_fwd, 0, "always use forwarded interrupts"); struct intrs_and_queues { - int intr_type; /* 1, 2, or 4 for INTx, MSI, or MSI-X */ + int intr_type; /* INTx, MSI, or MSI-X */ int nirq; /* Number of vectors */ int intr_fwd; /* Interrupts forwarded */ int ntxq10g; /* # of NIC txq's for each 10G port */ @@ -639,7 +639,7 @@ t4_detach(device_t dev) if (sc->flags & FW_OK) t4_fw_bye(sc, sc->mbox); - if (sc->intr_type == 2 || sc->intr_type == 4) + if (sc->intr_type == INTR_MSI || sc->intr_type == INTR_MSIX) pci_release_msi(dev); if (sc->regs_res) @@ -1152,14 +1152,14 @@ cfg_itype_and_nqueues(struct adapter *sc bzero(iaq, sizeof(*iaq)); nc = mp_ncpus; /* our snapshot of the number of CPUs */ - for (itype = 4; itype; itype >>= 1) { + for (itype = INTR_MSIX; itype; itype >>= 1) { if ((itype & intr_types) == 0) continue; /* not allowed */ - if (itype == 4) + if (itype == INTR_MSIX) navail = pci_msix_count(sc->dev); - else if (itype == 2) + else if (itype == INTR_MSI) navail = pci_msi_count(sc->dev); else navail = 1; @@ -1179,44 +1179,50 @@ cfg_itype_and_nqueues(struct adapter *sc iaq->nirq = n10g * nrxq10g + n1g * nrxq1g + 2; if (iaq->nirq <= navail && intr_fwd == 0) { + if (itype == INTR_MSI && !powerof2(iaq->nirq)) + goto fwd; + /* One for err, one for fwq, and one for each rxq */ iaq->intr_fwd = 0; iaq->nrxq10g = nrxq10g; iaq->nrxq1g = nrxq1g; - if (itype == 2) { - /* # of vectors requested must be power of 2 */ - while (!powerof2(iaq->nirq)) - iaq->nirq++; - KASSERT(iaq->nirq <= navail, - ("%s: bad MSI calculation", __func__)); - } + } else { fwd: iaq->intr_fwd = 1; - iaq->nirq = navail; + + if (navail > nc) { + if (itype == INTR_MSIX) + navail = nc + 1; + + /* navail is and must remain a pow2 for MSI */ + if (itype == INTR_MSI) { + KASSERT(powerof2(navail), + ("%d not power of 2", navail)); + + while (navail / 2 > nc) + navail /= 2; + } + } + iaq->nirq = navail; /* total # of interrupts */ /* * If we have multiple vectors available reserve one * exclusively for errors. The rest will be shared by * the fwq and data. */ - if (navail > 1) { + if (navail > 1) navail--; - - if (navail > nc && itype == 4) - iaq->nirq = nc + 1; - } - iaq->nrxq10g = min(nrxq10g, navail); iaq->nrxq1g = min(nrxq1g, navail); } navail = iaq->nirq; rc = 0; - if (itype == 4) + if (itype == INTR_MSIX) rc = pci_alloc_msix(sc->dev, &navail); - else if (itype == 2) + else if (itype == INTR_MSI) rc = pci_alloc_msi(sc->dev, &navail); if (rc == 0) { @@ -1481,10 +1487,10 @@ t4_set_desc(struct adapter *sc) struct adapter_params *p = &sc->params; snprintf(buf, sizeof(buf), - "Chelsio %s (rev %d) %d port %sNIC PCIe-x%d %s, S/N:%s, E/C:%s", + "Chelsio %s (rev %d) %d port %sNIC PCIe-x%d %d %s, S/N:%s, E/C:%s", p->vpd.id, p->rev, p->nports, is_offload(sc) ? "R" : "", - p->pci.width, (sc->intr_type == 4 ) ? "MSI-X" : - (sc->intr_type == 2) ? "MSI" : "INTx", p->vpd.sn, p->vpd.ec); + p->pci.width, sc->intr_count, sc->intr_type == INTR_MSIX ? "MSI-X" : + (sc->intr_type == INTR_MSI ? "MSI" : "INTx"), p->vpd.sn, p->vpd.ec); device_set_desc_copy(sc->dev, buf); } Modified: stable/8/sys/dev/cxgbe/t4_sge.c ============================================================================== --- stable/8/sys/dev/cxgbe/t4_sge.c Sun Mar 27 03:06:58 2011 (r220049) +++ stable/8/sys/dev/cxgbe/t4_sge.c Sun Mar 27 05:09:21 2011 (r220050) @@ -468,7 +468,7 @@ t4_intr_err(void *arg) { struct adapter *sc = arg; - if (sc->intr_type == 1) + if (sc->intr_type == INTR_INTX) t4_write_reg(sc, MYPF_REG(A_PCIE_PF_CLI), 0); t4_slow_intr_handler(sc);