Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 4 Jun 2009 04:11:27 +0000 (UTC)
From:      Kip Macy <kmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r193424 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
Message-ID:  <200906040411.n544BRw5076813@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kmacy
Date: Thu Jun  4 04:11:27 2009
New Revision: 193424
URL: http://svn.freebsd.org/changeset/base/193424

Log:
  fix INVARIANTS compile

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.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	Thu Jun  4 04:00:29 2009	(r193423)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h	Thu Jun  4 04:11:27 2009	(r193424)
@@ -402,7 +402,7 @@ struct t3_rx_mode {
 #define ADAPTER_UNLOCK(adap)	mtx_unlock(&(adap)->lock);
 #define ADAPTER_LOCK_INIT(adap, name) mtx_init(&(adap)->lock, name, 0, MTX_DEF)
 #define ADAPTER_LOCK_DEINIT(adap) mtx_destroy(&(adap)->lock)
-#define ADAPTER_LOCK_ASSERT_NOTOWNED(adap) mtx_assert(&(adap)->lock, MO_NOTOWNED)
+#define ADAPTER_LOCK_ASSERT_NOTOWNED(adap) mtx_assert(&(adap)->lock, MA_NOTOWNED)
 
 
 static __inline uint32_t
@@ -510,7 +510,7 @@ int t3_sge_init_adapter(adapter_t *);
 int t3_sge_reset_adapter(adapter_t *);
 int t3_sge_init_port(struct port_info *);
 void t3_sge_deinit_sw(adapter_t *);
-void t3_free_tx_desc(struct sge_txq *q, int n);
+void t3_free_tx_desc(struct sge_qset *qs, int n, int qid);
 void t3_free_tx_desc_all(struct sge_txq *q);
 
 void t3_rx_eth(struct adapter *adap, struct sge_rspq *rq, struct mbuf *m, int ethpad);

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	Thu Jun  4 04:00:29 2009	(r193423)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Thu Jun  4 04:11:27 2009	(r193424)
@@ -233,7 +233,7 @@ reclaim_completed_tx(struct sge_qset *qs
 	
 	mtx_assert(&qs->lock, MA_OWNED);
 	if (reclaim > 0) {
-		t3_free_tx_desc(q, reclaim);
+		t3_free_tx_desc(qs, reclaim, queue);
 		q->cleaned += reclaim;
 		q->in_use -= reclaim;
 	}
@@ -1263,7 +1263,7 @@ t3_encap(struct sge_qset *qs, struct mbu
 	DPRINTF("t3_encap port_id=%d qsidx=%d ", pi->port_id, pi->first_qset);
 	DPRINTF("mlen=%d txpkt_intf=%d tx_chan=%d\n", m[0]->m_pkthdr.len, pi->txpkt_intf, pi->tx_chan);
 	
-	mtx_assert(&txq->lock, MA_OWNED);
+	mtx_assert(&qs->lock, MA_OWNED);
 	cntrl = V_TXPKT_INTF(pi->txpkt_intf);
 /*
  * XXX need to add VLAN support for 6.x
@@ -1686,8 +1686,6 @@ reclaim_completed_tx_imm(struct sge_txq 
 {
 	unsigned int reclaim = q->processed - q->cleaned;
 
-	mtx_assert(&q->lock, MA_OWNED);
-	
 	q->in_use -= reclaim;
 	q->cleaned += reclaim;
 }
@@ -1966,10 +1964,11 @@ t3_sge_stop(adapter_t *sc)
  *      Returns number of buffers of reclaimed   
  */
 void
-t3_free_tx_desc(struct sge_txq *q, int reclaimable)
+t3_free_tx_desc(struct sge_qset *qs, int reclaimable, int queue)
 {
 	struct tx_sw_desc *txsd;
 	unsigned int cidx;
+	struct sge_txq *q = &qs->txq[queue];
 	
 #ifdef T3_TRACE
 	T3_TRACE2(sc->tb[q->cntxt_id & 7],
@@ -1978,7 +1977,7 @@ t3_free_tx_desc(struct sge_txq *q, int r
 	cidx = q->cidx;
 	txsd = &q->sdesc[cidx];
 	DPRINTF("reclaiming %d WR\n", reclaimable);
-	mtx_assert(&q->lock, MA_OWNED);
+	mtx_assert(&qs->lock, MA_OWNED);
 	while (reclaimable--) {
 		DPRINTF("cidx=%d d=%p\n", cidx, txsd);
 		if (txsd->m != NULL) {
@@ -2146,7 +2145,6 @@ ofld_xmit(adapter_t *adap, struct sge_qs
 	busdma_map_sgl(vsegs, segs, nsegs);
 
 	stx = &q->sdesc[q->pidx];
-	KASSERT(stx->mi.mi_base == NULL, ("mi_base set"));
 	
 	TXQ_LOCK(qs);
 again:	reclaim_completed_tx(qs, 16, TXQ_OFLD);

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