[dpdk-stable] patch 'common/mlx5: fix name for ConnectX VF device ID' has been queued to stable release 19.11.6
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Wed Nov 25 10:02:49 CET 2020
Hi,
FYI, your patch has been queued to stable release 19.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 11/26/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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/6de0c15edd6b76efd780ac5998ebcc4cdb0cf166
Thanks.
Luca Boccassi
---
>From 6de0c15edd6b76efd780ac5998ebcc4cdb0cf166 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland at nvidia.com>
Date: Thu, 19 Nov 2020 10:06:10 +0200
Subject: [PATCH] common/mlx5: fix name for ConnectX VF device ID
[ upstream commit 3ea12cad7165facd6bc8c4fa1cbc734ccbc71d2b ]
Starting ConnectX-6 Dx, the VF device ID is generic
and not per chip.
https://pci-ids.ucw.cz/v2.2/pci.ids
101e ConnectX Family mlx5Gen Virtual Function
This means that all will have the same VF device ID.
Fixes: 5fc66630bed5 ("net/mlx5: add ConnectX6-DX device ID")
Signed-off-by: Raslan Darawsheh <rasland at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
drivers/net/mlx5/mlx5.c | 4 ++--
drivers/net/mlx5/mlx5.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index f2327903eb..36e69379fa 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -3389,7 +3389,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF:
case PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF:
case PCI_DEVICE_ID_MELLANOX_CONNECTX6VF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF:
+ case PCI_DEVICE_ID_MELLANOX_CONNECTXVF:
dev_config.vf = 1;
break;
default:
@@ -3572,7 +3572,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF)
+ PCI_DEVICE_ID_MELLANOX_CONNECTXVF)
},
{
.vendor_id = 0
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index d2e4f446f4..206c8e9fa8 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -57,7 +57,7 @@ enum {
PCI_DEVICE_ID_MELLANOX_CONNECTX6 = 0x101b,
PCI_DEVICE_ID_MELLANOX_CONNECTX6VF = 0x101c,
PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF = 0x101e,
+ PCI_DEVICE_ID_MELLANOX_CONNECTXVF = 0x101e,
};
/* Request types for IPC. */
--
2.27.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-24 16:50:36.858866071 +0000
+++ 0007-common-mlx5-fix-name-for-ConnectX-VF-device-ID.patch 2020-11-24 16:50:36.561496146 +0000
@@ -1 +1 @@
-From 3ea12cad7165facd6bc8c4fa1cbc734ccbc71d2b Mon Sep 17 00:00:00 2001
+From 6de0c15edd6b76efd780ac5998ebcc4cdb0cf166 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3ea12cad7165facd6bc8c4fa1cbc734ccbc71d2b ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -20,24 +21,9 @@
- drivers/common/mlx5/mlx5_common.h | 2 +-
- drivers/net/mlx5/linux/mlx5_os.c | 2 +-
- drivers/net/mlx5/mlx5.c | 2 +-
- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
-index 10a0851794..a484b74b9c 100644
---- a/drivers/common/mlx5/mlx5_common.h
-+++ b/drivers/common/mlx5/mlx5_common.h
-@@ -131,7 +131,7 @@ enum {
- PCI_DEVICE_ID_MELLANOX_CONNECTX6 = 0x101b,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6VF = 0x101c,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d,
-- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF = 0x101e,
-+ PCI_DEVICE_ID_MELLANOX_CONNECTXVF = 0x101e,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF = 0xa2d6,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6LX = 0x101f,
- PCI_DEVICE_ID_MELLANOX_CONNECTX7 = 0x1021,
-diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
-index 00f793bc57..5a6ae790a7 100644
---- a/drivers/net/mlx5/linux/mlx5_os.c
-+++ b/drivers/net/mlx5/linux/mlx5_os.c
-@@ -2113,7 +2113,7 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ drivers/net/mlx5/mlx5.c | 4 ++--
+ drivers/net/mlx5/mlx5.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
+index f2327903eb..36e69379fa 100644
+--- a/drivers/net/mlx5/mlx5.c
++++ b/drivers/net/mlx5/mlx5.c
+@@ -3389,7 +3389,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
@@ -49 +35 @@
- dev_config_vf = 1;
+ dev_config.vf = 1;
@@ -52,5 +38 @@
-diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
-index ede5fd44ab..db7e8d708c 100644
---- a/drivers/net/mlx5/mlx5.c
-+++ b/drivers/net/mlx5/mlx5.c
-@@ -2035,7 +2035,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
+@@ -3572,7 +3572,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
@@ -64,14 +46,14 @@
- RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
-diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
-index 1502abdc89..b64f364eb7 100644
---- a/drivers/vdpa/mlx5/mlx5_vdpa.c
-+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
-@@ -824,7 +824,7 @@ static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = {
- },
- {
- RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
-- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF)
-+ PCI_DEVICE_ID_MELLANOX_CONNECTXVF)
- },
- {
- RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
+ .vendor_id = 0
+diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
+index d2e4f446f4..206c8e9fa8 100644
+--- a/drivers/net/mlx5/mlx5.h
++++ b/drivers/net/mlx5/mlx5.h
+@@ -57,7 +57,7 @@ enum {
+ PCI_DEVICE_ID_MELLANOX_CONNECTX6 = 0x101b,
+ PCI_DEVICE_ID_MELLANOX_CONNECTX6VF = 0x101c,
+ PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d,
+- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF = 0x101e,
++ PCI_DEVICE_ID_MELLANOX_CONNECTXVF = 0x101e,
+ };
+
+ /* Request types for IPC. */
More information about the stable
mailing list