From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbg151.qq.com (smtpbg151.qq.com [18.169.211.239]) (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 B6A9C3914EE for ; Sat, 9 May 2026 10:06:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=18.169.211.239 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778321199; cv=none; b=X9eW++cGdNIjdM7V8jN8QnQVs/KgnAsayJlBxUg1PeksXGeajSB47+6BhFwNExQGDxEjvdEMCCCDJ0is0mD5TaSVRZBA7AqCAz562ZbImJ9W+e3TEljh7dpwCEXSfSwI/oQUBEfRviwIAKZLTfw8auP1KDJbKxnvvU4qMpjwpuo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778321199; c=relaxed/simple; bh=n49jG7doxI5DjJbe0PkDUBSAdJaKG+xj1bYLgBKp9JM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sRCKf+VrqgwDRUSvNmZTXT/+CbhlB0scs5rVmGVBJBoyxOroqOTepWiIEMKw+jhfQaN8D0R58ST5AgkyJ6OUj6GLYTylAy3umcHkMZt1Vf8Z3Ko3F4+FP2fch0dtEssGecRqL5cKjmrr95FNlGd5w+3ZwctoMXeoeLtmUVxddz8= 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.169.211.239 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: esmtpsz17t1778321156t2a2df9a7 X-QQ-Originating-IP: Eu6Ky7UDZGEDZAiUsShHvLmBUGW7FyYpMtRfafLYtwk= Received: from lap-jiawenwu.trustnetic.com ( [115.204.251.157]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 09 May 2026 18:05:54 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 5756862793394237871 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 v3 3/5] net: wangxun: add reinit parameter to wx->do_reset callback Date: Sat, 9 May 2026 18:05:38 +0800 Message-Id: <20260509100540.32612-4-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260509100540.32612-1-jiawenwu@trustnetic.com> References: <20260509100540.32612-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: MijavZDuOhz7/h1ntCpOV0iAdwiGa5SYqPXUmZVMUL8cYs8j/dgXLa5b IMVBHFH1rjWajv2JABm/CTJS9Ab2NHNlZ4RpPUH6pBQVhqT7MsfStjvK40227W7UierQxUK SQmauhta+VnfAPL0P+TAK+RJrGptjZyGIqPaO5Owk5atNClXPxYD0dGEUYTAd2bOCOVIG16 l2lN5A+6kumrGBCcbaVgNYFJItFtmRG6ITO2rMdsTyqhVUF7NR1Gh40DsV5b5msYcxvuMJj WToM9dGcZXbusvBXlGz9Jo2zD7Y1AI483T+FithvT2awaBxA+sN6Ev8JdqrykTgCgtRBLSv Pd9RdAT8Bo/XzF2WQHBg/mja0Mpk4n9f3xE2y+n960gsGa7+IkOp3AEPQS9rePuYee1mjeF 5D6wpTLMLi1Nyf5XERQkE6tcZUB/kO9xPBGNW2V+700QljmjLIhmU2Jw2j47OO+h6mnA5Nb 7FODrmzQf7gDJe/O99amdMnQSIx/OPmoYDVtGPAIrklEyiIV1JOqXUzDpuCrwiytP2DVBZo r/NLaQXAWT3ZgspVyhDNxyo0uVgSXcP6AqXZ/ZEN18bgrFDyZSU+pg8nQOAGOtVCiG2XY4J yM+7nHLt7lWxb2/s+facz7uNdi1aYURp5YsRa1b288bMApE1LiNQHfCyEOWQ0EyowDSRUIZ KRtgpIIQu/0S0xTDhU2sClcu1w8bB/Jkz1ja6xvv2A54GKEDS+AssDK+3jZzTrNax/UVkJX by8o3JSHQ6XMZ44Jn+EYVAQHZb5xSJpcokSYKPhmnyUGlJ7BJ/owMxbFwti/Hr0Jz+c7KPS luv985QGDu9V9ydHVSCJUzqf9XqzawSlQDwyzeLL4AOgvEpEPesUjpan0JHuV+IjRVSlNDT 5C+SzzFtaNhmbKGvDg+75tsisz9A48GrMRqGOH3rGLLhZYKzGfVt9FIQHfHwTmxEcnjijYv PBBsJ0CL/HBy2z20rFdwJsC+9tQdtMrR0ySsBcT5Tie0otq8xLmcneoUn8py5wh1/TZlVcw mh17j1lKu96LqPQTmpWuCR3gs1EwrVdfhtpNO83OgYgrRYISWFY42lW+b0H87aHHWCYoaRv tZOh0BaTJlR89kT8UJ5odw= X-QQ-XMRINFO: Nq+8W0+stu50tPAe92KXseR0ZZmBTk3gLg== 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 bb61355447a8..deb9fac2e1a9 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_err.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_err.c @@ -24,7 +24,7 @@ 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); } out: 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 610183496632..c4b89b6d235a 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 91c6db7e8e40..33051ce82cb3 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h @@ -1407,7 +1407,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 c45f5770b722..4b70390936d2 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c @@ -631,11 +631,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 ba55a17da3b8..79909e3b1d8e 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c @@ -615,11 +615,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