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 D90FEA0093 for ; Fri, 22 Apr 2022 06:57:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCF23427EB; Fri, 22 Apr 2022 06:57:54 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2056.outbound.protection.outlook.com [40.107.104.56]) by mails.dpdk.org (Postfix) with ESMTP id 5BE0941611; Fri, 22 Apr 2022 06:57:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hk4aNH5slriqUwKPnIfW1h0xhKI7ufSXffvbf2jLeqlfMuRRZe/UwCM0rfETND3kUQGmVFO220sm+OupqR/KgZ6kIhWttwAK053ECqrRI0vZXMhJv49LUyg3aaomkPhwUhjges4/21Katq1wq3V3DFfUd0VSspM9U8UFRIRuV/T1oL6yuWiEk1drASs1qqSn2EdlbxAt15VJJpJFYLYvyCVBKZ3NeTrNISn5h7Sn91ntiRkBK52k0AUTldYdaKpa0xI5KezNcW/gVhp8Lrpwqw3q2yw3k7lEKCzyqbG4RwKBUwfeYWYFPA4LBwu038rPnpXbwi8Cl/jrO/eC4VWPfA== 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=BFlAwbj10GTEYVAe2+fI6q+suzG+kfsQEruu3LFIugk=; b=nuibt6eeJWOQVl131MG5cn/9224lmcHKxaOhmcuXA6+Ec3i2ddWia9CPmSq3Z5EoFiosUdAXAZ7GnAghQXrUph6xFD8baz5/YcXQm2sd+65XEzys9w3m/5sGpTvhMEZODY8iGU2zS0Syu3m74X9NcSM/V8Ttqonkp8568ARZB7Yj1cdpeaC6/H7XNf5YDNc6njC+iNtQbVHs9A21JlzuaWI16gJMgy5vMm9UZCPmu2mt/e9UVCIyY2XFrZ/Wkm3VCbwF3DMzhN/8ZSqul0GAM3RKg9pxD7ugcbB45nUtqkD6i76CTXrF3LZt8gggAE9ufnMShRAIziRin7XqsEjAzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BFlAwbj10GTEYVAe2+fI6q+suzG+kfsQEruu3LFIugk=; b=Yd6yTYqg93SowymBjbcYRpvEBsL46nr3sdkTI9N+qq8bzFJQQdQfrSrfYvJDbBwV4gJF3k/3DM3QXxunNLNnjaFfIsSj5wrxfDj5nTr6Mj7W/wgdvADKkkvGYYGasMc2/zg7hdFrwg2TRIc96W2QN9PTobrh2RoOU5IJPuIo3zo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by HE1PR04MB3049.eurprd04.prod.outlook.com (2603:10a6:7:18::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr 2022 04:57:51 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::8cf1:93b:c340:3be2]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::8cf1:93b:c340:3be2%7]) with mapi id 15.20.5186.015; Fri, 22 Apr 2022 04:57:51 +0000 From: Gagandeep Singh To: dev@dpdk.org Cc: Gagandeep Singh , stable@dpdk.org Subject: [PATCH 4/4] net/dpaa: fix ethernet event queue de-attach Date: Fri, 22 Apr 2022 10:27:29 +0530 Message-Id: <20220422045729.3320637-4-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220422045729.3320637-1-g.singh@nxp.com> References: <20220422045729.3320637-1-g.singh@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI2P153CA0016.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::17) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef97ecf2-5c47-4df4-22a7-08da241ca729 X-MS-TrafficTypeDiagnostic: HE1PR04MB3049: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: JRSbLSIFrcfXnUT53lEQWYacNfCP4ge+D5jkFUvVKMkES96r56/g2LVA+BUDNDeNpkjRLziWMoM4Mc9oU6Ax4RN8pkAvSduoTzO09pFQOGx1fQ72dF21uNYmubgE259TUvhIXT73wVPtPQCBQfpVHpqaBX8UCcy3JD/UjY4Cpj0jO/n75R04MBWwm46fgQbDCOaJZZLdWDgGu1KZMUkz0cYudqKqDkmDMO4ItEc0gvcleE3pW/bSuthMOScs5UOhw67Otzy/IJ+wO9Ncex55vTBhJrBLUN7HtjLDgoccXhd0RpjPzJV59RANOB4kyJ4qoT0yrOVC3mDOIGZit4cDTzGEdp/ryXUIUhiuWU5WnhT5yP+aSwy1Xe7k7vyG0Uk2EH6kSKg+zIoutseXu9Sg6EjIndN0nI/3oVcQHbAManwvGdpaCbXMIGnPhYFIGNdHn9mn9QeF5b+f/R4SFoVc1BcnoyrWakJycIsDzYAMMB+U3QU9pPGU4TdnffvuRfEKd7jlaLb9Xs1ndgn/LMh//6NfF6geItGBU5cs+8cPOrHfaIb+2IzzRN32Hjf9zU+N4MFil0p7jVeJKQB/xew7CJrSnRpKyNmWgy01N5zOnWDx7EjN91NLJu4QV2hu7TBKwD1Q3aIAznXfYGpv9Y2wbcyVTHNQta71TAC7nhrZTc52g4PFdBbzacyE1dRG/DPQ8CnM6mlntGiq2/fY+VLuOA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6916009)(1076003)(26005)(6512007)(186003)(6506007)(2616005)(55236004)(36756003)(508600001)(6486002)(5660300002)(8936002)(86362001)(8676002)(4326008)(2906002)(450100002)(316002)(66946007)(66476007)(66556008)(52116002)(6666004)(83380400001)(38350700002)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ICkYJIV6AjXceOeHkqE5Wt5Mu41eikGQjDGdhHtrnp0Smad0f3cTMJS69WMk?= =?us-ascii?Q?bllnXt5HPWk686okhBhwgpdjdcvn6uHBKF3PWb+ov/jK6DF1onXrxJ9sRbBl?= =?us-ascii?Q?dBDbJN3ICV4Dh8Ra5kM1qBNOW/tzpi4MnXHugQ1PVqpBrgnoJqGetHjnmYoc?= =?us-ascii?Q?h1eCp8VgoZ34I/kMjZ0BdwrGHnwuvU5WOs+WDejgyRRkBwTboSZVd+0NKBwj?= =?us-ascii?Q?Yf5I5a8VRC2ktsIWBe4Mls3YNG0bJvKSxMW3uP3a42nW8cf0dOTSg3dmO0yO?= =?us-ascii?Q?eH+kbbldRM5qE0CN8Tb6hsi2lk+/rRBRq1byorSlTsprUAJ98a8ZOnESjIUX?= =?us-ascii?Q?B09xUS2LdYqMHnBWE7e48J7wi/Btg0qv4t61Hp0yzOop6XbKM3yCJeX7RUZE?= =?us-ascii?Q?7byRy807Z4c3GEVuh1stzUSg4R7VOnidhty4ZipZaMUXXKZ5wVFBQbInZkHE?= =?us-ascii?Q?ddn6ZbqoJ/LdeTn8087ca3UqTfTAYCBkNN6y08Pb0REtKJdtzHwXi52oyoPh?= =?us-ascii?Q?O1/+O15Jwi3N5vhynb4TUA0gH8uB9fbSEQ198rzAydsd1oo6kiJp7GVXHzWM?= =?us-ascii?Q?5dZ+DS7AYykPn5l1dqEdEEdxTEagr9gMRunuU6p4diJPOzl9XwV+tX11X1Im?= =?us-ascii?Q?LMy557DrLo4r5hQH1n5XFW/bDgHkzbA69PHuPP0meet9HZY9Jh+QGZDxnGhq?= =?us-ascii?Q?PW/7b7V3gCA0oRJTe5J2qGkmRnxvEy8jChFJgQF68UmL5lrg3x7Xp2bW3mCx?= =?us-ascii?Q?6hNlVwLr4qDGhtxmQHCixmqUCzekTh+14lEoKPwuO4k63yGzAdehIBDDg3Dq?= =?us-ascii?Q?ByWP9s/zjVJXPlqcn4dJVQSNBCqekj4lOhYVDsduHst7h7OIxhZxmdAwve4G?= =?us-ascii?Q?rBJqmwyDGIWwrXW4P7JpRnI/+Q0TdaqsjxD2pIYS91LNPA8zGwUVWq3ndB+V?= =?us-ascii?Q?O19nOn66YXTHfau0xrw4khgB4TXJs/nxBueHuXtGdr/sm+S3WKL+xJBf6pLu?= =?us-ascii?Q?eU75x6ETtPU2ZsZHDybuq5+gkEbOIzFStee/KmUxVgjsNMZ6lIUkP8Q6IC/6?= =?us-ascii?Q?cWP4hIy8fWrQlR3vv9Cp0t4MKD4KbC3gXy1x6oBLJEaj118VF8IMSa64xbV8?= =?us-ascii?Q?/Eaa3VCGuNcDpxbD51rOhIvGjgt1u8VKJaEFNOG6xHAmCojjrUu9g5hdCCKa?= =?us-ascii?Q?lU/6vOLcO1YiRFbPC9FntAboMWk5py2Kh8G0xZY5hqrociGJMUptIoe4EtRx?= =?us-ascii?Q?DqR1yWC4sx+mKdvHck+3voTsXTdCdspmMUaxvryBzqOrxji1qBtOMx9yBB4Z?= =?us-ascii?Q?RSAZ2aewgi5bMZ2KeG5Eqjda0WAyr4KkGFnrW2uvLS2L3U4R+5lMFLJdjcgm?= =?us-ascii?Q?QBTgv9tdXVxLKFLz3FJxK8GYSP/zNCsARv1RHzEMhLwbUTGDdQu6L24RXV2I?= =?us-ascii?Q?jKpFlweaxWzBIgAvW0EVXHLRHsJ2JYen0DZEd5oEw2ubjriDFVFFuBb6ndSu?= =?us-ascii?Q?3mOYPodehSl4JKYVhZYRYKuJ+jN/SzuMvhEiOEbqG3PAXWfPqnlOtVmsz+ps?= =?us-ascii?Q?JEPz3+sMfTkcX5vB0bEv3wNZ9MTIxiQTHRiQ4lTdwZie2UJro5cG4El8C7BD?= =?us-ascii?Q?+qqSFxn1aJAlvvTJXSXtI/9BdhpVc6Ym08KSf50/qdpbRKnBp1Ux6kLpROBT?= =?us-ascii?Q?05oFmA2Q8o1ZDzpaZ+UNn/x1GPbyqqQNiswcwU08hviovUrpzs3cKTpX3N57?= =?us-ascii?Q?YA3k9imX9Q=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef97ecf2-5c47-4df4-22a7-08da241ca729 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 04:57:51.2583 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BqmNhDU95VAWnnvsn4CoxHUoy+nkD3TKw1SgxhXEjkMIuzYP95m+xLaXHQn8e2Sy X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB3049 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 Calling the correct qman queue free APIs to de-attach the queue. Fixes: 5e7455931442 ("net/dpaa: support Rx queue configurations with eventdev") Cc: stable@dpdk.org Signed-off-by: Gagandeep Singh --- 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 bddb3bb15c..e5a072cf49 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1211,23 +1211,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.25.1