Commit 459f326e authored by Sunil Goutham's avatar Sunil Goutham Committed by David S. Miller
Browse files

octeontx2-af: Set NIX link credits based on max LMAC 



When number of LMACs active on a CGX/RPM are 3, then
current NIX link credit config based on per lmac fifo
length which inturn  is calculated as
'lmac_fifo_len = total_fifo_len / 3', is incorrect. In HW
one of the LMAC gets half of the FIFO and rest gets 1/4th.

Signed-off-by: default avatarNithin Dabilpuram <ndabilpuram@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarGeetha Sowjanya <gakula@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da92e03c

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

+27 −0
Original line number Diff line number Diff line
@@ -498,6 +498,32 @@ static u8 cgx_get_lmac_type(void *cgxd, int lmac_id) 
	return (cfg >> CGX_LMAC_TYPE_SHIFT) & CGX_LMAC_TYPE_MASK;

}



static u32 cgx_get_lmac_fifo_len(void *cgxd, int lmac_id)

{

	struct cgx *cgx = cgxd;

	u8 num_lmacs;

	u32 fifo_len;



	fifo_len = cgx->mac_ops->fifo_len;

	num_lmacs = cgx->mac_ops->get_nr_lmacs(cgx);



	switch (num_lmacs) {

	case 1:

		return fifo_len;

	case 2:

		return fifo_len / 2;

	case 3:

		/* LMAC0 gets half of the FIFO, reset 1/4th */

		if (lmac_id == 0)

			return fifo_len / 2;

		return fifo_len / 4;

	case 4:

	default:

		return fifo_len / 4;

	}

	return 0;

}



/* Configure CGX LMAC in internal loopback mode */

int cgx_lmac_internal_loopback(void *cgxd, int lmac_id, bool enable)

{
@@ -1704,6 +1730,7 @@ static struct mac_ops cgx_mac_ops = { 
	.tx_stats_cnt   =       18,

	.get_nr_lmacs	=	cgx_get_nr_lmacs,

	.get_lmac_type  =       cgx_get_lmac_type,

	.lmac_fifo_len	=	cgx_get_lmac_fifo_len,

	.mac_lmac_intl_lbk =    cgx_lmac_internal_loopback,

	.mac_get_rx_stats  =	cgx_get_rx_stats,

	.mac_get_tx_stats  =	cgx_get_tx_stats,

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

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct mac_ops { 
	 */

	int			(*get_nr_lmacs)(void *cgx);

	u8                      (*get_lmac_type)(void *cgx, int lmac_id);

	u32                     (*lmac_fifo_len)(void *cgx, int lmac_id);

	int                     (*mac_lmac_intl_lbk)(void *cgx, int lmac_id,

						     bool enable);

	/* Register Stats related functions */

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

+30 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ static struct mac_ops rpm_mac_ops = { 
	.tx_stats_cnt   =       34,

	.get_nr_lmacs	=	rpm_get_nr_lmacs,

	.get_lmac_type  =       rpm_get_lmac_type,

	.lmac_fifo_len	=	rpm_get_lmac_fifo_len,

	.mac_lmac_intl_lbk =    rpm_lmac_internal_loopback,

	.mac_get_rx_stats  =	rpm_get_rx_stats,

	.mac_get_tx_stats  =	rpm_get_tx_stats,
@@ -350,6 +351,35 @@ u8 rpm_get_lmac_type(void *rpmd, int lmac_id) 
	return err;

}



u32 rpm_get_lmac_fifo_len(void *rpmd, int lmac_id)

{

	rpm_t *rpm = rpmd;

	u64 hi_perf_lmac;

	u8 num_lmacs;

	u32 fifo_len;



	fifo_len = rpm->mac_ops->fifo_len;

	num_lmacs = rpm->mac_ops->get_nr_lmacs(rpm);



	switch (num_lmacs) {

	case 1:

		return fifo_len;

	case 2:

		return fifo_len / 2;

	case 3:

		/* LMAC marked as hi_perf gets half of the FIFO and rest 1/4th */

		hi_perf_lmac = rpm_read(rpm, 0, CGXX_CMRX_RX_LMACS);

		hi_perf_lmac = (hi_perf_lmac >> 4) & 0x3ULL;

		if (lmac_id == hi_perf_lmac)

			return fifo_len / 2;

		return fifo_len / 4;

	case 4:

	default:

		return fifo_len / 4;

	}

	return 0;

}



int rpm_lmac_internal_loopback(void *rpmd, int lmac_id, bool enable)

{

	rpm_t *rpm = rpmd;

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

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
/* Function Declarations */

int rpm_get_nr_lmacs(void *rpmd);

u8 rpm_get_lmac_type(void *rpmd, int lmac_id);

u32 rpm_get_lmac_fifo_len(void *rpmd, int lmac_id);

int rpm_lmac_internal_loopback(void *rpmd, int lmac_id, bool enable);

void rpm_lmac_enadis_rx_pause_fwding(void *rpmd, int lmac_id, bool enable);

int rpm_lmac_get_pause_frm_status(void *cgxd, int lmac_id, u8 *tx_pause,

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

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ int rvu_cgx_config_tx(void *cgxd, int lmac_id, bool enable); 
int rvu_cgx_prio_flow_ctrl_cfg(struct rvu *rvu, u16 pcifunc, u8 tx_pause, u8 rx_pause,

			       u16 pfc_en);

int rvu_cgx_cfg_pause_frm(struct rvu *rvu, u16 pcifunc, u8 tx_pause, u8 rx_pause);



u32 rvu_cgx_get_lmac_fifolen(struct rvu *rvu, int cgx, int lmac);

int npc_get_nixlf_mcam_index(struct npc_mcam *mcam, u16 pcifunc, int nixlf,

			     int type);

bool is_mcam_entry_enabled(struct rvu *rvu, struct npc_mcam *mcam, int blkaddr,