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 1FCEAA0543 for ; Thu, 7 Jul 2022 09:56:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD173415D7; Thu, 7 Jul 2022 09:56:24 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 906D9406B4 for ; Thu, 7 Jul 2022 09:56:23 +0200 (CEST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id CB79540AAF for ; Thu, 7 Jul 2022 07:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180581; bh=ATYIWniuAp6RvSb2ceeCzrmm9CuwOd64pIt3QB14LS0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bTsEtCbFN9QWVXAO7p66ozYhKQsoRjC/iZmC5Xru2/dDt8MRwVKsV/HXwcoRCpBbp IrZh/fljEgpVHOALqtiAJ0uosVI2xD3FOmw3tbZ9xFMfecntyXv5wiinz568qTiW++ a+T+6oYIjRl1r9s6yGK6QtJ2aqJlbmhucyVqm0a2L7wp0eMF9WhZsjRPAJVmRHVkr0 JMQSCs/QLaFZRWgfm9yOAcx+bmmKafMc7KfuZn83AAzg67CsPVLEs2P3JFuSzgW5aN uo7nU2+cKY1npn3aYXxEvjrJ+xxgokNgwRQPt1qEQKv6u1zoqamvGq1PuUZi73IDIe UohuQZGlMJaAA== Received: by mail-ej1-f71.google.com with SMTP id hq41-20020a1709073f2900b00722e5ad076cso4516285ejc.20 for ; Thu, 07 Jul 2022 00:56:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ATYIWniuAp6RvSb2ceeCzrmm9CuwOd64pIt3QB14LS0=; b=03/cfzJKIqty26zUNJfDr7Qt43KXezU/COXU4z7qyshXcjY1Wa0Kt7IwNrIkYfI+mU PL8ya8LyCa/y/D1bDnA0XaKxqzbiOriHy9tC+GZ61AUwL9tifMXeYFJpwbOYarz3VY8s blEi3DHMU0SbjFHCa5OU/dlIswwmVz8FSzOi5wP+D/GKOxmvk9apL8Satfaj9xVB0eXb PBL7+DBgf9Er5bbGDQiUziX3y6wE6DCikh3z0cOTtRS9cID1GZh9GXOwjHYzYHk9hybC EmmJkT4X4OXUxawHjTV6YmqtiElPSkc4Gb/tZcrfjihQEm4P2Ko6wNjgZBWjkz4e9bz1 GGBw== X-Gm-Message-State: AJIora/hAQmGRy9DOi9Z8BD+lpaiy7WYuSoNu591NeP8qGBYfcCnDYZ7 bpbU5pxT5/D0Hg58Uc7+VEzYyfj1mdeQO2+U2K3L/xKQgncfIK72zwTvDtVnj01ZJNJgiaA2Fqb jOdwKzX8DQjkQRO8sqiBWrUDE X-Received: by 2002:a17:907:3f8d:b0:72a:e569:df9d with SMTP id hr13-20020a1709073f8d00b0072ae569df9dmr12370519ejc.135.1657180581211; Thu, 07 Jul 2022 00:56:21 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sMtbsIh/vkwz1UFK8I1Sxx+JGqLD0w8q68p8Qg4BgpmOu2Vjc78Vl19vGNyb4fXVXG/+Kr1A== X-Received: by 2002:a17:907:3f8d:b0:72a:e569:df9d with SMTP id hr13-20020a1709073f8d00b0072ae569df9dmr12370507ejc.135.1657180581016; Thu, 07 Jul 2022 00:56:21 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id jz2-20020a170906bb0200b00726314d0655sm18522363ejb.39.2022.07.07.00.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:56:19 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Gagandeep Singh Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa: fix event queue detach' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:15 +0200 Message-Id: <20220707075522.194223-20-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> 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 Hi, FYI, your patch has been queued to stable release 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/385c7b6b3b41f18fb66f85e094757dc19b698260 Thanks. Christian Ehrhardt --- >From 385c7b6b3b41f18fb66f85e094757dc19b698260 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 4d5946103a..37dce2146f 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -811,23 +811,17 @@ int 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; struct dpaa_if *dpaa_intf = dev->data->dev_private; 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.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:12.060652788 +0200 +++ 0020-net-dpaa-fix-event-queue-detach.patch 2022-07-07 09:54:10.821823727 +0200 @@ -1 +1 @@ -From ee6647e0169bae7bb3d3a53c309cd280e4740e11 Mon Sep 17 00:00:00 2001 +From 385c7b6b3b41f18fb66f85e094757dc19b698260 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 4d5946103a..37dce2146f 100644 @@ -21 +22 @@ -@@ -1211,23 +1211,17 @@ int +@@ -811,23 +811,17 @@ int