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 7B09A43345 for ; Thu, 16 Nov 2023 14:24:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7494040E0F; Thu, 16 Nov 2023 14:24:49 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id EEB0840DDC for ; Thu, 16 Nov 2023 14:24:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141087; 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=DA45abtt/hvRYrMZuqV9bDdFHYxCt2vJ9ICQM21Gmew=; b=KRPEtNJ4w6tGA0SiLPmZbIBpYyt3W+UV+7xISIU3CZQCKH8XLXSvuye+7kKnrYGKiGmn5X bRmt56A+fssHeKxx522VLH249aHieuZ6X23NPmIVjJO5K32AHKFkRUdsJKYXnQLgEY0FxK SqHgwvmcmzY7oM+8LXZ8dyD+EOM03yk= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-MW6hi8H9NFOro6iO47R64A-1; Thu, 16 Nov 2023 08:24:46 -0500 X-MC-Unique: MW6hi8H9NFOro6iO47R64A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id D715C38157A5; Thu, 16 Nov 2023 13:24:45 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id E789E2166B27; Thu, 16 Nov 2023 13:24:44 +0000 (UTC) From: Kevin Traynor To: Timothy Miskell Cc: Jonathan Tsai , Qi Zhang , dpdk stable Subject: patch 'net/ice: fix L1 check interval' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:16 +0000 Message-ID: <20231116132348.557257-34-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 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.6 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/21/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/da268d8b4ee41218c606176f82e6d6df89dc7cd0 Thanks. Kevin --- >From da268d8b4ee41218c606176f82e6d6df89dc7cd0 Mon Sep 17 00:00:00 2001 From: Timothy Miskell 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 Tested-by: Jonathan Tsai Acked-by: Qi Zhang --- .mailmap | 2 ++ drivers/net/ice/ice_ethdev.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 4e27a991ba..b92a52a280 100644 --- a/.mailmap +++ b/.mailmap @@ -652,4 +652,5 @@ John W. Linville Jonas Pfefferle Jonathan Erb +Jonathan Tsai Jon DeVree Jon Loeliger @@ -1365,4 +1366,5 @@ Tianyu Li Timmons C. Player Timothy McDaniel +Timothy Miskell Timothy Redaelli Tim Shearer diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 9768a6eb85..30be64ac40 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3838,6 +3838,6 @@ 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; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.381084151 +0000 +++ 0034-net-ice-fix-L1-check-interval.patch 2023-11-16 13:21:52.488946486 +0000 @@ -1 +1 @@ -From ff628a22c51f9cc5f69c715005a42456a2aec4f6 Mon Sep 17 00:00:00 2001 +From da268d8b4ee41218c606176f82e6d6df89dc7cd0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ff628a22c51f9cc5f69c715005a42456a2aec4f6 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index c0ab6d090b..d91775daf1 100644 +index 4e27a991ba..b92a52a280 100644 @@ -27 +28 @@ -@@ -677,4 +677,5 @@ John W. Linville +@@ -652,4 +652,5 @@ John W. Linville @@ -29 +30 @@ - Jonathan Erb + Jonathan Erb @@ -33 +34 @@ -@@ -1418,4 +1419,5 @@ Tianyu Li +@@ -1365,4 +1366,5 @@ Tianyu Li @@ -40 +41 @@ -index 305077e74e..6ef06b9926 100644 +index 9768a6eb85..30be64ac40 100644 @@ -43 +44 @@ -@@ -3993,6 +3993,6 @@ static int +@@ -3838,6 +3838,6 @@ static int