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 6856FA034C; Mon, 2 May 2022 21:48:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3EB342843; Mon, 2 May 2022 21:47:42 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2043.outbound.protection.outlook.com [40.107.93.43]) by mails.dpdk.org (Postfix) with ESMTP id 4B6E2427EB for ; Mon, 2 May 2022 21:47:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NFaY+iYyX51bqhyaAwn7LTxoD2WbWR0mm8k1smSiNPjBAGW2vKexur0Am4JcbWTeI2DJU3dyU7rFaJYWFkyTfxQIrF23liwab0BFAFZRxhHhK813cyimVb9u6GN4tlTdrTxjRV2LO3V4XDglf3wlIkwLfNymagzko2YYwdmoINc9Ck9U3QhNeahXzFjckOkKf1kBCCSRCXC5dRqv1WLqvQqUs5OohmjcH/flxDy8LR6yTwqXk/+TmCB5y3kGFUROMJTs+9JcqCTl2JKhlCEbDOmEcKaoIbV3L7Bq+tMcMt/faHlf7XXWwDqp7tHMG+GX3Bf+dUOcg6qhj3reant/ug== 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=SkMQq93YOMD7M4hir/5p9zIlrkat0A2P0UvdYXWs8vw=; b=SSLcsiQkKyBCbPZI/LCpzuoWxFMfUp0uURSaCmNkkOm/e7Jlw1tU38da+ZSo556bXyDnAVeyaAUcAAUf89cjtd+rvsEbr/J0Kddw+qBbkt7ZeEW+H2A9FzwpYLjpRmcbIMnyO366OFHgOnD62H7b4PDc8YTR2Qe7T0bP2uqTNe8I7vzik26fZNwpxSUrbuNcfmFuAzbMiIbpgaNkMEwb1Z/n9rW9WsN74Kj/QZV23+0lBJoqmwNuv+lzGCBxyYivuxqsdCE5Bxj9UYWGYo6WtvLp6H9RbEwFKkglqGHSmfGEqenzBCouLtR2dm39YHbjZN8iGOUiqgNELd6ELhccFw== 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=SkMQq93YOMD7M4hir/5p9zIlrkat0A2P0UvdYXWs8vw=; b=z29c55wpPZbueyPPLBrNrxFa6ZDj2VHwy3zUHDP9zKKAIZEX8+aEB9sDoVY9LpSTmZb/UoWbCRhlbkIaOgWR8K5l/yN3Y0eAc8gE9eBxVa6Jdji/rjo4osmmUnPq6BgYnaCZqUUyXB2dyHV+pqz4srubT1IDeg4edEQbaEO11xY= 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 MWHPR05MB3294.namprd05.prod.outlook.com (2603:10b6:301:41::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Mon, 2 May 2022 19:47:36 +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; Mon, 2 May 2022 19:47:36 +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: Mon, 2 May 2022 15:45:57 -0400 Message-Id: <20220502194557.16016-9-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220502194557.16016-1-pagupta@vmware.com> References: <20220502194557.16016-1-pagupta@vmware.com> Content-Type: text/plain X-ClientProxiedBy: BYAPR01CA0049.prod.exchangelabs.com (2603:10b6:a03:94::26) 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: 70a9d90e-850d-42a7-1423-08da2c749a29 X-MS-TrafficTypeDiagnostic: MWHPR05MB3294: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: TeqRtCEvE5DjDAcBbNADRFvEmVqkuY/pv8SdbfwhRYocX50swmCLq1kZIVNOUIxasKqGkgoSenyJWE4oU1OrWPoh3rFPPFnpHmO1N1jmGvmh2i5vX5wFw7xQktWuEZsqmeGQZSOzZLhpe8/CfCCsiA0YFFKJoGatAJD5TrLt/OzgEhk2EeRn/sN6vS3aK/PrfxfAHrqsoELuRGKly+r8LF9JZ5tstG1Riie/htGWUFxiwfoAsi6/denv1QW3p1MWoJeUJ9jnUGNqpWRScFaMDg2qNRjZrqGT5L0nnhr6sd3SXBpeyswdCo5pWLaKFGKbgbBUWSK8dYmaJzAg9a2MsFUMPaJBzuybkYOFyguv7JNfbIF8cNWO3WuqjXg4q1AYHBX3Av+eFHZzIm73CclTWlRFrDiIF96g22ffJUAjuf/c+lZbxLyEoDe4tMJbPSVu0Q3V0jkSruK0fPF39yH4XR/oa4Utw2GXU8mPiSmTdY8xPHwwaMEii2coF0+I8WCVAfLVMexqjMwkFZpndDxgOpPg8F9ccGa7ZyWR2YQ0hL/rFFvj5lXXPBYsGOwtJNWRuUvqUuFaLIDfB17y/HCibohXEvrQrI9eKrB6eSKpLFFpuXLYdWlZ/U8XILj01y+gT+aII4YqfOzchMJfVVcoPvV+94VlkM3LT6/HbUag5IAHkkKB/YuetNt5M69r+jRT13tfeh+JHhJRgfIRykOctg== 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)(6666004)(1076003)(4326008)(6486002)(508600001)(86362001)(186003)(83380400001)(38350700002)(8676002)(52116002)(6636002)(2616005)(316002)(36756003)(107886003)(66476007)(38100700002)(66556008)(66946007)(8936002)(6506007)(5660300002)(2906002)(26005)(6512007)(4744005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sKXp4qzYxyOzReYMe2fp02lN+5Ib+5pbM4VZ6GEgIBxrUZQWgJsiHqh8ywXv?= =?us-ascii?Q?t4I/JouZNhjlkeNNYsp+5Sdk0hho76DI/iZpoVTF6zdQ6e1E9FAsRtIjeSv/?= =?us-ascii?Q?sJB6X84kOMSKGtrFGl2jfnprFvpZZanQM8CE+RuN70Urld5nwwWJm+ez3Vli?= =?us-ascii?Q?SjCbrIeQkwcfvDNXshjHvanViqaGLAfcJJrXQon2uPAWqI+SjrksnvZHi6yR?= =?us-ascii?Q?UaS5nWE2F5plyfsEE6smqdvYu4NPEVheC82818aKF+Y25Aw7UoMghZY8cCjZ?= =?us-ascii?Q?Xt5k/b1K+BEWzeBEr3AGgDV0B2RbEDcIemyR4yR37GCZp2OzkAf4CkCDoa/j?= =?us-ascii?Q?HCJfbVDhfhqdaPLOxHDUe7hTWy9bWNI3HxTRduV5NqAoYJM7QGXIQYSFNcpH?= =?us-ascii?Q?LxEODyQtSDsLsOLA3dT5HH42rRZyBHp9kQVxWfKGmU62wZdkOHXotHeJ/BKU?= =?us-ascii?Q?N9zy5OwnSgbG2OsPqWM9fj+0vhpOxSttUtZNckq1Yudbi1/+x5DnPtD6erYr?= =?us-ascii?Q?EZK2rG5Y4XBIxnEeUP7RAz0Xua3mpuUs18iA+QFUnwk/XoewLiKcFZctEjRk?= =?us-ascii?Q?tFbpDYGrD4bXaK7lpryz8Pqipojy0GwVocqOd4HeiCa3Tas5q9zIHA8qPVOw?= =?us-ascii?Q?uq5/16ICE7SL+5ADy30P5lJcMfWz0k6Yx0b+T+iichU/A/lE/61j+qeHe6bT?= =?us-ascii?Q?nMS/EK/AwIcKngj4FIHsRTQoxOX+HTE6Dge0s/WTykH/WoPGHMJcdGfJfhCM?= =?us-ascii?Q?NgZG6zhZQbIHroNTVgySM+vX5Mbloscl6odO6x4G5FjVUUiB42dHghaSGXEH?= =?us-ascii?Q?eoBc3c0VCocmafYuI1Vtf5DcgY5TkaIOoFzSRCnnZ7AGvShOjB0PCzb4kYgW?= =?us-ascii?Q?4zJgeEBeh14ck8aAfLXnN//5dz1qpYayD/H40J0N+TUx5iIJ+36xM5m9teS8?= =?us-ascii?Q?cGsmiNpidByWDpn2juBSJe7kjXBey4FKaxB7iWorb/6v4xTlfNtIcekJBFuN?= =?us-ascii?Q?AAod1EYaDkQC3M5YAfrrf6f4xaSDxCQm38GgOGLtK2YnYiCqduOzawtRpHaW?= =?us-ascii?Q?YCgyRfGnmJM4tMvLuGEt5/Sg4ipzZ3wA2x6hc80k3bgrJX6mQdznzzbaH2Rf?= =?us-ascii?Q?LBagngH2t2hsVuE1I++EY+SuRGEP464HUi5LQFO0oe5vm+MHhTwyMCLzpP1k?= =?us-ascii?Q?9K6z7lAWhwiR2+M3/naoiJiTkWELMUqBpYTXm8bCGdqV6HYkMq7FQukRC+D0?= =?us-ascii?Q?VBhVBKjL0oAIcgmWuOaDBjD/MpWAGj9d2x6wDMY1nWa02Mi345xMq7pTF/d1?= =?us-ascii?Q?Q/Lq8Sd4CgNHsLiNrV8I9INhRFqBFU0SVXFaBrG5K7mTN/29tPonSO6B81RL?= =?us-ascii?Q?hRgV7BNWGn+7cDWDeOqdSL6KBlo6UB68KcFbBXtti7/MqpAHy35U6z/WgZ22?= =?us-ascii?Q?J7NOAJ+7sCTO0ghRDlEEN6zHEwcgcGx8/j0sQLkZUkow58/4hGCMnueuPx3l?= =?us-ascii?Q?v/0ypw73R96bBND3FOxCGy2lXO4jMWMNMQPGFw3P2C9n1uLTRLmJV6BCa+2G?= =?us-ascii?Q?YgmWtBikJrEvJxCFQ1zmg6KeYD2SqavRIES4x876gyxR5aGlIYvpVhOR3LvS?= =?us-ascii?Q?yWbX1uDoyvIeSjSd8zst3FQBbHlHrjWbr2/yRxmmlIAFG1PSFRWi75+Ysph+?= =?us-ascii?Q?/vDAAVTVxqtUoDUWp7612kzlvekf/qVqMSfVM8CZw4Zge/Vb9BT8MBI+Z+rz?= =?us-ascii?Q?nCF6mIn1/Q=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70a9d90e-850d-42a7-1423-08da2c749a29 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2022 19:47:34.2120 (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: d9MBKUZj8bPCngcCyA3byB9PLAZXwGToksqDesi1ZskdrTRcylvvNCWLhp90nxdm/MsSgvWz8Gj1ADXtO4WnCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR05MB3294 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 29157fe081..3e72bb94aa 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