diff mbox series

[net,v4] net: stmmac: Set MAC's flow control register to reflect current settings

Message ID 20221123105110.23617-1-wei.sheng.goh@intel.com
State New
Headers
Series [net,v4] net: stmmac: Set MAC's flow control register to reflect current settings |

Commit Message

Goh, Wei Sheng Nov. 23, 2022, 10:51 a.m. UTC 
  Currently, pause frame register GMAC_RX_FLOW_CTRL_RFE is not updated
correctly when 'ethtool -A <IFACE> autoneg off rx off tx off' command
is issued. This fix ensures the flow control change is reflected directly
in the GMAC_RX_FLOW_CTRL_RFE register.

Fixes: 46f69ded988d ("net: stmmac: Use resolved link config in mac_link_up()")
Cc: <stable@vger.kernel.org> # 5.10.x
Signed-off-by: Goh, Wei Sheng <wei.sheng.goh@intel.com>
Signed-off-by: Noor Azura Ahmad Tarmizi <noor.azura.ahmad.tarmizi@intel.com>
---
V3 -> V4: Fix commit message and incorrect insertions(+) value
V2 -> V3: Removed value assign for 'flow' in else statement based on review comments
V1 -> V2: Removed needless condition based on review comments

 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c |  2 ++
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

Comments

patchwork-bot+netdevbpf@kernel.org Nov. 25, 2022, 9:40 a.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Wed, 23 Nov 2022 18:51:10 +0800 you wrote:
> Currently, pause frame register GMAC_RX_FLOW_CTRL_RFE is not updated
> correctly when 'ethtool -A <IFACE> autoneg off rx off tx off' command
> is issued. This fix ensures the flow control change is reflected directly
> in the GMAC_RX_FLOW_CTRL_RFE register.
> 
> Fixes: 46f69ded988d ("net: stmmac: Use resolved link config in mac_link_up()")
> Cc: <stable@vger.kernel.org> # 5.10.x
> Signed-off-by: Goh, Wei Sheng <wei.sheng.goh@intel.com>
> Signed-off-by: Noor Azura Ahmad Tarmizi <noor.azura.ahmad.tarmizi@intel.com>
> 
> [...]

Here is the summary with links:
  - [net,v4] net: stmmac: Set MAC's flow control register to reflect current settings
    https://git.kernel.org/netdev/net/c/cc3d2b5fc0d6

You are awesome, thank you!
Alexander Lobakin Nov. 25, 2022, 4:01 p.m. UTC | #2 
From: "Goh, Wei Sheng" <wei.sheng.goh@intel.com>
Date: Wed, 23 Nov 2022 18:51:10 +0800

> Currently, pause frame register GMAC_RX_FLOW_CTRL_RFE is not updated
> correctly when 'ethtool -A <IFACE> autoneg off rx off tx off' command
> is issued. This fix ensures the flow control change is reflected directly
> in the GMAC_RX_FLOW_CTRL_RFE register.

Any particular reason why you completely ignored by review comments
to the v3[0]? I'd like to see them fixed or at least replied.

> 
> Fixes: 46f69ded988d ("net: stmmac: Use resolved link config in mac_link_up()")
> Cc: <stable@vger.kernel.org> # 5.10.x
> Signed-off-by: Goh, Wei Sheng <wei.sheng.goh@intel.com>
> Signed-off-by: Noor Azura Ahmad Tarmizi <noor.azura.ahmad.tarmizi@intel.com>
> ---
> V3 -> V4: Fix commit message and incorrect insertions(+) value
> V2 -> V3: Removed value assign for 'flow' in else statement based on review comments
> V1 -> V2: Removed needless condition based on review comments
> 
>  drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c |  2 ++
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 ++++++++++--
>  2 files changed, 12 insertions(+), 2 deletions(-)

[...]

> -- 
> 2.17.1

[0] https://lore.kernel.org/netdev/20221123180947.488302-1-alexandr.lobakin@intel.com

