From 3ea12cad7165facd6bc8c4fa1cbc734ccbc71d2b Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Thu, 19 Nov 2020 10:06:10 +0200 Subject: [PATCH 1/1] common/mlx5: fix name for ConnectX VF device ID 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") Cc: stable@dpdk.org Signed-off-by: Raslan Darawsheh Acked-by: Viacheslav Ovsiienko --- 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, 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: 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[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF) + PCI_DEVICE_ID_MELLANOX_CONNECTXVF) }, { 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, -- 2.20.1