Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/111078/?format=api
{ "id": 111078, "url": "http://patches.dpdk.org/api/patches/111078/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220512170642.28930-6-pagupta@vmware.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220512170642.28930-6-pagupta@vmware.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220512170642.28930-6-pagupta@vmware.com", "date": "2022-05-12T17:06:39", "name": "[v5,5/8] net/vmxnet3: version 6", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "37df75207f54c17796176b997629c207fa174a3d", "submitter": { "id": 2677, "url": "http://patches.dpdk.org/api/people/2677/?format=api", "name": "Pankaj Gupta", "email": "pagupta@vmware.com" }, "delegate": { "id": 3961, "url": "http://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220512170642.28930-6-pagupta@vmware.com/mbox/", "series": [ { "id": 22917, "url": "http://patches.dpdk.org/api/series/22917/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=22917", "date": "2022-05-12T17:06:34", "name": "vmxnet3 version V5 and V6", "version": 5, "mbox": "http://patches.dpdk.org/series/22917/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/111078/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/111078/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 90326A00C3;\n\tThu, 12 May 2022 19:07:43 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AC65E42845;\n\tThu, 12 May 2022 19:07:12 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68])\n by mails.dpdk.org (Postfix) with ESMTP id E039942831\n for <dev@dpdk.org>; Thu, 12 May 2022 19:07:08 +0200 (CEST)", "from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13)\n by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May\n 2022 17:07:05 +0000", "from BYAPR05MB5624.namprd05.prod.outlook.com\n ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com\n ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022\n 17:07:05 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=F3wqgrmf8a0a9LQyGTn9OaTkE80EEzVO8O8rvd7nGN9ujJgRuKWQJZjAULDP4vMGiQ3kKoxqh2K6WQSzGqrchseEp//c+XwCzHA8MvBr7qufCJdaBgr0U57s44fgCbwa3rlTOd1hxZWpLZfesmmpR9eCCUt8uJ0jrzP4EzbC0XJ12m2DFp8ppxaMnwchULzCeviUGEE/zaxU3X8QA2sZ8hCXYMc1YjH9laJZg20UL051VsO4uPDNeVcUAd1/kfTvHqbGsqNfSgoPOM3BqVyGc64qXQ22MGMPR0qekeTxcW8AVptBzMC5M2Ju+86Oa+kYNnNsTObE1TWuPIkvRuGE0w==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=o814Ps8CI4s3gPVDOCVnsrwpnx2Spmwf4huIZBaiJDk=;\n b=Hq8axWbrJAIF+TazfM6YLKmoy7XmhnmfLZiwX+XRES2431B4NalxeGOHgwI8JchQYWx/98rvsboAG7XQH66Vgdvnxv7VkTKdAIf7gYDqycRQwoMbZ6Ih/HdylFV3ueJFJ7nvYK/PHb9UNMnJiqanRfVZSWoirX7A9kT8E2nNWzn5eFxtsiKVrrrDyYqsoRm/jCwLvvx5CjB0b/4f96WUfYvZBKur9j+6ZgVMVoC2RY0hajX0M0bs3BLnYk9+K6HBcl3ftdTwmBPhKJDqR+u6YQu/6pab5cNQYdJfSBb9WzOcKAmLRJ6WbkBCiLOxKAjYWZeiHXasMxo6Yp48saaHyQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com;\n dkim=pass header.d=vmware.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=o814Ps8CI4s3gPVDOCVnsrwpnx2Spmwf4huIZBaiJDk=;\n b=L9Oe1yFwM7yXVDyJ9ovLvEt020KCvdzIdRELxHreKLsr5ah7SKQjVMxHMgGJr5cNus/xKX2HbH2+ubN72/yfJ2bEEgUxV2jc4hF2oIHaCbZmIgGnYjLjU29bvQThrPlbfmUunRxbNpzmhXwBHDCNavIH7KFY+Zdu6gf8l+pnFms=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=vmware.com;", "From": "Pankaj Gupta <pagupta@vmware.com>", "To": "jbehrens@vmware.com", "Cc": "dev@dpdk.org,\n\tpagupta@vmware.com", "Subject": "[PATCH v5 5/8] net/vmxnet3: version 6", "Date": "Thu, 12 May 2022 13:06:39 -0400", "Message-Id": "<20220512170642.28930-6-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>", "Content-Type": "text/plain", "X-ClientProxiedBy": "BYAPR02CA0014.namprd02.prod.outlook.com\n (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com\n (2603:10b6:a03:1d::13)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "88793f51-02f3-45be-88ac-08da3439d5e2", "X-MS-TrafficTypeDiagnostic": "BL0PR05MB4721:EE_", "X-Microsoft-Antispam-PRVS": "\n <BL0PR05MB4721120A8953DE4963579343C9CB9@BL0PR05MB4721.namprd05.prod.outlook.com>", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n HeljyRQVDBW7D9ESGnEGy3rOTmfPZ99JGTsc/fJVBA2/bHp2bUfLPC78uMQs2M6hJ9ag3tn5SqkL3QZz5d9FQ9awy9QdpfERCrTsZQCdFba8ShITH2YRg9lvs2SZgOUyLcfzoLsPgK54dIvp7e5C1nuq9C2cyxcxfKkcrnsDm+Jx2C4oGU6u4l4v6MvLvQ11I0P+fc41IJZsdC7LqhS5L/HPai0GeX+ItSCdHft6cdT6uDVA4RE0vu/5wT3Kp17vnBwzBjiI4dJFomVCndNZKPFn5cOkIxb0acVZ2S8YhwoWXSFCyRp7DGK1EnabhLapvRQ4cMNhaQK7wsFpyq4r0EnlgWr56863fZMSmI+5rTL5Y1kkgOoC5aL0lDCON3Y2yN6/Y40QP95Xac8nt66iscz1vWYlkjs9MGklEV/gE6ijjgljSDVRW209EOiFqLjWvWlrremqUE3YRBcORaOeV4j1sUkZmgQZh5dZhQ8s+rY36g7IpW8Ms+vS27c/KGj+ctNhzBPLskw8LLJ7HH5d3k3kOKuy4lhsfnn2iyocUs+77UlG3+4VoCP/VKtE/NmvlmK1uXnQAoi6LkaebZPoxtG+IxZ9KdbFk5FOj/DZzjJ/lp0uLyq4o3GnjENTjLWBR/dwX0Ynn1+wENEqIo33H4bXjREg147+WMJO/QJ9NKMHfnc3KLs06d7jRxwfJXhhqSCzWUaP+T8VYsKip/6CVfNBPQ7FErdcKBpNB43wmVg=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(19627235002)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(30864003)(36756003)(83380400001)(21314003);\n DIR:OUT; SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n xaWMVhH3pHiL4JDROLGQW/JP2D7uWVBcpBv6GhVIADlheRYj7Saaax2hTeuRldPLSF2pUPltbPzWP4l4UoKznn1XG/Cz4UEaynCl4z1F51TlalHCeDUtQ98l4LS3W5UU63STSBiFyxke3fRw0Bc7wGnyFkISBw9yvaQlYELNRcEdDLj5XsAXpy7CFLZVDbFPn+T1VGhnaSg9dQeffqXhkoXBhxbbk6ONitEubDhG4G2ppD7QGVEi/kMa7vc6dSgPww11hBvV4Mfl31rRQNdLuSzotOGltUhUrnNC8PszRIY0m0xNfcus7H4fBG31Ailf28BZlku6B0YMuzWhO7HGToGl/2Wg0JtRd8Zp34uYyrbKFXDLC4Ftt/k52U8Q+3mebsb2j3vDIpY0muV7OMPMncYX2ZGzgjVYv320Ue/CE67gKoW6qvRCE/4pTOo7gagXtt5sp1tghzadMXdkMjJbxGfjUuIT8B+/wcco6txd/CNMz0YAT5HpzwKE8iKDqnrF4euszp7XexehbFkEFglorkB4pDD3jE6+hCgJHhEZCQzBnMz00ZAgTuUMwnaBc1o5eJ0UBfztA3tAS7Ka72R/Lje0dsqvSxyjjg8YiMMA8qtWtECO/TkqJ5pXkTaV02+m5EhtO1SZRskiWbAGna4XrlUNXU/EHugBTD2CGnOYh15Qyz3OmhbbPw0vjAwmZVrVAzSyVfuNCDx0iwbxCeF/X5+VR99k1FwlerUCbg4w1BGBEHNCAR+uTkmsj1u2oCjfCn6PuSg9hkYLpYE/zF2lXy43g2XNYC/1hI4mnBrt4yDW9lB/7uCKAd48V3LKUHLabLBPtTMbocF+Lf7eaIK+6hdC9h2naNUayX5q6u9qea0MvTCGffpwC7Rk5/yaIrInZx0hC0FMuwHt7a1t5Jt6C7pNs79UJjNpnMkirGmYaRiyp7ARxwEKwIW9CpkvwaKqdchHAI5lkaSLIPzxJFf5LczIBHde86LfRrithJhg/ydT7RHfyO4bE+g0nBZfonHD3790Qg+6YYTLl57StIDaoEjEgNk526clB3+Y3yxjdFCID+ttR+8ZIY9hrngk79kLCNCQOA9j1Ik/5cjKEFFZpqefhMXVjUlHnt5IPRpXAUR59H147NZZg/tPPDPv7UCmtgUHwqO4oXfZdOsistNgrkXp7VUXr4Z3qelTLL0zc0jaoQW+dMPuSn0JsPzqbBo6STb7/xw0MR84TZ0kU50p2zlxlrj71Yu+WJmXPIqY+XgHOWiuxcMIgl6ZjoTztRgQMlO9D9nniq2wZn/dAyPhlKABfyhYjVHxb5cSzUQkTl6n2pCKz8kUUbymlHhFwCTfPxwnE6/SegdMcMRvm/1NJeLB138gr3eqaLyj7rGlXK8HnEoEKFSaZo+lUmopKueZ0lpTgC6XaZNzphZwVALCS6EyM85Qsxn14vnG1WA94cKl8sCxgHZEemc5eRVofvCnncvsUMa7t2GR4gDVVAwNr66zTLZriFqiCePqI69+DQsNY8YpPX1eHshqmcZoI4CxLQGIDgUtaRx6cVXtfIsH9K7rrgcBAt5PT/vvY0ayPJLqsqI1DYulr3dNiHusA2U5aMTU6cmfHlXTEbupTp9qH48ZJbugSs3Ujb0Z29b3QSVw0xwTo82j4AY3b/wJbVku6RDboT+N+f2SEJgveOmQn9YI+PYSlAVZ9k/ymAjHW7S8QvXi10qs6YOJrFyebdu8+K1FG1N23WC+7b84VDbI7A==", "X-OriginatorOrg": "vmware.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 88793f51-02f3-45be-88ac-08da3439d5e2", "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.5175 (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": "\n ycQTz3jci9Y82BgqUUJs1txPQCGriA9Fjh3FIwmPM72H9f5XLSG/aMhPac6kT65tsZ3wrvwkvaeD7588vdtWoQ==", "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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "vmxnet3 version 6 supports some new features, including but\nnot limited to:\n- Increased max MTU up to 9190\n- Increased max number of queues, both for Rx and Tx\n- Removes power-of-two limitations\n- Extended interrupt structures, required implementation for\n additional number of queues\n\nTested, using testpmd, for different hardware version on\nESXi 7.0 Update 2.\n\nSigned-off-by: Pankaj Gupta <pagupta@vmware.com>\nReviewed-by: Jochen Behrens <jbehrens@vmware.com>\n---\n drivers/net/vmxnet3/base/vmxnet3_defs.h | 73 ++++++--\n drivers/net/vmxnet3/vmxnet3_ethdev.c | 220 +++++++++++++++++-------\n drivers/net/vmxnet3/vmxnet3_ethdev.h | 10 +-\n drivers/net/vmxnet3/vmxnet3_rxtx.c | 2 +-\n 4 files changed, 226 insertions(+), 79 deletions(-)", "diff": "diff --git a/drivers/net/vmxnet3/base/vmxnet3_defs.h b/drivers/net/vmxnet3/base/vmxnet3_defs.h\nindex 8d62b3e116..bd6695e69d 100644\n--- a/drivers/net/vmxnet3/base/vmxnet3_defs.h\n+++ b/drivers/net/vmxnet3/base/vmxnet3_defs.h\n@@ -103,7 +103,11 @@ typedef enum {\n VMXNET3_CMD_GET_CONF_INTR,\n VMXNET3_CMD_GET_ADAPTIVE_RING_INFO,\n VMXNET3_CMD_GET_TXDATA_DESC_SIZE,\n- VMXNET3_CMD_RESERVED5,\n+\tVMXNET3_CMD_RESERVED5,\n+\tVMXNET3_CMD_RESERVED6,\n+\tVMXNET3_CMD_RESERVED7,\n+\tVMXNET3_CMD_RESERVED8,\n+\tVMXNET3_CMD_GET_MAX_QUEUES_CONF,\n } Vmxnet3_Cmd;\n \n /* Adaptive Ring Info Flags */\n@@ -571,6 +575,24 @@ enum vmxnet3_intr_type {\n /* addition 1 for events */\n #define VMXNET3_MAX_INTRS 25\n \n+/* Version 6 and later will use below macros */\n+#define VMXNET3_EXT_MAX_TX_QUEUES 32\n+#define VMXNET3_EXT_MAX_RX_QUEUES 32\n+\n+/* Version-dependent MAX RX/TX queues macro */\n+#define MAX_RX_QUEUES(hw) \\\n+\t(VMXNET3_VERSION_GE_6((hw)) ? \\\n+\tVMXNET3_EXT_MAX_RX_QUEUES : \\\n+\tVMXNET3_MAX_RX_QUEUES)\n+#define MAX_TX_QUEUES(hw) \\\n+\t(VMXNET3_VERSION_GE_6((hw)) ? \\\n+\tVMXNET3_EXT_MAX_TX_QUEUES : \\\n+\tVMXNET3_MAX_TX_QUEUES)\n+\n+/* addition 1 for events */\n+#define VMXNET3_EXT_MAX_INTRS 65\n+#define VMXNET3_FIRST_SET_INTRS 64\n+\n /* value of intrCtrl */\n #define VMXNET3_IC_DISABLE_ALL 0x1 /* bit 0 */\n \n@@ -587,6 +609,21 @@ struct Vmxnet3_IntrConf {\n #include \"vmware_pack_end.h\"\n Vmxnet3_IntrConf;\n \n+typedef\n+#include \"vmware_pack_begin.h\"\n+struct Vmxnet3_IntrConfExt {\n+\tuint8 autoMask;\n+\tuint8 numIntrs; /* # of interrupts */\n+\tuint8 eventIntrIdx;\n+\tuint8 reserved;\n+\t__le32 intrCtrl;\n+\t__le32 reserved1;\n+\tuint8 modLevels[VMXNET3_EXT_MAX_INTRS]; /* moderation level for each intr */\n+\tuint8 reserved2[3];\n+}\n+#include \"vmware_pack_end.h\"\n+Vmxnet3_IntrConfExt;\n+\n /* one bit per VLAN ID, the size is in the units of uint32 */\n #define VMXNET3_VFT_SIZE (4096 / (sizeof(uint32) * 8))\n \n@@ -692,6 +729,15 @@ struct Vmxnet3_DSDevRead {\n #include \"vmware_pack_end.h\"\n Vmxnet3_DSDevRead;\n \n+typedef\n+#include \"vmware_pack_begin.h\"\n+struct Vmxnet3_DSDevReadExt {\n+\t/* read-only region for device, read by dev in response to a SET cmd */\n+\tstruct Vmxnet3_IntrConfExt intrConfExt;\n+}\n+#include \"vmware_pack_end.h\"\n+Vmxnet3_DSDevReadExt;\n+\n typedef\n #include \"vmware_pack_begin.h\"\n struct Vmxnet3_TxQueueDesc {\n@@ -778,18 +824,18 @@ Vmxnet3_CmdInfo;\n typedef\n #include \"vmware_pack_begin.h\"\n struct Vmxnet3_DriverShared {\n- __le32 magic;\n- __le32 pad; /* make devRead start at 64-bit boundaries */\n- Vmxnet3_DSDevRead devRead;\n- __le32 ecr;\n- __le32 reserved;\n-\n- union {\n- __le32 reserved1[4];\n- Vmxnet3_CmdInfo cmdInfo; /* only valid in the context of executing the\n-\t\t\t\t * relevant command\n-\t\t\t\t */\n- } cu;\n+\t__le32 magic;\n+\t__le32 size; /* size of DriverShared */\n+\tVmxnet3_DSDevRead devRead;\n+\t__le32 ecr;\n+\t__le32 reserved;\n+\n+\tunion {\n+\t\t__le32\t\t\treserved1[4];\n+\t\t/* only valid in the context of executing the relevant command */\n+\t\tVmxnet3_CmdInfo\tcmdInfo;\n+\t} cu;\n+\tstruct Vmxnet3_DSDevReadExt devReadExt;\n }\n #include \"vmware_pack_end.h\"\n Vmxnet3_DriverShared;\n@@ -821,6 +867,7 @@ do {\\\n ((vfTable[vid >> 5] & (1 << (vid & 31))) != 0)\n \n #define VMXNET3_MAX_MTU 9000\n+#define VMXNET3_V6_MAX_MTU 9190\n #define VMXNET3_MIN_MTU 60\n \n #define VMXNET3_LINK_UP (10000 << 16 | 1) // 10 Gbps, up\ndiff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c\nindex d14ddfcbeb..af4a1a1b40 100644\n--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c\n+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c\n@@ -222,24 +222,20 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw, unsigned int intr_idx)\n }\n \n /*\n- * Enable all intrs used by the device\n+ * Simple helper to get intrCtrl and eventIntrIdx based on config and hw version\n */\n static void\n-vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)\n+vmxnet3_get_intr_ctrl_ev(struct vmxnet3_hw *hw,\n+\t\t\t uint8 **out_eventIntrIdx,\n+\t\t\t uint32 **out_intrCtrl)\n {\n-\tVmxnet3_DSDevRead *devRead = &hw->shared->devRead;\n-\n-\tPMD_INIT_FUNC_TRACE();\n \n-\tdevRead->intrConf.intrCtrl &= rte_cpu_to_le_32(~VMXNET3_IC_DISABLE_ALL);\n-\n-\tif (hw->intr.lsc_only) {\n-\t\tvmxnet3_enable_intr(hw, devRead->intrConf.eventIntrIdx);\n+\tif (VMXNET3_VERSION_GE_6(hw) && hw->queuesExtEnabled) {\n+\t\t*out_eventIntrIdx = &hw->shared->devReadExt.intrConfExt.eventIntrIdx;\n+\t\t*out_intrCtrl = &hw->shared->devReadExt.intrConfExt.intrCtrl;\n \t} else {\n-\t\tint i;\n-\n-\t\tfor (i = 0; i < hw->intr.num_intrs; i++)\n-\t\t\tvmxnet3_enable_intr(hw, i);\n+\t\t*out_eventIntrIdx = &hw->shared->devRead.intrConf.eventIntrIdx;\n+\t\t*out_intrCtrl = &hw->shared->devRead.intrConf.intrCtrl;\n \t}\n }\n \n@@ -250,15 +246,42 @@ static void\n vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw)\n {\n \tint i;\n+\tuint8 *eventIntrIdx;\n+\tuint32 *intrCtrl;\n \n \tPMD_INIT_FUNC_TRACE();\n+\tvmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl);\n+\n+\t*intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);\n \n-\thw->shared->devRead.intrConf.intrCtrl |=\n-\t\trte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);\n-\tfor (i = 0; i < hw->num_intrs; i++)\n+\tfor (i = 0; i < hw->intr.num_intrs; i++)\n \t\tvmxnet3_disable_intr(hw, i);\n }\n \n+/*\n+ * Enable all intrs used by the device\n+ */\n+static void\n+vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)\n+{\n+\tuint8 *eventIntrIdx;\n+\tuint32 *intrCtrl;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\tvmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl);\n+\n+\t*intrCtrl &= rte_cpu_to_le_32(~VMXNET3_IC_DISABLE_ALL);\n+\n+\tif (hw->intr.lsc_only) {\n+\t\tvmxnet3_enable_intr(hw, *eventIntrIdx);\n+\t} else {\n+\t\tint i;\n+\n+\t\tfor (i = 0; i < hw->intr.num_intrs; i++)\n+\t\t\tvmxnet3_enable_intr(hw, i);\n+\t}\n+}\n+\n /*\n * Gets tx data ring descriptor size.\n */\n@@ -333,7 +356,11 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)\n \t/* Check h/w version compatibility with driver. */\n \tver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS);\n \n-\tif (ver & (1 << VMXNET3_REV_5)) {\n+\tif (ver & (1 << VMXNET3_REV_6)) {\n+\t\tVMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,\n+\t\t\t\t 1 << VMXNET3_REV_6);\n+\t\thw->version = VMXNET3_REV_6 + 1;\n+\t} else if (ver & (1 << VMXNET3_REV_5)) {\n \t\tVMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,\n \t\t\t\t 1 << VMXNET3_REV_5);\n \t\thw->version = VMXNET3_REV_5 + 1;\n@@ -508,15 +535,22 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)\n \tif (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)\n \t\tdev->data->dev_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;\n \n-\tif (dev->data->nb_tx_queues > VMXNET3_MAX_TX_QUEUES ||\n-\t dev->data->nb_rx_queues > VMXNET3_MAX_RX_QUEUES) {\n-\t\tPMD_INIT_LOG(ERR, \"ERROR: Number of queues not supported\");\n-\t\treturn -EINVAL;\n+\tif (!VMXNET3_VERSION_GE_6(hw)) {\n+\t\tif (!rte_is_power_of_2(dev->data->nb_rx_queues)) {\n+\t\t\tPMD_INIT_LOG(ERR,\n+\t\t\t\t \"ERROR: Number of rx queues not power of 2\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n \t}\n \n-\tif (!rte_is_power_of_2(dev->data->nb_rx_queues)) {\n-\t\tPMD_INIT_LOG(ERR, \"ERROR: Number of rx queues not power of 2\");\n-\t\treturn -EINVAL;\n+\t/* At this point, the number of queues requested has already\n+\t * been validated against dev_infos max queues by EAL\n+\t */\n+\tif (dev->data->nb_rx_queues > VMXNET3_MAX_RX_QUEUES ||\n+\t dev->data->nb_tx_queues > VMXNET3_MAX_TX_QUEUES) {\n+\t\thw->queuesExtEnabled = 1;\n+\t} else {\n+\t\thw->queuesExtEnabled = 0;\n \t}\n \n \tsize = dev->data->nb_rx_queues * sizeof(struct Vmxnet3_TxQueueDesc) +\n@@ -627,9 +661,9 @@ vmxnet3_configure_msix(struct rte_eth_dev *dev)\n \t\treturn -1;\n \n \tintr_vector = dev->data->nb_rx_queues;\n-\tif (intr_vector > VMXNET3_MAX_RX_QUEUES) {\n+\tif (intr_vector > MAX_RX_QUEUES(hw)) {\n \t\tPMD_INIT_LOG(ERR, \"At most %d intr queues supported\",\n-\t\t\t VMXNET3_MAX_RX_QUEUES);\n+\t\t\t MAX_RX_QUEUES(hw));\n \t\treturn -ENOTSUP;\n \t}\n \n@@ -777,6 +811,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)\n \tuint32_t mtu = dev->data->mtu;\n \tVmxnet3_DriverShared *shared = hw->shared;\n \tVmxnet3_DSDevRead *devRead = &shared->devRead;\n+\tstruct Vmxnet3_DSDevReadExt *devReadExt = &shared->devReadExt;\n \tuint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;\n \tuint32_t i;\n \tint ret;\n@@ -853,13 +888,27 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)\n \t}\n \n \t/* intr settings */\n-\tdevRead->intrConf.autoMask = hw->intr.mask_mode == VMXNET3_IMM_AUTO;\n-\tdevRead->intrConf.numIntrs = hw->intr.num_intrs;\n-\tfor (i = 0; i < hw->intr.num_intrs; i++)\n-\t\tdevRead->intrConf.modLevels[i] = hw->intr.mod_levels[i];\n+\tif (VMXNET3_VERSION_GE_6(hw) && hw->queuesExtEnabled) {\n+\t\tdevReadExt->intrConfExt.autoMask = hw->intr.mask_mode ==\n+\t\t\t\t\t\t VMXNET3_IMM_AUTO;\n+\t\tdevReadExt->intrConfExt.numIntrs = hw->intr.num_intrs;\n+\t\tfor (i = 0; i < hw->intr.num_intrs; i++)\n+\t\t\tdevReadExt->intrConfExt.modLevels[i] =\n+\t\t\t\thw->intr.mod_levels[i];\n+\n+\t\tdevReadExt->intrConfExt.eventIntrIdx = hw->intr.event_intr_idx;\n+\t\tdevReadExt->intrConfExt.intrCtrl |=\n+\t\t\trte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);\n+\t} else {\n+\t\tdevRead->intrConf.autoMask = hw->intr.mask_mode ==\n+\t\t\t\t\t VMXNET3_IMM_AUTO;\n+\t\tdevRead->intrConf.numIntrs = hw->intr.num_intrs;\n+\t\tfor (i = 0; i < hw->intr.num_intrs; i++)\n+\t\t\tdevRead->intrConf.modLevels[i] = hw->intr.mod_levels[i];\n \n-\tdevRead->intrConf.eventIntrIdx = hw->intr.event_intr_idx;\n-\tdevRead->intrConf.intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);\n+\t\tdevRead->intrConf.eventIntrIdx = hw->intr.event_intr_idx;\n+\t\tdevRead->intrConf.intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);\n+\t}\n \n \t/* RxMode set to 0 of VMXNET3_RXM_xxx */\n \tdevRead->rxFilterConf.rxMode = 0;\n@@ -937,18 +986,24 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)\n \t\treturn -EINVAL;\n \t}\n \n-\t/* Setup memory region for rx buffers */\n-\tret = vmxnet3_dev_setup_memreg(dev);\n-\tif (ret == 0) {\n-\t\tVMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,\n-\t\t\t\t VMXNET3_CMD_REGISTER_MEMREGS);\n-\t\tret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);\n-\t\tif (ret != 0)\n-\t\t\tPMD_INIT_LOG(DEBUG,\n-\t\t\t\t \"Failed in setup memory region cmd\\n\");\n-\t\tret = 0;\n+\t/* Check memregs restrictions first */\n+\tif (dev->data->nb_rx_queues <= VMXNET3_MAX_RX_QUEUES &&\n+\t dev->data->nb_tx_queues <= VMXNET3_MAX_TX_QUEUES) {\n+\t\tret = vmxnet3_dev_setup_memreg(dev);\n+\t\tif (ret == 0) {\n+\t\t\tVMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,\n+\t\t\t\t\tVMXNET3_CMD_REGISTER_MEMREGS);\n+\t\t\tret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);\n+\t\t\tif (ret != 0)\n+\t\t\t\tPMD_INIT_LOG(DEBUG,\n+\t\t\t\t\t\"Failed in setup memory region cmd\\n\");\n+\t\t\tret = 0;\n+\t\t} else {\n+\t\t\tPMD_INIT_LOG(DEBUG, \"Failed to setup memory region\\n\");\n+\t\t}\n \t} else {\n-\t\tPMD_INIT_LOG(DEBUG, \"Failed to setup memory region\\n\");\n+\t\tPMD_INIT_LOG(WARNING, \"Memregs can't init (rx: %d, tx: %d)\",\n+\t\t\t dev->data->nb_rx_queues, dev->data->nb_tx_queues);\n \t}\n \n \tif (VMXNET3_VERSION_GE_4(hw) &&\n@@ -1203,8 +1258,6 @@ vmxnet3_hw_stats_save(struct vmxnet3_hw *hw)\n \n \tVMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);\n \n-\tRTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_TX_QUEUES);\n-\n \tfor (i = 0; i < hw->num_tx_queues; i++)\n \t\tvmxnet3_hw_tx_stats_get(hw, i, &hw->saved_tx_stats[i]);\n \tfor (i = 0; i < hw->num_rx_queues; i++)\n@@ -1306,7 +1359,6 @@ vmxnet3_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \n \tVMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);\n \n-\tRTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_TX_QUEUES);\n \tfor (i = 0; i < hw->num_tx_queues; i++) {\n \t\tvmxnet3_tx_stats_get(hw, i, &txStats);\n \n@@ -1323,7 +1375,6 @@ vmxnet3_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \t\tstats->oerrors += txStats.pktsTxError + txStats.pktsTxDiscard;\n \t}\n \n-\tRTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_RX_QUEUES);\n \tfor (i = 0; i < hw->num_rx_queues; i++) {\n \t\tvmxnet3_rx_stats_get(hw, i, &rxStats);\n \n@@ -1377,9 +1428,27 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev,\n \t\t struct rte_eth_dev_info *dev_info)\n {\n \tstruct vmxnet3_hw *hw = dev->data->dev_private;\n+\tint queues = 0;\n+\n+\tif (VMXNET3_VERSION_GE_6(hw)) {\n+\t\tVMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,\n+\t\t\t\t VMXNET3_CMD_GET_MAX_QUEUES_CONF);\n+\t\tqueues = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);\n+\n+\t\tif (queues > 0) {\n+\t\t\tdev_info->max_rx_queues =\n+\t\t\t RTE_MIN(VMXNET3_EXT_MAX_RX_QUEUES, ((queues >> 8) & 0xff));\n+\t\t\tdev_info->max_tx_queues =\n+\t\t\t RTE_MIN(VMXNET3_EXT_MAX_TX_QUEUES, (queues & 0xff));\n+\t\t} else {\n+\t\t\tdev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES;\n+\t\t\tdev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES;\n+\t\t}\n+\t} else {\n+\t\tdev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES;\n+\t\tdev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES;\n+\t}\n \n-\tdev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES;\n-\tdev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES;\n \tdev_info->min_rx_bufsize = 1518 + RTE_PKTMBUF_HEADROOM;\n \tdev_info->max_rx_pktlen = 16384; /* includes CRC, cf MAXFRS register */\n \tdev_info->min_mtu = VMXNET3_MIN_MTU;\n@@ -1430,24 +1499,50 @@ vmxnet3_dev_supported_ptypes_get(struct rte_eth_dev *dev)\n }\n \n static int\n-vmxnet3_dev_mtu_set(struct rte_eth_dev *dev, __rte_unused uint16_t mtu)\n+vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)\n {\n-\tif (dev->data->dev_started) {\n-\t\tPMD_DRV_LOG(ERR, \"Port %d must be stopped to configure MTU\",\n-\t\t\t dev->data->port_id);\n-\t\treturn -EBUSY;\n-\t}\n+\tstruct vmxnet3_hw *hw = dev->data->dev_private;\n \n+\trte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr));\n+\tvmxnet3_write_mac(hw, mac_addr->addr_bytes);\n \treturn 0;\n }\n \n static int\n-vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)\n+vmxnet3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)\n {\n \tstruct vmxnet3_hw *hw = dev->data->dev_private;\n+\tuint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 4;\n+\n+\tif (mtu < VMXNET3_MIN_MTU)\n+\t\treturn -EINVAL;\n+\n+\tif (VMXNET3_VERSION_GE_6(hw)) {\n+\t\tif (mtu > VMXNET3_V6_MAX_MTU)\n+\t\t\treturn -EINVAL;\n+\t} else {\n+\t\tif (mtu > VMXNET3_MAX_MTU) {\n+\t\t\tPMD_DRV_LOG(ERR, \"MTU %d too large in device version v%d\",\n+\t\t\t\t mtu, hw->version);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\tdev->data->mtu = mtu;\n+\t/* update max frame size */\n+\tdev->data->dev_conf.rxmode.mtu = frame_size;\n+\n+\tif (dev->data->dev_started == 0)\n+\t\treturn 0;\n+\n+ /* changing mtu for vmxnet3 pmd does not require a restart\n+ * as it does not need to repopulate the rx rings to support\n+ * different mtu size. We stop and restart the device here\n+ * just to pass the mtu info to the backend.\n+ */\n+\tvmxnet3_dev_stop(dev);\n+\tvmxnet3_dev_start(dev);\n \n-\trte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr));\n-\tvmxnet3_write_mac(hw, mac_addr->addr_bytes);\n \treturn 0;\n }\n \n@@ -1668,11 +1763,14 @@ vmxnet3_interrupt_handler(void *param)\n {\n \tstruct rte_eth_dev *dev = param;\n \tstruct vmxnet3_hw *hw = dev->data->dev_private;\n-\tVmxnet3_DSDevRead *devRead = &hw->shared->devRead;\n \tuint32_t events;\n+\tuint8 *eventIntrIdx;\n+\tuint32 *intrCtrl;\n \n \tPMD_INIT_FUNC_TRACE();\n-\tvmxnet3_disable_intr(hw, devRead->intrConf.eventIntrIdx);\n+\n+\tvmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl);\n+\tvmxnet3_disable_intr(hw, *eventIntrIdx);\n \n \tevents = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_ECR);\n \tif (events == 0)\n@@ -1681,7 +1779,7 @@ vmxnet3_interrupt_handler(void *param)\n \tRTE_LOG(DEBUG, PMD, \"Reading events: 0x%X\", events);\n \tvmxnet3_process_events(dev);\n done:\n-\tvmxnet3_enable_intr(hw, devRead->intrConf.eventIntrIdx);\n+\tvmxnet3_enable_intr(hw, *eventIntrIdx);\n }\n \n static int\ndiff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h\nindex ceaeb66392..5a303717b1 100644\n--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h\n+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h\n@@ -70,7 +70,7 @@ struct vmxnet3_intr {\n \tenum vmxnet3_intr_type type; /* MSI-X, MSI, or INTx? */\n \tuint8_t num_intrs; /* # of intr vectors */\n \tuint8_t event_intr_idx; /* idx of the intr vector for event */\n-\tuint8_t mod_levels[VMXNET3_MAX_MSIX_VECT]; /* moderation level */\n+\tuint8_t mod_levels[VMXNET3_EXT_MAX_INTRS]; /* moderation level */\n \tbool lsc_only; /* no Rx queue interrupt */\n };\n \n@@ -108,6 +108,7 @@ struct vmxnet3_hw {\n \tuint64_t queueDescPA;\n \tuint16_t queue_desc_len;\n \tuint16_t mtu;\n+\tbool queuesExtEnabled;\n \n \tVMXNET3_RSSConf *rss_conf;\n \tuint64_t rss_confPA;\n@@ -117,19 +118,20 @@ struct vmxnet3_hw {\n \tVmxnet3_MemRegs\t *memRegs;\n \tuint64_t\t memRegsPA;\n #define VMXNET3_VFT_TABLE_SIZE (VMXNET3_VFT_SIZE * sizeof(uint32_t))\n-\tUPT1_TxStats\t saved_tx_stats[VMXNET3_MAX_TX_QUEUES];\n-\tUPT1_RxStats\t saved_rx_stats[VMXNET3_MAX_RX_QUEUES];\n-\n+\tUPT1_TxStats\t saved_tx_stats[VMXNET3_EXT_MAX_TX_QUEUES];\n+\tUPT1_RxStats\t saved_rx_stats[VMXNET3_EXT_MAX_RX_QUEUES];\n \tUPT1_TxStats snapshot_tx_stats[VMXNET3_MAX_TX_QUEUES];\n \tUPT1_RxStats snapshot_rx_stats[VMXNET3_MAX_RX_QUEUES];\n };\n \n+#define VMXNET3_REV_6\t\t5\t\t/* Vmxnet3 Rev. 6 */\n #define VMXNET3_REV_5\t\t4\t\t/* Vmxnet3 Rev. 5 */\n #define VMXNET3_REV_4\t\t3\t\t/* Vmxnet3 Rev. 4 */\n #define VMXNET3_REV_3\t\t2\t\t/* Vmxnet3 Rev. 3 */\n #define VMXNET3_REV_2\t\t1\t\t/* Vmxnet3 Rev. 2 */\n #define VMXNET3_REV_1\t\t0\t\t/* Vmxnet3 Rev. 1 */\n \n+#define VMXNET3_VERSION_GE_6(hw) ((hw)->version >= VMXNET3_REV_6 + 1)\n #define VMXNET3_VERSION_GE_5(hw) ((hw)->version >= VMXNET3_REV_5 + 1)\n #define VMXNET3_VERSION_GE_4(hw) ((hw)->version >= VMXNET3_REV_4 + 1)\n #define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1)\ndiff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c\nindex e15b377d8c..c94e3762e6 100644\n--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c\n+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c\n@@ -1400,7 +1400,7 @@ vmxnet3_rss_configure(struct rte_eth_dev *dev)\n \t/* loading hashKeySize */\n \tdev_rss_conf->hashKeySize = VMXNET3_RSS_MAX_KEY_SIZE;\n \t/* loading indTableSize: Must not exceed VMXNET3_RSS_MAX_IND_TABLE_SIZE (128)*/\n-\tdev_rss_conf->indTableSize = (uint16_t)(hw->num_rx_queues * 4);\n+\tdev_rss_conf->indTableSize = (uint16_t)((MAX_RX_QUEUES(hw)) * 4);\n \n \tif (port_rss_conf->rss_key == NULL) {\n \t\t/* Default hash key */\n", "prefixes": [ "v5", "5/8" ] }