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 74523A0524 for ; Thu, 4 Feb 2021 12:37:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6D8A3240771; Thu, 4 Feb 2021 12:37:36 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 7BF6B240750 for ; Thu, 4 Feb 2021 12:37:34 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cx4-0005fz-9O; Thu, 04 Feb 2021 11:37:34 +0000 From: Christian Ehrhardt To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Thu, 4 Feb 2021 12:29:18 +0100 Message-Id: <20210204112954.2488123-103-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix FW version log' has been queued to stable release 19.11.7 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.7 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/06/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/910cfd154663ce9e4d9dbcfdfc9f4a9525e407af Thanks. Christian Ehrhardt --- >From 910cfd154663ce9e4d9dbcfdfc9f4a9525e407af Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Mon, 18 Jan 2021 09:42:11 +0530 Subject: [PATCH] net/bnxt: fix FW version log [ upstream commit 51a7d362721e2fe60425d4c045306ac85f87cd2c ] Driver is not logging the complete FW version along with HSI version. Fix it to indicate complete FW version string. Fixes: 9a891c1764ea ("net/bnxt: update HWRM to version 1.9.2") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 419f42ffef..8025d5ad78 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1005,10 +1005,11 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) else HWRM_CHECK_RESULT(); - PMD_DRV_LOG(INFO, "%d.%d.%d:%d.%d.%d\n", + 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, - resp->hwrm_fw_min_8b, resp->hwrm_fw_bld_8b); + resp->hwrm_fw_min_8b, resp->hwrm_fw_bld_8b, + resp->hwrm_fw_rsvd_8b); bp->fw_ver = (resp->hwrm_fw_maj_8b << 24) | (resp->hwrm_fw_min_8b << 16) | (resp->hwrm_fw_bld_8b << 8) | -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:32.272580098 +0100 +++ 0103-net-bnxt-fix-FW-version-log.patch 2021-02-04 12:04:28.118789814 +0100 @@ -1 +1 @@ -From 51a7d362721e2fe60425d4c045306ac85f87cd2c Mon Sep 17 00:00:00 2001 +From 910cfd154663ce9e4d9dbcfdfc9f4a9525e407af Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 51a7d362721e2fe60425d4c045306ac85f87cd2c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 6d54b16568..4d8ca9e478 100644 +index 419f42ffef..8025d5ad78 100644 @@ -23 +24 @@ -@@ -1102,10 +1102,11 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) +@@ -1005,10 +1005,11 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout)