Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31563789 authored by Divy Le Ray's avatar Divy Le Ray Committed by David S. Miller
Browse files

cxgb3: start qset timers when setup succeeded 



Start queue set reclaim timers after the queue sets have been
allocated successfully.

Signed-off-by: default avatarDivy Le Ray <divy@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d1ec781

drivers/net/cxgb3/adapter.h

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ void t3_os_link_fault_handler(struct adapter *adapter, int port_id); 


void t3_sge_start(struct adapter *adap);

void t3_sge_stop(struct adapter *adap);

void t3_start_sge_timers(struct adapter *adap);

void t3_stop_sge_timers(struct adapter *adap);

void t3_free_sge_resources(struct adapter *adap);

void t3_sge_err_intr_handler(struct adapter *adapter);

drivers/net/cxgb3/cxgb3_main.c

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -602,7 +602,6 @@ static int setup_sge_qsets(struct adapter *adap) 
				&adap->params.sge.qset[qset_idx], ntxq, dev,

				netdev_get_tx_queue(dev, j));

			if (err) {

				t3_stop_sge_timers(adap);

				t3_free_sge_resources(adap);

				return err;

			}
@@ -1046,6 +1045,8 @@ static int cxgb_up(struct adapter *adap) 
		setup_rss(adap);

		if (!(adap->flags & NAPI_INIT))

			init_napi(adap);



		t3_start_sge_timers(adap);

		adap->flags |= FULL_INIT_DONE;

	}

drivers/net/cxgb3/sge.c

100644 → 100755
+21 −3
Original line number Diff line number Diff line
@@ -3044,9 +3044,6 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports, 
	t3_write_reg(adapter, A_SG_GTS, V_RSPQ(q->rspq.cntxt_id) |

		     V_NEWTIMER(q->rspq.holdoff_tmr));



	mod_timer(&q->tx_reclaim_timer, jiffies + TX_RECLAIM_PERIOD);

	mod_timer(&q->rx_reclaim_timer, jiffies + RX_RECLAIM_PERIOD);



	return 0;



err_unlock:
@@ -3056,6 +3053,27 @@ err: 
	return ret;

}



/**

 *      t3_start_sge_timers - start SGE timer call backs

 *      @adap: the adapter

 *

 *      Starts each SGE queue set's timer call back

 */

void t3_start_sge_timers(struct adapter *adap)

{

	int i;



	for (i = 0; i < SGE_QSETS; ++i) {

		struct sge_qset *q = &adap->sge.qs[i];



	if (q->tx_reclaim_timer.function)

		mod_timer(&q->tx_reclaim_timer, jiffies + TX_RECLAIM_PERIOD);



	if (q->rx_reclaim_timer.function)

		mod_timer(&q->rx_reclaim_timer, jiffies + RX_RECLAIM_PERIOD);

	}

}



/**

 *	t3_stop_sge_timers - stop SGE timer call backs

 *	@adap: the adapter