Commit 2078a341 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'octeontx2-af-miscellaneous-fixes' 

Geetha sowjanya says:

====================
octeontx2-af: miscellaneous fixes

The series of patches fixes various issues related to mcs
and NIX link registers.

v3-v4:
 Used FIELD_PREP macro and proper data types.

v2-v3:
 Fixed typo error in patch 4 commit message.

v1-v2:
 Fixed author name for patch 5.
 Added Reviewed-by.
====================

Link: https://lore.kernel.org/r/20231205080434.27604-1-gakula@marvell.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 3142dbf0 7336fc19

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

+1 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ struct mcs_hw_info { 
	u8 tcam_entries;	/* RX/TX Tcam entries per mcs block */

	u8 secy_entries;	/* RX/TX SECY entries per mcs block */

	u8 sc_entries;		/* RX/TX SC CAM entries per mcs block */

	u8 sa_entries;		/* PN table entries = SA entries */

	u16 sa_entries;		/* PN table entries = SA entries */

	u64 rsvd[16];

};

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

+15 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void mcs_get_rx_secy_stats(struct mcs *mcs, struct mcs_secy_stats *stats, int id 
	reg = MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYTAGGEDCTLX(id);

	stats->pkt_tagged_ctl_cnt = mcs_reg_read(mcs, reg);



	reg = MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYUNTAGGEDORNOTAGX(id);

	reg = MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYUNTAGGEDX(id);

	stats->pkt_untaged_cnt = mcs_reg_read(mcs, reg);



	reg = MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYCTLX(id);
@@ -215,7 +215,7 @@ void mcs_get_sc_stats(struct mcs *mcs, struct mcs_sc_stats *stats, 
		reg = MCSX_CSE_RX_MEM_SLAVE_INPKTSSCNOTVALIDX(id);

		stats->pkt_notvalid_cnt = mcs_reg_read(mcs, reg);



		reg = MCSX_CSE_RX_MEM_SLAVE_INPKTSSCUNCHECKEDOROKX(id);

		reg = MCSX_CSE_RX_MEM_SLAVE_INPKTSSCUNCHECKEDX(id);

		stats->pkt_unchecked_cnt = mcs_reg_read(mcs, reg);



		if (mcs->hw->mcs_blks > 1) {
@@ -1219,6 +1219,17 @@ struct mcs *mcs_get_pdata(int mcs_id) 
	return NULL;

}



bool is_mcs_bypass(int mcs_id)

{

	struct mcs *mcs_dev;



	list_for_each_entry(mcs_dev, &mcs_list, mcs_list) {

		if (mcs_dev->mcs_id == mcs_id)

			return mcs_dev->bypass;

	}

	return true;

}



void mcs_set_port_cfg(struct mcs *mcs, struct mcs_port_cfg_set_req *req)

{

	u64 val = 0;
@@ -1436,7 +1447,7 @@ static int mcs_x2p_calibration(struct mcs *mcs) 
	return err;

}



static void mcs_set_external_bypass(struct mcs *mcs, u8 bypass)

static void mcs_set_external_bypass(struct mcs *mcs, bool bypass)

{

	u64 val;
@@ -1447,6 +1458,7 @@ static void mcs_set_external_bypass(struct mcs *mcs, u8 bypass) 
	else

		val &= ~BIT_ULL(6);

	mcs_reg_write(mcs, MCSX_MIL_GLOBAL, val);

	mcs->bypass = bypass;

}



static void mcs_global_cfg(struct mcs *mcs)

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

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ struct mcs { 
	u16			num_vec;

	void			*rvu;

	u16			*tx_sa_active;

	bool                      bypass;

};



struct mcs_ops {
@@ -206,6 +207,7 @@ void mcs_get_custom_tag_cfg(struct mcs *mcs, struct mcs_custom_tag_cfg_get_req * 
int mcs_alloc_ctrlpktrule(struct rsrc_bmap *rsrc, u16 *pf_map, u16 offset, u16 pcifunc);

int mcs_free_ctrlpktrule(struct mcs *mcs, struct mcs_free_ctrl_pkt_rule_req *req);

int mcs_ctrlpktrule_write(struct mcs *mcs, struct mcs_ctrl_pkt_rule_write_req *req);

bool is_mcs_bypass(int mcs_id);



/* CN10K-B APIs */

void cn10kb_mcs_set_hw_capabilities(struct mcs *mcs);

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

+27 −4
Original line number Diff line number Diff line
@@ -810,14 +810,37 @@ 
		offset = 0x9d8ull;			\

	offset; })



#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSCUNCHECKEDX(a) ({	\

	u64 offset;					\

							\

	offset = 0xee80ull;				\

	if (mcs->hw->mcs_blks > 1)			\

		offset = 0xe818ull;			\

	offset += (a) * 0x8ull;				\

	offset; })



#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYUNTAGGEDX(a) ({	\

	u64 offset;					\

							\

	offset = 0xa680ull;				\

	if (mcs->hw->mcs_blks > 1)			\

		offset = 0xd018ull;			\

	offset += (a) * 0x8ull;				\

	offset; })



#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSCLATEORDELAYEDX(a)	({	\

	u64 offset;						\

								\

	offset = 0xf680ull;					\

	if (mcs->hw->mcs_blks > 1)				\

		offset = 0xe018ull;				\

	offset += (a) * 0x8ull;					\

	offset; })



#define MCSX_CSE_RX_MEM_SLAVE_INOCTETSSCDECRYPTEDX(a)	(0xe680ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INOCTETSSCVALIDATEX(a)	(0xde80ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYUNTAGGEDORNOTAGX(a)	(0xa680ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYNOTAGX(a)	(0xd218 + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYUNTAGGEDX(a)	(0xd018ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSCUNCHECKEDOROKX(a)	(0xee80ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSECYCTLX(a)		(0xb680ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSCLATEORDELAYEDX(a) (0xf680ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSAINVALIDX(a)	(0x12680ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSANOTUSINGSAERRORX(a) (0x15680ull + (a) * 0x8ull)

#define MCSX_CSE_RX_MEM_SLAVE_INPKTSSANOTVALIDX(a)	(0x13680ull + (a) * 0x8ull)

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

+3 −0
Original line number Diff line number Diff line
@@ -2631,6 +2631,9 @@ static void __rvu_flr_handler(struct rvu *rvu, u16 pcifunc) 
	rvu_npc_free_mcam_entries(rvu, pcifunc, -1);

	rvu_mac_reset(rvu, pcifunc);



	if (rvu->mcs_blk_cnt)

		rvu_mcs_flr_handler(rvu, pcifunc);



	mutex_unlock(&rvu->flr_lock);

}