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 1F693A0553 for ; Mon, 17 Feb 2020 18:46:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1964B1DA12; Mon, 17 Feb 2020 18:46:24 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id B935E1DA12 for ; Mon, 17 Feb 2020 18:46:22 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id b17so203690wmb.0 for ; Mon, 17 Feb 2020 09:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qW9wPPrcENHllwwqlFQg20EDLJeqLbBgCdCmHNnru+w=; b=q4cuUoxDW1R516qGEK8gGZd3e32GLcCkDVtE0LaXn7Ym67Rui8zpGB5OEWKWCzkm2I IWhbimCnbXUaLztSl+vT9zCryLBZUpHd+fYs2JXf+Ql/8Hsyeq8v1AVCN+DYDMUgCl+K fvEVEUJ/LYKZaiHOvMZ6G9pC7kch1kkZJr5TaaONs5zAigs1wjczjGhWaCE3lJw0St4p W9SBMfxhU66SwnbMm1Y39f7WyY9LmDx5iSTMuW9pV85EZQeaAwxRveULfyIcicWl8Q3N ygKWrSIDyGf82ypXHLcAyaQO5TnKjgtd1/ieasgd5+RuWp1bx3CbiM0TgvXyfrookXkB CTsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qW9wPPrcENHllwwqlFQg20EDLJeqLbBgCdCmHNnru+w=; b=lVaESNIKB6Mb82FO7fF2TRnXJKkA7rHG56FlUDQdjhGSlU6BpcRvIUh/awevewrmaP cDYw1z3KVSSSX42Wh/faMHf/5iJ7SPC0fhBnQjs8UCNJrDFhAU1oqkyXQg63XSDTki2d y4whndMZ6rHtBcGNEWHWbkpp+6XlnG8/PlPAhJs6thCMrEvn57Ql6ps4YRv18dM4fHAw 2vdHNbTNmSChA3wmH9DoR490S4eM0s0Oryu80auHjjoLN/lJY979QRUfKQo5WSA871pQ s08KW4E0o80yP5OCODbxDk958YEJz2scQmLwjmw68yggAMa1if5XJJj9J7PeaZMXp3UW oddg== X-Gm-Message-State: APjAAAXRPDZuQ6nHORX5U+flAdT4Mfv8LMYgspsC/VldD/LLPtaT6Vvz hBDYqw8oBacgY3ynSNRH/RU= X-Google-Smtp-Source: APXvYqxfRUT2isEXrhaEf/Hd7zSMQuV8og0aUzlFybP0PWxKdqiNfoLsQ2F73xXK1PAn+4Vu3iUceA== X-Received: by 2002:a05:600c:22d1:: with SMTP id 17mr151568wmg.91.1581961582428; Mon, 17 Feb 2020 09:46:22 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id b18sm2044697wru.50.2020.02.17.09.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:46:21 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , Rahul Gupta , dpdk stable Date: Mon, 17 Feb 2020 17:45:12 +0000 Message-Id: <20200217174546.25334-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix port stop on error recovery failure' has been queued to stable release 19.11.1 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 stable release 19.11.1 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/19/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 403641055b702973adbcecc2c199f12c5428b737 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 6 Feb 2020 22:03:12 +0530 Subject: [PATCH] net/bnxt: fix port stop on error recovery failure [ upstream commit e5acec69294891c3bdd18c2a8177de74fb435c2d ] During live FW upgrade or error recovery, if restoring the filter settings fail after port start, driver invokes bnxt_uninit_resources() only. Fix it to invoke bnxt_dev_stop_op() first before calling bnxt_uninit_resources(). Fixes: df6cd7c1f73a ("net/bnxt: handle reset notify async event from FW") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Rahul Gupta --- drivers/net/bnxt/bnxt_ethdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index f123c823e3..9ac63fd6d1 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3856,15 +3856,17 @@ static void bnxt_dev_recover(void *arg) rc = bnxt_dev_start_op(bp->eth_dev); if (rc) { PMD_DRV_LOG(ERR, "Failed to start port after reset\n"); - goto err; + goto err_start; } rc = bnxt_restore_filters(bp); if (rc) - goto err; + goto err_start; PMD_DRV_LOG(INFO, "Recovered from FW reset\n"); return; +err_start: + bnxt_dev_stop_op(bp->eth_dev); err: bp->flags |= BNXT_FLAG_FATAL_ERROR; bnxt_uninit_resources(bp, false); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:15.885606197 +0000 +++ 0020-net-bnxt-fix-port-stop-on-error-recovery-failure.patch 2020-02-17 17:00:15.307950455 +0000 @@ -1,15 +1,16 @@ -From e5acec69294891c3bdd18c2a8177de74fb435c2d Mon Sep 17 00:00:00 2001 +From 403641055b702973adbcecc2c199f12c5428b737 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 6 Feb 2020 22:03:12 +0530 Subject: [PATCH] net/bnxt: fix port stop on error recovery failure +[ upstream commit e5acec69294891c3bdd18c2a8177de74fb435c2d ] + During live FW upgrade or error recovery, if restoring the filter settings fail after port start, driver invokes bnxt_uninit_resources() only. Fix it to invoke bnxt_dev_stop_op() first before calling bnxt_uninit_resources(). Fixes: df6cd7c1f73a ("net/bnxt: handle reset notify async event from FW") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur @@ -19,10 +20,10 @@ 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 7147cc8fe2..3c40f4b599 100644 +index f123c823e3..9ac63fd6d1 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -4022,15 +4022,17 @@ static void bnxt_dev_recover(void *arg) +@@ -3856,15 +3856,17 @@ static void bnxt_dev_recover(void *arg) rc = bnxt_dev_start_op(bp->eth_dev); if (rc) { PMD_DRV_LOG(ERR, "Failed to start port after reset\n");