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 E2A49287247 for ; Wed, 10 Jun 2026 06:13:18 +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=1781072001; cv=none; b=oqDoX7v+BTDh3XBN3D3Jm/mBpJee8T2XMvhZQN+snevwtIu/DfVC6tnU/kD55UE0e3XU+G3Sii5UP/8WEhS0D8bHEnghGFYQBF04nEMaBmEe02pVLKjVjpAa8QBeXCtr9GrxppwEHJcA9TBY7Q2SEgSQHvtj6j3PZ4WmzVe9l1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781072001; c=relaxed/simple; bh=uxJcU+JAXVDRC0kijGotmsQ1aOdXYpLxFNojaEXQI4k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ujAieP4LiFq/Vflx3WcbVpGehtiq7lKaUmgBfeSR5ccgZWdGYOvJyunsknY9Ma4UUSZ/dJNSYyaz1jeyVM+CYgIiN+U1duAkwyfb98kQbObFobeRViw9Fo5YgxN7x/S9LNjKAHyzoAfaPuKcpa2qfT+rlHYMcpS8l+fgZfyV0MY= 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: esmtpsz10t1781071911t240fa5d8 X-QQ-Originating-IP: vEUuOc52Zk7jNcDnlFnCphBVM6xmmwVZOH6ebGXM0fY= Received: from lap-jiawenwu.trustnetic.com ( [125.118.31.65]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 10 Jun 2026 14:11:49 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 17232553967629735928 EX-QQ-RecipientCnt: 22 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 , Jacob Keller , Michal Swiatkowski , Simon Horman , Kees Cook , Larysa Zaremba , Joe Damato , Breno Leitao , Aleksandr Loktionov , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Fabio Baltieri , Thomas Gleixner , Greg Kroah-Hartman , Jiawen Wu Subject: [PATCH net-next v6 3/5] net: wangxun: add reinit parameter to wx->do_reset callback Date: Wed, 10 Jun 2026 14:09:15 +0800 Message-Id: <20260610060917.23980-4-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260610060917.23980-1-jiawenwu@trustnetic.com> References: <20260610060917.23980-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: esmtpsz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: MBI0vGIMy96B1F9ApdFwYNdLW6CNAGmipWfTVi9aQoZtpK0BwiQgKzo8 Vf+Vzq6hrDAADIrWorIf0TtGdNJdxBfYv2tzm4v6y0ySsq2u8l169szwGQY9IQXtfXS3+ki P7Ty+P9WshRVX2QWHlOfRcNI0Qpqg7sMWeNFQ96S4/kitBlMJIjsdvmIBxIsy3bXR5HD96D fqt10TyPkRbOpiMQy0VfGA+qYw5J1+ueaZBc01Dn9yvH/dSSSo+7bms14irp9T3oxdoC19l 2dfrq086pkK/hGRL4xplS5qHauaxEWlrNdXm8ckl2Ba7V66L9rnZuKlzFKCcNv1JXUNycCp fvt34bCC8EhlwKodgOn+mzH4odp4RztgRBs5MjsU0vgnVpWpNR7NFBvTGExqUQkxzdtTkxF LnNfLgdlr7wgP/HBa42JJy4faIET87Umdhu+J3KitjBm906sD2Kx4EGv+peRIMk4IToQ8Xy +gO9AWNaUESVyLMuEZ4MhsWPaH6EXVrD1Pi0y6TczQWT966BedBI86x5zhkTVOaOc/7kD2R c6a83otDr21KWf849Z/rSXVd/97T0lShNK5k8WMY4viL/cqFt9dGsUj2ziA0eLHLEb2aoIX GdBXYpXKdIkP4Ofnv1xUdmDtcYXXjRdZ453tSMKeAMDqfbML8tCTqN8wQHpEFPEn5oDZ2J9 3v4VwYg72zFZ4Ls4gSMiDci74JR015YL8Y67yMhjIwyxuwsHb5CjbXrnANPstFHivjqPK+S AzTFdbu/3HjiQbybQESxJxu3glzjsYa4UL9haZoFXoKWhz7Ap8WA+AnZH2+Y6OQ6HG5Xt3c VK17O0wiorrCtlTUBBxfMQgxuU8W+gBfIOoqFrUTUgywQKE3Ys4Unlio5fBGRHunjNao92N EFWvm2RKn69dPsrG5+6thp50s7bc87m+8VocHJNzKmlhFQ6h8pi3Ot6UVmqHYL+oyt6ylWd UKKM41DpJKvdeEEA1NVhC61+vlmf6+TCNJ8tvhnlIqoMt7PKPAwRugc31uNAHyd9A+9iqGF k2eB+Eg3KoGCyK9lGNmvMUnpZ5dQb+odsU6MeHNmdDnXhln0uecPJYWMcUX6/8PstYF3QmD A== X-QQ-XMRINFO: Mp0Kj//9VHAxzExpfF+O8yhSrljjwrznVg== 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 b6e2d16d4a16..ee27f96735dc 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 5df971aca9e3..d1356ff5d69b 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c @@ -395,7 +395,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 da4d9e229c9e..e5a45356ba00 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c @@ -3148,7 +3148,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); @@ -3198,7 +3198,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 75d74ca2e259..a8b4e84787f4 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 4bcef967e992..7dd3e12d48aa 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 689679b315ae..9251e7a1d416 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 6b05f32b4a01..1e373f7fd9b5 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 TXGBE_LINK_SPEED_UNKNOWN 0 #define TXGBE_LINK_SPEED_10GB_FULL 4 -- 2.51.0