From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <shahafs@mellanox.com>
Received: from EUR02-HE1-obe.outbound.protection.outlook.com
 (mail-eopbgr10060.outbound.protection.outlook.com [40.107.1.60])
 by dpdk.org (Postfix) with ESMTP id AB9241B0FF
 for <dev@dpdk.org>; Tue,  1 Jan 2019 06:51:59 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;
 s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=dF2AhKrT/e7fxHLTugoyPqgv5ZgkcTDMdPEwhxWPSac=;
 b=oPPbtPKXNhBTywNkUsfNXx5TH5wX3ekvluGVu9ziDDqLO+mFe2oNiArxDh9jLHHDe1WZFzP1Hyi50qID+r3flfpf4lqAu1X2ag8SLDr9ijhTCB7520NhpA85OB/WA0V3n1qwDAr9GekT0S0GKV58SNQiBJ0SYY3/mmASSdyS3v0=
Received: from DB7PR05MB4426.eurprd05.prod.outlook.com (52.134.109.15) by
 DB7PR05MB4825.eurprd05.prod.outlook.com (20.176.235.81) with Microsoft SMTP
 Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 15.20.1471.20; Tue, 1 Jan 2019 05:51:57 +0000
Received: from DB7PR05MB4426.eurprd05.prod.outlook.com
 ([fe80::b0a0:72a4:7547:1c3c]) by DB7PR05MB4426.eurprd05.prod.outlook.com
 ([fe80::b0a0:72a4:7547:1c3c%4]) with mapi id 15.20.1471.019; Tue, 1 Jan 2019
 05:51:56 +0000
From: Shahaf Shuler <shahafs@mellanox.com>
To: Wisam Monther <wisamm@mellanox.com>
CC: "dev@dpdk.org" <dev@dpdk.org>
Thread-Topic: [PATCH v2] net/mlx5: add ConnectX-6 device IDs
Thread-Index: AQHUoQZ5I6iu/GRCLECUWc4KYcCEuqWZ6YwQ
Date: Tue, 1 Jan 2019 05:51:56 +0000
Message-ID: <DB7PR05MB44267C428980661C84370605C3B30@DB7PR05MB4426.eurprd05.prod.outlook.com>
References: <1546260214-10064-1-git-send-email-wisamm@mellanox.com>
In-Reply-To: <1546260214-10064-1-git-send-email-wisamm@mellanox.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
authentication-results: spf=none (sender IP is )
 smtp.mailfrom=shahafs@mellanox.com; 
x-originating-ip: [31.154.10.105]
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1; DB7PR05MB4825;
 6:H8AIedKsExNr74uOnzBJK8XrBMR2tbkhHHg9yQvsawxUrqrqdDxtvzcCiKY8ojndGekZtH4kfF9Td0luMPU8jUeBS/50bswydtkaAOnTP3KhsTDMPsGg9lYqcL8yhebr3kH67Ak4eHZ3/0vxNKZKM6sd002gkW61OplpZluujIz61JR9ZFZHGIs8krmtj626YXaKSZm5NPuD9AW+UR6JAjb2crE3plTYAl63ppnqbAEMUtJ0W7gY6R5DIX/NEPW9CyU/r+cQD56jcGp7WwEx55ViDUHz4LtnZjyvvGYu9Im0w7a0NP0BYJTWgeDhkhNtLA8U5h25CijT0JIjGDsqWwx2mQpfSOLT8Q72PjLgUpdYxGUYwtOMLgy54qxnMTT9arfPQ6rWRnmxHhgDuliChveF4W5u15mXSCWDOvlWMG75UPs/uEGv4Zb48PnJkU76ZqWs9/s/IgKqONVOeYtArQ==;
 5:lNS5G/1gnw4luj3c6gL9qc9slIxV3pVwyJAutRGEdpG1XnrWOGY8yKc0bN4mwIU4rrZSrsiPp4mVCE0017hRgztqaGd1DrTt6Bs3Q4OzWBQul0eVYW8tVgFVAnDqE+XsirfIQdQ/YVVZVdGVIUYtYyTVW9VyL2Z4d/+luvMznA0=;
 7:GvHbwbRTu3oJre2Kisq8wJ+tHWpNiOe5W2cNA2EZC4S8t5dbAI9gI+4wJZe+rvH5A+8JZyEXD/D4MJOFZZzhlGMjilr0cmnnAmrQ8QPou50cCmIet0j4QZBt7NatcK/8T9Rl9Pfu1ZYwTU8y2d3O/w==
x-ms-exchange-antispam-srfa-diagnostics: SOS;
x-ms-office365-filtering-correlation-id: fa1779c0-57fc-41bb-6745-08d66fad3d68
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0; PCL:0;
 RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);
 SRVR:DB7PR05MB4825; 
x-ms-traffictypediagnostic: DB7PR05MB4825:
x-microsoft-antispam-prvs: <DB7PR05MB4825BC140866B03556C56885C3B30@DB7PR05MB4825.eurprd05.prod.outlook.com>
x-exchange-antispam-report-cfa-test: BCL:0; PCL:0;
 RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(10201501046)(3231475)(944501520)(52105112)(3002001)(93006095)(93001095)(6055026)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051)(76991095);
 SRVR:DB7PR05MB4825; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4825; 
x-forefront-prvs: 0904004ECB
x-forefront-antispam-report: SFV:NSPM;
 SFS:(10009020)(39860400002)(376002)(346002)(366004)(396003)(136003)(199004)(189003)(68736007)(55016002)(2906002)(6116002)(5660300001)(9686003)(6506007)(74316002)(76176011)(316002)(11346002)(446003)(26005)(86362001)(6246003)(6306002)(3846002)(53936002)(102836004)(186003)(25786009)(8936002)(256004)(71190400001)(71200400001)(6636002)(19627235002)(66066001)(4326008)(476003)(81156014)(478600001)(81166006)(8676002)(6862004)(229853002)(486006)(305945005)(6436002)(105586002)(7736002)(106356001)(97736004)(14454004)(99286004)(7696005)(14444005)(33656002);
 DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4825;
 H:DB7PR05MB4426.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en;
 PTR:InfoNoRecords; A:1; MX:1; 
