From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbguseast1.qq.com (smtpbguseast1.qq.com [54.204.34.129]) (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 D14F82F6577 for ; Tue, 7 Jul 2026 06:16:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.204.34.129 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783404967; cv=none; b=ft6IyUC3R4BaRUXT5GaZDdAx8haZVAORagh9bgGWZ1bPSCsg8aOwgsbvEN+T95hPjkQV88r8uYrYoYpxWMU9vPKw6+33o7ashZkOs60VhR6kLeJ5ydiqOnw5PkEdOgUUwB8LNaq0IWioCnTwcNc0TGHy/KoxOfodEPceL48rAiw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783404967; c=relaxed/simple; bh=6AFo5vxslIwLJHmQAwxTHn5JObBYSyWZatqARdMMw2o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IwFXI90+DwfPicv75r7Vyy3lC8zx6FEaHNi3nN7y3/855OUWC6359pvj4LIP8ojHEcwVNk49RG3JiXsIjo3hUe0dGVhh3udM8/5CEZ03lg+w+0ABCHoclZoVA71mR52Kd8AnIpCvAL1j5zscOh2ruVCQe7egDtVpVsmUStmmUvU= 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.204.34.129 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: esmtpsz10t1783404904tb005bb4e X-QQ-Originating-IP: aR1XAjNefRJjIpZd4FIwYiBUeXNAurr2JqYnIydqw+M= Received: from lap-jiawenwu.trustnetic.com ( [60.188.196.189]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 07 Jul 2026 14:15:02 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 15980835019790244233 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 1/5] net: ngbe: implement libwx reset ops Date: Tue, 7 Jul 2026 14:14:51 +0800 Message-Id: <20260707061455.39564-2-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: MTOVcXjwdVbt7NI1YFsiOK2UtgLrcy7NsWaXN7pyQrRJxCdibnBb1AbG UJHkIQQoaB/ke8CQ+IBpIPpLNzLe2O1xKAz65Fp+jzHvBUCJZj7/CJcpEoji2G7XMXo0dGG 5eu+/cl5SylnxqOxsm0M/XsbUG2hyDB4bMl8vzFxI+gTuqMfrvuaNQhrxpUhQ+Z6gwXRe/Y WQYfE0J6kHePU/iUde3PXb+mITUz49ag2jsPHXjsruWXVSVPBkS1ncALaFwRZlakBDSkcwh w76F304bmwH64Bz2fyeYMPEC1TyiGwmg4xwofkZI/5UgZi+OpJ2WctlFBGjVbXYykzYb7eK 3qnYvwrt292Z/Hy/lriVAhVXVXmF5yPPrDZa8gcGeHQbkrtnXui8zqJywNfgjrmnzRWjZk5 5WAXnnLvUbHuIwVZ+KgU415/uYt92LZHxX+WKuse2mrT0vHyBdeDrydvRm486j8M2H4V8MB 3evFr52leKs4zxIsR1K8KXNl63UaKmvKk0V92Uyaavi+EUM9H9dFo0g97gHP10eioSpeIgu bkn2XCmZ1nAafH/EY2k2fWtLWJ+LVzVJ08z35yNv27TaJcpGKAFUlcHsKIVKQ55/T1pq5oQ fDFxKiV2uh/oF8BvtV9CbpIWidqEyVAKihSppy5F24wKy69Y2+2qsxaThe6FxYXGfgaBqB7 F0Mcae0KeWfEEBdO7tK0NiLDCLdYiJxhZapYJHHd1Rq+EwqkkU0DOgSnJZciw4t2WlLgR3v KpqiCdS7JQXSwMyFurgGl0av8dtXU5WNTxBvccEkLiwZwAn9avSJ/SWi1ZCEpDGBjhg3wmj 9XRMk8/CGScy6zX5x3veohN5cjxy2kVDbBTjdAqjx+DxO8dRoAYWPmcGXf9SZPAXWmL50wp PmmcN+wYKnIMQoF3g+5DZdsbEvnuUdMJzhlDdmuGSMMCFD2k4TiFvccHaInag/AymfX3dux 963s6i/j28qeDXkVYItqgOF6h+ymeAsSwDkzzxJOkEcLaA3aTQgVdzMIu0hIoLJ0oagA7UA Yd0tazEHk8C7KilHiVCUR4hebsboOc3AgCIy5XZNnJKmh4F29p/+tqFS2+t/FfziUP2wUSO A== X-QQ-XMRINFO: Nq+8W0+stu50tPAe92KXseR0ZZmBTk3gLg== X-QQ-RECHKSPAM: 0 Implement wx->do_reset() for library module calling. Signed-off-by: Jiawen Wu Reviewed-by: Larysa Zaremba Reviewed-by: Aleksandr Loktionov --- .../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 a16221995909..bbbec9b43bc2 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; @@ -423,7 +424,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); @@ -490,7 +491,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: @@ -503,6 +504,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 @@ -590,6 +597,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); @@ -606,6 +615,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