patch 'net/ice: fix L1 check interval' has been queued to stable release 20.11.10
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Wed Nov 8 20:25:31 CET 2023
Hi,
FYI, your patch has been queued to stable release 20.11.10
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/10/23. 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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/e0f81abc3c873ff7c9d442f7a9a8a0889973c92e
Thanks.
Luca Boccassi
---
>From e0f81abc3c873ff7c9d442f7a9a8a0889973c92e Mon Sep 17 00:00:00 2001
From: Timothy Miskell <timothy.miskell at intel.com>
Date: Thu, 19 Oct 2023 17:26:10 +0000
Subject: [PATCH] net/ice: fix L1 check interval
[ upstream commit ff628a22c51f9cc5f69c715005a42456a2aec4f6 ]
For edge cases where the transceiver is physically inserted first and
immediately afterwards the DPDK PF is started the LSC event may occur
outside the current setting for the maximum check interval window. This
change lengthens the check interval to account for this along with other
reported cases where the link event may be longer than 1 second.
Fixes: cf911d90e366 ("net/ice: support link update")
Signed-off-by: Timothy Miskell <timothy.miskell at intel.com>
Tested-by: Jonathan Tsai <jonathan1.tsai at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
drivers/net/ice/ice_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 7af6548afc..017059fc87 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -3783,8 +3783,8 @@ ice_atomic_write_link_status(struct rte_eth_dev *dev,
static int
ice_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{
-#define CHECK_INTERVAL 100 /* 100ms */
-#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
+#define CHECK_INTERVAL 50 /* 50ms */
+#define MAX_REPEAT_TIME 40 /* 2s (40 * 50ms) in total */
struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct ice_link_status link_status;
struct rte_eth_link link, old;
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-11-08 19:23:53.539469801 +0000
+++ 0033-net-ice-fix-L1-check-interval.patch 2023-11-08 19:23:51.825397369 +0000
@@ -1 +1 @@
-From ff628a22c51f9cc5f69c715005a42456a2aec4f6 Mon Sep 17 00:00:00 2001
+From e0f81abc3c873ff7c9d442f7a9a8a0889973c92e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff628a22c51f9cc5f69c715005a42456a2aec4f6 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -19 +19,0 @@
- .mailmap | 2 ++
@@ -21 +21 @@
- 2 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -23,20 +22,0 @@
-diff --git a/.mailmap b/.mailmap
-index c0ab6d090b..d91775daf1 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -676,6 +676,7 @@ John Romein <romein at astron.nl>
- John W. Linville <linville at tuxdriver.com>
- Jonas Pfefferle <jpf at zurich.ibm.com> <pepperjo at japf.ch>
- Jonathan Erb <jonathan.erb at threatblockr.com> <jonathan.erb at banduracyber.com>
-+Jonathan Tsai <jonathan1.tsai at intel.com>
- Jon DeVree <nuxi at vault24.org>
- Jon Loeliger <jdl at netgate.com>
- Joongi Kim <joongi at an.kaist.ac.kr>
-@@ -1417,6 +1418,7 @@ Tianli Lai <laitianli at tom.com>
- Tianyu Li <tianyu.li at arm.com>
- Timmons C. Player <timmons.player at spirent.com>
- Timothy McDaniel <timothy.mcdaniel at intel.com>
-+Timothy Miskell <timothy.miskell at intel.com>
- Timothy Redaelli <tredaelli at redhat.com>
- Tim Shearer <tim.shearer at overturenetworks.com>
- Ting Xu <ting.xu at intel.com>
@@ -44 +24 @@
-index 305077e74e..6ef06b9926 100644
+index 7af6548afc..017059fc87 100644
@@ -47 +27 @@
-@@ -3992,8 +3992,8 @@ ice_atomic_write_link_status(struct rte_eth_dev *dev,
+@@ -3783,8 +3783,8 @@ ice_atomic_write_link_status(struct rte_eth_dev *dev,
More information about the stable
mailing list