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 1B3FEA0505 for ; Thu, 19 May 2022 10:04:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 123F942B8A; Thu, 19 May 2022 10:04:54 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 63D384281F; Thu, 19 May 2022 10:04:44 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 115) id 3A51C90; Thu, 19 May 2022 11:04:44 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mail1.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD autolearn=no autolearn_force=no version=3.4.6 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id 41E7696; Thu, 19 May 2022 11:04:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 41E7696 Authentication-Results: shelob.oktetlabs.ru/41E7696; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: Pankaj Gupta , Jochen Behrens , Yong Wang Cc: dev@dpdk.org, stable@dpdk.org Subject: [PATCH v6 9/9] net/vmxnet3: fix merge error in Rx data ring initialization Date: Thu, 19 May 2022 11:04:15 +0300 Message-Id: <20220519080415.1577680-10-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220519080415.1577680-1-andrew.rybchenko@oktetlabs.ru> References: <20220503042257.15626-1-pagupta@vmware.com> <20220519080415.1577680-1-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Pankaj Gupta 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.30.2