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 BE018A0555 for ; Thu, 9 Jun 2022 13:38:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B8ADD427F9; Thu, 9 Jun 2022 13:38:14 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7A96E4069C for ; Thu, 9 Jun 2022 13:38:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ynxt8TrPkiLmGctpw53+PvRZkYKTq+Nb52pV4P7H22E=; b=TB9CNS5ygiWzlLW4Q/XDzdTChLBMrb7cOA3A6Jsm+jSPEXNvEzm3BP+XhHCN8IsTa+kzk1 /OBc1ByRkkrWEmlLaYtHDZY4NHZfoWvuvvhTYzdyVrQvGx9FDUTT77k+GUR/hxsmKP1eVq dFO96dZOroOMY76Ubj9KGRSXpPkpfzM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-374-uS7YJY3yMnSeHZFfEpvnwA-1; Thu, 09 Jun 2022 07:38:10 -0400 X-MC-Unique: uS7YJY3yMnSeHZFfEpvnwA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D0BC6101A54E; Thu, 9 Jun 2022 11:38:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5CC41730C; Thu, 9 Jun 2022 11:38:08 +0000 (UTC) From: Kevin Traynor To: Pankaj Gupta Cc: Jochen Behrens , dpdk stable Subject: patch 'net/vmxnet3: fix Rx data ring initialization' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:30 +0100 Message-Id: <20220609113701.386938-43-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a3f86b4d6b55f28cabf130c1a5223da3ed5f71d6 Thanks. Kevin --- >From a3f86b4d6b55f28cabf130c1a5223da3ed5f71d6 Mon Sep 17 00:00:00 2001 From: Pankaj Gupta Date: Tue, 24 May 2022 17:40:28 -0700 Subject: [PATCH] net/vmxnet3: fix Rx data ring initialization [ upstream commit cac5e257f670159310a9558860463e562d480aa8 ] Fix merge error. Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2. Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt") 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 d1ef1cad08..d4aea74026 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -823,4 +823,9 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) 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; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.773603050 +0100 +++ 0043-net-vmxnet3-fix-Rx-data-ring-initialization.patch 2022-06-09 12:34:29.751980651 +0100 @@ -1 +1 @@ -From cac5e257f670159310a9558860463e562d480aa8 Mon Sep 17 00:00:00 2001 +From a3f86b4d6b55f28cabf130c1a5223da3ed5f71d6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cac5e257f670159310a9558860463e562d480aa8 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c9e352b73a..2af67dc0a3 100644 +index d1ef1cad08..d4aea74026 100644 @@ -24 +25 @@ -@@ -876,4 +876,9 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) +@@ -823,4 +823,9 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)