From patchwork Wed May 4 17:16:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Horia Geanta X-Patchwork-Id: 9017041 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B680FBF29F for ; Wed, 4 May 2016 17:17:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3E01203B7 for ; Wed, 4 May 2016 17:17:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C346B203B4 for ; Wed, 4 May 2016 17:17:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754463AbcEDRQ6 (ORCPT ); Wed, 4 May 2016 13:16:58 -0400 Received: from mail-by2on0054.outbound.protection.outlook.com ([207.46.100.54]:39136 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754578AbcEDRQz (ORCPT ); Wed, 4 May 2016 13:16:55 -0400 Received: from BLUPR0301CA0038.namprd03.prod.outlook.com (10.162.113.176) by BN3PR0301MB1220.namprd03.prod.outlook.com (10.161.207.20) with Microsoft SMTP Server (TLS) id 15.1.485.9; Wed, 4 May 2016 17:16:52 +0000 Received: from BY2FFO11FD029.protection.gbl (2a01:111:f400:7c0c::142) by BLUPR0301CA0038.outlook.office365.com (2a01:111:e400:5259::48) with Microsoft SMTP Server (TLS) id 15.1.485.9 via Frontend Transport; Wed, 4 May 2016 17:16:52 +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=none 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 BY2FFO11FD029.mail.protection.outlook.com (10.1.14.212) with Microsoft SMTP Server (TLS) id 15.1.485.4 via Frontend Transport; Wed, 4 May 2016 17:16:51 +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 u44HGmXu009717; Wed, 4 May 2016 10:16:49 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= To: Herbert Xu CC: , , "David S. Miller" , Cristian Stoica , Scott Wood , Alexandru Porosanu , Tudor Ambarus , Fabio Estevam Subject: [PATCH 4/7] crypto: caam - fix offset field in hw sg entries Date: Wed, 4 May 2016 20:16:47 +0300 Message-ID: <1462382207-12124-1-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131068558122660618; (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)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(50986999)(47776003)(86362001)(50466002)(19580395003)(19580405001)(50226002)(36756003)(2870700001)(5008740100001)(106466001)(104016004)(92566002)(110136002)(81166005)(87936001)(6806005)(189998001)(33646002)(85426001)(105606002)(2906002)(229853001)(77096005)(586003)(4326007)(23676002)(5820100001)(11100500001)(8936002)(1220700001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0301MB1220; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD029; 1:bcGT+4+T7yeftRONFAFd/0P9jdT8+eYeYpIqh2b+m/kOIiyLLC+Bv1pZ4RSCi5SCzn3c5lmHhpDNfo3DUd7Oj/8LJiXHCQvSLIhtz4eXOG73AkRBdXDJBjnUpZJGv3bl0++qYnAmmb5Bac3X1Utvky+7f5sS6Z90JybnraB2FrVJvAE4yhcw/2smT7vIvSxbP5HbZLF+bH2O4iNqcdLHlykiOsd+9KCWgTux7Rgv4aTEosOLimcu45bor9f1b7OWDGT91NLISl+zjdC96ooZIfZQJC5EpdGpLbhOmAY4ABFTzE06NqGg3gP7uvf6yxew6LjD1aMjNJcLi873TUBLnaeiUP2qltWDwHkYmNBKcSexeJg+eDNizdZ1SDRqVnhd6fh9gqN578bbdW9kHB+hJ5ISWL++vlRCm533a+XXmMCsIx7lfRucJO8y2EraMFf7kbEOxWVsTPHwMpqYiVgMBrJviGc2j5HFQObNnBUvbGgd+eKkocNG77mCbP1r4wM73mb8A+xZv8UcvXKIgA4kYN1H/vmpxIKI1MDx1CTXSHPWb+3ulR5BFGJTsW9ksvsH4ZOOHS7kFMEkyk4s6psNl5A6W5+AR1ou+ZgG7EyP7OoaODkjStqADn55CWxj/r2qezV7fMpNNeAjEo/HEdAyYX3XluEe/NKi/N50fuUA7eXZfkjYfdDLT2k7YPvLSSz08qHasuhtfWmhWtSY0DAIxQ== X-MS-Office365-Filtering-Correlation-Id: 7a332bdc-051c-4a67-46a1-08d3743fe281 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1220; 2:OKHbrSFGZidCTcJ+eoUs1HaS3/p2v1hixpgWoyq3dS5W7496fSXx92DhrXsfGGqJlKthlZX1Yj9UmNb6O1CzLCqjaK9h888a86mihEypUlSOmbS2oKogDxfWa0PUaWLSuwc+jBDe22xSCaUkK6E4NR6UDe4KIudOOkVQQM8aoUPm/cNLIUrXkRcp7FybhUNB; 3:86MQ2MkmLkLyq5/L0tcFNKr5AuXUzRWt4hHFDgxzV3MX9x8fC4TOnuJLOemCy9XQVh69z+C1bg9/tiZ/igPRm/sPxOCVPfMDv85T3a7taEYLgLpV9z/jKnNhG0TuDhXv7AWbbQaNx8Pxjb0zVZAKpEdfc8XKPHM8XfAoR0+nL30SP0bqI6xXvhFhAUXpaeJqq/Lwe+BnMS7IvUn8mPbwuc+IGZucKRadpKZO4bgl8z4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1220; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1220; 25:O7Awhjp6OXEFkanhVUWxLF4lsGU00ZiVScB2W7FbvZuZ5M1bSunsO/TTHxFh63OCl5tkA+znH+dubdhEETKyKsHL+9inmmIka2c1I4kP3t8/lZkTIkaP5fnwHjDYX2swphjTa5gBWU7Nl0e9AvfnLZzhLSULl2McuRFTNg19A0dY7fTiU3VWtATGkbE3jWDXezc+0RVvaFgH2E6VHhRyzlU4+cBbYGcuwXdxgxZkTXv6741IVO3Y8Z0Ob5MxmSQsrFGDVIjXsczMNyI91WX3TV6IzSJm53ZzGm/GJ6R+zciaBZ8kzEheRL9927eNsPqmKXC8f/tmBVlBgTZsbxDMWabVuZjtGs2ARKduQI9wAw+Goxg6t5aDE8ZKVYWFO1ChuK2hwOXInqS0rqiwaf49E3l8p78NP6A3RJEwa86baj9NzAC/qEFgk7iu90M9QcBxa1TzBhAYZYQ0Y2hGYGc8CvQNYSV6qJAxvhx4t5bC9Uxi72F8E4zTzh93HTKEpfxMMwN8j12WtBXf2Fd5SnkGDL3kwXJXu8c0DUls7Q4Sc/0edGd1o6P47NY8w9QFGpPXTwE/S20hpGueTpjTDI6AycWRN97gATOG319BBjIiRH/o3gHgm6HoTis2Q3wvPoWQVha/sq8uWPdCg2t8+QY/ikIXjRmlk5bV0pO7Mg1lhQeoC4ht+Vk4LBSz7cY9Dsc1I+9dBR9JmQnRA0HMS7MJGwA56xQefE/Roiikj6WwTqCromIDe+loZX9GQuXO9cCS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13023025)(8121501046)(13015025)(13024025)(5005006)(13017025)(10201501046)(3002001)(6055026); SRVR:BN3PR0301MB1220; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR0301MB1220; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1220; 4:UOm6zAh+mtRCfWqKPawIx7vztwF/Nia+VmvfPvzU9/3VtArOvnTM8crl3hrZjejjx0J+6GMlp2vcSEtFIS7C2RgpBSqXytT1cHnxABg1GJnttgOkCWZ8CtJF+Z28wrfWILQu0xs7fWr6TTPDsrAieU+hIJTOokhGKC7VnRqw8qpcgP9pPBwfwQBWGs0UIZ1XZ6GdDJP2r7ibvS4Hhvk4R4skxiXseT4w6PneIySrIc8zErqiGLdbchi8Zk2OqOYaa7mcPwyjSiH1ygRKOt3JzMfpdZ+XhIeJpVxCk92wv0J8rAgwMuuRSaOt1CIKVMUxpF/M6fDrf0HCvjmm+z5FTXVS+c0NTaixqUN/Gug5gEp1mx4nKDVEZkhu+oAmDlBICbq1WEUfhdIuBo0qBEpxNTYudVP7vEcH6SH6bBw1j3E5I3nIjd/6G4zgsNduuO7BFk/YU27arqLZGuQRUa7lctkVfL7njkbmn5ineraen1g= X-Forefront-PRVS: 093290AD39 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjNQUjAzMDFNQjEyMjA7MjM6MFJoUzAyQldEc3ljVDg0cm05VHRjYmlQ?= =?utf-8?B?UERLd0VKQlgvWmNEK3JYQU9hRkJDRHYwajhLL213VXpFcFVMd0NSRlZyNU9J?= =?utf-8?B?ME9Mc2hBblhmSWtqeWpXTEFnc2ZHb3Q5K0FIRnFBd0RheStKQUNZdTk3ZlZa?= =?utf-8?B?Yi95TUw5TFZQZ01NM2JDbHlCVFk3aFNlUWh2NjIwRlM4WmtmQnR5YjdVY3N0?= =?utf-8?B?aVZoV1VlTFlvNEFvaHF6UFdnazlxa0x5L3VmL1BJM1NnRk4xZSt6NHlZQVMz?= =?utf-8?B?LzRydTFybXJ6MnVZLzh5a3FEUVNKNDNvZmJoT0Rad2ZtbUx1b0l4NjdOM29T?= =?utf-8?B?QUpQd1lDQ3VralFzakhMR25Uck5xMXJSdVB5SFAwODN3ck5pMWF1R3pPRXpn?= =?utf-8?B?UVlRUVFCYUVJNVlTTFdldmNuWWl3a3hhcXJxRHpWMnFLVzN6emxOcTFnZHpW?= =?utf-8?B?cWtGTXRnK2ExZ1lmUzBuVlh2R2x1Ulc2L2xJQUszWmd0eWtIK3Z5empTZlFO?= =?utf-8?B?QmVxS004L1laUERvYmJ3bU5kRE42RGR3bGlHVHFlSXFybzVwWkRDQ3R4Q0Jh?= =?utf-8?B?UGZXYUFIYWw2aExDVDQzWndXRXU5S0F3QlRiN0hIcE90Znh5bkgxd1JpNXV0?= =?utf-8?B?ckMwUjRKQnBhb1RqeExaVE5vdTBtL3JUWXpjYUVsYTJOUFJWd0llUWM2L1dn?= =?utf-8?B?ei9yUW1vL1VoM3FZdzFFZTljbUhRWkdEQkJLOE1zMkgyY2N3RmIyaGZ3OFk0?= =?utf-8?B?UXJXSkoyeUQ0QmFGa29VeHZlSkRKT1JRc0U5cG9RRXJxZ0ZJdkFkUzNqQTNK?= =?utf-8?B?VzJ3bG9tT01XUitSRUlxZzdha1huUlJCSjI1VzBQL0RBSTc0VkkyUU05dm53?= =?utf-8?B?MDJSZkJRSHJzK3FkTjBRT3VoM2xrVUNkUnNHd2ZVYzhqZmxaeEZReW1sNm5M?= =?utf-8?B?OSt4RDduWXJUSHFuSFRGeGxXWTlmNmY3Tm5lZGNUZ0s2T2FiRkpVemMvOS83?= =?utf-8?B?dVJZRWdLTWducmw0b1lQaU0yV29xL0krVVhnZXFocUp4WFBRWitSV25DeXFn?= =?utf-8?B?YkFYUWNiVjNFSkVvY0w1VWhHaE90NU84Wm1pdUZnTWtPSVhncUpYWU51UUpY?= =?utf-8?B?dmhJSUtXczJDOGFucm5NWWp6UFZJa1FVbHVsMXFWY0w5QkJEcFZ4T2t6NTNv?= =?utf-8?B?Vjkxd3hWSHhtaVV3Z3J2dTk0aXhMbWd4WTk5WVk5WGExeFBqZUpXcGtmdlEv?= =?utf-8?B?ZnpqNC80Wldqc1VJTjB6RDUrNDBvOVBEL2VTVXpSZVBBaUhJWkJSbmE1clRM?= =?utf-8?B?ZUx3cU9WUTd2Zy85ZHNSNUtnSDBmVDUwZ3VkejM5Y3dSM2VmMGlxY0xKOGxM?= =?utf-8?Q?mpZBXBhzai?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1220; 5:JgtEQE/8BvSIhKA9J+Io+JhyL2Vzw0rWGDqgTtFwV+TURsl5/nwldNvoYNJxs0iXDufSmYNLBHAAWi4dSwm3c53ColhSBr9xirrW/dSKvo+wQvNP5v331BBRXUxHdF2OdR+TjDyCrhbkd90x3DJcYybnYm7TfEKy9nUozWOTRwk=; 24:YqW9OOmQIO/zgGPR+1nnmvbgLnswSS4D8ieB0HWxhBsW63NMhKkJZ4Jxq7D0cNyRCntZGUSeSVZOC47kLUTywZNmaZiANhwhccGdocureBA=; 7:lnRrov6ivoT4vEuqLwhF6hcCUK/b8AILhvmL2S08eg3EOribcl/1V6AsfBpCuNJa+dI53J+a5EcBQi4IaLkWiUnZPEIGSFrZ9dnxItDGl+AaenAtacEjMO0wBFf5cQ/ybHz2MHlCADaIy0t5fXCZtISNjS44DaABxhSBK/vIOdyQdb1mM6kU/ZWUQ8gM2STV SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2016 17:16:51.9384 (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: BN3PR0301MB1220 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.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;