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 5B4DCA04A3 for ; Fri, 5 Jun 2020 20:27:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 957F71D567; Fri, 5 Jun 2020 20:27:03 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 37FC11D51C for ; Fri, 5 Jun 2020 20:27:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wk3TAMvQe5FYAeD6lIrPbdh4UDNeCpZ9qPjRL0LfU+8=; b=cOmeJxH1EOnOYGFX20U5wp3IXzBJHoG2rFcW6NXX0tyN6EvjoU0/zUDrz6ZjifBt+DOcS4 jJv2WBCu4km7ekqF+T9JnW8VVYW9QrLN0nV/w9U51S+sUoTQVvMV9ocoJW8ppVJstXCsiR QHnMhO3DwCg1wWJHHtmD6f3yQfeLflY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-176-6dLVzZsKMlK6tLqE2wt7SA-1; Fri, 05 Jun 2020 14:26:58 -0400 X-MC-Unique: 6dLVzZsKMlK6tLqE2wt7SA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 91E49100CCD3; Fri, 5 Jun 2020 18:26:57 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9D3B60C47; Fri, 5 Jun 2020 18:26:56 +0000 (UTC) From: Kevin Traynor To: Ajit Khaparde Cc: dpdk stable Date: Fri, 5 Jun 2020 19:24:35 +0100 Message-Id: <20200605182525.22483-38-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix FW version query' has been queued to LTS release 18.11.9 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 LTS release 18.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 06/10/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/372013714b3037d9a0e9e040121a6e0e42634b0d Thanks. Kevin. --- >From 372013714b3037d9a0e9e040121a6e0e42634b0d Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Wed, 6 May 2020 22:43:28 -0700 Subject: [PATCH] net/bnxt: fix FW version query [ upstream commit cfa9e98d3c135e4f937265263feb7377330219f6 ] bnxt_fw_version_get is not indicating the complete FW version. Fix it to indicate complete version string. Fixes: e2652b0a20a0 ("net/bnxt: support get FW version") Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 219d836d91..9ec1e13721 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1550,8 +1550,9 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) uint8_t fw_minor = (bp->fw_ver >> 16) & 0xff; uint8_t fw_updt = (bp->fw_ver >> 8) & 0xff; + uint8_t fw_rsvd = bp->fw_ver & 0xff; int ret; - ret = snprintf(fw_version, fw_size, "%d.%d.%d", - fw_major, fw_minor, fw_updt); + ret = snprintf(fw_version, fw_size, "%d.%d.%d.%d", + fw_major, fw_minor, fw_updt, fw_rsvd); ret += 1; /* add the size of '\0' */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:52.932789085 +0100 +++ 0038-net-bnxt-fix-FW-version-query.patch 2020-06-05 19:20:50.789041290 +0100 @@ -1 +1 @@ -From cfa9e98d3c135e4f937265263feb7377330219f6 Mon Sep 17 00:00:00 2001 +From 372013714b3037d9a0e9e040121a6e0e42634b0d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cfa9e98d3c135e4f937265263feb7377330219f6 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index dab291c7ce..ee0550b324 100644 +index 219d836d91..9ec1e13721 100644 @@ -21 +22 @@ -@@ -2405,8 +2405,9 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) +@@ -1550,8 +1550,9 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)