Commit 6e54e1c5 authored by Hariprasad Kelam's avatar Hariprasad Kelam Committed by David S. Miller
Browse files

octeontx2-af: cn10K: Add MTU configuration 



OcteonTx3 CN10K silicon supports bigger MTU when compared
to 9216 MTU supported by OcteonTx2 silicon variants. Lookback
interface supports upto 64K and RPM LMAC interfaces support
upto 16K.

This patch does the necessary configuration and adds support
for PF/VF drivers to retrieve max packet size supported via mbox

This patch also configures tx link credit by considering supported
fifo size and max packet length for Octeontx3 silicon.

This patch also removes platform specific name from the driver name.

Signed-off-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Signed-off-by: default avatarGeetha sowjanya <gakula@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 242da439

drivers/net/ethernet/marvell/octeontx2/af/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
#



ccflags-y += -I$(src)

obj-$(CONFIG_OCTEONTX2_MBOX) += octeontx2_mbox.o

obj-$(CONFIG_OCTEONTX2_AF) += octeontx2_af.o

obj-$(CONFIG_OCTEONTX2_MBOX) += rvu_mbox.o

obj-$(CONFIG_OCTEONTX2_AF) += rvu_af.o



octeontx2_mbox-y := mbox.o rvu_trace.o

octeontx2_af-y := cgx.o rvu.o rvu_cgx.o rvu_npa.o rvu_nix.o \

rvu_mbox-y := mbox.o rvu_trace.o

rvu_af-y := cgx.o rvu.o rvu_cgx.o rvu_npa.o rvu_nix.o \

		  rvu_reg.o rvu_npc.o rvu_debugfs.o ptp.o rvu_npc_fs.o \

		  rvu_cpt.o rvu_devlink.o rpm.o rvu_cn10k.o

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

+10 −0
Original line number Diff line number Diff line
@@ -1151,6 +1151,14 @@ int cgx_lmac_linkup_start(void *cgxd) 
	return 0;

}



static void cgx_lmac_get_fifolen(struct cgx *cgx)

{

	u64 cfg;



	cfg = cgx_read(cgx, 0, CGX_CONST);

	cgx->mac_ops->fifo_len = FIELD_GET(CGX_CONST_RXFIFO_SIZE, cfg);

}



static int cgx_configure_interrupt(struct cgx *cgx, struct lmac *lmac,

				   int cnt, bool req_free)

{
@@ -1205,6 +1213,8 @@ static int cgx_lmac_init(struct cgx *cgx) 
	u64 lmac_list;

	int i, err;



	cgx_lmac_get_fifolen(cgx);



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

	/* lmac_list specifies which lmacs are enabled

	 * when bit n is set to 1, LMAC[n] is enabled

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

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#define CGXX_SCRATCH0_REG		0x1050

#define CGXX_SCRATCH1_REG		0x1058

#define CGX_CONST			0x2000

#define CGX_CONST_RXFIFO_SIZE	        GENMASK_ULL(23, 0)

#define CGXX_SPUX_CONTROL1		0x10000

#define CGXX_SPUX_LNX_FEC_CORR_BLOCKS	0x10700

#define CGXX_SPUX_LNX_FEC_UNCORR_BLOCKS	0x10800

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

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ enum nix_scheduler { 
#define	NIC_HW_MIN_FRS			40

#define	NIC_HW_MAX_FRS			9212

#define	SDP_HW_MAX_FRS			65535

#define CN10K_LMAC_LINK_MAX_FRS		16380 /* 16k - FCS */

#define CN10K_LBK_LINK_MAX_FRS		65535 /* 64k */



/* NIX RX action operation*/

#define NIX_RX_ACTIONOP_DROP		(0x0ull)

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct mac_ops { 
	u8			irq_offset;

	u8			int_ena_bit;

	u8			lmac_fwi;

	u32			fifo_len;

	bool			non_contiguous_serdes_lane;

	/* Incase of RPM get number of lmacs from RPMX_CMR_RX_LMACS[LMAC_EXIST]

	 * number of setbits in lmac_exist tells number of lmacs