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 9EC28A0545; Wed, 25 May 2022 02:40:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3ED2C40146; Wed, 25 May 2022 02:40:53 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2046.outbound.protection.outlook.com [40.107.93.46]) by mails.dpdk.org (Postfix) with ESMTP id 4CEA1400D6 for ; Wed, 25 May 2022 02:40:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CNTRlbokAY7p2oq0BsDvv8Q3Duzc3WAL6ZNfvn8emAyIiRbk1h5GrJMvtkLgMu6MyqLd3fQuubQDmto9KrFdbz4cMk9ERfOklczLarjDkAbbJgjxHlLYyD9O762wfeJ0xNpzjfNruiws9b/KeHK1JKE4f6txNrNIKy2Ms8WQ+78oZ+GvxRCF9AQdSWPsGDG10d6gTzAGpI6/qs4spMt7TfxhZEtBEQCIwugzYYXoYkAXDgX4VzJYPvElSK956Kx8yaS/kFXAKh6kM9jQVKE1GM+TY5Vzh+ZSR8HYYlUOT+lrB4YY7QTvxZ/rQeqjxarRAFRCzXSx5V3yPlaLPeWzow== 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=OECTfZpwkwFDMtfNxbjnAQlsRJWyUMTToXXq+Zo0Vkk=; b=hpHTFMnkJLnAtUptEPW7uNZzXspo6uWvYv1sS0mhQ2NiUzFlcaCviKQPBDsMkhZyLlz+r/GNBViXQt5wjujMINrG8cAkgiUm+SF0CNWzWGX+I/FlPITPWBDVw7/snXfadbMIR3I8W98R/9amY0UV4933HHxZtMSDBh3onro0XS77epz5oQ2SgQM9bnt9+8AcCJieSHdrznxI/i0v554UBHoqGe4qusFr2Pn5l4gMZ/5Y+av67A1UoZ2EAL0cOcY9wmjHxCxJrj069QIPp42oqPDkd4x8MGNETDXa+omFbmWDMZ6/EWwpDga7Nqqwj2oUi1cq6jgmv52Pug3DGUpC6A== 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=OECTfZpwkwFDMtfNxbjnAQlsRJWyUMTToXXq+Zo0Vkk=; b=iLL5PQsZUnepke4Of44tGS4zq1EdUXeH6EdhrPSTPIkebwp3hGLAqNKY42Mhgk8YUT2+uPGIzH+3B+SRyzE1B1JXxMeWwcb2Lyv9HP4izFXnmGN319QaooiFrRtV73oui6+ol7M7cWcg9MH5oC+y4iP23p2i5S34ytrm+o65TUM= 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 MWHPR0501MB3753.namprd05.prod.outlook.com (2603:10b6:301:79::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Wed, 25 May 2022 00:40:48 +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.5293.013; Wed, 25 May 2022 00:40:48 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v6 1/9] net/vmxnet3: add version 5 support Date: Tue, 24 May 2022 17:40:20 -0700 Message-Id: <20220525004028.24938-2-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220525004028.24938-1-pagupta@vmware.com> References: <20220525004028.24938-1-pagupta@vmware.com> Content-Type: text/plain X-ClientProxiedBy: SJ0PR05CA0056.namprd05.prod.outlook.com (2603:10b6:a03:33f::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: fcdf15f4-403d-4c51-2d1a-08da3de735f3 X-MS-TrafficTypeDiagnostic: MWHPR0501MB3753: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: TMXSBG0v5mVIp+CjJYVNYPApzzVN4oEAjMNHoGTjx/4LUDHW4B1pllpQh+znZyKF16xd9UtRcULQZDNihEm6ovq3voYZTk39cd2jnCAZA8NkbGkbar202RuZF1044cpGuQ/Kb1mju56blW1B9pjwaUf8N2NONdJjiCm927sfJS+FQySXR7YUoBWEWXrhc2XiAqulPHVwK8XrT6gZ7yBAWbyQCSYkK7sO9VoANSnrSk/9Pu1C27SzNlvctOjCLqAfUQGgJr6nfhdMqFcdxIsoZrJrJ5uo6RODpFYtMDcWTTnkLxFu4mGAWNcZuScxsBL1CIz+1uW0JckBt10E8BmP45S5PsIKma/zTSm3Ni4vjlSQxU392m4aT8lwfBY1fV0fiwF4tSIQ5KEgkqpT2pQMY5qUdz1EOp2a66QPTMGLwDTr4xg1ZTbx7UWtkNDZ4glT3ogOdp2QitJ8Uq9O1VpaLejl3lNlPT2ngHFWBtDCsHKglFCAOrmRrlxR1R8yoHUaPguzAYy1F4dNcD8G8x5RaAh7sRX+ZVHOJeTTJPq7Q6deRGwyvro0nVBpOV93G17wAFyRl8RHQBiYqZ5aLRBr0bVfc6n/ATWorQXmiEYdOfERhZ3+ZL9mnoWwmvoai7tcLWAp8XDxl9OXMkr+J6SgPefv6mk/jVVYH62PaIgf3x2+kL5JcdRgpF+l8/CSzh4apSL9KgsTan2z8/lllJTqBg== 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)(186003)(52116002)(1076003)(2616005)(6666004)(8676002)(6506007)(316002)(66476007)(66556008)(66946007)(38100700002)(6512007)(34206002)(4326008)(107886003)(508600001)(6486002)(6636002)(37006003)(36756003)(26005)(38350700002)(2906002)(5660300002)(83380400001)(86362001)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+ig9REXxN7F8Fj8wCLIzD+ZXwh4Mn48X/+zyKLD89p7FTkTQG7RQhaBd5bU4?= =?us-ascii?Q?QxHz4z9c+GjB9SJ9OuwnktDF3QtraZXPpigBkjVK0HecnMpFR4miDXuZhGT9?= =?us-ascii?Q?3GTabpYo7BhREwevA2FeoJsvM5d1zARAW2y5t0QA1dW7LTq/8h7gE4+khHX6?= =?us-ascii?Q?Ks2Dq4AFMNp2kYCyTkzT6a47qWsnOF9FxaJu44Y90GjuH2w6kwMxVSfDSKtm?= =?us-ascii?Q?DsyncNeH7L9TS6TcrGQnW7sTqSqA+LBdbmnwEUYknIJN8bnIJKBtiRMGdDIG?= =?us-ascii?Q?v9Ujc81g1B9gzta1z+BXbQf88QDjpn6JZPygfl17xVdjcfWFwodVJP85Rewo?= =?us-ascii?Q?Cb1tNV9KyEqiS9dFd9DOz2Gafe8QoyvluPcR2B5G/mo3qVazrcGDtHg5rKzq?= =?us-ascii?Q?jZNO0FtTFkJgT9+U9HYf6z97qej0BjHCqS2D/UquVz5Ng1FopBXeW3+UC9Kz?= =?us-ascii?Q?CRnPSzNCbU835yajqrL2/zhHLcEonp/nXQNnPr0FGCjugeerPD8uU98pmUfj?= =?us-ascii?Q?vTplgLcTUxr570pXYR+5zCaTlMVi3n1EuFTZrrMe4NMgQWMXXkMo1CikFQlM?= =?us-ascii?Q?gHK517yO52hd0CSGH9WYwBMOueyeCtst5h47Kjp2ac60Cs2sQQhPDNtcP+9T?= =?us-ascii?Q?7j2S64dAULoWe2JZBe/euvYMfYLk2vrcENbWFTuGFoYBIfmkf4i+aRMB5QgZ?= =?us-ascii?Q?CfdnyGAWlQgOF2Y0yBAYr38E8i4Wn9hZBYwI8IF5pfndA6y/qaZqPM8l3iQk?= =?us-ascii?Q?0tt1ARGndZ91UhqLjqxITiNeNooujbDpXCO0mrCo5aOzAAvYaO1YDdshclfR?= =?us-ascii?Q?bYzTrlC36yFwNxnPWBxKbHb/7NdPC/rDV5BB1YhHlyQ7Jc6XHB0GL8k7AqTT?= =?us-ascii?Q?j6ouk7HmztssYngnUocxSS6nHlFfSgMK2f29GTi2mFSjVwGW+1mCo9tSKniO?= =?us-ascii?Q?LYt2AJLxbRbSuCMk5qzw9yxVBCysTDlEgywzfZgQA6rKBhkP+eBc73MQdx58?= =?us-ascii?Q?a10dS8T2F5/MSTCjZb+Nbc4WYOwN/CDZXEtlS3HG6d3EwrZIBKClLFddvbNq?= =?us-ascii?Q?VP6TjDt9Gw0Ep1PiCEavm5rcrYgI9Ewmy3wDtLFgUaiWrbr1fhKUn7y+NfP0?= =?us-ascii?Q?8/GYSkLZ1pwR9m/jRT4stnqB6lwF2wMwBwnaHJPI7OOMsKLsWAMONanCth4f?= =?us-ascii?Q?D4FuPEyZv9wDZCQAOJzHM8paW+rr3bqvz4bNXuFofo1gp9XfSHEmQq2xcFwq?= =?us-ascii?Q?kMvoKcFwXPxnL/N6vLrgJmSZ6wrXOS7dCcUmlLFtK7YcceIR8tslna/oC0/2?= =?us-ascii?Q?aprXBWWzkaKgOQBjd8JXEuDbHVIExyzZ+2vfKWUD9XMok6Az3q7dbcLjMhMX?= =?us-ascii?Q?5zuXxvdDxY8qfZ8BJIjOaM1uVc8Vi2x0r1gvmXOGlA0cEDfr83Zb5Brvc3qX?= =?us-ascii?Q?p7amqT+BdE8pe+FRlNNTWpDD9uJALm5qmShjz4dIAGoGsgWo9zc60Wv/BwU8?= =?us-ascii?Q?yc3Brdjx5FYL0r4+y7BX7r6zKzvdaN+JYVAPw6ivel432vVHwBfJjIB0x9Ri?= =?us-ascii?Q?jG12z94dXXrCQynQ2GM4wFGPVX51hzJ3RT+TMlxuC8Arixjy5CZOftLt1lJ9?= =?us-ascii?Q?uZWVodX6NArI6gphh5q3z6g/cslspJNRdpT89k9mMh67uNa03aATVQlwcGWF?= =?us-ascii?Q?2pXfgJB77nr9sfnq1WeB5BwNbWCNc98xy7hWjlDEYv/EQ15MwbOStINZXMbB?= =?us-ascii?Q?iSsGuEiG2w=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: fcdf15f4-403d-4c51-2d1a-08da3de735f3 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 00:40:47.9621 (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: rU8ADKxAGpqbIeoJGw82ABSwZOFMIq+Sytk8qrstvLjyywRB1Eb9mEiG7aif9Kg5S7pmmlD1aUxd45pdgO4vTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR0501MB3753 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 Add VMXNET3 v5 support. Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- doc/guides/rel_notes/release_21_08.rst | 2 ++ drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 +++++-- drivers/net/vmxnet3/vmxnet3_ethdev.h | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst index ac1c081903..cc472d7a05 100644 --- a/doc/guides/rel_notes/release_21_08.rst +++ b/doc/guides/rel_notes/release_21_08.rst @@ -129,6 +129,8 @@ New Features Updated testpmd application to output log errors and warnings to stderr instead of stdout. +* **Added vmxnet3 version 5 support.** + API Changes ----------- diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index d1ef1cad08..a7e1e5fef5 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -316,9 +316,12 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) /* Check h/w version compatibility with driver. */ ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS); - PMD_INIT_LOG(DEBUG, "Hardware version : %d", ver); - if (ver & (1 << VMXNET3_REV_4)) { + if (ver & (1 << VMXNET3_REV_5)) { + VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS, + 1 << VMXNET3_REV_5); + hw->version = VMXNET3_REV_5 + 1; + } else if (ver & (1 << VMXNET3_REV_4)) { VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS, 1 << VMXNET3_REV_4); hw->version = VMXNET3_REV_4 + 1; diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h index ef858ac951..7ec3b2e1f0 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.h +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h @@ -124,11 +124,13 @@ struct vmxnet3_hw { UPT1_RxStats snapshot_rx_stats[VMXNET3_MAX_RX_QUEUES]; }; +#define VMXNET3_REV_5 4 /* Vmxnet3 Rev. 5 */ #define VMXNET3_REV_4 3 /* Vmxnet3 Rev. 4 */ #define VMXNET3_REV_3 2 /* Vmxnet3 Rev. 3 */ #define VMXNET3_REV_2 1 /* Vmxnet3 Rev. 2 */ #define VMXNET3_REV_1 0 /* Vmxnet3 Rev. 1 */ +#define VMXNET3_VERSION_GE_5(hw) ((hw)->version >= VMXNET3_REV_5 + 1) #define VMXNET3_VERSION_GE_4(hw) ((hw)->version >= VMXNET3_REV_4 + 1) #define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1) #define VMXNET3_VERSION_GE_2(hw) ((hw)->version >= VMXNET3_REV_2 + 1) -- 2.17.1