Commit 18f76191 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: improve defines for constants in ethtool 



We split rvector stats into two categories - per queue and
stats which are added up into one total counter.  Improve
the defines denoting their number.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16f50cda

drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -181,7 +181,8 @@ static const struct nfp_et_stat nfp_mac_et_stats[] = { 




#define NN_ET_GLOBAL_STATS_LEN ARRAY_SIZE(nfp_net_et_stats)

#define NN_ET_GLOBAL_STATS_LEN ARRAY_SIZE(nfp_net_et_stats)

#define NN_ET_SWITCH_STATS_LEN 9

#define NN_ET_SWITCH_STATS_LEN 9

#define NN_ET_RVEC_GATHER_STATS 8

#define NN_RVEC_GATHER_STATS	8

#define NN_RVEC_PER_Q_STATS	3





static void nfp_net_get_nspinfo(struct nfp_app *app, char *version)

static void nfp_net_get_nspinfo(struct nfp_app *app, char *version)

{

{
@@ -427,7 +428,7 @@ static unsigned int nfp_vnic_get_sw_stats_count(struct net_device *netdev) 
{

{

	struct nfp_net *nn = netdev_priv(netdev);

	struct nfp_net *nn = netdev_priv(netdev);





	return NN_ET_RVEC_GATHER_STATS + nn->dp.num_r_vecs * 3;

	return NN_RVEC_GATHER_STATS + nn->dp.num_r_vecs * NN_RVEC_PER_Q_STATS;

}

}





static u8 *nfp_vnic_get_sw_stats_strings(struct net_device *netdev, u8 *data)

static u8 *nfp_vnic_get_sw_stats_strings(struct net_device *netdev, u8 *data)
@@ -455,9 +456,9 @@ static u8 *nfp_vnic_get_sw_stats_strings(struct net_device *netdev, u8 *data) 




static u64 *nfp_vnic_get_sw_stats(struct net_device *netdev, u64 *data)

static u64 *nfp_vnic_get_sw_stats(struct net_device *netdev, u64 *data)

{

{

	u64 gathered_stats[NN_ET_RVEC_GATHER_STATS] = {};

	u64 gathered_stats[NN_RVEC_GATHER_STATS] = {};

	struct nfp_net *nn = netdev_priv(netdev);

	struct nfp_net *nn = netdev_priv(netdev);

	u64 tmp[NN_ET_RVEC_GATHER_STATS];

	u64 tmp[NN_RVEC_GATHER_STATS];

	unsigned int i, j;

	unsigned int i, j;





	for (i = 0; i < nn->dp.num_r_vecs; i++) {

	for (i = 0; i < nn->dp.num_r_vecs; i++) {
@@ -482,13 +483,13 @@ static u64 *nfp_vnic_get_sw_stats(struct net_device *netdev, u64 *data) 
			tmp[7] = nn->r_vecs[i].tx_lso;

			tmp[7] = nn->r_vecs[i].tx_lso;

		} while (u64_stats_fetch_retry(&nn->r_vecs[i].tx_sync, start));

		} while (u64_stats_fetch_retry(&nn->r_vecs[i].tx_sync, start));





		data += 3;

		data += NN_RVEC_PER_Q_STATS;





		for (j = 0; j < NN_ET_RVEC_GATHER_STATS; j++)

		for (j = 0; j < NN_RVEC_GATHER_STATS; j++)

			gathered_stats[j] += tmp[j];

			gathered_stats[j] += tmp[j];

	}

	}





	for (j = 0; j < NN_ET_RVEC_GATHER_STATS; j++)

	for (j = 0; j < NN_RVEC_GATHER_STATS; j++)

		*data++ = gathered_stats[j];

		*data++ = gathered_stats[j];





	return data;

	return data;