From patchwork Tue Nov 22 13:44:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Horia Geanta X-Patchwork-Id: 9441159 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1AC1C60237 for ; Tue, 22 Nov 2016 14:00:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E2B62853B for ; Tue, 22 Nov 2016 14:00:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 026CD2853E; Tue, 22 Nov 2016 14:00:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1D5D2853B for ; Tue, 22 Nov 2016 14:00:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932568AbcKVOAR (ORCPT ); Tue, 22 Nov 2016 09:00:17 -0500 Received: from mail-sn1nam01on0071.outbound.protection.outlook.com ([104.47.32.71]:31601 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933140AbcKVOAP (ORCPT ); Tue, 22 Nov 2016 09:00:15 -0500 Received: from BLUPR0301CA0008.namprd03.prod.outlook.com (10.162.113.146) by DM5PR03MB2473.namprd03.prod.outlook.com (10.168.233.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8; Tue, 22 Nov 2016 13:45:00 +0000 Received: from BL2FFO11FD048.protection.gbl (2a01:111:f400:7c09::167) by BLUPR0301CA0008.outlook.office365.com (2a01:111:e400:5259::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8 via Frontend Transport; Tue, 22 Nov 2016 13:45:00 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD048.mail.protection.outlook.com (10.173.161.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.721.5 via Frontend Transport; Tue, 22 Nov 2016 13:45:00 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:998; Count:13 Received: from enigma.ea.freescale.net (enigma.ea.freescale.net [10.171.77.120]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uAMDioJb031527; Tue, 22 Nov 2016 06:44:57 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= To: Herbert Xu CC: "David S. Miller" , , Dan Douglass , Tudor Ambarus , Alexandru Porosanu Subject: [PATCH 01/10] crypto: caam - move append_key_aead() into init_sh_desc_key_aead() Date: Tue, 22 Nov 2016 15:44:03 +0200 Message-ID: <1479822252-23833-2-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1479822252-23833-1-git-send-email-horia.geanta@nxp.com> References: <1479822252-23833-1-git-send-email-horia.geanta@nxp.com> MIME-Version: 1.0 X-IncomingHeaderCount: 13 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131242959004546930; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(336004)(339900001)(189002)(199003)(85426001)(50226002)(23676002)(105606002)(86362001)(8666005)(356003)(92566002)(87936001)(2870700001)(106466001)(69596002)(5820100001)(7846002)(8676002)(305945005)(68736007)(50466002)(2906002)(47776003)(4326007)(33646002)(76176999)(104016004)(8936002)(50986999)(626004)(189998001)(38730400001)(6666003)(77096005)(5660300001)(110136003)(6916009)(2950100002)(36756003)(81156014)(81166006)(97736004)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2473; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD048; 1:HPLsujBaxV8svpfQA9tEhUbg82Bd4/oJrqcUaPr1FEFZVdfDd7vArjOeMlk/1I0MBf/KwbD4nRNPyY48EcqFGElAPE6/+JfrmtEsTVXCkYoctrFHafIeNvdfPTAW8Y6cgUED2vXp5PmSBIlYcVLaN6frRfoQOqpqoGK1mBGX1HW56r0kD/fGoww8KN90pfEyPu+zKluHPhs97gUeZuyNrmRQD7OK9BoBAfaLq34N1VOrBesBQDS9uqwjXgx8L1HFeXruIcKFFSGRIDbqJ9t7h3zvOu+pn2WKXK6HLKzBWArEVdnEKGJignzYsSEsN/DVXVoa9d0zuQM82qp2zgaGwgu7qFkFmx3VG1G6yr1M3Ug60FAmdZhuhZ5gE9bUIP+kIufwjPdZh5LQYGV2Q4SA19ypR8X1LTehAJuo5+pv6wjLcd6rYRtH/MwcghpQDU2qShBLioKGNAXFic3wxy15AsErn/FNd526NPOHm+yvO1c3Eye9XCTMyKyzNZniUodJqF4mhpwzXEKyIDRGKcbf00t1L1L8UDG8LuDJTmNaRIHIYiTdEL9JlPl0qalc1mctraluLWxW4PDtEjF6TAU4ijzMbQKriWvIMi6loMM06xJRh6Iwxgve6TbskmYuN9xKZ4glGYsPTHJyI0uoqz/s9Cho/JEziVikr7xUPvDSgBDlCTXo81BN0Yseh0wy3OjRF9iqPo7lvPs6oKshm1HCTRfcmMBxjr3IqV3d1dRsNls= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 2:GnrJAXo8WnR/TQazHuZfJhrVMsvNyPxhQUhNrBR6pk19NioyX9X656aig5sbkw4AJGySc1NOR288Owgpe7wC8xCvsCjHICBf+Zw2+UH/U7qXOE6cCs3/CanOJR64OxGwFmpXTS2hHWgpRwHLEDdyTzk70LzhfQZIJKT2gd6dLUg=; 3:UYHiS70p4Y244cQB64MLxDSgiofeFFuMNwQE+bBtxdxYt7v64CMVpTgm5yvG6gv36JPhCYTG71RSZ2Yz3cGFHGeTcZZq//INWtCSAN4NjxDG49EoZhok/p4IDQkIPb11Oa35ayedJomaYCfCmkSED6XHUT1cnx5foa7myuwZGLrDKUAI6FUwKsL5tMJWskpOlVsUcpzqr5k+UXXq50XL2B+k5jiOt2vibjnuef0oB5sNCRTIxyapjJ4MDbLljWpGP4lHrSzEmDFbRavYcc7GVA== X-MS-Office365-Filtering-Correlation-Id: ac5b4442-f44a-4d21-4b2d-08d412ddc11e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2473; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 25:OHCCO4vt6xM+BPqyi+tiDF/+BUGzucFGcxiOx8FzhMsZesbS7jWmYOIPVjotAXjWT3XopcH7lumqXLbFCDUWSlaOZh7OyryVT0zTSEAwgjqQP6k729RObkuJ1SYm85IczQECDkPWaD48HO4hYgB32h4QpOAWlf4G5dKOnHsUh2yvutiIt+p+aLaxgMRb599sAcpyfGWUNsHmIL7KghFVGlPqGzTSYw8z0HfDp6nTcUvOw5g81Xynq93amXdlOYQQJ7zAiEkEpdkK5A9HdNVPTJQaLJBTW+EBLvbmD0dPj9GRsmyflzUvh3gi8f6aFQ0uo5+gvnISQnvWk/0Uk9NESfTgIH7yvwUCEKUbHYNYSNA3ENqwT5iI18uELthfXFHU8oOh30PjodDwLqMd1+U0rkgXa3VG6j4nMvUrJ1YuPnFtNN+4mnfWinH+W6qrRYIZMTXVQokvxoGHm8tIOnotym9ocYZr7+LV704j5nI+tQTP0uf28oCmBAI4FxboqMsm8D6U5A4kiXkk/iRsdVB6mTCJguF3XgMoqeser5FVyVCkP9nPJWjHFUMMOw+ZVdF23YYInmdZdWFN4t+Tl0Aow+ezKeC/QzbPy9gzCB3sX9fp0desYzS48jdLEMMkvyhu5G7vvu60vFHLAg65tn+p7sjQ/wzR1dspTNC2qd+767qjy0glflVqjtjz6GQwHxmv8hRu4912N1AG/tJvj/93We3LFmsT486vlGuZ3x+RCdmDulcHTi1KFTKApFVmhH8BCRd2YvyzZp5lHT8gOcS+TQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 31:5zVqlfxEqbDrSHKu4y+UU1sUS6ZyXT89LC4FjTAO9+l8ysjDC1Tx/OkNMHFtAhSeRQ6xbzmwhZnALOjVqKH3fEMLMts4HgsM1HLs6a3sCSVRDdH+Cy6qok/1fmiVukTi2Vjv/vGd5Whi9giABIlAFpN8YhgJdGXQ+ulQAjtXdajIAI7b1sU8Oua+7llPxOcoXcWxux4k0kdYxTScXuTJ4Ehi9e/ldjaxfze9RxwOjUPd6s5+GrzK0zDW+b7v++Yc2rg2BR4BQzMp2IBxASi057EETRy7h03pZfo7xi9+z5Y=; 4:O8kCv0pM+dYXgJeJXrRde9VuhhK8lfw1X4wArReZ5tG0J0tYRgX9JAEM+pC7IHiOgvSBXqe4PS8UPDX8t7FU+/9cRXazMFCijf5AfYez2p81QZQdXenbymbqLASBUabDt+Vl5SeYEjFNrK5IDiCYDhKCgl9PS8Xi2ja6g+sKdeH6tkJJyHnFUfQUnbM3BePD3TLcRvYaxW9fLOUVmk6kBkgky+pnn3Y4fBXzUl/Rsdu94gIe0+UK1pbm4Rh3Uy2VbOq0qN700U3RAiPdVRvh1t2KZyPum5baPpCI07yKGcT6UpwwF/y3qYQA09rNULNTTdd4vYoEhmb/Zkpw/ZliC816511Pm0hAXBbbXqqF3/JFV/AXV5xwtq0ZUg1yM59fkZZBdLgDkljZFjX+lS4V/epWOVtW9n5b83gjG7yNJwfX1o8QrpBsQ0N6GhrWBtb0OZg3j3mNMn2Vb/D+iZ1ZJjgsGJHHPj0i9R+RUdxrNX2R9xUFxnaF1QTsCfkdsL88l1vxHZNCfoH67RgwHaOqwQgamfzOszBZPrP7ZTDJkNGdiquBcHohtDnRa5sSvVQtv8vrYeqi9cjtmp85vlKCXw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095035)(601004)(2401047)(13018025)(13023025)(13024025)(13015025)(13017025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035); SRVR:DM5PR03MB2473; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2473; X-Forefront-PRVS: 0134AD334F X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjAzTUIyNDczOzIzOmJ3S3BOcGV3TjkxdkdzVUI2OE5pMHJEWllz?= =?utf-8?B?MHJLcDVGV3ZVSFZSRTBwS1Iwekd0UmY4OVYxaC9qRlJ4UGowT2VnbUVlUlNi?= =?utf-8?B?SWRFZ3ZxeXBrajY2L0NjeWVzbjN0eCswY0c1WGxXWERrOVVFQ0VaNG02V3JJ?= =?utf-8?B?aks5blpUSkRjdjU5TTJ4aWRCc3dKK2x6cStiV0lvNS9weEs5azdqanNlQkRG?= =?utf-8?B?ajFTMndPR1pTR3hXZHVYQmVSN0tQd0tZYkRpVEh2azBwMktLdDM0ZWVmbHZM?= =?utf-8?B?L0VQYk50Q29xVmkxMVRzQ1pqN2RNeUJ2V2tnS3p1bDZKN3JrV1lvTzNwMGJq?= =?utf-8?B?TFlyUnJFQjhnMVY4b1N4Sm91R2IrMDFVUTVqQkFydjJVNEZTUWZHczFQOWlC?= =?utf-8?B?QlU2OERuY3NXV3pXOWcwMWFpWGg3NXR3ai9GNHhmQWRtSnFBaHVxYjRwV2V4?= =?utf-8?B?UUU4WjVYUUNneWlmL2NDUVNnbXlqRG5nbFVrOHJMZFdsa29IcnpTSDdlRnVW?= =?utf-8?B?N2JJbytSdXk3Q09Ea0FnWmRucGRuR0UrMXk3SUNIeTRkbG81Ty9DaUcwamRE?= =?utf-8?B?VHhKRE1Sc2J0RzFSLzl3ZVZveVZkNjFRMFlCUjFTNE5IQzc4a1lsY01ITkQ2?= =?utf-8?B?VFpzdzhzM2Fva3pHYW43ZnNmcXFzbGN1cE5UeVdCLzRsK05zeW8wUXp2SU84?= =?utf-8?B?ckVMcTBkK01YWDVxUUVSOUthTnNwNnJCSEF3ZnRQZytGeGdxdTlEeXVRbjdQ?= =?utf-8?B?dTVtdmg1SDFMeXg3Q2hvRjJWV1Y2RlY1aXpDanZxU0NJWDZvb1VEcHAzWXB3?= =?utf-8?B?V29pOG1WRjIxb3dHZ1pFRGZOa1lBUWZkM2EvWWFJMmlFN3A2eWozanp6VWg4?= =?utf-8?B?QnVweEhKNWdnQTAvSGpEK0ZsUlgrZkhRVmJVTyttL2VXdjRENmFsUjFqRGJ2?= =?utf-8?B?MHBGSHp5dGZOZ1dRL09hU1pKZWJaQUNKWGxaVXRWS0ZIOTMxaFF5dDNsb1Js?= =?utf-8?B?VVBSUStoRThZcHBjSktPV0RMRUNSNzlPa1Q2bXZUeUtBSGZ1cWUvM0xiSFBK?= =?utf-8?B?cmlqSlo4VnZOTklMYy90WENWUVRUM2tRTVJtUHhVcHU2NzI0VUpwc0ZXdGdu?= =?utf-8?B?aWhXUGVzdENmS05panFENWZHMmxmZWRhbHFzZytHNnd2V0hWUGVvS3RKcTFJ?= =?utf-8?B?b1ZGWTRNOUk4UEh4bFZsZy9iMFBlUGQ0T3gxV0M3NVVWU0tWVlpQWHI1M2th?= =?utf-8?B?cUg4VUhkYklkekllTXJLYmFsMnFXQ3ZLcmFNcjMyRkZxYk9scnNZRHMxUHQv?= =?utf-8?B?cGV5aWFKSjBWYzQwZ1RsRXBQUjBvV2sxMVg5eUJ4WnQ1bEVERXk0cG9oWTNr?= =?utf-8?B?SnJ5b1dPbGNlUE5FMFVwdlVlNzJQVG5URmlDWVJlVGZzTE9IaHIrYXIxNmRK?= =?utf-8?B?MVVrUXNBQkt6azUyMldLVjR1N25reUY2RHlNeDk2SGJOWit6VHdKUG9jTzdC?= =?utf-8?B?WnhYOGc2UGJod3ZuSVJtTEsxbmRYZi9VeTdtZUVHRkpwR0dURTUwQnBjYWl0?= =?utf-8?B?UVh1cXg2aFZ1OGd6N2dsU3NOK3VLcmc9PQ==?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 6:RfeWacJXiCRqWrEzDeCxS0FX2GSDjSLEsxTDyPqS3AKhb09k/ONemQE7UQkkp0G/x1KQK4DjVqHBQHW+DhLO0k+E6Wn3B+qxtpEY7f9NsJJ293gfWLr1X0OVNTSh++WR/xIPJ/Kr+JxH9See/dzP3mLrdhLhI+soiBA5KXifs+1pXD6CuEEBajuZOEcVuxAs3EzCf8vDPqoYYKEqS/FCF64jcyAx5WxIqmPDrOJPnPzsXWk764WVYSRShU8tQkh5UIoyDUpbDQjD2PDZWSXyWGOkggU/gxwbX8MXjEFAcfNrjzh9r1uVA6BvBVAlP780nPiJ0lVSIhOTGSyg63Rzng==; 5:OYCGk91sMmUCxCh9Yn/BF8qhySYo2aUb1CNT9FtTVSLp5abE+YcbqMIh2G4kyFMsnPUal6XZ7IejI6stp9H3kEdSx6zrKAswPQ5W/c+SWxN5puL8tl0s4O4gFdaVaf8XRwHHRzs5n2gRvKrIO1ZgYhGgwyqcaCnBvEucPYJ8tBIUGj4CesV3U90l9mxChyrZ; 24:X/BzZeSMN5z0NwOTdi0SM66nF4akZX8o4p0QQyqChAF9SNxjU+ktHbHtg9kLQOCZNABMVOhb9rD1Fiuu+WulzdjiXcbklR3MXnXsO8fULkU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 7:SvL4oWjH3E/u6f4ONx67U5bkx5MAbPax8XklxPrAoioWtvTOr0KsOmt8lJctAvGBVjxN30XrD+Mwj6Kh6R9a0mXNkhFMfEGRfgqlsG992zL1LSlXCa0PWg4DKPTG43K4fACcDnzYlJmajL/bNkJpMPHmE59nQNp4QjxKfgFLsbPQHTEfewAJqHXDERqyr/mFg/ZcqEb9vJIrC93L2qsRrmQ8FItBFvdEvN0OWILs7TEJDMvBv4sLmSj7sKAkhSgM/FoYz4vzcE3maOH0+zHUBTSboMt1mi7LwwC5yPraPEEjzM1ERYTMeXUeFXVT8lcNykoHrA4i2A5LFA8hx6w1VbLsc+XUDSwT4JAIOSrrwj0= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2016 13:45:00.0958 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2473 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP append_key_aead() is used in only one place, thus inline it. Signed-off-by: Horia Geantă --- drivers/crypto/caam/caamalg.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 8db54b090d39..567e234fb49b 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -228,12 +228,19 @@ struct caam_ctx { unsigned int authsize; }; -static void append_key_aead(u32 *desc, struct caam_ctx *ctx, - int keys_fit_inline, bool is_rfc3686) +static void init_sh_desc_key_aead(u32 *desc, struct caam_ctx *ctx, + int keys_fit_inline, bool is_rfc3686) { - u32 *nonce; + u32 *key_jump_cmd; unsigned int enckeylen = ctx->enckeylen; + /* Note: Context registers are saved. */ + init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX); + + /* Skip if already shared */ + key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | + JUMP_COND_SHRD); + /* * RFC3686 specific: * | ctx->key = {AUTH_KEY, ENC_KEY, NONCE} @@ -258,6 +265,8 @@ static void append_key_aead(u32 *desc, struct caam_ctx *ctx, /* Load Counter into CONTEXT1 reg */ if (is_rfc3686) { + u32 *nonce; + nonce = (u32 *)((void *)ctx->key + ctx->split_key_pad_len + enckeylen); append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE, @@ -269,21 +278,6 @@ static void append_key_aead(u32 *desc, struct caam_ctx *ctx, (16 << MOVE_OFFSET_SHIFT) | (CTR_RFC3686_NONCE_SIZE << MOVE_LEN_SHIFT)); } -} - -static void init_sh_desc_key_aead(u32 *desc, struct caam_ctx *ctx, - int keys_fit_inline, bool is_rfc3686) -{ - u32 *key_jump_cmd; - - /* Note: Context registers are saved. */ - init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX); - - /* Skip if already shared */ - key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | - JUMP_COND_SHRD); - - append_key_aead(desc, ctx, keys_fit_inline, is_rfc3686); set_jump_tgt_here(desc, key_jump_cmd); }