From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) (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 AD8222E093A for ; Wed, 22 Apr 2026 09:57:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.207.22.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776851844; cv=none; b=Ttenl1tvGgMWQblQYKS4z+17w124RRNdIvmn0L8Vl7VSge6IJpe3Ye5h2Zw05IhX8AfXc+b59juYMnK/lx8ss8xk5PdYLC09XuKch2Ps7WmvnYzNm/Xi0DxYVk0FTudfFl0a+ePUm+hPK8rbTRD4MM1jyB2pFf8KvhmujmCDRKc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776851844; c=relaxed/simple; bh=GYquoJ1OJF63F1rXbC7ebsrzyvJH/znlX+DBQxoXMoE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PjB0ooL8bLJpebYH2DR4qpQcAT+0h4HTh7XwOffkYXGRUdY4mymMZUtqHMetRsAHC9JJ51OJINvrNyumDQn2g9xHB6h87eAbYisOwEAaylGuXDVqNpctiL7CrGG1MSjHtrhgVXvkV0CqAhIT76vHfSRfQKzBSN+GxjzDYSfZHGc= 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.207.22.56 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: esmtpgz13t1776851793tfd354621 X-QQ-Originating-IP: 6inCep8bbi5gX7TpSpkyyQmNVjdkoM1f3DO8F7lu1s8= Received: from lap-jiawenwu.trustnetic.com ( [115.220.225.180]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 22 Apr 2026 17:56:31 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 10494451503082843288 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: [RFC PATCH net-next 1/5] net: ngbe: implement libwx reset ops Date: Wed, 22 Apr 2026 17:56:13 +0800 Message-Id: <20260422095617.27080-2-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260422095617.27080-1-jiawenwu@trustnetic.com> References: <20260422095617.27080-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: esmtpgz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: MCiK9DnWZEXsF+iZhFbZgXoia6dYKMVswBn7lBXLJMoFhuTMWKPH64aw ONIul7iJgq4JUq7anKMwQl/3S9v/vAibGM+INolHjXHyweDYzFapHdrjSJlGCCm4uwWw9/X CrmrCimmUsb2JljmSbq8MENgG1IDGjS/RYFC9lPzmFR+uuop8NkiozfAj+Y771iU6SYl9SW 8qxcY3EDym+th5+u8mQQ4iCT42c53Qqv1avvz2mRMF6wKHkKPZERb4r9ekDDXq9rFo5E1ms mWyRmcnnyI4g1RE//AylobxD/NTZW6bz01yIppn35ix+vIAlVp1IyweCYGgB2KdEtllnolB 3lPwj8X3fPr/+n1f6/NbKaEjhwBn49g6xUfnJBB0LiyjhPhlVQxjrFWQTZAgeZ1ALPk+7HV 1kXvA7LiPmrl9j7cC+jSeT3gWbTEdqljkEGSnZyA2Yh2Emgv1fxDKhJA7MlLPmQT2UVvC+t XljarF/jO3R0nUMhyi5a+vLJcZiQaBOCHfW5einZXjz5PWDLFv3QCAjp4eoVrISnl92aNfI JQStHL38e5Dci7CXSR399Mq2u1ZvE1qJXez9xYO/GLv+GqgO09lXnFnQ2A11Yq8Lk08ClQF +Sr+tqv1rxT09pLECKDQyutarDf4E7b70QzelIitR+ryoqeRFhqVtqKabExXmAlI9DIJ/K8 iOlXcXWlhRtC9VdE4L03TAmCArzuaVG9DgUCLQzWvf7IpbFoDrcMi6fAtEOv72I410Ly+6e Ukfech+LVdXQlij5ci7pbNYPEM0om+lKUI3fDxJIC5Imfw5cDdlM0f0a7OpO4chEMYGI4zF 924xK5KQDu8p7VT8YXw3oX3A0zweF91Qmj6SWd2jqUY2Bx7++QSy9PoYYSFLjsyNSlDkF09 9wbwj1sPTNCg0xQDrN2xVZZh6ru9+nOckItV3AAo3n4xicwlrQpMSdZioEY3Ey7Y8MfBXcK 5fHnE4/IIlhm1ASbBI0YBj6AGM27h/bLHjzcgXqCxKxWnnE3EDUe/4k4zJKaAFFt+LOzOEg 8FwsFt7KJKK+oNPCm5IU51s6FuWJrh6s6NeBNL69+p2lHu8qxeLDgGUQuuHfY= X-QQ-XMRINFO: OWPUhxQsoeAVwkVaQIEGSKwwgKCxK/fD5g== 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