[PATCH net] octeontx2-af: fix CN20K default MCAM rule removal on port cleanup

[PATCH net] octeontx2-af: fix CN20K default MCAM rule removal on port cleanup

[Ratheesh Kannoth]

From: Kiran Kumar K <kirankumark@marvell.com>

npc_mcam_free_all_entries() disables every MCAM entry mapped to a
port before freeing it.  On CN20K, that also disables the default
broadcast, multicast, promiscuous, and unicast rules, which causes
packet drops when all rules are removed per port.

Only disable and free non-default entries.  Leave CN20K default rules
enabled when freeing the remaining port entries.

Fixes: 013717353c03 ("octeontx2-af: npc: cn20k: Tear down default MCAM rules explicitly on free")
Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
---
 drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
index 60922944675b..c34f8d86cc8a 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -2957,10 +2957,9 @@ static void npc_mcam_free_all_entries(struct rvu *rvu, struct npc_mcam *mcam,
 			}
 		}
 
-		/* Disable the entry */
-		npc_enable_mcam_entry(rvu, mcam, blkaddr, index, false);
-
 		if (!cn20k_dft_rl) {
+			/* Disable the entry */
+			npc_enable_mcam_entry(rvu, mcam, blkaddr, index, false);
 			mcam->entry2pfvf_map[index] = NPC_MCAM_INVALID_MAP;
 			/* Free the entry in bitmap */
 			npc_mcam_clear_bit(mcam, index);
-- 
2.43.0

Re: [PATCH net] octeontx2-af: fix CN20K default MCAM rule removal on port cleanup

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <davem@davemloft.net>:

On Tue, 25 Aug 2026 10:47:25 +0530 you wrote:
> From: Kiran Kumar K <kirankumark@marvell.com>
> 
> npc_mcam_free_all_entries() disables every MCAM entry mapped to a
> port before freeing it.  On CN20K, that also disables the default
> broadcast, multicast, promiscuous, and unicast rules, which causes
> packet drops when all rules are removed per port.
> 
> [...]

Here is the summary with links:
  - [net] octeontx2-af: fix CN20K default MCAM rule removal on port cleanup
    https://git.kernel.org/netdev/net/c/1376afc7660b

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html