netdev - [PATCH net] net: libwx: fix to set pause param

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <6A2C0EF528DE9E00+20250425070942.4505-1-jiawenwu@trustnetic.com>
Date: Fri, 25 Apr 2025 15:09:42 +0800
From: Jiawen Wu <jiawenwu@...stnetic.com>
To: netdev@...r.kernel.org,
	linux@...linux.org.uk,
	pabeni@...hat.com,
	kuba@...nel.org,
	edumazet@...gle.com,
	davem@...emloft.net,
	andrew+netdev@...n.ch
Cc: mengyuanlou@...-swift.com,
	Jiawen Wu <jiawenwu@...stnetic.com>
Subject: [PATCH net] net: libwx: fix to set pause param

For some interfaces like PHY_INTERFACE_MODE_10GBASER, no link events
occur when the manual pause modes are changed. So add extra judgment to
configure the MAC.

Fixes: 2fe2ca09da95 ("net: wangxun: add flow control support")
Signed-off-by: Jiawen Wu <jiawenwu@...stnetic.com>
---
 drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 11 ++++++++++-
 drivers/net/ethernet/wangxun/libwx/wx_hw.c      |  3 +++
 drivers/net/ethernet/wangxun/libwx/wx_type.h    |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c
index 43019ec9329c..1b4f97ecee4a 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c
@@ -266,11 +266,20 @@ int wx_set_pauseparam(struct net_device *netdev,
 		      struct ethtool_pauseparam *pause)
 {
 	struct wx *wx = netdev_priv(netdev);
+	int err;
 
 	if (wx->mac.type == wx_mac_aml)
 		return -EOPNOTSUPP;
 
-	return phylink_ethtool_set_pauseparam(wx->phylink, pause);
+	err = phylink_ethtool_set_pauseparam(wx->phylink, pause);
+	if (err)
+		return err;
+
+	if (wx->fc.rx_pause != pause->rx_pause ||
+	    wx->fc.tx_pause != pause->tx_pause)
+		return wx_fc_enable(wx, pause->tx_pause, pause->rx_pause);
+
+	return 0;
 }
 EXPORT_SYMBOL(wx_set_pauseparam);
 
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_hw.c b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
index aed45abafb1b..2a56c9fdb3e8 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_hw.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
@@ -2450,6 +2450,9 @@ int wx_fc_enable(struct wx *wx, bool tx_pause, bool rx_pause)
 			wx_disable_rx_drop(wx, wx->rx_ring[i]);
 	}
 
+	wx->fc.rx_pause = rx_pause;
+	wx->fc.tx_pause = tx_pause;
+
 	return 0;
 }
 EXPORT_SYMBOL(wx_fc_enable);
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h
index 4c545b2aa997..b1c6483c485a 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_type.h
+++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h
@@ -1067,6 +1067,8 @@ enum wx_isb_idx {
 struct wx_fc_info {
 	u32 high_water; /* Flow Ctrl High-water */
 	u32 low_water; /* Flow Ctrl Low-water */
+	bool rx_pause;
+	bool tx_pause;
 };
 
 /* Statistics counters collected by the MAC */
-- 
2.48.1