octeontx2-af: Enable RSS with promiscuous mode

This patch adds support for enabling RSS in promiscuous mode
if RSS is already requested by the AF client.

Signed-off-by: Vamsi Attunuru <vamsi.attunuru@marvell.com>
Signed-off-by: Jerin Jacob <jerinj@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
index c203d3fddde9486b71cd0090a311caea0204b236..bf81031f0fdd0cf4c13657816ffd9bd6fe8f6ae5 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -368,9 +368,9 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc,
                                   int nixlf, u64 chan, bool allmulti)
 {
        struct npc_mcam *mcam = &rvu->hw->mcam;
+       int blkaddr, ucast_idx, index, kwi;
        struct mcam_entry entry = { {0} };
        struct nix_rx_action action = { };
-       int blkaddr, index, kwi;
 
        /* Only PF or AF VF can add a promiscuous entry */
        if ((pcifunc & RVU_PFVF_FUNC_MASK) && !is_afvf(pcifunc))
@@ -392,9 +392,21 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc,
                entry.kw_mask[kwi] = BIT_ULL(40);
        }
 
-       *(u64 *)&action = 0x00;
-       action.op = NIX_RX_ACTIONOP_UCAST;
-       action.pf_func = pcifunc;
+       ucast_idx = npc_get_nixlf_mcam_index(mcam, pcifunc,
+                                            nixlf, NIXLF_UCAST_ENTRY);
+
+       /* If the corresponding PF's ucast action is RSS,
+        * use the same action for promisc also
+        */
+       if (is_mcam_entry_enabled(rvu, mcam, blkaddr, ucast_idx))
+               *(u64 *)&action = npc_get_mcam_action(rvu, mcam,
+                                                       blkaddr, ucast_idx);
+
+       if (action.op != NIX_RX_ACTIONOP_RSS) {
+               *(u64 *)&action = 0x00;
+               action.op = NIX_RX_ACTIONOP_UCAST;
+               action.pf_func = pcifunc;
+       }
 
        entry.action = *(u64 *)&action;
        npc_config_mcam_entry(rvu, mcam, blkaddr, index,
@@ -539,6 +551,21 @@ void rvu_npc_update_flowkey_alg_idx(struct rvu *rvu, u16 pcifunc, int nixlf,
        rvu_write64(rvu, blkaddr,
                    NPC_AF_MCAMEX_BANKX_ACTION(index, bank), *(u64 *)&action);
 
+       index = npc_get_nixlf_mcam_index(mcam, pcifunc,
+                                        nixlf, NIXLF_PROMISC_ENTRY);
+
+       /* If PF's promiscuous entry is enabled,
+        * Set RSS action for that entry as well
+        */
+       if (is_mcam_entry_enabled(rvu, mcam, blkaddr, index)) {
+               bank = npc_get_bank(mcam, index);
+               index &= (mcam->banksize - 1);
+
+               rvu_write64(rvu, blkaddr,
+                           NPC_AF_MCAMEX_BANKX_ACTION(index, bank),
+                           *(u64 *)&action);
+       }
+
        rvu_npc_update_rxvlan(rvu, pcifunc, nixlf);
 }