[dpdk-stable] patch 'net/mlx5/linux: fix firmware version' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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/14/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/48af30a4c38ec2784868bbe23d84d2e2038bc621

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 48af30a4c38ec2784868bbe23d84d2e2038bc621 Mon Sep 17 00:00:00 2001
From: Kamil Vojanec <xvojan00 at stud.fit.vutbr.cz>
Date: Fri, 5 Feb 2021 10:00:45 +0100
Subject: [PATCH] net/mlx5/linux: fix firmware version
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 520e3f4888c508dad32da1d8c5486a7be9b0fbba ]

This patch fixes a bug where firmware version was not
copied from ibv_device_attr structure into mlx5_dev_attr
structure, resulting in inability to read firmware
version.

Fixes: e85f623e13ea ("net/mlx5: remove attributes dependency on Verbs")

Signed-off-by: Kamil Vojanec <xvojan00 at stud.fit.vutbr.cz>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/linux/mlx5_os.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 8ba6f03de0..22fbe30e05 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -147,6 +147,8 @@ mlx5_os_get_dev_attr(void *ctx, struct mlx5_dev_attr *device_attr)
 #ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
 	device_attr->tunnel_offloads_caps = dv_attr.tunnel_offloads_caps;
 #endif
+	strlcpy(device_attr->fw_ver, attr_ex.orig_attr.fw_ver,
+		sizeof(device_attr->fw_ver));
 
 	return err;
 }
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:59.383821500 +0800
+++ 0108-net-mlx5-linux-fix-firmware-version.patch	2021-06-12 06:53:56.470000000 +0800
@@ -1 +1 @@
-From 520e3f4888c508dad32da1d8c5486a7be9b0fbba Mon Sep 17 00:00:00 2001
+From 48af30a4c38ec2784868bbe23d84d2e2038bc621 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 520e3f4888c508dad32da1d8c5486a7be9b0fbba ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 6325607cdb..41b3e076a1 100644
+index 8ba6f03de0..22fbe30e05 100644
@@ -24 +26 @@
-@@ -154,6 +154,8 @@ mlx5_os_get_dev_attr(void *ctx, struct mlx5_dev_attr *device_attr)
+@@ -147,6 +147,8 @@ mlx5_os_get_dev_attr(void *ctx, struct mlx5_dev_attr *device_attr)