From patchwork Thu May 12 17:06:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111077 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7D822A00C3; Thu, 12 May 2022 19:07:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5A8A42841; Thu, 12 May 2022 19:07:11 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id 7688342831 for ; Thu, 12 May 2022 19:07:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XnXoTLTcE1W2hw9DHBplkABmb6OistrMoOlWU3ky1fMImyhd5lZxdBtKPlIzc/NBg8v1szyr/hR/SexC4EHdoUafmgVYs7VlL7XlAJsYsBb0EGvU7bh1qlLxg415Pg1yfw/c53Q9xyWkEN0SbcvXQQhn3Vk384uDm09syEHOjsJdmduANUDHUC+hVCyAqssi/Zj56MMwO/5lS2jL0bmKgD76TXHWyoDy0Z63tq0r0QzOVWFL9dzZ6s7pBpRyr0gUdXB83zhyvBIAvAOEHBZjAI8dD8UbrHRoCarBkmjYGp+4Pq8uWdRU62WZjngl+L1PZcczW+M8LXAX5oTA1NbDrw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pWfLjTyqvPyLcKeNvdyDR7w6tiuAfXiJvBwJkV2iHnc=; b=oX6ECqg6JrDFs/BJuA+zkLopILmsUiEhnACtFu78HXVL74LYFIS1/w3dOvs98ocOxohbQrQPXaRqCweYYmp0ihmyziEK/dxbN2hK9rj/ZRrbncM8MTRzPLwvd3u7jJRhkS5zLfXyfOmlM8/WgUn1Ylme9wsbDL1Zhp6lWBop7BEmgpbPos49xPUw0QBJ0lYnNLVHWyaq7K0aSQUBiux9eIDoEPgp6hvScLfhyvxaT6qmRY5KLvJgpuq+S8WaG01WZr8yx6gQTyh0maCh58cAzRlj1TpuTPv/MxzI9i/KjnpINHS1kv3O4VqKtAdMtR3lsI/iDxEn5mMmHL2N5hN2Mw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pWfLjTyqvPyLcKeNvdyDR7w6tiuAfXiJvBwJkV2iHnc=; b=f6JIOYYVC+bR/6OnQr0wMUqoCPMGJ3W+uowZHYUnSLLDBiAkXR8JR4aG4ysU0dz/P6WWoCJT9ng0UGfhXXG7VP7i0zQ2LuEGZsfgozj1TbInOo5zEj6HlZKiBalg+9p4u5EYXeL6ldHZBVK+UkxDwLFR3jU58o+ZJmxdVBKgyPw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May 2022 17:07:04 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:04 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 4/8] net/vmxnet3: report HW version on FW version get Date: Thu, 12 May 2022 13:06:38 -0400 Message-Id: <20220512170642.28930-5-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54a69b24-cd28-4067-b399-08da3439d5ab X-MS-TrafficTypeDiagnostic: BL0PR05MB4721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1kc17Nfdy/bFhHvhlC3/fjI/EkVcMx5PenmadSXF1G765cXEIY9ImY+naxnXTvfKMlrnGWJk3eQa57JlEdw6HuRrr37nDdoLNxl5s28OCkRtlP98Opz9fY4+zR7KarychGHApzAofIo+gFN1cKltlzlASg2ZTmB2CRUmmW0HGux5aZkiwiBmmf5KNSrNa3Ad6gudNDGwTsbBDd1+LpjD8ZDRXL89JaS6FoQS/eiLcgv5pR27hZWGl7FQ8GiwtWUHW1Ss5bVMfkATMAUX6Lt+oVx3xceqdKB1uvZX4CVHrh4LgRl1woGwK9EPAFVBGDldJfR59xCN8WSkzMutwnnvJ2N55hDlF638OzBQ7tTDUxG6zvHgDQDhf5t8v3hQJ8JPavxwh1Dk6Es2n5hRVraIS2GX+3b4cGFI3bYKZcxjXpbxvP5zXVKFbAZs9SU/0QKSQ5CIKCcyIwA4k7XLS6XDzLqRt4fmqsazUfCxnAxl/zySzzybxS9jbsnznJYghZbJo5q8fcAxwJeSGr55bjq6//miTUisqcODdh9I95QLuiMgmITwqLtHk9yWZWWCOYfAdJWWrM+eMrqVJH7BWgt1Rp8gz2U7FrPpnYy+nWSpmwPZfu8HGfv/3CheclN7m9jr1FIdudtCaiI0UpQWZKwGwpkdXVqBJdhtzwOOci+Ya7RxrS7O5rv38VfL/4Wpigowscpo9qp0wS/eYPsqB7HhEw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(36756003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: soMyx+MX4TSuLGllY0WbFDC2tIZBLeg6jEo9NLCDqgXaWoDydunOxYwi5mKKipDyMQkFfQQNJNbTM4WPz5yzXpdinROpJ6lJY3XXi0rHcQkzVMJr2pL9LHOO7/rf4B9oZTj4v+216qo+3JJlUX6ZmVDF6+vEB/vxyjTn9On0PAYvtx/7kBgTKOaiKyXbWx2xCgVjqJcNr+3EULEWvzB1sCwM3CIo6iAXzmEHC0hkLqGSfpC/ExGFM4oizWsoFt/Kbis+u2QbxTIqVilK8HBeY2DtMNPtaPd0uAC1WtzTNwlhxsFO/1HGUZ+uUNtXYkGbK7T+eXzhB8jns9k88e1FSJ/6rJ0EejBFYlmCyGAB0ORTc/CJq8qFbTZD85th4rm8c6StWUcrrJlGvKkWnHq1JdxETmz3eoKxBjvhUQQRs5X6M2B+DkL6zQ6OlPm6w/7SBSPEMvY3u1XUj4DZEjth/0jo+xsc3Y4X1aNscI62BX5PEFwhZReC83LWG3gFGlTvK0YQqxzGwDUWaPaQzU6kEAE5j/VU2pp2lT7sWwkFTk8vxqUsgj8dfJdMwLKv+Lzjz9H9I2V2YsBXM41irK6ndf11iIg/ODlC63QVkMh5f73zjudvBlno56C5hhkcZ+uEu45y2ffONlOfsYAGhn3Sy2KdzaqkUOnYCWrm4+dT6SbewGPq2qDWuF4tEDnkw8FcpAMDGDD8JlT1iRyuzhnM82R7zcazrOWjmsAq1gS+ElVFdB1qnwNZ3IZnty6+9biJgPMvCB5TN5YkK6SanC4b0UUTmai+PRR8hHZDi1OCgHByrRpZz4KA+17nhtJRgEG60rHafmwLF3MNPB0iZchfm37pUyTlpjc2ZYDTJiYcARpH+JiQr7R6vYQX9vu4GG7UCtaaJhObNFR7KN/ETxDfBl7oJryUFZ5QzcMohAmhuZiR38Va8Pv2EXWulKvzAY+HxGybLe40cM3iqlLFBeNkzhrcb+UHjsN2n367VkuaLm1zIAzmTUqo07JjIAX7hy8edAfx5bRrkD4sgm7loTM5HbrduLKnbip0zRsiZlL+oMB1xPyanesMrXgjNn/6q5jLUwbZjLcb8KVpnSXIOIjBK1uiwxLOZj7ZyTKgyj08EL4AocoOxBE5qqqIEEO71TaWBqtT9F/rvHlYDzlpqvVbhI/kBuTiB+2inevl4eJBmATETKVO+k2Z/84XA4IgzRNPG3o1Iu7RXl9X+zcZrG1piXh0OJ2oLC+CC2HdAqhJWYQSMoGZIUjiqJAlhdCDscdi/LMkZg4BgBM71VsJ360IOKtwczsCu4e1OHnfaxZ5xiTjTquNW2rQ/VplRvqbpECfFrSoxRlFiDnaYp20TZ0rT9X0rGrVohyIh2GTf8lwS4B8WBW8s9OcXlWeeTKZ5QZYAWw6TNkwdBd1footWAgPMmKeI6ZDYK17fUOn7R7OT6TPCOO9NPpqkxpPLC3ckK0MJIuIWvC6VJknymQqdKOpimyfQAQ50Vu4tUPttXSCSFa69oAu8YzP0xvoyTNqLVAYtlZqbngR02l2ZKGQx68Hvdd2cnazq7y0d+p1fkbVFQ3a55s9rcLKsh/SzwOAZREvTXIB5KONgHeY2Ysv0DYi4YFWTUslVaeIU8N5PY1MlFHqNMmFb8a7cE9e1ZqT//ZscB91uu2+uYfstNpSdxSt/hAmKaz8c3mAGmHYUsC6EN1v+Djak1IuHtMWT9VBKnvjNvjRZHUlq6O/k60gMsPVjg== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54a69b24-cd28-4067-b399-08da3439d5ab X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:03.0957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: R2xRPtwAy318RV6jxxHh6faMSUbh/DfjGIqsLqQOCOj4p0FANVt1HT46Dh8rcEyxMWM1L9j8J2RyGDX+mmTzDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4721 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Implement fw_version_get API for vmxnet3 Align addition order in vmxnet3_eth_dev_ops with eth_dev_ops Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 35 ++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index cd32c1b4ee..d14ddfcbeb 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -103,6 +103,10 @@ static int vmxnet3_rss_reta_query(struct rte_eth_dev *dev, struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size); +static int +vmxnet3_hw_ver_get(struct rte_eth_dev *dev, + char *fw_version, size_t fw_size); + static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id); static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, @@ -124,27 +128,28 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = { .dev_stop = vmxnet3_dev_stop, .dev_close = vmxnet3_dev_close, .dev_reset = vmxnet3_dev_reset, + .link_update = vmxnet3_dev_link_update, .promiscuous_enable = vmxnet3_dev_promiscuous_enable, .promiscuous_disable = vmxnet3_dev_promiscuous_disable, .allmulticast_enable = vmxnet3_dev_allmulticast_enable, .allmulticast_disable = vmxnet3_dev_allmulticast_disable, - .link_update = vmxnet3_dev_link_update, + .mac_addr_set = vmxnet3_mac_addr_set, + .mtu_set = vmxnet3_dev_mtu_set, .stats_get = vmxnet3_dev_stats_get, - .xstats_get_names = vmxnet3_dev_xstats_get_names, - .xstats_get = vmxnet3_dev_xstats_get, .stats_reset = vmxnet3_dev_stats_reset, - .mac_addr_set = vmxnet3_mac_addr_set, + .xstats_get = vmxnet3_dev_xstats_get, + .xstats_get_names = vmxnet3_dev_xstats_get_names, + .fw_version_get = vmxnet3_hw_ver_get, .dev_infos_get = vmxnet3_dev_info_get, .dev_supported_ptypes_get = vmxnet3_dev_supported_ptypes_get, - .mtu_set = vmxnet3_dev_mtu_set, .vlan_filter_set = vmxnet3_dev_vlan_filter_set, .vlan_offload_set = vmxnet3_dev_vlan_offload_set, .rx_queue_setup = vmxnet3_dev_rx_queue_setup, .rx_queue_release = vmxnet3_dev_rx_queue_release, - .tx_queue_setup = vmxnet3_dev_tx_queue_setup, - .tx_queue_release = vmxnet3_dev_tx_queue_release, .rx_queue_intr_enable = vmxnet3_dev_rx_queue_intr_enable, .rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable, + .tx_queue_setup = vmxnet3_dev_tx_queue_setup, + .tx_queue_release = vmxnet3_dev_tx_queue_release, .reta_update = vmxnet3_rss_reta_update, .reta_query = vmxnet3_rss_reta_query, }; @@ -1764,3 +1769,19 @@ vmxnet3_rss_reta_query(struct rte_eth_dev *dev, return 0; } + +static int +vmxnet3_hw_ver_get(struct rte_eth_dev *dev, + char *fw_version, size_t fw_size) +{ + int ret; + struct vmxnet3_hw *hw = dev->data->dev_private; + + ret = snprintf(fw_version, fw_size, "v%d", hw->version); + + ret += 1; /* add the size of '\0' */ + if (fw_size < (uint32_t)ret) + return ret; + else + return 0; +}