From patchwork Thu Mar 5 16:46:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 5947831 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 08A61BF6C3 for ; Thu, 5 Mar 2015 16:50:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DAC12038D for ; Thu, 5 Mar 2015 16:50:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E7932038F for ; Thu, 5 Mar 2015 16:50:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758087AbbCEQuR (ORCPT ); Thu, 5 Mar 2015 11:50:17 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:48242 "EHLO mailhub1.si.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757793AbbCEQqZ (ORCPT ); Thu, 5 Mar 2015 11:46:25 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 25F841C832C; Thu, 5 Mar 2015 17:46:22 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from mailhub1.si.c-s.fr ([192.168.12.234]) by localhost (mailhub1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Aj_ezEWlDwxo; Thu, 5 Mar 2015 17:46:22 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id EE1801C8330; Thu, 5 Mar 2015 17:46:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D9F39C73DD; Thu, 5 Mar 2015 17:46:20 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Jz_6caPMj1GY; Thu, 5 Mar 2015 17:46:20 +0100 (CET) Received: from PO10863.localdomain (unknown [172.25.231.75]) by messagerie.si.c-s.fr (Postfix) with ESMTP id BF65EC73D5; Thu, 5 Mar 2015 17:46:12 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 006801A2425; Thu, 5 Mar 2015 17:46:06 +0100 (CET) From: Christophe Leroy To: Kim Phillips , Herbert Xu , "David S. Miller" CC: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-crypto@vger.kernel.org Subject: [PATCH 11/17] crypto: talitos - Move hash chain handling into talitos2.h Message-Id: <20150305164607.006801A2425@localhost.localdomain> Date: Thu, 5 Mar 2015 17:46:06 +0100 (CET) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Move hash chain handling into talitos2.h as only SEC2 has sg chaining capatibility Signed-off-by: Christophe Leroy --- drivers/crypto/talitos.c | 34 ---------------------------------- drivers/crypto/talitos2.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 3190762..6c1f6f1 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -458,23 +458,6 @@ static void talitos_unregister_rng(struct device *dev) #define MD5_BLOCK_SIZE 64 -#define HASH_MAX_BLOCK_SIZE SHA512_BLOCK_SIZE -#define TALITOS_MDEU_MAX_CONTEXT_SIZE TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512 - -struct talitos_ahash_req_ctx { - u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)]; - unsigned int hw_context_size; - u8 buf[HASH_MAX_BLOCK_SIZE]; - u8 bufnext[HASH_MAX_BLOCK_SIZE]; - unsigned int swinit; - unsigned int first; - unsigned int last; - unsigned int to_hash_later; - u64 nbuf; - struct scatterlist bufsl[2]; - struct scatterlist *psrc; -}; - /* * derive number of elements in scatterlist */ @@ -913,23 +896,6 @@ static int ahash_init_sha224_swinit(struct ahash_request *areq) return 0; } -static void ahash_process_chain(struct scatterlist *src, int nbytes, - bool *chained, - struct talitos_ahash_req_ctx *req_ctx, - int nbytes_to_hash) -{ - if (req_ctx->nbuf) { - unsigned int nsg = (req_ctx->nbuf < nbytes_to_hash) ? 2 : 1; - - sg_init_table(req_ctx->bufsl, nsg); - sg_set_buf(req_ctx->bufsl, req_ctx->buf, req_ctx->nbuf); - if (nsg > 1) - scatterwalk_sg_chain(req_ctx->bufsl, 2, src); - req_ctx->psrc = req_ctx->bufsl; - } else - req_ctx->psrc = src; -} - static int ahash_process_req(struct ahash_request *areq, unsigned int nbytes) { struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); diff --git a/drivers/crypto/talitos2.h b/drivers/crypto/talitos2.h index 10c7313..7edc563 100644 --- a/drivers/crypto/talitos2.h +++ b/drivers/crypto/talitos2.h @@ -223,6 +223,40 @@ static inline void do_init_device(struct talitos_private *priv) setbits32(priv->reg + TALITOS_IMR_LO, TALITOS_IMR_LO_INIT); } +#define HASH_MAX_BLOCK_SIZE SHA512_BLOCK_SIZE +#define TALITOS_MDEU_MAX_CONTEXT_SIZE TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512 + +struct talitos_ahash_req_ctx { + u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)]; + unsigned int hw_context_size; + u8 buf[HASH_MAX_BLOCK_SIZE]; + u8 bufnext[HASH_MAX_BLOCK_SIZE]; + unsigned int swinit; + unsigned int first; + unsigned int last; + unsigned int to_hash_later; + u64 nbuf; + struct scatterlist bufsl[2]; + struct scatterlist *psrc; +}; + +static inline void ahash_process_chain(struct scatterlist *src, int nbytes, + bool *chained, + struct talitos_ahash_req_ctx *req_ctx, + int nbytes_to_hash) +{ + if (req_ctx->nbuf) { + unsigned int nsg = (req_ctx->nbuf < nbytes_to_hash) ? 2 : 1; + + sg_init_table(req_ctx->bufsl, nsg); + sg_set_buf(req_ctx->bufsl, req_ctx->buf, req_ctx->nbuf); + if (nsg > 1) + scatterwalk_sg_chain(req_ctx->bufsl, 2, src); + req_ctx->psrc = req_ctx->bufsl; + } else + req_ctx->psrc = src; +} + #define DEF_TALITOS_DONE(name, ch_done_mask) \ static void talitos_done_##name(unsigned long data) \ { \