received-spf: None (protection.outlook.com: mellanox.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: 9zGoIVECLJXpbetQQa8DIOYKdydAjos/ir3Yycgw8UaLEzNH+2Ght/Yayk7d98HOEfub5z8abeHjRFPLwaOZoZMaJGNKzvq1/fyJbPDOb2QSnpPCbL9H9soUslRyOxsje6JBinA1YOarCf+MQmySXBwoUjhYpIk3qLHW4NM5mY7LZXxMawWK8uXAkgOX9cCDuxpEs5plI33qTvLfuMG4X7nQE/LY4XNwH8lRU23skHP3YKDTPkufg06pf77n0bWgB6e7YaqKZ6trM2Chsbocx6kfNCsSkvm+uHhPT6k9TEkRkJUEPYJ6A8MvOUxuCYwY
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fa1779c0-57fc-41bb-6745-08d66fad3d68
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Jan 2019 05:51:56.8150 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4825
Subject: Re: [dpdk-dev] [PATCH v2] net/mlx5: add ConnectX-6 device IDs
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jan 2019 05:52:00 -0000

Monday, December 31, 2018 2:44 PM, Wisam Monther:
> Subject: [PATCH v2] net/mlx5: add ConnectX-6 device IDs
>=20
> This commit includes the add of:
> - ConnectX-6 device ID
> - ConnectX-6 SRIOV device ID
>=20
> Signed-off-by: Wisam Jaddo <wisamm@mellanox.com>

Pay attention your singed-of name is different than the author name of the =
patch. They must be the same.
You probably would want to update your git config.=20

With updating the signed-of-by to Wisam Monther, applied to next-net-mlx, t=
hanks.=20

> ---
>=20
> Changes in  v2:
>     - Updated mlx5 docs to include ConnectX-6 product.
>     - Add ConnectX-6 virtual function device as well.
>=20
>  config/common_base       |  4 ++--
>  doc/guides/nics/mlx5.rst | 32 +++++++++++++++++---------------
> drivers/net/mlx5/mlx5.c  |  8 ++++++++  drivers/net/mlx5/mlx5.h  |  2 ++
>  4 files changed, 29 insertions(+), 17 deletions(-)
>=20
> diff --git a/config/common_base b/config/common_base index
> 0e3f900..964a695 100644
> --- a/config/common_base
> +++ b/config/common_base
> @@ -323,8 +323,8 @@ CONFIG_RTE_LIBRTE_MLX4_DEBUG=3Dn
> CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS=3Dn
>=20
>  #
> -# Compile burst-oriented Mellanox ConnectX-4, ConnectX-5 & Bluefield -#
> (MLX5) PMD
> +# Compile burst-oriented Mellanox ConnectX-4, ConnectX-5, # ConnectX-6
> +& Bluefield (MLX5) PMD
>  #
>  CONFIG_RTE_LIBRTE_MLX5_PMD=3Dn
>  CONFIG_RTE_LIBRTE_MLX5_DEBUG=3Dn
> diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index
> 2c516fe..add8bc1 100644
> --- a/doc/guides/nics/mlx5.rst
> +++ b/doc/guides/nics/mlx5.rst
> @@ -7,8 +7,9 @@ MLX5 poll mode driver
>=20
>  The MLX5 poll mode driver library (**librte_pmd_mlx5**) provides support
> for **Mellanox ConnectX-4**, **Mellanox ConnectX-4 Lx** , **Mellanox
> -ConnectX-5** and **Mellanox Bluefield** families of 10/25/40/50/100 Gb/s=
 -
> adapters as well as their virtual functions (VF) in SR-IOV context.
> +ConnectX-5**, **Mellanox ConnectX-6** and **Mellanox Bluefield**
> +families of 10/25/40/50/100/200 Gb/s adapters as well as their virtual
> +functions (VF) in SR-IOV context.
>=20
>  Information and documentation about these adapters can be found on the
> `Mellanox website <http://www.mellanox.com>`__. Help is also provided by =
the
> @@ -274,8 +275,8 @@ Run-time configuration
>=20
>    Supported on:
>=20
> -  - x86_64 with ConnectX-4, ConnectX-4 LX, ConnectX-5 and Bluefield.
> -  - POWER8 and ARMv8 with ConnectX-4 LX, ConnectX-5 and Bluefield.
> +  - x86_64 with ConnectX-4, ConnectX-4 LX, ConnectX-5, ConnectX-6 and
> Bluefield.
> +  - POWER8 and ARMv8 with ConnectX-4 LX, ConnectX-5, ConnectX-6 and
> Bluefield.
>=20
>  - ``rxq_cqe_pad_en`` parameter [int]
>=20
> @@ -359,13 +360,13 @@ Run-time configuration
>=20
>    This option should be used in combination with ``txq_inline`` above.
>=20
> -  On ConnectX-4, ConnectX-4 LX, ConnectX-5 and Bluefield without
> +  On ConnectX-4, ConnectX-4 LX, ConnectX-5, ConnectX-6 and Bluefield
> + without
>    Enhanced MPW:
>=20
>          - Disabled by default.
>          - In case ``txq_inline`` is set recommendation is 4.
>=20
> -  On ConnectX-5 and Bluefield with Enhanced MPW:
> +  On ConnectX-5, ConnectX-6 and Bluefield with Enhanced MPW:
>=20
>          - Set to 8 by default.
>=20
> @@ -386,7 +387,7 @@ Run-time configuration
>  - ``txq_mpw_en`` parameter [int]
>=20
>    A nonzero value enables multi-packet send (MPS) for ConnectX-4 Lx and
> -  enhanced multi-packet send (Enhanced MPS) for ConnectX-5 and Bluefield=
.
> +  enhanced multi-packet send (Enhanced MPS) for ConnectX-5, ConnectX-6
> and Bluefield.
>    MPS allows the TX burst function to pack up multiple packets in a
>    single descriptor session in order to save PCI bandwidth and improve
>    performance at the cost of a slightly higher CPU usage. When @@ -401,1=
3
> +402,13 @@ Run-time configuration
>    DEV_TX_OFFLOAD_VXLAN_TNL_TSO, DEV_TX_OFFLOAD_GRE_TNL_TSO,
> DEV_TX_OFFLOAD_VLAN_INSERT``.
>    When those offloads are requested the MPS send function will not be us=
ed.
>=20
> -  It is currently only supported on the ConnectX-4 Lx, ConnectX-5 and Bl=
uefield
> +  It is currently only supported on the ConnectX-4 Lx, ConnectX-5,
> + ConnectX-6 and Bluefield
>    families of adapters.
>    On ConnectX-4 Lx the MPW is considered un-secure hence disabled by
> default.
>    Users which enable the MPW should be aware that application which
> provides incorrect
>    mbuf descriptors in the Tx burst can lead to serious errors in the hos=
t
> including, on some cases,
>    NIC to get stuck.
> -  On ConnectX-5 and Bluefield the MPW is secure and enabled by default.
> +  On ConnectX-5, ConnectX-6 and Bluefield the MPW is secure and enabled =
by
> default.
>=20
>  - ``txq_mpw_hdr_dseg_en`` parameter [int]
>=20
> @@ -427,14 +428,14 @@ Run-time configuration
>=20
>  - ``tx_vec_en`` parameter [int]
>=20
> -  A nonzero value enables Tx vector on ConnectX-5 and Bluefield NICs if =
the
> number of
> +  A nonzero value enables Tx vector on ConnectX-5, ConnectX-6 and
> + Bluefield NICs if the number of
>    global Tx queues on the port is less than ``txqs_max_vec``.
>=20
>    This option cannot be used with certain offloads such as
> ``DEV_TX_OFFLOAD_TCP_TSO,
>    DEV_TX_OFFLOAD_VXLAN_TNL_TSO, DEV_TX_OFFLOAD_GRE_TNL_TSO,
> DEV_TX_OFFLOAD_VLAN_INSERT``.
>    When those offloads are requested the MPS send function will not be us=
ed.
>=20
> -  Enabled by default on ConnectX-5 and Bluefield.
> +  Enabled by default on ConnectX-5, ConnectX-6 and Bluefield.
>=20
>  - ``rx_vec_en`` parameter [int]
>=20
> @@ -518,7 +519,7 @@ DPDK and must be installed separately:
>  - **libmlx5**
>=20
>    Low-level user space driver library for Mellanox
> -  ConnectX-4/ConnectX-5/Bluefield devices, it is automatically loaded
> +  ConnectX-4/ConnectX-5/ConnectX-6/Bluefield devices, it is
> + automatically loaded
>    by libibverbs.
>=20
>    This library basically implements send/receive calls to the hardware @=
@ -
> 540,7 +541,7 @@ DPDK and must be installed separately:
>    their devices:
>=20
>    - mlx5_core: hardware driver managing Mellanox
> -    ConnectX-4/ConnectX-5/Bluefield devices and related Ethernet kernel
> +    ConnectX-4/ConnectX-5/ConnectX-6/Bluefield devices and related
> + Ethernet kernel
>      network devices.
>    - mlx5_ib: InifiniBand device driver.
>    - ib_uverbs: user space driver for Verbs (entry point for libibverbs).
> @@ -548,7 +549,7 @@ DPDK and must be installed separately:
>  - **Firmware update**
>=20
>    Mellanox OFED releases include firmware updates for
> -  ConnectX-4/ConnectX-5/Bluefield adapters.
> +  ConnectX-4/ConnectX-5/ConnectX-6/Bluefield adapters.
>=20
>    Because each release provides new features, these updates must be appl=
ied
> to
>    match the kernel modules and libraries they come with.
> @@ -589,6 +590,7 @@ Mellanox OFED
>    - ConnectX-4 Lx: **14.21.1000** and above.
>    - ConnectX-5: **16.21.1000** and above.
>    - ConnectX-5 Ex: **16.21.1000** and above.
> +  - ConnectX-6: **20.99.5374** and above.
>    - Bluefield: **18.99.3950** and above.
>=20
>  While these libraries and kernel modules are available on OpenFabrics @@=
 -
> 820,7 +822,7 @@ Usage example
>  -------------
>=20
>  This section demonstrates how to launch **testpmd** with Mellanox -
> ConnectX-4/ConnectX-5/Bluefield devices managed by librte_pmd_mlx5.
> +ConnectX-4/ConnectX-5/ConnectX-6/Bluefield devices managed by
> librte_pmd_mlx5.
>=20
>  #. Load the kernel modules:
>=20
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index
> 9e5cab1..4521045 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -1586,6 +1586,14 @@ static const struct rte_pci_id mlx5_pci_id_map[] =
=3D {
>  			       PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF)
>  	},
>  	{
> +		RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
> +				PCI_DEVICE_ID_MELLANOX_CONNECTX6)
> +	},
> +	{
> +		RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
> +				PCI_DEVICE_ID_MELLANOX_CONNECTX6VF)
> +	},
> +	{
>  		.vendor_id =3D 0
>  	}
>  };
> diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index
> b2fe5cb..b48cd94 100644
> --- a/drivers/net/mlx5/mlx5.h
> +++ b/drivers/net/mlx5/mlx5.h
> @@ -52,6 +52,8 @@ enum {
>  	PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF =3D 0x101a,
>  	PCI_DEVICE_ID_MELLANOX_CONNECTX5BF =3D 0xa2d2,
>  	PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF =3D 0xa2d3,
> +	PCI_DEVICE_ID_MELLANOX_CONNECTX6 =3D 0x101b,
> +	PCI_DEVICE_ID_MELLANOX_CONNECTX6VF =3D 0x101c,
>  };
>=20
>  /** Switch information returned by mlx5_nl_switch_info(). */
> --
> 2.7.4