From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) (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 E20D3384244 for ; Sat, 9 May 2026 10:06:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.254.200.128 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778321192; cv=none; b=IWqz5j528AZjk713NZ5qNdT44b7TE03/J/4felZyO0wHDAsrQrahT75rx/AC0kcNETTBlk/1Uk7pWxSYHGO/seyUY7tWe2Z+TVTjDcq7wgmBXrQKpb1V8sS5t9mOLWE8vqjeo6Bo+oFBlNGch8Jn9WjTeslx68s8lE2/sNiQdac= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778321192; c=relaxed/simple; bh=GYquoJ1OJF63F1rXbC7ebsrzyvJH/znlX+DBQxoXMoE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GV/lSEamtAJNwnUq/hm1/N+7RpjKXOMWD1gMYB2zirSiQWMNdNePLuYqax41k9rhlKf/iErJKMnjFsinfOz5maaio390oqzh/qSOtEfmm10sz0vL1c67i956xwVewSrrrKUqK8wknARirPWoW0U65BfCfKpC4YqyaNAppwe7Iog= 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.254.200.128 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: esmtpsz17t1778321149tf461a7df X-QQ-Originating-IP: iqzCeUyUSAUjTbm7X6eRGWqfjGWylwH2O3UAG5d2cU0= Received: from lap-jiawenwu.trustnetic.com ( [115.204.251.157]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 09 May 2026 18:05:47 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 10744577546115657484 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 1/5] net: ngbe: implement libwx reset ops Date: Sat, 9 May 2026 18:05:36 +0800 Message-Id: <20260509100540.32612-2-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: OE2SNMSfMbmOMMgi3uLBtkWzHo+FZG/LqiqQfxFi95RmjxqIKY/HL1sg QUk0+/gtMheqPx9oWzpwa/IzX/+aJgiivtoCOJdkEq06G2301uwWgcv+AGF4HL9IzrMK95i FyDGsAztUnuw8H7FNCRhXRW6YIbdmMsnCRfCYP7JGc1tjRAn8GyZHtvQ9V8WJzdbrX5UVPF ShWV8PIKtg2Va0AFLu4IgFMbrja1xoVBtnc4MVbb/TRuiQvSSeiYtcQIGmx2xzJGQJk/4Oy 3VswH5Ld4Vvp4HmEdx/N4XjRAITJggxl0ESQG83dsRDSj2JNApZSr9lGRYQ1yz6cWQ9TsNd NvoBY2OuL2SdXBzpT5z/m9BSCGsYdIS8fTP3qswSh8rXF1ET7cda2p4uliujlg6C4FXFwl6 zw3B5gg+3d+Ws2Jm3D/fIehe7C4b2ep3KDWiZ+tEzpZGD7zv7DT1vUQjfuM8oi8qYUCnURY Y/4RPcZNC9LFuWzF9ECn+9WX5r1OgRnr5oa5N3mB5XR7z6S8dc3bixTsztHynbvGDPZRKhJ zIZO1r2FqOw6LOt/oYeYycXu4qFVDK4onSM2gO/hDWXLw6XDWzquV0AlLNIRiKIMgtkAprs 4Nigst9ygu2olU1Eu7yIJr9OGnkUi0nmVJkQJ9kjEsPhq1rBlKYqWDbmOAbaWksf41XpESj QTAHF5+FZL3Thaw3RAOJpPllxjH5kR1XsGsjRkg6N47jKUmCkvPIuODLkvee3PdpT4IV9Rg C090mIyzmtjlIw0txi1gLpuVba9MjJ/dAfT7nRajTyensSacxJ7qCjb3V+CZYDDEiIbRs3c 7PjVc2H1x3JCIIF0gKBxU0K4Buw4v0iL/g93oP1HESq9lOQYk85DbGCedKQLv3G4eq2ayw3 2u2+ViwfKYfpso9WHOtfPfcWrqgQDf1I1uJF+PGPBr6oGkYtYYi5yPxhAEudjdcw3xfgv0g zpLeZ+yYYMvhL4gdzODO1lfK0kZkLpGZ0akydYiPzkPdQdG2kITaJkBd4vjBOqKFOPggD3e bIJJnZmerL8xBzaYGU5kk+FtbKGjFAeHvmohIXClGXTumRlBI1SguKoS2Dne5AO1Ep7iNGP w== X-QQ-XMRINFO: NyFYKkN4Ny6FuXrnB5Ye7Aabb3ujjtK+gg== X-QQ-RECHKSPAM: 0 Implement wx->do_reset() for library module calling. Signed-off-by: Jiawen Wu --- .../net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 1 - drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 37 ++++++++++++++++++- drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 1 + 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c index b2e191982803..1960f7154151 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c @@ -59,7 +59,6 @@ static int ngbe_set_ringparam(struct net_device *netdev, wx_set_ring(wx, new_tx_count, new_rx_count, temp_ring); kvfree(temp_ring); - wx_configure(wx); ngbe_up(wx); clear_reset: diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c index d8e3827a8b1f..bd905e267575 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c @@ -133,6 +133,7 @@ static int ngbe_sw_init(struct wx *wx) wx->mbx.size = WX_VXMAILBOX_SIZE; wx->setup_tc = ngbe_setup_tc; + wx->do_reset = ngbe_do_reset; set_bit(0, &wx->fwd_bitmask); return 0; @@ -422,7 +423,7 @@ void ngbe_down(struct wx *wx) wx_clean_all_rx_rings(wx); } -void ngbe_up(struct wx *wx) +static void ngbe_up_complete(struct wx *wx) { wx_configure_vectors(wx); @@ -488,7 +489,7 @@ static int ngbe_open(struct net_device *netdev) wx_ptp_init(wx); - ngbe_up(wx); + ngbe_up_complete(wx); return 0; err_dis_phy: @@ -501,6 +502,12 @@ static int ngbe_open(struct net_device *netdev) return err; } +void ngbe_up(struct wx *wx) +{ + wx_configure(wx); + ngbe_up_complete(wx); +} + /** * ngbe_close - Disables a network interface * @netdev: network interface device structure @@ -588,6 +595,8 @@ int ngbe_setup_tc(struct net_device *dev, u8 tc) */ if (netif_running(dev)) ngbe_close(dev); + else + ngbe_reset(wx); wx_clear_interrupt_scheme(wx); @@ -604,6 +613,30 @@ int ngbe_setup_tc(struct net_device *dev, u8 tc) return 0; } +static void ngbe_reinit_locked(struct wx *wx) +{ + netif_trans_update(wx->netdev); + + mutex_lock(&wx->reset_lock); + set_bit(WX_STATE_RESETTING, wx->state); + + ngbe_down(wx); + ngbe_up(wx); + + clear_bit(WX_STATE_RESETTING, wx->state); + mutex_unlock(&wx->reset_lock); +} + +void ngbe_do_reset(struct net_device *netdev) +{ + struct wx *wx = netdev_priv(netdev); + + if (netif_running(netdev)) + ngbe_reinit_locked(wx); + else + ngbe_reset(wx); +} + static const struct net_device_ops ngbe_netdev_ops = { .ndo_open = ngbe_open, .ndo_stop = ngbe_close, diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h index 7077a0da4c98..4f648f272c08 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h @@ -125,5 +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); #endif /* _NGBE_TYPE_H_ */ -- 2.51.0