From patchwork Thu May 5 15:36:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Horia Geanta X-Patchwork-Id: 9025421 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 73C0B9F30C for ; Thu, 5 May 2016 15:36:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97390203A4 for ; Thu, 5 May 2016 15:36:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94093203AE for ; Thu, 5 May 2016 15:36:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755000AbcEEPgj (ORCPT ); Thu, 5 May 2016 11:36:39 -0400 Received: from mail-bl2on0074.outbound.protection.outlook.com ([65.55.169.74]:30997 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756756AbcEEPgg (ORCPT ); Thu, 5 May 2016 11:36:36 -0400 Received: from BN3PR0301CA0063.namprd03.prod.outlook.com (10.160.152.159) by CY1PR0301MB0716.namprd03.prod.outlook.com (10.160.159.146) with Microsoft SMTP Server (TLS) id 15.1.477.8; Thu, 5 May 2016 15:36:27 +0000 Received: from BY2FFO11OLC012.protection.gbl (2a01:111:f400:7c0c::117) by BN3PR0301CA0063.outlook.office365.com (2a01:111:e400:401e::31) with Microsoft SMTP Server (TLS) id 15.1.485.9 via Frontend Transport; Thu, 5 May 2016 15:36:28 +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 BY2FFO11OLC012.mail.protection.outlook.com (10.1.15.23) with Microsoft SMTP Server (TLS) id 15.1.485.4 via Frontend Transport; Thu, 5 May 2016 15:36:27 +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 u45FaOf6029584; Thu, 5 May 2016 08:36:24 -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 v2 5/8] crypto: caam - fix offset field in hw sg entries Date: Thu, 5 May 2016 18:36:22 +0300 Message-ID: <1462462582-27826-1-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1462462435-27403-1-git-send-email-horia.geanta@nxp.com> References: <1462462435-27403-1-git-send-email-horia.geanta@nxp.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131069361873668333; (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)(1110001)(1109001)(339900001)(199003)(189002)(2950100001)(104016004)(86362001)(50226002)(8936002)(189998001)(4326007)(76176999)(85426001)(47776003)(50986999)(77096005)(5008740100001)(50466002)(6806005)(33646002)(23676002)(106466001)(5820100001)(19580405001)(229853001)(1220700001)(19580395003)(586003)(92566002)(110136002)(2870700001)(36756003)(2906002)(81166005)(105606002)(87936001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0716; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC012; 1:v0hOfCF92b68/PDYl7a13H0R5K7Rm1vS+ORBkqx/okPXsCuIrMK/E/QQf+k4yk2/6mxwrMFLEuqDBtbZw7v0tZOuJyaBK0LIG6+k3srrM1Bp6mq/c/dOy2wwkG6/Mkv9Dc2bbv3FYTFwPhhdeoPSHoCNBdGKa5XzTpAHFJmsuryhGHPkEeTBYjugbVACBsWcSzUZ4tlXpAS2iKaMrPcJLx4+9FrgD7SOaEsafDGgvd27jZOV7h2mte3wW8AwCMPVQYGDiskDpix0dcNcq9KSo2Di/SlvkuqwsQOJPZno+XXDKkYWCIBKEd+oiDkd3o/Ml2sfs+n1YIIuUaADUtSCp7jirqdIRudlnava5kPqNJnqJVnNaWbn99UkysjDyFxTBO2UyRjU/HVejvlXTqeg30hAdEQLEYqOLVM2k+QJLTMmFdsED7DxqpTbbCbEWU8KHYnaCPYT2zVFL8WZyW2FP9kF0G25Bm53WQZUYj50qPvb4IOQTVN6S75GpQPfDGhNh8pXmmV3HMMMde+pxSF+XSJw/NCn3I96E4WKdzBlYCGoswjpPIJbXbgz7LaMCCv0Ot850wus0wdxfHWlQ7TOSUs5uj/39jMC1faql4wGDelJ4S0AnkcSX1cvOpcsXeHRzR1boJkYJrF552gClOhOi+MYBeHKusndXuu9PyxTHSTMtDuRKUkjNcKvNUcmAhAn1cmWEbdW1hSvE9HOU01wAQ== X-MS-Office365-Filtering-Correlation-Id: caf3096c-9e9e-4384-6790-08d374fb05df X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0716; 2:cmXVIcjifU+LvETxPcMikEUOkFV3x5/NPZTUceTSeJRS2urcJxfmz6Peg6nEt6cZVqGljGqVU9ZDTpFB2Ddcft8Yxdstnb56w4FM4EGdl7uN3TRWJYbOmU6DR3CB9nWqoVzGvA53M19kpoiMCa5W1GwvhbORkZBktxyD4l7KAyVSiiFv6uPC4wKPV1Pj1mvo; 3:dwUNo5t1Z6B/u29EMpKJGg3MBW+3pd+sMfbp4oMCnDl2ykdOnHxF87lCeP2na2k1quhnBthsRxBCRVpJyHDDilsqfPkErBjrVeR22JrCg/NvNCJvDgJZWORYRi4zrdbQR3CzBlAnzavpb8qrdfKd2IQuQLNagL2l1BWIWi7OE+EBXXWoqQU63oMHJ0oSBb1Ss3yP1NKNeEs6/LhxPSuH4Tx/gJt8Pip78oWmPf0r6MU=; 25:DXa/+yLuO8FqqBcAN6ohQo2ToiPDPNR7tKAuUo0QEHSMnExSkJIK1QPkb5g9i0v9BjDVrmXYNXrUBF4cATZ8aaNc1l3FbCcDh/7a0vFQ6dKqktYkgOks1jx+J0sWHnQZ6MVSBYRvR6cEYAMnX26nvEcsBVSAzpI3rCTW5lNpdVcrirhKfR2FyNz2PFpIdQwzHYxIVckqlRc8HRR5rv36xpnCAXTnxJIMzx/X0vY25ndANrnzkzXXEz6YYdLVi1VyDF83pmKvuWf5vGg4VZjXu4VYGlISrWtbtDKOfblKIW06p0mPy1l2Ic4SAk+hOWeoHDeGnIlLrLq2seIvsCRWhw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0716; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(5005006)(13023025)(13024025)(13015025)(8121501046)(13018025)(10201501046)(3002001)(6055026); SRVR:CY1PR0301MB0716; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0716; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0716; 4:jPNAEcFc7rfTsPqXpI7ABBB2XBWdFM6ql3z7ffBRiT/PIGLVacxU873kZKOhtyYw/Itw99BNgllOVU0Tj4Dlq5BOmFnQeImkMqXhGPHnskzlP5s/5q7RJthKLI0qPKX/laLxpJ5xsqmqRdNNLz4KLys9lewj6tb4OemFI5JiEJIHlBhaj1FeEtYqcLMqy55gZs447V9P6eDn4YfsF0QzrkmCnK+SyJEBKfYDu7JvC59owXgjCdoXvnour5xq6dzwhcAps6Nsb/DfvukPnkz22nFDkJ3FGRe07YwI+R2YxEes5qqqukmERUZX5VoSaSgp3s+9XAhsEbsP/VPk+Dtyn6SqUDhTkf6OnqMCfnTJYHNuOg4DjQbuDQp56PEeJlYEnPKrKY2eZ2oJU1NsXTTD75IVdeO51bmZfy89R0xj+lU9ikbqjSUHNknflqZJ03laf5ypYe1ho0uwLT86WCroWAAloFCN+rfW9UC4tizkJTU= X-Forefront-PRVS: 0933E9FD8D X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjAzMDFNQjA3MTY7MjM6T05hY1NkbEE3SU4zZ2tpZ3hCcE9SejVw?= =?utf-8?B?dVptM2ppUVRkT29IdVY3czErMllQSTlPbzNsbHhXY2RzWGllMEJjVTNnVmZz?= =?utf-8?B?OE9vQkRadDgwaDhlUTI1bjd5WGZwRDRWTEdKZlhvNG85SE56Tk0xR01DcDJa?= =?utf-8?B?cldtVkkzcUNKR3IxZ3RocWdmMVU3dUtqNG5TYXp5d3crQk5WU25mcFZZTnhZ?= =?utf-8?B?TStjU2l2Vm1ha2VHU1d3WGs0U3BzUGVKYXB4dXdZR2hJd2ZIc3RCRnU2OWhS?= =?utf-8?B?LzZ1aG52eUF6UkVUWnRiUlBVYWxsRXBZZDdZZDI0TXFkY09EbnZHUkVnL0pR?= =?utf-8?B?b3VNcm55YTJsa2o1RGRpYzZadjdSejVVVWhReUVhWFFHQWRWL3dTZ2dFdWFv?= =?utf-8?B?THFEbmFQOEpqeTZOTDI3SWZ0dm9FSGdQS21WSEc0SmY5VUNMdVNXQkIrVVc5?= =?utf-8?B?QlY3dUE0VVhBTEZZUUZ5dGY1L29aWlZwR3lTOGlzQzFZRGtpMklwdG0weHVp?= =?utf-8?B?Ni94WmUxYytMdXpjMDZVK21SSnhkN3hCV2VWWldaV2x0ZjdocXdmT00zcE1C?= =?utf-8?B?UXNEQW1uOS9LUnZvWmZVUENRRVl2cm1XWWtkTTZRVU9BZEZhTHlVcVcxMlpG?= =?utf-8?B?QThqYWdNeEV5V0RIdEp4clBheWl4UVFUM0t2dXdmdyttb3BCeDZNeGdBek54?= =?utf-8?B?K2lMMUdqV2gvNk15aUZwMkExbCtiZXNBb2JLS1I2NHdjdWNONlM1NCtQaWRj?= =?utf-8?B?a1JGOG5XcTVxcmpMT2cxTjlZWjduenNwdUdNZ0prUGlUdXJhcjZnK3VXaTU0?= =?utf-8?B?SjFVZy8vVndPUVF6ZmJrbE1lMEJ3dVVsWUFWMmpsY1hsUHhvZzRyZkI5ODRZ?= =?utf-8?B?d0JnYnM4UjhMQ0ZjZ3lMNlE5UStsVktaclRmeUo0TEJIK3JxTVcycU9OMjFa?= =?utf-8?B?eDdmOXpEN1A5OCs5Q1dna3VXdURSMWdXc2lLcnIxVS9zU2J0Z2FLNVMrNjBh?= =?utf-8?B?VVRCQngvZjVHek42dFJ6TmYvRGcwTmJHdzZjWS84eldBcE1Na3JHN09IMXQ2?= =?utf-8?B?cHZBcHJJcUVwaXhibENGellUSG5CalJpaFlCbWNYOHRDQm5hUVRQSzVRa1g5?= =?utf-8?B?bjNJckEwNlVzNTV2dGl1M2VCMkdrdndzaWhCMEtBaGg4c21hNnJIT1J5OTN1?= =?utf-8?B?aGtBbGNVcUNmT1dISUNkdDRTTU1jR0drelNRTGl6REk2bjlaOWxKdnNNeEhw?= =?utf-8?B?M1FwakVOZG11dXlCMmUrbHVsRmZlclJKdGZnV1JvQUYwdXpaVEV2Z1NMaktR?= =?utf-8?B?RjYrKyt2N0xJNmF6ZFpKcWJpWGk2QjF3OUZDNHVuRnlhb0FJN1lhNlF3c0s4?= =?utf-8?B?enJuL0VMMWFZazZJdlZBa3ZHK1haREs0T2s1UzNZS3c9PQ==?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0716; 5:b/7BIJJpZ38XEturcY9yZ3c/g1EcinIhyIAewAH0Q5cOl9FdVVG6y1mCai4BgB+mY0CbCz7waIYcaR1QqlUwDYUFMxbUkstMNgAHUa/qjtL4jSUBEYmZapB/sCKMlc7m+rD5D5d1D2J/NPGOHVqVUwqlDcwByPFtP4isetSBqcY=; 24:eSD/scUunw4cNxa2fNMr1iooWqqNgylCvW639exNCZ17bY1CDiipgTTwKkEehwPYYEWQiCM81KSHtWRPxslVaOw0lbL2TXL0LmfXb3YV0+4=; 7:MSoETJSOdeHkfxAvUWZWJhuVUqRmWazPNEHWhmQfYryp+03mbWI9yC36LJbx+/fPxz3iTAGEuhcoYcK1A5iZiXro8AC3OHKJbSH3BwE8X9VwuzjMwU1wRPeJGHOp1cRIlABW/FVfUxrpbT3Pv2gdqrx8LfCEEFgFh7CfkNjq4Hh0yN5RK5jDfTR5oXDLJPpl SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2016 15:36:27.2420 (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: CY1PR0301MB0716 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=unavailable 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;