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 5B01CA0540 for ; Thu, 7 Jul 2022 09:56:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B70B415D7; Thu, 7 Jul 2022 09:56:36 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id E0438406B4 for ; Thu, 7 Jul 2022 09:56:34 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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-1.canonical.com (Postfix) with ESMTPS id B215240AAF for ; Thu, 7 Jul 2022 07:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180594; bh=OGcoVlIoX+DGAn1+/KRg+LArXbTCN8A/F2HeyX6VkTo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=c7OWiMZpDWfS0+9BVzNEUNoaZpBzjuL+XEg5H+Yx3FWwZKDxrtsVamN4WroF30NHO Ss0jJZrBj6P67v+a3MSL2vhAPKOcK2g3KRmHjgOf9g9LybWPjqfLHIich7XhoXrLbx Zo1ZoYuPYeQfAPqAOVjy7osowG6tfyh366JZcXuls/JCPdZRhQtO2GZ9L/QuXUzlYu Wymf+o7cStNopZhi6zJVxXWpxqVuKCoGAhWOujfMSw0Z/gjQv7KbvE5SgMeztS9uK3 qKpncxOmNv9NFDe+3Bsco7ffI7DJC+rjheQwcYxjmurVvZCGPrxumbdPGqZUJ9zWFS bcx5n6gKWC4XA== Received: by mail-ed1-f69.google.com with SMTP id y6-20020a056402270600b00433940d207eso9905078edd.1 for ; Thu, 07 Jul 2022 00:56:34 -0700 (PDT) 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=OGcoVlIoX+DGAn1+/KRg+LArXbTCN8A/F2HeyX6VkTo=; b=Zsxl7Y2NgXery0eDA900yXDyV5LUBfhfV4FwWLS9owMqc897OrISoON7QTxMszHJ7J GT/O6nIcSTGsI9jvLuxU3Ho94de5qP5i8uhcGZj2yZpMZXyTo6h660VmtkD1ca9JM9WJ 853Px5o5UUw3sf+DL8RrqSMyIHz0JQ2pk+hD9iNeaUrO8ZMTR6sZ4tofU2R3bcSwnmLc aCPa04muJHEqBkFtw75G4SglU5I4j3eiG3gmmou9gOML2TqL7I0eTrLLnJJqVhbi6gf0 g+FeLtJ0vweJ2heVLN5CsNFTnbib8BAjA5YY4UdyHqbPV2WNHf/pmB7tjozufxlUEEFd u8/w== X-Gm-Message-State: AJIora9SIB5bmBIrrmhNBMQqip38kumL4zB7mzSMVCw5esfWcTeOI58F RqWYDwbwggl2kIDQBTD0fWSBkAwZlUrvCzgfteb6FMbOW07FnShNSeiAIjfLKscbqQtfZTaRzTn 94sTNsE18YIBh2XgzWB9uW6/j X-Received: by 2002:a17:907:1c8d:b0:6f2:eb2:1cd6 with SMTP id nb13-20020a1709071c8d00b006f20eb21cd6mr41770062ejc.568.1657180594429; Thu, 07 Jul 2022 00:56:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u40OHv28Q4z22Vqjx76cAVN3bICTK+wlaITmpASu9E2uIKetmrwAZQ7aHtCcv1BjRnXVUlgw== X-Received: by 2002:a17:907:1c8d:b0:6f2:eb2:1cd6 with SMTP id nb13-20020a1709071c8d00b006f20eb21cd6mr41770051ejc.568.1657180594211; Thu, 07 Jul 2022 00:56:34 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id s16-20020a170906455000b00722bc0aa9e3sm12194041ejq.162.2022.07.07.00.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:56:33 -0700 (PDT) From: christian.ehrhardt@canonical.com 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 19.11.13 Date: Thu, 7 Jul 2022 09:54:18 +0200 Message-Id: <20220707075522.194223-23-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-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.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/66aae5fff0ee89ddf472eab7990fb5071f13afd2 Thanks. Christian Ehrhardt --- >From 66aae5fff0ee89ddf472eab7990fb5071f13afd2 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 f51812f148..2acde85e96 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -133,6 +133,7 @@ static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev); static void bnxt_cancel_fw_health_check(struct bnxt *bp); static int bnxt_restore_vlan_filters(struct bnxt *bp); static void bnxt_dev_recover(void *arg); +static int bnxt_check_fw_ready(struct bnxt *bp); int is_bnxt_in_error(struct bnxt *bp) { @@ -888,6 +889,11 @@ 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); bp->flags &= ~BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE; @@ -4301,7 +4307,7 @@ 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; do { -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:12.197940246 +0200 +++ 0023-net-bnxt-recheck-FW-readiness-if-in-reset-process.patch 2022-07-07 09:54:10.837823826 +0200 @@ -1 +1 @@ -From 5591bb92ced3a841398eec4444f593a22b1ca6ea Mon Sep 17 00:00:00 2001 +From 66aae5fff0ee89ddf472eab7990fb5071f13afd2 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 f51812f148..2acde85e96 100644 @@ -24 +25,3 @@ -@@ -177,6 +177,7 @@ static int bnxt_restore_vlan_filters(struct bnxt *bp); +@@ -133,6 +133,7 @@ static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev); + static void bnxt_cancel_fw_health_check(struct bnxt *bp); + static int bnxt_restore_vlan_filters(struct bnxt *bp); @@ -26,2 +28,0 @@ - static void bnxt_free_error_recovery_info(struct bnxt *bp); - static void bnxt_free_rep_info(struct bnxt *bp); @@ -32 +33 @@ -@@ -1350,6 +1351,11 @@ static int bnxt_handle_if_change_status(struct bnxt *bp) +@@ -888,6 +889,11 @@ static int bnxt_handle_if_change_status(struct bnxt *bp) @@ -44 +45 @@ -@@ -4324,7 +4330,7 @@ static int bnxt_restore_filters(struct bnxt *bp) +@@ -4301,7 +4307,7 @@ static int bnxt_restore_filters(struct bnxt *bp)