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 64474A0C41 for ; Tue, 30 Nov 2021 17:40:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FECF41186; Tue, 30 Nov 2021 17:40:11 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id A9A45410F7 for ; Tue, 30 Nov 2021 17:40:09 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8E1F93F1B1 for ; Tue, 30 Nov 2021 16:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290409; bh=kUbvRhfsDptLQnq4g2ioyHdNZeoe3kzEcaHxvp/BZk8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DYYpUZ8fpC73I1TeZRWLqr9I5OizJzknWrsUwVtyMBPv5DHmVUJPL3g+UxfhfeppQ saaLgMny81WMWtYkjCFwk7ODCHhOyAH8LuLZi2gufm6CvQDBavtcvMj2VzJJYSdJdr 3CPD6NebvcLj1fjkUvpqc1wYR3HePbZqRQ3os/KP86/1CwA64AVN+zKla8DOy2DRAh SO0gVXkjRkJsD6ILfzYH4WYAfAFqL/kK8qC0NWRRSbF85CnEYfdhx//Hnoon9E/06j 22HKBdjlUUyfmI5HHi4XdDfeE3yj3QU+TMaoWq0LqqP2PiYowtib/M8+4C0B0ubD9w F2+4y4PbfKSXA== Received: by mail-ed1-f72.google.com with SMTP id bx28-20020a0564020b5c00b003e7c42443dbso17406810edb.15 for ; Tue, 30 Nov 2021 08:40:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kUbvRhfsDptLQnq4g2ioyHdNZeoe3kzEcaHxvp/BZk8=; b=nkTC0kF3NlzDGHNy/3xbtKVEb/1E0Eo4eNCYKYnSMPyjhYZ7o7IbeuOaATwNEocupw dMwG2zBBAlBgeOHHl6wyMEHmdP/CGaZhZp9weFAkMBDni5WcPf4h7yVNNAd8usQe9I/j XXJ0+R85LH1zfwrV3jYRE/gTGtihRGGPodzsTJGeRhh8NQ65y7yo43HfExnjBgCDEG45 3CHkHJwMgxNOJNgIkx6EaWUkQuMJ4FfxTutj2ijnHYE1rvNAAvakKWkfYWTotXCMfAT2 Lnfv1mB8fnsab4n8JH/HHO0X+bbDZognbbw+2bY4PX/Yg74CIvZ+NI4PjJjlJNGlTHxf 53vg== X-Gm-Message-State: AOAM530oUA3ST+kzeMRQmZdSPwIIUrUeGSMedw4p0qJk9WHLhdTRWSwy VmYbBFgcW74t9eo96Om/ixLIxVF8yhmN+6icy7MX39xToL3NsX35D0B34BIkpnZzBUARuSirJAn 8CwIoBdQbs1V1ZSKXZB5MwYpq X-Received: by 2002:a17:906:ff47:: with SMTP id zo7mr256556ejb.148.1638290409305; Tue, 30 Nov 2021 08:40:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcjNpvM5gFPCaCUclQXk7TC9euEBPcbhgbKQC2imcBWnOKgA4mN5JbpzckK53Jf3S60BTVBg== X-Received: by 2002:a17:906:ff47:: with SMTP id zo7mr256532ejb.148.1638290409106; Tue, 30 Nov 2021 08:40:09 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id z1sm11626017edq.54.2021.11.30.08.40.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:40:08 -0800 (PST) From: christian.ehrhardt@canonical.com To: Robin Zhang Cc: Sylwester Dziedziuch , Beilei Xing , dpdk stable Subject: patch 'net/i40e/base: fix PF reset' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:42 +0100 Message-Id: <20211130163605.2460997-78-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f2c2ed35707d45124f63c28063d1016d9ce98ac5 Thanks. Christian Ehrhardt --- >From f2c2ed35707d45124f63c28063d1016d9ce98ac5 Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Sat, 9 Oct 2021 01:39:45 +0000 Subject: [PATCH] net/i40e/base: fix PF reset [ upstream commit 25829b55b463f7bb0b69af0e63b19121a16d2a63 ] PF has to delete all the filters during reset. If it is fully loaded with filters then it is possible that it will take more than 200 ms to finish the reset resulting in timeout during pf_reset and PF reset failed, -15 error indication. Increasing the timeout value for PF reset from 200 to 1000 to give PF more time to finish reset if it is loaded with filters. Fixes: 1e32378f0774 ("i40e/base: increase PF reset max loop limit") Signed-off-by: Sylwester Dziedziuch Signed-off-by: Robin Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index e9aac841e8..fef3b08e89 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1326,7 +1326,7 @@ STATIC enum i40e_status_code i40e_poll_globr(struct i40e_hw *hw, return I40E_ERR_RESET_FAILED; } -#define I40E_PF_RESET_WAIT_COUNT 200 +#define I40E_PF_RESET_WAIT_COUNT 1000 /** * i40e_pf_reset - Reset the PF * @hw: pointer to the hardware structure -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:10.441536398 +0100 +++ 0078-net-i40e-base-fix-PF-reset.patch 2021-11-30 16:50:05.814873706 +0100 @@ -1 +1 @@ -From 25829b55b463f7bb0b69af0e63b19121a16d2a63 Mon Sep 17 00:00:00 2001 +From f2c2ed35707d45124f63c28063d1016d9ce98ac5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 25829b55b463f7bb0b69af0e63b19121a16d2a63 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index ceedec68bf..aa424e6010 100644 +index e9aac841e8..fef3b08e89 100644 @@ -28 +29 @@ -@@ -1341,7 +1341,7 @@ STATIC enum i40e_status_code i40e_poll_globr(struct i40e_hw *hw, +@@ -1326,7 +1326,7 @@ STATIC enum i40e_status_code i40e_poll_globr(struct i40e_hw *hw,