From patchwork Fri Mar 17 10:05:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Horia_Geant=C4=83?= X-Patchwork-Id: 740229 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vl1Jb451rz9s1h for ; Fri, 17 Mar 2017 21:08:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="RTXOBVbI"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=K5x5PeQp9K0ocZaE0lENLWHW0CKjNLgn3fxeV/VIZm0=; b=RTXOBVbInnDbHz itQLCZRDCvN/qRPBG/K7WztZ4kmJElHIskXXXRuN6yH9qr5/F89G1MzcplQnXNJDQWo76tOUSRstG Bz+pb7ftjrNV5CXxB/gAJuljcvsXoGvP58oKWBqfedn2VYmoU5CdbgvqUz8zrIcIhKzxpiHifA5c3 3B4cKdj6UpyKrpp64Wj4seqO8nZi2i7KsqiDhV9dTJeHn5l+D3Vfrlui3jXmigCjU26vNvbFQQhIM xMZktXHJMuXcLkrwGfEgx3163g40frS9QJrlg5l/u5oOs1x9/8ZBG78AerXaBNy48HBOODCnKsjnF NV8TFdlhMwoLC53/Jd/g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1coooN-0002rb-7Q; Fri, 17 Mar 2017 10:08:43 +0000 Received: from mail-bn3nam01on0067.outbound.protection.outlook.com ([104.47.33.67] helo=NAM01-BN3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1coome-0001Am-OU for linux-arm-kernel@lists.infradead.org; Fri, 17 Mar 2017 10:07:00 +0000 Received: from CY4PR03CA0011.namprd03.prod.outlook.com (10.168.162.21) by BN1PR03MB188.namprd03.prod.outlook.com (10.255.200.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.961.17; Fri, 17 Mar 2017 10:06:34 +0000 Received: from BN1BFFO11FD029.protection.gbl (2a01:111:f400:7c10::1:189) by CY4PR03CA0011.outlook.office365.com (2603:10b6:903:33::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.977.11 via Frontend Transport; Fri, 17 Mar 2017 10:06:34 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD029.mail.protection.outlook.com (10.58.144.92) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Fri, 17 Mar 2017 10:06:33 +0000 Received: from enigma.ea.freescale.net (enigma.ea.freescale.net [10.171.77.120]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2HA6O4K014594; Fri, 17 Mar 2017 03:06:31 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= To: Herbert Xu , Scott Wood , Roy Pledge Subject: [PATCH 2/7] soc/qman: add dedicated channel ID for CAAM Date: Fri, 17 Mar 2017 12:05:57 +0200 Message-ID: <20170317100602.2837-3-horia.geanta@nxp.com> X-Mailer: git-send-email 2.12.0.264.gd6db3f216544 In-Reply-To: <20170317100602.2837-1-horia.geanta@nxp.com> References: <20170317100602.2837-1-horia.geanta@nxp.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131342187941341997; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39860400002)(39840400002)(39450400003)(39850400002)(39400400002)(39410400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(86362001)(50466002)(77096006)(50226002)(81166006)(8936002)(47776003)(4326008)(53936002)(8656002)(8676002)(5820100001)(85426001)(23676002)(54906002)(104016004)(1076002)(2870700001)(6636002)(2950100002)(36756003)(2906002)(189998001)(105606002)(106466001)(7416002)(33646002)(356003)(38730400002)(76176999)(6666003)(5660300001)(305945005)(50986999); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR03MB188; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD029; 1:sphYmaUlb5MECQ+v+HQXnOIVdngmPnsLayW+FY2779p7mf11cLdWifFvTha6xDhMZcgx8HTYXQNf3s/QOAr6NJYhTpQyM3O89lPfNVECsGz3KxzfZenNJUx2cdgzb4UUKj7tvxxV+uHwp3XTQ4t4Vc+7LjIzRH4BRaDnN7RYllpLD8/lnRB+Kb4/SOYxEeZ5QJsSzLucdHSH0QlNTHX8LDAHEv5DnJoxf6qlIHicvXZhUUJ+rI65T2tR4zSPAKGhX/wEQGwEg6OqOvbpt6VyrnzssUIfXitzfW8jZdF+gU9hanODYqDZVIEzNQHyye5+oFjCRqWzPC2jASRwS/Q900XO06AUAsRz8KpwiziXDtltpEMwxY/d2ymvrxgO++IljeTjmi5faT8xhuhXmNjU0PieRA+fnjLMoMFFv9tu25FarobwGMb9nem8XtuGREaQwJ9+TyYj+eKT6UWNpIN2RgxPnyJ5OnPcWSy+mwuE3qNFBcCBSBH09xVrYckN6yBw1aa7YPnqd/KlbP7n84U15z4Jl16bMdKB+N+Ifd8kLx0/hYpUmsj/k5tKiFyZpoh+GS7sSQqid6slGmsmvRZ763FOW2Ck35xIJbjFSCXKEljPuSR9E8nzdRuoF4GSJ09K8uxRs0ReQTYCh/XHO6P0zb88pG76jMBDs8O9hCkev24zP8ZGhckNXsmMhaVZAGbxKduaG9Jh1t+7zc41q4Wz4w== X-MS-Office365-Filtering-Correlation-Id: c80d4621-b5e7-4297-c9d9-08d46d1d4ab8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR03MB188; X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 3:IL7bgwyFLFtt/0USlmQG24/HifyRzg7W0o4kwJIfm/zsFKQ+iHV1K7ktEXdHmDRio0MrKwq3lgaWNfEKHqxLxVLOlUliVsdumigmQkSMJVQaekiowQJZszbVKqaO5pSxnkLXeJmzn7T8Z0C7BcXcjsd5uasiFONh5YaAcAn6DiMxBNirI/mQgdFRQnTZkuUynVqRHGJFCRmOqQvWbigaHZ+6rtstS83WaNWL+SfeQdbGtZEcc6l9OrDq22h58k9u+MRLwOA8e0bKDO4kqvwLgaf3syxGakoXFNPLq8ZhtpX/KnzCXTmV4dlmUg8L+pbjVEI2TGH3EClY/98YBetjaKnKR+Sm06Yt01T/+TuSzsamVkif/a3iDxr2dleBqTKV; 25:XjdZjc5EApHg0/mGCzgCeBvquNSz+0fOOECF0nvp3zKF5I+MVuGCbDR4hHD1xDU8gR5r8y+85zICL5R69nLCSPaN4fOG7GyuKvkm8uD9MZNzAZm40RkjEXh4UZb5aVDrtzhapLCxloDd91MimzDv82Wy+bm4hcpvjIgZUqIhk+770Yd2LGi8iSXmc7n33BF64kE3p4SuP1LSu/aAUWnvxMfi+fsLTFUb/f2eq6pwUEy3znXOzgJwtXgtNARNxAsDnlfhq/ov5zfPkNzQ2zO4nUmhWtAAwli/jQ+a/Xn4/d+nlwnfBwzp3sYbIRdZ1DleYxoAQsRAGzVbb8FBYHe/92GdFuc22LcGr0roUfUJo5F95IKXfNuGP/nygCPnaWMsU3M8vFZtjupt3Lo1F8wFVqP9hWCBXHjzGWHKpMOODoPXcY1G6M5/hCGKKq4he4V2GbJOVFqQhbDwAtSmTfwaLw== X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 31:ZF/MySfC+Un82HmBhhWwaTJAuysmL8VNSsi7Z4XD7jFFq0i0IMsGlO9YF+ZPhC7KszTLL0WTDKz+b54fg51QCRXaAkWbylDC4/FcdeKguOC2mZon3uRhrxeMRVs+sE0MmWIR01igWVhKICfl5Yb/79Ea3p7eN/5lYlfFwvdv9xi6qNGEgsAmCaN+s/njInQj+e8skLPqSaSGrC37FyZhIiOBLp5ILlde0ILkS5T9yIemwILj+49dQV7YW/Dx2+tyocnThibDymLu+8u8HZXREQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13018025)(5005006)(8121501046)(13024025)(13015025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123563025)(20161123565025)(20161123561025)(20161123559025); SRVR:BN1PR03MB188; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR03MB188; X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 4:M/Z9HvZMuH3K7pY4OvlbDrCwn1W29c02AtB9Yxq95EiAEJWqyCunjLkw+v/Ro5hy/S63iEsxDr/pc5wXgWWO+JM8HxFcHZr7ZdmQ2MeDzZ3/Hwv9zTZtk36ddsxj+UMQjZA3ghBAP10EeRcjsRN1fraScZfd+2p7JeamItOMLC5WIvn3YfgM7+/qp+lYDrh46LhOu5/4Pw6O1GPDtPqya2n4DMN9ZZ4L0+q3vNbpp7yvZMqcPDT1rQt83noDMn+0TC/B97o2GrBstgYjPzvc+DZTGQIcKFhDwaML3po3jMkq8hEI5rdXmUfu1ILq0ZgBcYJTt5iBm5pFutHRZaO7/U2gAnK2WFWxCnRffN6uWJx4BYncGUaE5FXqtC+eFOfBJHPE2arGAN/DX1F/2pwPXS4bQpTKld5m5koqn1/Y/jej0c2Sic9yKHxXgxSVStF+tatJEuS7qWr7gs77COGUWf9Oc1GrQh9olkn/yKC/ViCBfHJu9n0E8iVPx4z1A01kUQbWE9xfNNnMwjKxamB1wHHR5TRfzV91vaF+ckfuJchedpAjbxHwjlpBJderNWRSn3JgIE0xUAvYB64MqJosasICFtFjMePuX5diN9md0SVY6Q1E+0OiYUIwW/+PfQSAVjbxP6SIyPMUizTPalG3Fp6aYML1DEyIMzmae5Zr4oYL6+zS/pnqdJ2mfkfE4B/Art8HNlGh5iM3w6ytcdsDVmAy6x5vxiCUwEpyWU7CcQToAE2CS3/QgkF31ISsnFCPJClj4v1TB7ueenKCGxp5JQ== X-Forefront-PRVS: 0249EFCB0B X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjFQUjAzTUIxODg7MjM6QUZhaWd0NGlnUmpoWGF6a0NHVVBOcGR6eXVV?= =?utf-8?B?bC9GeXJhRURwRE16YmphMnBPREhXUXVwL3QrWUpwNUUyNnI2ZnJyTzE4T0Nu?= =?utf-8?B?djVmMm1LaHZvM1lmN252QmhEUzZGZ3Vma0M2M0U3cGZyUkt1SUVmZU42dEZB?= =?utf-8?B?VVhnM0dlZk9UUkhyalNTeFlOdVBaQ0syS1dpd2dQaDA2dnl1T0ZWaVdVMmRP?= =?utf-8?B?WXRXeU5zYjNoM25BVXVhY1RiL296aEpPQnpoZWJhZDJqcXVJN1ViYTg1blp5?= =?utf-8?B?QXp0aFR5NDlvdWhBRTNEbjduRmUvckhrN2FUdlZXRGJqczZqZXN2VjVwdzhp?= =?utf-8?B?UU9lR2N1aUhWNVhhSStVMHRLTEw1bHlSbmZyOXl3VExkamdYQWp3a284UjlP?= =?utf-8?B?em1BdGJtK2tkVjVXZUFSUFVQa1RXeWs1N1dldVRRU2w3eHFpVmJSU29aSlZn?= =?utf-8?B?ZTdCblFnSm1hTWl4NUo2VmtFVGJGaXppMUV6OUdYYVJrVHFvN0g2N2tkRFVs?= =?utf-8?B?L2VFTnd5SHg5N1o3TXhUaGdmYmJReWp0TS9LWVdWd2srTkovcFRoOVAvUlp0?= =?utf-8?B?MkVndjNWYkpmL2t0cm5JQWl3K1NDaTFYY2ZJOGk2eFNnWHQ0N2FEL0VmeU9u?= =?utf-8?B?Sys1cXZWUHpCS2E4NnJiY3JFY1pwelZEYWIyWTU2QXhOZ2E2WTk3VFY5a3Z3?= =?utf-8?B?d3RxRFdsaXdsME00NTg4Y0tSNFE2NElnYWhWemZXYTdCOGRhMWJRZU5xTkNV?= =?utf-8?B?SmR4c0tmL01HcGV2QnJnWjNQNlJKdEJWeDJjSjdESW40L0tXa1VsZmNzWEVR?= =?utf-8?B?bkdQUDdsUkU5ekRyWnhIdkZpUklvODM2SnlwMDB1UTBKODJnZmNRaGQxdjlm?= =?utf-8?B?c20xTEp5T25CQUQxTDc0WU1lNXhpZUVzUk0xK2hOK0dPSklLamhHMURqc0N6?= =?utf-8?B?MkVMUG1majlZWEFVMDFIZnFKVmdMTHlkeE1Da3BWUS8zV2c3M1hwWkJ4YS9O?= =?utf-8?B?TWhDTlYyV21JVXlNNFc1NitETkFwSkxYVG9lRTh5elZUbFlYQVFXZXlZV2VU?= =?utf-8?B?RjU1WG02Sk04enV2OElJK3VTMENhNnpOT3RxQ1J6MmluVldvWHpQRGZIRGdR?= =?utf-8?B?WERHVUJmRXdLZFJDWUpuMno5blk4aHVlZVBnV0hpc010OVJ6cTNuNDV6NjI4?= =?utf-8?B?WlB3bEtoZWdKbHpkYjg4K0lZeHJpd3JiTDBCSVdSRDZaNjRqdkVNa0xKU0FM?= =?utf-8?B?N2RVQTVnaWg1UktBQU90TVZNczk4V3JWNG1zUUZpRVp6TlZ1Vlh0ZGQ5eTYr?= =?utf-8?B?NDVSQWFwYUVUNGEwUWJsb3Irajc2L0Rua2Z3U2d3U2laSTMwVmNUV0MwNTdK?= =?utf-8?B?ZG1ESU1vVzduUVdtUXUwRXM3OUdwZ2hVbEdCTm9DclNwYmtJN2VHR3A4SHlH?= =?utf-8?B?Vlk1WXE2YXZHdzJqTmtocFZ2TlRZU3Z6SzJnelVuY091Wnd2M2ppOTRTSGFl?= =?utf-8?B?QUluTzd4dllFUHBZU0hkRGFtb2NxM2d6YkJzQXMwdFYreExwM052T0x2c1Q0?= =?utf-8?B?ZkxUNUNWZ09TQWtlSkJSQWVkWCtEQWRra3J1MHZxYlJDMW1DQzZpdm9QL2xh?= =?utf-8?B?YlBkczk0Z0ZaTUFiOHhJczlSRXRLeHdMRUFSYStCaUtPOTY3dDNrYXc9PQ==?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 6:tJx1nmYXcksBZbSruApSABva+abRnJpIMOqjciZ9aBERfonl5inSVlcldUf4/69fjaYGkt7L+LTgn5yswnhjOaLUc6g0AL/0SWPE9egJOSCpUMwb0XIheDBNra6HDyTZbdtjRqe+3HNiiZIftblKyAQ+JxgvRVrrkbkDJYyIVDipkXY7EUn00wCd5ajDBa2TIy0tNR1C2n7tyZxE06zkGgy4DiNWoFGhXFM6HvOUr4uixvzxImw8W+88ZrWRxK//ZwBRvgJGSqx3fSbIPFifrvTP0XBjJ6g2ipKQ4KeWCZgzo+Seu6F81pBxabXc4Hiasyp/EJA+ewPenrmHFZLlUiMIw6XIujhQ2LIDQYzXvj13F/cm/f+mLfOEeIxZNocQKfP9Z+3bdpEvnvZkvqMbtjA1MFTSpMDWmQUaeeUAtf4=; 5:m+Y3KZOYI0wgRWbEZwCAoRrIJbhuazBgsEnFqOBbGsCwmM2HluMolTNouzLoT/AYUI/IF8s4fPrJLAEdC6FaTPKUydyjon9A8HowE7Jynw71gE5nWBti/T6mEdh4MEJOaDSEImk5VYuw4nQmgOWqENionXJds53C/oOS3OZij/yFqeJRMehHyxBIRFx23z9j; 24:+Gt20S0lyv8uXYKzfTTGYG4wlYs6OtATFc11T6RyXygk1Ga4taEvNEZRlQfkhzy1nddHpgT6JPkZRA15QKZQujua9ypoVeqzFbKz+yvdQZY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 7:IEvYAdlQ8p4v/rw31yeTzdKZd50xFq6qPEihBp5CFkBQ0C/+hSfjj+I71gtVEJRaZYsGA/GsR0h7Cp+bjYMzELNmhRWQSa+haBZsoUNSYyuP/O0HF9fgVhSkYKiSD9SSZI/L6bmkUcueS24xGlYnW9OpQ54rivkU6Aiyf1cNbl1vMw1cVCUt3sWJm8tBk5NOjPiABjNUTRD9ejDavNU2W9kKRLjzOlxB8b5U54W1XjHk9C12btOZZ1xTGcD3zjwjhE/ijeXRqkfI9k/capqw4nxdk2JyQYcFieeZceAVZ2oDTpUxbj//EBMjdkFMnwITR6dniEZ17QdzVMsR7w9pbQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2017 10:06:33.8534 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR03MB188 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170317_030657_085241_07332A5C X-CRM114-Status: GOOD ( 12.41 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.33.67 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [104.47.33.67 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Claudiu Manoil , Cristian Stoica , Dan Douglass , linux-arm-kernel@lists.infradead.org, Vakul Garg , "David S. Miller" , Alexandru Porosanu , linux-crypto@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Add and export the ID of the channel serviced by the CAAM (Cryptographic Acceleration and Assurance Module) DCP. Signed-off-by: Horia Geantă --- drivers/soc/fsl/qbman/qman_ccsr.c | 6 +++++- include/soc/fsl/qman.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c index f4e6e70de259..90bc40c48675 100644 --- a/drivers/soc/fsl/qbman/qman_ccsr.c +++ b/drivers/soc/fsl/qbman/qman_ccsr.c @@ -34,6 +34,8 @@ u16 qman_ip_rev; EXPORT_SYMBOL(qman_ip_rev); u16 qm_channel_pool1 = QMAN_CHANNEL_POOL1; EXPORT_SYMBOL(qm_channel_pool1); +u16 qm_channel_caam = QMAN_CHANNEL_CAAM; +EXPORT_SYMBOL(qm_channel_caam); /* Register offsets */ #define REG_QCSP_LIO_CFG(n) (0x0000 + ((n) * 0x10)) @@ -720,8 +722,10 @@ static int fsl_qman_probe(struct platform_device *pdev) return -ENODEV; } - if ((qman_ip_rev & 0xff00) >= QMAN_REV30) + if ((qman_ip_rev & 0xff00) >= QMAN_REV30) { qm_channel_pool1 = QMAN_CHANNEL_POOL1_REV3; + qm_channel_caam = QMAN_CHANNEL_CAAM_REV3; + } ret = zero_priv_mem(dev, node, fqd_a, fqd_sz); WARN_ON(ret); diff --git a/include/soc/fsl/qman.h b/include/soc/fsl/qman.h index 4de1ffcc8982..10b549783ec5 100644 --- a/include/soc/fsl/qman.h +++ b/include/soc/fsl/qman.h @@ -36,8 +36,11 @@ /* Hardware constants */ #define QM_CHANNEL_SWPORTAL0 0 #define QMAN_CHANNEL_POOL1 0x21 +#define QMAN_CHANNEL_CAAM 0x80 #define QMAN_CHANNEL_POOL1_REV3 0x401 +#define QMAN_CHANNEL_CAAM_REV3 0x840 extern u16 qm_channel_pool1; +extern u16 qm_channel_caam; /* Portal processing (interrupt) sources */ #define QM_PIRQ_CSCI 0x00100000 /* Congestion State Change */