From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bg5.exmail.qq.com (bg5.exmail.qq.com [43.155.80.173]) (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 9B42C35AC14 for ; Fri, 31 Jul 2026 06:19:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=43.155.80.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785478795; cv=none; b=eZU5PFDNQ2NfhEXgYzvSxbBvhQKElusmHXMzCEwZBod2Nau2WZ2mU7A9Swc/PM2IuRhkcycgBRoa0QzMZQAxiloxeU10f3pUzyrMzpGSikCzolaUVlLjI5mWflav5o6bQXi4DY2YmPsg3ByUzzBOL8IaLLDwRsv4P7i+Q9EndGs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785478795; c=relaxed/simple; bh=6AFo5vxslIwLJHmQAwxTHn5JObBYSyWZatqARdMMw2o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HvpWJeqn0X297mxPrxRxKau920csLlouIxVH+qBEsQlSgjqiGaQuZ+xZuoVgBtBCzqXnPmBvg10gS8zKrEsHFFVORMSliBtAMX5Ycf+QxeJy9nr5gOPMFB6mJwHfF/Dl0DsGNPmhtDb9/RfrxuuJgLfojAk2AJfFkLo8kSutIeo= 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=43.155.80.173 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: zesmtpgz1t1785478730t3547c892 X-QQ-Originating-IP: gFd5fsF5q+bTKvAvvvZNw+aMmCqFrEQVlyQtn4cav4w= Received: from lap-jiawenwu.trustnetic.com ( [122.235.139.83]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 31 Jul 2026 14:18:48 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 9950312804173204120 EX-QQ-RecipientCnt: 21 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 , Simon Horman , Kees Cook , Breno Leitao , Rongguang Wei , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Joe Damato , Larysa Zaremba , Chenguang Zhao , Fabio Baltieri , Jiawen Wu Subject: [PATCH net-next v13 1/5] net: ngbe: implement libwx reset ops Date: Fri, 31 Jul 2026 14:18:33 +0800 Message-Id: <20260731061837.12672-2-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260731061837.12672-1-jiawenwu@trustnetic.com> References: <20260731061837.12672-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: NOYK4kaBN9tVoHfxGEj0xjhF3qFCkdYJPb97OlSjEumivq35m53WZxEI Vvmvj2mWu93pkHMrVZsVklFAzcWArAZQzLq80Ghm+zf5WhQ+eXApof2qMzUdXBkX4RviPjk 3LeuSxvV5Zhg1YtT0IGLD3VZwvqsIOi7xLGjlSYDrcpwedIIkaIRnnvEUwc+S7nhwsArmQR ksY8D8ZIpRcN9hnLoW3QaJigKGw7zTBxrKLyp2aMUe3C8zsc/Tf0i1q0PzfZRx52qZBW0YH 5McqjtfHqqNbCVPFOsaOAx0FWJ9TC+EbVkdBiFTucaLPX8sbKbnrzGmiALM8gYA0WIx503r 2PTf7SDcteyUJg5MCGjsucQwMUrkI+l0HujEjB1XRvtQSks28liPtTiNCFUSC3GeHSSXYOS Tqw2yy6jxBA2UAFhEONKMmkH9+Hcyu32ES5GoYZzx01s43HLHheM/I0TORy5NoICh+3DNdP 9/4zFzYdl3DGz1ZaPsG176ajD43FP/3GO8UsIlfjdsmLX/+DQim7BtWE2DP8qKeXoF2ZpDy A+dVNuYaS3n7OJfF0UnmPnke3ghxq53/lvmLl/1c84nSWYDEDvw7e/V1zHJ9MAG/uHcCK6E fk6HlFyR3CimAKyWZE+TADOyg/6J9+DHmDGQkGkNiVeOUhgaCmo8qk6my8eS5iSnggxwSN3 LVuzRuuUqHMfqjcQCFGj2qpQHChq0fZrKwMechVkq/q1ixMP3tHFncEqA5WQ5/IAhfH5DBD ufG27E9Gn7/AB7eeD7xeoS2EFXc3gcUf6219fL4vcDrOVhtF4U5dXWSWVRaloU+fsHDCymq GMU1vUHnyEbK9XQtW0LXVcaKtFl8IM3YXdHN6/fNSNPyqdfcwbedrUf8435gDJA0PKExwsq d+uAKx9AVKYC+cXSRIPzF0HK5r/xiz1EYCunjYaI/Er6KWDwY4HLETPzshSEiUWom9lq4iT kE0Ic9SnVGRtmD4DHjkNd+rzUEB6nbgxqZeRQpjW0emkUu/5VSG/g/D+vyse4Mkk+Nbqg18 rB9U9XyA4i0fXKzhT0iIJqfeTc3STHbbPTytdT59npfLMUgP4YmsDnWQAmP9jNJnElA6+m0 lDdR34aUCv9UHlebKT9h7WMBdFHfJDQTFOrbf97U+H3WOEhl2FGeR4= X-QQ-XMRINFO: NyFYKkN4Ny6FuXrnB5Ye7Aabb3ujjtK+gg== 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