From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D62FA00BE; Thu, 5 May 2022 03:09:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EF4542832; Thu, 5 May 2022 03:09:08 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2076.outbound.protection.outlook.com [40.107.94.76]) by mails.dpdk.org (Postfix) with ESMTP id 1E72040C35 for ; Thu, 5 May 2022 03:09:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J7uOmX89Ye6jn0lC96bQHD6peicgex2V6g8I5hcdtMC0xp+ViOGmyKHf195SWNTSxjIieE0Fkb5WDw1elUeSVaA9jKgojbh+8r62+a/Em92hK0hl0M3EjEzDJnXRc60sFpRdC+jfU5k5fZBJasW4CFDCBPLLhshJS5oh4prXhDVouCv8eVPJsKQ4eM91Z3UexCCKU1mEDPg0IVL8teT2I2P7QyXhGinvMRL58zH05IXCrC+1c5m34iETfo98lnUX7Q7fvOJPMg8EBJ2tAr1/nMOgdS7iEdnVTu5vHk4es+pSXugBvsmJ3sR+PpvAOBsxOX/7TBVra4XVKNFJ6qG4tA== 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=iLH9mSZi/A2H1bXBuZMpkLUxrjfMkAz1hIVosPGZvZQ=; b=Y4OwqwSnoQ0Kgwu+rnerC2iaBouoOqeQP80lFXI4FoJTYM1W60xmyL96Y9Y2d3CHnoYeixv82zW6AbFRremW4x1UxiKFd+Z5YrBFYxibog9JpnXLCqzOn7Z+u7CvxovEF8lglW+cE/5P4Hp+JgxH+iSS8HZOMHvkvABMTh/99eJodxdXWMQOq8yCSXGrmq2TS8kaXmUGIhRKjNqwS1VuEX3y1oSAyL+q0M0g229xFBhNDSOqzqmuIyvch8sdmCP2Pe5S22QlSaTSUKYl/aMQ7Vaq9tI3lTG7e2QzUU/qxHKgz20mYeGkfJknE1fv1B9+sTvrqvWl9sr6r+Ypg6JBcw== 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=iLH9mSZi/A2H1bXBuZMpkLUxrjfMkAz1hIVosPGZvZQ=; b=atw4ti5425/hSthE3jwg21fsUVzvJaBEHk7q9m3bKdQVa09nIlpPo7tMt2bWr4BG6ULHU+cWfKlp9BDA1DLv34f+Yedv5L3IY9UZqd1B/LERibespCmgIE1S/UPR/BIUzzvVIrQCtmohXMw9nk91IhoSB9DT5vFCuoQrcbE9rGk= 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 BN6PR05MB3489.namprd05.prod.outlook.com (2603:10b6:405:40::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.14; Thu, 5 May 2022 01:09:02 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::5161:a7c5:8c7d:f3b2]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::5161:a7c5:8c7d:f3b2%7]) with mapi id 15.20.5206.024; Thu, 5 May 2022 01:09:01 +0000 From: Pankaj Gupta To: jbehrens@vmware.com, yongwang@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v3 4/8] net/vmxnet3: report HW version on FW version get Date: Wed, 4 May 2022 21:08:42 -0400 Message-Id: <20220505010846.25788-5-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505010846.25788-1-pagupta@vmware.com> References: <20220505010846.25788-1-pagupta@vmware.com> Content-Type: text/plain X-ClientProxiedBy: SJ0P220CA0011.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::31) 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: a98f7ac4-392c-4b3a-b023-08da2e33d577 X-MS-TrafficTypeDiagnostic: BN6PR05MB3489: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: i9V3SgErdXkkaYTKPzkmSlYleWWBCe/IN8llq2t/IF1NGl1zLOIpv6WOU/ZQDDdlQh1EUMVaKOSzl9+qjVo6bo7awpgbEJSEsGwfEZg2R4GHkamIH59vZAHRdV7+WMN0jcZU6pUIzQ/2ockQbTCk2PBDEHaEfKIpFbcMWpySQ1h7Ri6CQC9u4xHV9VCa9gzNCISxq3R07rtC9I+eTKNtKKj99jqhUzQuqRJ0af6Pf7dt/xikjDZ2yPE1ie+YG5oKmz2Ltk6XxZKCCoPd4PtH0W71sQfBW9l02h7HqXafvIh/dyZXSYzAzCY7N5EfnNIMv3oy1JiP25BmoEqS8ti0saBf+Y7x4b367/aYdNA/fH9OjriWfh0cpHqvyaKxLD8+mR0TfLi77wn5GoF+CauacBQxmBiLbCepNZ5gSL9zIsy0K6MC6T/iniI0lRmXKECvGlQkr57o/kzZZvc50dkfOROQu66XDeY7Ln3c9vROfOFQV66WEd3dEWmv8p/yxZttmQIHiJuDN2lbZXPS2yCjcFbRj52JBA5C4ElcfdeiURb8WusNeDNf9MA5ai0+TfQoH/fcvbFqqYnRamokgUDs0+qzemASD7j8PJ0CR/HMsh9pzNJZ5IbWhsPwvVVqka70AfMfVa/Dxp3DY1zUVrwsuEm6F4dJiJZ2htZ05sfmEEuNXkAuiSTp47yKeCOLa/07RxReADnOPsor6Hp5Za513rJVQ2N1FxlHtOzuwpq0ZHG097hSH7+O/N/QXZj0WTUY 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)(26005)(6512007)(316002)(38100700002)(38350700002)(86362001)(6486002)(508600001)(6506007)(66946007)(66556008)(4326008)(8676002)(66476007)(6666004)(52116002)(186003)(6636002)(5660300002)(83380400001)(2906002)(1076003)(107886003)(8936002)(2616005)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/KrmWY/CV2CP7+gPiBCgelL5w7UDg+yHi6xEU8x4NySP2NPvHsUQN1/yOr5L?= =?us-ascii?Q?/McBzOZylQxLxPzjlQmRVBk3HMC/KVPDk/YSZtbk4zGmAQ/nZL1/ZqKsxLaD?= =?us-ascii?Q?FW0cCKXGapj9SVPccw0OhUBWPX3p3DyEfQXKJgYKnOfyuWQH2HGK7uIRTE9t?= =?us-ascii?Q?/UEasTHKYL7nFaozhO+qijJAX1rRfDwsTY+4ToiS7Z7VMzxRP2KXLimsOzS5?= =?us-ascii?Q?WBnD4T9QMQBkjY29fTZr6PjcHshyEvpdT3L0utiby3dXjOsjvRWMH1oDCaLz?= =?us-ascii?Q?ClCOvMC3zc3RWnLVqQkyHnoySR1O63uZ11tlnv10PsyMixC+T/+h5N8FHEY8?= =?us-ascii?Q?HEcnVk3EALTXp3nkwAUuWsMkRBko/mdAV6bg0o/n1BebyXLb4bGvslY5wPPK?= =?us-ascii?Q?UvTRpWzIUEQ9L8HQD4iwpok4E0cVFcueIOTmLIMZiy3RKV4xVTFH0vLOR2zm?= =?us-ascii?Q?m9qcWf9Vy6coFpKi16gkHLqWBKHTJ5NpX9FqMLX5P9sfMlzIPQGOkEXxNA/9?= =?us-ascii?Q?LxQ3yyatFM0RdHBlT1QVQSRFxdXAm2pdR/WepTanDDjrxfGeom04VsKxSe2f?= =?us-ascii?Q?1DC8zMJGQvHk+NHomhtszWanfEKwroiuHUFJSustTQLHQHsY6q8UyoY/tR2k?= =?us-ascii?Q?9Gcd8Z4WS36XnIqBg1/9kXyOSHkp0UabxFVBSon4v585WxkeOZdFMSVe9vEA?= =?us-ascii?Q?wV5lIEXWaNEeVoggaytl0o/PrSsE5Hy24kEBVKVKayNOE75GEvU0E5n2+swB?= =?us-ascii?Q?/50MDTbWXjr8CVVXrjlB3akmlnwbPJxFl4gXOo30tOIvqpM1wPpDsZXg/u7P?= =?us-ascii?Q?vKlleBACuJQckabe9QuWRUa1khrp7sGV+MH8WIEW3GE7uUAgMLowYRgQYR6O?= =?us-ascii?Q?qoSO+IxCZjGSljBr7Yb/w5sISi+Imy/7i4NNvXPFttlaCN+1AttHZJ0jzxX3?= =?us-ascii?Q?roATycX8VIGG6uTb0WYlh1m37s0KjMy7CB8mwGoOStGuQ+YBlCA3ZEDiA0sL?= =?us-ascii?Q?BiXvxa3f8paeWHcPWos6Y0UXSSKFQtDG6sPmaOFX21ZltsafEsTC/w9M8DZ6?= =?us-ascii?Q?Y7U0Lst/i2ZOyPMc7IyAWFSvyxs2xMGy5P67/+yRYuUGnDfhK5FbzIa9aQDJ?= =?us-ascii?Q?u2Pd2TciT8gKmEXk5ZFkefvWULTp69Xo8CVrhe6eA7PKwe8veybgR/pt5PJK?= =?us-ascii?Q?IrgqSL94WEAXpMdBAFF8tWJon9K84wE2ChNujW1jv/lTDE1ac3SbehF4MfCM?= =?us-ascii?Q?9zyPfJ9zU81DI65ynYNTNKHZwz7tJtzaqa/y8L3h7qPFdvha+khYMFt4tJ36?= =?us-ascii?Q?n2Xf1+Nm5PDIWGlEwbIAdYMlnB+luJeSVNaxSuHUn4WzE8/ING75mqWHv4Ak?= =?us-ascii?Q?p9no6LfYYAHYdAGL4enaKMfR+1Tla8K9WGhP/L5Tef3c+nblzGy3pc8poGCp?= =?us-ascii?Q?S/fzp8ZlYhwfQhoGQ5wpb+VHGQy/gOuORprsgYSPEuYveuM1ENmGEPx8cDEx?= =?us-ascii?Q?Gp5i/hC5ijO3PZFQi7kCVkFY3lOqbtJyYmoWf2RAVpj8huGWTC7Ywx+pv1JP?= =?us-ascii?Q?Dlm8+lR78JmGjny2jp73M67uTwcEI05obgXCARA1XdN6SSUjM0pZhN6geQhk?= =?us-ascii?Q?YPyHtWYi58xc8OQ/3YQsl4kQ837yTtb2V+5dK9pvYSepxOZtaYZ3TPOWkYvi?= =?us-ascii?Q?ufgAspJmaw39JENEknwZVKE3pzwhWdgcYqXE2VyWMQbs+z0nhLJj/wHb7ovG?= =?us-ascii?Q?0+F0q0DnoA=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: a98f7ac4-392c-4b3a-b023-08da2e33d577 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 01:08:58.7665 (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: DN4M/6XeI5mwSeRgbNv4G1ggIBxXaPYCpvfG4ztktrbDJlzFRrr5SqQ6D8DAZah+/3gP4BrsksyI8PvgajNCBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR05MB3489 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 2725e49ae9..30a0026ade 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; +} -- 2.17.1