Skip to content

Macsec fixes for CN10KB

Geetha sowjanya lkml netdev 2 versions – Applied

Status from this message: This series was applied to netdev/net.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest9 patches 1 replyApplied 9/9
  2. v19 patches 13 repliesSuperseded

Patches in v2 All 9 applied

#Subject and filesSizeRepliesApplied
1/9octeonxt2-af: mcs: Fix per port bypass configdrivers/net/ethernet/marvell/octeontx2/af/mcs.c drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c+13 -30 repliesApplied
2/9octeontx2-af: mcs: Write TCAM_DATA and TCAM_MASK registers at oncedrivers/net/ethernet/marvell/octeontx2/af/mcs.c+4 -00 repliesApplied
3/9octeontx2-af: mcs: Config parser to skip 8B headerdrivers/net/ethernet/marvell/octeontx2/af/mcs_reg.h drivers/net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c drivers/net/ethernet/marvell/octeontx2/af/rvu.h +1 more+41 -00 repliesApplied
4/9octeontx2-af: mcs: Fix MCS block interruptdrivers/net/ethernet/marvell/octeontx2/af/mcs.c drivers/net/ethernet/marvell/octeontx2/af/mcs.h drivers/net/ethernet/marvell/octeontx2/af/mcs_cnf10kb.c +1 more+119 -700 repliesApplied
5/9octeontx2-pf: mcs: Fix NULL pointer dereferencesdrivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c+1 -21 replyApplied
6/9octeontx2-pf: mcs: Match macsec ethertype along with DMACdrivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c+9 -10 repliesApplied
7/9octeontx2-pf: mcs: Clear stats before freeing resourcedrivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c+9 -00 repliesApplied
8/9octeontx2-pf: mcs: Fix shared counters logicdrivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h+8 -80 repliesApplied
9/9octeontx2-pf: mcs: Do not reset PN while updating secydrivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c+10 -50 repliesApplied

Reviews trailers per patch

All 9 patches have a Reviewed-by or Acked-by.

PatchLeon Romanovsky
1/9R-b
2/9R-b
3/9R-b
4/9R-b
5/9R-b
6/9R-b
7/9R-b
8/9R-b
9/9R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [net PATCH v2 0/9] Macsec fixes for CN10KB

This patch set has fixes for the issues encountered while testing macsec on CN10KB silicon. Below is the description of patches:

Patch 1: For each LMAC two MCSX_MCS_TOP_SLAVE_CHANNEL_CFG registers exist
in CN10KB. Bypass has to be disabled in two registers.

Patch 2: Add workaround for errata w.r.t accessing TCAM DATA and MASK registers.

Patch 3: Fixes the parser configuration to allow PTP traffic.

Patch 4: Addresses the IP vector and block level interrupt mask changes.

Patch 5: Fix NULL pointer crashes when rebooting

Patch 6: Since MCS is global block shared by all LMACS the TCAM match
must include macsec DMAC also to distinguish each macsec interface

Patch 7: Before freeing MCS hardware resource to AF clear the stats also.

Patch 8: Stats which share single counter in hardware are tracked in software.
This tracking was based on wrong secy mode params.
Use correct secy mode params

Patch 9: When updating secy mode params, PN number was also reset to
initial values. Hence do not write to PN value register when updating secy.

Geetha sowjanya (3):
octeonxt2-af: mcs: Fix per port bypass config
octeontx2-af: mcs: Config parser to skip 8B header
octeontx2-af: mcs: Fix MCS block interrupt

Subbaraya Sundeep (6):
octeontx2-af: mcs: Write TCAM_DATA and TCAM_MASK registers at once
octeontx2-pf: mcs: Fix NULL pointer dereferences
octeontx2-pf: mcs: Match macsec ethertype along with DMAC
octeontx2-pf: mcs: Clear stats before freeing resource
octeontx2-pf: mcs: Fix shared counters logic
octeontx2-pf: mcs: Do not reset PN when updating secy

---
v1-v2:
-Added Reviewed-by: Leon Romanovsky <[email protected]> -Corrected the sequence of tear down to fix null pointer dereferences.

 .../net/ethernet/marvell/octeontx2/af/mcs.c   | 106 +++++++++---------
 .../net/ethernet/marvell/octeontx2/af/mcs.h   |  26 ++---
 .../marvell/octeontx2/af/mcs_cnf10kb.c        |  63 +++++++++++
 .../ethernet/marvell/octeontx2/af/mcs_reg.h   |   6 +-
 .../marvell/octeontx2/af/mcs_rvu_if.c         |  37 ++++++
 .../net/ethernet/marvell/octeontx2/af/rvu.h   |   1 +
 .../ethernet/marvell/octeontx2/af/rvu_cgx.c   |   2 +
 .../marvell/octeontx2/af/rvu_debugfs.c        |   4 +-
 .../marvell/octeontx2/nic/cn10k_macsec.c      |  54 ++++++---
 .../marvell/octeontx2/nic/otx2_common.h       |   2 +-
 10 files changed, 217 insertions(+), 84 deletions(-)
Signature · 1 line
2.25.1