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

octeontx2-af: Skip NIXLF check for bcast MCE entry 



At the time of initial broadcast packet replication table init,
NIXLFs are not yet attached to PF_FUNCs. Hence skipped checking
NIXLF while submitting MCE entry init instruction to NIX admin queue.

Also did a minor cleanup while installing bcast match entry in
packet parser unit i.e NPC.

Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarJerin Jacob <jerinj@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e360f73

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

+9 −5
Original line number Diff line number Diff line
@@ -431,9 +431,8 @@ static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req, 
	bool ena;

	u64 cfg;



	pfvf = rvu_get_pfvf(rvu, pcifunc);

	blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NIX, pcifunc);

	if (!pfvf->nixlf || blkaddr < 0)

	if (blkaddr < 0)

		return NIX_AF_ERR_AF_LF_INVALID;



	block = &hw->block[blkaddr];
@@ -443,9 +442,14 @@ static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req, 
		return NIX_AF_ERR_AQ_ENQUEUE;

	}



	pfvf = rvu_get_pfvf(rvu, pcifunc);

	nixlf = rvu_get_lf(rvu, block, pcifunc, 0);

	if (nixlf < 0)



	/* Skip NIXLF check for broadcast MCE entry init */

	if (!(!rsp && req->ctype == NIX_AQ_CTYPE_MCE)) {

		if (!pfvf->nixlf || nixlf < 0)

			return NIX_AF_ERR_AF_LF_INVALID;

	}



	switch (req->ctype) {

	case NIX_AQ_CTYPE_RQ:
@@ -1295,7 +1299,7 @@ static int nix_setup_mce(struct rvu *rvu, int mce, u8 op, 
	struct nix_aq_enq_req aq_req;

	int err;



	aq_req.hdr.pcifunc = pcifunc;

	aq_req.hdr.pcifunc = 0;

	aq_req.ctype = NIX_AQ_CTYPE_MCE;

	aq_req.op = op;

	aq_req.qidx = mce;

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

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ void rvu_npc_install_bcast_match_entry(struct rvu *rvu, u16 pcifunc, 
	 *

	 */

	entry.kw[0] = BIT_ULL(13) | chan;

	entry.kw_mask[0] = ~entry.kw[0] & (BIT_ULL(13) | 0xFFFULL);

	entry.kw_mask[0] = BIT_ULL(13) | 0xFFFULL;



	*(u64 *)&action = 0x00;

#ifdef MCAST_MCE

CRA Git | Maintained and supported by SUSTech CRA and CCSE