Skip to content

Commit b4e9b87

Browse files
mvl-aczubakkuba-moo
authored andcommitted
octeontx2-af: Fix LMAC config in cgx_lmac_rx_tx_enable
PF netdev can request AF to enable or disable reception and transmission on assigned CGX::LMAC. The current code instead of disabling or enabling 'reception and transmission' also disables/enable the LMAC. This patch fixes this issue. Fixes: 1435f66 ("octeontx2-af: CGX Rx/Tx enable/disable mbox handlers") Signed-off-by: Angela Czubak <[email protected]> Signed-off-by: Hariprasad Kelam <[email protected]> Reviewed-by: Leon Romanovsky <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent c244c09 commit b4e9b87

File tree

2 files changed

+2
-3
lines changed
  • drivers/net/ethernet/marvell/octeontx2/af

2 files changed

+2
-3
lines changed

drivers/net/ethernet/marvell/octeontx2/af/cgx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,9 +774,9 @@ int cgx_lmac_rx_tx_enable(void *cgxd, int lmac_id, bool enable)
774774

775775
cfg = cgx_read(cgx, lmac_id, CGXX_CMRX_CFG);
776776
if (enable)
777-
cfg |= CMR_EN | DATA_PKT_RX_EN | DATA_PKT_TX_EN;
777+
cfg |= DATA_PKT_RX_EN | DATA_PKT_TX_EN;
778778
else
779-
cfg &= ~(CMR_EN | DATA_PKT_RX_EN | DATA_PKT_TX_EN);
779+
cfg &= ~(DATA_PKT_RX_EN | DATA_PKT_TX_EN);
780780
cgx_write(cgx, lmac_id, CGXX_CMRX_CFG, cfg);
781781
return 0;
782782
}

drivers/net/ethernet/marvell/octeontx2/af/cgx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#define CMR_P2X_SEL_SHIFT 59ULL
2727
#define CMR_P2X_SEL_NIX0 1ULL
2828
#define CMR_P2X_SEL_NIX1 2ULL
29-
#define CMR_EN BIT_ULL(55)
3029
#define DATA_PKT_TX_EN BIT_ULL(53)
3130
#define DATA_PKT_RX_EN BIT_ULL(54)
3231
#define CGX_LMAC_TYPE_SHIFT 40

0 commit comments

Comments
 (0)