Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/52259/?format=api
{ "id": 52259, "url": "http://patches.dpdk.org/api/patches/52259/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190404072335.24555-3-shreyansh.jain@nxp.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20190404072335.24555-3-shreyansh.jain@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190404072335.24555-3-shreyansh.jain@nxp.com", "date": "2019-04-04T07:23:24", "name": "[v2,2/3] drivers: update MC firmware version for FSLMC bus", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "8298a63f1cf6a5b19f18f3e002e88b509cde3bbf", "submitter": { "id": 497, "url": "http://patches.dpdk.org/api/people/497/?format=api", "name": "Shreyansh Jain", "email": "shreyansh.jain@nxp.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190404072335.24555-3-shreyansh.jain@nxp.com/mbox/", "series": [ { "id": 4105, "url": "http://patches.dpdk.org/api/series/4105/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4105", "date": "2019-04-04T07:23:14", "name": "Update FSLMC bus firmware", "version": 2, "mbox": "http://patches.dpdk.org/series/4105/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/52259/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/52259/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5F4415323;\n\tThu, 4 Apr 2019 09:23:29 +0200 (CEST)", "from EUR03-AM5-obe.outbound.protection.outlook.com\n\t(mail-eopbgr30043.outbound.protection.outlook.com [40.107.3.43])\n\tby dpdk.org (Postfix) with ESMTP id A8CB44F9C\n\tfor <dev@dpdk.org>; Thu, 4 Apr 2019 09:23:27 +0200 (CEST)", "from VI1PR04MB4688.eurprd04.prod.outlook.com (20.177.56.80) by\n\tVI1PR04MB4957.eurprd04.prod.outlook.com (20.177.49.210) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.1750.17; Thu, 4 Apr 2019 07:23:24 +0000", "from VI1PR04MB4688.eurprd04.prod.outlook.com\n\t([fe80::f198:d57:e38d:30]) by VI1PR04MB4688.eurprd04.prod.outlook.com\n\t([fe80::f198:d57:e38d:30%4]) with mapi id 15.20.1750.017;\n\tThu, 4 Apr 2019 07:23:24 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=tJ4C0FnxDqUJzzmbne8VB135HpL3YrKSr+xqPYEoHmQ=;\n\tb=ejuqnicbLuyrey57Bs1UOxVY+wrwPvk9CYnYhg456VsyU/crP2K/mL+mCNkrOChpVBkou/HZ5UeftThG1NeP+YcUfhhGENktOtKo/GXOaGYEdRFa4fwKdbNMCqFLPreAhktSRgSGP1dwkt5iliWzsu9eyfyWttcJQNz0k/P/Lmc=", "From": "Shreyansh Jain <shreyansh.jain@nxp.com>", "To": "\"ferruh.yigit@intel.com\" <ferruh.yigit@intel.com>", "CC": "\"dev@dpdk.org\" <dev@dpdk.org>, Shreyansh Jain <shreyansh.jain@nxp.com>", "Thread-Topic": "[PATCH v2 2/3] drivers: update MC firmware version for FSLMC\n\tbus", "Thread-Index": "AQHU6rdJg4UgyNNhdkGJjAM5+soojQ==", "Date": "Thu, 4 Apr 2019 07:23:24 +0000", "Message-ID": "<20190404072335.24555-3-shreyansh.jain@nxp.com>", "References": "<20190403142357.17700-1-shreyansh.jain@nxp.com>\n\t<20190404072335.24555-1-shreyansh.jain@nxp.com>", "In-Reply-To": "<20190404072335.24555-1-shreyansh.jain@nxp.com>", "Accept-Language": "en-US", "Content-Language": "en-US", "X-MS-Has-Attach": "", "X-MS-TNEF-Correlator": "", "x-originating-ip": "[92.120.0.8]", "x-mailer": "git-send-email 2.19.1", "x-clientproxiedby": "BM1PR01CA0148.INDPRD01.PROD.OUTLOOK.COM\n\t(2603:1096:b00:68::18) To VI1PR04MB4688.eurprd04.prod.outlook.com\n\t(2603:10a6:803:71::16)", "authentication-results": "spf=none (sender IP is )\n\tsmtp.mailfrom=shreyansh.jain@nxp.com; ", "x-ms-exchange-messagesentrepresentingtype": "1", "x-ms-publictraffictype": "Email", "x-ms-office365-filtering-correlation-id": "91935449-2e86-4f79-6758-08d6b8ce6c28", "x-ms-office365-filtering-ht": "Tenant", "x-microsoft-antispam": "BCL:0; PCL:0;\n\tRULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);\n\tSRVR:VI1PR04MB4957; ", "x-ms-traffictypediagnostic": "VI1PR04MB4957:", "x-microsoft-antispam-prvs": "<VI1PR04MB4957B38E463CB2DFFB693EA090500@VI1PR04MB4957.eurprd04.prod.outlook.com>", "x-forefront-prvs": "0997523C40", "x-forefront-antispam-report": "SFV:NSPM;\n\tSFS:(10009020)(39860400002)(396003)(376002)(136003)(346002)(366004)(199004)(189003)(51234002)(6436002)(6486002)(6512007)(256004)(7736002)(1076003)(86362001)(2351001)(25786009)(5640700003)(2501003)(30864003)(106356001)(105586002)(81156014)(71190400001)(50226002)(6916009)(8936002)(4326008)(71200400001)(68736007)(15650500001)(81166006)(97736004)(316002)(8676002)(102836004)(99286004)(5660300002)(386003)(3846002)(476003)(54906003)(53936002)(6506007)(486006)(6116002)(14454004)(2906002)(66066001)(446003)(76176011)(11346002)(36756003)(44832011)(478600001)(14444005)(52116002)(2616005)(305945005)(186003)(26005);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4957;\n\tH:VI1PR04MB4688.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en;\n\tPTR:InfoNoRecords; A:1; MX:1; ", "received-spf": "None (protection.outlook.com: nxp.com does not designate\n\tpermitted sender hosts)", "x-ms-exchange-senderadcheck": "1", "x-microsoft-antispam-message-info": "bINKWYuBjcD08eWw6RHhAn+TdQgJ4WxUom5oO/ul8tnaZErTKOrA/Cfi3RtJYe0AF66VxHAsTr3p+nL620vMCHLcwM5ezw7YIGfaYK4aGCSpZ8e6pjmPL2A52G2HFvl9u/t8Toy5Cq0vvVA3QvF3ox6yUSs+kS9FNuzzV4tbmOqW77RD2XkhiZUUoJWxhXlmHa0NO46aXMwGBJdkVMlgfGun55yJ1KvXsP/UTEjuH4YXNyD9i0K2Zs8YXVNbZ1deYwFscN4oVFkeJeFTrDzXh7chuT7wp6VAr4TIzXSb6UVkWNHLgPae7CaXeZxTwG1Pk8pTB+pgfBj9fHCSvdT1oOU6TDpmoZjEV+uaZA1ziDPCelPZb2vTXf5EGju41vCPtytkNVbu+qGjkPbnfWdAQE0taLYqAWVreeAvvMOSOGg=", "Content-Type": "text/plain; charset=\"iso-8859-1\"", "Content-Transfer-Encoding": "quoted-printable", "MIME-Version": "1.0", "X-OriginatorOrg": "nxp.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "91935449-2e86-4f79-6758-08d6b8ce6c28", "X-MS-Exchange-CrossTenant-originalarrivaltime": "04 Apr 2019 07:23:24.2749\n\t(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-Transport-CrossTenantHeadersStamped": "VI1PR04MB4957", "Subject": "[dpdk-dev] [PATCH v2 2/3] drivers: update MC firmware version for\n\tFSLMC bus", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "MC firmware is the core component of FSLMC bus and DPAA2 devices.\nPrior to this patch, MC firmware supported 10.10.x version. This\npatch bumps the min supported version to 10.14.x.\n\nSigned-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>\nAcked-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/bus/fslmc/mc/fsl_dpmng.h | 2 +-\n drivers/net/dpaa2/dpaa2_ethdev.c | 1 +\n drivers/net/dpaa2/mc/dpni.c | 13 ++++-\n drivers/net/dpaa2/mc/fsl_dpni.h | 84 ++++++++++++++++++++++-------\n drivers/net/dpaa2/mc/fsl_dpni_cmd.h | 40 ++++++++++----\n 5 files changed, 109 insertions(+), 31 deletions(-)", "diff": "diff --git a/drivers/bus/fslmc/mc/fsl_dpmng.h b/drivers/bus/fslmc/mc/fsl_dpmng.h\nindex 8559bef87..bef2ef095 100644\n--- a/drivers/bus/fslmc/mc/fsl_dpmng.h\n+++ b/drivers/bus/fslmc/mc/fsl_dpmng.h\n@@ -18,7 +18,7 @@ struct fsl_mc_io;\n * Management Complex firmware version information\n */\n #define MC_VER_MAJOR 10\n-#define MC_VER_MINOR 10\n+#define MC_VER_MINOR 14\n \n /**\n * struct mc_version\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex 3fbc82977..98ef8a5f5 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -665,6 +665,7 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t\t DPNI_CONG_OPT_WRITE_MEM_ON_ENTER |\n \t\t\t\t\t DPNI_CONG_OPT_WRITE_MEM_ON_EXIT |\n \t\t\t\t\t DPNI_CONG_OPT_COHERENT_WRITE;\n+\t\tcong_notif_cfg.cg_point = DPNI_CP_QUEUE;\n \n \t\tret = dpni_set_congestion_notification(dpni, CMD_PRI_LOW,\n \t\t\t\t\t\t priv->token,\ndiff --git a/drivers/net/dpaa2/mc/dpni.c b/drivers/net/dpaa2/mc/dpni.c\nindex 6c12a0ae1..362cd476f 100644\n--- a/drivers/net/dpaa2/mc/dpni.c\n+++ b/drivers/net/dpaa2/mc/dpni.c\n@@ -125,6 +125,7 @@ int dpni_create(struct fsl_mc_io *mc_io,\n \tcmd_params->vlan_filter_entries = cfg->vlan_filter_entries;\n \tcmd_params->qos_entries = cfg->qos_entries;\n \tcmd_params->fs_entries = cpu_to_le16(cfg->fs_entries);\n+\tcmd_params->num_cgs = cfg->num_cgs;\n \n \t/* send command to mc*/\n \terr = mc_send_command(mc_io, &cmd);\n@@ -593,6 +594,7 @@ int dpni_get_attributes(struct fsl_mc_io *mc_io,\n \tattr->qos_key_size = rsp_params->qos_key_size;\n \tattr->fs_key_size = rsp_params->fs_key_size;\n \tattr->wriop_version = le16_to_cpu(rsp_params->wriop_version);\n+\tattr->num_cgs = rsp_params->num_cgs;\n \n \treturn 0;\n }\n@@ -1800,6 +1802,8 @@ int dpni_set_congestion_notification(struct fsl_mc_io *mc_io,\n \tcmd_params = (struct dpni_cmd_set_congestion_notification *)cmd.params;\n \tcmd_params->qtype = qtype;\n \tcmd_params->tc = tc_id;\n+\tcmd_params->congestion_point = cfg->cg_point;\n+\tcmd_params->cgid = (uint8_t)cfg->cgid;\n \tcmd_params->dest_id = cpu_to_le32(cfg->dest_cfg.dest_id);\n \tcmd_params->notification_mode = cpu_to_le16(cfg->notification_mode);\n \tcmd_params->dest_priority = cfg->dest_cfg.priority;\n@@ -1850,6 +1854,8 @@ int dpni_get_congestion_notification(struct fsl_mc_io *mc_io,\n \tcmd_params = (struct dpni_cmd_get_congestion_notification *)cmd.params;\n \tcmd_params->qtype = qtype;\n \tcmd_params->tc = tc_id;\n+\tcmd_params->congestion_point = cfg->cg_point;\n+\tcmd_params->cgid = cfg->cgid;\n \n \t/* send command to mc*/\n \terr = mc_send_command(mc_io, &cmd);\n@@ -1949,6 +1955,7 @@ int dpni_set_queue(struct fsl_mc_io *mc_io,\n \t\t queue->destination.hold_active);\n \tcmd_params->flc = cpu_to_le64(queue->flc.value);\n \tcmd_params->user_context = cpu_to_le64(queue->user_context);\n+\tcmd_params->cgid = queue->cgid;\n \n \t/* send command to mc */\n \treturn mc_send_command(mc_io, &cmd);\n@@ -2010,6 +2017,10 @@ int dpni_get_queue(struct fsl_mc_io *mc_io,\n \tqueue->user_context = le64_to_cpu(rsp_params->user_context);\n \tqid->fqid = le32_to_cpu(rsp_params->fqid);\n \tqid->qdbin = le16_to_cpu(rsp_params->qdbin);\n+\tif (dpni_get_field(rsp_params->flags, CGID_VALID))\n+\t\tqueue->cgid = rsp_params->cgid;\n+\telse\n+\t\tqueue->cgid = -1;\n \n \treturn 0;\n }\n@@ -2031,7 +2042,7 @@ int dpni_get_statistics(struct fsl_mc_io *mc_io,\n \t\t\tuint32_t cmd_flags,\n \t\t\tuint16_t token,\n \t\t\tuint8_t page,\n-\t\t\tuint8_t param,\n+\t\t\tuint16_t param,\n \t\t\tunion dpni_statistics *stat)\n {\n \tstruct mc_command cmd = { 0 };\ndiff --git a/drivers/net/dpaa2/mc/fsl_dpni.h b/drivers/net/dpaa2/mc/fsl_dpni.h\nindex aecdc8d1f..8b1cfbac7 100644\n--- a/drivers/net/dpaa2/mc/fsl_dpni.h\n+++ b/drivers/net/dpaa2/mc/fsl_dpni.h\n@@ -91,6 +91,10 @@ struct fsl_mc_io;\n * All Tx traffic classes will use a single sender (ignore num_queueus for tx)\n */\n #define DPNI_OPT_SINGLE_SENDER\t\t\t0x000100\n+/**\n+ * Define a custom number of congestion groups\n+ */\n+#define DPNI_OPT_CUSTOM_CG\t\t\t\t0x000200\n \n int dpni_open(struct fsl_mc_io *mc_io,\n \t uint32_t cmd_flags,\n@@ -172,6 +176,7 @@ struct dpni_cfg {\n \tuint8_t num_tcs;\n \tuint8_t num_rx_tcs;\n \tuint8_t qos_entries;\n+\tuint8_t num_cgs;\n };\n \n int dpni_create(struct fsl_mc_io *mc_io,\n@@ -326,6 +331,7 @@ struct dpni_attr {\n \tuint8_t qos_key_size;\n \tuint8_t fs_key_size;\n \tuint16_t wriop_version;\n+\tuint8_t num_cgs;\n };\n \n int dpni_get_attributes(struct fsl_mc_io *mc_io,\n@@ -638,6 +644,36 @@ union dpni_statistics {\n */\n #define DPNI_LINK_OPT_PFC_PAUSE\t0x0000000000000010ULL\n \n+/**\n+ * Advertise 10MB full duplex\n+ */\n+#define DPNI_ADVERTISED_10BASET_FULL 0x0000000000000001ULL\n+/**\n+ * Advertise 100MB full duplex\n+ */\n+#define DPNI_ADVERTISED_100BASET_FULL 0x0000000000000002ULL\n+/**\n+ * Advertise 1GB full duplex\n+ */\n+#define DPNI_ADVERTISED_1000BASET_FULL 0x0000000000000004ULL\n+/**\n+ * Advertise auto-negotiation enable\n+ */\n+#define DPNI_ADVERTISED_AUTONEG 0x0000000000000008ULL\n+/**\n+ * Advertise 10GB full duplex\n+ */\n+#define DPNI_ADVERTISED_10000BASET_FULL 0x0000000000000010ULL\n+/**\n+ * Advertise 2.5GB full duplex\n+ */\n+#define DPNI_ADVERTISED_2500BASEX_FULL 0x0000000000000020ULL\n+/**\n+ * Advertise 5GB full duplex\n+ */\n+#define DPNI_ADVERTISED_5000BASET_FULL 0x0000000000000040ULL\n+\n+\n /**\n * struct - Structure representing DPNI link configuration\n * @rate: Rate\n@@ -668,7 +704,7 @@ struct dpni_link_state {\n \tuint32_t rate;\n \tuint64_t options;\n \tint up;\n-\tint state_valid;\n+\tint state_valid;\n \tuint64_t supported;\n \tuint64_t advertising;\n };\n@@ -850,7 +886,6 @@ enum dpni_congestion_unit {\n \tDPNI_CONGESTION_UNIT_FRAMES\n };\n \n-\n /**\n * enum dpni_dest - DPNI destination types\n * @DPNI_DEST_NONE: Unassigned destination; The queue is set in parked mode and\n@@ -924,6 +959,25 @@ struct dpni_dest_cfg {\n */\n #define DPNI_CONG_OPT_FLOW_CONTROL\t0x00000040\n \n+/**\n+ * enum dpni_congestion_point - Structure representing congestion point\n+ * @DPNI_CP_QUEUE:\tSet congestion per queue, identified by QUEUE_TYPE, TC\n+ *\t\t\tand QUEUE_INDEX\n+ * @DPNI_CP_GROUP:\tSet congestion per queue group. Depending on options\n+ *\t\t\tused to define the DPNI this can be either per\n+ *\t\t\tTC (default) or per interface\n+ *\t\t\t(DPNI_OPT_SHARED_CONGESTION set at DPNI create).\n+ *\t\t\tQUEUE_INDEX is ignored if this type is used.\n+ * @DPNI_CP_CONGESTION_GROUP: Set per congestion group id. This will work\n+ *\t\tonly if the DPNI is created with DPNI_OPT_CUSTOM_CG option\n+ */\n+\n+enum dpni_congestion_point {\n+\tDPNI_CP_QUEUE,\n+\tDPNI_CP_GROUP,\n+\tDPNI_CP_CONGESTION_GROUP,\n+};\n+\n /**\n * struct dpni_congestion_notification_cfg - congestion notification\n *\t\tconfiguration\n@@ -937,6 +991,8 @@ struct dpni_dest_cfg {\n *\tcontained in 'options'\n * @dest_cfg: CSCN can be send to either DPIO or DPCON WQ channel\n * @notification_mode: Mask of available options; use 'DPNI_CONG_OPT_<X>' values\n+ * @cg_point: Congestion point settings\n+ * @cgid: id of the congestion group. The index is relative to dpni.\n */\n \n struct dpni_congestion_notification_cfg {\n@@ -947,6 +1003,8 @@ struct dpni_congestion_notification_cfg {\n \tuint64_t message_iova;\n \tstruct dpni_dest_cfg dest_cfg;\n \tuint16_t notification_mode;\n+\tenum dpni_congestion_point cg_point;\n+\tint cgid;\n };\n \n int dpni_set_congestion_notification(struct fsl_mc_io *mc_io,\n@@ -1016,6 +1074,7 @@ int dpni_get_congestion_notification(struct fsl_mc_io *mc_io,\n * FD[OFFSET].\n * For more details check the Frame Descriptor section in the\n * hardware documentation.\n+ *@cgid :indicate the cgid to set relative to dpni\n */\n struct dpni_queue {\n \tstruct {\n@@ -1029,6 +1088,7 @@ struct dpni_queue {\n \t\tuint64_t value;\n \t\tchar stash_control;\n \t} flc;\n+\tint cgid;\n };\n \n /**\n@@ -1218,6 +1278,9 @@ int dpni_get_api_version(struct fsl_mc_io *mc_io,\n */\n #define DPNI_QUEUE_OPT_HOLD_ACTIVE\t0x00000008\n \n+#define DPNI_QUEUE_OPT_SET_CGID\t\t\t\t0x00000040\n+#define DPNI_QUEUE_OPT_CLEAR_CGID\t\t\t0x00000080\n+\n int dpni_set_queue(struct fsl_mc_io *mc_io,\n \t\t uint32_t cmd_flags,\n \t\t uint16_t token,\n@@ -1240,28 +1303,13 @@ int dpni_get_statistics(struct fsl_mc_io *mc_io,\n \t\t\tuint32_t cmd_flags,\n \t\t\tuint16_t token,\n \t\t\tuint8_t page,\n-\t\t\tuint8_t param,\n+\t\t\tuint16_t param,\n \t\t\tunion dpni_statistics *stat);\n \n int dpni_reset_statistics(struct fsl_mc_io *mc_io,\n \t\t\t uint32_t cmd_flags,\n \t\t\t uint16_t token);\n \n-/**\n- * enum dpni_congestion_point - Structure representing congestion point\n- * @DPNI_CP_QUEUE:\tSet taildrop per queue, identified by QUEUE_TYPE, TC and\n- *\t\t\t\tQUEUE_INDEX\n- * @DPNI_CP_GROUP:\tSet taildrop per queue group. Depending on options used\n- *\t\t\t\tto define the DPNI this can be either per\n- *\t\t\t\tTC (default) or per interface\n- *\t\t\t\t(DPNI_OPT_SHARED_CONGESTION set at DPNI create).\n- *\t\t\t\tQUEUE_INDEX is ignored if this type is used.\n- */\n-enum dpni_congestion_point {\n-\tDPNI_CP_QUEUE,\n-\tDPNI_CP_GROUP,\n-};\n-\n /**\n * struct dpni_taildrop - Structure representing the taildrop\n * @enable:\tIndicates whether the taildrop is active or not.\ndiff --git a/drivers/net/dpaa2/mc/fsl_dpni_cmd.h b/drivers/net/dpaa2/mc/fsl_dpni_cmd.h\nindex 9116e417e..5effbb300 100644\n--- a/drivers/net/dpaa2/mc/fsl_dpni_cmd.h\n+++ b/drivers/net/dpaa2/mc/fsl_dpni_cmd.h\n@@ -9,7 +9,7 @@\n \n /* DPNI Version */\n #define DPNI_VER_MAJOR\t\t\t\t7\n-#define DPNI_VER_MINOR\t\t\t\t8\n+#define DPNI_VER_MINOR\t\t\t\t9\n \n #define DPNI_CMD_BASE_VERSION\t\t\t1\n #define DPNI_CMD_VERSION_2\t\t\t2\n@@ -23,13 +23,13 @@\n /* Command IDs */\n #define DPNI_CMDID_OPEN\t\t\t\tDPNI_CMD(0x801)\n #define DPNI_CMDID_CLOSE\t\t\tDPNI_CMD(0x800)\n-#define DPNI_CMDID_CREATE\t\t\tDPNI_CMD_V2(0x901)\n+#define DPNI_CMDID_CREATE\t\t\tDPNI_CMD_V3(0x901)\n #define DPNI_CMDID_DESTROY\t\t\tDPNI_CMD(0x981)\n #define DPNI_CMDID_GET_API_VERSION\t\tDPNI_CMD(0xa01)\n \n #define DPNI_CMDID_ENABLE\t\t\tDPNI_CMD(0x002)\n #define DPNI_CMDID_DISABLE\t\t\tDPNI_CMD(0x003)\n-#define DPNI_CMDID_GET_ATTR\t\t\tDPNI_CMD_V2(0x004)\n+#define DPNI_CMDID_GET_ATTR\t\t\tDPNI_CMD_V3(0x004)\n #define DPNI_CMDID_RESET\t\t\tDPNI_CMD(0x005)\n #define DPNI_CMDID_IS_ENABLED\t\t\tDPNI_CMD(0x006)\n \n@@ -77,10 +77,10 @@\n #define DPNI_CMDID_REMOVE_FS_ENT\t\tDPNI_CMD(0x245)\n #define DPNI_CMDID_CLR_FS_ENT\t\t\tDPNI_CMD(0x246)\n \n-#define DPNI_CMDID_GET_STATISTICS\t\tDPNI_CMD_V2(0x25D)\n+#define DPNI_CMDID_GET_STATISTICS\t\tDPNI_CMD_V3(0x25D)\n #define DPNI_CMDID_RESET_STATISTICS\t\tDPNI_CMD(0x25E)\n-#define DPNI_CMDID_GET_QUEUE\t\t\tDPNI_CMD(0x25F)\n-#define DPNI_CMDID_SET_QUEUE\t\t\tDPNI_CMD(0x260)\n+#define DPNI_CMDID_GET_QUEUE\t\t\tDPNI_CMD_V2(0x25F)\n+#define DPNI_CMDID_SET_QUEUE\t\t\tDPNI_CMD_V2(0x260)\n #define DPNI_CMDID_GET_TAILDROP\t\t\tDPNI_CMD_V2(0x261)\n #define DPNI_CMDID_SET_TAILDROP\t\t\tDPNI_CMD_V2(0x262)\n \n@@ -89,8 +89,8 @@\n #define DPNI_CMDID_GET_BUFFER_LAYOUT\t\tDPNI_CMD_V2(0x264)\n #define DPNI_CMDID_SET_BUFFER_LAYOUT\t\tDPNI_CMD_V2(0x265)\n \n-#define DPNI_CMDID_SET_CONGESTION_NOTIFICATION\tDPNI_CMD(0x267)\n-#define DPNI_CMDID_GET_CONGESTION_NOTIFICATION\tDPNI_CMD(0x268)\n+#define DPNI_CMDID_SET_CONGESTION_NOTIFICATION\tDPNI_CMD_V2(0x267)\n+#define DPNI_CMDID_GET_CONGESTION_NOTIFICATION\tDPNI_CMD_V2(0x268)\n #define DPNI_CMDID_SET_EARLY_DROP\t\tDPNI_CMD_V2(0x269)\n #define DPNI_CMDID_GET_EARLY_DROP\t\tDPNI_CMD_V2(0x26A)\n #define DPNI_CMDID_GET_OFFLOAD\t\t\tDPNI_CMD(0x26B)\n@@ -131,6 +131,8 @@ struct dpni_cmd_create {\n \tuint8_t pad3;\n \tuint16_t fs_entries;\n \tuint8_t num_rx_tcs;\n+\tuint8_t pad4;\n+\tuint8_t num_cgs;\n };\n \n struct dpni_cmd_destroy {\n@@ -222,6 +224,7 @@ struct dpni_rsp_get_attr {\n \tuint8_t qos_key_size;\n \tuint8_t fs_key_size;\n \tuint16_t wriop_version;\n+\tuint8_t num_cgs;\n };\n \n #define DPNI_ERROR_ACTION_SHIFT\t\t0\n@@ -315,7 +318,7 @@ struct dpni_rsp_get_tx_data_offset {\n \n struct dpni_cmd_get_statistics {\n \tuint8_t page_number;\n-\tuint8_t param;\n+\tuint16_t param;\n };\n \n struct dpni_rsp_get_statistics {\n@@ -464,6 +467,8 @@ struct dpni_cmd_get_queue {\n \n #define DPNI_DEST_TYPE_SHIFT\t\t0\n #define DPNI_DEST_TYPE_SIZE\t\t4\n+#define DPNI_CGID_VALID_SHIFT\t\t5\n+#define DPNI_CGID_VALID_SIZE\t\t1\n #define DPNI_STASH_CTRL_SHIFT\t\t6\n #define DPNI_STASH_CTRL_SIZE\t\t1\n #define DPNI_HOLD_ACTIVE_SHIFT\t\t7\n@@ -476,7 +481,9 @@ struct dpni_rsp_get_queue {\n \tuint32_t dest_id;\n \tuint16_t pad1;\n \tuint8_t dest_prio;\n-\t/* From LSB: dest_type:4, pad:2, flc_stash_ctrl:1, hold_active:1 */\n+\t/* From LSB:\n+\t * dest_type:4, pad:1, cgid_valid:1, flc_stash_ctrl:1, hold_active:1\n+\t */\n \tuint8_t flags;\n \t/* response word 2 */\n \tuint64_t flc;\n@@ -485,6 +492,9 @@ struct dpni_rsp_get_queue {\n \t/* response word 4 */\n \tuint32_t fqid;\n \tuint16_t qdbin;\n+\tuint16_t pad2;\n+\t/* response word 5*/\n+\tuint8_t cgid;\n };\n \n struct dpni_cmd_set_queue {\n@@ -503,6 +513,8 @@ struct dpni_cmd_set_queue {\n \tuint64_t flc;\n \t/* cmd word 3 */\n \tuint64_t user_context;\n+\t/* cmd word 4 */\n+\tuint8_t cgid;\n };\n \n #define DPNI_DISCARD_ON_MISS_SHIFT\t0\n@@ -655,7 +667,10 @@ struct dpni_tx_confirmation_mode {\n struct dpni_cmd_set_congestion_notification {\n \tuint8_t qtype;\n \tuint8_t tc;\n-\tuint8_t pad[6];\n+\tuint8_t pad;\n+\tuint8_t congestion_point;\n+\tuint8_t cgid;\n+\tuint8_t pad2[3];\n \tuint32_t dest_id;\n \tuint16_t notification_mode;\n \tuint8_t dest_priority;\n@@ -670,6 +685,9 @@ struct dpni_cmd_set_congestion_notification {\n struct dpni_cmd_get_congestion_notification {\n \tuint8_t qtype;\n \tuint8_t tc;\n+\tuint8_t pad;\n+\tuint8_t congestion_point;\n+\tuint8_t cgid;\n };\n \n struct dpni_rsp_get_congestion_notification {\n", "prefixes": [ "v2", "2/3" ] }