From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbguseast3.qq.com (smtpbguseast3.qq.com [54.243.244.52]) (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 A5B5D2E92B3 for ; Wed, 10 Jun 2026 06:12:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.243.244.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781071961; cv=none; b=gVIW9HudvD141Rhu47eeUPmg3ew9wgPl/jpeXdKlK9A5wr1aYZX4msAGID2R96qi4LoTUsJ0Ti6ooTX2yYPYJqe+Vd3GwmvB6bpxKnQdxuqBp2EQO2HqoBv2LunmOnW3BnVB7KoeMuvyOJCD1mf80BaTZwneicalgNzjhYQNLnk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781071961; c=relaxed/simple; bh=9r8CPdgcO0MMwaZXD+DCywGNBG1DTWI44SfCpZTaSDc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gUpz31HmPGH4p8I+v4LFdxBi9/gUOE1wQNuZ2M+C+zT3cw8UkWhupuK1L5ZD6p+ATTqHMfKnE4FKGTyiD1yWMD983lx8lYDOkydyut+qfJvI/UYDSrpCvUVT0lqX1OW0VjqAN8VkQzToBG5OOm7YngDeXtruvTMnLtX0cqNIBGA= 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.243.244.52 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: esmtpsz10t1781071904t37a69c9f X-QQ-Originating-IP: kqWZyR3Yo3ICn27etjgv9DYScyTfKE4IaVaRv/Z7yXg= Received: from lap-jiawenwu.trustnetic.com ( [125.118.31.65]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 10 Jun 2026 14:11:41 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 2488463598221864266 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 , Jacob Keller , Michal Swiatkowski , Simon Horman , Kees Cook , Larysa Zaremba , Joe Damato , Breno Leitao , Aleksandr Loktionov , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Fabio Baltieri , Thomas Gleixner , Greg Kroah-Hartman , Jiawen Wu Subject: [PATCH net-next v6 1/5] net: ngbe: implement libwx reset ops Date: Wed, 10 Jun 2026 14:09:13 +0800 Message-Id: <20260610060917.23980-2-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260610060917.23980-1-jiawenwu@trustnetic.com> References: <20260610060917.23980-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: NrIDgsAfObNz7JVM97Xqt48hPUEPnSxEDIbqdu9Ijv1S29B67fh4uTAb 6c4hRlgt0u1JoiiTwZTrksZwaXnpkL19rJ9Zm8VdNg4lwinJCmmOwsrJaBGo0QpXCU3NOVI iDXkR6njVewb/ECBlXEbDlHX95fvGKItxbCrxQMZ0261CjyzX1BaUg2l9ZmA45evndurxQx UxJMrRQfgSlEiLYqFS/1BxoiWVHC1zH+ilWi4mkUoMpdkOU75jdD6eOi9nPg+0fG/xpJe/6 jMEuxwNvXXb9n4xZX7EzU9p67/ydIr713HAAvFaDfnjNWtPE936iQs8AzQyeSw5SjzKajDM tShmUeJ8C9yJ9GNgaG/JM5fWgSjetxeM6Dpx0u+5P+WAFlRmjdCFn4tXE+1RTHcZSJnTN67 d0TAyjIbP5F+RTNZ1+2X8oxjl32pFFApNIm+aaSQTk9MyRWvKKMwZJ7oTRUzF2Cz9J+wUOr 1YJ3oDqXGJSDfoOasj/noxHz6aziMomZ/+4RVfbx1HcmA5oRPO1aPzIJmpe0cr4CrhVUf/m 2kHY9AeZa7k/xFcjqFfm/qEdy/IRc0ScevGATvL6DSub4BQBKEtHfszUuUXsJy6RXhh+uB5 wamzgzL8gNf5xbecpKn9nLAueAmW6/FL6iapIrXcQrIh15dom55t4gWcGe8WHla5ilkOr/a zwKhqlzuqpiaL/bMrABJFG5nZbmj/1SlVWmcn7OlCV9lLa53/8pidZZcGpgASsR5+D+PWsc ne3c7s/SnR6M5rXCiKVCevbcTRGiBmaoKrZSCVcQ8zVL7zGPH/jlEvFsj3aSxCD/q3aWP4d IYSaSfFaBMYGnXHHzd1//wdCXCDUizTYhhmoHtOGorekxqOdYI/BGk5oAIO8WE3RYKB8xnC jttZis5SAfjqAFGJIhKyCRpHQt7V1bcQCXx5S8Jl6CuHQDsGWmqfnz4IHYjh/dKM19LlXqY 6xKXauI1MAtuioz9CsvWcpfnOOEfvmwq9DdxKkfhx09JWNAqCEE4FAPzdk9saQTyjTVkksr bUyLZomGOb7LZ5IxdJNLia85AmbhYh/FvXSmjLrBiDT7gkQGlvtK+5CrR1sJxKBNIfmADSV fWXhKiWjT7Hw4uBq9wz/BA= X-QQ-XMRINFO: M/715EihBoGS47X28/vv4NpnfpeBLnr4Qg== 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 8678c49b892a..dea6dfb043f3 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