Thanks,
Olek
Goh, Wei Sheng Nov. 28, 2022, 6:06 a.m. UTC | #3 
Hi,

> -----Original Message-----
> From: Lobakin, Alexandr <alexandr.lobakin@intel.com>
> Sent: Saturday, 26 November, 2022 12:02 AM
> To: Goh, Wei Sheng <wei.sheng.goh@intel.com>
> Cc: Lobakin, Alexandr <alexandr.lobakin@intel.com>; Giuseppe Cavallaro
> <peppe.cavallaro@st.com>; Alexandre Torgue <alexandre.torgue@st.com>;
> Jose Abreu <joabreu@synopsys.com>; David S . Miller <davem@davemloft.net>;
> Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>;
> Paolo Abeni <pabeni@redhat.com>; Maxime Coquelin
> <mcoquelin.stm32@gmail.com>; netdev@vger.kernel.org; linux-stm32@st-md-
> mailman.stormreply.com; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org; Alexandre Torgue <alexandre.torgue@foss.st.com>;
> Ong, Boon Leong <boon.leong.ong@intel.com>; Voon, Weifeng
> <weifeng.voon@intel.com>; Tan, Tee Min <tee.min.tan@intel.com>; Ahmad
> Tarmizi, Noor Azura <noor.azura.ahmad.tarmizi@intel.com>; Looi, Hong Aun
> <hong.aun.looi@intel.com>
> Subject: Re: [PATCH net v4] net: stmmac: Set MAC's flow control register to
> reflect current settings
> 
> From: "Goh, Wei Sheng" <wei.sheng.goh@intel.com>
> Date: Wed, 23 Nov 2022 18:51:10 +0800
> 
> > Currently, pause frame register GMAC_RX_FLOW_CTRL_RFE is not updated
> > correctly when 'ethtool -A <IFACE> autoneg off rx off tx off' command
> > is issued. This fix ensures the flow control change is reflected
> > directly in the GMAC_RX_FLOW_CTRL_RFE register.
> 
> Any particular reason why you completely ignored by review comments to the
> v3[0]? I'd like to see them fixed or at least replied.
> 
> >
> > Fixes: 46f69ded988d ("net: stmmac: Use resolved link config in
> > mac_link_up()")
> > Cc: <stable@vger.kernel.org> # 5.10.x
> > Signed-off-by: Goh, Wei Sheng <wei.sheng.goh@intel.com>
> > Signed-off-by: Noor Azura Ahmad Tarmizi
> > <noor.azura.ahmad.tarmizi@intel.com>
> > ---
> > V3 -> V4: Fix commit message and incorrect insertions(+) value
> > V2 -> V3: Removed value assign for 'flow' in else statement based on
> > review comments
> > V1 -> V2: Removed needless condition based on review comments
> >
> >  drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c |  2 ++
> > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 ++++++++++--
> >  2 files changed, 12 insertions(+), 2 deletions(-)
> 
> [...]
> 
> > --
> > 2.17.1
> 
> [0] https://lore.kernel.org/netdev/20221123180947.488302-1-
> alexandr.lobakin@intel.com
> 
> Thanks,
> Olek

Due to v4 is being accepted. Therefore I will submit a new patch to address your review comments.
Thanks and appreciate your effort for reviewing my patch.
Russell King (Oracle) Dec. 2, 2022, 5:24 p.m. UTC | #4 
On Mon, Nov 28, 2022 at 06:06:11AM +0000, Goh, Wei Sheng wrote:
> Hi,
> 
> > -----Original Message-----
> > From: Lobakin, Alexandr <alexandr.lobakin@intel.com>
> > Any particular reason why you completely ignored by review comments to the
> > v3[0]? I'd like to see them fixed or at least replied.
> > 
> > [0] https://lore.kernel.org/netdev/20221123180947.488302-1-
> > alexandr.lobakin@intel.com
> > 
> > Thanks,
> > Olek
> 
> Due to v4 is being accepted. Therefore I will submit a new patch to address your review comments.
> Thanks and appreciate your effort for reviewing my patch.

And on that very same subject, why did you ignore my review comments on
v2?
Goh, Wei Sheng Dec. 6, 2022, 4:05 a.m. UTC | #5 
Hi,

> -----Original Message-----
> From: Russell King <linux@armlinux.org.uk>
> Sent: Saturday, 3 December, 2022 1:24 AM
> To: Goh, Wei Sheng <wei.sheng.goh@intel.com>
> Cc: Lobakin, Alexandr <alexandr.lobakin@intel.com>; Giuseppe Cavallaro
> <peppe.cavallaro@st.com>; Alexandre Torgue <alexandre.torgue@st.com>;
> Jose Abreu <joabreu@synopsys.com>; David S . Miller
> <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub
> Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Maxime
> Coquelin <mcoquelin.stm32@gmail.com>; netdev@vger.kernel.org; linux-
> stm32@st-md-mailman.stormreply.com; linux-arm-
> kernel@lists.infradead.org; linux-kernel@vger.kernel.org; Alexandre Torgue
> <alexandre.torgue@foss.st.com>; Ong, Boon Leong
> <boon.leong.ong@intel.com>; Voon, Weifeng <weifeng.voon@intel.com>;
> Tan, Tee Min <tee.min.tan@intel.com>; Ahmad Tarmizi, Noor Azura
> <noor.azura.ahmad.tarmizi@intel.com>; Looi, Hong Aun
> <hong.aun.looi@intel.com>
> Subject: Re: [PATCH net v4] net: stmmac: Set MAC's flow control register to
> reflect current settings
> 
> On Mon, Nov 28, 2022 at 06:06:11AM +0000, Goh, Wei Sheng wrote:
> > Hi,
> >
> > > -----Original Message-----
> > > From: Lobakin, Alexandr <alexandr.lobakin@intel.com> Any particular
> > > reason why you completely ignored by review comments to the v3[0]?
> > > I'd like to see them fixed or at least replied.
> > >
> > > [0] https://lore.kernel.org/netdev/20221123180947.488302-1-
> > > alexandr.lobakin@intel.com
> > >
> > > Thanks,
> > > Olek
> >
> > Due to v4 is being accepted. Therefore I will submit a new patch to address
> your review comments.
> > Thanks and appreciate your effort for reviewing my patch.
> 
> And on that very same subject, why did you ignore my review comments on
> v2?
> 
> --
> RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
> FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

Sorry I missed some of your comment. Will try to address them in the next submission.
Also thanks and appreciate your effort for reviewing my patch.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index c25bfecb4a2d..369db308b1dd 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -748,6 +748,8 @@  static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,
 	if (fc & FLOW_RX) {
 		pr_debug("\tReceive Flow-Control ON\n");
 		flow |= GMAC_RX_FLOW_CTRL_RFE;
+	} else {
+		pr_debug("\tReceive Flow-Control OFF\n");
 	}
 	writel(flow, ioaddr + GMAC_RX_FLOW_CTRL);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 8273e6a175c8..ab7f48f32f5b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1061,8 +1061,16 @@  static void stmmac_mac_link_up(struct phylink_config *config,
 		ctrl |= priv->hw->link.duplex;
 
 	/* Flow Control operation */
-	if (tx_pause && rx_pause)
-		stmmac_mac_flow_ctrl(priv, duplex);
+	if (rx_pause && tx_pause)
+		priv->flow_ctrl = FLOW_AUTO;
+	else if (rx_pause && !tx_pause)
+		priv->flow_ctrl = FLOW_RX;
+	else if (!rx_pause && tx_pause)
+		priv->flow_ctrl = FLOW_TX;
+	else
+		priv->flow_ctrl = FLOW_OFF;
+
+	stmmac_mac_flow_ctrl(priv, duplex);
 
 	if (ctrl != old_ctrl)
 		writel(ctrl, priv->ioaddr + MAC_CTRL_REG);