Message ID | 1478681184-9442-13-git-send-email-horia.geanta@nxp.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Herbert Xu |
Headers | show
Return-Path: <linux-crypto-owner@kernel.org> 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 6754060512 for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 9 Nov 2016 09:03:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5ABB128B16 for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 9 Nov 2016 09:03:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E06428C59; Wed, 9 Nov 2016 09:03:39 +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 DEAC028B16 for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 9 Nov 2016 09:03:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752945AbcKIJDh (ORCPT <rfc822;patchwork-linux-crypto@patchwork.kernel.org>); Wed, 9 Nov 2016 04:03:37 -0500 Received: from mail-by2nam01on0052.outbound.protection.outlook.com ([104.47.34.52]:37472 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751745AbcKIJDf (ORCPT <rfc822;linux-crypto@vger.kernel.org>); Wed, 9 Nov 2016 04:03:35 -0500 Received: from BN3PR0301CA0028.namprd03.prod.outlook.com (10.160.180.166) by BN6PR03MB2881.namprd03.prod.outlook.com (10.175.125.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.707.6; Wed, 9 Nov 2016 08:47:58 +0000 Received: from BN1BFFO11FD037.protection.gbl (2a01:111:f400:7c10::1:114) by BN3PR0301CA0028.outlook.office365.com (2a01:111:e400:4000::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.707.6 via Frontend Transport; Wed, 9 Nov 2016 08:47:57 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=fail 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 BN1BFFO11FD037.mail.protection.outlook.com (10.58.144.100) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.707.3 via Frontend Transport; Wed, 9 Nov 2016 08:47:57 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:822; 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 uA98lTXX026193; Wed, 9 Nov 2016 01:47:56 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com> To: Herbert Xu <herbert@gondor.apana.org.au> CC: "David S. Miller" <davem@davemloft.net>, <linux-crypto@vger.kernel.org> Subject: [PATCH 12/14] crypto: caam - move sec4_sg_entry to sg_sw_sec4.h Date: Wed, 9 Nov 2016 10:46:22 +0200 Message-ID: <1478681184-9442-13-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1478681184-9442-1-git-send-email-horia.geanta@nxp.com> References: <1478681184-9442-1-git-send-email-horia.geanta@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-IncomingHeaderCount: 13 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131231548779613088; (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)(339900001)(199003)(189002)(36756003)(8676002)(8936002)(23676002)(6666003)(6916009)(69596002)(81166006)(2950100002)(81156014)(586003)(33646002)(2906002)(76176999)(50226002)(104016004)(50466002)(50986999)(229853001)(106466001)(85426001)(2870700001)(97736004)(47776003)(77096005)(68736007)(87936001)(305945005)(5660300001)(7846002)(4326007)(105606002)(189998001)(110136003)(356003)(92566002)(86362001)(5820100001)(626004); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2881; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD037; 1:wNM5ErzT+4BvvRHS8+A8Ke1OH5jc2Tv76Nf3vH6ac/JP7HRXEHsxxVh437xMuoiTqKhcuc7rRd5eHDWVZN3EueYA2pK4Ura7iCHhoYPmDiXghRaxlq++S62S8QjsO6W1LtWVofmshfh/YBkBYvNYFAJOH+GeO3bl1sR5FmvRR3YKRuoE7ivnm4WFRkrEfkPQJlr2FdMspaaWzMyz75r9HZD7P94SqEbF4ItORCYIGmnHF7n2GSzx4LH9BdT8bCANTV2qRaiiXsMkWyeRUvhccMBT5GCYq3vIEQR9VCsiY6Hb4r1QlLsK0eshARbB2+LWUCxbHZQhi2vMkzrgBXzKxkxTyD690j1V8Yw3lwLK/VL1Fl7b5t1Fs3YqpRgi6rxdDzg8+LWhmgxK+bllGuiZnPG2DHGRetbBzL/X35Vlr8MlEKqe9Quo1HYErB7tGRLay1IKomE+PBgaKkO1XKPnI3ORnxLXuWk1K6fyLqjl6uVSGuXatUKLcIjW6NyLJdxjDzxeX7BgmDhZrln2iJEEH0RDaUA7/PEUQDz/iX1/0SokGAOPszB4jNBXm0RAlgnETGgyj+MjyQ4U3P52JGpBrRypkwdFlPD/c0sUka1+WoideM4AYS/QzoFWPxy5zgcP X-MS-Office365-Filtering-Correlation-Id: d199c686-a644-4a3d-88e0-08d4087d1ac7 X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2881; 2:Z29V3sZQZ0sn6XESOO+ME6AfVr3Y0PZouqbZacPkJBk+bgeFE0HQpPXsn/rbkJzLO98C2vMbruiTLI94YqbYpv8E0naHwHEJ+3fMbs3NJh8i8Ffq552oeemVTuYPktNci95R/r0vKTTN5HgtqQX9XRQTDdiP20Wav7Xda4+79dMSK4Gqm6NIfmYx1HO2MM0rvJUR/aDWwylZQQRNgl8fdA==; 3:qrEoP4E+teL+fhlQiNgFT6ciQuEncPv43/h5mNKNf0G4mlVduHSgBl4Buja9RZinEaj1vSdbcOljpUPEk+HxwyXDQWW+xyM9K74VZqJzvI7F5Bs0BFTstrDVTuqEEQd81Uynz8iXhd1ASkL47rsK+XA8sFzms6mWi5mU/x1IucZSLIbFLna6Or/cD1b+1jdR97Ou8oukI4P9A+H67gyqKtdvpWHrPbD3k9I+aGQeUR6yCbwNuTy8fN/XJaAFpzFL X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN6PR03MB2881; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2881; 25:onUXR/HeZKPD76OjYtkDPqDvY26NmDjSZ+5VBC2799amc2ilC+Lx39mm4P1mPvmtv4vEAOYtFhHsnuPr0NOwMoXtBXzqzGWPnRfh/F/rBsOoKUMJgwJf4SnW5ZOpvOwyN9BHOJwCGudtVi8U4di/nsSwHWvzPreYw0lfpCQmzyMH+goXCYUnJBHVQTDsbAcWQPztdzMR+RDjRQq/jKNgf9jzzOveHBNbQFz6aiFBsU8O4AtaGkQI2GZ4yJ0dlpH1RL2wXcajoBuKR28qJmvf1/bMNi4tDuvd3TTmzj5sq5ftxG8KLrlYz0pRQUanhk1q9glwEWTj7w8Dub5sVjtB7Hqz8oMW252ek4lM7vzOXSkpcHYv73JGyeUN1rObgwZq0E/+BMUpyay5bP6sBqtULC6VkJ4U8CszIRuvJkeYyRp49zwXTCx7vlrplw1j+/+chWbAfV7fUul++sZUuz8uaw==; 31:DU+GjMkzD3LIJpSiNEHT7WWWnAaKMbG2bXqKiBUghchIQW3vug4P1vZtoVTL7IaHTXOqCMG2RaRl8oY2noL2ebQ5fE2t0CbSZbKmlwn/s/T3dQfT0mVhxglNdyCdigCGteb+w+gbNMMKV/5w8d3KkaA3h/6E5cpFCSFUEog9QRIkLxaWJDdkPUXGuUZ54EepTSapmcOerZxvBixymmlRqRNkZv9zpr885e2aOFWsimcgdsVxchlp4SUtsFbUEh0V24k/tFC4BAfvIg3xgWf0TjbnMKkCvptqt3WuS40k+yc= X-Microsoft-Antispam-PRVS: <BN6PR03MB2881E127EB9730998FF9436F98B90@BN6PR03MB2881.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(13015025)(13018025)(5005006)(13017025)(13024025)(13023025)(3002001)(10201501046)(6055026); SRVR:BN6PR03MB2881; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2881; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2881; 4:ZO9CXLzaExcK/tKA7KvOnGxI+n4FYgYlXqprQLoL60b9I09nPzgepUSelxNa6ajh9PFNHAsaOSQ/c7ykYmQbWSjAB4fyQ0+dhwTuYVjzkbdAjg4a67ITu2OI3QKaSnCUhOft+3FjK2wxR74MBOcOfc+L7Ay+xxTURnkB93ezHIDaJ+QbnJizbSuXd1T2tUN6ilq98JbWFgm41LGBCjuND5s6u8LMcyZ6xWNEYpZmp/9zXOZ0M7Ap0tomH4kb5Xy4bH8x5wP7WkHs2o6Jizfz2QHnGZHE7N9xCEoozkLb4l/VNVtNrv3NZsrkC8q12tUpsTJIAYbTNG3zx6MB6hoGEt97MbT/NwEZYVqE2IKHhRVVr/6gCX0zXM52VjmMkJ6ZQu2exWZ6Vn+sbO426hevk7U0ftKe2bSHmPstIY/dmSUepxORlp0TOLPEH+OOKVRrS4qe5uZBjUD7w+gX73Sxy5Pg6ICGJ5ZRb79CTOtVOyn1Lpq8+Qb8Q/JMdPejHF+QJG7O11moOKvZSsyq64YJjwgZloO9ZtNLFEbWBTWmnyPiUBlmpG45MA9tezwS5xl1 X-Forefront-PRVS: 0121F24F22 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjAzTUIyODgxOzIzOkFNdnpZOGdzcnZkMUN2bEwzM0g5K0FDbGky?= =?utf-8?B?UzBnc2pRK0ZNNHB3WFJuSDkwWmR3MmlDRmpzclQ1cWNjV0M3SFhWTXQ1bEVr?= =?utf-8?B?N1c1K3ViM1IySlFoYlFDTFNkSFo5KzBTMUo3QVk2SnRlTzJKQTE1VnRCdm1z?= =?utf-8?B?Q3NuSUF0V0NDSTJzK3A3d1JtemNPcllkWG4rVmtTSHhKRXpwZStWNHZUVUtX?= =?utf-8?B?b09BdXpQSzVQNkRQV1hOQ1Z6VWJXSnQvTE1hb0tWdVEwckg3aUE4OW1sMTkw?= =?utf-8?B?SUpZT3JiT2xuTGx1ajBRYThwMWx4VWdQdkFPSW1ET1NYNXUrZ3Q1S0pFTk44?= =?utf-8?B?K2t5NnVEdHVMakloUmFXdlg2SmY4VjZ3eXJKNEdUU3g2VHRLd2JYbnNUeTBN?= =?utf-8?B?RUFFemZ5SFk1c2hCcEQydzNETVRyRzBsdi91YXpVNVdvdkx4Q09HbEhXZGNJ?= =?utf-8?B?eFJCcHIzM3VXaUY5Q3NrdUE0YmVTU3Z3UExGdFN3WVY3Y0ZnWFJXUTcrOStW?= =?utf-8?B?T2ZVaEdwelhnUkc3dUNicVg5K2pFTlJFNmhkVVVKdEJ2TEUwSUREaDk4Ukg4?= =?utf-8?B?c3RSTzVUMlRIV1ZrbFk3RVpvU21pb1cwRzV4d1ZacHYwOVdGaUZzRTlVTGFL?= =?utf-8?B?bCtRU0ZmUmdwTkt1ZGdKYzB3RXlvb0t6THUrcWk2VFlpRlM4bnJGSHNid3Br?= =?utf-8?B?emt2UEpTT1AxSGk3RUxvNlR5SStkOU5wSVJQYW1PUTdySDBVQncwblBVU080?= =?utf-8?B?THY5NzFoSDBrVDU1OEUyblRHa3NrMDcrTDlxdUtQaHRrcE81ZEo5NmFGa0ZD?= =?utf-8?B?TXR1emdXWklVWlAwSzJ2dUVvYjYzQStZcVd0Zm5xRnZTWWViVnlCMjN3MndK?= =?utf-8?B?RytvOXMzQ0RENjFxMDMrU0JyNEIzaU9PamZETzNheDBTSCs2TXQ5S2ltdjJN?= =?utf-8?B?QldlNDhHMFRiZUFHSXJUODgzZG5Mdzk5bkwyZWlqT1dzRzByYWcvdEoxYUdM?= =?utf-8?B?R1RtV01xVHUzdm0zWmFyWktGNnZaL21YeUZVVjZjcjA0THhaaU5acC9WbEFn?= =?utf-8?B?MFlZQjBDN09hL2pyREUrUlJHZ3MvcE54VWZtUjhuandtQVNQUGtMOWJzZ2FF?= =?utf-8?B?VkZIZi9wZTN4YXRoY00weSszVVVxVUlUT0NWZDhnZHpuelAvelBYNlpYVWNW?= =?utf-8?B?b1JtRUVFVW0rb2hQbXJja0xDSVB5amE0d2ZRdFhrc3FldU50Z1VUc3kvNW9M?= =?utf-8?B?NHl6YkROcTJwK3hoanJmTkJ6TmVCYWU0dkdCd0hienhNRUhNMWhDK21sallG?= =?utf-8?B?WUQ5WFV1Qm0xbkkxMWducnNObEFyUDBQdGpuaDg4ZmVBbjhTM1I3V2JReEtY?= =?utf-8?B?SEJrb05lWU5iSncxT0NyTzZyVlptS0tiRWlxMTFrVTE0ZVVnaUFsK1RKcVN5?= =?utf-8?B?ZlR0bmhJUUlUazRCY1Fqc0NFQVM5M2l0QXpYWHNHa2ZGQVpUaUhtZG5VVCtF?= =?utf-8?Q?W3gbiKnRX9Q/c37V8j5QqRN18=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2881; 6:1HvCv7nOD7sOESnXoPM63yTMS3XNSwaID+63Uns43hpg36Q+gRH2NrsGa9GKcd+cQngFdw5jA8WwH7DaWVazOs7n7HkiHH83sWAYmjuaDJyYZv1p5Zgv1yrJxpmYM8hhhnTs0aJaNp4WsLBSfblJ39NdPB77PXyDeoTd74/zbeWUSK/TWsXxtSB66qmICUYVS23R2U4byZhQ47+UxdCKGH3w707eMIQx3AdGz96io5MoLBkU7FVXoTNInzX7CzdI/o8+Pfeq9Tk5BubmCihHM53ylgfapOvAb7J9J5kJhOzIVrD3yRg561Bn1lEVMsBi; 5:KEdpcmU8+JjSZMHQAiaD8dRwGanrY6HH+sGAXjuH9xnR+6YnknBt0dEoTkozd3dlkOwYsLL7pGjSrlLF8KMKBSj2+yqnqXkiSvDVuDUlUosWgVy6P108ejkEDc79f1EuMewwZB/HTD2I1+MbCoEq0jMIIe9FiW1fCGfEE1wgjdwBdBgZXYuVpvVMGYFHPU7Z; 24:xse2sqx+iX39gksT51ZXBZBa8i/BFBapUvawJdSbXQNHRWaEkhPlegPR9SuWc4kTGV+oWhyMr+c2HEUwL2QVUlqoQNZwuRtPrrkJcSAbE94= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2881; 7:kV5qmSOQeD0ObPD4z534cFz1XbNtaZpRLlCSrvD0/CTbRqh6QtjCoFagsAicYE288tt1mg3KnzxheDLUvRu+8v/RCV5sOLde1g4WNtnfAK4een68x35J28yalTGI4Jao6GUn85Qdi8mE5Fcvh7r44leXeXPe3Ofpq/sMWTUHJk+WLeZ9U+f/hHGCcjYNclB59JT4ZfYyOOSfXKVu6tPcLppprt433Fm4N4FKQuIBchQnWhhySwAsVknRDMpIIpXlfc5ax39380URrjAu7q4CdmfxPhF5HmbNJU3fQCkyx10z4g2MBvLyZ1sDMsAj7jrvck9kfmu6nPriRhZeOb8NspNHsC2RkkkAhaSONLwDckc= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2016 08:47:57.6961 (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: BN6PR03MB2881 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: <linux-crypto.vger.kernel.org> X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h index 61059abef737..2e6766a1573f 100644 --- a/drivers/crypto/caam/desc.h +++ b/drivers/crypto/caam/desc.h @@ -22,12 +22,6 @@ #define SEC4_SG_LEN_MASK 0x3fffffff /* Excludes EXT and FINAL */ #define SEC4_SG_OFFSET_MASK 0x00001fff -struct sec4_sg_entry { - u64 ptr; - u32 len; - u32 bpid_offset; -}; - /* Max size of any CAAM descriptor in 32-bit words, inclusive of header */ #define MAX_CAAM_DESCSIZE 64 diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h index 41cd5a356d05..6afa20c4a013 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h @@ -7,7 +7,11 @@ #include "regs.h" -struct sec4_sg_entry; +struct sec4_sg_entry { + u64 ptr; + u32 len; + u32 bpid_offset; +}; /* * convert single dma address to h/w link table format
sec4_sg_entry structure is used only by helper functions in sg_sw_sec4.h. Since SEC HW S/G entries are to be manipulated only indirectly, via these functions, move sec4_sg_entry to the corresponding header. Signed-off-by: Horia Geantă <horia.geanta@nxp.com> --- drivers/crypto/caam/desc.h | 6 ------ drivers/crypto/caam/sg_sw_sec4.h | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-)