Commit bd74d4ea authored by Felix Manlunas's avatar Felix Manlunas Committed by David S. Miller
Browse files

octeontx2-af: Add new CGX_CMD to get PHY FEC statistics 



This patch adds support to fetch fec stats from PHY. The stats are
put in the shared data struct fwdata.  A PHY driver indicates
that it has FEC stats by setting the flag fwdata.phy.misc.has_fec_stats

Besides CGX_CMD_GET_PHY_FEC_STATS, also add CGX_CMD_PRBS and
CGX_CMD_DISPLAY_EYE to enum cgx_cmd_id so that Linux's enum list is in sync
with firmware's enum list.

Signed-off-by: default avatarFelix Manlunas <fmanlunas@marvell.com>
Signed-off-by: default avatarChristina Jacob <cjacob@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84c4f9ca

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

+12 −0
Original line number Diff line number Diff line
@@ -861,6 +861,18 @@ int cgx_set_fec(u64 fec, int cgx_id, int lmac_id) 
	return cgx->lmac_idmap[lmac_id]->link_info.fec;

}



int cgx_get_phy_fec_stats(void *cgxd, int lmac_id)

{

	struct cgx *cgx = cgxd;

	u64 req = 0, resp;



	if (!cgx)

		return -ENODEV;



	req = FIELD_SET(CMDREG_ID, CGX_CMD_GET_PHY_FEC_STATS, req);

	return cgx_fwi_cmd_generic(req, &resp, cgx, lmac_id);

}



static int cgx_fwi_link_change(struct cgx *cgx, int lmac_id, bool enable)

{

	u64 req = 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -154,5 +154,6 @@ void cgx_lmac_ptp_config(void *cgxd, int lmac_id, bool enable); 
u8 cgx_lmac_get_p2x(int cgx_id, int lmac_id);

int cgx_set_fec(u64 fec, int cgx_id, int lmac_id);

int cgx_get_fec_stats(void *cgxd, int lmac_id, struct cgx_fec_stats_rsp *rsp);

int cgx_get_phy_fec_stats(void *cgxd, int lmac_id);



#endif /* CGX_H */

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

+5 −0
Original line number Diff line number Diff line
@@ -89,6 +89,11 @@ enum cgx_cmd_id { 
	CGX_CMD_SET_AN,

	CGX_CMD_GET_ADV_LINK_MODES,

	CGX_CMD_GET_ADV_FEC,

	CGX_CMD_GET_PHY_MOD_TYPE, /* line-side modulation type: NRZ or PAM4 */

	CGX_CMD_SET_PHY_MOD_TYPE,

	CGX_CMD_PRBS,

	CGX_CMD_DISPLAY_EYE,

	CGX_CMD_GET_PHY_FEC_STATS,

};



/* async event ids */

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

+43 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ M(CGX_CFG_PAUSE_FRM, 0x20E, cgx_cfg_pause_frm, cgx_pause_frm_cfg, \ 
			       cgx_pause_frm_cfg)			\

M(CGX_FEC_SET,		0x210, cgx_set_fec_param, fec_mode, fec_mode)   \

M(CGX_FEC_STATS,	0x211, cgx_fec_stats, msg_req, cgx_fec_stats_rsp) \

M(CGX_GET_PHY_FEC_STATS, 0x212, cgx_get_phy_fec_stats, msg_req, msg_rsp) \

M(CGX_FW_DATA_GET,	0x213, cgx_get_aux_link_info, msg_req, cgx_fw_data) \

 /* NPA mbox IDs (range 0x400 - 0x5FF) */				\

/* NPA mbox IDs (range 0x400 - 0x5FF) */				\

M(NPA_LF_ALLOC,		0x400, npa_lf_alloc,				\
@@ -413,6 +415,47 @@ struct fec_mode { 
	int fec;

};



struct sfp_eeprom_s {

#define SFP_EEPROM_SIZE 256

	u16 sff_id;

	u8 buf[SFP_EEPROM_SIZE];

	u64 reserved;

};



struct phy_s {

	struct {

		u64 can_change_mod_type:1;

		u64 mod_type:1;

		u64 has_fec_stats:1;

	} misc;

	struct fec_stats_s {

		u32 rsfec_corr_cws;

		u32 rsfec_uncorr_cws;

		u32 brfec_corr_blks;

		u32 brfec_uncorr_blks;

	} fec_stats;

};



struct cgx_lmac_fwdata_s {

	u16 rw_valid;

	u64 supported_fec;

	u64 supported_an;

	u64 supported_link_modes;

	/* only applicable if AN is supported */

	u64 advertised_fec;

	u64 advertised_link_modes;

	/* Only applicable if SFP/QSFP slot is present */

	struct sfp_eeprom_s sfp_eeprom;

	struct phy_s phy;

#define LMAC_FWDATA_RESERVED_MEM 1021

	u64 reserved[LMAC_FWDATA_RESERVED_MEM];

};



struct cgx_fw_data {

	struct mbox_msghdr hdr;

	struct cgx_lmac_fwdata_s fwdata;

};



/* NPA mbox message formats */



/* NPA mailbox error codes

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

+4 −0
Original line number Diff line number Diff line
@@ -357,6 +357,10 @@ struct rvu_fwdata { 
	u64 msixtr_base;

#define FWDATA_RESERVED_MEM 1023

	u64 reserved[FWDATA_RESERVED_MEM];

#define CGX_MAX         5

#define CGX_LMACS_MAX   4

	struct cgx_lmac_fwdata_s cgx_fw_data[CGX_MAX][CGX_LMACS_MAX];

	/* Do not add new fields below this line */

};



struct ptp;