From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbgjp3.qq.com (smtpbgjp3.qq.com [54.92.39.34]) (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 BE93642089C for ; Tue, 7 Jul 2026 06:15:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.92.39.34 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783404957; cv=none; b=sIjr+yI0ZGXZg6L2J1QgzBikW4aM16WVreePWrBqxjJ+Z02S4kEBYVxU7Lrq0tnLuh5BGJbci+ZUWi6uE9gMKzfVO41Y19zoOhth0W/reLtKsMtNf2ZrdG/tgLKk/btr9CAlUyh9lDWEaJ+r3Qc4tcb0pcrWjX4ZpPEZLeDZDGo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783404957; c=relaxed/simple; bh=6I454hJx/ljgeAiUkN6h73UVw2kQr2wEeJ0aVNkphmQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TNDqaDfVyKxY8xcqUzu4jnIAkYSipxd7+oHoqd+iEKnm9hSmTNa6SWsSPrulPej6F3j4zWg6itlSgW45Wp4l4K5akyZNUGJZ0XGrYiYK1QyQyiRGi0Eb6Fl4abd4p35wBqaB+C9yr2U1otQF7kKTXTGkxo9GMj0IU8i3wKmpswQ= 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.92.39.34 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: esmtpsz10t1783404913t96b7de01 X-QQ-Originating-IP: 5mOXtIN1UQTLZ2r4PVz/iHDkj85nHH1saHHmrWi5ZgM= Received: from lap-jiawenwu.trustnetic.com ( [60.188.196.189]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 07 Jul 2026 14:15:10 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 1767413409993546178 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 , Joe Damato , Breno Leitao , Jijie Shao , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Rongguang Wei , Larysa Zaremba , Fabio Baltieri , Jiawen Wu Subject: [PATCH net-next v10 3/5] net: wangxun: add reinit parameter to wx->do_reset callback Date: Tue, 7 Jul 2026 14:14:53 +0800 Message-Id: <20260707061455.39564-4-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260707061455.39564-1-jiawenwu@trustnetic.com> References: <20260707061455.39564-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: NtBm3I3+idbhXiLW37TNhbSaQFv+MBPvd+Pb5sWbEYufUuPDye1Nw57M Y/iP/tNiy22AFPT6YIGKKwvLL8x8/2goxGw6a02gq5zlPgfDhGYAaJddq23UdgLea7otl6u sxN0AMGzHbd4v0rc2uBZFruWGRbwl8h+Wc0c5Lu31xakK4A+HZZZPHFr8ssv1EBk8wsmstd Ec80UdVTxONumQwhGuTbciQz1yPmwR9EMxiYKp0erfvEnNlY9CxylKPiPhl8haIeRiFkPtu H1ELanFr22OScHzGNrmsXo3+lcgC85qZxfOnk3/53u2IudQDWRc4O0GjIpCmVejazi0I0vI PWZNposd9DWIAZmqdfdXaORTLD+s5BIwuiuQd9crmbOI6q+nhvJFq8GCLCtoJQk+YzuYVbo VfRe827MpP/Z5TvJUvUmenDJD1guQONh1OFU0rVlP0YfhXRtBs1K/GGZHIeGhfFm13CihyK oUSipiluNd1o00pL9++ix4pSaKV2mno8aSZ9q7aaedqxyJBQEFjZTK5X1nf8t+nw+BNCn1P aHS26QPDRSUwGVnVIheywjzQ7FjmhQ55nJxjyVgeRCjSIGqvX5dXy8tOa9bwwXxG3slZFWF fnRKumksWiXYqr8WWtULhkXOAYVPxrHLOq3ighamnG8Uc6RE6EKTtvHNsOiYpWbDDwD+QN/ 4XjzvF+ibw3ZptVRZDJcr3piC6hg7fNPW+SyXryZaF06EMYam7yxtWLMUc3bTtMTYvGaq6j DQHWBuzwmt2Ph17XYsnP16RdBM3vGKSJCyFGmv2RHDnMkT5L3GxExTqxKOTBVDWCLDoNbct qBES+vnADKwB8wQY5rfJfCc25S7FTXHIUGVo6RGYSGaBwT4N2kLJTLIq22id72f/zoI6Vt8 5nhvjfTHHc0cHJoE6TzqC1Apq4EPS2BqvuDT2vLTZOmuDsb2ocQ+rXfLxkUQix2FLnU84RG IwfJDSmczWH5xTi9R6HrXUM86nq3bQbcKEAaJugPklw0oFR6jMN7klW8/db3lJAAcq2eYkd tnC2DJ60E8ddfGf2ddU7kImVy1qNiBL5vglSC5p4iZBDzGuwMyu2AueDdsChQ= X-QQ-XMRINFO: OWPUhxQsoeAVwkVaQIEGSKwwgKCxK/fD5g== 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 3a6db657c685..c8a4822d3819 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c @@ -3149,7 +3149,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); @@ -3199,7 +3199,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 e12a59305193..edcb8d121b86 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h @@ -1409,7 +1409,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