Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 11 Nov 2009 22:31:03 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r199202 - stable/8/sys/dev/cxgb
Message-ID:  <200911112231.nABMV3jx009297@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: np
Date: Wed Nov 11 22:31:02 2009
New Revision: 199202
URL: http://svn.freebsd.org/changeset/base/199202

Log:
  MFC r197043

Modified:
  stable/8/sys/dev/cxgb/cxgb_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)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- stable/8/sys/dev/cxgb/cxgb_sge.c	Wed Nov 11 21:30:58 2009	(r199201)
+++ stable/8/sys/dev/cxgb/cxgb_sge.c	Wed Nov 11 22:31:02 2009	(r199202)
@@ -1942,7 +1942,6 @@ again:	reclaim_completed_tx_imm(q);
 	if (__predict_false(ret)) {
 		if (ret == 1) {
 			TXQ_UNLOCK(qs);
-			log(LOG_ERR, "no desc available\n");
 			return (ENOSPC);
 		}
 		goto again;
@@ -1955,6 +1954,7 @@ again:	reclaim_completed_tx_imm(q);
 		q->gen ^= 1;
 	}
 	TXQ_UNLOCK(qs);
+	wmb();
 	t3_write_reg(adap, A_SG_KDOORBELL,
 		     F_SELEGRCNTX | V_EGRCNTX(q->cntxt_id));
 	return (0);
@@ -1975,8 +1975,6 @@ restart_ctrlq(void *data, int npending)
 	struct sge_txq *q = &qs->txq[TXQ_CTRL];
 	adapter_t *adap = qs->port->adapter;
 
-	log(LOG_WARNING, "Restart_ctrlq in_use=%d\n", q->in_use);
-	
 	TXQ_LOCK(qs);
 again:	reclaim_completed_tx_imm(q);
 
@@ -2928,9 +2926,9 @@ handle_rsp_cntrl_info(struct sge_qset *q
 	credits = G_RSPD_TXQ0_CR(flags);
 	if (credits) 
 		qs->txq[TXQ_ETH].processed += credits;
-	
+
 	credits = G_RSPD_TXQ2_CR(flags);
-	if (credits) 
+	if (credits)
 		qs->txq[TXQ_CTRL].processed += credits;
 
 # if USE_GTS
@@ -3133,12 +3131,9 @@ process_responses(adapter_t *adap, struc
 		check_ring_db(adap, qs, sleeping);
 
 	mb();  /* commit Tx queue processed updates */
-	if (__predict_false(qs->txq_stopped > 1)) {
-		printf("restarting tx on %p\n", qs);
-		
+	if (__predict_false(qs->txq_stopped > 1))
 		restart_tx(qs);
-	}
-	
+
 	__refill_fl_lt(adap, &qs->fl[0], 512);
 	__refill_fl_lt(adap, &qs->fl[1], 512);
 	budget -= budget_left;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911112231.nABMV3jx009297>