From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) (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 4BDF7318140 for ; Tue, 28 Apr 2026 02:12:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.207.22.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777342368; cv=none; b=u7hLxxgYwAiY1wNwCq+YUQj75sJJfYKXFNdgU2RXoTV9Mwjuo8SwlzPYaLn4rHss9FLKZRPxuieENP5o3cw0utTi+2GX/GMNJB/Lj4RIQZBwetXz479m5l7GELuj+LJ2l5n3Mm8sOom/TXZmQxhElPs67V4XbY7t3F+Rpluly5I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777342368; c=relaxed/simple; bh=8PtGHfG7+BpOmgwhmokRyWyi/Npd9yF59PsAbLpjd4I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LESrCWaLDBi9R4yIm2wIGERETV9uM8Zcp1pQ60oL1gkublE/Esdgbhl1/xjsGNG/UO4W/mAK1a0Z0Sxb5VFF9++F0ibgI4J5Wru6zUwVFYNvxNcgkS1WITQLrMzQOpharB00bbwx+4t3VYmzHru226zzcBxCgAodPTPU1BNCfwg= 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=54.207.22.56 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: esmtpgz11t1777342331t00f1b5a4 X-QQ-Originating-IP: hlSAg2bRxxlEg7kt1asIJTk4IMg5jQ/h9nX20zhzQHo= Received: from lap-jiawenwu.trustnetic.com ( [36.24.191.108]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 28 Apr 2026 10:12:09 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 654635747587079035 EX-QQ-RecipientCnt: 17 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 , Simon Horman , Kees Cook , Larysa Zaremba , Breno Leitao , Joe Damato , Jacob Keller , Fabio Baltieri , Jiawen Wu Subject: [PATCH net-next v1 3/5] net: wangxun: add reinit parameter to wx->do_reset callback Date: Tue, 28 Apr 2026 10:11:54 +0800 Message-Id: <20260428021156.13564-4-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260428021156.13564-1-jiawenwu@trustnetic.com> References: <20260428021156.13564-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: NMMSTmykDl9bxgxR55WchUpIurHwKLBgdP2K3lLerpcuWr2QI0Xr5pyp 5xvB+jdrVjvMsk7XJFbFRwVfliE4H88FjzQLvuYfO9CHm5aR5hJyJxnuqK8J6XNSyhNGXSJ koTQ5ddDzANlRJLhWcy8LgBHc+J8c23dQ8uBy8uj2I88eIvKTRq9/62PgSpo/1G4/xUy1DX XOZeZPF2SluQPUcLrRG2QVU8C7btM0au0qo/uo4MIcHzgt5Pi+LiX/ufnEokDAHeDtjj4Xr IhCGGI/gdkTptj/P30nlJWnIe640Q55MbnEmwXRE/555bVY4gLYbJd5q5yT8gqfeyV14ttJ 2KH3YefSvJNv6+cXBIiOx0SVVrxoi6Czwpjs2bzrOQuyh/WE0/vtFanDCTzuKkewKtwMHHK RtiG5OWz79FsyAxY+wOIsRK6aXQr4ixgiRpYiNi8YoOluWMphkIKSO+qjvw7oLaHGV077ZC vnXHpG4vUUDXp4riw5ALNvNoKgphHqYpAznIfo5URYNi9NBxALSFHJ5q5RXZCH9ZZgxaAzw pIxHdKzP38lABrIO6PQA+xkPy41/MaUhkzS9pDyme4Jvjl85k/Er63/bxnT6qWynaWXwc/m gUAhZTAXObCAMqamF36RTPAWHuvqi6Azvl5ykkq0IIRLRcNbl9yEB87gL+4r4jlpgo9dfyG otyvS/Dif9hvvFqBs8b94XEjCYyYNo7JILsCv13T1a2dMGhWLeZUwskFHETBNC0K9vPuP+0 OvICNfEXn8PhbWuv3qx2riTdkq2Xq5UbRaiEbJTefENPj1CFAxPgTzh4g6oWj5ycWhnwGE3 c38ezXZxvQEo+G/mxrqWdZno/vWWOx+eih+1c9AmPR92en7+sVU4jG3/qmsAfqmWvf+TCP0 kWmNmxv5Jyz2IJUBEBXtlgPzTZSGvR3ArV6nsE05nyqRpg0HLrrdmwmTC2T1F8KZ81J07xa 103JZBhqRXcfbkSjCZrFJjIPy2fmOSdUimjYVnywlFhC8GsJp7KR1rE7DYKG4tbMbdel0yZ 2MUnoSC/BZ7oOUeot1pyn/xCMZAKAfcOUUu/SLMdTa0TCRYw+H2pqy/oqY9K7schX5LT8kI g== X-QQ-XMRINFO: NI4Ajvh11aEjEMj13RCX7UuhPEoou2bs1g== 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 --- 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 42e00f0bd8da..e7c9dcb148b5 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_err.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_err.c @@ -23,7 +23,7 @@ static void wx_reset_subtask(struct wx *wx) if (test_and_clear_bit(WX_FLAG_NEED_PF_RESET, wx->flags)) { if (wx->do_reset) - wx->do_reset(wx->netdev); + wx->do_reset(wx->netdev, true); } rtnl_unlock(); 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 9e6167b43f75..3216dee778be 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c @@ -3146,7 +3146,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); @@ -3196,7 +3196,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 f65c2d7bae39..671ac0a19dee 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h @@ -1402,7 +1402,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 e9561996b970..ec14dd47cd42 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c @@ -629,11 +629,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 5793da5b7bab..9887638203cb 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c @@ -613,11 +613,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