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 9630BA0542 for ; Fri, 7 Feb 2020 16:14:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F3761C02E; Fri, 7 Feb 2020 16:14:07 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id B01591C02E for ; Fri, 7 Feb 2020 16:14:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088446; 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=TqQ2W0bmSpMCdcJN3E97ZFQav/HbVflOT5Gy5Dx1FZE=; b=NmR3sM6JFbH3sk17VprHumuduXOw7o+5C5pnsOaFiXmNwHjAKNzoXsZDEk0HREy6Asq5uZ UoafpRwZSl4S6w5JCmAP2sTV59bFV1AU7NONQpoDrPrjKrA7X+TYVusUxKIyLOhk6/oh+A Tln8NadhVd1x6XSRqRkRXENb5M/HyHc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-438-fNJp5UoNPnCc5gBpl03xTg-1; Fri, 07 Feb 2020 10:14:02 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1980295BA0; Fri, 7 Feb 2020 15:14:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CDDF10016DA; Fri, 7 Feb 2020 15:13:59 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: Marcin Formela , Qi Zhang , Beilei Xing , dpdk stable Date: Fri, 7 Feb 2020 15:12:43 +0000 Message-Id: <20200207151248.29804-31-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: fNJp5UoNPnCc5gBpl03xTg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/i40e/base: fix retrying logic' has been queued to LTS release 18.11.7 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 LTS release 18.11.7 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 rebasi= ng (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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/601bb85f687ca54720= 8063dd208008183f5eaa6c Thanks. Kevin. --- >From 601bb85f687ca547208063dd208008183f5eaa6c Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 13 Jan 2020 10:39:37 +0800 Subject: [PATCH] net/i40e/base: fix retrying logic [ upstream commit 50126939c66692d5b74922e12a9bf0dacfb6618b ] Fixed a bug where driver was breaking out of the loop and reporting an error without retrying first. Fixes: 466eec7d6b1a ("net/i40e/base: retry AQC to overcome IRCRead hangs") Signed-off-by: Marcin Formela Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_common.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i4= 0e_common.c index 87fa7e183f..1f8bb603df 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1703,17 +1703,20 @@ enum i40e_status_code i40e_aq_get_phy_capabilities(= struct i40e_hw *hw, =09=09=09=09=09 abilities_size, cmd_details); =20 -=09=09if (status !=3D I40E_SUCCESS) -=09=09=09break; - -=09=09if (hw->aq.asq_last_status =3D=3D I40E_AQ_RC_EIO) { +=09=09switch (hw->aq.asq_last_status) { +=09=09case I40E_AQ_RC_EIO: =09=09=09status =3D I40E_ERR_UNKNOWN_PHY; =09=09=09break; -=09=09} else if (hw->aq.asq_last_status =3D=3D I40E_AQ_RC_EAGAIN) { +=09=09case I40E_AQ_RC_EAGAIN: =09=09=09i40e_msec_delay(1); =09=09=09total_delay++; =09=09=09status =3D I40E_ERR_TIMEOUT; +=09=09=09break; +=09=09/* also covers I40E_AQ_RC_OK */ +=09=09default: +=09=09=09break; =09=09} -=09} while ((hw->aq.asq_last_status !=3D I40E_AQ_RC_OK) && -=09=09 (total_delay < max_delay)); + +=09} while ((hw->aq.asq_last_status =3D=3D I40E_AQ_RC_EAGAIN) && +=09=09(total_delay < max_delay)); =20 =09if (status !=3D I40E_SUCCESS) --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:19.135625203 +0000 +++ 0031-net-i40e-base-fix-retrying-logic.patch=092020-02-07 15:08:17.56406= 2285 +0000 @@ -1 +1 @@ -From 50126939c66692d5b74922e12a9bf0dacfb6618b Mon Sep 17 00:00:00 2001 +From 601bb85f687ca547208063dd208008183f5eaa6c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 50126939c66692d5b74922e12a9bf0dacfb6618b ] + @@ -20 +22 @@ -index 4f87ec9fad..a37e70599d 100644 +index 87fa7e183f..1f8bb603df 100644 @@ -23 +25 @@ -@@ -1715,17 +1715,20 @@ enum i40e_status_code i40e_aq_get_phy_capabilities= (struct i40e_hw *hw, +@@ -1703,17 +1703,20 @@ enum i40e_status_code i40e_aq_get_phy_capabilities= (struct i40e_hw *hw,