From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id D9791B62 for ; Mon, 15 Oct 2018 13:51:58 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id 193-v6so19270043wme.3 for ; Mon, 15 Oct 2018 04:51:58 -0700 (PDT) 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=53cjQ2dFJvbwCcBup+diEwDfXCkFVXQ5NV+ISjK2VMc=; b=ZCe0MWVBinDklBD1gvaGcenAe8SlTFQPtYKaVga3bk3K7L4SQ8tqfYe0mJ1Jf9qtig ful6iM62tYLZmYIUych/bs2Kpxpi0hLKepiYaboZLvPi/MDA28DXoV8MFdOMkX8EVrSO K8mOl9A/QoYxsufB+O/VfePqLPJXvPEpCFRm8uSjgneEeKAkj63k3qSQuBqszsT8n16y AtlgWC6Z/tJM2FLub7v2cAate7166jQFMTQGtlnac7y2E6DYVtx59KeSxtDOaDq5WRQe xti4wJfjNBIIFrL5evgQPZd1KfTlIdL+dU6B31LAtA6+H5vNVucJUAU3TUHPf51meUGt OVWw== X-Gm-Message-State: ABuFfoiPqhHdYa8/nKPJ05TIk8t1RLR5WzWN/E53vY1ivDJ8ms8SC9q+ ATs5xaqmN7uUNPl/F04kUrsg+Uuz X-Google-Smtp-Source: ACcGV60xiYsBOBXMLq5dfLnDylNyzwSQJhCK2FLsV1xP+sqllTTuLHwM4qYBEcZtIE2GJyqqDn4Gtw== X-Received: by 2002:a1c:a1c6:: with SMTP id k189-v6mr13620021wme.0.1539604318430; Mon, 15 Oct 2018 04:51:58 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id 67-v6sm7350920wmd.1.2018.10.15.04.51.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 04:51:57 -0700 (PDT) From: Luca Boccassi To: Qi Zhang Cc: Beilei Xing , dpdk stable Date: Mon, 15 Oct 2018 12:51:25 +0100 Message-Id: <20181015115144.27626-5-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181015115144.27626-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181015115144.27626-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e/base: correct global reset timeout calculation' has been queued to LTS release 16.11.9 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: Mon, 15 Oct 2018 11:51:59 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/17/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. Luca Boccassi --- >>From d2f863a3f2f76e384454085fd2cc32e2a06b24b8 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 25 Sep 2018 10:34:33 +0800 Subject: [PATCH] net/i40e/base: correct global reset timeout calculation [ upstream commit 92451d9039ddddeddf59208a988393a6d44b2b9b ] The wait time for Global Reset Ready steady state is calculated based on the GLGEN_RSTCTL.GRSTDEL value. However, current impelementation multiplied that value by 20 as a workaround for an issue in SOC platforms. This resulted in the maximum GLGEN_RSTCTL.GRSTDEL timeout of 6.5 seconds becoming 130 seconds, which is so long that the VMkernel watchdog thinks the kernel is frozen and triggers a PSOD. Signed-off-by: Qi 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 1bfda0866d..8ba75c738d 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1348,7 +1348,7 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw) I40E_GLGEN_RSTCTL_GRSTDEL_MASK) >> I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT; - grst_del = grst_del * 20; + grst_del = min(grst_del * 20, 160U); for (cnt = 0; cnt < grst_del; cnt++) { reg = rd32(hw, I40E_GLGEN_RSTAT); -- 2.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-10-15 12:48:34.743212124 +0100 +++ 0005-net-i40e-base-correct-global-reset-timeout-calculati.patch 2018-10-15 12:48:34.509096018 +0100 @@ -1,8 +1,10 @@ -From 92451d9039ddddeddf59208a988393a6d44b2b9b Mon Sep 17 00:00:00 2001 +From d2f863a3f2f76e384454085fd2cc32e2a06b24b8 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 25 Sep 2018 10:34:33 +0800 Subject: [PATCH] net/i40e/base: correct global reset timeout calculation +[ upstream commit 92451d9039ddddeddf59208a988393a6d44b2b9b ] + The wait time for Global Reset Ready steady state is calculated based on the GLGEN_RSTCTL.GRSTDEL value. However, current impelementation multiplied that value by 20 as a workaround for an issue in SOC platforms. @@ -10,8 +12,6 @@ becoming 130 seconds, which is so long that the VMkernel watchdog thinks the kernel is frozen and triggers a PSOD. -Cc: stable@dpdk.org - Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- @@ -19,10 +19,10 @@ 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 0affa98ac9..0eb369ff6c 100644 +index 1bfda0866d..8ba75c738d 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c -@@ -1342,7 +1342,7 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw) +@@ -1348,7 +1348,7 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw) I40E_GLGEN_RSTCTL_GRSTDEL_MASK) >> I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT;