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 66F09A0A02 for ; Mon, 17 May 2021 18:11:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FF9E410F7; Mon, 17 May 2021 18:11:58 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id CD77840041 for ; Mon, 17 May 2021 18:11:56 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifqW-0007ed-LI; Mon, 17 May 2021 16:11:56 +0000 From: Christian Ehrhardt To: Kalesh AP Cc: Somnath Kotur , Randy Schacher , Ajit Khaparde , dpdk stable Date: Mon, 17 May 2021 18:07:42 +0200 Message-Id: <20210517161039.3132619-33-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix device readiness check' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 05/19/21. 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/f734fc7b78206baf7b865183b85aee2d8b88cf24 Thanks. Christian Ehrhardt --- >From f734fc7b78206baf7b865183b85aee2d8b88cf24 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 4 Mar 2021 14:37:27 +0530 Subject: [PATCH] net/bnxt: fix device readiness check [ upstream commit 3972281f47b2cc0cf844698885f0e6b4228c0975 ] Fix HWRM_VER_GET command to handle DEV_NOT_RDY state. Driver should fail probe if the device is not ready. Conversely, the HWRM_VER_GET poll after reset can safely retry until the existing timeout is exceeded. Fixes: 804e746c7b73 ("net/bnxt: add hardware resource manager init code") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Randy Schacher Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index b1b6b43e65..f18ba83d8a 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1005,6 +1005,11 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) else HWRM_CHECK_RESULT(); + if (resp->flags & HWRM_VER_GET_OUTPUT_FLAGS_DEV_NOT_RDY) { + rc = -EAGAIN; + goto error; + } + PMD_DRV_LOG(INFO, "%d.%d.%d:%d.%d.%d.%d\n", resp->hwrm_intf_maj_8b, resp->hwrm_intf_min_8b, resp->hwrm_intf_upd_8b, resp->hwrm_fw_maj_8b, @@ -5112,6 +5117,10 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp) rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); HWRM_CHECK_RESULT_SILENT(); + + if (resp->flags & HWRM_VER_GET_OUTPUT_FLAGS_DEV_NOT_RDY) + rc = -EAGAIN; + HWRM_UNLOCK(); return rc; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:30.859484604 +0200 +++ 0033-net-bnxt-fix-device-readiness-check.patch 2021-05-17 17:40:29.159809382 +0200 @@ -1 +1 @@ -From 3972281f47b2cc0cf844698885f0e6b4228c0975 Mon Sep 17 00:00:00 2001 +From f734fc7b78206baf7b865183b85aee2d8b88cf24 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3972281f47b2cc0cf844698885f0e6b4228c0975 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 02b0a214ca..5ef0845e8c 100644 +index b1b6b43e65..f18ba83d8a 100644 @@ -27 +28 @@ -@@ -1217,6 +1217,11 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) +@@ -1005,6 +1005,11 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) @@ -39 +40 @@ -@@ -6045,6 +6050,10 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp) +@@ -5112,6 +5117,10 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp)