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 240CCA0093; Tue, 3 May 2022 06:24:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 24EE242857; Tue, 3 May 2022 06:23:22 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2087.outbound.protection.outlook.com [40.107.244.87]) by mails.dpdk.org (Postfix) with ESMTP id 644A44283E for ; Tue, 3 May 2022 06:23:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fUSTuzP1nDOF7Rpkp+jZxk6ls2Ua5OlV82h1rC9PPNKLEBTUMYgwMn0kGL6TmR9nA9oW0oS69o8egwMpwPRj02iNSRTcBrlL3MeXg0DLqOQCBOAxtd0DilLXWh0vSC/U2KNIfK1IZTWh9PocbWj3jBBXIuKmaWm+qmnEjzRU+aLQ7tFPMqPPwnzqOqNe2B7fT173HZpcmclZlSUSiWWeYh0q2WCxM6t4aHudeXDOFT3JAA3YUS3YG/pblCaUlrBVlFMgckW9apLnq8Iw7+OBBn8LySD2hw7hl0KSSG4/Lk0OTuT7ob5cugFAzA+F4SciT5FFVHZ4pgxJ+S4S4bkNDg== 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=dBqVr3HCFTPD1xEDAcYNl7KfQWDmHl2uc7npbMhwUfs=; b=hOa6jGckVpp65hhGwNXiSVjXXGOJdxeCzvzjUgCBo6d1w4qFLvvx8hswKFjDdTyTo5RNPXOmmgr1fTGYEgte8IikC/r08kd4blegkZQ8TfnLWKV2vZn7ft79XSpxI0U/JZif3VdFE6OGtUY2pJ7YgLbqvFwExw2H3HXn/1zAswincmrE1d6qmS7kWpuf/lJlODVvqa2tDxvpqLXJKPfnuR/GlZ9kfeWbjWRT1I200m0gNxDdvvIbL435zulxwpzLrq0rLP/+lXY+eAeGHlvgt4LzxII8kCBWYnOai8KiXxa4uiB1L/pAHUFa7rr3Ec7LwUAX5+J8coe+djJ4PGeFXg== 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=dBqVr3HCFTPD1xEDAcYNl7KfQWDmHl2uc7npbMhwUfs=; b=aUnk2K8BR6hvgSWHHDBLnuSOD6bVmFV+mqpYYeqzrGJa+MGiUCPohvCrw6FG5geJr+O0YCuMgDmApHdnm/jUMBLAehjGfY9TMmn4bYxj4tFxzLSxxZMJPOE4135Bv8KJVpkiUCLHdtRIC79SBtxlW+Vseq3Fk8ITZ/bRco6Yi3w= 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 BL0PR05MB5523.namprd05.prod.outlook.com (2603:10b6:208:68::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Tue, 3 May 2022 04:23:15 +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; Tue, 3 May 2022 04:23:15 +0000 From: Pankaj Gupta To: jbehrens@vmware.com, yongwang@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH 8/8] vmxnet3: Fix merge error in initialization for rxDataRing feature Date: Tue, 3 May 2022 00:22:57 -0400 Message-Id: <20220503042257.15626-9-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220503042257.15626-1-pagupta@vmware.com> References: <20220503042257.15626-1-pagupta@vmware.com> Content-Type: text/plain X-ClientProxiedBy: SJ0PR03CA0059.namprd03.prod.outlook.com (2603:10b6:a03:33e::34) 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: c9c42f00-d068-4aa8-cfe7-08da2cbca323 X-MS-TrafficTypeDiagnostic: BL0PR05MB5523: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: QW059kPvm7+vOzHDgvqTKFyIrtyIpU58qG27Hc2nAvJN7yxjxh/aVg02L0oAyq4iC/BRKdhhpX4axk1D2TSay4iAdCl9LdIfzZcqn9QHiLBY+U8YNACfF6sTL8pGXeHncN1DH+8H4oqUCJFHDfRnwmazxBFKkZymFhzyOPlN5zRTku0IE+5cDb/9Vk07aDd7IUzFXAGAoCZk1W8SnUz4bPnmunm2iX+VKP0jFEwW0ShDsmgPOkyY+Q4D51C2ocpZdK9Kq0+7ANN53VrbH1hF2KHBbZjEd2wT3LtxdlQiLwCK78M7FD9T/F6fnUTqZ03RnX7gBvYpRmTsR0MZBWNsmqWPfJFIJustitjscvdHzvHb0VGOULtdHVX958NTvkJyqQHZ4fjGajwpR8RoeEqR6vE5IlKcLi5FfZ+xuuBM4ILxV7XZ31pnD6M0ClEfQg9x7na8ILHFrs/JrSD3kMz4mO0YQzdEfHrLLJ2ckzbs/uKW44M53iqnmlSaQ1bLz7M/HttpzSJYeOAsfWyIZ9QfEWDRhPBIT4zw9fmO2NVodfOYGxcGxNstSe9l34MLTfZv9XWQwwud170ieTzLPWk/vaBVnqEG0OJmcz+qVVkmbbEKeXZWX9mRNfBaPUp9dBqUgCV0RugAgB2peohstgCymUOf1S0Kc1d2NBHbzowA7Ig4xqxdhZJp96Sva9dku5mQki35AuhGYdcvqbCibUEviQ== 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)(6636002)(38350700002)(26005)(107886003)(83380400001)(36756003)(1076003)(8676002)(6506007)(86362001)(2616005)(66476007)(66946007)(66556008)(38100700002)(4744005)(4326008)(6486002)(508600001)(186003)(316002)(2906002)(8936002)(6666004)(6512007)(52116002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AqtR0nnP6wa/IFsU7Ct8u1ijS4Q1pNx/LH5wMGx+OtzGRp+SLm0Hg55FJCS6?= =?us-ascii?Q?/ZhJrogPDhuBgGX9MbizgPUphlTFgveFgy1vn1T+M+VhyQxsSmgB0zUf4L4X?= =?us-ascii?Q?ndZskun5svcBpATCOwqLk2e1QAffUA7Ufl7Oaechy/krjHUYtlAhyCQfqx+j?= =?us-ascii?Q?FbjKChv1R46CXWYkEgVSjqpYUmSYGY+M/RtyYLy4MnsIEHKkj1yz7csJUT9E?= =?us-ascii?Q?3PTMiuq49tcm8seakHEp+hCDh+r4ix8cHmae0vfYr3k5E00IAqW0CYTCHmE5?= =?us-ascii?Q?gYS/MUD6a0NI5g/3lk+WWypNLJvq+DNN5FDPlP+uKjsgKwNMXfp+rI6gHVA2?= =?us-ascii?Q?aXAbyGbEOoMI6RFgtrrZEAcnnJiu45Rd0XewpLiGDD1YmlCQK75UmNybTM8h?= =?us-ascii?Q?IKJDLsEBoHzcjIPD2+pYr1VKil+IwdSzdh+1j1xRrSJBna67wtwi5+g92dEM?= =?us-ascii?Q?oir9oz5Sa3VxA82mGDfoCVeb+kwRfuJO0wEaZ6xIOtuWZeJaA+o45JmLRE6N?= =?us-ascii?Q?ih/En0x+xa69cYxi4Jl6z7QutzPX4LFpR5LsylnuCxDRbS8n41Zp4IyFaj+n?= =?us-ascii?Q?3rSaKzvtpHhGjadD/0pIua9f6w9sfJ3GtmB0BFbKBQdgojWhFIQKMmNvIxWc?= =?us-ascii?Q?1Pqa+1Cb3n1FSUBUjAn8yBilEXIxFP/ZCTuZ1TuYJCoQ3eyHD+Vt5Zudhnld?= =?us-ascii?Q?9/g7vzzypxPoIE2+pp4fbAtTCQ8uScYKy+8xXYQzvr5KYtmsf8uP8al2ZnOH?= =?us-ascii?Q?2FkHETReUWz3dKeKrDDbd077lKJeSTpgnaBfB08rFRpqDSDB1BUIwwCQ8ujF?= =?us-ascii?Q?QJc4zW5yWxENv3GSv035AicT3f18PKPBf7j341Xh1Fer3u2WcS3MmzcTTfGJ?= =?us-ascii?Q?gkdrTGcMDBA/lUmYYI1fZGEGUSW8N9RoYRWWxNVcaZq5tVDBZu5figNtMRUW?= =?us-ascii?Q?I6xD9LvaABW7giXUgq3+GtDmNKmounPxWlf1diA0lTlF6EClNrZbc/Nl1qcF?= =?us-ascii?Q?AGmW01vYK5OR3UM1I27mc8ADn+2zlyNDjupIF8C7dHDD/RbeA63PlvHEo6vc?= =?us-ascii?Q?D77lsYYItMOl1gvks2Eu9IOBVxxjniV/cWaK9agB+KsaadP6w7+xMdf7lUDx?= =?us-ascii?Q?EGw3+QyCz/3DBJqTkvwVheLkZgMNLJujExYI6cSQaOL7JpCVWrixn1iu/8iP?= =?us-ascii?Q?Ao06grS2+lXZygeojGe3Pi74hH2ObtfsIEIet+OhNc0Up9psxSzhggqBXVOs?= =?us-ascii?Q?6SD+NMkvSFPoT2HTKxanYru+B2OhVqIMAUGPzLT9bxvQMIKkHpSLhRwnr79P?= =?us-ascii?Q?1XAmNBEsvmpoCaN6JEN3yvCgk/mFcJvxsDpe8MgB3Q0ZjJDJxcrkHzKC59pM?= =?us-ascii?Q?qGe9ioAVu4Gyfdd4N8yhHeFw6P/9a4kNI9ef9ttXBG1h9cQ8CYhvZW0qlWj7?= =?us-ascii?Q?G3+ksZmYXcHq8XW0n7vtR6EbBnPqvmv4+MKXNJIqvT7oK+LMChD2TG10C0Mg?= =?us-ascii?Q?W5h+Km5niB6uVtn4xxOkcBJFZeEOjfoUN53iEmigmL8SGjjNm5L84MV3/fC8?= =?us-ascii?Q?+3Psmim9qyJzXJlALnIFcGB4Ocln0WgZOaOBpqAN6u3KlvpImY1Je4DNeqw2?= =?us-ascii?Q?yw2/UnnXjW4kxYO1RBi8kWRrGG2z+EtUQPqZ4BU7JqU0e65+AftOeSp+AavP?= =?us-ascii?Q?EZYt7Oe4KkebFMANVq8Da1ExZWXVvEe8doeuGFBOo8DPxmWqnU9WDVjqv8+Y?= =?us-ascii?Q?LqmUTxR5aA=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9c42f00-d068-4aa8-cfe7-08da2cbca323 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 04:23:13.0259 (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: 7xpVohWcR07a9jmkdOfP9RH9aUqwnQnAHWOlgN4gSUTpVd9vvkTV4LlCU9Pj9Lb5Jo2vmfcqb/7yrfwSqXLnUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB5523 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 9955f121f6..6ced76ae2a 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