From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 7DC9BA04A3
for <public@inbox.dpdk.org>; Fri, 5 Jun 2020 20:27:32 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 6B4E41D52B;
Fri, 5 Jun 2020 20:27:32 +0200 (CEST)
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com
[205.139.110.61]) by dpdk.org (Postfix) with ESMTP id CED5A1D525
for <stable@dpdk.org>; Fri, 5 Jun 2020 20:27:30 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1591381650;
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=IZ9k06baNMh4xwmrR5V1HycogBanRK2ifBARlWKg77U=;
b=eUCHngwxNpTA2wRjzII3GeQXxj9SBM78X68qIuP6NP/MNC57oBQusWVCxynkJQzSNprBGb
KMuZo8p8RXPuw/NaVdZE5CK9PiXvKjUzvM4Qb1fKJgPqQzEcmjUKMFU4WOFvTCYYxetpce
H8xFpaBytH1bTRbhgr+2kn7YQMsRJ34=
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-428-yiSSCBRPOJO3i3WQGfPW0Q-1; Fri, 05 Jun 2020 14:27:24 -0400
X-MC-Unique: yiSSCBRPOJO3i3WQGfPW0Q-1
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4861100CCC1;
Fri, 5 Jun 2020 18:27:23 +0000 (UTC)
Received: from rh.redhat.com (unknown [10.33.36.130])
by smtp.corp.redhat.com (Postfix) with ESMTP id F2BB960C47;
Fri, 5 Jun 2020 18:27:22 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Guinan Sun <guinanx.sun@intel.com>
Cc: Wei Zhao <wei.zhao1@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Fri, 5 Jun 2020 19:24:54 +0100
Message-Id: <20200605182525.22483-57-ktraynor@redhat.com>
In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com>
References: <20200605182525.22483-1-ktraynor@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/ixgbe: fix statistics in flow control
mode' has been queued to LTS release 18.11.9
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to LTS release 18.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 06/10/20. 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-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b79430e24abbcaf6b23460462ac550f47962985c
Thanks.
Kevin.
---
>From b79430e24abbcaf6b23460462ac550f47962985c Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Tue, 12 May 2020 08:13:06 +0000
Subject: [PATCH] net/ixgbe: fix statistics in flow control mode
[ upstream commit 861ca8b1e97c68727cbafbb859cc6c2ff017801e ]
The register autoneg can't be updated synchronously with flow control
mode setting in the state of port start, so NIC statistics error occurs.
AUTO_NEG Advt register should be updated by ixgbe_setup_fc() when
enabling flow control.
The patch fixes the issue.
Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting")
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
---
drivers/net/ixgbe/ixgbe_ethdev.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 9b67e56a53..e888f8e62d 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2581,4 +2581,6 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)
uint32_t mflcn;
+ ixgbe_setup_fc(hw);
+
err = ixgbe_fc_enable(hw);
--
2.21.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-06-05 19:20:53.940391314 +0100
+++ 0057-net-ixgbe-fix-statistics-in-flow-control-mode.patch 2020-06-05 19:20:50.877039291 +0100
@@ -1 +1 @@
-From 861ca8b1e97c68727cbafbb859cc6c2ff017801e Mon Sep 17 00:00:00 2001
+From b79430e24abbcaf6b23460462ac550f47962985c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 861ca8b1e97c68727cbafbb859cc6c2ff017801e ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index a4e5c539de..f8a84c565f 100644
+index 9b67e56a53..e888f8e62d 100644
@@ -25 +26 @@
-@@ -2544,4 +2544,6 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)
+@@ -2581,4 +2581,6 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)