From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bg1.exmail.qq.com (bg1.exmail.qq.com [114.132.62.65]) (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 BF7F52DB7B9 for ; Tue, 30 Jun 2026 03:11:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.132.62.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782789110; cv=none; b=r1erlajQ5O/6YcZ+bDk27yz4vEpnvYlMMDxxgKkGBZFqHH/56SjQ1Z7ic+ofmm6pH78J5lBaazXZtbG7ZsjJ4UegqAQoyJravszpnJxDzgWd1HRW6CQ2JBSdEN4jNoPvbdLVlHxazoMKO66dj+fBZgNKIcymALmSboJaGRltmzM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782789110; c=relaxed/simple; bh=JFQg45+q3dw9svhIeTmg63aTk8xERABJHQz/CooYhdY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HH389qIGnvx+UcNNGDhUMTJXIGg7cU6X5sa/tEn3DKiBZPFeZuKhBr6qWxQ2c6bqYniSbPMkCCUX72bKcu0qy6OuRkcju2sKUnfTs5Il9P1NpPAIog3504SXaU8X4OIhEKU2uufHxBqUywBURBhpHqAukFrr16qGBcRUn9UVhYk= 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=114.132.62.65 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: zesmtpgz8t1782789042te46d0d77 X-QQ-Originating-IP: 9LDgzlpSFfEE1NAq8sKt/lm2msZyb/0bYKSPNsTIkM4= Received: from lap-jiawenwu.trustnetic.com ( [36.24.190.76]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 30 Jun 2026 11:10:39 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 5209489280864309932 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 , Aleksandr Loktionov , Jacob Keller , Michal Swiatkowski , Simon Horman , Kees Cook , Greg Kroah-Hartman , Thomas Gleixner , Breno Leitao , Larysa Zaremba , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Rongguang Wei , Fabio Baltieri , Jiawen Wu Subject: [PATCH net-next v8 3/5] net: wangxun: add reinit parameter to wx->do_reset callback Date: Tue, 30 Jun 2026 11:10:14 +0800 Message-Id: <20260630031016.19820-4-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260630031016.19820-1-jiawenwu@trustnetic.com> References: <20260630031016.19820-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: zesmtpgz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: OC+Fi6GG+SdXHr9/Ph7EeGT5RVEtORv6sYjnz8FTVKZjftdnhoCRR+hs z+DvGffanTCTuNt/wI+H/wMG8eHYTmFti3dh+quUWMrXTasLin49enm/s+jHIhhwuFxdF8G hWEHTCdKwSEhfS6w499T7HED8oc9cV4g1kv09tJEegh9AJWQWlWMttDdbE0hc+gSy5y89TS TJ0FofwU4kDIG8P+UIqTrnhHq5UB3AxT7r5/+KuZYLNuc3J+eyFYwBj3js90stDvjr5A71B oVWWS6BtFQnMMaYgPEZ/6VMeSl0CZ0BZ67zr7CuVA3rGEKFwpEKZFum4/G0MhQuGy757toz hYt2dzHN3dGHkOi8HfdWAaQGjxwirEPL0Ev0gmNs6wq0GCA+jB1tM3tmo4i8R1GliQrXYRG Eec67wRT5id+vbSnz8dldk7RPOwz19tPbseSjcd+TAi2bwX9kOgWjNHiz5EZj4NKdBG9i5Z P+kY9VpaQhLcrbZ5+m+sr9jESQGO3gHltIPuXDZTUshuXjqSrm4tsOBJCpHM7qBrSLrjbaM NM7V6tiI4Gv/Capqv/ymqMs7YEo57F/15XA6TiwA34N41ZYc9EKyaSphwYoL1a6hwbxhsfk ssQ7HuikAFnvWS2QdRFKFsaxzxFLQUeQKi7zwwsGP/XNTJvFfMAd6vSwcA/9kyeQR4F4xvP e/1APzwPyMsRD2Kz6bsa8OLPOA4JfyLm/iGRbCpREDGAuRelHRrJb6e8xp+oe5+uHMMVFVd uDLnirMfNmeE98CG6XwE9hGTochtiYyyA6ho2ZDjZ+TI8yYdbRPCszidXJvuWKGKFhm8WeR G081a2qqrJobDLasJxQ3nX/8lbwSUBfzKrtFG6hrNSeQq/Wcy5vI9iJiiky2J6oOuPbg+jb xu0rW4ppdRC8u1eVIdADpefo8V7bmx43j+dMVD8UQGxuOUsRV7oinL26ekKkynOXTRChAW/ /0KzOhhmXuCIsQDaTIsRwzlB8clFKvTn1bqtNDyH2PjeCx9QFS5W5w3VW7Qjl0d3TZyoJp2 /u5wfNNeX2AfjAoCr8gzGaFwgx+DbBgGivA5sxyY+So3cphvHHbwMUw3fUlrYHUsnm1ZrcR BhI5rsFJzOU X-QQ-XMRINFO: NyFYKkN4Ny6FuXrnB5Ye7Aabb3ujjtK+gg== 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 996c48da52d7..92895f503511 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 b1615f82a265..a8773712cff8 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