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 C4982A0A02 for ; Mon, 17 May 2021 18:21:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B702441102; Mon, 17 May 2021 18:21:43 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D4C4A40041 for ; Mon, 17 May 2021 18:21:42 +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 1lifzy-0000PZ-Lw; Mon, 17 May 2021 16:21:42 +0000 From: Christian Ehrhardt To: Kalesh AP Cc: Somnath Kotur , Andy Gospodarek , Ajit Khaparde , dpdk stable Date: Mon, 17 May 2021 18:21:13 +0200 Message-Id: <20210517162125.3178901-9-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> References: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: prevent device access in error state' 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/741a4e8fca9cadcb5b3fbb7fdaeed139577d8792 Thanks. Christian Ehrhardt --- >From 741a4e8fca9cadcb5b3fbb7fdaeed139577d8792 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Mon, 3 May 2021 10:51:50 +0530 Subject: [PATCH] net/bnxt: prevent device access in error state [ upstream commit c967098a4c0aafa0cb244ab9423fdea3d943d1ab ] Driver should prevent any DMA with the device when it detects an error. When firmware is in fatal state, stop tx/rx by assigning them to dummy functions. Fixes: be14720def9c ("net/bnxt: support FW reset") Fixes: 9d0cbaecc91a ("net/bnxt: support periodic FW health monitoring") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Andy Gospodarek Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 60e85c33f1..524764e1f7 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4300,6 +4300,8 @@ reset: bp->flags |= BNXT_FLAG_FATAL_ERROR; bp->flags |= BNXT_FLAG_FW_RESET; + bnxt_stop_rxtx(bp); + PMD_DRV_LOG(ERR, "Detected FW dead condition\n"); if (bnxt_is_master_func(bp)) -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:37.125203550 +0200 +++ 0198-net-bnxt-prevent-device-access-in-error-state.patch 2021-05-17 17:40:29.575812657 +0200 @@ -1 +1 @@ -From c967098a4c0aafa0cb244ab9423fdea3d943d1ab Mon Sep 17 00:00:00 2001 +From 741a4e8fca9cadcb5b3fbb7fdaeed139577d8792 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c967098a4c0aafa0cb244ab9423fdea3d943d1ab ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 719eb68847..822853a008 100644 +index 60e85c33f1..524764e1f7 100644 @@ -26 +27 @@ -@@ -4275,6 +4275,8 @@ reset: +@@ -4300,6 +4300,8 @@ reset: