diff mbox series

common/mlx5: fix name for ConnectX VF device ID

Message ID 20201119080610.14294-1-rasland@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series common/mlx5: fix name for ConnectX VF device ID |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-testing warning Testing issues
ci/iol-intel-Functional fail Functional Testing issues
ci/iol-intel-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

Raslan Darawsheh Nov. 19, 2020, 8:06 a.m. UTC 
  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 <rasland@nvidia.com>
---
 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(-)

Comments

Slava Ovsiienko Nov. 19, 2020, 8:13 a.m. UTC | #1 
> -----Original Message-----
> From: Raslan Darawsheh <rasland@nvidia.com>
> Sent: Thursday, November 19, 2020 10:06
> To: dev@dpdk.org
> Cc: Matan Azrad <matan@nvidia.com>; Slava Ovsiienko
> <viacheslavo@nvidia.com>; stable@dpdk.org
> Subject: [PATCH] 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.
Extra space is here: "all  will".
Beside this:

Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

> 
> Fixes: 5fc66630bed5 ("net/mlx5: add ConnectX6-DX device ID")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Raslan Darawsheh <rasland@nvidia.com>
> ---
>  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 4b7fff4eff..9855bbe180 100644
> --- a/drivers/net/mlx5/linux/mlx5_os.c
> +++ b/drivers/net/mlx5/linux/mlx5_os.c
> @@ -2115,7 +2115,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.17.1
Raslan Darawsheh Nov. 19, 2020, 9:43 a.m. UTC | #2 
Hi Slava, thanks for your comments,

> -----Original Message-----
> From: Slava Ovsiienko <viacheslavo@nvidia.com>
> Sent: Thursday, November 19, 2020 10:13 AM
> To: Raslan Darawsheh <rasland@nvidia.com>; dev@dpdk.org
> Cc: Matan Azrad <matan@nvidia.com>; stable@dpdk.org
> Subject: RE: [PATCH] common/mlx5: fix name for ConnectX VF device ID
> 
> > -----Original Message-----
> > From: Raslan Darawsheh <rasland@nvidia.com>
> > Sent: Thursday, November 19, 2020 10:06
> > To: dev@dpdk.org
> > Cc: Matan Azrad <matan@nvidia.com>; Slava Ovsiienko
> > <viacheslavo@nvidia.com>; stable@dpdk.org
> > Subject: [PATCH] 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.
> Extra space is here: "all  will".
Sure, will fix during integration. 
> Beside this:
> 
> Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> 
> >
> > Fixes: 5fc66630bed5 ("net/mlx5: add ConnectX6-DX device ID")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Raslan Darawsheh <rasland@nvidia.com>
> > ---

Kindest regards,
Raslan Darawsheh
Raslan Darawsheh Nov. 19, 2020, 10:54 a.m. UTC | #3 
Hi,

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Raslan Darawsheh
> Sent: Thursday, November 19, 2020 10:06 AM
> To: dev@dpdk.org
> Cc: Matan Azrad <matan@nvidia.com>; Slava Ovsiienko
> <viacheslavo@nvidia.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] common/mlx5: fix name for ConnectX VF
> device ID
> 
> Starting ConnectX-6 Dx, the VF device ID is generic
> and not per chip.
> 
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpci-
> ids.ucw.cz%2Fv2.2%2Fpci.ids&amp;data=04%7C01%7Crasland%40nvidia.com
> %7C13be0db809fd48cf689a08d88c6214a3%7C43083d15727340c1b7db39efd9c
> cc17a%7C0%7C0%7C637413700176245747%7CUnknown%7CTWFpbGZsb3d8e
> yJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D
> %7C1000&amp;sdata=0AtUwe1GPUVmOvf32LHYzyayHx%2FF7Yb7QhZKg8VL
> LB4%3D&amp;reserved=0
> 101e  ConnectX Family mlx5Gen Virtual Function
> 
> This means that all  will have the same VF device ID.
Removed extra empty space from commit log,

> 
> Fixes: 5fc66630bed5 ("net/mlx5: add ConnectX6-DX device ID")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Raslan Darawsheh <rasland@nvidia.com>
> ---
>  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(-)
> 
Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh
diff mbox series

Patch

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 4b7fff4eff..9855bbe180 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2115,7 +2115,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,