Commit 55efcc57 authored by Subbaraya Sundeep's avatar Subbaraya Sundeep Committed by Jakub Kicinski
Browse files

octeontx2-af: Setup MCE context for assigned NIX 



Initialize MCE context for the assigned NIX0/1
block for a CGX mapped PF. Modified rvu_nix_aq_enq_inst
function to work with nix_hw so that MCE contexts
for both NIX blocks can be inited.

Signed-off-by: default avatarSubbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarRakesh Babu <rsaladi2@marvell.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c5a73b63

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

+36 −20
Original line number Diff line number Diff line
@@ -649,7 +649,8 @@ static int nix_aq_enqueue_wait(struct rvu *rvu, struct rvu_block *block, 
	return 0;

}



static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req,

static int rvu_nix_blk_aq_enq_inst(struct rvu *rvu, struct nix_hw *nix_hw,

				   struct nix_aq_enq_req *req,

				   struct nix_aq_enq_rsp *rsp)

{

	struct rvu_hwinfo *hw = rvu->hw;
@@ -659,15 +660,11 @@ static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req, 
	struct rvu_block *block;

	struct admin_queue *aq;

	struct rvu_pfvf *pfvf;

	struct nix_hw *nix_hw;

	void *ctx, *mask;

	bool ena;

	u64 cfg;



	blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NIX, pcifunc);

	if (blkaddr < 0)

		return NIX_AF_ERR_AF_LF_INVALID;



	blkaddr = nix_hw->blkaddr;

	block = &hw->block[blkaddr];

	aq = block->aq;

	if (!aq) {
@@ -675,10 +672,6 @@ static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req, 
		return NIX_AF_ERR_AQ_ENQUEUE;

	}



	nix_hw =  get_nix_hw(rvu->hw, blkaddr);

	if (!nix_hw)

		return -EINVAL;



	pfvf = rvu_get_pfvf(rvu, pcifunc);

	nixlf = rvu_get_lf(rvu, block, pcifunc, 0);
@@ -875,6 +868,23 @@ static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req, 
	return 0;

}



static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req,

			       struct nix_aq_enq_rsp *rsp)

{

	struct nix_hw *nix_hw;

	int blkaddr;



	blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NIX, req->hdr.pcifunc);

	if (blkaddr < 0)

		return NIX_AF_ERR_AF_LF_INVALID;



	nix_hw =  get_nix_hw(rvu->hw, blkaddr);

	if (!nix_hw)

		return -EINVAL;



	return rvu_nix_blk_aq_enq_inst(rvu, nix_hw, req, rsp);

}



static const char *nix_get_ctx_name(int ctype)

{

	switch (ctype) {
@@ -1993,8 +2003,8 @@ int rvu_mbox_handler_nix_vtag_cfg(struct rvu *rvu, 
	return 0;

}



static int nix_setup_mce(struct rvu *rvu, int mce, u8 op,

			 u16 pcifunc, int next, bool eol)

static int nix_blk_setup_mce(struct rvu *rvu, struct nix_hw *nix_hw,

			     int mce, u8 op, u16 pcifunc, int next, bool eol)

{

	struct nix_aq_enq_req aq_req;

	int err;
@@ -2014,7 +2024,7 @@ static int nix_setup_mce(struct rvu *rvu, int mce, u8 op, 
	/* All fields valid */

	*(u64 *)(&aq_req.mce_mask) = ~0ULL;



	err = rvu_nix_aq_enq_inst(rvu, &aq_req, NULL);

	err = rvu_nix_blk_aq_enq_inst(rvu, nix_hw, &aq_req, NULL);

	if (err) {

		dev_err(rvu->dev, "Failed to setup Bcast MCE for PF%d:VF%d\n",

			rvu_get_pf(pcifunc), pcifunc & RVU_PFVF_FUNC_MASK);
@@ -2120,7 +2130,7 @@ int nix_update_bcast_mce_list(struct rvu *rvu, u16 pcifunc, bool add) 


		next_idx = idx + 1;

		/* EOL should be set in last MCE */

		err = nix_setup_mce(rvu, idx, NIX_AQ_INSTOP_WRITE,

		err = nix_blk_setup_mce(rvu, nix_hw, idx, NIX_AQ_INSTOP_WRITE,

					mce->pcifunc, next_idx,

					(next_idx > last_idx) ? true : false);

		if (err)
@@ -2151,6 +2161,11 @@ static int nix_setup_bcast_tables(struct rvu *rvu, struct nix_hw *nix_hw) 
		numvfs = (cfg >> 12) & 0xFF;



		pfvf = &rvu->pf[pf];



		/* This NIX0/1 block mapped to PF ? */

		if (pfvf->nix_blkaddr != nix_hw->blkaddr)

			continue;



		/* Save the start MCE */

		pfvf->bcast_mce_idx = nix_alloc_mce_list(mcast, numvfs + 1);
@@ -2165,7 +2180,8 @@ static int nix_setup_bcast_tables(struct rvu *rvu, struct nix_hw *nix_hw) 
			 * Will be updated when a NIXLF is attached/detached to

			 * these PF/VFs.

			 */

			err = nix_setup_mce(rvu, pfvf->bcast_mce_idx + idx,

			err = nix_blk_setup_mce(rvu, nix_hw,

						pfvf->bcast_mce_idx + idx,

						NIX_AQ_INSTOP_INIT,

						pcifunc, 0, true);

			if (err)