octeonxt2-af: mcs: Fix per port bypass config

For each lmac port, MCS has two MCS_TOP_SLAVE_CHANNEL_CONFIGX
registers. For CN10KB both register need to be configured for the
port level mcs bypass to work. This patch also sets bitmap
of flowid/secy entry reserved for default bypass so that these
entries can be shown in debugfs.

Fixes: bd69476e86fc ("octeontx2-af: cn10k: mcs: Install a default TCAM for normal traffic")
Signed-off-by: Geetha sowjanya <gakula@marvell.com>
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mcs.c b/drivers/net/ethernet/marvell/octeontx2/af/mcs.c
index f68a6a0e3aa41a110a9c3a00c0fd1b50b6c3824b..492baa0b594ceeca751ec3352be2ef3a9c0f2ba2 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/mcs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/mcs.c
@@ -494,6 +494,9 @@ int mcs_install_flowid_bypass_entry(struct mcs *mcs)
 
        /* Flow entry */
        flow_id = mcs->hw->tcam_entries - MCS_RSRC_RSVD_CNT;
+       __set_bit(flow_id, mcs->rx.flow_ids.bmap);
+       __set_bit(flow_id, mcs->tx.flow_ids.bmap);
+
        for (reg_id = 0; reg_id < 4; reg_id++) {
                reg = MCSX_CPM_RX_SLAVE_FLOWID_TCAM_MASKX(reg_id, flow_id);
                mcs_reg_write(mcs, reg, GENMASK_ULL(63, 0));
@@ -504,6 +507,8 @@ int mcs_install_flowid_bypass_entry(struct mcs *mcs)
        }
        /* secy */
        secy_id = mcs->hw->secy_entries - MCS_RSRC_RSVD_CNT;
+       __set_bit(secy_id, mcs->rx.secy.bmap);
+       __set_bit(secy_id, mcs->tx.secy.bmap);
 
        /* Set validate frames to NULL and enable control port */
        plcy = 0x7ull;
@@ -528,6 +533,7 @@ int mcs_install_flowid_bypass_entry(struct mcs *mcs)
        /* Enable Flowid entry */
        mcs_ena_dis_flowid_entry(mcs, flow_id, MCS_RX, true);
        mcs_ena_dis_flowid_entry(mcs, flow_id, MCS_TX, true);
+
        return 0;
 }
 
@@ -1325,8 +1331,11 @@ void mcs_reset_port(struct mcs *mcs, u8 port_id, u8 reset)
 void mcs_set_lmac_mode(struct mcs *mcs, int lmac_id, u8 mode)
 {
        u64 reg;
+       int id = lmac_id * 2;
 
-       reg = MCSX_MCS_TOP_SLAVE_CHANNEL_CFG(lmac_id * 2);
+       reg = MCSX_MCS_TOP_SLAVE_CHANNEL_CFG(id);
+       mcs_reg_write(mcs, reg, (u64)mode);
+       reg = MCSX_MCS_TOP_SLAVE_CHANNEL_CFG((id + 1));
        mcs_reg_write(mcs, reg, (u64)mode);
 }
 

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
index 26cfa501f1a112dd166b4260faeccd0cc65d1b17..9533b1d929604a097981c5ae703bf895db5bd73d 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
@@ -497,8 +497,9 @@ static int rvu_dbg_mcs_rx_secy_stats_display(struct seq_file *filp, void *unused
                           stats.octet_validated_cnt);
                seq_printf(filp, "secy%d: Pkts on disable port: %lld\n", secy_id,
                           stats.pkt_port_disabled_cnt);
-               seq_printf(filp, "secy%d: Octets validated: %lld\n", secy_id, stats.pkt_badtag_cnt);
-               seq_printf(filp, "secy%d: Octets validated: %lld\n", secy_id, stats.pkt_nosa_cnt);
+               seq_printf(filp, "secy%d: Pkts with badtag: %lld\n", secy_id, stats.pkt_badtag_cnt);
+               seq_printf(filp, "secy%d: Pkts with no SA(sectag.tci.c=0): %lld\n", secy_id,
+                          stats.pkt_nosa_cnt);
                seq_printf(filp, "secy%d: Pkts with nosaerror: %lld\n", secy_id,
                           stats.pkt_nosaerror_cnt);
                seq_printf(filp, "secy%d: Tagged ctrl pkts: %lld\n", secy_id,