From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C1426A051C for ; Tue, 11 Feb 2020 12:27:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B6E395B3C; Tue, 11 Feb 2020 12:27:55 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id C78C85B3C for ; Tue, 11 Feb 2020 12:27:54 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id p17so3082244wma.1 for ; Tue, 11 Feb 2020 03:27:54 -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=7jLFUrNq4o5ws3rslAE7CAihUrVOySchOMVcfrI+A4Q=; b=CjfT64fg1JUX7vin8eqZNSPjH/w6jUJ0AaeeP96QbTFTaOSRYDraAt1nPnGGLu719K FGBHwx9PVLBfz6/4KuA77h3faoJ9ggMsSV1trhwqbOLDzlbHtpXUhzNyUYtXcbBRUaZZ 1dB7ydE6tMmIDqAulq6od0xzMjg9tT9D5GDExKYQlycoP+f08KvYb2qtdA1DunUngi0a jDU9kAmLgCeGay2LX46AF8f2dNZLMp+NcRDO7Y+RAT0tKuiArd0cmwVSNvbKu2h8SRRN vAZjCp5VXLUwmVqzDWxcs/t2bc++4ELY3MK/8kKV9THgtjUvuipr8haiKyT9MXp6xNS2 i+mA== 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=7jLFUrNq4o5ws3rslAE7CAihUrVOySchOMVcfrI+A4Q=; b=kT8gdr7oZJB/colht4DdZNGyses86xW0bXRiDOLu2a+JkKFTkVD3ibDQ9tBo4VbbHG K6DvPhIZS+Y1zBe+2c7l73cBo+UrH53ie50OPIRvO8Ca+TvV0nIBjGWmu68MOuKTgBiD JDeeCTdRlyk06V/FUYrikUxRIJYzCWlq6Ux2inrfFJpgwuiSZbalm20icRd+MhIpLpdx JgGiPF+vR97NYXeooAU28VmB7Kf4HQAcOiQSjfd0EWBvQbpN5/ruzpaeJ0i/Bxnasefe Ka401gsVOHLdB+GPKwxPW0fYeBc6Zg6HY5T96yPnXomSk2bCmuU4bp21s/22bmVSVaad nGgg== X-Gm-Message-State: APjAAAUL3xLclNTxrUx5sxIoPFdu4FKCaWfzbVv7bOPmWzJiKC5iyjzI dlhzox85I34XQ5i19iGWdyc= X-Google-Smtp-Source: APXvYqx9h62i2MYX2eyBeekWuxYrNqjM1L1OWP2EaI3qtvSDfUWJojLsZhcx1rMT7vft28B+pdJqRA== X-Received: by 2002:a1c:1f56:: with SMTP id f83mr5083296wmf.93.1581420474549; Tue, 11 Feb 2020 03:27:54 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y6sm4753218wrl.17.2020.02.11.03.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:27:52 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Jacob Keller , Paul M Stillwell Jr , Qiming Yang , dpdk stable Date: Tue, 11 Feb 2020 11:20:06 +0000 Message-Id: <20200211112216.3929-60-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/ice/base: increase PF reset wait timeout' 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 6f74d76c254d2f8d92a6a27e198dd8987e080da4 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 6 Jan 2020 11:38:47 +0800 Subject: [PATCH] net/ice/base: increase PF reset wait timeout [ upstream commit 54cf696d5a9730b6c42813135bf35499e92c3b42 ] Increase the maximum time that the driver will wait for a PF reset from 200 milliseconds to 300 milliseconds, to account for possibility of a slightly longer than expected PF reset. Fixes: 453d087ccaff ("net/ice/base: add common functions") Signed-off-by: Jacob Keller Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c index 4ba3ab2028..2646a96321 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -9,7 +9,7 @@ #include "ice_flow.h" #include "ice_switch.h" -#define ICE_PF_RESET_WAIT_COUNT 200 +#define ICE_PF_RESET_WAIT_COUNT 300 /** * ice_set_mac_type - Sets MAC type -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:41.140923305 +0000 +++ 0060-net-ice-base-increase-PF-reset-wait-timeout.patch 2020-02-11 11:17:38.452002319 +0000 @@ -1,14 +1,15 @@ -From 54cf696d5a9730b6c42813135bf35499e92c3b42 Mon Sep 17 00:00:00 2001 +From 6f74d76c254d2f8d92a6a27e198dd8987e080da4 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 6 Jan 2020 11:38:47 +0800 Subject: [PATCH] net/ice/base: increase PF reset wait timeout +[ upstream commit 54cf696d5a9730b6c42813135bf35499e92c3b42 ] + Increase the maximum time that the driver will wait for a PF reset from 200 milliseconds to 300 milliseconds, to account for possibility of a slightly longer than expected PF reset. Fixes: 453d087ccaff ("net/ice/base: add common functions") -Cc: stable@dpdk.org Signed-off-by: Jacob Keller Signed-off-by: Paul M Stillwell Jr @@ -19,7 +20,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c -index 319b00f759..2e756f542b 100644 +index 4ba3ab2028..2646a96321 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -9,7 +9,7 @@