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 D25C0A00BE; Thu, 5 May 2022 03:09:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67FEF4284A; Thu, 5 May 2022 03:09:13 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2057.outbound.protection.outlook.com [40.107.94.57]) by mails.dpdk.org (Postfix) with ESMTP id 272F842834 for ; Thu, 5 May 2022 03:09:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=chFdXKki2F+dHxMtVmlJ7Gg6sBOTNOKfd09jf31vIta4zuonuAldZQPL5VxsCB0hDP6aexGqW3eFYzQnHb1f4K1J7g7S/9kk4X31CbubiityZ1JdDCT2g7eS/Bv8lynBEB+cjZ/6R/LkFjDGOzpOFKcJYK5FbIUDSGuotFIwujfHYNUC8MIi09y8QqfnTRWaLjvHIpy1Ow3dYaH5aLKPGndLROw8ilQ2anDtTZCxD8K1Q+0lvL6kweErpbXwRy2H/41w7e1RWB9+31QVzN/eNLJc9VjxVG1CO6TfOrq2Wsormdecd48En/ZEm+mDbW2rvLIVeNUtrTOV3CbInPHPRw== 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=72BdeZocA+/cYwauWWqAu2spYHBpz+va2OSXYRY3RQo=; b=arbh7nvVRZ9RSP4tL49iRbjsTdF6gypASO76/WxR6uKdwuiOPGkWU0cx/L2UE0JB0PdRIw+AKOq8row9sY8xbB8DfYFxQLMcuseTkiJVKyBRdKv4Ns/DjMKoNgqmArQCA02PKpaaY/Bel0E1P8gmYrx76kwKQDTbcnnO0Ge5ip6ZXcta/djxSX7mlsnUYrP1ITEAom0bsCpGfs2ZoRkp2NRChMi7PXsIgT2qG4MSoTW+jfJUYBwKCIkSKqo/+FFE9Zbyv1xzph3o7zLLVamLApFioxkuX14PtJ4WSHCnnGS86R1xEI7gpAmCw/YMKNHrOqyZ1TKb2nlPjvzniCD7GA== 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=72BdeZocA+/cYwauWWqAu2spYHBpz+va2OSXYRY3RQo=; b=zH52E8bbS6jxJYy9e1BgM0FWFzfHB/ngAu5NOq+aTB+/e7MzycxB+F+9phYGBifogeR2NNI870YP2yXURaA5S4cw69/4HdWfLT/IRMQbe7qudK2qfFGjpyKEAVhauB37AfKvhIVt4cpNDn0BhRO5t1ZkWkkEX+DMcQyOUqxa51A= 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:05 +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:04 +0000 From: Pankaj Gupta To: jbehrens@vmware.com, yongwang@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v3 8/8] net/vmxnet3: fix merge error in initialization for rxDataRing feature Date: Wed, 4 May 2022 21:08:46 -0400 Message-Id: <20220505010846.25788-9-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: 84651d9e-c4b1-45a9-b690-08da2e33d644 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: h6+3Sij+chEI2k+LSV6IRHcx5otBwTw+Cqllkz9VG0Y/EB7N5XKjFOtqYD21ySzi9XXG2eQaHCAUO1un0VnpPjrQa/3jg5O77suNVeOl4f5Y+O0mnGHnaCefV1UNUSCH+ngXWaQbpUF7y+XoD3HkLyoTvri/cjVxtiDNwp1ukELfl1ziixKHl28oLYN6tIv8MJLxO7Lo8MZBvKq5JL1/GVf8iXPaetNZfXFfJoJzs4V1PWH/vPxSRrXO3mJiD8V8836BlcFRC10NHO88adzVRGZhNJ6bflH2e/zumqsr9tZ5eRKxvAEruovgX85aP8RclpMvWKuGJ9UCWEQh1NGlOisBbQDpP2ZHkVviCoGOuMAqVUeIwdG7zwfFSy11BzaszSSmryNOsIRJT3NnotEP4YPuD8jM8qrYnR1XOmUS3jJwiVqGxP2ujiJP+ynR3VVtt8+wdOV4vulBY2Ujjiq1CtCdrD7EUqsnVZTRU7Hy5HeQTeekbZkIOiltw99U6qRKrSXXezQ5iKn1aoistAZPITuqNdLLjlLLXYMuCL2mmkK87vtBUk4UPpG5wMBo1uyzZVRYqg/1mHCdCTPpH8h7D4JdsWO2fnr0Wu/SC5kxd9KqfdutG7jA7HBWid6JJOwQinHj5IlTmLkbSYJykzlp7DkFrAHo7A0d1DDpEj5FjeVnPSOzaEOSlAHBdLAy2f4VpvD+MTa548rDak4cFSFa6AjC03L0prOz8FUs/shSf2kYALKwAJgKU6lKm6FP4S0B 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)(4744005)(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?u3Qwwp8oY4ywuV09I63Oew2uo86hw0ymfPuA+9a0Xl6J0eUpS4VHOJ62wLGr?= =?us-ascii?Q?i67LX46/Ifysc98I1RoGuJNcHyqSM5TgFB+aYvfAweDZWfNogLsXRLLRbAkq?= =?us-ascii?Q?+pAuPuP8XJ991n0+6mrSVVFMv55U2nsvTby6fnqzhDAuKDh3KzcQPO+uSNgF?= =?us-ascii?Q?29NyucEYjqE12y++Mz9feVtgbfui/EOrigiaI7H2g747XGX7AC8Rg6Qwx/RB?= =?us-ascii?Q?PDk84cyxttJCNJyR9JCXDGHUMQiTAms1pRAEHUyrcgCOQlZ+gTriPKOcd09o?= =?us-ascii?Q?fYwxAqc5tLojtUYR2qKxSaTwfcx9PimW5/UrroPcMKs3JxjlRIPamftsIRzs?= =?us-ascii?Q?N7zLneBsEZ6btio1NNlwc/2lBSmq+0jGfgNgt7H8pgy1MSbaGMFuaBhsgaYc?= =?us-ascii?Q?puznmiM5kzXq0DpzXMaOzDKc1U1RUmr+Wkcs0RPJJ9IUyKMZAVrUBbLNoKG7?= =?us-ascii?Q?kQR8+/oT2wAieR+43vnuLIm9RDVjDZNbOvx/an4mRLKOYMAiRxNtyRGbuzcv?= =?us-ascii?Q?MFJc5X6WHJclTLJ4yB6NneJoJBQpZCfiMsTCF1HmnT14tsei2M8BhF5wv/R7?= =?us-ascii?Q?VZj9HdJdUI6tKleqJS7ZbVa6xyei6VwvZUWodraqQ9b5IPxwADhZAQjQ5+tp?= =?us-ascii?Q?6YXtE2Ao3qTB+6gpnQooFGTvoNTEeBr4iLXYi3XKuHuAUfkZFgGylppWV2CB?= =?us-ascii?Q?p+sYFOt7u0/JLI7+YFurgyzuTNW9Pygc25UlZGDEeJxs6dXj4V1NOe19Krow?= =?us-ascii?Q?0HX1kESlnIcP4yzi16nrNPHx0CA7iBBX8+Fg6OrsHOg+YpO7C2bKgR8cVh0M?= =?us-ascii?Q?P8deuItorQ4Y8sZh4X7PvjZxjh6TI1kMOgrZZg9dKeVM2rira75h5a8V9fbz?= =?us-ascii?Q?UxM+s+7NMKn4d+RXlUKdnAXmhT07KnlM+ASlJ2ErWHd2Obt6wADsFGpT78BO?= =?us-ascii?Q?wez+YOM3r7r8Abfd7rsa7zzSbd6+5Wsq9ghgHLFW27Ca2GsuLKK4ln5vrgKi?= =?us-ascii?Q?KvTC1tDLPVeuvYfXECSNToUCoYGjgVymqo3zYfei2INuJhCqThRXBNr8SvKF?= =?us-ascii?Q?LjuDBsyiwrT0IdELkSk0IjqakK5qp5RnJqm2A0n5mF80QEuY/Df4dSs929+l?= =?us-ascii?Q?tOo3iPc4M5e31VjV4jXGyawnJzdjU4qFk/V1Qon2hr40TUiaYlJymoXNT8oL?= =?us-ascii?Q?/h6k/sfUknibIs5lr8HA2PRb+nfSCOyT1iSLlbMc1rC29mJZkkF+f0J3kj7T?= =?us-ascii?Q?U4BAmeHBoC9xgLmHiFmq4fAEUzxtw1YJubkyuVaM/i7mrB3NbBcMP1Bz37qN?= =?us-ascii?Q?enffYbXFVU1vBvSB1qh+7Pl7+gUDeIAuO/jQUfKcVjUqxqroVKthjPr19Z5T?= =?us-ascii?Q?gX+EnyyQMLpv/CIFMjkG2HWeXlxpw1pmZXODVBfQ8iyZF1dIUOs87OOHWGP4?= =?us-ascii?Q?/yfF7injw0o+vxo7td7Kdf4fhbr+DFQphFIzbndpPiplSi7TnaCIsHZJINHr?= =?us-ascii?Q?VwCtLGVq82Zl+oe2xzj46oP8ZbsehyfPJpWluRw7mcGmQy/YyC3fSLpNCREE?= =?us-ascii?Q?ayCg1byuOf0kwCowxp7NQBtWmjvj4oMOoemkgrmGiHTafyxqmDPro2mxhyjn?= =?us-ascii?Q?OfvjCbLticinTyUrI6Z6VduGsKRZ2CAyqK0HO0QSnNsVF2dnlajmHxJUmYy4?= =?us-ascii?Q?2dcvBZqeWwUmY337PEaLDaYADVaZ3zg0fYdbU3al81bRWReEdXiZMrPS0GlG?= =?us-ascii?Q?VBaioCgZdg=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84651d9e-c4b1-45a9-b690-08da2e33d644 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:09:00.0789 (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: 7WkfTZfdM1ovx8pwJzMOfp7tDUv2ZsyHsEooButr2t+jxyw8PnimV4DE2DspJb1v+56sZ4+w0USfu+7mma/5fw== 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 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 Reviewed-by: Jochen Behrens --- 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