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 EC062A0545 for ; Wed, 25 May 2022 02:41:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E700A42B83; Wed, 25 May 2022 02:41:07 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2070.outbound.protection.outlook.com [40.107.223.70]) by mails.dpdk.org (Postfix) with ESMTP id A778D410FB; Wed, 25 May 2022 02:40:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YK2tEJck39s21E3H4NZ6F0oSmQKtkYAaSSQ9LvguOKyyrxEQWTb8CF660qARZIgLbGhjOtKOCZgZeNTy/zyLVW38TYWtMj0aMCcx8bPcN5goAlOUvlbdjUXqJAvsnxB6SDANK+6/jVERcPhpQRDgy4kIcgB46FSlfkHsWjsjp4PO43N+ey/ffljyzYOsN/Zg+WVBn9MES/iZH7Eu+KDSeCHUyE31J7IQ0AMT8Xld4gCTiKifJqFqy/ecunVwLrEfpHbcl54g+aPD0nU1F0WTwoqWwYG+VpyVpvh7zO+FLVCpCPAyP9OA4thco3jqHLEai6mLUQR07DmHSGKLvahJwg== 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=GnOnSiz4Y8VVIdPm/0ZbY+3FcTzjXZI0e2fwq2SVZH4=; b=c/K7brEQ2g/UN4+NypissIN3IH0/aM+33z9u+cATr3OZyKL8cwZ6dcas+QK/pMY/bp+SZN0xc/FEPSo3Mh7uhQOG0CkpZDBvKyoo9FoOdEskD5KOW4wFyXUVIitEth8pXuVw6k72LWIkgRizEDYsRs3UDBqOKUsX3klzNQjAApDfv2XHUUFmAto3cHQFaDonHUxlNR6rhPcm2J6xbbKNXjtjQyMMfslehMbqBPeniykyXXHFDB5SQiNtH+pRu6lWUbueOOnDkKI3kb5uCejg6D58kO23dDv1atm2VfQV0zhKqUzP6Qosivk/g7MjsZpH6aZUvyExyYg+bwD/EYcRgA== 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=GnOnSiz4Y8VVIdPm/0ZbY+3FcTzjXZI0e2fwq2SVZH4=; b=Vs4cdymViKuLVbjbvybVSW1cUv0/VnAhz8zhVtCberzMYp7S5Qd1N3+4pOqHkuOGVQKKf4taZgPz/rs5PLaPYcmrxzd/xFP0J34q0F8x0SVBkwsLe60qSRS4MNk2ekInb+XErVls/eK9qMqE5tmXIsb/SAzU1I6EOv2NHUShn/A= 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 SN7PR05MB7534.namprd05.prod.outlook.com (2603:10b6:806:f7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7; Wed, 25 May 2022 00:40:53 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5293.013; Wed, 25 May 2022 00:40:52 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com, stable@dpdk.org Subject: [PATCH v6 9/9] net/vmxnet3: fix merge error in Rx data ring initialization Date: Tue, 24 May 2022 17:40:28 -0700 Message-Id: <20220525004028.24938-10-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220525004028.24938-1-pagupta@vmware.com> References: <20220525004028.24938-1-pagupta@vmware.com> Content-Type: text/plain X-ClientProxiedBy: SJ0PR05CA0056.namprd05.prod.outlook.com (2603:10b6:a03:33f::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: 279c06d5-0098-4bcb-ee69-08da3de7375f X-MS-TrafficTypeDiagnostic: SN7PR05MB7534: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: Q3jfsH8zr18Q3T9VDEv1FBDpjIc5h4JwCHfknaxROrW+NSy64OW3kCP7vuZqr0ahdU4q87ZfrfR3g85kDJAu8a9tiz3Nma0+wmOxManSGZLY34eFg0wTq10eS9KQXIWYITFu3pqtmPLGSqjVEAk/66QJwIrcunMS3iN51B8y3pK5u1s4a2xkRVj0Wzotvm+/TAeSyGlK4WwQqwSK5I2y5DFLTtmrDwrWBggwbn6roIu/GKsKWACARgxRRT+uG2KoB3m4OLJ4YcqHbN2IeKtzTtKxeaGake/6eSeUVyTk2p2oZvPbzaTs29FgNMNJrmLhGVT07t5isEIcslCDIxQmXoUX4aREyRfBwPpJIDYvEb16NYjdMcHGeOo3ShsP5UIc8dFSHIci+MBRRg09AvP65d7adm5mV32B5z6dYCaNDaOqoiu/G27FSUxmM/5wAEvYpL+HmY+2z05KCoBD5MPAqp+WJEw8I33OT4ql8LNU5ABbRNYszr+ZpHccYWU0ehdFF0uw73ebWb8RmX31RqMsuEfBbqT5EYTvCmsKEeQ0kOGmtCbiu/jRUu3idGmKORbTjJBl3bM7VQ8TRvz8Q+nlRs4pUhDy9C+Z6xYOlCBXrINJv5S7hX/aaCcws0dPSKFWl7EkMX2xG4r1afrijoSH9SbN7vrOLH1JqEVVWgUhrDOKKYqehwOO7CHkOFQ5eS50V9nzoFnOOjju5pS5yI8aYndedQNBkGASaWfW+Juk4YVe5d5IRKkKpkrnRXFjdbxa 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)(316002)(4744005)(38100700002)(5660300002)(38350700002)(8936002)(186003)(52116002)(2616005)(36756003)(6506007)(1076003)(6486002)(6666004)(508600001)(37006003)(6512007)(6636002)(450100002)(83380400001)(8676002)(34206002)(4326008)(66476007)(66556008)(66946007)(86362001)(2906002)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SEZPW5sH6aJoUb0wi0HGRunjdMUzVrKTTnL4rsY/EN7KX82D/BztcOXBVrC+?= =?us-ascii?Q?iMq/3aPy4/uAha2uqgN9ZCLR989NjjQPlKuL4RcsGfB5/Ud5wOCdAMxfDdyt?= =?us-ascii?Q?4foNYCCznWAk6uoTudgNnXMnMpevSpsIPXj39o3A5CnPBNHk5MfOnPWgysUe?= =?us-ascii?Q?1CBxB5/8nrQyECNaRxRXQD1K2+Q33vtnGhHJ/TIFSiTzjALsHuxDyHzSyams?= =?us-ascii?Q?hJzew0OcJvtOKt/ud/9unOqgGQDS6vIU79hm+r2pLsUekG9FA1yzKZi8Dpe/?= =?us-ascii?Q?KMppA+PUUwRU96evF3912egAQ5nkLuGDGvnxYpWF7MnDmD9Hm83VPZG4/7jC?= =?us-ascii?Q?HAW69golqF0xoDwLaGjTjBNKRxj8EYqAcJaO4OT5WRuWYr30l9+wRPIKjd5H?= =?us-ascii?Q?Vvy0Q9Vomy2R3S1+sTsX+/KuR9w7E6vO78sSQrJENyht0wnryZz6UuhqRJ6h?= =?us-ascii?Q?KUCR1oBby/OTL0hok/DqVvb8W8DrfyzX02SI+3/N45oOmYe9jxCfxXGRpOJq?= =?us-ascii?Q?d89cE8dBntgTq+X664vmhzce4mTzL99RjVfJWAoVHoOkECaSoT93sLI7LwyT?= =?us-ascii?Q?fzolgBqzOgKX/fyoyS089lnaNTxV867v5Q7/XK/dTvRSPLrz4S8g3bDeWibD?= =?us-ascii?Q?Ni7wILpYyrzWt/Xv8E4uPe4I9ekNr/d4irs3GyIYo2PHAWBGRbVwNPOtvIyY?= =?us-ascii?Q?Kta2xJQkV+PMBmxZkmqThnHxSXjf1++Ki16ovgFlZvXSLR84FmX//juj62ek?= =?us-ascii?Q?llWI6Qnsi8O9ylVWzW3/m6swpjCSbafLkS773YmICsObQxhBkC4lR+/pujgn?= =?us-ascii?Q?1p01z0GvT8ydJnQKgNoh3YA8sRvKTEcNQXrGEjQ+J3dpzedS8sPJuRaBXkxL?= =?us-ascii?Q?bkfC50OwgzTDoooSDtr2lBPNi6NcW1eWuz4JWYHbYbvP3FKI1ZglPtNuvLZl?= =?us-ascii?Q?95bF/kiKV77/KtwPaI6Zgylbjlv1+8IEEofqxUb75v8UczV82gsdsgkpXkku?= =?us-ascii?Q?AIi3RLXW0oydOw4e0sqIowzt8huOjrecrLkeU+Jskg6tdegTwrle91JNNXJZ?= =?us-ascii?Q?SU9KP+Jzz3oBxh6Kl5z6wX8udxGjjYsaw9LwMc8JaG8wUROyOYNpjCqd8sYn?= =?us-ascii?Q?rJJ7/FbZjIcMQcCZ33dlGyM52V4xbt4kxx3+Np7SBF2H2MhajH1FV4qudYNI?= =?us-ascii?Q?JsI2KptbwTwrchIWolcaBTyXhjdHnFUOWJwJhoq7POBLha5JJEiL6aMaYLkU?= =?us-ascii?Q?82Tg9FCT6CAPNN8R6biV6Pz8Kiq4Yvwdg0+QUaKZY5vSh8OkP18yb1M4tGpf?= =?us-ascii?Q?/P54MU8hHfdtEXvWCcFneywPl3a0xYHlgws9xBz44zS6DrFzJrxRZ8AIgVZx?= =?us-ascii?Q?FdFkmIES87yDjC9TAal6wpKzaypBaSZDjUMI27eDuP0XHo3BR0TqR4LqxJww?= =?us-ascii?Q?l6nce2oPPnUddtazZuBVcolYfTgt85Q7FoeF6pNKSPDafWOBKueIGOpgaFvU?= =?us-ascii?Q?qv2hGVSTJlhkqSifb/B223lPaGfWO0DHC0wmzudHr2jPy2jo/rGkQ7/PP6h9?= =?us-ascii?Q?VrLjzbiLLzP+3KPK5tq07GU+rYRXyAlri32e1eTebX5GGqRhhiBWPmHmxZO3?= =?us-ascii?Q?yb2EaLdwzHtepV1sbsRz7z39blp1ex4EvquV0CGFhWcL+RTl0JfArtLAQjtF?= =?us-ascii?Q?a3bR35MPcIzRcejeDAu8Wo5MkLbQKgag8tZtqM9MSks4FDb2Wu+74+k+3OvG?= =?us-ascii?Q?sbou1Un1lw=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 279c06d5-0098-4bcb-ee69-08da3de7375f X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 00:40:50.3526 (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: HomgoECPhNDtoID9r6Ddwj79Yx7FmC2S+ULsL3E+RQAg7kk7FkC+E5188oIqEoBE2HPeywuDTgs6rTlYK5glHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR05MB7534 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2. Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt") Cc: stable@dpdk.org 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 c9e352b73a..2af67dc0a3 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -875,6 +875,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