drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 4 ++-- drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
From: Angela Czubak <aczubak@marvell.com>
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: 1435f66a28b4 ("octeontx2-af: CGX Rx/Tx enable/disable mbox handlers")
Signed-off-by: Angela Czubak <aczubak@marvell.com>
Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
---
v2 * remove unused macro define
drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 4 ++--
drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
index b2b71fe80d61..724df6398bbe 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
@@ -774,9 +774,9 @@ int cgx_lmac_rx_tx_enable(void *cgxd, int lmac_id, bool enable)
cfg = cgx_read(cgx, lmac_id, CGXX_CMRX_CFG);
if (enable)
- cfg |= CMR_EN | DATA_PKT_RX_EN | DATA_PKT_TX_EN;
+ cfg |= DATA_PKT_RX_EN | DATA_PKT_TX_EN;
else
- cfg &= ~(CMR_EN | DATA_PKT_RX_EN | DATA_PKT_TX_EN);
+ cfg &= ~(DATA_PKT_RX_EN | DATA_PKT_TX_EN);
cgx_write(cgx, lmac_id, CGXX_CMRX_CFG, cfg);
return 0;
}
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.h b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
index fb2d37676d84..5a20d93004c7 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
@@ -26,7 +26,6 @@
#define CMR_P2X_SEL_SHIFT 59ULL
#define CMR_P2X_SEL_NIX0 1ULL
#define CMR_P2X_SEL_NIX1 2ULL
-#define CMR_EN BIT_ULL(55)
#define DATA_PKT_TX_EN BIT_ULL(53)
#define DATA_PKT_RX_EN BIT_ULL(54)
#define CGX_LMAC_TYPE_SHIFT 40
--
2.17.1
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 5 Jan 2023 21:31:07 +0530 you wrote: > From: Angela Czubak <aczubak@marvell.com> > > 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. > > [...] Here is the summary with links: - [net,PATCHV2] octeontx2-af: Fix LMAC config in cgx_lmac_rx_tx_enable https://git.kernel.org/netdev/net/c/b4e9b8763e41 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
On Thu, Jan 05, 2023 at 09:31:07PM +0530, Hariprasad Kelam wrote: > From: Angela Czubak <aczubak@marvell.com> > > 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: 1435f66a28b4 ("octeontx2-af: CGX Rx/Tx enable/disable mbox handlers") > Signed-off-by: Angela Czubak <aczubak@marvell.com> > Signed-off-by: Hariprasad Kelam <hkelam@marvell.com> > --- > v2 * remove unused macro define > > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 4 ++-- > drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 - > 2 files changed, 2 insertions(+), 3 deletions(-) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
© 2016 - 2025 Red Hat, Inc.