From owner-svn-src-all@freebsd.org Thu Apr 6 16:22:55 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 860E5D300EC; Thu, 6 Apr 2017 16:22:55 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E34EFAC; Thu, 6 Apr 2017 16:22:55 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v36GMsjp044355; Thu, 6 Apr 2017 16:22:54 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v36GMsEM044354; Thu, 6 Apr 2017 16:22:54 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201704061622.v36GMsEM044354@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Thu, 6 Apr 2017 16:22:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316581 - head/sys/dev/bnxt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Thu, 06 Apr 2017 16:22:55 -0000 Author: sbruno Date: Thu Apr 6 16:22:54 2017 New Revision: 316581 URL: https://svnweb.freebsd.org/changeset/base/316581 Log: tx and rx interrupts are not combined in bnxt(4) and should be handled independantly. Submitted by: venkatkumar.duvvuru@broadcom.com> Differential Revision: https://reviews.freebsd.org/D10297 Modified: head/sys/dev/bnxt/if_bnxt.c Modified: head/sys/dev/bnxt/if_bnxt.c ============================================================================== --- head/sys/dev/bnxt/if_bnxt.c Thu Apr 6 16:19:19 2017 (r316580) +++ head/sys/dev/bnxt/if_bnxt.c Thu Apr 6 16:22:54 2017 (r316581) @@ -177,7 +177,8 @@ static void bnxt_update_admin_status(if_ /* Interrupt enable / disable */ static void bnxt_intr_enable(if_ctx_t ctx); -static int bnxt_queue_intr_enable(if_ctx_t ctx, uint16_t qid); +static int bnxt_rx_queue_intr_enable(if_ctx_t ctx, uint16_t qid); +static int bnxt_tx_queue_intr_enable(if_ctx_t ctx, uint16_t qid); static void bnxt_disable_intr(if_ctx_t ctx); static int bnxt_msix_intr_assign(if_ctx_t ctx, int msix); @@ -253,8 +254,8 @@ static device_method_t bnxt_iflib_method DEVMETHOD(ifdi_update_admin_status, bnxt_update_admin_status), DEVMETHOD(ifdi_intr_enable, bnxt_intr_enable), - DEVMETHOD(ifdi_tx_queue_intr_enable, bnxt_queue_intr_enable), - DEVMETHOD(ifdi_rx_queue_intr_enable, bnxt_queue_intr_enable), + DEVMETHOD(ifdi_tx_queue_intr_enable, bnxt_tx_queue_intr_enable), + DEVMETHOD(ifdi_rx_queue_intr_enable, bnxt_rx_queue_intr_enable), DEVMETHOD(ifdi_intr_disable, bnxt_disable_intr), DEVMETHOD(ifdi_msix_intr_assign, bnxt_msix_intr_assign), @@ -1437,7 +1438,16 @@ bnxt_intr_enable(if_ctx_t ctx) /* Enable interrupt for a single queue */ static int -bnxt_queue_intr_enable(if_ctx_t ctx, uint16_t qid) +bnxt_tx_queue_intr_enable(if_ctx_t ctx, uint16_t qid) +{ + struct bnxt_softc *softc = iflib_get_softc(ctx); + + bnxt_do_enable_intr(&softc->tx_cp_rings[qid]); + return 0; +} + +static int +bnxt_rx_queue_intr_enable(if_ctx_t ctx, uint16_t qid) { struct bnxt_softc *softc = iflib_get_softc(ctx); @@ -1482,7 +1492,7 @@ bnxt_msix_intr_assign(if_ctx_t ctx, int for (i=0; iscctx->isc_nrxqsets; i++) { rc = iflib_irq_alloc_generic(ctx, &softc->rx_cp_rings[i].irq, - softc->rx_cp_rings[i].ring.id + 1, IFLIB_INTR_RXTX, + softc->rx_cp_rings[i].ring.id + 1, IFLIB_INTR_RX, bnxt_handle_rx_cp, &softc->rx_cp_rings[i], i, "rx_cp"); if (rc) { device_printf(iflib_get_dev(ctx),