Commit 9cfc5809 authored by Subbaraya Sundeep's avatar Subbaraya Sundeep Committed by David S. Miller
Browse files

octeontx2-af: Modify install flow error codes 



When installing a flow using npc_install_flow
mailbox there are number of reasons to reject
the request like caller is not permitted,
invalid channel specified in request, flow
not supported in extraction profile and so on.
Hence define new error codes for npc flows and use
them instead of generic error codes.

Signed-off-by: default avatarSubbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 354e1f9d

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

+7 −0
Original line number Diff line number Diff line
@@ -1078,6 +1078,13 @@ enum npc_af_status { 
	NPC_MCAM_ALLOC_DENIED	= -702,

	NPC_MCAM_ALLOC_FAILED	= -703,

	NPC_MCAM_PERM_DENIED	= -704,

	NPC_FLOW_INTF_INVALID	= -707,

	NPC_FLOW_CHAN_INVALID	= -708,

	NPC_FLOW_NO_NIXLF	= -709,

	NPC_FLOW_NOT_SUPPORTED	= -710,

	NPC_FLOW_VF_PERM_DENIED	= -711,

	NPC_FLOW_VF_NOT_INIT	= -712,

	NPC_FLOW_VF_OVERLAP	= -713,

};



struct npc_mcam_alloc_entry_req {

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

+8 −8
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static int npc_check_unsupported_flows(struct rvu *rvu, u64 features, u8 intf) 
		dev_info(rvu->dev, "Unsupported flow(s):\n");

		for_each_set_bit(bit, (unsigned long *)&unsupported, 64)

			dev_info(rvu->dev, "%s ", npc_get_field_name(bit));

		return NIX_AF_ERR_NPC_KEY_NOT_SUPP;

		return -EOPNOTSUPP;

	}



	return 0;
@@ -1143,10 +1143,10 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu, 
	}



	if (!is_npc_interface_valid(rvu, req->intf))

		return -EINVAL;

		return NPC_FLOW_INTF_INVALID;



	if (from_vf && req->default_rule)

		return NPC_MCAM_PERM_DENIED;

		return NPC_FLOW_VF_PERM_DENIED;



	/* Each PF/VF info is maintained in struct rvu_pfvf.

	 * rvu_pfvf for the target PF/VF needs to be retrieved
@@ -1172,12 +1172,12 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu, 


	err = npc_check_unsupported_flows(rvu, req->features, req->intf);

	if (err)

		return err;

		return NPC_FLOW_NOT_SUPPORTED;



	/* Skip channel validation if AF is installing */

	if (!is_pffunc_af(req->hdr.pcifunc) &&

	    npc_mcam_verify_channel(rvu, target, req->intf, req->channel))

		return -EINVAL;

		return NPC_FLOW_CHAN_INVALID;



	pfvf = rvu_get_pfvf(rvu, target);
@@ -1195,7 +1195,7 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu, 
	/* Proceed if NIXLF is attached or not for TX rules */

	err = nix_get_nixlf(rvu, target, &nixlf, NULL);

	if (err && is_npc_intf_rx(req->intf) && !pf_set_vfs_mac)

		return -EINVAL;

		return NPC_FLOW_NO_NIXLF;



	/* don't enable rule when nixlf not attached or initialized */

	if (!(is_nixlf_attached(rvu, target) &&
@@ -1211,7 +1211,7 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu, 


	/* Do not allow requests from uninitialized VFs */

	if (from_vf && !enable)

		return -EINVAL;

		return NPC_FLOW_VF_NOT_INIT;



	/* PF sets VF mac & VF NIXLF is not attached, update the mac addr */

	if (pf_set_vfs_mac && !enable) {
@@ -1226,7 +1226,7 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu, 
	 */

	if (from_vf && pfvf->def_ucast_rule && is_npc_intf_rx(req->intf) &&

	    pfvf->def_ucast_rule->features & req->features)

		return -EINVAL;

		return NPC_FLOW_VF_OVERLAP;



	return npc_install_flow(rvu, blkaddr, target, nixlf, pfvf, req, rsp,

				enable, pf_set_vfs_mac);