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 DAAB0A051C
for <public@inbox.dpdk.org>; Tue, 11 Feb 2020 12:42:11 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id D1A9F1C022;
Tue, 11 Feb 2020 12:42:11 +0100 (CET)
Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com
[209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 100701C020
for <stable@dpdk.org>; Tue, 11 Feb 2020 12:42:10 +0100 (CET)
Received: by mail-wr1-f68.google.com with SMTP id g3so10868846wrs.12
for <stable@dpdk.org>; Tue, 11 Feb 2020 03:42:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=2VMvBk/7pezfds02DENA3kaIlLYlu/BhApAWN3rwMiU=;
b=gNSKdUQQbk8rOHV50VG/6djFmCge/ZpsfF981MfXIeWIg+CtEKpmOR/m2ZtbI+GQNx
xHhA/1Br5dcVew5WCDa6f5ZuahHzrK4SEXsonpLVdJdfypBu+KxFQjBrBfJLWsifgwMd
PrTjPhVvr1rDxBbjZcy7jn1v1oVPr1aXulRR9G/OtrqtTTcr4QeTSLy4ulXHvRpt8pN8
qh/ovcFn/MMc0HEWxCIOlz1DBtSw4/QarYoYhtrakL5k/DuZugdyhJc7/4sp08bvQi3A
8e0OGWQ3iJNE+QFLqVc31mhHaX87g5oL4sutpyq3ER/eKljzlUv1gMd2j82G+Rf02t8F
k4xg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=2VMvBk/7pezfds02DENA3kaIlLYlu/BhApAWN3rwMiU=;
b=AYoDp0hW4Y1a4zAybB0tbsgBxIRh4QoinqYguUTvqppaBi0YwXDX8Aa3XK8brRMQoy
yVRs55rTqR5bHWf0uJN2YwKuiPCb85m+7y0VkS+b1RL7lyMvvumWOxTvGgd/iY38z+pZ
HHzqSJT031jek5OGXJpPBfEyxfgqzaBRjNM7Wcy2CEKN7ilJvKet2dXRqUXuWCtzNY+8
jLXuJBZ1sFwnFbj8dRYRWu7f+7ZInwdm2eGieN7U5a/jnXBjXJTAl9JGqtT2yAhQrC6g
Z4MW9AYCenl74oo+/bBxMiYJFlX0cgt8ZH6Tudz537HqfTVwb3F3lbBCoGDgN6Kn3rE+
5FZA==
X-Gm-Message-State: APjAAAUFxFBGYGITIF/ktp3mey+MZn5o+gVAO8V5657quehDA6MfU8RO
3dmG/lPWL5ucfu7m3mWY+6w9KWRBPw4=
X-Google-Smtp-Source: APXvYqyerTzP9aGdQZf7HfiKT5F3i8CPs67fa1MwAhC7lVlesZ4T73RXmbGu8i2fppk0bK2PcM4XGg==
X-Received: by 2002:a5d:534b:: with SMTP id t11mr8091415wrv.120.1581421329795;
Tue, 11 Feb 2020 03:42:09 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id v15sm5119807wrf.7.2020.02.11.03.42.09
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 11 Feb 2020 03:42:09 -0800 (PST)
From: luca.boccassi@gmail.com
To: Kiran Kumar K <kirankumark@marvell.com>
Cc: Jerin Jacob <jerinj@marvell.com>,
dpdk stable <stable@dpdk.org>
Date: Tue, 11 Feb 2020 11:21:55 +0000
Message-Id: <20200211112216.3929-169-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com>
References: <20200211112216.3929-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/octeontx2: fix Tx flow control for HIGIG'
has been queued to stable release 19.11.1
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 stable release 19.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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.
Thanks.
Luca Boccassi
---
>From b72c6c1c1860a61a42c7ff45bb9bc3d8b408dfc0 Mon Sep 17 00:00:00 2001
From: Kiran Kumar K <kirankumark@marvell.com>
Date: Thu, 30 Jan 2020 21:53:24 +0530
Subject: [PATCH] net/octeontx2: fix Tx flow control for HIGIG
[ upstream commit 184a3235735a2fae78bcc019c6cd9973426da3f1 ]
Tx flow controlled is disabled in the Ax silicon version due to an errata.
This errata is not applicable for HIGIG Tx flow control, therefore
not enabling in HIGIG case.
Fixes: 602009ee2dfb ("net/octeontx2: support HIGIG2")
Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
drivers/net/octeontx2/otx2_flow_ctrl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/octeontx2/otx2_flow_ctrl.c b/drivers/net/octeontx2/otx2_flow_ctrl.c
index c6d7b1971a..1c6929e764 100644
--- a/drivers/net/octeontx2/otx2_flow_ctrl.c
+++ b/drivers/net/octeontx2/otx2_flow_ctrl.c
@@ -213,6 +213,7 @@ otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev)
/* To avoid Link credit deadlock on Ax, disable Tx FC if it's enabled */
if (otx2_dev_is_Ax(dev) &&
+ (dev->npc_flow.switch_header_type != OTX2_PRIV_FLAGS_HIGIG) &&
(fc_conf.mode == RTE_FC_FULL || fc_conf.mode == RTE_FC_RX_PAUSE)) {
fc_conf.mode =
(fc_conf.mode == RTE_FC_FULL ||
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-11 11:17:44.472191938 +0000
+++ 0169-net-octeontx2-fix-Tx-flow-control-for-HIGIG.patch 2020-02-11 11:17:38.804008901 +0000
@@ -1,14 +1,15 @@
-From 184a3235735a2fae78bcc019c6cd9973426da3f1 Mon Sep 17 00:00:00 2001
+From b72c6c1c1860a61a42c7ff45bb9bc3d8b408dfc0 Mon Sep 17 00:00:00 2001
From: Kiran Kumar K <kirankumark@marvell.com>
Date: Thu, 30 Jan 2020 21:53:24 +0530
Subject: [PATCH] net/octeontx2: fix Tx flow control for HIGIG
+[ upstream commit 184a3235735a2fae78bcc019c6cd9973426da3f1 ]
+
Tx flow controlled is disabled in the Ax silicon version due to an errata.
This errata is not applicable for HIGIG Tx flow control, therefore
not enabling in HIGIG case.
Fixes: 602009ee2dfb ("net/octeontx2: support HIGIG2")
-Cc: stable@dpdk.org
Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>