From patchwork Fri Apr 22 04:57:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 110076 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3CBC8A0093; Fri, 22 Apr 2022 06:57:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1636A40042; Fri, 22 Apr 2022 06:57:51 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2052.outbound.protection.outlook.com [40.107.104.52]) by mails.dpdk.org (Postfix) with ESMTP id ED36640040 for ; Fri, 22 Apr 2022 06:57:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mo84/1ZJK7hlkwpdJkl0i/XkzYr7jvDtuPkKmCMjMhXbP7Kr3b50L1Po/26h62knssrr9dHdL3z/PDHgwdbFT8RTwYaZNTj/mttlaCDVs0kLvheb95UkIHpPFXj3BtGD6/dp660UiPTX7utfaEZld434TOiXK2hb4eMknzOfNx/XgYPF5CnyjoZgUHUpZFrc669UDgMfNvqwcLTqvhD5/JqEEocxqCMX4wQhkBhjJUW8y4D1BvbMGuEKxcxnde7JzOzrWdjkvq3P74CEquLY2+KzTH6/rY44KtKl6AsMzTRRQIUGY8m529Rew/ygeS+0vcR8zJ79JepEI1nZMuZM3g== 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=u8ZwTSIqlKV8Sg5mBirCJ7ftqEYBOuJfcC9C8oP6pcE=; b=aw+Xev8/+0aJMA8YIGoe0dszoaTVOlj90wN7ul/UZLdmHRyrBoyHoxZtxz8ki3iqn8TDfhJ2D0PG37s0zTmlCWJ213ZpTh+IKWz76KIY9Fgu4+QFwOGZazkbbJK7i/dL5ByUbBRuQVjMAXdx25f6gxiaCNUaXtU7c25G2bRcFAHzNF7iAMCJddQDPT3VcHpmKC036ZYDVqEjXyj0egPHxYq+LNswkdJ8NXXJfMxBXjl1yRaRL6pscbLK/br/4qyyApQ36C6H9DvpxPTm0VXdrKy9dmyeNxzb9dqARTPpGbjmrPzQPYaWrrxYtikTvJEW5ih+H4EJ2JCk5irv+cMr1Q== 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=u8ZwTSIqlKV8Sg5mBirCJ7ftqEYBOuJfcC9C8oP6pcE=; b=rj90Xw962HX2PsVco259ZpWlkj6lqo14JVoXp5QEFiAb6LScEIvhIELZDZB2fbE1GmcCLQJqIvAdsHa2R6ti8glHLdpFIunDkJ9iDTO538CN1omMbVx5ZIVFxCEjwTG+DzBKRz4b/nZNHU5gfJPdpfhM19V5Of/LZPUELiK3yzQ= 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:46 +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:46 +0000 From: Gagandeep Singh To: dev@dpdk.org Cc: Rohit Raj , Gagandeep Singh Subject: [PATCH 1/4] net/dpaa2: update mc to 10.32 Date: Fri, 22 Apr 2022 10:27:26 +0530 Message-Id: <20220422045729.3320637-1-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 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: e8ca69de-cc98-4d2c-e662-08da241ca41e 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: tfe5eOlakXRMqrqrE0RlJZyh0ArRMHu+cwEPiXg3GfTia1at5ffkdXsslJKKT76/mNyBQI1O4SEV5lcrR5hlCcyqFKZ3bsO+tbdZcVot6Ssq51QawJsP7YESMgO2rXZyrfWqmSGIBIJLh7V4smvaIdWm7eTIKo4PRZ0M0GcOcgHAeh1UO5ZUu0xlZUgK3JHQRl6wBVIojbpHeBWH7XL1IFt325yeUllNGoRK3TmYEOEy9LRpX93KnpbwS9n8xNtUuhQ0ziujGRfzjtfz8N04CFTCGhxVGWx4pWwVYlziWAibjVZGtvXHKyjMfGW3jo5YMWH9GHsC7YBMVGVdRZe5S21egHxV4yPRW6CK6pes5YYXb9yp9zIClXmH/p1UpE0TTLQtVsK6JbWEb6I/gF4rO9Pl5J3S56zIIZ3116eVhWSz2W/fSEMQd3Xd1bpRqTERPHx5YJPO6XeF83oHQU7v5A1REE3mfvUqoRueD0MvPP9I6hll8Pi+f+Yf0njWZ+9UOPStk9afzbX1j7nxfshhywZsdYIYE47/f+I5qb7JwlN/eRsgFj3fNWGhEEWhrl/Gw0lnhZh67pvDCjovTfm2DRlBg8f5t+ShiGRPQtG/bJzjhTqh47Mb9YhVIMtWwJtT4sW9+uOOet6gLouRC1bGnlvHuXI8FlFmtZY9q39T3lzia7Xtz0+LRSR8VnTynDSEQ5wzBMjsvCGQQJX8ZQDhhg== 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)(54906003)(5660300002)(8936002)(86362001)(15650500001)(8676002)(4326008)(2906002)(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: DTpPP+V+effhOxCpb90a1+tOZKX4ri56Zut9JSDZYr3PQqSKXm1dc0bSqbokNGXgvSgT73HtipaieFYJXquGqET4Ozofn89T0mkZUNG9o/h4eNxAoSEpjc6rwTfgvnEsQd8CDVG773V8qVaAhVup7R9s9q1cxvj7XifZBvqHcdjWtf9iwCXnGu/KWQ/gCYS4gzV6ugW8KMYLS1kk5Y9hDREN1fp4IzKo9nxYgdsBl8BDQ5QPGbUnC6KgGJ5y7xtH2KavbCwbEJXbsoDWI/3HLVB+61I9Li5K+RZzTAefcBTEakDb5lNntWgv6j5BnJnClSJH/oPmGjLvTEhfWhslB1aXRAoPJ2gWgV5z+xUyOgSma5z5Wdm87NGkfvGO7623u1LD060rm3SI0viVs/um3y+W9t9xbQH0w3AqLyFDTlcyYhhV/9DtmcYPF4ehFA2XnAw9OG2vv5RG4HQr1iHTEyJWfNFcnAGLO5qglZ/uIZEgzqGDQwmRPGxzmLCtdH+A7teDvDwE0XnTjMk5f5+ZGarjCnDpNtEgRdwbvkykhykifWncwa/i0J0FSt8zi+fQ37ZRpbeGHYxs9sbTrAds6xr0PU32N6FDeAxduL3PmHYX6L4pH9d8cc5XrEI6oSSmFPfJTFPCO+0KFgEUCqqdwBuXI1X0qfY5v8e6FgMUvaIYgAeZHvBUYNgxH6/nAQsX6LPYhVzzVSKLrkkYS4A8xhnnpe5HFZbviCo1Put1tZbCx4dI5bKTCo8IoQA7RhsR4SZfMAfttV7fvBNM03whhi4N6L6DLDMWYlBndNXfNTnGiHf95k4FXBNjizC7cmw/7kaL+sCMnuNnVhec3dBQK65mygZ16JIfWDYbR+QVTsRqeTeklyD/Od6lxOhUigd+fKxPSHg/diS3Rqi8Qwgw0g+2kUYflcWjN1nyLhFNn49LVSpIr2t8rO5yGfrY4Zw7Mz0y0DJjI6rl0TmZ22nSAR8xzTBZ1ySz673IQDc9UGHuJWkPyX77uNqsu7x78A5TgjSJ1RffJvY4NYDv9cZbRpMHbw4Excwjb1LAk4/jhIY8Cb3ZgGlZHAawkHSn/NPgMzn+WrlckOhOpFwsGlBDJv+qMR4gO+em2vhbaByqRftYSDI48s1/vZsyOeOr2b9lkaVc10kJf7d0SGItUcFKZ66iLxi1KcyjC80IVZKHjRMDC35znb3qArUWDpmDUq4+kGNDcGsCtHRZPJRgd8quI10Aq5zscVv4m7X/LuL8wRTmlnS/wfNhgq+bKAeSJywlFRN0QFbDkx0lWZ7cuafwjt4NUmVJTvNDQbgh/shh5Ouoq7gGjME1sYR0VBkmQ41msnM+cKHQIeaMSrOL4BvT8HNbOMpg6RKgOW4oozQv3WlHWM5h/KlyZwTG1visFjtWyanQ0ryzFbUXjMtbtRtZalSsy1eboY/wKAjAZWd2ncbsKsbkhY30CLe5BzmmKGYrAgmd3uAqJp/mjkY/yXhip8oMA9kBoWJKtDbgIufYWBt8N3AiOPH4N22HQASW82hlkYB2iALYp5Biw2g7zUaVRzQRsFf/2Snmck6Wt+JQEREpjWCXqGVlLB0VYgF4uwHKXJCvPKc/OfceMMPE9Ip/qAMezBlYiB3VRhRmg4q2QvJ3dSAsXqMQlxbnfR887OUOHkRK9h+XWEH5phY4DVZ1PWsau0Gybenfifw8TdB8gkvwtIlFOYtl6athcTJjqYsJcKUR6OkfGcYXjdnxp4Fc8w== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8ca69de-cc98-4d2c-e662-08da241ca41e 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:46.0174 (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: ip26AIc5sKgdNFlaHm2CTQTPvxssIDNIUxfthHLKyZXoU2CZMpai1sh+AWJGc35J X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB3049 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Rohit Raj Updating the management complex to version 10.32 Signed-off-by: Rohit Raj Signed-off-by: Gagandeep Singh Acked-by: Hemant Agrawal Acked-by: Hemant Agrawal --- drivers/bus/fslmc/mc/fsl_dpmng.h | 4 ++-- drivers/net/dpaa2/mc/dpni.c | 6 ++++-- drivers/net/dpaa2/mc/fsl_dpni.h | 1 + drivers/net/dpaa2/mc/fsl_dpni_cmd.h | 26 +++++++++++++++----------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/drivers/bus/fslmc/mc/fsl_dpmng.h b/drivers/bus/fslmc/mc/fsl_dpmng.h index 073d47efbf..c6ea220df7 100644 --- a/drivers/bus/fslmc/mc/fsl_dpmng.h +++ b/drivers/bus/fslmc/mc/fsl_dpmng.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2013-2015 Freescale Semiconductor Inc. - * Copyright 2017-2021 NXP + * Copyright 2017-2022 NXP * */ #ifndef __FSL_DPMNG_H @@ -20,7 +20,7 @@ struct fsl_mc_io; * Management Complex firmware version information */ #define MC_VER_MAJOR 10 -#define MC_VER_MINOR 29 +#define MC_VER_MINOR 32 /** * struct mc_version diff --git a/drivers/net/dpaa2/mc/dpni.c b/drivers/net/dpaa2/mc/dpni.c index c5cc9302f9..4d97b98939 100644 --- a/drivers/net/dpaa2/mc/dpni.c +++ b/drivers/net/dpaa2/mc/dpni.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2013-2016 Freescale Semiconductor Inc. - * Copyright 2016-2021 NXP + * Copyright 2016-2022 NXP * */ #include @@ -596,6 +596,7 @@ int dpni_get_attributes(struct fsl_mc_io *mc_io, attr->num_channels = rsp_params->num_channels; attr->qos_entries = rsp_params->qos_entries; attr->fs_entries = le16_to_cpu(rsp_params->fs_entries); + attr->num_opr = le16_to_cpu(rsp_params->num_opr); attr->qos_key_size = rsp_params->qos_key_size; attr->fs_key_size = rsp_params->fs_key_size; attr->wriop_version = le16_to_cpu(rsp_params->wriop_version); @@ -2238,7 +2239,8 @@ int dpni_get_early_drop(struct fsl_mc_io *mc_io, * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' * @token: Token of DPNI object * @qtype: Type of queue - Rx, Tx and Tx confirm types are supported - * @tc_id: Traffic class selection (0-7) + * @param: Traffic class and channel. Bits[0-7] contain traaffic class, + * bite[8-15] contains channel id * @cfg: congestion notification configuration * * Return: '0' on Success; error code otherwise. diff --git a/drivers/net/dpaa2/mc/fsl_dpni.h b/drivers/net/dpaa2/mc/fsl_dpni.h index e970e4702a..ce84f4265e 100644 --- a/drivers/net/dpaa2/mc/fsl_dpni.h +++ b/drivers/net/dpaa2/mc/fsl_dpni.h @@ -372,6 +372,7 @@ struct dpni_attr { uint8_t vlan_filter_entries; uint8_t qos_entries; uint16_t fs_entries; + uint16_t num_opr; uint8_t qos_key_size; uint8_t fs_key_size; uint16_t wriop_version; diff --git a/drivers/net/dpaa2/mc/fsl_dpni_cmd.h b/drivers/net/dpaa2/mc/fsl_dpni_cmd.h index b7bd7556af..781f936add 100644 --- a/drivers/net/dpaa2/mc/fsl_dpni_cmd.h +++ b/drivers/net/dpaa2/mc/fsl_dpni_cmd.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2013-2016 Freescale Semiconductor Inc. - * Copyright 2016-2021 NXP + * Copyright 2016-2022 NXP * */ #ifndef _FSL_DPNI_CMD_H @@ -9,7 +9,7 @@ /* DPNI Version */ #define DPNI_VER_MAJOR 8 -#define DPNI_VER_MINOR 0 +#define DPNI_VER_MINOR 2 #define DPNI_CMD_BASE_VERSION 1 #define DPNI_CMD_VERSION_2 2 @@ -17,6 +17,7 @@ #define DPNI_CMD_VERSION_4 4 #define DPNI_CMD_VERSION_5 5 #define DPNI_CMD_VERSION_6 6 +#define DPNI_CMD_VERSION_7 7 #define DPNI_CMD_ID_OFFSET 4 #define DPNI_CMD(id) (((id) << DPNI_CMD_ID_OFFSET) | DPNI_CMD_BASE_VERSION) @@ -25,17 +26,18 @@ #define DPNI_CMD_V4(id) (((id) << DPNI_CMD_ID_OFFSET) | DPNI_CMD_VERSION_4) #define DPNI_CMD_V5(id) (((id) << DPNI_CMD_ID_OFFSET) | DPNI_CMD_VERSION_5) #define DPNI_CMD_V6(id) (((id) << DPNI_CMD_ID_OFFSET) | DPNI_CMD_VERSION_6) +#define DPNI_CMD_V7(id) (((id) << DPNI_CMD_ID_OFFSET) | DPNI_CMD_VERSION_7) /* Command IDs */ #define DPNI_CMDID_OPEN DPNI_CMD(0x801) #define DPNI_CMDID_CLOSE DPNI_CMD(0x800) -#define DPNI_CMDID_CREATE DPNI_CMD_V6(0x901) +#define DPNI_CMDID_CREATE DPNI_CMD_V7(0x901) #define DPNI_CMDID_DESTROY DPNI_CMD(0x981) #define DPNI_CMDID_GET_API_VERSION DPNI_CMD(0xa01) #define DPNI_CMDID_ENABLE DPNI_CMD(0x002) #define DPNI_CMDID_DISABLE DPNI_CMD(0x003) -#define DPNI_CMDID_GET_ATTR DPNI_CMD_V4(0x004) +#define DPNI_CMDID_GET_ATTR DPNI_CMD_V6(0x004) #define DPNI_CMDID_RESET DPNI_CMD(0x005) #define DPNI_CMDID_IS_ENABLED DPNI_CMD(0x006) @@ -104,17 +106,17 @@ #define DPNI_CMDID_GET_CONGESTION_NOTIFICATION DPNI_CMD_V3(0x268) #define DPNI_CMDID_SET_EARLY_DROP DPNI_CMD_V3(0x269) #define DPNI_CMDID_GET_EARLY_DROP DPNI_CMD_V3(0x26A) -#define DPNI_CMDID_GET_OFFLOAD DPNI_CMD(0x26B) -#define DPNI_CMDID_SET_OFFLOAD DPNI_CMD(0x26C) +#define DPNI_CMDID_GET_OFFLOAD DPNI_CMD_V2(0x26B) +#define DPNI_CMDID_SET_OFFLOAD DPNI_CMD_V2(0x26C) #define DPNI_CMDID_SET_TX_CONFIRMATION_MODE DPNI_CMD(0x266) #define DPNI_CMDID_GET_TX_CONFIRMATION_MODE DPNI_CMD(0x26D) -#define DPNI_CMDID_SET_OPR DPNI_CMD(0x26e) -#define DPNI_CMDID_GET_OPR DPNI_CMD(0x26f) +#define DPNI_CMDID_SET_OPR DPNI_CMD_V2(0x26e) +#define DPNI_CMDID_GET_OPR DPNI_CMD_V2(0x26f) #define DPNI_CMDID_LOAD_SW_SEQUENCE DPNI_CMD(0x270) #define DPNI_CMDID_ENABLE_SW_SEQUENCE DPNI_CMD(0x271) #define DPNI_CMDID_GET_SW_SEQUENCE_LAYOUT DPNI_CMD(0x272) -#define DPNI_CMDID_SET_RX_FS_DIST DPNI_CMD(0x273) -#define DPNI_CMDID_SET_RX_HASH_DIST DPNI_CMD(0x274) +#define DPNI_CMDID_SET_RX_FS_DIST DPNI_CMD_V2(0x273) +#define DPNI_CMDID_SET_RX_HASH_DIST DPNI_CMD_V2(0x274) #define DPNI_CMDID_ADD_CUSTOM_TPID DPNI_CMD(0x275) #define DPNI_CMDID_REMOVE_CUSTOM_TPID DPNI_CMD(0x276) #define DPNI_CMDID_GET_CUSTOM_TPID DPNI_CMD(0x277) @@ -238,7 +240,7 @@ struct dpni_rsp_get_attr { uint8_t qos_entries; uint8_t pad2; uint16_t fs_entries; - uint16_t pad3; + uint16_t num_opr; /* response word 2 */ uint8_t qos_key_size; uint8_t fs_key_size; @@ -906,6 +908,8 @@ struct dpni_rsp_single_step_cfg { uint16_t flags; uint16_t offset; uint32_t peer_delay; + uint32_t ptp_onestep_reg_base; + uint32_t pad0; }; #define DPNI_PORT_LOOPBACK_EN_SHIFT 0 From patchwork Fri Apr 22 04:57:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 110077 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2EA34A0093; Fri, 22 Apr 2022 06:57:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E63F1410EF; Fri, 22 Apr 2022 06:57:51 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2052.outbound.protection.outlook.com [40.107.104.52]) by mails.dpdk.org (Postfix) with ESMTP id 1835B40042 for ; Fri, 22 Apr 2022 06:57:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=biXaEWsGV322Kr6MP8+GpJsdchWYvsQ9jVB7rfnCrmuMRUqQeuGegWMJPxh6gK6Nj9SAykJtIShjX7MKYDgiavjMO1MS9YFNjAIEyUxbiOoTyf197QzXhvZQzl0BD0nFvIX6fdhthm6B/5NdRgjH93IoSzPKK3afdNNoAdW2AEwGIJWKIHBLwSlYhGyMpcxxTRVuvjdonMAYEuDZXCB+0q+SJc/q2KuLvlRlQsVwxq5UJehklgpeHXRlgb6DgQg4q6WrgG6A0zIkVCISvbLOuK51QSYyRMUm9fu8UHDy2Ftjq2kJzHqztpr65HzSd2lFIAh5+rIEJTzbEr7T27ViXw== 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=WpiZqQFuHM1O2jox6Qrscy3oJgnXwK6x5DDJIXUTU+A=; b=LeTM7FcQSR5egaVEVxUMIt30YXXc6zppVskhklROrHJt0OMHd/z+EwmUVpbr2S3+QHvGe4W7vEE5NzNJYwD35nabDlzDsky0k54KbIuJamZzgEbitzQxbtP6FUz2yenCWY+oAcPfQvoDpg+Lslv37o8Hq+tPMrPEbVprbaqGftlLTj/4MJlCIGpsmxe3wTioKvl+hUwkzAAsDZ4+cmlx2YFSpR7H7tyXC5S/d3f1crgjri50mZS1W/sXR5tpoWXYPAu2m9il9TlEkgsI6nF4MFMoGmCW5199UJuOwuA8Qivu7GrJzBJKFtFJFW6y1LfRwiqj7IZuOLRZvvRsSUqHwg== 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=WpiZqQFuHM1O2jox6Qrscy3oJgnXwK6x5DDJIXUTU+A=; b=N6GeVqiXJCojp49PWwhIYI0n7783aI+UzoQxQ2ocEAIyJSGVQliex4lxMu1QYCtcq5bCh3ToIKlaE7HAmdYxQt+cCjUHQ3SHfl3+TGf+LtZeQtaiQWToSD/0BhyhExCJnMY1kiOpJzOHf2Tbvp0E3rqrD1B5Juj8kLGECX9mXOg= 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:47 +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:47 +0000 From: Gagandeep Singh To: dev@dpdk.org Cc: Gagandeep Singh Subject: [PATCH 2/4] net/dpaa2: support mempool debug Date: Fri, 22 Apr 2022 10:27:27 +0530 Message-Id: <20220422045729.3320637-2-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> 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: f1296cfa-41ca-4106-749d-08da241ca50b 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: V39QSGwUkZBoK4F3WvxTWoKfrr9BCjPQGuu4WrWpAiykhEHANqfr6CzqbH3w8pDoAoxVv5GrutxD7EGIqTnQ+VH9j/g+DbO5w92ohPN8vRfxQ23tIkJDwrHO9ATOplg1ppH5QdqU0TY/HeJiqFnvDn24Eol15hN+PX0r0vTxLIiKdzSN+ChcjQhpNox/eCWILGmncNZf6VDcZrUUYt2HYjWjH2U6UIjt53w7CTaW0gwyr2zi6xdzxlbxr1Lqr0mJ83O+X5rBEDqPfSEr14itLIRsFtND+cM8XArmYmW6ZRCxUugCLmT5zVGmhteRsq76vs+CHa1YZYP5v+SIPmIqASdXUd1Sg7mzXwxK1pabkN4cG0GvVKwmnZnC941F8g1clAmEohkkb3AU9IKUD8/NvCM/mlXWrYhCEDMSzBcF9xNhpoPb9GPCu7doDl3raS3bofvPyQoq5v/bYJMuVH2tPrj85mhKMZXDP4+arS6gL542Nff/plJgLvXoButHbW3TaiH3g/SKGKWgCyxfIizUjilP/WkHKXv3LMGrc4Po5TZC0KUPifbxbYGk8qSBTbtth4tCsE+iVlRVEKZi2rYxfxdNlBgpIGDEjTyeaVUMfr89X8EgASQaBVzj8nDyRW3CoVUZI1l3Z91qNItiepbtQhUkyHDBR7O3XVObNJJUKH3IRp2jCK4L818I7b+7fcXVSnlh1M8JhbHk99C64P8Lbw== 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)(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: WyutvKvCQQGUKbpsvpTbxH4Uhj39dXl2rNIp8BJh7tvwXdtIBXoGYOe3kGeyk6q1XCHtmRxO5CSwXcdxX/S37EqQJ6T0u6TUzETOwwH7YRLMq79Jvj+wBYBJxvSGETL1b0JMj8XKIeXNFO/4tWCpLTJ7vE+koykBvc1wHk7TRVgiBYaznKRAH4xSafCilnUXuQzpclVrgN3xlPsy2ORYthGWrUAYSECWWq0pgzWhT7HisPuvlyeT5hxLHTG+LBiez5vAdzTVZ3cBcv4gVs3ibisWiy1XmSfbbUmG12Dh/qhlylohGsJDSn5b4vGfGUQOebbRoSVHoHKR3WcrCiPB810O367o2O6bbtAAuyU8ujVenvjelTXVKKPQ5bpmD+l6H0Z2gnQufGBpUUkxMeVSKyF6hn28eOVyOwplqPtAS/tE++n2Rte5aQmBChmbkQ+Q6zegsmzfyvujFI0ToI5uzuP9TPbzsIDmk1bllWkHE7726WcggKSfdSlWQ2gsRv+ZoM1jG909GuvDx7rY+Bn3Spk6Ukktzwce2d7AmAOO4moctVXQxqDeCXTr2ZwfYvlxJCk0WdXBv31VDBghS6fpy62xyARZFJsNJrZm4WsGTIt3GL2422V4aJuRvABg+ipYh4tWe/OrwiKntlSuXqdffARQOgNdNOaBX6GlMZ0ZtIhqP94pg7fC/pxDpgeO9ieIb9TfYNGKpEKnB3GJzxP+f8BlCtiVNGufCbz0i/rJANMxBPSp1e99peznes/O0aHqqLwSp7LRAAU8OesUdbMUJteOoMhy+3lDe3VabKlpfOT1yibGS41Qdj0V4AjwRBknMdzuXchj4E84HqupXRcZzcbqq/dXP+dAIed0VRQpFVFb5NDv5QyHFdYhARBGcrl91lsl/8LxQory3o/ade0IIn3u/HcWnTWSWBpNQdcucYjqZM9GXmqyvsjRlGpU16xRjd9MpZ0luGa5PPujd+9fLOVwMzewgLyIIGAN+ZrgTMIWiYZJujRErqN8qorEqj2Zg/z1UNZQReQO1stYsg/dLLC5Bq74GPf5YDWhZcQ8ZsKG74UqGpbwx4ylZZYEkCCO1S6LBzAv9fFi9MDtOiQyaTRiqzqSkAu6wawp7Wa7+/Gun7mfuF0ikSJLIHIrOf+18BFViZZX6jSpWas821ti84duabvDk6NndriW69ohUMT6mF3uWwqAmrSSOzpP8V99KTfOYfDYXOFVYqB1qkZ4HvVDHJMvBkFd419XhwkRjUNCWjV4QpYkFT255XqGCp1GqVyoiWf64C9Wfl87mtg7FF0mBXODIWZME9JWcP8XVzBl6fd4uOYMCO0mz9Fg6VBbkn7/n4pAjIoQx1I0TZ4M6vds7bl/rhULxfoXCPoUrjBjDDBUXncNPXPuFUZ/0g92uC2+AhVkpWrtuCPclfskksrWCOpELN6lSa7Eo7rXhySkxV152qXNfrGIINa5WEvIu3EqJMBG5V5JLNBQbaX9qr7iE56/Jn2RRyBJY8ehtVkfjeLJSlzIGDnEjWLyLqyZvgqeuNfETCaGUiIyJCImMA9/yV4NuoRUPnqY+lIFwvYTUo+xsNTsgjw0D6k8sz6S3rQjFKYV9fOB/zbwbSAmlXXHe2SVK1+kGfTNtita6DgTAV0/Dw7/NImu62wF+CBaQaqFg33jJ1m2ahHDQ+joeZ/Ha7RV6ekr75kMu+vjPe3yOvTWw3j/Zk4rY8px6OiF0bXVYtZg24+7SJP1pLbTJw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1296cfa-41ca-4106-749d-08da241ca50b 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:47.6146 (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: HWXfAlTCF9KqAwz4th8UZkm84xep2B/nm7/VxRC8XvLZaUkSaDkC7jgHMllu7vgZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB3049 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch supports mempool debug to detect buffer overflows. Signed-off-by: Gagandeep Singh --- drivers/net/dpaa2/dpaa2_rxtx.c | 42 ++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index b8844fbdf1..d536352895 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -312,6 +312,10 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd, dpaa2_dev_rx_parse(first_seg, hw_annot_addr); rte_mbuf_refcnt_set(first_seg, 1); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies(rte_mempool_from_obj((void *)first_seg), + (void **)&first_seg, 1, 1); +#endif cur_seg = first_seg; while (!DPAA2_SG_IS_FINAL(sge)) { sge = &sgt[i++]; @@ -324,6 +328,10 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd, next_seg->data_len = sge->length & 0x1FFFF; first_seg->nb_segs += 1; rte_mbuf_refcnt_set(next_seg, 1); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies(rte_mempool_from_obj((void *)next_seg), + (void **)&next_seg, 1, 1); +#endif cur_seg->next = next_seg; next_seg->next = NULL; cur_seg = next_seg; @@ -331,6 +339,10 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd, temp = DPAA2_INLINE_MBUF_FROM_BUF(fd_addr, rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); rte_mbuf_refcnt_set(temp, 1); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp), + (void **)&temp, 1, 1); +#endif rte_pktmbuf_free_seg(temp); return (void *)first_seg; @@ -356,6 +368,10 @@ eth_fd_to_mbuf(const struct qbman_fd *fd, mbuf->port = port_id; mbuf->next = NULL; rte_mbuf_refcnt_set(mbuf, 1); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies(rte_mempool_from_obj((void *)mbuf), + (void **)&mbuf, 1, 1); +#endif /* Parse the packet */ /* parse results for LX2 are there in FRC field of FD. @@ -404,6 +420,10 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, rte_mbuf_refcnt_update(temp, -1); } else { DPAA2_SET_ONLY_FD_BPID(fd, bpid); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp), + (void **)&temp, 1, 0); +#endif } DPAA2_SET_FD_OFFSET(fd, offset); } else { @@ -414,6 +434,10 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, } DPAA2_SET_ONLY_FD_BPID(fd, bpid); DPAA2_SET_FD_OFFSET(fd, temp->data_off); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp), + (void **)&temp, 1, 0); +#endif } DPAA2_SET_FD_ADDR(fd, DPAA2_MBUF_VADDR_TO_IOVA(temp)); DPAA2_SET_FD_LEN(fd, mbuf->pkt_len); @@ -450,6 +474,10 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, } else { DPAA2_SET_FLE_BPID(sge, mempool_to_bpid(cur_seg->pool)); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies(rte_mempool_from_obj((void *)cur_seg), + (void **)&cur_seg, 1, 0); +#endif } } cur_seg = cur_seg->next; @@ -500,6 +528,11 @@ eth_mbuf_to_fd(struct rte_mbuf *mbuf, DPAA2_SET_FD_IVP(fd); rte_mbuf_refcnt_update(mbuf, -1); } +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + else + rte_mempool_check_cookies(rte_mempool_from_obj((void *)mbuf), + (void **)&mbuf, 1, 0); +#endif } else if (RTE_MBUF_HAS_EXTBUF(mbuf)) { DPAA2_SET_FD_IVP(fd); } else { @@ -539,6 +572,10 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf, DPAA2_MBUF_TO_CONTIG_FD(m, fd, bpid); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies(rte_mempool_from_obj((void *)m), + (void **)&m, 1, 0); +#endif DPAA2_PMD_DP_DEBUG( "mbuf: %p, BMAN buf addr: %p, fdaddr: %" PRIx64 ", bpid: %d," " meta: %d, off: %d, len: %d\n", @@ -1260,6 +1297,11 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } DPAA2_MBUF_TO_CONTIG_FD((*bufs), &fd_arr[loop], mempool_to_bpid(mp)); +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG + rte_mempool_check_cookies + (rte_mempool_from_obj((void *)*bufs), + (void **)bufs, 1, 0); +#endif bufs++; #ifdef RTE_LIBRTE_IEEE1588 enable_tx_tstamp(&fd_arr[loop]); From patchwork Fri Apr 22 04:57:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 110078 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 30C6BA0093; Fri, 22 Apr 2022 06:58:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1CA21427F6; Fri, 22 Apr 2022 06:57:53 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2075.outbound.protection.outlook.com [40.107.104.75]) by mails.dpdk.org (Postfix) with ESMTP id 86FAE40040 for ; Fri, 22 Apr 2022 06:57:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WGAbOXhs2Z8ksVK96heOP2mCZ126wPrBkAAchQew3a1U1PvhzZt5rq/N3cTRBiQFM/Kb3BPPvUEZDreMWUGGWS9RHeQx/BP0Of1V1GRFr7KE+ibZt7lVav3X6SI3YwWnepKe/UQywMYZ7PnSSmAJtBkgmaf5gtnOO9eyWMJMRZS1Am2Lw4pflyL2/dnLZ8MDDIBt20QpWwEMvv4/YLEpg2YyavivazRoeC9PCJ+7E0EM0Ww0RWTz0zP6lcnMemRKhL3Ry2TPbbpKvRKadIzitarliw+kuG3WDqT2011RS2xO6RQWvGfQI4DT4X+xbvgg6R1hpOOZoDwJreCmXdxMCg== 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=+c7NE/Kyq4kG36cO4+c5ls+Dfafr4l8fEq2NCoS9A2I=; b=F6YM2iDDjtOUqJwk5MSyAOn85ioY1GY/MdpbG+seyA+mPDgIFXHfE513OJRdbafjMCG9v9L9YXZpWobfkBOowBRpe3lPymYTn72tj4j41QDn651LaI+pS33jkQrd6o3LiQ6WyWqJcA4/CF14MW8shAa+UN7z1EzEEyZ/QxsJqmU1bDSyBe9DSebzcTpz3Wj0L73HFyiodDg+DyMegIPHHWqcOdlMlQd24QSl/4m5T4yJQAhrbCHefm6lwNrPSM2nffS9lwUfZkBl1zYwLQspWGe3Npon3A6pZ6g4Py89RmHfPPqYwGSSbvkSBCpBwY8h5ivZuOzNZjJ61F8N3ZwiWw== 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=+c7NE/Kyq4kG36cO4+c5ls+Dfafr4l8fEq2NCoS9A2I=; b=SF1rkgux/sU92hoKRXAdC/LIEdK8fK3uXKEUb1FpHKH7fvDdFJtwYa5JyaxLvlMy8CPWo5JYpI0XTgUGWIWnk2MVCRr4iRI5DCiN7T/Hq8JUMaubyaFJ2X90spuqoeTGfv88TQZpon6OQbfKL/qnDTewx5ePI+vSmwuCqBNYmBw= 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:49 +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:49 +0000 From: Gagandeep Singh To: dev@dpdk.org Cc: Gagandeep Singh Subject: [PATCH 3/4] net/dpaa2: support ESP in packet type parsing Date: Fri, 22 Apr 2022 10:27:28 +0530 Message-Id: <20220422045729.3320637-3-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> 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: 24397788-46b3-4b2f-f075-08da241ca605 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: p+Zuj2qrTTDV1I/0+sTKcLejvkyeRP+ECuOxNO2xwF1XD1vr6+zHOlEF+1TkWBa8Bp3xEdxFnhS9sqm641FLi+A3upEaubxc6EX+RoYF3P2eF33VsaS/nDztlKkixihTLOjXWsXWcNXfSYarsF/fO/78cDYc8pPgJ5/QaWw+HnuKJxPx86WuvR4teS2VSE9DKXKMnCXB6T14/OChg8G+R5U2GDgBpT8PlMRUiLTC/d9y+vu+S6w1fVXzCzfJ8J+Y625tjMsba24Up3OAX2ObGFM0Nqwx2VA3ZU6EMhvTwlZSWDzO7iPD/Tq10GI5009dVHeC6FPileVnYk1hbyS5ECzk6kxUCMbXdDxF+G8oScUBCRvbE6P6NpkcDubPQovcy+iprDRK1R3l/YqbnibH1vCGh7SI3PKj8fIdcX8EYLLNgBGuiTEXyvRJpgSJTwhypB7eW5+OfcYG6mi3HwtppUZYeeETRgpw201hFRqZYeY+rSV+9YtjJBItE4zSlRFUcvEM3S581UJ0kO8enhp2+oKvtUQqxmcqAMKI/QUO8nw81zOEx8NYyvF030R0vGn6QTET7l7Z4bLQaGwVcqg+HFtc8fvsDu+LSpA+quS/QOLm80lpSqiCalmU9Q7rNOrtzc3SFbsIr2l/0iiLGB0DocWqapsSGTvsFIhwd/Ctse5AoCAcI1fIelNNX54qpSBGY8bIkhyh1nezw+niqW77nA== 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)(316002)(66946007)(66476007)(66556008)(52116002)(6666004)(38350700002)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XcJMPstDbEjIq+ku4D0Bemyw+CgbSLU8h7A91DGYMYoYtooEjyjbaP7jgCUsaI0I1e0NCPrLMYHQg/AEaRvXe5nVPun1egx+y9+rLWbkTuJ8JvHagAGAvlRVUUZl2pIb+uKu3Q9gBF4RACnXEP5QW44YC0EmzS+jFLKKJcPaN8vjjh8H7/geMPtX4PN4IOJeuGovLH6TQw5qL7aoEe78vh8X732l7/Sjys5wyEshdAz7rw9ETu2PvL2df1JLuvZB2+sqtVTCHLQABwK/w+3IyeYCBJUCvCuB1Ade6r2oG/Jk8OTj8Uhk2seAClqHEW11xjnEDoCe5SYquzA1Hvi2DK3j9L/sfTohyM99sszipm+z08hDYWMplAsOQDznUKeBzvQr7jTW94E533P1CV/DynFC++S4aoLIhGNzYX7M0qH5gw1JFbyB9lQQYpWUcbywp1+lJPGl1AOU8O2h4Rk2UXMHre8tkMdrQeiqHSAZ2K+UyTmJYUUc6dcNUD/LoEoD6eJGFR6u/w9oXN4y7JgkqcPAbpuhemSdcEbKL/jSJpo6BfDn+0nZFBqPQMPY+Ji9BFs+Zb0cQ883TzFq8N/jWn02XroA+1mdO+5bcVIW9HPkn/OxVqygwxblW/YOkGkt/6Z/L7kk8rY/00O4uNGip5xJO34E3ndALci8EQW604bZ5Fx5LHIPt2LraUgopYbx5yghhQ1hYOHeMTZBwmVP/hj5Ov5UqrnAzseElqGAGAUY+fhdM9/xp5ZNgQe6RsGCGxI3P2s0xZvFZATkQkOCEeX74gRFzgPYjs9BNejWEK4UY/OmjbnLx18Rj69GDlz4OoFA2mKsiJp0RUULtW0brrapFDdEK2Rh0thDtlYDoeVpfcr7EUybbic9gF0cZ/y70DQooBemSBXgjUfMwWR/g+H3KOhmZf6YFYtq4fmHET7t9bS97E1RG1iHIe2pYlkConlsaE1xAaWFq3mm41AfxO2BBTfAhPSIl2VuPMiLeSV4fRjZ/+LNrlU0FvyX8fRewu75jNv6qXMMKhQijGW0hncohvxDGMD3Zbnxq+4h4YRIU89q8Gb8kXFTAzjSdXTn34TImvEXJY89INl7AXpl6+NixmGvpNtBmexddMokZLLqmObcq8PPDKRJ6INtuSBa2BBOcxbSm1YNo/k/88P2C+ROuT1ojjJj3ZyCW32mDJc3BuP7txtGdzCrelafoHKCEuC0vpZ2radyI9sjAc6i01A38p9kYZuD/JLLBPGmYUmMFRnY7efVz+ul+b9uh9+/039gPQDIkejpTvxv7q8oWlMLkH7Q+0AxaY0gbo7Z9DAuP0i6lRqKJMXDU5dDbcT0K04qWSxHbCbbCZdyyHug+lsG17CGKmvBDsr1WGzm81bVjagRnjIH8hy273Tag40M8hxk9M0cBQDM0T0zR55W/D5UV/Mu9a/tWnPjT6eGdXWiOecVz1XqE00eh97uNjjH/ngvwaa1e2CqaJxj3yf6tUve6TfdGnLiV1BvRGNQJaqs81tEfo+1B+pwasWgqo8fpM1diUP/cfBWeCNfDj2Rr3CFkgV51R/rjAsFJpiS3QcSdG+zN5JHYDMvYyTW9u/RU2cxIMa6IZj6W/sFrQNxyjW7p9xsSDF0PQQGJYv4pkGYHWHxbWS3kS3nPQFCGKNg9ybIV2mbeSS3GXjyTZ/+vJ2eEzCcYsmgnEq1qaify9uRJmxFVrYvuVQEPYk8b/xmUoeTNfL47bYfxAEEhuKK4Q== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24397788-46b3-4b2f-f075-08da241ca605 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:49.3655 (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: cQV+8buwX6NXlNXibRLlpCAb5WOEpjpbzCDXI2uWza1XZDdaBHXBpL0vtZTmcxbr X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB3049 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch supports ESP packet type in packet parsing. Signed-off-by: Gagandeep Singh --- drivers/net/dpaa2/dpaa2_rxtx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index d536352895..5ebce2b4f4 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -179,6 +179,9 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_OPT_PRESENT | L3_IP_N_OPT_PRESENT)) pkt_type |= RTE_PTYPE_L3_IPV4_EXT; + if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_IPSEC_ESP_PRESENT | + L3_PROTO_ESP_PRESENT)) + pkt_type |= RTE_PTYPE_TUNNEL_ESP; } else if (BIT_ISSET_AT_POS(annotation->word4, L3_IPV6_1_PRESENT | L3_IPV6_N_PRESENT)) { @@ -186,6 +189,9 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_OPT_PRESENT | L3_IP_N_OPT_PRESENT)) pkt_type |= RTE_PTYPE_L3_IPV6_EXT; + if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_IPSEC_ESP_PRESENT | + L3_PROTO_ESP_PRESENT)) + pkt_type |= RTE_PTYPE_TUNNEL_ESP; } else { goto parse_done; } From patchwork Fri Apr 22 04:57:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 110079 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F04C5A0093; Fri, 22 Apr 2022 06:58:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC206427FC; Fri, 22 Apr 2022 06:57:53 +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> 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: ICkYJIV6AjXceOeHkqE5Wt5Mu41eikGQjDGdhHtrnp0Smad0f3cTMJS69WMkbllnXt5HPWk686okhBhwgpdjdcvn6uHBKF3PWb+ov/jK6DF1onXrxJ9sRbBldBDbJN3ICV4Dh8Ra5kM1qBNOW/tzpi4MnXHugQ1PVqpBrgnoJqGetHjnmYoch1eCp8VgoZ34I/kMjZ0BdwrGHnwuvU5WOs+WDejgyRRkBwTboSZVd+0NKBwjYf5I5a8VRC2ktsIWBe4Mls3YNG0bJvKSxMW3uP3a42nW8cf0dOTSg3dmO0yOeH+kbbldRM5qE0CN8Tb6hsi2lk+/rRBRq1byorSlTsprUAJ98a8ZOnESjIUXB09xUS2LdYqMHnBWE7e48J7wi/Btg0qv4t61Hp0yzOop6XbKM3yCJeX7RUZE7byRy807Z4c3GEVuh1stzUSg4R7VOnidhty4ZipZaMUXXKZ5wVFBQbInZkHEddn6ZbqoJ/LdeTn8087ca3UqTfTAYCBkNN6y08Pb0REtKJdtzHwXi52oyoPhO1/+O15Jwi3N5vhynb4TUA0gH8uB9fbSEQ198rzAydsd1oo6kiJp7GVXHzWM5dZ+DS7AYykPn5l1dqEdEEdxTEagr9gMRunuU6p4diJPOzl9XwV+tX11X1ImLMy557DrLo4r5hQH1n5XFW/bDgHkzbA69PHuPP0meet9HZY9Jh+QGZDxnGhqPW/7b7V3gCA0oRJTe5J2qGkmRnxvEy8jChFJgQF68UmL5lrg3x7Xp2bW3mCx6hNlVwLr4qDGhtxmQHCixmqUCzekTh+14lEoKPwuO4k63yGzAdehIBDDg3DqByWP9s/zjVJXPlqcn4dJVQSNBCqekj4lOhYVDsduHst7h7OIxhZxmdAwve4GrBJqmwyDGIWwrXW4P7JpRnI/+Q0TdaqsjxD2pIYS91LNPA8zGwUVWq3ndB+VO19nOn66YXTHfau0xrw4khgB4TXJs/nxBueHuXtGdr/sm+S3WKL+xJBf6pLueU75x6ETtPU2ZsZHDybuq5+gkEbOIzFStee/KmUxVgjsNMZ6lIUkP8Q6IC/6cWP4hIy8fWrQlR3vv9Cp0t4MKD4KbC3gXy1x6oBLJEaj118VF8IMSa64xbV8/Eaa3VCGuNcDpxbD51rOhIvGjgt1u8VKJaEFNOG6xHAmCojjrUu9g5hdCCKalU/6vOLcO1YiRFbPC9FntAboMWk5py2Kh8G0xZY5hqrociGJMUptIoe4EtRxDqR1yWC4sx+mKdvHck+3voTsXTdCdspmMUaxvryBzqOrxji1qBtOMx9yBB4ZRSAZ2aewgi5bMZ2KeG5Eqjda0WAyr4KkGFnrW2uvLS2L3U4R+5lMFLJdjcgmQBTgv9tdXVxLKFLz3FJxK8GYSP/zNCsARv1RHzEMhLwbUTGDdQu6L24RXV2IjKpFlweaxWzBIgAvW0EVXHLRHsJ2JYen0DZEd5oEw2ubjriDFVFFuBb6ndSu3mOYPodehSl4JKYVhZYRYKuJ+jN/SzuMvhEiOEbqG3PAXWfPqnlOtVmsz+psJEPz3+sMfTkcX5vB0bEv3wNZ9MTIxiQTHRiQ4lTdwZie2UJro5cG4El8C7BD+qqSFxn1aJAlvvTJXSXtI/9BdhpVc6Ym08KSf50/qdpbRKnBp1Ux6kLpROBT05oFmA2Q8o1ZDzpaZ+UNn/x1GPbyqqQNiswcwU08hviovUrpzs3cKTpX3N57YA3k9imX9Q== 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: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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); }