Commit 940754a2 authored by Geetha sowjanya's avatar Geetha sowjanya Committed by David S. Miller
Browse files

octeontx2-pf: Get VF stats via representor 



Adds support to export VF port statistics via representor
netdev. Defines new mbox "NIX_LF_STATS" to fetch VF hw stats.

Signed-off-by: default avatarGeetha sowjanya <gakula@marvell.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 683645a2

drivers/net/ethernet/marvell/octeontx2/af/mbox.h

+32 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ M(NIX_MCAST_GRP_DESTROY, 0x802c, nix_mcast_grp_destroy, nix_mcast_grp_destroy_re 
M(NIX_MCAST_GRP_UPDATE, 0x802d, nix_mcast_grp_update,				\

				nix_mcast_grp_update_req,			\

				nix_mcast_grp_update_rsp)			\

M(NIX_LF_STATS, 0x802e, nix_lf_stats, nix_stats_req, nix_stats_rsp)	\

/* MCS mbox IDs (range 0xA000 - 0xBFFF) */					\

M(MCS_ALLOC_RESOURCES,	0xa000, mcs_alloc_resources, mcs_alloc_rsrc_req,	\

				mcs_alloc_rsrc_rsp)				\
@@ -1366,6 +1367,37 @@ struct nix_bandprof_get_hwinfo_rsp { 
	u32 policer_timeunit;

};



struct nix_stats_req {

	struct mbox_msghdr hdr;

	u8 reset;

	u16 pcifunc;

	u64 rsvd;

};



struct nix_stats_rsp {

	struct mbox_msghdr hdr;

	u16 pcifunc;

	struct {

		u64 octs;

		u64 ucast;

		u64 bcast;

		u64 mcast;

		u64 drop;

		u64 drop_octs;

		u64 drop_mcast;

		u64 drop_bcast;

		u64 err;

		u64 rsvd[5];

	} rx;

	struct {

		u64 ucast;

		u64 bcast;

		u64 mcast;

		u64 drop;

		u64 octs;

	} tx;

};



/* NPC mbox message structs */



#define NPC_MCAM_ENTRY_INVALID	0xFFFF

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c

+0 −27
Original line number Diff line number Diff line
@@ -45,33 +45,6 @@ enum { 
	CGX_STAT18,

};



/* NIX TX stats */

enum nix_stat_lf_tx {

	TX_UCAST	= 0x0,

	TX_BCAST	= 0x1,

	TX_MCAST	= 0x2,

	TX_DROP		= 0x3,

	TX_OCTS		= 0x4,

	TX_STATS_ENUM_LAST,

};



/* NIX RX stats */

enum nix_stat_lf_rx {

	RX_OCTS		= 0x0,

	RX_UCAST	= 0x1,

	RX_BCAST	= 0x2,

	RX_MCAST	= 0x3,

	RX_DROP		= 0x4,

	RX_DROP_OCTS	= 0x5,

	RX_FCS		= 0x6,

	RX_ERR		= 0x7,

	RX_DRP_BCAST	= 0x8,

	RX_DRP_MCAST	= 0x9,

	RX_DRP_L3BCAST	= 0xa,

	RX_DRP_L3MCAST	= 0xb,

	RX_STATS_ENUM_LAST,

};



static char *cgx_rx_stats_fields[] = {

	[CGX_STAT0]	= "Received packets",

	[CGX_STAT1]	= "Octets of received packets",

drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c

+43 −0
Original line number Diff line number Diff line
@@ -14,6 +14,49 @@ 
#include "rvu.h"

#include "rvu_reg.h"



#define RVU_LF_RX_STATS(reg) \

		rvu_read64(rvu, blkaddr, NIX_AF_LFX_RX_STATX(nixlf, reg))



#define RVU_LF_TX_STATS(reg) \

		rvu_read64(rvu, blkaddr, NIX_AF_LFX_TX_STATX(nixlf, reg))



int rvu_mbox_handler_nix_lf_stats(struct rvu *rvu,

				  struct nix_stats_req *req,

				  struct nix_stats_rsp *rsp)

{

	u16 pcifunc = req->pcifunc;

	int nixlf, blkaddr, err;

	struct msg_req rst_req;

	struct msg_rsp rst_rsp;



	err = nix_get_nixlf(rvu, pcifunc, &nixlf, &blkaddr);

	if (err)

		return 0;



	if (req->reset) {

		rst_req.hdr.pcifunc = pcifunc;

		return rvu_mbox_handler_nix_stats_rst(rvu, &rst_req, &rst_rsp);

	}

	rsp->rx.octs = RVU_LF_RX_STATS(RX_OCTS);

	rsp->rx.ucast = RVU_LF_RX_STATS(RX_UCAST);

	rsp->rx.bcast = RVU_LF_RX_STATS(RX_BCAST);

	rsp->rx.mcast = RVU_LF_RX_STATS(RX_MCAST);

	rsp->rx.drop = RVU_LF_RX_STATS(RX_DROP);

	rsp->rx.err = RVU_LF_RX_STATS(RX_ERR);

	rsp->rx.drop_octs = RVU_LF_RX_STATS(RX_DROP_OCTS);

	rsp->rx.drop_mcast = RVU_LF_RX_STATS(RX_DRP_MCAST);

	rsp->rx.drop_bcast = RVU_LF_RX_STATS(RX_DRP_BCAST);



	rsp->tx.octs = RVU_LF_TX_STATS(TX_OCTS);

	rsp->tx.ucast = RVU_LF_TX_STATS(TX_UCAST);

	rsp->tx.bcast = RVU_LF_TX_STATS(TX_BCAST);

	rsp->tx.mcast = RVU_LF_TX_STATS(TX_MCAST);

	rsp->tx.drop = RVU_LF_TX_STATS(TX_DROP);



	rsp->pcifunc = req->pcifunc;

	return 0;

}



static u16 rvu_rep_get_vlan_id(struct rvu *rvu, u16 pcifunc)

{

	int id;

drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h

+26 −0
Original line number Diff line number Diff line
@@ -823,4 +823,30 @@ enum nix_tx_vtag_op { 
#define VTAG_STRIP	BIT_ULL(4)

#define VTAG_CAPTURE	BIT_ULL(5)



/* NIX TX stats */

enum nix_stat_lf_tx {

	TX_UCAST	= 0x0,

	TX_BCAST	= 0x1,

	TX_MCAST	= 0x2,

	TX_DROP		= 0x3,

	TX_OCTS		= 0x4,

	TX_STATS_ENUM_LAST,

};



/* NIX RX stats */

enum nix_stat_lf_rx {

	RX_OCTS		= 0x0,

	RX_UCAST	= 0x1,

	RX_BCAST	= 0x2,

	RX_MCAST	= 0x3,

	RX_DROP		= 0x4,

	RX_DROP_OCTS	= 0x5,

	RX_FCS		= 0x6,

	RX_ERR		= 0x7,

	RX_DRP_BCAST	= 0x8,

	RX_DRP_MCAST	= 0x9,

	RX_DRP_L3BCAST	= 0xa,

	RX_DRP_L3MCAST	= 0xb,

	RX_STATS_ENUM_LAST,

};

#endif /* RVU_STRUCT_H */

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h

+0 −27
Original line number Diff line number Diff line
@@ -121,33 +121,6 @@ enum otx2_errcodes_re { 
	ERRCODE_IL4_CSUM = 0x22,

};



/* NIX TX stats */

enum nix_stat_lf_tx {

	TX_UCAST	= 0x0,

	TX_BCAST	= 0x1,

	TX_MCAST	= 0x2,

	TX_DROP		= 0x3,

	TX_OCTS		= 0x4,

	TX_STATS_ENUM_LAST,

};



/* NIX RX stats */

enum nix_stat_lf_rx {

	RX_OCTS		= 0x0,

	RX_UCAST	= 0x1,

	RX_BCAST	= 0x2,

	RX_MCAST	= 0x3,

	RX_DROP		= 0x4,

	RX_DROP_OCTS	= 0x5,

	RX_FCS		= 0x6,

	RX_ERR		= 0x7,

	RX_DRP_BCAST	= 0x8,

	RX_DRP_MCAST	= 0x9,

	RX_DRP_L3BCAST	= 0xa,

	RX_DRP_L3MCAST	= 0xb,

	RX_STATS_ENUM_LAST,

};



struct otx2_dev_stats {

	u64 rx_bytes;

	u64 rx_frames;