From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 889C3A0524; Mon, 24 Feb 2020 09:59:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A3E441BFAA; Mon, 24 Feb 2020 09:59:43 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60070.outbound.protection.outlook.com [40.107.6.70]) by dpdk.org (Postfix) with ESMTP id 66258A3 for ; Mon, 24 Feb 2020 09:59:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gnLaTatjvp5mY8K4wnTZQwcBWHV8nWxHL0xe0O0VJyj1C98MSbtofhUyJkHedFYGmzujdF4LxsFjwtSsivCvQvbMxSL7RQL/W5DuQYJEkKxS7FPK23/x1EZyze/o8pTUon7TTlHcNJOu6Z0fswRfYT0SiZayN2GE7VeHWjA/HWp0TIoQxrAvKo4VhxU+VfHPn3FsfVhHmjSJNoPXNcGfQFMEQOBEtUo0qkT888xpJInC6qWKXw4ITK9V/xCtyZHkzXVFZzL3tecRe5u/zAU+dD8BynprGDxp+Q3pQVH7cl3KVUV3nz+jz7uEqXU7NHoyUV0zVTYH5Wnp+7UuzApG1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Zw9jU6uny68bb3g/PdQk1357XIQtuBZInfiuuUw5NAE=; b=WGZLMJU80NNeaFeZinAi/gkN8RmbLuvG7ofwPx+fWWauF1In4Tzspab6pzWMHM+F7AIgAuHPEGMslC3YNvWbUQcOMdwb9EmPFOVK+iP8UuClyv+7I7nl6YwtYSAO3FPogEvHcSlwX3t+cZzS3iAqtvt8IE+LvC9rVP6R/WLJ1ErxQET8aY0CIb2c2c8K+yzAbG7qdpb4ZAehFR9DO4QhhEr37vTWN0r/kTw6ZxQJdwGwCduVphotH1rTYrmwh+4IN8m/9yeb3nJNhsB+XBUcZjlbpMDGginSen4ktrsXeAdg0THArzulW53emH2A9z8xCPgmmizCCatFe9MoW3nU2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none 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=Zw9jU6uny68bb3g/PdQk1357XIQtuBZInfiuuUw5NAE=; b=Uo/+6okxLIML8xom2reh9zSxfo6ItMbtzmRHKIhZEHxky2dG4fcIQYoAJXOL9Op/fcYicZ3skzggQns4QzL0clNWnsAqwJxG8BsMO38xYcRD27qyv26c28k8uw0d8C7/bJeet9ink/AUwbEa0535MM6xh09op9cXWd6UjEnBUyQ= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (10.171.188.154) by AM4PR05MB3475.eurprd05.prod.outlook.com (10.171.186.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.21; Mon, 24 Feb 2020 08:59:40 +0000 Received: from AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::da5:7919:35c1:894]) by AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::da5:7919:35c1:894%6]) with mapi id 15.20.2750.021; Mon, 24 Feb 2020 08:59:40 +0000 From: Slava Ovsiienko To: Thomas Monjalon , "dev@dpdk.org" CC: Gal Cohen , Matan Azrad , Shahaf Shuler , John McNamara , Marko Kovacevic Thread-Topic: [PATCH] doc: fix naming of Mellanox devices Thread-Index: AQHV6MePIVUiKWE5wEGaKMZ3x5m8PagqD9SA Date: Mon, 24 Feb 2020 08:59:40 +0000 Message-ID: References: <20200221145927.345130-1-thomas@monjalon.net> In-Reply-To: <20200221145927.345130-1-thomas@monjalon.net> 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=viacheslavo@mellanox.com; x-originating-ip: [95.164.10.10] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 505f86f7-3c70-4149-7ced-08d7b907e219 x-ms-traffictypediagnostic: AM4PR05MB3475:|AM4PR05MB3475: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-forefront-prvs: 032334F434 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(136003)(346002)(376002)(396003)(366004)(199004)(189003)(186003)(26005)(52536014)(478600001)(53546011)(9686003)(6506007)(71200400001)(86362001)(55016002)(7696005)(2906002)(66446008)(5660300002)(66476007)(30864003)(76116006)(81156014)(8676002)(33656002)(81166006)(8936002)(66946007)(316002)(110136005)(54906003)(66556008)(64756008)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3475; H:AM4PR05MB3265.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: BCL:0; x-microsoft-antispam-message-info: lO6YEUfG5zFhStoFhenIKZW8RccguIzEqWnucBb0k0OI0TYVOHh8aicADj2ja+wDWeGEf//q1XQsNg17l+8bupKiW6XKH1Eq/cUkEqmwa7SzXdRh0t4sqqV/XXRSljeulDnX8oj+zMxHHgKt2dT6gi+kOiStuyqbGhcvViTXHJwqF1dQXAY/YDGWlO1lbikFrNnNltVOWqgqJhCuOUOvkLXuhyk2CQF9mb0Qq9W5eh26XXAXxorSvBZl1wvnP5mB+bcQX9jV6MwmjXZ7K+Mrk0RtG8cAdlf4b7xuux1VNHxOlG3n1Le1Z1s61dOJQsfFHW8nEJ87f//FhcOpuWgcp9VYuVHcTTnBvJWj/vXz3i4Qa/tgaN6Oh0Q3+NJ+MPR+nOrCVFuSoW/0FBro+B0dZNvjU2Jl+ecTB9z90AZgvOYimYlYN9nJVrKQAYOu/6dd x-ms-exchange-antispam-messagedata: zB338NqaqXIK6EJohGXrycqd324Gbxa9enD7hFqRtKzwJBBuBWAZWYfj6za3695b/IB0TRwhESMq6F307KWVO5F3vDUl/iaaPLykPhyuDBM0C6zZM1Y8NHwAFwidSQJDwohNf7nVn3vw0hhzepbS1w== 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: 505f86f7-3c70-4149-7ced-08d7b907e219 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Feb 2020 08:59:40.4535 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: BYhhW+CcegyJWxJMX8+5DpmwcDPeIywpkGjytg85VDb4MZckB6BuVBs+fSTAGoFP5lo4YU3J40fGOZIhBB5+uaehmfCTUJnccwHDa4j6b0w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3475 Subject: Re: [dpdk-dev] [PATCH] doc: fix naming of Mellanox devices X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: Thomas Monjalon > Sent: Friday, February 21, 2020 16:59 > To: dev@dpdk.org > Cc: Gal Cohen ; Matan Azrad ; > Shahaf Shuler ; Slava Ovsiienko > ; John McNamara ; > Marko Kovacevic > Subject: [PATCH] doc: fix naming of Mellanox devices >=20 > The devices of the family ConnectX may have two letters as suffix. > Such suffix is preceded with a space and the second x is lowercase: > - ConnectX-4 Lx > - ConnectX-5 Ex > - ConnectX-6 Dx >=20 > Uppercase of the device family name BlueField is also fixed. >=20 > Signed-off-by: Thomas Monjalon Acked-by: Viacheslav Ovsiienko > --- > config/common_base | 4 ++-- > doc/guides/nics/mlx5.rst | 24 ++++++++++++------------ > doc/guides/rel_notes/release_18_08.rst | 2 +- > doc/guides/rel_notes/release_19_02.rst | 2 +- > doc/guides/rel_notes/release_19_11.rst | 2 +- > doc/guides/vdpadevs/mlx5.rst | 6 +++--- > drivers/net/mlx5/mlx5.c | 2 +- > drivers/net/mlx5/mlx5_rxtx.c | 2 +- > drivers/net/mlx5/mlx5_txq.c | 2 +- > 9 files changed, 23 insertions(+), 23 deletions(-) >=20 > diff --git a/config/common_base b/config/common_base index > 6ea9c63cc3..7ca2f28b19 100644 > --- a/config/common_base > +++ b/config/common_base > @@ -361,13 +361,13 @@ CONFIG_RTE_LIBRTE_MLX4_DEBUG=3Dn >=20 > # > # Compile burst-oriented Mellanox ConnectX-4, ConnectX-5, -# ConnectX-6 = & > Bluefield (MLX5) PMD > +# ConnectX-6 & BlueField (MLX5) PMD > # > CONFIG_RTE_LIBRTE_MLX5_PMD=3Dn > CONFIG_RTE_LIBRTE_MLX5_DEBUG=3Dn >=20 > # > -# Compile vdpa-oriented Mellanox ConnectX-6 & Bluefield (MLX5) PMD > +# Compile vdpa-oriented Mellanox ConnectX-6 & BlueField (MLX5) PMD > # > CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=3Dn >=20 > diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index > 5ab7c07165..748a87d8f3 100644 > --- a/doc/guides/nics/mlx5.rst > +++ b/doc/guides/nics/mlx5.rst > @@ -7,7 +7,7 @@ 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**, **Mellanox ConnectX-6**, **Mellanox ConnectX-6DX** and > +ConnectX-5**, **Mellanox ConnectX-6**, **Mellanox ConnectX-6 Dx** 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 > @@ -324,9 +324,9 @@ Run-time configuration >=20 > Supported on: >=20 > - - x86_64 with ConnectX-4, ConnectX-4 LX, ConnectX-5, ConnectX-6, > ConnectX-6 DX > + - x86_64 with ConnectX-4, ConnectX-4 Lx, ConnectX-5, ConnectX-6, > + ConnectX-6 Dx > and BlueField. > - - POWER9 and ARMv8 with ConnectX-4 LX, ConnectX-5, ConnectX-6, > ConnectX-6 DX > + - POWER9 and ARMv8 with ConnectX-4 Lx, ConnectX-5, ConnectX-6, > + ConnectX-6 Dx > and BlueField. >=20 > - ``rxq_cqe_pad_en`` parameter [int] > @@ -357,9 +357,9 @@ Run-time configuration >=20 > Supported on: >=20 > - - x86_64 with ConnectX-4, ConnectX-4 LX, ConnectX-5, ConnectX-6, > ConnectX-6 DX > + - x86_64 with ConnectX-4, ConnectX-4 Lx, ConnectX-5, ConnectX-6, > + ConnectX-6 Dx > and BlueField. > - - POWER8 and ARMv8 with ConnectX-4 LX, ConnectX-5, ConnectX-6, > ConnectX-6 DX > + - POWER8 and ARMv8 with ConnectX-4 Lx, ConnectX-5, ConnectX-6, > + ConnectX-6 Dx > and BlueField. >=20 > - ``mprq_en`` parameter [int] > @@ -462,14 +462,14 @@ Run-time configuration > If ``txq_inline_min`` key is not present, the value may be queried by = the > driver from the NIC via DevX if this feature is available. If there is= no DevX > enabled/supported the value 18 (supposing L2 header including VLAN) is= set > - for ConnectX-4 and ConnectX-4LX, and 0 is set by default for ConnectX-= 5 > + for ConnectX-4 and ConnectX-4 Lx, and 0 is set by default for > + ConnectX-5 > and newer NICs. If packet is shorter the ``txq_inline_min`` value, the= entire > packet is inlined. >=20 > For ConnectX-4 NIC, driver does not allow specifying value below 18 > (minimal L2 header, including VLAN), error will be raised. >=20 > - For ConnectX-4LX NIC, it is allowed to specify values below 18, but > + For ConnectX-4 Lx NIC, it is allowed to specify values below 18, but > it is not recommended and may prevent NIC from sending packets over > some configurations. >=20 > @@ -552,7 +552,7 @@ Run-time configuration > - ``txq_mpw_en`` parameter [int] >=20 > A nonzero value enables Enhanced Multi-Packet Write (eMPW) for > ConnectX-5, > - ConnectX-6, ConnectX-6 DX and BlueField. eMPW allows the TX burst > function to pack > + ConnectX-6, ConnectX-6 Dx and BlueField. eMPW allows the TX burst > + function to pack > up multiple packets in a single descriptor session in order to save PC= I > bandwidth > and improve performance at the cost of a slightly higher CPU usage. Wh= en > ``txq_inline_mpw`` is set along with ``txq_mpw_en``, TX burst function > copies @@ -598,7 +598,7 @@ Run-time configuration >=20 > - ``tx_vec_en`` parameter [int] >=20 > - A nonzero value enables Tx vector on ConnectX-5, ConnectX-6, ConnectX-= 6 > DX > + A nonzero value enables Tx vector on ConnectX-5, ConnectX-6, > + ConnectX-6 Dx > and BlueField NICs if the number of global Tx queues on the port is le= ss > than > ``txqs_max_vec``. The parameter is deprecated and ignored. >=20 > @@ -899,7 +899,7 @@ Mellanox OFED/EN > - ConnectX-5: **16.21.1000** and above. > - ConnectX-5 Ex: **16.21.1000** and above. > - ConnectX-6: **20.99.5374** and above. > - - ConnectX-6 DX: **22.27.0090** and above. > + - ConnectX-6 Dx: **22.27.0090** and above. > - BlueField: **18.25.1010** and above. >=20 > While these libraries and kernel modules are available on OpenFabrics @@= - > 944,8 +944,8 @@ Supported NICs > * Mellanox(R) ConnectX(R)-5 100G MCX556A-ECAT (2x100G) > * Mellanox(R) ConnectX(R)-5 Ex EN 100G MCX516A-CDAT (2x100G) > * Mellanox(R) ConnectX(R)-6 200G MCX654106A-HCAT (4x200G) > -* Mellanox(R) ConnectX(R)-6DX EN 100G MCX623106AN-CDAT (2*100g) > -* Mellanox(R) ConnectX(R)-6DX EN 200G MCX623105AN-VDAT (1*200g) > +* Mellanox(R) ConnectX(R)-6 Dx EN 100G MCX623106AN-CDAT (2*100g) > +* Mellanox(R) ConnectX(R)-6 Dx EN 200G MCX623105AN-VDAT (1*200g) >=20 > Quick Start Guide on OFED/EN > ---------------------------- > diff --git a/doc/guides/rel_notes/release_18_08.rst > b/doc/guides/rel_notes/release_18_08.rst > index 8a09dee95c..4ae388c331 100644 > --- a/doc/guides/rel_notes/release_18_08.rst > +++ b/doc/guides/rel_notes/release_18_08.rst > @@ -546,4 +546,4 @@ Tested Platforms > * Mellanox MLNX_OFED 4.2-1.4.21.0 >=20 > * DPDK application running on ARM cores inside SmartNIC > - * Bluefield representors support planned for next release. > + * BlueField representors support planned for next release. > diff --git a/doc/guides/rel_notes/release_19_02.rst > b/doc/guides/rel_notes/release_19_02.rst > index ace1534eff..87dfbf5c7d 100644 > --- a/doc/guides/rel_notes/release_19_02.rst > +++ b/doc/guides/rel_notes/release_19_02.rst > @@ -109,7 +109,7 @@ New Features > ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` for make and ``ibverbs_link`` for > meson. > * Added static linkage of ``mlx`` dependency. > * Improved stability of E-Switch flow driver. > - * Added new make build configuration to set the cacheline size for Blu= efield > + * Added new make build configuration to set the cacheline size for > + BlueField > correctly - ``arm64-bluefield-linux-gcc``. >=20 > * **Updated the enic driver.** > diff --git a/doc/guides/rel_notes/release_19_11.rst > b/doc/guides/rel_notes/release_19_11.rst > index 84aa03a1f2..f0aee29477 100644 > --- a/doc/guides/rel_notes/release_19_11.rst > +++ b/doc/guides/rel_notes/release_19_11.rst > @@ -206,7 +206,7 @@ New Features > * Added support for VLAN set VID offload command. > * Added support for matching on packets withe Geneve tunnel header. > * Added hairpin support. > - * Added ConnectX6-DX support. > + * Added ConnectX-6 Dx support. > * Flow engine selected based on RDMA Core library version. > DV flow engine selected if version is rdma-core-24.0 or higher. > Verbs flow engine selected otherwise. > diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst > index ce7c8a7415..cf878e1917 100644 > --- a/doc/guides/vdpadevs/mlx5.rst > +++ b/doc/guides/vdpadevs/mlx5.rst > @@ -6,7 +6,7 @@ MLX5 vDPA driver >=20 > The MLX5 vDPA (vhost data path acceleration) driver library > (**librte_pmd_mlx5_vdpa**) provides support for **Mellanox ConnectX-6**, > -**Mellanox ConnectX-6DX** and **Mellanox BlueField** families of > +**Mellanox ConnectX-6 Dx** 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 > @@ -49,8 +49,8 @@ Supported NICs > -------------- >=20 > * Mellanox(R) ConnectX(R)-6 200G MCX654106A-HCAT (4x200G) > -* Mellanox(R) ConnectX(R)-6DX EN 100G MCX623106AN-CDAT (2*100G) > -* Mellanox(R) ConnectX(R)-6DX EN 200G MCX623105AN-VDAT (1*200G) > +* Mellanox(R) ConnectX(R)-6 Dx EN 100G MCX623106AN-CDAT (2*100G) > +* Mellanox(R) ConnectX(R)-6 Dx EN 200G MCX623105AN-VDAT (1*200G) > * Mellanox(R) BlueField SmartNIC 25G MBF1M332A-ASCAT (2*25G) >=20 > Prerequisites > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index > 4803760cab..94aaa60579 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -1724,7 +1724,7 @@ mlx5_init_once(void) > * key is specified in devargs > * - if DevX is enabled the inline mode is queried from the > * device (HCA attributes and NIC vport context if needed). > - * - otherwise L2 mode (18 bytes) is assumed for ConnectX-4/4LX > + * - otherwise L2 mode (18 bytes) is assumed for ConnectX-4/4 Lx > * and none (0 bytes) for other NICs > * > * @param spawn > diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c = index > 2b4fc2ae06..5ac63da803 100644 > --- a/drivers/net/mlx5/mlx5_rxtx.c > +++ b/drivers/net/mlx5/mlx5_rxtx.c > @@ -5213,7 +5213,7 @@ MLX5_TXOFF_DECL(iv, >=20 > /* > * Generate routines with Legacy Multi-Packet Write support. > - * This mode is supported by ConnectX-4LX only and imposes > + * This mode is supported by ConnectX-4 Lx only and imposes > * offload limitations, not supported: > * - ACL/Flows (metadata are becoming meaningless) > * - WQE Inline headers > diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c in= dex > 2ad849a229..57bc116450 100644 > --- a/drivers/net/mlx5/mlx5_txq.c > +++ b/drivers/net/mlx5/mlx5_txq.c > @@ -983,7 +983,7 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl) > * If there is requested minimal amount of data to inline > * we MUST enable inlining. This is a case for ConnectX-4 > * which usually requires L2 inlined for correct operating > - * and ConnectX-4LX which requires L2-L4 inlined to > + * and ConnectX-4 Lx which requires L2-L4 inlined to > * support E-Switch Flows. > */ > if (inlen_mode) { > -- > 2.25.0