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