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 0E43EA0555 for ; Wed, 25 May 2022 18:29:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 094D642B76; Wed, 25 May 2022 18:29:15 +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 818A9400EF for ; Wed, 25 May 2022 18:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496154; 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=47L/Bm9JLV/6WQ0FF2fUOkweDG2Ny1Tq+Jtt4hVvex8=; b=af+kwaVoEuZpBcVTSOxiwKyTUJIS6JCcGlWUsAIPmAQ6TZsX1lFeGPuytbDrJddVrdfpWG H/4qGUxC33gBWn+W8OIhAxQRcHkg800NW0Nv5dA1TOyf7V11Dy6qXrli5lGqSfbJozYx1N IKwnkXYB7xjRT7h6zEmGSJFm9DoyMTI= 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-582-2nq_SPcKNguO7cBCNLUhtw-1; Wed, 25 May 2022 12:29:12 -0400 X-MC-Unique: 2nq_SPcKNguO7cBCNLUhtw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 809B1811E83; Wed, 25 May 2022 16:29:12 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B6AC2026D07; Wed, 25 May 2022 16:29:11 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa: fix event queue detach' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:05 +0100 Message-Id: <20220525162847.711753-13-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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 05/30/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/82ccc27de556076d4b4baab55da6599bab141119 Thanks. Kevin --- >From 82ccc27de556076d4b4baab55da6599bab141119 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Fri, 22 Apr 2022 10:27:29 +0530 Subject: [PATCH] net/dpaa: fix event queue detach [ upstream commit ee6647e0169bae7bb3d3a53c309cd280e4740e11 ] Calling the correct qman queue free APIs to de-attach the queue. Fixes: 5e7455931442 ("net/dpaa: support Rx queue configurations with eventdev") Signed-off-by: Gagandeep Singh Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 2c2c4e4ebb..9847ca1be1 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1202,5 +1202,5 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev, int eth_rx_queue_id) { - struct qm_mcc_initfq opts; + struct qm_mcc_initfq opts = {0}; int ret; u32 flags = 0; @@ -1208,15 +1208,9 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev, struct qman_fq *rxq = &dpaa_intf->rx_queues[eth_rx_queue_id]; - dpaa_poll_queue_default_config(&opts); - - if (dpaa_intf->cgr_rx) { - opts.we_mask |= QM_INITFQ_WE_CGID; - opts.fqd.cgid = dpaa_intf->cgr_rx[eth_rx_queue_id].cgrid; - opts.fqd.fq_ctrl |= QM_FQCTRL_CGE; - } - + qman_retire_fq(rxq, NULL); + qman_oos_fq(rxq); ret = qman_init_fq(rxq, flags, &opts); if (ret) { - DPAA_PMD_ERR("init rx fqid %d failed with ret: %d", + DPAA_PMD_ERR("detach rx fqid %d failed with ret: %d", rxq->fqid, ret); } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:58.926290460 +0100 +++ 0013-net-dpaa-fix-event-queue-detach.patch 2022-05-25 17:26:58.547828302 +0100 @@ -1 +1 @@ -From ee6647e0169bae7bb3d3a53c309cd280e4740e11 Mon Sep 17 00:00:00 2001 +From 82ccc27de556076d4b4baab55da6599bab141119 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ee6647e0169bae7bb3d3a53c309cd280e4740e11 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index bddb3bb15c..e5a072cf49 100644 +index 2c2c4e4ebb..9847ca1be1 100644 @@ -21 +22 @@ -@@ -1212,5 +1212,5 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev, +@@ -1202,5 +1202,5 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev, @@ -28 +29 @@ -@@ -1218,15 +1218,9 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev, +@@ -1208,15 +1208,9 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,