From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8EB6B45DB9 for ; Wed, 27 Nov 2024 18:22:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8AC6F402DE; Wed, 27 Nov 2024 18:22:45 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id F08C040A70 for ; Wed, 27 Nov 2024 18:22:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8CCq3pfyMGxjO6cWMGtofJpQ+m2TYy39eBgyXQpzsSI=; b=iJtWGEP+biMuANpxSji2F2/bhmf3e4JmgdAmyBWTO2m2JajJfZp6jLGvxNEG63GrEOmI8y 1t69VDJe4s8CULZKZY/NZVaDhVG3PkhJpJrZxJSfGmJ2rjAU6DpzmfhCNoRh6poqX4pnJ5 5KeMgZYT4fpP00d6uJ1NC28pCLUubUY= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-632-AUboltJJN9SNabK8s4p4OQ-1; Wed, 27 Nov 2024 12:22:41 -0500 X-MC-Unique: AUboltJJN9SNabK8s4p4OQ-1 X-Mimecast-MFC-AGG-ID: AUboltJJN9SNabK8s4p4OQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1D8C619541BE; Wed, 27 Nov 2024 17:22:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D475030001A2; Wed, 27 Nov 2024 17:22:38 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: reconfigure more MAC Rx registers' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:38 +0000 Message-ID: <20241127171916.690404-91-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Y6NIB-uEwcBtWL_FFhPGUyTry3Cu6QoncKBxCAKRxrw_1732728160 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a30b9b2f583fc4824e21357652d2fef7034ff660 Thanks. Kevin --- >From a30b9b2f583fc4824e21357652d2fef7034ff660 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 4 Nov 2024 10:30:05 +0800 Subject: [PATCH] net/ngbe: reconfigure more MAC Rx registers [ upstream commit b8d52e1084a17c7ef83624f3bbd11a090e7b2267 ] When link status changes, there is a probability that no more packets can be received on the port, due to hardware defects. These MAC Rx registers should be reconfigured to fix this problem. Fixes: b9246b8fa280 ("net/ngbe: support link update") Fixes: a7c5f95ed9c2 ("net/ngbe: reconfigure MAC Rx when link update") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_regs.h | 2 ++ drivers/net/ngbe/ngbe_ethdev.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/net/ngbe/base/ngbe_regs.h b/drivers/net/ngbe/base/ngbe_regs.h index c0e79a2ba7..0d820f4079 100644 --- a/drivers/net/ngbe/base/ngbe_regs.h +++ b/drivers/net/ngbe/base/ngbe_regs.h @@ -713,4 +713,6 @@ enum ngbe_5tuple_protocol { #define NGBE_MACRXFLT_RXALL MS(31, 0x1) +#define NGBE_MAC_WDG_TIMEOUT 0x01100C + /****************************************************************************** * Statistic Registers diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 2ad0f9d92f..e95a315c7c 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -1869,4 +1869,5 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, int err; int wait = 1; + u32 reg; memset(&link, 0, sizeof(link)); @@ -1938,6 +1939,11 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, NGBE_MACTXCFG_SPEED_1G | NGBE_MACTXCFG_TE); } + /* Re configure MAC RX */ + reg = rd32(hw, NGBE_MACRXCFG); + wr32(hw, NGBE_MACRXCFG, reg); wr32m(hw, NGBE_MACRXFLT, NGBE_MACRXFLT_PROMISC, NGBE_MACRXFLT_PROMISC); + reg = rd32(hw, NGBE_MAC_WDG_TIMEOUT); + wr32(hw, NGBE_MAC_WDG_TIMEOUT, reg); } -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.124951944 +0000 +++ 0091-net-ngbe-reconfigure-more-MAC-Rx-registers.patch 2024-11-27 17:17:38.298269751 +0000 @@ -1 +1 @@ -From b8d52e1084a17c7ef83624f3bbd11a090e7b2267 Mon Sep 17 00:00:00 2001 +From a30b9b2f583fc4824e21357652d2fef7034ff660 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b8d52e1084a17c7ef83624f3bbd11a090e7b2267 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 8a6776b0e6..b1295280a7 100644 +index c0e79a2ba7..0d820f4079 100644 @@ -32 +33 @@ -index 238533f2b8..c372fd928c 100644 +index 2ad0f9d92f..e95a315c7c 100644 @@ -35 +36 @@ -@@ -1942,4 +1942,5 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, +@@ -1869,4 +1869,5 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, @@ -41 +42 @@ -@@ -1999,6 +2000,11 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, +@@ -1938,6 +1939,11 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev,