octeontx2-af: Apply tx nibble fixup always

NPC_PARSE_NIBBLE for TX interface has to be equal to the RX one for some
silicon revisions. Mistakenly this fixup was only applied to the default
MKEX profile while it should also be applied to any loaded profile.

Fixes: a5265327184a ("octeontx2-af: Add NIX1 interfaces to NPC")
Signed-off-by: Stanislaw Kardach <skardach@marvell.com>
Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
index 583ead4dd246898a14474ba5823ffcff113d879d..a2ceb831db336abeb5523bef089cb78f30fb3171 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -1939,6 +1939,7 @@ static void rvu_npc_hw_init(struct rvu *rvu, int blkaddr)
 
 static void rvu_npc_setup_interfaces(struct rvu *rvu, int blkaddr)
 {
+       struct npc_mcam_kex *mkex = rvu->kpu.mkex;
        struct npc_mcam *mcam = &rvu->hw->mcam;
        struct rvu_hwinfo *hw = rvu->hw;
        u64 nibble_ena, rx_kex, tx_kex;
@@ -1951,15 +1952,15 @@ static void rvu_npc_setup_interfaces(struct rvu *rvu, int blkaddr)
        mcam->counters.max--;
        mcam->rx_miss_act_cntr = mcam->counters.max;
 
-       rx_kex = npc_mkex_default.keyx_cfg[NIX_INTF_RX];
-       tx_kex = npc_mkex_default.keyx_cfg[NIX_INTF_TX];
+       rx_kex = mkex->keyx_cfg[NIX_INTF_RX];
+       tx_kex = mkex->keyx_cfg[NIX_INTF_TX];
        nibble_ena = FIELD_GET(NPC_PARSE_NIBBLE, rx_kex);
 
        nibble_ena = rvu_npc_get_tx_nibble_cfg(rvu, nibble_ena);
        if (nibble_ena) {
                tx_kex &= ~NPC_PARSE_NIBBLE;
                tx_kex |= FIELD_PREP(NPC_PARSE_NIBBLE, nibble_ena);
-               npc_mkex_default.keyx_cfg[NIX_INTF_TX] = tx_kex;
+               mkex->keyx_cfg[NIX_INTF_TX] = tx_kex;
        }
 
        /* Configure RX interfaces */