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

Commit df459ebc authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller
Browse files

cxgb4: Read stats for only available channels 



Updating the driver to read the stats of only available channels. T6 and
later has only 2 channels

Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b4e83e1

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+26 −47
Original line number Diff line number Diff line
@@ -3926,43 +3926,25 @@ void t4_tp_get_tcp_stats(struct adapter *adap, struct tp_tcp_stats *v4, 
 */

void t4_tp_get_err_stats(struct adapter *adap, struct tp_err_stats *st)

{

	/* T6 and later has 2 channels */

	if (adap->params.arch.nchan == NCHAN) {

		t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->mac_in_errs, 12, TP_MIB_MAC_IN_ERR_0_A);

		t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->tnl_cong_drops, 8,

				 TP_MIB_TNL_CNG_DROP_0_A);

		t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->tnl_tx_drops, 4,

				 TP_MIB_TNL_DROP_0_A);

		t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->ofld_vlan_drops, 4,

				 TP_MIB_OFD_VLN_DROP_0_A);

		t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->tcp6_in_errs, 4,

				 TP_MIB_TCP_V6IN_ERR_0_A);

	} else {

	int nchan = adap->params.arch.nchan;



	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->mac_in_errs, 2, TP_MIB_MAC_IN_ERR_0_A);

			 st->mac_in_errs, nchan, TP_MIB_MAC_IN_ERR_0_A);

	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->hdr_in_errs, 2, TP_MIB_HDR_IN_ERR_0_A);

			 st->hdr_in_errs, nchan, TP_MIB_HDR_IN_ERR_0_A);

	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->tcp_in_errs, 2, TP_MIB_TCP_IN_ERR_0_A);

			 st->tcp_in_errs, nchan, TP_MIB_TCP_IN_ERR_0_A);

	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->tnl_cong_drops, 2,

				 TP_MIB_TNL_CNG_DROP_0_A);

			 st->tnl_cong_drops, nchan, TP_MIB_TNL_CNG_DROP_0_A);

	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->ofld_chan_drops, 2,

				 TP_MIB_OFD_CHN_DROP_0_A);

			 st->ofld_chan_drops, nchan, TP_MIB_OFD_CHN_DROP_0_A);

	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->tnl_tx_drops, 2, TP_MIB_TNL_DROP_0_A);

			 st->tnl_tx_drops, nchan, TP_MIB_TNL_DROP_0_A);

	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->ofld_vlan_drops, 2,

				 TP_MIB_OFD_VLN_DROP_0_A);

			 st->ofld_vlan_drops, nchan, TP_MIB_OFD_VLN_DROP_0_A);

	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

				 st->tcp6_in_errs, 2, TP_MIB_TCP_V6IN_ERR_0_A);

	}

			 st->tcp6_in_errs, nchan, TP_MIB_TCP_V6IN_ERR_0_A);



	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A,

			 &st->ofld_no_neigh, 2, TP_MIB_OFD_ARP_DROP_A);

}
@@ -3976,16 +3958,13 @@ void t4_tp_get_err_stats(struct adapter *adap, struct tp_err_stats *st) 
 */

void t4_tp_get_cpl_stats(struct adapter *adap, struct tp_cpl_stats *st)

{

	/* T6 and later has 2 channels */

	if (adap->params.arch.nchan == NCHAN) {

		t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A, st->req,

				 8, TP_MIB_CPL_IN_REQ_0_A);

	} else {

	int nchan = adap->params.arch.nchan;



	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A, st->req,

				 2, TP_MIB_CPL_IN_REQ_0_A);

			 nchan, TP_MIB_CPL_IN_REQ_0_A);

	t4_read_indirect(adap, TP_MIB_INDEX_A, TP_MIB_DATA_A, st->rsp,

				 2, TP_MIB_CPL_OUT_RSP_0_A);

	}

			 nchan, TP_MIB_CPL_OUT_RSP_0_A);



}



/**