Commit 2f387525 authored by Hariprasad Kelam's avatar Hariprasad Kelam Committed by David S. Miller
Browse files

octeontx2-af: Add validation of lmac 



With the addition of new MAC blocks like CN10K RPM and CN10KB
RPM_USX, LMACs are noncontiguous. Though in most of the functions,
lmac validation checks exist but in few functions they are missing.
This patch adds the same.

Signed-off-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Signed-off-by: default avatarSunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f027fd51

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

+7 −3
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ int cgx_lmac_addr_set(u8 cgx_id, u8 lmac_id, u8 *mac_addr) 
	int index, id;

	u64 cfg;



	if (!lmac)

		return -ENODEV;



	/* access mac_ops to know csr_offset */

	mac_ops = cgx_dev->mac_ops;
@@ -550,15 +553,16 @@ void cgx_lmac_promisc_config(int cgx_id, int lmac_id, bool enable) 
{

	struct cgx *cgx = cgx_get_pdata(cgx_id);

	struct lmac *lmac = lmac_pdata(lmac_id, cgx);

	u16 max_dmac = lmac->mac_to_index_bmap.max;

	struct mac_ops *mac_ops;

	u16 max_dmac;

	int index, i;

	u64 cfg = 0;

	int id;



	if (!cgx)

	if (!cgx || !lmac)

		return;



	max_dmac = lmac->mac_to_index_bmap.max;

	id = get_sequence_id_of_lmac(cgx, lmac_id);



	mac_ops = cgx->mac_ops;
@@ -731,7 +735,7 @@ int cgx_get_fec_stats(void *cgxd, int lmac_id, struct cgx_fec_stats_rsp *rsp) 
	int corr_reg, uncorr_reg;

	struct cgx *cgx = cgxd;



	if (!cgx || lmac_id >= cgx->lmac_count)

	if (!is_lmac_valid(cgx, lmac_id))

		return -ENODEV;



	if (cgx->lmac_idmap[lmac_id]->link_info.fec == OTX2_FEC_NONE)