From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91EEB346ACE for ; Mon, 3 Aug 2026 06:44:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=18.194.254.142 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785739489; cv=none; b=gerU2Hu5Q6Hcq+lIJ+4y8BO2sHAllen2jogRebPr/zb8rc521M/LyClWzIJNFLSoItBkb1NaXE1nQaKeFhIQm4JEWCkuiESwMDJLDVPF9s0GrAx2KphGFrS7FcPQM9GFkjBu9aGvDHU+cTUHf74La25syAx0X7Q+3HerbNYzmgA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785739489; c=relaxed/simple; bh=BgYM17lPAGUT2W8VFHDimlDbrGxtiRCE6Vvi6yCsyIU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HWWx2/qfAn/gQCr7dIlSZeB7nPzomJFODo/5JbY94kx01XVPb2i2OTPQOJxAuS+8wQgp6dBDNU7pOJX55YJn/Hq+/YImBVyLbvaDFMrSAl3Hj+4ePwRoNESRq6KAh8blamsBtzUGgZNojFD+kPdt5goAN5pbbfnnVNpxGbetNhg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=trustnetic.com; spf=pass smtp.mailfrom=trustnetic.com; arc=none smtp.client-ip=18.194.254.142 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=trustnetic.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=trustnetic.com X-QQ-mid: esmtpgz10t1785739429tb85b4cd3 X-QQ-Originating-IP: h86C0ASWLhR4OUD4Z9j9WgaA8LhXVTwQsP2q0MDWazg= Received: from lap-jiawenwu.trustnetic.com ( [122.235.139.83]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 03 Aug 2026 14:43:47 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 7258342715175676099 EX-QQ-RecipientCnt: 21 From: Jiawen Wu To: netdev@vger.kernel.org Cc: Mengyuan Lou , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Russell King , Aleksandr Loktionov , Jacob Keller , Kees Cook , Breno Leitao , Larysa Zaremba , Michal Swiatkowski , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Rongguang Wei , Joe Damato , Chenguang Zhao , Fabio Baltieri , Jiawen Wu Subject: [PATCH net-next v14 3/5] net: wangxun: add reinit parameter to wx->do_reset callback Date: Mon, 3 Aug 2026 14:43:32 +0800 Message-Id: <20260803064334.21876-4-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260803064334.21876-1-jiawenwu@trustnetic.com> References: <20260803064334.21876-1-jiawenwu@trustnetic.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: esmtpgz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: MPs12nfZS/hNumxlptqo+Z1jlpjR/kctYVHsUNd1y76sLfYoYDm4Ylac e5/HGUmhjZB+WSA3HEiQtBoF4izzHnf/PsdJ6NGpusdGHF84juJF/D40JiIniKreDzks6// LpAJIi3D5tsYi/TaPjX4E52mb0YO0L4sZ9lyv4j8x78e1Dkh94vVl8L+/kCPpJdsznhYsS6 OefXmHIt0Uu8poCz+Y5T6j1Tr8llgOx5Ch/fapzpN0PFXBsu86ztMHphk8vNuIC2eotVRX5 fHPEDL/VhFJDgZjjhjNqRuEoIsUZxAb4DwoJwFyAkLt9peyNr3bkMU5sLltq3CdqLLd478B cVe0yYsKD/OweoDd/5Do0IvNrePlV4nyyFoYBeHjNlhuTF0SI/DUNGewjE/7g+Vu3O0RbA5 +D0UGgJ/ItTXzJ45JAQXTHmH8d1HV5cIKHZX3E1AzZbPBrIOd3woFkyeHmTFcP5pO6GW6N3 kcgTWE08wuJa0VOKz+mQFuudGZmMbzuIzJ5i5+/4nYxk6CDnIVWZKl4vhDMszn3/6009NUb qR5vrmkKFLypO/PUjNY4nFtyY4zH3rMfopEvxrUjEt/q1kRSFJCbBxRkBKUfWz4EI5zU9Lp kQi5zprchXvNNkx3zbRDyLKNwg/tsr96b7pOvO1ni4+KPoZiZkfcsTSzdhoOSl5V1D8MW/+ +NUUg6ofIwjQZGhb9xJsWZvHBKnX1XExTYfwX9GQWc4e1hCu66yUnYHPJtktNhIdqPs/dkA JKHorNEjUHDhyz/6cPhqn1KwYBJgcy0Zd12RFw0DReornWdB4py1pfiXsJLSeWwC7APrBES 5KNI5XX0qgSlIwrWGiaC85SeVQe1DEbrlnVOIkha9Kz8zgawVmT6OwFaI5/2FnLVmAJ6Xnm DMj+LIOmwtVFbGgEdWgBniB5DibWl4XIcG6s+PiT+PiUyBChQVmXLSR7kh3BYsvw9jfc0n5 doPHAS7WDAqqzArge9A6+O+uRIiPuVWFPWkvo0t3i/r7S0x1D6IZNeiNcziCDrt7SIb/eNw 9Wciz/12u9NpRMJSgCJR7y+YEHPX5HBA6M6Nfl1mhsD4IxEvtMfPmL9YKV8ns+wxLDj2FWD 0UgTcZSoVQJmpraUg82jzY/BTiSWMW9Kw== X-QQ-XMRINFO: MSVp+SPm3vtSI1QTLgDHQqIV1w2oNKDqfg== X-QQ-RECHKSPAM: 0 To implement a simple hardware reset without tearing down the network interface state, introduce a boolean 'reinit' parameter to wx->do_reset callback. Signed-off-by: Jiawen Wu Reviewed-by: Aleksandr Loktionov --- drivers/net/ethernet/wangxun/libwx/wx_err.c | 2 +- drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 2 +- drivers/net/ethernet/wangxun/libwx/wx_lib.c | 4 ++-- drivers/net/ethernet/wangxun/libwx/wx_type.h | 2 +- drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 4 ++-- drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 2 +- drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 4 ++-- drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/wangxun/libwx/wx_err.c b/drivers/net/ethernet/wangxun/libwx/wx_err.c index 4c45e97bf9e3..4c59a1110120 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_err.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_err.c @@ -16,7 +16,7 @@ static void wx_pf_reset_subtask(struct wx *wx) wx_warn(wx, "Reset adapter.\n"); if (wx->do_reset) - wx->do_reset(wx->netdev); + wx->do_reset(wx->netdev, true); } static void wx_reset_task(struct work_struct *work) diff --git a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c index 22037f015ded..940d2e59876c 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c @@ -397,7 +397,7 @@ static void wx_update_rsc(struct wx *wx) /* reset the device to apply the new RSC setting */ if (need_reset && wx->do_reset) - wx->do_reset(netdev); + wx->do_reset(netdev, true); } int wx_set_coalesce(struct net_device *netdev, diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c index 633ab5c61a05..67af8640a49e 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c @@ -3151,7 +3151,7 @@ int wx_set_features(struct net_device *netdev, netdev_features_t features) netdev->features = features; if (changed & NETIF_F_HW_VLAN_CTAG_RX && wx->do_reset) - wx->do_reset(netdev); + wx->do_reset(netdev, true); else if (changed & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER)) wx_set_rx_mode(netdev); @@ -3201,7 +3201,7 @@ int wx_set_features(struct net_device *netdev, netdev_features_t features) out: if (need_reset && wx->do_reset) - wx->do_reset(netdev); + wx->do_reset(netdev, true); return 0; } diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h index f0ebc0acf0f3..158e8611f3d6 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h @@ -1408,7 +1408,7 @@ struct wx { void (*atr)(struct wx_ring *ring, struct wx_tx_buffer *first, u8 ptype); void (*configure_fdir)(struct wx *wx); int (*setup_tc)(struct net_device *netdev, u8 tc); - void (*do_reset)(struct net_device *netdev); + void (*do_reset)(struct net_device *netdev, bool reinit); int (*ptp_setup_sdp)(struct wx *wx); void (*set_num_queues)(struct wx *wx); diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c index 33d4a40442d3..45b166ff0c97 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c @@ -633,11 +633,11 @@ static void ngbe_reinit_locked(struct wx *wx) mutex_unlock(&wx->reset_lock); } -void ngbe_do_reset(struct net_device *netdev) +void ngbe_do_reset(struct net_device *netdev, bool reinit) { struct wx *wx = netdev_priv(netdev); - if (netif_running(netdev)) + if (netif_running(netdev) && reinit) ngbe_reinit_locked(wx); else ngbe_reset(wx); diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h index 4f648f272c08..c9233dc7ae50 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h @@ -125,6 +125,6 @@ extern char ngbe_driver_name[]; void ngbe_down(struct wx *wx); void ngbe_up(struct wx *wx); int ngbe_setup_tc(struct net_device *dev, u8 tc); -void ngbe_do_reset(struct net_device *netdev); +void ngbe_do_reset(struct net_device *netdev, bool reinit); #endif /* _NGBE_TYPE_H_ */ diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c index 9fac2369a55c..f25249ddf2c6 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c @@ -610,11 +610,11 @@ static void txgbe_reinit_locked(struct wx *wx) mutex_unlock(&wx->reset_lock); } -void txgbe_do_reset(struct net_device *netdev) +void txgbe_do_reset(struct net_device *netdev, bool reinit) { struct wx *wx = netdev_priv(netdev); - if (netif_running(netdev)) + if (netif_running(netdev) && reinit) txgbe_reinit_locked(wx); else txgbe_reset(wx); diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h index 877234e3fdc2..3e93a3f309c1 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h @@ -313,7 +313,7 @@ extern char txgbe_driver_name[]; void txgbe_down(struct wx *wx); void txgbe_up(struct wx *wx); int txgbe_setup_tc(struct net_device *dev, u8 tc); -void txgbe_do_reset(struct net_device *netdev); +void txgbe_do_reset(struct net_device *netdev, bool reinit); #define DECLARE_PHY_INTERFACE_MASK_ZERO(name) \ unsigned long name[PHY_INTERFACE_MODE_MAX] = { 0, } -- 2.51.0