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 DD74EA0555 for ; Wed, 25 May 2022 18:30:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5B1C4281C; Wed, 25 May 2022 18:30:16 +0200 (CEST) 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 6B9E1400EF for ; Wed, 25 May 2022 18:30:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496212; 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=hWoRfNuPHgjYwRmpB6/lv+27L16XwgBmaSm+7cGVpWo=; b=X4wI3CuZ2+3GooTcF632mzmElI8xpbtEwL/5KPTz6VZNdOG1Jju4I4hAkhrovJNpBAR/4b 1X+jGZOXbhyUC+vtjUa7MXiFqbwJqth3PSWV6h34geVSLjuYHaC8/TVcxKAIJJAWUGdtVE bpdRB2N9rc8N9kuX9JJxzVAmsof3ak8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-PX5_TNCcNYqRnF6S4-GDFg-1; Wed, 25 May 2022 12:30:09 -0400 X-MC-Unique: PX5_TNCcNYqRnF6S4-GDFg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 060F1101AA46; Wed, 25 May 2022 16:30:09 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id D80CF2026D64; Wed, 25 May 2022 16:30:07 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: recheck FW readiness if in reset process' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:40 +0100 Message-Id: <20220525162847.711753-48-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/30/22. 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/fa1a893ff78d5c0a095f758dcf72fb7468c32215 Thanks. Kevin --- >From fa1a893ff78d5c0a095f758dcf72fb7468c32215 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 27 Apr 2022 20:28:19 +0530 Subject: [PATCH] net/bnxt: recheck FW readiness if in reset process [ upstream commit 5591bb92ced3a841398eec4444f593a22b1ca6ea ] If Firmware is still in reset process and returns the error HWRM_ERR_CODE_HOT_RESET_PROGRESS, retry VER_GET command. We have to do it in bnxt_handle_if_change_status(). Fixes: 0b533591238f ("net/bnxt: inform firmware about IF state changes") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 9b3b7b76df..68e28f95f6 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -178,4 +178,5 @@ static void bnxt_dev_recover(void *arg); static void bnxt_free_error_recovery_info(struct bnxt *bp); static void bnxt_free_rep_info(struct bnxt *bp); +static int bnxt_check_fw_ready(struct bnxt *bp); int is_bnxt_in_error(struct bnxt *bp) @@ -1351,4 +1352,9 @@ static int bnxt_handle_if_change_status(struct bnxt *bp) /* clear fatal flag so that re-init happens */ bp->flags &= ~BNXT_FLAG_FATAL_ERROR; + + rc = bnxt_check_fw_ready(bp); + if (rc) + return rc; + rc = bnxt_init_resources(bp, true); @@ -4326,5 +4332,5 @@ static int bnxt_restore_filters(struct bnxt *bp) static int bnxt_check_fw_ready(struct bnxt *bp) { - int timeout = bp->fw_reset_max_msecs; + int timeout = bp->fw_reset_max_msecs ? : BNXT_MAX_FW_RESET_TIMEOUT; int rc = 0; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.695118481 +0100 +++ 0048-net-bnxt-recheck-FW-readiness-if-in-reset-process.patch 2022-05-25 17:26:58.648828450 +0100 @@ -1 +1 @@ -From 5591bb92ced3a841398eec4444f593a22b1ca6ea Mon Sep 17 00:00:00 2001 +From fa1a893ff78d5c0a095f758dcf72fb7468c32215 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5591bb92ced3a841398eec4444f593a22b1ca6ea ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 69f1117ffa..abcb534af6 100644 +index 9b3b7b76df..68e28f95f6 100644 @@ -40 +41 @@ -@@ -4325,5 +4331,5 @@ static int bnxt_restore_filters(struct bnxt *bp) +@@ -4326,5 +4332,5 @@ static int bnxt_restore_filters(struct bnxt *bp)