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 4FFBAA00BE; Wed, 4 May 2022 23:24:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 604F542843; Wed, 4 May 2022 23:23:20 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2046.outbound.protection.outlook.com [40.107.220.46]) by mails.dpdk.org (Postfix) with ESMTP id 64E724282A for ; Wed, 4 May 2022 23:23:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hw4IxKNuw8l4hwLIVawtI4pd/U+Nmcv2epLAtMi8uSY21x4H+U5ZEL02B6+hey7eKlui8ISeQ84X5j6IZW4+WQRH8FQ/rQ3VtSBDMmSWWpYCeX/hbz/PSQIjP5NMxkN4JF30m+6AAEM90dM1B/gP+bzxEAiRqxCKvKxEWABZr2JqT9zT18qhnNC9pS2epBapAjE1PLQPj9NIYkrunYZJbARo9001Ik8SPZ2xZCM4WEW2uEY7xsGujnWNbJiJJNGyEiZ6lNI28TaIpj0dCef3t6u6Cf2uksIF6zKWVST61lvXbaxZ8W//GNEuGrU0xQMpBeyQJ177xG39hXrcbOtzmA== 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=RY5ZhvptWnZ7poxKBYVd0eWSh/dgy0xC0xuq63DoNFc=; b=A3wwpp70PcexhW+VBgr1qYQlMDHzWgYT8kfSJ2eGPl2oopzN27L6zu3kaO7IZIS3H0iEMEuHPZarPptZpU6bfrGzMRGqiBmGlJFs2vnM1r2d5NbL0bea0ay+vtB0D/UHSVAEDffvFkdr5fUFSRvpjJVvUeUT1V0XpQD7Jn9ViOXKabiRG/d+ReNGJRRsWh5//xPOHvRum1EuPgDjQlj8ZilsCl5lN1nTA6oc0f3wd9zKbXpe1IeJ4fMCKqMY/aYGxk9q50zjQBq+KxgMR3n9pH0kQUGz0vuHfWgXbR0M7HjFmho9vJJNdexaqEHUkcF6P5EsIVIl/kvASmRzSs+WFw== 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=RY5ZhvptWnZ7poxKBYVd0eWSh/dgy0xC0xuq63DoNFc=; b=Tn0BAFuENHW0iSyXoXdKjoKowoDt8LDcCj7fqGr2SCP2pa1nqvbeZGvm82Y/RPdMU+GuiAq9363EwFieNYu+4Nk6hQeKwzpqvMM1r4mesrHeu10Sxx9HmUMfyGzgZ8+kutS46DfrqW4yxvL1uFTr6iSuiwlDgw38voIO5RCAw08= 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:12 +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:12 +0000 From: Pankaj Gupta To: jbehrens@vmware.com, yongwang@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v2 8/8] net/vmxnet3: fix merge error in initialization for rxDataRing feature Date: Wed, 4 May 2022 17:22:52 -0400 Message-Id: <20220504212252.25117-9-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: ccc39c8c-b00d-42c5-a80f-08da2e144a05 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: XEoWg+rV1rGeMECrs1dB69DdBNPvxsDjOrZ8dRJBMSaCVCFFlFalwtHcR4pDqeN8R67sWtVj6aMhLZDNFS+kiqAf8GMJ8n0vjKdQBisNRtXP9215Od2QPikLC+tWqRj7ZoE/GoXk6URynA/5SOEqyWZ4O5gJWId9zAgijLn9eCco2e8X22zBf4i1yz/se9ng1Q9rxuxXBHnRkAO80sQBY79Ixo9CioRp23aQM3AVFTee53Az0TwvJ3Kx1bfbjdhiNmZTqbGTUwT9fkqpIzHEiOhz3WNnJiGIZUDvuYPuN0GOIMJcSObnvgjNMjDG78DFO8PNe/TUPGvkbvVX9a4d5imAy9A7/41D+1qOTcqs7CC7lEOrY99aUG1dk33x9mmRHkg9JDAxzqjrIiiJKn9qvKTMEyhpAHW2MCo3OlBpLIOVYQG5Ay0AvOUrTBn4xzALVGFcDUYCc2Ah+1FLD3ugIY6xRjzCXejKhckHC4jiaOa632ICjlbcp505f4+8d8+BjHW8lbF8g6+dJOGsT443pK9R8ale5Z5u9hmdy4+Ip2dRu+e+VHmMx3S5HhRsotKDcnq7Api14D05gWUnlA19jGayoShx55hgU/pTND+QV16BTkPExn4f7ukTxEyMp7OJhOns3FWyATvtdVZkqd0LWfKJw/BunpiNRtOB+2Z3U4kLaQB0BwcBzBVvch5kyegKjESMt30c1DhhhVBOowtlNJU23V9mnG2VPdhVqi+7FhMCab4843Oot1dJP3JhsGW0 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)(4744005)(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?K0NqHlMioJ83PHcBD+kx6Dmxf7Urik6jN4jgArFvKxaiyXEETEyheUSqigiP?= =?us-ascii?Q?Z6lywakLHGqdOkp3WfGhAtZv+o51fwJrZNXNh3h7ONsB6LWaX+cc9JrnKdoi?= =?us-ascii?Q?tNigjpG749vt1M1RXBCZ0DVFnD8uBng6B8CCo0SI+qEMDv5zafGdJauRIDF6?= =?us-ascii?Q?a4C9D9B7xsVUU4Ep+UyhPlStJjwpNEE6/XqhQtIh75/yCw8GH11SM6cqmpUK?= =?us-ascii?Q?Rq4zKunZIJPBhaXdjbdOfwdDxShcyVhJY0yFwQ/2lcOgAixW7ehD986pOyFX?= =?us-ascii?Q?73+Y7QgvwhmUdPgeA1cuEch2gqqBWPoj5pPJQH5wsx1x4ReW0BpZbce8xMfT?= =?us-ascii?Q?T/5iOe+8Mz+FnZjqA64b8IwSRI5obuWchrVDqXST1C2LBrSLgPLe8ncX9lMO?= =?us-ascii?Q?S/LXMQTjQJ/QZiuTqLEtepkv4wLG0hds/OxWvWIO0QRZfC3sSto/c2VxALPB?= =?us-ascii?Q?+2kBFdmeYH//IcrE3HX+3Hh1LCmm9zRXDf83bTsnPeIRujWHylj8YcRX11v2?= =?us-ascii?Q?ZJ1rql9vVuZ//sFHnRLCMyMVBpV7TgL/q6BEwQwgfCFE1AGJ7hpO2O/DCjAt?= =?us-ascii?Q?jH60kxAWIXBTe12UDGUjs3qGIPwVb+Pz4j5IvT0OUoznHg2gJizNa65SjKW1?= =?us-ascii?Q?mWCFYcNRO6abxaecqtusUFayYe0sWdLeff7OCE11t8KvbTUlISNjHbXTF0WA?= =?us-ascii?Q?R9r314dFixqWm48LJJtGs8XCbm3cRJVY75Z8eqbE4kpi1oyKTV3kANxuCYsA?= =?us-ascii?Q?BsixYZkUYEKFqQ0kyaw5JR+rJ0BRqDcPAD1AWpLQBfp+Y2TrKfwy/ym/EJ+T?= =?us-ascii?Q?tr70lADdayrPdcOuO79wEjFNhpCpss5rggpnKPqH/6h04AnIBKQY0KvwJqTi?= =?us-ascii?Q?9O8fSJJF2haGES8ShB0t5wA82G+2wvFcMRV9xm8SzRg7f6Z77wyp5apBIWyq?= =?us-ascii?Q?bUxEhKzbNuS3joPZBCCFD3YOGXORsiyCd9FEKJX4ykikBTC1+XVc8bKYDQ7j?= =?us-ascii?Q?/bYxiq5Yf/F2BTdeWBigJDoGtQNaNtiuzFVJiSzKsGSZKBI+eXmJq87D58se?= =?us-ascii?Q?LdySJca2zTKw3t600c9W5BEqJ4fyj/V4hjw/JXAoPjamVBtJquxzEzTeWqWr?= =?us-ascii?Q?pDPbLSgLiGeSUypyK9pGdV6ITwHU3Ckb5DPsMX0Veo4K6Nq96+QUMwP9jDFQ?= =?us-ascii?Q?ab7KroVcJv2U7nB4qqqQRsAPbxaps7fc90s6Oe9XI0jpSuhijaoVQaZVHMN5?= =?us-ascii?Q?/cm5/0XupvHMMIwRi6zk3LAgFsGRAJFS3OI5nj5WsrwzoMx8hW6JJFBWxE0s?= =?us-ascii?Q?aZZUjgplUXCDx01RwCfDTPdRtcsmWlL9MFMofZm6n9CcDtRvr1w53+oOPVTd?= =?us-ascii?Q?uh18V0wt2HSpXoEKhhNh/do7J/BaxSgPXmPMZjQxdUY6j/dXLtaRw7Q6UrLZ?= =?us-ascii?Q?ozbrXSzPf7sbf+fT4T131g6/KCTyWSYeja6qm/0WlB6K4UI5NTKoU4VpvUSI?= =?us-ascii?Q?P7obvVPXHDor+WO+ms9rz3rjeADo8ElXFiPYy17ixbuaOf3mFJ5wfCQ/Rev+?= =?us-ascii?Q?eg7s3y0w2lKRpKlwqciv5lnnlDBxGdjlNyzH1BRIs/Us8cJjVlp6/L0KnMRO?= =?us-ascii?Q?1J7dRUdsO1IWvDl5l34O3KmPDOg4kfntuzqmNSNp+KHklGWD9uHqC/1lxvUP?= =?us-ascii?Q?KkPAUjl9oHDbf8wX5PNBtYTm+20/LkCeWfgWUbcYRJFj3BlzfsRDNyMnRFG6?= =?us-ascii?Q?199YK/9bLw=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: ccc39c8c-b00d-42c5-a80f-08da2e144a05 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:10.3392 (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: nZ5nt1ZuzV5PVjbumI36UtyVoSigvzv5jUqdswj/6av/heGm4PGRrypxDCdWBYZLzKmlmQreuJ0LXKzF5oTymA== 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 Fix merge error in initialization for rxDataRing feature. Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index d3148dcec5..fbfe33e22c 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -876,6 +876,11 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) rqd->conf.rxRingSize[1] = rxq->cmd_ring[1].size; rqd->conf.compRingSize = rxq->comp_ring.size; + if (VMXNET3_VERSION_GE_3(hw)) { + rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA; + rqd->conf.rxDataRingDescSize = rxq->data_desc_size; + } + if (hw->intr.lsc_only) rqd->conf.intrIdx = 1; else -- 2.17.1