From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 05D9D1B108 for ; Wed, 21 Nov 2018 17:06:45 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 64E52308FE94; Wed, 21 Nov 2018 16:06:44 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6036560A9C; Wed, 21 Nov 2018 16:06:43 +0000 (UTC) From: Kevin Traynor To: Damjan Marion Cc: Qi Zhang , dpdk stable Date: Wed, 21 Nov 2018 16:04:28 +0000 Message-Id: <20181121160440.9014-38-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 21 Nov 2018 16:06:44 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix 25G AOC and ACC cable detection on XXV710' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 16:06:45 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 11/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From e2774f13917a221c67045ebc494a8ca4a2b40c1d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 25 Sep 2018 10:16:40 +0200 Subject: [PATCH] net/i40e: fix 25G AOC and ACC cable detection on XXV710 [ upstream commit 3c4c76cf170d62de7cb246c28f8113dfffa0d582 ] Fixes: 75d133dd3296 ("net/i40e: enable 25G device") Signed-off-by: Damjan Marion Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index 3fffe5a55..b876933e5 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -1394,5 +1394,7 @@ i40e_calc_itr_interval(bool is_pf, bool is_multi_drv) ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_CR) || \ ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_SR) || \ - ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_LR)) + ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_LR) || \ + ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_AOC) || \ + ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_ACC)) #endif /* _I40E_ETHDEV_H_ */ -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:14.587375369 +0000 +++ 0038-net-i40e-fix-25G-AOC-and-ACC-cable-detection-on-XXV7.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,10 +1,11 @@ -From 3c4c76cf170d62de7cb246c28f8113dfffa0d582 Mon Sep 17 00:00:00 2001 +From e2774f13917a221c67045ebc494a8ca4a2b40c1d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 25 Sep 2018 10:16:40 +0200 Subject: [PATCH] net/i40e: fix 25G AOC and ACC cable detection on XXV710 +[ upstream commit 3c4c76cf170d62de7cb246c28f8113dfffa0d582 ] + Fixes: 75d133dd3296 ("net/i40e: enable 25G device") -Cc: stable@dpdk.org Signed-off-by: Damjan Marion Acked-by: Qi Zhang @@ -13,10 +14,10 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h -index 7d197f6aa..11ecfc30d 100644 +index 3fffe5a55..b876933e5 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h -@@ -1397,5 +1397,7 @@ i40e_calc_itr_interval(bool is_pf, bool is_multi_drv) +@@ -1394,5 +1394,7 @@ i40e_calc_itr_interval(bool is_pf, bool is_multi_drv) ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_CR) || \ ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_SR) || \ - ((phy_type) & I40E_CAP_PHY_TYPE_25GBASE_LR))