From owner-svn-src-user@FreeBSD.ORG Tue Jun 9 02:58:58 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51C581065674; Tue, 9 Jun 2009 02:58:58 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E75E58FC16; Tue, 9 Jun 2009 02:58:57 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n592wvtR053384; Tue, 9 Jun 2009 02:58:57 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n592wvnc053381; Tue, 9 Jun 2009 02:58:57 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906090258.n592wvnc053381@svn.freebsd.org> From: Kip Macy Date: Tue, 9 Jun 2009 02:58:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193797 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 02:58:58 -0000 Author: kmacy Date: Tue Jun 9 02:58:57 2009 New Revision: 193797 URL: http://svn.freebsd.org/changeset/base/193797 Log: - restore max descriptors per call to cxgb_start_locked - remove unused defines - don't always clean in tx timeout Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h Tue Jun 9 02:27:59 2009 (r193796) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h Tue Jun 9 02:58:57 2009 (r193797) @@ -84,8 +84,6 @@ extern int cxgb_debug; #else #define MTX_INIT mtx_init #define MTX_DESTROY mtx_destroy -#define SX_INIT sx_init -#define SX_DESTROY sx_destroy #endif struct port_info { @@ -270,6 +268,7 @@ enum { #define QS_RUNNING 0x2 #define QS_BOUND 0x4 #define QS_FLUSHING 0x8 +#define QS_TIMEOUT 0x10 struct sge_qset { struct sge_rspq rspq; Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h Tue Jun 9 02:27:59 2009 (r193796) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h Tue Jun 9 02:58:57 2009 (r193797) @@ -170,8 +170,8 @@ struct t3_mbuf_hdr { #define TX_MAX_DESC 4 /* max descriptors per packet */ -#define TX_START_MIN_DESC (TX_MAX_DESC << 1) -#define TX_START_MAX_DESC (TX_MAX_DESC << 2) /* maximum number of descriptors +#define TX_START_MIN_DESC (TX_MAX_DESC << 1) +#define TX_START_MAX_DESC (TX_MAX_DESC << 3) /* maximum number of descriptors * call to start used per */ #define TX_CLEAN_MAX_DESC (TX_MAX_DESC << 4) /* maximum tx descriptors Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Tue Jun 9 02:27:59 2009 (r193796) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Tue Jun 9 02:58:57 2009 (r193797) @@ -1580,9 +1580,9 @@ cxgb_tx_timeout(void *arg) struct sge_qset *qs = arg; if (TXQ_TRYLOCK(qs)) { - qs->qs_flags |= QS_FLUSHING; + qs->qs_flags |= QS_TIMEOUT; cxgb_start_locked(qs); - qs->qs_flags &= ~QS_FLUSHING; + qs->qs_flags &= ~QS_TIMEOUT; TXQ_UNLOCK(qs); } }