svn commit: r193569 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb

[Kip Macy]

Author: kmacy
Date: Sat Jun  6 06:29:15 2009
New Revision: 193569
URL: http://svn.freebsd.org/changeset/base/193569

Log:
  - simplify teardown
  - remove dead code

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
  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	Sat Jun  6 06:11:25 2009	(r193568)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h	Sat Jun  6 06:29:15 2009	(r193569)
@@ -509,9 +509,7 @@ void t3_intr_msix(void *data);
 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_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_main.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Sat Jun  6 06:11:25 2009	(r193568)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Sat Jun  6 06:29:15 2009	(r193569)
@@ -677,14 +677,14 @@ cxgb_free(struct adapter *sc)
 		    sc->msix_regs_res);
 	}
 
-	if (sc->flags & FULL_INIT_DONE)
+	if (sc->flags & FULL_INIT_DONE) {
 		t3_free_sge_resources(sc);
-	t3_sge_deinit_sw(sc);
-
+		sc->flags &= ~FULL_INIT_DONE;
+	}
 	/*
 	 * Wait for last callout
 	 */
-	DELAY(hz*100);
+	DELAY(hz*10000);
 
 	for (i = 0; i < (sc)->params.nports; ++i) {
 		if (sc->portdev[i] != NULL)

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	Sat Jun  6 06:11:25 2009	(r193568)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Sat Jun  6 06:29:15 2009	(r193569)
@@ -907,12 +907,6 @@ t3_sge_init_port(struct port_info *pi)
 	return (0);
 }
 
-void
-t3_sge_deinit_sw(adapter_t *sc)
-{
-	;
-}
-
 /**
  *	refill_rspq - replenish an SGE response queue
  *	@adapter: the adapter
@@ -1932,7 +1926,6 @@ t3_mgmt_tx(struct adapter *adap, struct 
 	return ctrl_xmit(adap, &adap->sge.qs[0], m);
 }
 
-
 /**
  *	free_qset - free the resources of an SGE queue set
  *	@sc: the controller owning the queue set
@@ -1947,8 +1940,7 @@ t3_free_qset(adapter_t *sc, struct sge_q
 {
 	int i;
 	
-	t3_free_tx_desc_all(&q->txq[TXQ_ETH]);
-	
+	reclaim_completed_tx(q, 0, TXQ_ETH);
 	for (i = 0; i < SGE_TXQ_PER_SET; i++) {
 		if (q->txq[i].txq_mr != NULL) 
 			buf_ring_free(q->txq[i].txq_mr, M_DEVBUF);
@@ -2139,25 +2131,6 @@ t3_free_tx_desc(struct sge_qset *qs, int
 
 }
 
-void
-t3_free_tx_desc_all(struct sge_txq *q)
-{
-	int i;
-	struct tx_sw_desc *txsd;
-	
-	for (i = 0; i < q->size; i++) {
-		txsd = &q->sdesc[i];
-		if (txsd->m != NULL) {
-			if (txsd->flags & TX_SW_DESC_MAPPED) {
-				bus_dmamap_unload(q->entry_tag, txsd->map);
-				txsd->flags &= ~TX_SW_DESC_MAPPED;
-			}
-			m_freem_list(txsd->m);
-			txsd->m = NULL;			
-		}
-	}
-}
-
 /**
  *	is_new_response - check if a response is newly written
  *	@r: the response descriptor