Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/695633/?format=api
{ "id": 695633, "url": "http://patchwork.ozlabs.org/api/patches/695633/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1479307230-16650-13-git-send-email-claudiu.manoil@nxp.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<1479307230-16650-13-git-send-email-claudiu.manoil@nxp.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/1479307230-16650-13-git-send-email-claudiu.manoil@nxp.com/", "date": "2016-11-16T14:40:25", "name": "[12/17] soc/qman: Fix accesses to fqid, cleanup", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c8534b5fb9b9137f1f8f381a2e8ec6d020c86b40", "submitter": { "id": 68115, "url": "http://patchwork.ozlabs.org/api/people/68115/?format=api", "name": "Claudiu Manoil", "email": "claudiu.manoil@nxp.com" }, "delegate": { "id": 1707, "url": "http://patchwork.ozlabs.org/api/users/1707/?format=api", "username": "scottwood", "first_name": "Scott", "last_name": "Wood", "email": "scottwood@freescale.com" }, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1479307230-16650-13-git-send-email-claudiu.manoil@nxp.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/695633/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/695633/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3tJnQg3GSlz9t0q\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 17 Nov 2016 01:56:43 +1100 (AEDT)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3tJnQg2NqKzDwXy\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 17 Nov 2016 01:56:43 +1100 (AEDT)", "from NAM01-BY2-obe.outbound.protection.outlook.com\n\t(mail-by2nam01on0062.outbound.protection.outlook.com [104.47.34.62])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3tJn4R5r5CzDvg0\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tThu, 17 Nov 2016 01:40:55 +1100 (AEDT)", "from BLUPR0301CA0019.namprd03.prod.outlook.com (10.162.113.157) by\n\tCY4PR03MB2472.namprd03.prod.outlook.com (10.168.165.8) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id\n\t15.1.707.6; Wed, 16 Nov 2016 14:40:51 +0000", "from BN1AFFO11FD046.protection.gbl (2a01:111:f400:7c10::191) by\n\tBLUPR0301CA0019.outlook.office365.com (2a01:111:e400:5259::29) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10 via\n\tFrontend Transport; Wed, 16 Nov 2016 14:40:51 +0000", "from az84smr01.freescale.net (192.88.158.2) by\n\tBN1AFFO11FD046.mail.protection.outlook.com (10.58.53.61) with\n\tMicrosoft SMTP Server (version=TLS1_0,\n\tcipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.721.5\n\tvia Frontend Transport; Wed, 16 Nov 2016 14:40:51 +0000", "from fsr-fed1764-016.ea.freescale.net\n\t(fsr-fed1764-016.ea.freescale.net [10.171.81.161])\n\tby az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id\n\tuAGEeVKf005542; Wed, 16 Nov 2016 07:40:49 -0700" ], "Authentication-Results": "spf=fail (sender IP is 192.88.158.2)\n\tsmtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed)\n\theader.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com;\n\tnxp.com; \n\tdkim=none (message not signed) header.d=none;", "Received-SPF": "Fail (protection.outlook.com: domain of nxp.com does not\n\tdesignate 192.88.158.2 as permitted sender)\n\treceiver=protection.outlook.com; \n\tclient-ip=192.88.158.2; helo=az84smr01.freescale.net;", "X-IncomingTopHeaderMarker": "OriginalChecksum:; UpperCasedChecksum:;\n\tSizeAsReceived:704; Count:10", "From": "Claudiu Manoil <claudiu.manoil@nxp.com>", "To": "<linuxppc-dev@lists.ozlabs.org>", "Subject": "[PATCH 12/17] soc/qman: Fix accesses to fqid, cleanup", "Date": "Wed, 16 Nov 2016 16:40:25 +0200", "Message-ID": "<1479307230-16650-13-git-send-email-claudiu.manoil@nxp.com>", "X-Mailer": "git-send-email 1.7.11.7", "In-Reply-To": "<1479307230-16650-1-git-send-email-claudiu.manoil@nxp.com>", "References": "<1479307230-16650-1-git-send-email-claudiu.manoil@nxp.com>", "X-IncomingHeaderCount": "10", "X-EOPAttributedMessage": "0", "X-Matching-Connectors": "131237808520005282;\n\t(91ab9b29-cfa4-454e-5278-08d120cd25b8); ()", "X-Forefront-Antispam-Report": "CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI;\n\tSFV:NSPM;\n\tSFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(336004)(189002)(199003)(92566002)(2906002)(2950100002)(305945005)(48376002)(4326007)(81156014)(7846002)(626004)(8666005)(356003)(36756003)(33646002)(104016004)(50466002)(86362001)(47776003)(77096005)(87936001)(50226002)(85426001)(8936002)(189998001)(106466001)(110136003)(50986999)(105606002)(69596002)(5660300001)(4720700003)(6916009)(5003940100001)(76176999)(68736007)(8676002)(2351001)(6666003)(97736004)(81166006)(7059030);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2472;\n\tH:az84smr01.freescale.net; FPR:; \n\tSPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; ", "X-Microsoft-Exchange-Diagnostics": [ "1; BN1AFFO11FD046;\n\t1:5uRMXjy5oxXKlBKyudwBCwOMdVe7BQv+XouhVMZadSEtN6gpZr4NRu++OD+DHwbYRVepyM8/OH8cVIS9jRlOpZ8KEM9ZP6xwJQcGuh0WDl1NLMKIGMyv50WtnnyaN9JRLlc0VVDlhRQmERNStAEKDoM8UzFBIqcszkSeJMugoviU3qiJpJ/FEqwFrm2TwiMcSacjSrRkUgRN6SGbMSuA/rshD/cTidadKzAKfExvwc/hhsggNkWm5a/6cKN/kPRdSv/c3luzqMjmp134gUkbR9VlZVQXA+yBekUZV2C0UgyPNlQM5wrys6AduhodwmX4/bR029S5fdaBA5jBdfvzsV30DQ+lusTog41UT0+tKX9VVbIiqrkyQFfwnWN/f6ASSKmI8Pq2yHiFDXVi2U4YZZOXiFHZ4X2XqJq3ulrqsF429qgxmVOghJegFdXovRRzwtQmuCHMaKAHOlC0XcYzAiU9zhMt/+uNnyBbQaI9XkhTXmpSBc1QznA26pk5aHPd8l8nc74I8jiDcmkJcKTHsFY4jEWLzKcS6HjGhDcfktACdH1bSArkna8DjJsE0lE8An1ixuXSh0D3TnFrBmro7TEAa5KUaU3tiauUKv7nrJcaWFNnMY5BoJdwVH39E8dxAysPaxBLYCXaS5GHSfNcDroCiHh1Vpd2IIpLMgiDQTk3DdSGc7CjV9FitT/5Kb4BKCFdps6EN2yTspuHmVhvFJeV3P9lIhU/ZynDBnJUCmU=", "1; CY4PR03MB2472;\n\t2:CFAPLE3Er1eeoHY5PUelt5zQpiASahzKgtblZyywovw18JQ8TlsC8WmF4i9i/QnUGtDFGegn1nLRAshqDyFcFGUWddH/MYCAJZkUfnLQlqbl0dsRjJU21Y2jpcioqm9boG8Bu5Pj8ehpynqCj/sbFMYGqXsINsmfoD6l/9FErl8=;\n\t3:cQ/4dWZetG4L8gubmY80XrFDyb6OrehT2fAz9yOc5iVU5dvw+I9vAAMymNBdDysv1XZ0Lv/L8GbejQUn6JrZ7YToB8ZzU2WD4ohApuHCk7w10suGludyVeUNOyoyGq7LQm4q8Z/kGUjoMxT/bQrPifuqJKD1/zQm9PsG1c1lBAJG/giFRJZQRC15zzyFeLvtiaFwX9jnanwlFzMBIX6Erq4nRb1pVAKq1uJ13USYMOCN0zNGwnyF7ABO+8ZATJQNldP0R8caAzjBzlbKTvTQGQ==;\n\t25:6r3P0oLcx+qQKjFp+/B4bTmf1P8wA8Nj1oWQpGkx/WXBLYFtOYa7vz2wlMrV4zGWD/wgph/rpTsVicclw90/ECw1tbltuJO7g5uSQrnDA2SjTxiDUnlJETZfsQU7hbepWBYSl1/OHuCX4egDcHvkB++JXaYjEBzieJFDe+YgTUM26EPc5A2drK6QJeGdiQyOZDP/YFkDU39oKwwzUeDLr1ecQu7X57eEHKlF/83+5h/6zpVWHyEr+OTz/AoUOqAU9SETwaUjOBhcjp6oVNR3/CnD6H/kGdaZLXsgLkMZaoZ9Kv91Fmmi9EXpq6hG3dKRK8ehhm/qOqcdM4bx1RBUTA9xibPy9N4KXx/eJy7N/VmfZnDYgodMaI6eTnaPFogYZ3qGLd3kJf65V9+BlXCAcbs0QtDgAlgy6bX/rw/X81SDUeIx2piB+LRBfccbqOJ2SBf43O0l8j1wPshA/du8MA==", "1; CY4PR03MB2472;\n\t31:q4YkhsItK92rUjPog2EKChobArqHgg+5iyJnukYAXHvPtaPwLpSamTrvZWooosRwyvsjFk1K9tNUuqJv+hkBcylNy96Ol5gAcLd07TsCGI9DV4+eFih+jLvVaoL6dDmG8PyD6j3A7Vwwnf4tIZLGSoOefNF2zi3+HC02CjWYU1UF7MmDQTkpdEyIV3F8DDKrZqL0HRCmTOJSbGbAIQkTloFBiSpaxHz72NU/LPAGrNJsJfME1BETfu+Y/I94Brq87wfGynv0xt5KcPCI+bpLVQ==;\n\t4:o5KNIDGG45fdYhd8NytnjBdJUHAdqQ9EcrPlO1US1xiwlt61HrOAvXCrArjH0fXemOqheEuiCurTVR1sHMeCqWVysaQloS4nVzmRgqr44SGbntFR2Lp5kyMDGz4HP9qvz92I7EWmcuQlXBaT/RHAe2VI4plx17LfbIiGW7QzJf6RDGS6sD0432InVRs6AmT1LB2gb6S7DqUHSkXnGro4tpZetE4zfz1vwHWhZBDwisAYKlrE1fUdfInP8bGIyjhxAXLqPRhZUHByPf8VOW7repV6SzJUBjyNpIdCxbnzNn1x1LSG9XuM3usNF7aPMkUQaAg/L0Tmi/OzNc4qtdBlT5wv4sr9S4qY70MTg3NsjTD/vyDbb3AKH7XkPVV31+G/zQTye7NJA90pbjC10nA3w3gJudyChusfBWqkb8DzVE1I5n1pXY2P2oByx75QzJcq2HUYw7ALGJdwdPatwunOa+LfegbaVc2SVqYZ5Dstnh0xKmuGseGkaWypJxDB7dy572snfkfuRgWe81W2Jk15I76iBglPnS9cO4Dh1Vd7kRPrGk6NG1g8H1yKZ2/5A+PqfSqFDOMWchd2OYJXNCGZ/Q==", "=?us-ascii?Q?1; CY4PR03MB2472;\n\t23:gNHztQn2fz80L3z+YRWqfX8asVByOmKoDl3zryoL/?=\n\t=?us-ascii?Q?aESpKJCfeoaspCkMBR0jmFy9hMX6WrBzsuvQlEnteTe//4eAv6oJgz5XFAfh?=\n\t=?us-ascii?Q?o0jA8nahxFW7aDC4WWwMqzC9Toissnru+8E7JrqWcbXmmTpGfGkpmYoshr0r?=\n\t=?us-ascii?Q?bNNJRSPTMLjpFJjPphB6Jt04o4z+SENDBawGV4jdYqT6ZbjWt7kV2SmUHmqK?=\n\t=?us-ascii?Q?9tonTABUra1eEBGZx2NF21ucy80XxMGC6OGiUp5TDosl+9gjBY3lpopx+e5F?=\n\t=?us-ascii?Q?TaZY1IkxFc+S4jIpu4vu2Bl9x64f/pJpcq5k6cbeE+hDfj8S0gECKPJYTUMn?=\n\t=?us-ascii?Q?lNj+xdc240kv51vk7/4Qpg9aovhk/K8qRt0ChB2E6veULJ1rC3y5S1JiEMYX?=\n\t=?us-ascii?Q?NMOcsQ6k417WmHPjEBLnTXg7AaOyVB9npImCCeU3ZFmcjJlhmjWd09L+ePWw?=\n\t=?us-ascii?Q?nUNtaFInY3U/ZQcMkU6WA2tGkcRnKr5xnZNmY4fL3DqJiDHXezqzHcJ+dXwD?=\n\t=?us-ascii?Q?1xDastYW/OUy1RW4SxJaS70AbZcQpmwmhnD4AVocOkyYEBVR1kMs91O9ITXT?=\n\t=?us-ascii?Q?mUufNh9pyfOqljauvq5LkogNj0jI8MqI0evMHn03StLw7z7M+bSeFjjq5U01?=\n\t=?us-ascii?Q?9ZG3RkstV5gM9zNSvWCxZ9cMVKuZD6ycuC45eVC3I0xBwbLe76bT+qV+qXkP?=\n\t=?us-ascii?Q?UxKPQ8J3hFVrs0KZzTb2P4PvEaA+AzcOT18IemruuTtUjWQfyY4lIhemasD8?=\n\t=?us-ascii?Q?MLWQ/GL7OdH6NGQyD/KeXv7Us16D0Iw2w14bbCTQxT67NgbclP74xKO4Myre?=\n\t=?us-ascii?Q?lRdiQE/bu0mJg55zHgTvYK1xC5OzZeRsKDqNJHHIQrznTD3RzxAlAGnVj4Ei?=\n\t=?us-ascii?Q?VOOWLcIjE/p009Q33Pg5BUEWCmlZDgdJHJgIaWCbJeTKwBjI/iPUhh2/BdbG?=\n\t=?us-ascii?Q?1jU31KOGKNIvWIwycC63Rfpfiyu0r28YbubQfQcT8+678ekgFUqjalYHPFOa?=\n\t=?us-ascii?Q?Vvs+tPNmsdNlKksLh187aEIjbiwGC2CmbQQQE2m+6MnDXKMWQqAIyVdloROF?=\n\t=?us-ascii?Q?08q58c0A6cCZf1FuAhwM9zu48dLsAnlVxnP/Cjc+G9D0BkkzhrIuZ2bG8vPd?=\n\t=?us-ascii?Q?IN1X09s2NlfJH62L56JmfAxe7rV8ngvkEMpLtYE8LZGA2+aLziAAQ=3D=3D?=", "1; CY4PR03MB2472;\n\t6:xcLKhW0l4qHthtHDS1r4IuLAUDrRuiGnXkJ+zGBCOzzWMibATPAWlTG7tf8H7LR5WEc9QZp12ZueezmqHgiEU2rxzqJNdqQwRygtYu2CQBwARqKYC9ngWTlK0pxLU2kQjbYTURpg/BclPtH+bksQtu2+0gVAkJdXAJkMV/CIONkp4TwKkOWmDf2l2EE6zmoQ7eHi41NQGtYqnXShxl2sXfNXiWkhNa1MpXGbAQltF5xib/ikp+setefDnTqV94iVyuaF4/ThzvLw21c0oLeCTJ9RzTFujYwjTIHVNjUqw9IvsoiTlqJb/bWVf1w2uHcoeW9mLSbDZLCm9JmXNY+F/g==;\n\t5:9pOADyGaO0/C+WFyexTVIWLNJ+mzUjgCMElaYAL28E8FKK0QL7yilSkmAtiFgfWMrNCERddn3NsNUWkgXJbAicureat3SzSygvBqGrorZ9w6G6YmGJxS1bUn8uO4yNU/DW8aECLqnhv/9VWuK3//RJV2+S2bSGAF5Mm3jhu2xd4BRMjpyrmQCY6PzT3AaWNQ;\n\t24:nQfehIF9TzQniBjl1v4mxuyu68GgoeAsTbYpUYC8MTQf+4EBnmy5VBSKt7t8woZrxMA5P3XmL4HTP+9azXgTnxIwLIsAJRzHy++i4X+roa8=", "1; CY4PR03MB2472;\n\t7:9VOfUfyKSdeifbYTY5C2xpYUuX3c3VZXahLb+IuY7IEfPaelX1Up2emiTv03/45LMId1m+LRl2dWiplDhGRSs3RRr02+oXQ9rYd2T3ofeafKVeLnBXpAwU4oBDWpJqvj/RBS77EpFRs665FyrgM5hcDf8gkDnp8132Z4Ap1UCbjWgNBNmtFofhQm8fUd1X5771TVpYiSE11osUJvaJSJf/ta9NF73KJ+zwxufu/g2Enoh3OkAcV+Pk4RefI09N9/SzxUFlNd3DeCZXHuT19wId17G7d6e0WdM7X9IMy38goTtt37wm6lYMsm9zgS2PzqrJbwM54G0DU7yM3IIvGwCWevkhV//KYBBleGBR6ufA0=" ], "MIME-Version": "1.0", "Content-Type": "text/plain", "X-MS-Office365-Filtering-Correlation-Id": "65256902-9631-4994-2543-08d40e2e9064", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0; RULEID:(22001);\n\tSRVR:CY4PR03MB2472; ", "X-Microsoft-Antispam-PRVS": "<CY4PR03MB2472FC585412FF95DEA6EE2796BE0@CY4PR03MB2472.namprd03.prod.outlook.com>", "X-Exchange-Antispam-Report-Test": "UriScan:(185117386973197);", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(6095035)(601004)(2401047)(13015025)(13023025)(5005006)(8121501046)(13017025)(13018025)(13024025)(10201501046)(3002001)(6055026)(6096035);\n\tSRVR:CY4PR03MB2472; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2472;", "X-Forefront-PRVS": "01283822F8", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "16 Nov 2016 14:40:51.7509\n\t(UTC)", "X-MS-Exchange-CrossTenant-Id": "5afe0b00-7697-4969-b663-5eab37d5f47e", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;\n\tIp=[192.88.158.2]; \n\tHelo=[az84smr01.freescale.net]", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CY4PR03MB2472", "X-BeenThere": "linuxppc-dev@lists.ozlabs.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "Linux on PowerPC Developers Mail List\n\t<linuxppc-dev.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>", "Cc": "Scott Wood <oss@buserror.net>, roy.pledge@nxp.com", "Errors-To": "linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org", "Sender": "\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>" }, "content": "Preventively mask every access to the 'fqid' h/w field,\nsince it is defined as a 24-bit field, for every h/w\ndescriptor. Add generic accessors for this field to\nensure correct access.\n\nSigned-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>\n---\n drivers/soc/fsl/qbman/qman.c | 32 ++++++++++++++++----------------\n include/soc/fsl/qman.h | 5 +++++\n 2 files changed, 21 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c\nindex 53d9bfb..099ba8e 100644\n--- a/drivers/soc/fsl/qbman/qman.c\n+++ b/drivers/soc/fsl/qbman/qman.c\n@@ -471,7 +471,7 @@ static inline void eqcr_commit_checks(struct qm_eqcr *eqcr)\n {\n \tDPAA_ASSERT(eqcr->busy);\n \tDPAA_ASSERT(eqcr->cursor->orp == (eqcr->cursor->orp & 0x00ffffff));\n-\tDPAA_ASSERT(eqcr->cursor->fqid == (eqcr->cursor->fqid & 0x00ffffff));\n+\tDPAA_ASSERT(!(eqcr->cursor->fqid & ~QM_FQID_MASK));\n \tDPAA_ASSERT(eqcr->available >= 1);\n }\n \n@@ -1387,7 +1387,7 @@ static void qm_mr_process_task(struct work_struct *work)\n \t\t\tcase QM_MR_VERB_FQRN:\n \t\t\tcase QM_MR_VERB_FQRL:\n \t\t\t\t/* Lookup in the retirement table */\n-\t\t\t\tfq = fqid_to_fq(msg->fq.fqid);\n+\t\t\t\tfq = fqid_to_fq(qm_fqid_get(&msg->fq));\n \t\t\t\tif (WARN_ON(!fq))\n \t\t\t\t\tbreak;\n \t\t\t\tfq_state_change(p, fq, msg, verb);\n@@ -1755,7 +1755,7 @@ int qman_init_fq(struct qman_fq *fq, u32 flags, struct qm_mcc_initfq *opts)\n \tmcc = qm_mc_start(&p->p);\n \tif (opts)\n \t\tmcc->initfq = *opts;\n-\tmcc->fq.fqid = fq->fqid;\n+\tqm_fqid_set(&mcc->fq, fq->fqid);\n \tmcc->initfq.count = 0;\n \t/*\n \t * If the FQ does *not* have the TO_DCPORTAL flag, contextB is set as a\n@@ -1851,7 +1851,7 @@ int qman_schedule_fq(struct qman_fq *fq)\n \t\tgoto out;\n \t}\n \tmcc = qm_mc_start(&p->p);\n-\tmcc->fq.fqid = fq->fqid;\n+\tqm_fqid_set(&mcc->fq, fq->fqid);\n \tqm_mc_commit(&p->p, QM_MCC_VERB_ALTER_SCHED);\n \tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\tdev_err(p->config->dev, \"ALTER_SCHED timeout\\n\");\n@@ -1894,7 +1894,7 @@ int qman_retire_fq(struct qman_fq *fq, u32 *flags)\n \t\tgoto out;\n \t}\n \tmcc = qm_mc_start(&p->p);\n-\tmcc->fq.fqid = fq->fqid;\n+\tqm_fqid_set(&mcc->fq, fq->fqid);\n \tqm_mc_commit(&p->p, QM_MCC_VERB_ALTER_RETIRE);\n \tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\tdev_crit(p->config->dev, \"ALTER_RETIRE timeout\\n\");\n@@ -1937,7 +1937,7 @@ int qman_retire_fq(struct qman_fq *fq, u32 *flags)\n \n \t\t\tmsg.verb = QM_MR_VERB_FQRNI;\n \t\t\tmsg.fq.fqs = mcr->alterfq.fqs;\n-\t\t\tmsg.fq.fqid = fq->fqid;\n+\t\t\tqm_fqid_set(&msg.fq, fq->fqid);\n \t\t\tmsg.fq.contextB = fq_to_tag(fq);\n \t\t\tfq->cb.fqs(p, fq, &msg);\n \t\t}\n@@ -1973,7 +1973,7 @@ int qman_oos_fq(struct qman_fq *fq)\n \t\tgoto out;\n \t}\n \tmcc = qm_mc_start(&p->p);\n-\tmcc->fq.fqid = fq->fqid;\n+\tqm_fqid_set(&mcc->fq, fq->fqid);\n \tqm_mc_commit(&p->p, QM_MCC_VERB_ALTER_OOS);\n \tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\tret = -ETIMEDOUT;\n@@ -1999,7 +1999,7 @@ int qman_query_fq(struct qman_fq *fq, struct qm_fqd *fqd)\n \tint ret = 0;\n \n \tmcc = qm_mc_start(&p->p);\n-\tmcc->fq.fqid = fq->fqid;\n+\tqm_fqid_set(&mcc->fq, fq->fqid);\n \tqm_mc_commit(&p->p, QM_MCC_VERB_QUERYFQ);\n \tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\tret = -ETIMEDOUT;\n@@ -2025,7 +2025,7 @@ static int qman_query_fq_np(struct qman_fq *fq,\n \tint ret = 0;\n \n \tmcc = qm_mc_start(&p->p);\n-\tmcc->fq.fqid = fq->fqid;\n+\tqm_fqid_set(&mcc->fq, fq->fqid);\n \tqm_mc_commit(&p->p, QM_MCC_VERB_QUERYFQ_NP);\n \tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\tret = -ETIMEDOUT;\n@@ -2206,7 +2206,7 @@ int qman_enqueue(struct qman_fq *fq, const struct qm_fd *fd)\n \tif (unlikely(!eq))\n \t\tgoto out;\n \n-\teq->fqid = fq->fqid;\n+\tqm_fqid_set(eq, fq->fqid);\n \teq->tag = fq_to_tag(fq);\n \teq->fd = *fd;\n \n@@ -2468,7 +2468,7 @@ static int _qm_dqrr_consume_and_match(struct qm_portal *p, u32 fqid, int s,\n \t} while (wait && !dqrr);\n \n \twhile (dqrr) {\n-\t\tif (dqrr->fqid == fqid && (dqrr->stat & s))\n+\t\tif (qm_fqid_get(dqrr) == fqid && (dqrr->stat & s))\n \t\t\tfound = 1;\n \t\tqm_dqrr_cdc_consume_1ptr(p, dqrr, 0);\n \t\tqm_dqrr_pvb_update(p);\n@@ -2504,7 +2504,7 @@ static int qman_shutdown_fq(u32 fqid)\n \tdev = p->config->dev;\n \t/* Determine the state of the FQID */\n \tmcc = qm_mc_start(&p->p);\n-\tmcc->fq.fqid = fqid;\n+\tqm_fqid_set(&mcc->fq, fqid);\n \tqm_mc_commit(&p->p, QM_MCC_VERB_QUERYFQ_NP);\n \tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\tdev_err(dev, \"QUERYFQ_NP timeout\\n\");\n@@ -2519,7 +2519,7 @@ static int qman_shutdown_fq(u32 fqid)\n \n \t/* Query which channel the FQ is using */\n \tmcc = qm_mc_start(&p->p);\n-\tmcc->fq.fqid = fqid;\n+\tqm_fqid_set(&mcc->fq, fqid);\n \tqm_mc_commit(&p->p, QM_MCC_VERB_QUERYFQ);\n \tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\tdev_err(dev, \"QUERYFQ timeout\\n\");\n@@ -2539,7 +2539,7 @@ static int qman_shutdown_fq(u32 fqid)\n \tcase QM_MCR_NP_STATE_PARKED:\n \t\torl_empty = 0;\n \t\tmcc = qm_mc_start(&p->p);\n-\t\tmcc->fq.fqid = fqid;\n+\t\tqm_fqid_set(&mcc->fq, fqid);\n \t\tqm_mc_commit(&p->p, QM_MCC_VERB_ALTER_RETIRE);\n \t\tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\t\tdev_err(dev, \"QUERYFQ_NP timeout\\n\");\n@@ -2634,7 +2634,7 @@ static int qman_shutdown_fq(u32 fqid)\n \t\t\tcpu_relax();\n \t\t}\n \t\tmcc = qm_mc_start(&p->p);\n-\t\tmcc->fq.fqid = fqid;\n+\t\tqm_fqid_set(&mcc->fq, fqid);\n \t\tqm_mc_commit(&p->p, QM_MCC_VERB_ALTER_OOS);\n \t\tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\t\tret = -ETIMEDOUT;\n@@ -2654,7 +2654,7 @@ static int qman_shutdown_fq(u32 fqid)\n \tcase QM_MCR_NP_STATE_RETIRED:\n \t\t/* Send OOS Command */\n \t\tmcc = qm_mc_start(&p->p);\n-\t\tmcc->fq.fqid = fqid;\n+\t\tqm_fqid_set(&mcc->fq, fqid);\n \t\tqm_mc_commit(&p->p, QM_MCC_VERB_ALTER_OOS);\n \t\tif (!qm_mc_result_timeout(&p->p, &mcr)) {\n \t\t\tret = -ETIMEDOUT;\ndiff --git a/include/soc/fsl/qman.h b/include/soc/fsl/qman.h\nindex 1405810..f3fa53f 100644\n--- a/include/soc/fsl/qman.h\n+++ b/include/soc/fsl/qman.h\n@@ -262,6 +262,11 @@ struct qm_dqrr_entry {\n #define QM_DQRR_STAT_UNSCHEDULED\t0x02\t/* Unscheduled dequeue */\n #define QM_DQRR_STAT_DQCR_EXPIRED\t0x01\t/* VDQCR or PDQCR expired*/\n \n+/* 'fqid' is a 24-bit field in every h/w descriptor */\n+#define QM_FQID_MASK\tGENMASK(23, 0)\n+#define qm_fqid_set(p, v) ((p)->fqid = ((v) & QM_FQID_MASK))\n+#define qm_fqid_get(p) ((p)->fqid & QM_FQID_MASK)\n+\n /* \"ERN Message Response\" */\n /* \"FQ State Change Notification\" */\n union qm_mr_entry {\n", "prefixes": [ "12/17" ] }