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 611B4A00BE; Wed, 4 May 2022 23:23:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 87CA942829; Wed, 4 May 2022 23:23:15 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2056.outbound.protection.outlook.com [40.107.220.56]) by mails.dpdk.org (Postfix) with ESMTP id C3DA54281A for ; Wed, 4 May 2022 23:23:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ciRbO1jdvI9XNdver9bvm72XOf381/YeitXiGcM5e5PBwJiq7/ZOXwrWUDf+Yj/h7nUTuaORIeOpbL8gpZINwIvJw+YbXUMkc1jffJbdm3C5IQktASiflP7NO2UndfsxAMWrsVzJTjPJFGHvO9F+Sotzl/EnoTsD+9dcUX8mzT9bhRgkrV83/ZGzajmnsBYunwIWUS7E2vMTFlLy6S39uwmOfmvyvkUit05r7EzC78YB4gPlrrl6mDBt5ncMggvKGjvyD0a0Jf+7LjxS97o/Vhh4NTyx/R3RqcgmXi3y9EBz3H7b5seJhc+0Ww6dzi1Y0L2+2pI0mytA1VIgRM0rgA== 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=GKGFo5sPXydOU0JiDcfRgXDifYU7pRMkPz3vSXQW8CE=; b=PJE5zi7fdTdDgTmp3Yr5eDSGqelvkgT1Nk5yXNQLNYAfxIV5+fZOZCwqb08SeFv4FPb8QPtUcKUSAkZ/OHnpJfj7HM6tHlaoCgqB4TM5JRCp0weCsAsmgY21Wd4pmq0OrOya6gceyQbqz07HvyXZOgFCDkf/q6pQbjkERBzSo6R+flUtl2qJpHjA/dN5TeuT6++839MIhyacFjEQ9fjkQVASJOHy0M0d4tuM+7YaL9t3srtUMMqorUNxJIn6J5eoiFPStld448NicRjVRqY8uxY4HPWWGfAJ7cNVrSgxSIbwoLrVaxqud4DbfpYhx4GUGe2Y4SYtoBdA+B5UWRNvvw== 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=GKGFo5sPXydOU0JiDcfRgXDifYU7pRMkPz3vSXQW8CE=; b=buPsZWe/1C2sqWpfisgescyDPFPLNjx6amJD8ewVQlEWgXbIIcrsG3Npf3VO7hnsaFL9YnxeAqVMQ6gPJTgrs9jWUIY+cUfId9mi/AI7YvbNHJZK8ipsCGcPWkFvtLXlJq+5PC5v0EWz25vZVW23UfN/5PSWfbBk9kCQJ3SGoCg= 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 BN6PR05MB3313.namprd05.prod.outlook.com (2603:10b6:405:42::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 21:23:09 +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; Wed, 4 May 2022 21:23:09 +0000 From: Pankaj Gupta To: jbehrens@vmware.com, yongwang@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v2 4/8] net/vmxnet3: report HW version on FW version get Date: Wed, 4 May 2022 17:22:48 -0400 Message-Id: <20220504212252.25117-5-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220504212252.25117-1-pagupta@vmware.com> References: <20220504212252.25117-1-pagupta@vmware.com> Content-Type: text/plain X-ClientProxiedBy: SJ0P220CA0006.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::29) 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: 0963d6bc-3e5a-462f-f367-08da2e144908 X-MS-TrafficTypeDiagnostic: BN6PR05MB3313: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: c/+2TNO7jxJWw2P2VDlvD7NSW0LGSv2tTbRQEpzTPFWGO1Pyw+OvNAL7GR65jPG7cSyw27TlugMCtWwqp0NbDu/Z9bsDi53YBblCES1SLY7FJPoa/cVWBnjxt1ZLwz62atcMBW1TSb8/KGoF/oW0mFc05/OeCb5gbnfpadH7WwFoqjiZdUPjFpOo6bstDiABjHLKHYxKyQA5hGiLLb+UNIKAtdJgBvlNesGIAqvb0nVp6qokeqcAQk/xbKBTHAUBFwLzQscW0H4TvFza3LEZckPd91Xg16XQNUEucVJBY/6FYE1KrjAcnp0FbyM8Jf1Zwhi6hhZGTevhgH40xrthbBNHwNK5uFj2Gn4tfa6LfH5lK7IwcWOKA9GiTlbukJg3fd0lCAhHl7VdjlxKbUZb3QMwW7j0Ylnf2xqQSjd+G66vggLlbMqr3aApl7OJuqBexmJIefL/prhaT/0OD5OgU3ORy7Qf7nfuDl0th4tt//lmCKHXK9A8h1H53ri85C7TzHDQDVOtiL7KVj8RShA267ttZdCeAWYeuZL5VvNq1ouDYKYL5XH/XoVmKoOCoAKEeyFy9jX8CZuaweq3YlRviJVzzKaf/6S1r+RKEz5P9gsK4pGQLkBhHxmdjY36+ZNaiI6/n5PB2pjDsf0EAaNlktL8VzCrVqX5EFEieCB+OWq4pt934yh6mav6IebZmxLq7ECTJxyF2RJCmxEe1JPBcXM4rRfRyYnfL210bgc7ZrSbCMp+CNh3eO//GBsElcZb 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)(1076003)(86362001)(36756003)(26005)(83380400001)(6636002)(52116002)(508600001)(5660300002)(2616005)(38100700002)(186003)(38350700002)(8936002)(107886003)(6486002)(66556008)(66946007)(8676002)(66476007)(4326008)(2906002)(316002)(6506007)(6666004)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qPbbm7F2LUQKul0AG9vTbMw2BXcebVllN6+pdXuQKE8ZAFbOjbsYPYN5deNU?= =?us-ascii?Q?6761+fCXDhLywUlyeUybf1AVn8YfND/3oo2uGHtDQpVhgmcI9HQreR/C7WEL?= =?us-ascii?Q?kXKcHSQ0ShYe9yI0fvQtjm0RfP0rfiLLWK4ESVdk8CRIbAlYo140th1qnCNw?= =?us-ascii?Q?dwhqexPqam58WVP/50EsQNKlZrt+8emQbZhzOuPU9ilqfT0cYaS3jk/w2ri7?= =?us-ascii?Q?L6OPowktqzlL5Jv1zZTZmXoHtB8FjD3zYpv/JUMv+asUoOWFygUiEz4sDzYF?= =?us-ascii?Q?2Wq2bDrdlptyJmwPSnK+biG5/9JN5YLPU5gdbVeZfPz9869RheiuDFYBolVS?= =?us-ascii?Q?1Z5IDMe8Zpob4AW8+28IVJXE9jVIOxN6Se1SEK2KG3yCX0eCFmOZn/UqN/rt?= =?us-ascii?Q?z68xJImVCgwTK5lUWE+F53MsHHF5BScF8AZgxZFPAsw+5QljG0UjUUcVc8A1?= =?us-ascii?Q?8qRd4P03ZKnDYgUXQ16/OHGmVLZOc4ZM3Jv4et3R6HXzLZX8Mbgc9lFKlp2c?= =?us-ascii?Q?s3xgbG0vShl4L8NvYsI9qxoeO6Exm8ehwhxv6kSy3vIZMdNoUDHtz059emWN?= =?us-ascii?Q?/7PUbjOdN863S5AwWHstHj86fTA1WB+rJQhINH/f0pSfFpMnMW24BhUbUSF+?= =?us-ascii?Q?5fCfVv3rtr6dJ4Eh5KgOSz8ByS7CVhtfyQFCD0/oztys/hv77vcUsQEVF/L9?= =?us-ascii?Q?+d8HbPQu3iXXoh1u94jpZt4XKMnbidNubOStl3hJ+1JhZXGUySFknwxxILYk?= =?us-ascii?Q?nYkJOe9XpLeWJobGV/W0nI7I+76hNM2dV6BJUNgwR9mSupmwqCz/dvm+Iu3/?= =?us-ascii?Q?Wr5EXIbCN6/IqsW3w6+3poyAjZHoWiBqKoWZHBVT+aVzCigQDG6ACUdldFfD?= =?us-ascii?Q?6vsZFMZODUb4o4+V3nEoxLtXb/LI8T5UDva0Y82DIP+89QaDLWHiyvALVvwB?= =?us-ascii?Q?MVMXnHp/DTj2JAkThXUCGV4iFwItK+tEfAUEtx50e6/utnoafgXSYI+vYV9+?= =?us-ascii?Q?NH/bTxxRq3l96ZKmfU/+AXm1SQ+WqpBq8rqjRESut6A0ygyFA+qfH7vOwWgz?= =?us-ascii?Q?dJquTuc7KzVXBi5wFLU6abpMPJwnQPOrZAGK7IGLXuhIv+KjTT5I56bvN+qH?= =?us-ascii?Q?MNws6RIVdpbPnDbfTvtQxOEhMe6JhAIYhboY6RiqWfPgvj6VDPep6J0sp1E4?= =?us-ascii?Q?OJQtjxix/kxkaGGTZ8I9YWGIRCFHCXlMlznPjstCS5WgNYeRA9sImIz2niaX?= =?us-ascii?Q?nzNqd8LePqJb7v99syTp7ELAdsI6lydfHwUWzQBYypEKWIPFwVWW/VlllKP9?= =?us-ascii?Q?VXghCPnGO3kE+xfJQFN5M9rAQiozJa437OKRc1/mMhvpfo4NgERsJG3jPYcq?= =?us-ascii?Q?V15mQvDPWcPRJK0v358EB8inxypBVK4EKu16Wiq4xOelg18m3IGMLXMvhZFu?= =?us-ascii?Q?0nT4PbIaT9m3fWkEId5rUJz3LOf3WOVrhSDHkGUHPRsKoGdSDU/XiBbh/cNo?= =?us-ascii?Q?yUdWppl6n0M+qu9lzJ3bfMDDRd/ij6MLedK8nqolBkO0v9JHHX+Iv1KTSNnB?= =?us-ascii?Q?VDwB7Tf/LxTdOsfom8r0FJk7/zayuLKUpOIHW7rxZNqWThKOnmRh5kChg1QT?= =?us-ascii?Q?PbDmjkJdoTXEulJDfHCsN7jHDzDunD734gYVx3M/ZBSE9iycNu7nQblIGY2T?= =?us-ascii?Q?coabIOcd6qCBi3u/aZljcE91l5xWgCPftSjwEyv8PKXpNJWI34p+WMql89sH?= =?us-ascii?Q?WuLb3DStEQ=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0963d6bc-3e5a-462f-f367-08da2e144908 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 21:23:08.7768 (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: H+2v0saxnAguxlwf3L5CRbGh+brfPpbiNZRVZ1e8mI8B4iI62ohJ9K84vXBx18np0RiQQZjlFwjfVv7rFle+tw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR05MB3313 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 --- 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