octeontx2-af: Remove channel verification while installing MCAM rules

New usecases are popping up where in user wants to install common MCAM
filters for all interfaces. Having channel verification will result in
duplicating such MCAM filters for each of the ingress interface. Hence
removed channel verification.

Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
index eeb7909e5287c46aa3d1a7df0d579ec95371ac85..a85d7eb1ef77c66ebd271964604acce47f7f9c97 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
@@ -784,7 +784,6 @@ bool is_npc_intf_tx(u8 intf);
 bool is_npc_intf_rx(u8 intf);
 bool is_npc_interface_valid(struct rvu *rvu, u8 intf);
 int rvu_npc_get_tx_nibble_cfg(struct rvu *rvu, u64 nibble_ena);
-int npc_mcam_verify_channel(struct rvu *rvu, u16 pcifunc, u8 intf, u16 channel);
 int npc_flow_steering_init(struct rvu *rvu, int blkaddr);
 const char *npc_get_field_name(u8 hdr);
 int npc_get_bank(struct npc_mcam *mcam, int index);

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
index 1ffe8a7a1f86d8cc6e92c7f0e34e1c12ba5722e7..d71fe69991346840b60a1864ecf492937f582544 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -85,36 +85,6 @@ static int npc_mcam_verify_pf_func(struct rvu *rvu,
        return 0;
 }
 
-int npc_mcam_verify_channel(struct rvu *rvu, u16 pcifunc, u8 intf, u16 channel)
-{
-       int pf = rvu_get_pf(pcifunc);
-       u8 cgx_id, lmac_id;
-       int base = 0, end;
-
-       if (is_npc_intf_tx(intf))
-               return 0;
-
-       /* return in case of AF installed rules */
-       if (is_pffunc_af(pcifunc))
-               return 0;
-
-       if (is_afvf(pcifunc)) {
-               end = rvu_get_num_lbk_chans();
-               if (end < 0)
-                       return -EINVAL;
-       } else {
-               rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
-               base = rvu_nix_chan_cgx(rvu, cgx_id, lmac_id, 0x0);
-               /* CGX mapped functions has maximum of 16 channels */
-               end = rvu_nix_chan_cgx(rvu, cgx_id, lmac_id, 0xF);
-       }
-
-       if (channel < base || channel > end)
-               return -EINVAL;
-
-       return 0;
-}
-
 void rvu_npc_set_pkind(struct rvu *rvu, int pkind, struct rvu_pfvf *pfvf)
 {
        int blkaddr;
@@ -2706,7 +2676,6 @@ int rvu_mbox_handler_npc_mcam_write_entry(struct rvu *rvu,
        struct rvu_pfvf *pfvf = rvu_get_pfvf(rvu, req->hdr.pcifunc);
        struct npc_mcam *mcam = &rvu->hw->mcam;
        u16 pcifunc = req->hdr.pcifunc;
-       u16 channel, chan_mask;
        int blkaddr, rc;
        u8 nix_intf;
 
@@ -2714,10 +2683,6 @@ int rvu_mbox_handler_npc_mcam_write_entry(struct rvu *rvu,
        if (blkaddr < 0)
                return NPC_MCAM_INVALID_REQ;
 
-       chan_mask = req->entry_data.kw_mask[0] & NPC_KEX_CHAN_MASK;
-       channel = req->entry_data.kw[0] & NPC_KEX_CHAN_MASK;
-       channel &= chan_mask;
-
        mutex_lock(&mcam->lock);
        rc = npc_mcam_verify_entry(mcam, pcifunc, req->entry);
        if (rc)
@@ -2739,12 +2704,6 @@ int rvu_mbox_handler_npc_mcam_write_entry(struct rvu *rvu,
        else
                nix_intf = pfvf->nix_rx_intf;
 
-       if (!is_pffunc_af(pcifunc) &&
-           npc_mcam_verify_channel(rvu, pcifunc, req->intf, channel)) {
-               rc = NPC_MCAM_INVALID_REQ;
-               goto exit;
-       }
-
        if (!is_pffunc_af(pcifunc) &&
            npc_mcam_verify_pf_func(rvu, &req->entry_data, req->intf, pcifunc)) {
                rc = NPC_MCAM_INVALID_REQ;
@@ -3091,7 +3050,6 @@ int rvu_mbox_handler_npc_mcam_alloc_and_write_entry(struct rvu *rvu,
        struct npc_mcam *mcam = &rvu->hw->mcam;
        u16 entry = NPC_MCAM_ENTRY_INVALID;
        u16 cntr = NPC_MCAM_ENTRY_INVALID;
-       u16 channel, chan_mask;
        int blkaddr, rc;
        u8 nix_intf;
 
@@ -3102,13 +3060,6 @@ int rvu_mbox_handler_npc_mcam_alloc_and_write_entry(struct rvu *rvu,
        if (!is_npc_interface_valid(rvu, req->intf))
                return NPC_MCAM_INVALID_REQ;
 
-       chan_mask = req->entry_data.kw_mask[0] & NPC_KEX_CHAN_MASK;
-       channel = req->entry_data.kw[0] & NPC_KEX_CHAN_MASK;
-       channel &= chan_mask;
-
-       if (npc_mcam_verify_channel(rvu, req->hdr.pcifunc, req->intf, channel))
-               return NPC_MCAM_INVALID_REQ;
-
        if (npc_mcam_verify_pf_func(rvu, &req->entry_data, req->intf,
                                    req->hdr.pcifunc))
                return NPC_MCAM_INVALID_REQ;

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
index 9bde1bb7e148131dfe3eb4961e61edff6739a469..43874d3509a16c77fc6ed134f5d3652df7aec0f8 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
@@ -1173,11 +1173,6 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu,
        if (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 NPC_FLOW_CHAN_INVALID;
-
        pfvf = rvu_get_pfvf(rvu, target);
 
        /* PF installing for its VF */