octeontx2-af: npc: cn20k: Clear MCAM entries by index and key width

Replace the old four-argument CN20K MCAM clear with a per-bank static
helper and npc_cn20k_clear_mcam_entry() that takes a logical MCAM index,
resolves the key width via npc_mcam_idx_2_key_type(), and clears either one
bank (X2) or every bank (X4).

Call it from npc_clear_mcam_entry() on cn20k and log when key-type lookup
fails. Use the per-bank helper from npc_cn20k_config_mcam_entry() for
pre-program clears.

For loopback VFs, use the promisc MCAM index as ucast_idx when copying RSS
action for promisc, matching cn20k default-rule layout.

Cc: Suman Ghosh <sumang@marvell.com>
Fixes: 6d1e70282f76 ("octeontx2-af: npc: cn20k: Use common APIs")
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
Link: https://patch.msgid.link/20260429022722.1110289-6-rkannoth@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
index 70ce3f49adc1a82b298c03fee8ec085700b31f4b..112c37c190b13d26ec732343dd041dba2ba246cc 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
@@ -842,8 +842,8 @@ npc_cn20k_enable_mcam_entry(struct rvu *rvu, int blkaddr,
        return 0;
 }
 
-void
-npc_cn20k_clear_mcam_entry(struct rvu *rvu, int blkaddr, int bank, int index)
+static void
+npc_clear_x2_entry(struct rvu *rvu, int blkaddr, int bank, int index)
 {
        rvu_write64(rvu, blkaddr,
                    NPC_AF_CN20K_MCAMEX_BANKX_CAMX_INTF_EXT(index, bank, 1),
@@ -877,6 +877,33 @@ npc_cn20k_clear_mcam_entry(struct rvu *rvu, int blkaddr, int bank, int index)
                    NPC_AF_CN20K_MCAMEX_BANKX_STAT_EXT(index, bank), 0);
 }
 
+int
+npc_cn20k_clear_mcam_entry(struct rvu *rvu, int blkaddr, int mcam_idx)
+{
+       struct npc_mcam *mcam = &rvu->hw->mcam;
+       int bank = npc_get_bank(mcam, mcam_idx);
+       u8 kw_type;
+       int index;
+
+       if (npc_mcam_idx_2_key_type(rvu, mcam_idx, &kw_type))
+               return -EINVAL;
+
+       index = mcam_idx & (mcam->banksize - 1);
+
+       if (kw_type == NPC_MCAM_KEY_X2) {
+               npc_clear_x2_entry(rvu, blkaddr, bank, index);
+               return 0;
+       }
+
+       /* For NPC_MCAM_KEY_X4 keys, both the banks
+        * need to be programmed with the same value.
+        */
+       for (bank = 0; bank < mcam->banks_per_entry; bank++)
+               npc_clear_x2_entry(rvu, blkaddr, bank, index);
+
+       return 0;
+}
+
 static void npc_cn20k_get_keyword(struct cn20k_mcam_entry *entry, int idx,
                                  u64 *cam0, u64 *cam1)
 {
@@ -1071,7 +1098,7 @@ int npc_cn20k_config_mcam_entry(struct rvu *rvu, int blkaddr, int index,
         */
        if (kw_type == NPC_MCAM_KEY_X2) {
                /* Clear mcam entry to avoid writes being suppressed by NPC */
-               npc_cn20k_clear_mcam_entry(rvu, blkaddr, bank, mcam_idx);
+               npc_clear_x2_entry(rvu, blkaddr, bank, mcam_idx);
                npc_cn20k_config_kw_x2(rvu, mcam, blkaddr,
                                       mcam_idx, intf, entry,
                                       bank, kw_type, kw, req_kw_type);
@@ -1096,8 +1123,8 @@ int npc_cn20k_config_mcam_entry(struct rvu *rvu, int blkaddr, int index,
        }
 
        /* Clear mcam entry to avoid writes being suppressed by NPC */
-       npc_cn20k_clear_mcam_entry(rvu, blkaddr, 0, mcam_idx);
-       npc_cn20k_clear_mcam_entry(rvu, blkaddr, 1, mcam_idx);
+       npc_clear_x2_entry(rvu, blkaddr, 0, mcam_idx);
+       npc_clear_x2_entry(rvu, blkaddr, 1, mcam_idx);
 
        npc_cn20k_config_kw_x4(rvu, mcam, blkaddr,
                               mcam_idx, intf, entry,

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h
index 8f3eea9cfb1d303acfaeeca77be55b1c1c5da63e..2f761b97f91b11de8e01a768bbea4db0e9be36ae 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h
@@ -330,8 +330,7 @@ int npc_cn20k_copy_mcam_entry(struct rvu *rvu, int blkaddr,
 int npc_cn20k_read_mcam_entry(struct rvu *rvu, int blkaddr, u16 index,
                              struct cn20k_mcam_entry *entry, u8 *intf,
                              u8 *ena, u8 *hw_prio);
-void npc_cn20k_clear_mcam_entry(struct rvu *rvu, int blkaddr,
-                               int bank, int index);
+int npc_cn20k_clear_mcam_entry(struct rvu *rvu, int blkaddr, int index);
 int npc_mcam_idx_2_key_type(struct rvu *rvu, u16 mcam_idx, u8 *key_type);
 u16 npc_cn20k_vidx2idx(u16 index);
 u16 npc_cn20k_idx2vidx(u16 idx);

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
index ecaf0946b85207f88fb6fd63de7ec7ebd763130f..44ca65efc80f094dc3069af93a21f85c7f0d4f8b 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -261,6 +261,13 @@ static void npc_clear_mcam_entry(struct rvu *rvu, struct npc_mcam *mcam,
        int bank = npc_get_bank(mcam, index);
        int actbank = bank;
 
+       if (is_cn20k(rvu->pdev)) {
+               if (npc_cn20k_clear_mcam_entry(rvu, blkaddr, index))
+                       dev_err(rvu->dev, "%s Failed to clear mcam %u\n",
+                               __func__, index);
+               return;
+       }
+
        index &= (mcam->banksize - 1);
        for (; bank < (actbank + mcam->banks_per_entry); bank++) {
                rvu_write64(rvu, blkaddr,
@@ -755,9 +762,15 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc,
 
        /* If the corresponding PF's ucast action is RSS,
         * use the same action for promisc also
+        * Please note that for lbk(s) "index" and "ucast_idx"
+        * will be same.
         */
-       ucast_idx = npc_get_nixlf_mcam_index(mcam, pcifunc,
-                                            nixlf, NIXLF_UCAST_ENTRY);
+       if (is_lbk_vf(rvu, pcifunc))
+               ucast_idx = index;
+       else
+               ucast_idx = npc_get_nixlf_mcam_index(mcam, pcifunc,
+                                                    nixlf, NIXLF_UCAST_ENTRY);
+
        if (is_mcam_entry_enabled(rvu, mcam, blkaddr, ucast_idx))
                *(u64 *)&action = npc_get_mcam_action(rvu, mcam,
                                                      blkaddr, ucast_idx);