From patchwork Thu May 19 15:11:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Horia Geanta X-Patchwork-Id: 9127779 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 3D64960213 for ; Thu, 19 May 2016 15:12:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30DA8281BC for ; Thu, 19 May 2016 15:12:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25C94281C3; Thu, 19 May 2016 15:12:11 +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 24BD6281BE for ; Thu, 19 May 2016 15:12:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755054AbcESPMF (ORCPT ); Thu, 19 May 2016 11:12:05 -0400 Received: from mail-by2on0057.outbound.protection.outlook.com ([207.46.100.57]:26474 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754862AbcESPL1 (ORCPT ); Thu, 19 May 2016 11:11:27 -0400 Received: from BLUPR0301CA0026.namprd03.prod.outlook.com (10.162.113.164) by CY1PR0301MB0603.namprd03.prod.outlook.com (10.160.142.22) with Microsoft SMTP Server (TLS) id 15.1.497.12; Thu, 19 May 2016 15:11:24 +0000 Received: from BN1BFFO11FD045.protection.gbl (2a01:111:f400:7c10::1:138) by BLUPR0301CA0026.outlook.office365.com (2a01:111:e400:5259::36) with Microsoft SMTP Server (TLS) id 15.1.497.12 via Frontend Transport; Thu, 19 May 2016 15:11:24 +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=none action=none header.from=nxp.com; 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 BN1BFFO11FD045.mail.protection.outlook.com (10.58.145.0) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Thu, 19 May 2016 15:11:23 +0000 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 u4JFBLNU006887; Thu, 19 May 2016 08:11:21 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= To: Herbert Xu CC: , "David S. Miller" , , Cristian Stoica Subject: [PATCH v3 5/8] crypto: caam - fix offset field in hw sg entries Date: Thu, 19 May 2016 18:11:18 +0300 Message-ID: <1463670678-3045-1-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1463670405-1059-1-git-send-email-horia.geanta@nxp.com> References: <1463670405-1059-1-git-send-email-horia.geanta@nxp.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131081442840229053; (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)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(8676002)(36756003)(50226002)(23676002)(47776003)(5008740100001)(229853001)(8936002)(92566002)(189998001)(33646002)(50986999)(106466001)(87936001)(2906002)(105606002)(85426001)(81166006)(19580395003)(2870700001)(50466002)(4326007)(110136002)(77096005)(2950100001)(6806005)(104016004)(11100500001)(586003)(76176999)(1220700001)(19580405001)(86362001)(5820100001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0603; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD045; 1:2PE2A7752VW6IKzZnBupii7vNd6hpV+QYgbx+EHymKkpMg3f7SAnhvpKTwUf/RSSFNM7tX+FYy2W4kG71RpJkw+WdL8ZEdagGDP5x9bVLaYbrxc+cVwV51anXffAmU8cRycifgtodW4VnH85SN3o4xUWnWS44et/3veCXV+OJu6DSoHdUEUnFlz1dbVrhr4bBv4tP150h9pV0cSLszdRS2hfXJzCaHmH2r+63AIzlsXjAtwxzYlJe+fVGNLYtn00lIoY8EYi54QqLBWmC2MICtq5rr1p/NWRKQyUFlmC25MWfgqKSp/EFAcy7NWWPYuYDdcUFxRfV8bOglRNXmUb6NDpoAT96T+mxTxJW+GvXUA5wntC05N9GOnugZQ+dYvoGApPBGqrYNi9UQKRXDqpXKRivUwC5HHD4uRRavMWIXbFKHcfy2WPs9WQKXa9CosogxCRqWV7AkZKUip83ZpIJZmrgokfEQlUaFFKS6u2ldlp40GI/fzbyBgoilnjM6TMboqhQ8X+59tOTarRlrQLNtuh+zJnd/CNEQj7+Sr2SS5SjnAGrHOn8k13MVBsqbu3/JzP7CXAyEfEiQS7ryzMEYPg3MXZgRN7X94Ldze6emLQyN8WFKZHZxToNWne2+IcHuLREb7OABDcd+ezlsuQ2NRrIJSpsfs5cl2ZNV3eiUU= X-MS-Office365-Filtering-Correlation-Id: 87138b8e-686c-4fa2-71ff-08d37ff7d795 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0603; 2:aGho5qa1qjt9RMk7UZ8l1t3TrI/U5sQkVljCKxb04LgdH4OFAK1s3KyO3GmD6JsmABV6YjGRHrOsKV0acKVeEIjtfIiLDZhIZap08GWnW7BQ5vn/C0TG+Wj4l7jBbu6LrKuyUS9wZUTgzfCk42/f9G1VPqxvXj5ulivg16t3xSpGSROYPoEOjcaIWwYX+E47; 3:cZLUo0O7skNrXJFbWwDePw5ZmdXWMVq7FxUtax3u9kQVaGS0Xukw1ZdNV0dFwVx0AAj6f11QnAfgGqgsaxfPenfAwoYzhrnP50GwFPZQVH1osrPyFxgVcjnodp2reYzjMXmLugEOOWo4y15cKqdw8BQ9F1QuQshXeE5unFmnfOSWAyzH4rIaBT7uHRizNomD9UHLLsbrnK5veXiRFtQ0pb8J2lqPdC9/1SgTWfVuO6s= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0603; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0603; 25:+aAzsR42Ixz/Te+F2SZq12YGhwpJQQIVEs6pPWMoy/6ePIpJIUROyeKo8KZR2Qt4KdCRL+8RqtEMPx8OORrw7ngQ7k3R+LRoTioCBe+Gk30rau+DmgooOTQwTlmdUPmP2x3IWowJPQSxxNjxl4erisup78NczjyfCnrI8khTVc+6ULu475P80oQFezejmPQ+7F3cAxYQSPHIiedHPW7MO6VBGbtPkKsv0uzxkgVd3eA/ibwlGcJpJxobl/6Il9+u3kejamAP9UINY9fkmNQtk+rlkwxrhKMGdzggeE9NzijB6NvhBQN3yzoCrvvhtrOqXHQPTyhLNvCYlTqAG5n1Mj97LLF8OMgSV4TmMtalmCQbmz0/QYEL+CjqCccQKhmCRa8Gs/I/5PcdYMEjlGFoHFXod/fRyeupwZf9KBtBPRw1uq4M1jFl9+LgUkM8D8g+2cwqa+wTOBKEJi28RZsIKQ+B3RtGXw0O3c1xf67cNoal1mF+/ZXvWKF73FTTjeJOIE//nrl3RscWGIOPzXYpzKwoF4qywhB9+YBthwoXL8qptf69cm8jUWXUkhRt5G7oJW09TM5McQEhs7cFqMkDthXe3SrVUlEFRtQ9712Q2UxtZCIQEPVZrxMj5UKkwziqcAr/35YzcUphoFxJUzWvnCtb6slieKGHY8AQgkOvcGdGVsuFsNVZ1UTcJSbLK6dAM5xxnmmwZG0kxG+8jMjHiU8FU1vg3iE41S3e7fZADes= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13023025)(13024025)(13018025)(13015025)(13017025)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:CY1PR0301MB0603; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0603; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0603; 4:VRuC9/WA6Wi7URVHlwEfSg2fnH9Sx6FM+THyEW8BS/o2HuBRKETtpkNNp4nOn58czEtfE+pnnF5AAfBr/maHyyncLd3zPRZdWBA8LaaSKr6NdrsjGXKFDIXqC6zYIb8mJvebk7mKWSaPyDdBlRkMPJxN9ztAU1oQ2bks/JKlw9Yu39BmjSZIA/cpZIyb8605uRY1gze2gS7EuvtZv+pMsFd4zD6nfqYlsFZLGkZKHEHSmQ8YID2/EDXkkdNM4jaI7anksxY1eHS7mRpTW+jD9xoENUjv8lE5p7pg4VXCwKxobOm6WKl8IQ7gl4l4KZz7s6XST/HCtKbB6sdiLmv3bKhg29D3JU2S87YJKIW4UA8uQ33xeHrz2Y/ogQI8TmYhF5IyKTjq+1Y1MMXgOb4MT0HduFLCpnhk/GSRnUKrOCRCMNWXselFx1W8nEac+PywlmG/ezOO8UI4GuWIbg6d5la2c7mBPDRuI30rxRgW8DU= X-Forefront-PRVS: 094700CA91 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjAzMDFNQjA2MDM7MjM6V09sOUV1YTFjZXNMUHpOampVR2h5YnJO?= =?utf-8?B?a3NPSTF3bm1pUExidEsvS3NuQjZURWtoK0ticExQNXZTTzd4N3V5dmNZS0Yw?= =?utf-8?B?Ylk0eG5lU2tkUTJtM01UMEFZeG5SdGhNSVoxdzJLTDdGNFlLOXJ4cWFBUHcr?= =?utf-8?B?SGRWeFhFbTlrVDFmUXdYUGxaTWxKMEd3V0NDYWdheEY1dVZoMXl3TkIzTDY5?= =?utf-8?B?dVIxV1U1MFdIS3pJZDFva1p6TW0zOUk3Qm8xd25vakN0SFh1b2libXl2dU9x?= =?utf-8?B?V3BDekwyaWFxU2JpdFlnVXdPNjFtSWZpRGhxT2FoaVZRbEdwWGlvZEhRSmln?= =?utf-8?B?aUl2RDNHTVRIVHVaZUIvK2FLSkJqaGo4aHQvRDJIS2VyQVVCbGVtUFhpanNL?= =?utf-8?B?V1BEMXZZcVUrSTFkM3kzQjBLbXBTaTdGbTdaV1JVWXovNzllYmpIOW55MC9O?= =?utf-8?B?TE8rVHYyU0E0cGR0UjVETURtTlFyQmZqOHc0SlVWajFOTEIyNlRiV0tUeXo5?= =?utf-8?B?NDZlN3JPdzg2L0ZqcHNSelhPa2hUamVvaWtYbjJ5N3Q4ZUNpWG5OZjBNbWN1?= =?utf-8?B?TUZzZzJHUXhrbkFXRHFVQVhlamY4QkQ0S3VId2kzdmExMGtFMDdkOTFuNFAz?= =?utf-8?B?bU9rR1ZxRkpaRUI0dXBXRDhRclVvSithZndpa1RYei9JTTQrejIvMDlrVmhl?= =?utf-8?B?dVNwVHRlZFRWT2xhMnBRc1J2TFJCY2kyelI3QjNDRGlzbVA5Sm9CUC9OT20v?= =?utf-8?B?Qm43N2dXZXVOb0FPc0FEanU0OENkQjU0OG9ScUZuY0JTK0EzK29UUmlMcmxQ?= =?utf-8?B?dFZObHRhSmR2MytDaU5kcDJGdDlSS2lTTWozdXUxR2N3KzI5cjZiY1BhS09j?= =?utf-8?B?bmRuVTFQd0ZtV2g2V2dXRmJ4RDRtY2pDNnBpeCtibzBpWGppSjQ4YUorZ25z?= =?utf-8?B?Wm5teW83Vm1MUjZFalVyd29mWG1uNWhncWRlWE8yd0E3ZFAwLzNPZm05akcx?= =?utf-8?B?K2svdFpKTFozNG5SL3ZlY3l6cDBZQVRwWWlGYU5oWkZnU0JCL3paL2NXZGN6?= =?utf-8?B?TU9Xb1FCWitVczV2bzRxRDdVTUJHSHV2K0tKU25JYVBSSkVzak9yTWdlakF6?= =?utf-8?B?YjM0d2hnTjN2ZnhuWEhWdmRzMWhWS3dFMy81dTl1UkJjTE9tTWRkZ2Q4VFRR?= =?utf-8?B?OFYrMnBEOEx1OWJQcVNGUWxTSUpRMkZHVGhvQkR5eUtmd1ZLUjVOOHBCcDY5?= =?utf-8?B?eW13Z2M2QlNaZmRwSVFkRzZ6M0R3ZGF3YWg4R09ubzNJS3hQTE8rQ3J5UDB5?= =?utf-8?B?WDJrb1N4UDFzYjYzME05M3k5Nm1hNzJvbjdwM2l2eHdlOW1IUHhiaGlhVjRz?= =?utf-8?B?U0ZYaDM0QkZocDhDMDd6RjBBRDdoUmZUcTNwcjBsdVBRMFJlU3I0azVTSDJz?= =?utf-8?B?bGY0RHd1TkcwKzFEL0E4V2NQS3hWVVdMNU5MU0FuQmpuTFY1d0JmaDNoR2t6?= =?utf-8?Q?XBpxeXBSamDUbKXgK3FTlcN2tNY=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0603; 5:zdmZ2FFmSAHPrPRZ2bQPefjPFiq10vl+FzdAaCgMIt9RaWFIRgqrBX8WjdFb0uWIn+n205Sif8V1/VWMjr8+kyq66f1L/YD4M/G+pv0RtNstUQfDap2dMec/0NI8K+q700S8AznDS3hE5TfSZCCllYq62uDNR0Il5Xw7cdzMmZg=; 24:7IIpSnyGcpnR4s25YV4IQzV62kJbeJg6D5f90mJ0H/tMmzcJPoodGxuJ/B+/RdeON/Z7b/XlwGHdsJKd9Z1UtBFVWdTqcCudxMm6uW+V29o=; 7:476GYcZnAoY/kl3Ze5GuLuJ/dlVVC8RfsGZ/2zFkghRO705YTEg+QiYogzddkysXj51F63bKf1m1c+/TxfxkwyH1qYh9jZ5z4heA6nAAF2S3kxWq4WPr2K4IRV9Nvg/kla0mWTkq7ZvnPNdngnTrOy81mhg4XywBIhwH3dInUIEAdAwXqbFPS9VhQrZnLrPz SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2016 15:11:23.7577 (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: CY1PR0301MB0603 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 From: Cristian Stoica The offset field is 13 bits wide; make sure we don't overwrite more than that in the caam hardware scatter gather structure. Signed-off-by: Cristian Stoica Signed-off-by: Horia Geantă --- drivers/crypto/caam/desc.h | 2 +- drivers/crypto/caam/sg_sw_sec4.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h index 1e93c6af2275..fe30ff69088c 100644 --- a/drivers/crypto/caam/desc.h +++ b/drivers/crypto/caam/desc.h @@ -20,7 +20,7 @@ #define SEC4_SG_BPID_MASK 0x000000ff #define SEC4_SG_BPID_SHIFT 16 #define SEC4_SG_LEN_MASK 0x3fffffff /* Excludes EXT and FINAL */ -#define SEC4_SG_OFFS_MASK 0x00001fff +#define SEC4_SG_OFFSET_MASK 0x00001fff struct sec4_sg_entry { #ifdef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h index 12ec6616e89d..2311341b7356 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h @@ -11,12 +11,12 @@ struct sec4_sg_entry; * convert single dma address to h/w link table format */ static inline void dma_to_sec4_sg_one(struct sec4_sg_entry *sec4_sg_ptr, - dma_addr_t dma, u32 len, u32 offset) + dma_addr_t dma, u32 len, u16 offset) { sec4_sg_ptr->ptr = dma; sec4_sg_ptr->len = len; sec4_sg_ptr->buf_pool_id = 0; - sec4_sg_ptr->offset = offset; + sec4_sg_ptr->offset = offset & SEC4_SG_OFFSET_MASK; #ifdef DEBUG print_hex_dump(KERN_ERR, "sec4_sg_ptr@: ", DUMP_PREFIX_ADDRESS, 16, 4, sec4_sg_ptr, @@ -30,7 +30,7 @@ static inline void dma_to_sec4_sg_one(struct sec4_sg_entry *sec4_sg_ptr, */ static inline struct sec4_sg_entry * sg_to_sec4_sg(struct scatterlist *sg, int sg_count, - struct sec4_sg_entry *sec4_sg_ptr, u32 offset) + struct sec4_sg_entry *sec4_sg_ptr, u16 offset) { while (sg_count) { dma_to_sec4_sg_one(sec4_sg_ptr, sg_dma_address(sg), @@ -48,7 +48,7 @@ sg_to_sec4_sg(struct scatterlist *sg, int sg_count, */ static inline void sg_to_sec4_sg_last(struct scatterlist *sg, int sg_count, struct sec4_sg_entry *sec4_sg_ptr, - u32 offset) + u16 offset) { sec4_sg_ptr = sg_to_sec4_sg(sg, sg_count, sec4_sg_ptr, offset); sec4_sg_ptr->len |= SEC4_SG_LEN_FIN;