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 34689A0543 for ; Tue, 21 Jun 2022 10:07:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F83F4281B; Tue, 21 Jun 2022 10:07:42 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2063.outbound.protection.outlook.com [40.107.96.63]) by mails.dpdk.org (Postfix) with ESMTP id 138D24281B for ; Tue, 21 Jun 2022 10:07:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QZlrXMtnqqdm8t5f8HD3mMEI3UVQ9/ReyWqlWRjaqBCma5GsieshzwmEZPpxfKPvL/iZQqFneth8rqRNS/Qwa7t87VFoDO5GXqYTB+7xGVcfGaS+G6Qigxj30+GpWmFeV0zDeoClmZv5j38jW5q7iYSe1eSil1uAbcknxRRMuVDis86Tg1RfE5HUAA5uwOwYR/SzM4+YxiCKf4O06Zb1TxesjWamOK8U7wOcd9SyIVVdbeyOHoBTUBidoWIk/B5gHBajxJnszzA33uweGjLOoAn0OE06ZD+pikq1zmPku5LTq4It8DnD0l03ucade6P/xpUa7tRO3VLjSW4bg36YXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=J04UIYce+9xC5noHQWqAHKkj8Bd5plzuBvFf5oLSazM=; b=dk8sf/BbBCEYG1IMbCvp1owiFipXTPhUo42o46DUTqzUT8Zw2zkXT73tzZnVfqz6cgf2DwirRHJOtq5WiCdknd31cT/c1QcKDpZHTcYMHwttgFbzAKrB1mSJ4faM0esgVu6CwbYqxej4g4toaNg/Cr4IXn1ctB1v2tp3zmqyS07/R9UpIglgP3qrvrYm6slUbtgMfTyav75LJrH8cQZ1rxWhInRarcG4tEVjfQplaEtcgiBV1vkfdpXbuOBRitEacc35mDCvmxxE8x/gn892rIcj75K5ebJDmpwQOqgMuR80LCjIIy3P67vE1KEVocQIuqIqvoYKwA9LxuDwmya1Jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=broadcom.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=J04UIYce+9xC5noHQWqAHKkj8Bd5plzuBvFf5oLSazM=; b=krBV1/Q2hmhbDkVFMuC7IlgEUEJqpgP7s/OY0dcFWMBboDu/5pPPo2aF4P7e1AQnZcSeiepYeN0N0SAfVPW/Z+xw/EXXG9Mn6cOpd8xAYfgmPSt5+M+V7yGKuBQ7EeCXwh9s+RUBL5sDtKc7+srAAji6RPn7xAKSxecLvTXa+2Hvq3qZKNze3kYt0/Py3d6upgYcSq73peY1R8FutpUg3qDfvzz/uIGtYN0udi4xtc8AYvHJ5vLPBQPIVJAxOnZsnmS31Ijb6ZmMxL3RIG6miBAbhaBDUMx2jC5kBzZ4BHqmpoc4845gkXLB8TbRVZ7uAl3fz0qHVK4SHN8pAptffw== Received: from MW4PR04CA0049.namprd04.prod.outlook.com (2603:10b6:303:6a::24) by PH0PR12MB5607.namprd12.prod.outlook.com (2603:10b6:510:142::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 21 Jun 2022 08:07:39 +0000 Received: from CO1NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6a:cafe::a3) by MW4PR04CA0049.outlook.office365.com (2603:10b6:303:6a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:07:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT040.mail.protection.outlook.com (10.13.174.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:07:39 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:07:38 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:07:37 -0700 From: Xueming Li 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 20.11.6 Date: Tue, 21 Jun 2022 11:01:57 +0300 Message-ID: <20220621080301.2315720-52-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be956fc0-06b7-48c1-4359-08da535d1c0d X-MS-TrafficTypeDiagnostic: PH0PR12MB5607:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BiFv0DUKFpiPbbc2yjTDbQlvWd7frKH3yPECuvFWQS/80P1iUbavUKltRg85v5gFel1KAO6iZcx8EwyMZ/GpEE4VSWrCHjX+p0Yus3jC3gRklQjNIwd1BIdzGyj/hZuhdTauN/wEC2Orw/hpvcC8D5yEzaF/YHFVzFcgHLULkgpwMnZ/w5AFVuAYpWAyEaRsOfAVyvnczmxPbJR8KXC0GmNt9Zaywyj0CZTDq5BS2IJ+57YImHn2dlRdIDgyUwpYHdxICLiCEUPkTBp5kn8fHPnvcsN0ZNV3qHqSZuJI6N+m4coyVNojos48RGfm4BbtE06bVYR/JRf3wPGNZuXTuF3tdJtWKjFU5zV+YorpE86nTZqmY3cpaOI0GaPtxEYL70/qkykVpKpah5+P4DieT7UUFb4jzatolB0DWeb1wLtbGZ8Mz1ryLCrxWmEh/IBnLY41Nk/rI4gzEuJf1BKiWmR82ToOuKyAmk1Xj7w/YbGya2ede92Qka7Db/2PY01NZr/5dywqp3FhJlF3bJHxYyobzGYkAwUfXKY/dki1xJCLNQwqxDRtp2T6KoAKLqTTfjYOpaFpmWYOdp8tG+sCllpj3FtMNZJrYPXw79rBkBrjCzFrTPMgBx4W2g5KJ5GD2uTKRCT9VmUSKyEB/VhVGPFtvB8OuD+iU/fqt32nR+5GcBt2a8G6LAJMDj2bJC1oxhFZ0mufBth1wV/Cl8pNzrD54zz8IDCby1dzzEUQ6wIo1+nVAJ+uRqlYCACe1iuWcH6SMPO6LCzcXPpOHCcf+cKM2m4/gSKYCrHUMr+hBzzAIhwKS9nkFQrAVc6OYrOteGDRyOmnxn9V42g/z/ZTDwXRF6FaBH020QP9YuuGVeU= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(396003)(39860400002)(346002)(376002)(136003)(36840700001)(46966006)(40470700004)(70586007)(4326008)(8676002)(1076003)(16526019)(70206006)(47076005)(336012)(426003)(26005)(6286002)(2906002)(186003)(86362001)(6666004)(7696005)(40460700003)(53546011)(478600001)(8936002)(5660300002)(966005)(41300700001)(2616005)(6916009)(55016003)(40480700001)(356005)(82310400005)(316002)(83380400001)(82740400003)(36860700001)(36756003)(81166007)(54906003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:07:39.2948 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be956fc0-06b7-48c1-4359-08da535d1c0d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5607 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/03a539bf175280b8b9927846f6f0633ce3311cc2 Thanks. Xueming Li --- >From 03a539bf175280b8b9927846f6f0633ce3311cc2 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 Cc: Xueming Li [ 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 e3fd3dcb7e..281c209335 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -188,6 +188,7 @@ static int bnxt_restore_vlan_filters(struct bnxt *bp); 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) { @@ -1321,6 +1322,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; @@ -4136,7 +4142,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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:51.641248284 +0800 +++ 0051-net-bnxt-recheck-FW-readiness-if-in-reset-process.patch 2022-06-21 15:37:49.074451382 +0800 @@ -1 +1 @@ -From 5591bb92ced3a841398eec4444f593a22b1ca6ea Mon Sep 17 00:00:00 2001 +From 03a539bf175280b8b9927846f6f0633ce3311cc2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5591bb92ced3a841398eec4444f593a22b1ca6ea ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 69f1117ffa..abcb534af6 100644 +index e3fd3dcb7e..281c209335 100644 @@ -24 +26 @@ -@@ -177,6 +177,7 @@ static int bnxt_restore_vlan_filters(struct bnxt *bp); +@@ -188,6 +188,7 @@ static int bnxt_restore_vlan_filters(struct bnxt *bp); @@ -32 +34 @@ -@@ -1350,6 +1351,11 @@ static int bnxt_handle_if_change_status(struct bnxt *bp) +@@ -1321,6 +1322,11 @@ static int bnxt_handle_if_change_status(struct bnxt *bp) @@ -44 +46 @@ -@@ -4324,7 +4330,7 @@ static int bnxt_restore_filters(struct bnxt *bp) +@@ -4136,7 +4142,7 @@ static int bnxt_restore_filters(struct bnxt *bp)