From patchwork Fri Sep 18 12:57:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 7216061 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 E7C839F32B for ; Fri, 18 Sep 2015 12:59:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D3337208D2 for ; Fri, 18 Sep 2015 12:59:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFB9D208B8 for ; Fri, 18 Sep 2015 12:59:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754003AbbIRM7G (ORCPT ); Fri, 18 Sep 2015 08:59:06 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33113 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751009AbbIRM7E (ORCPT ); Fri, 18 Sep 2015 08:59:04 -0400 Received: by wiclk2 with SMTP id lk2so63450910wic.0; Fri, 18 Sep 2015 05:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BNy5C+mNewqrkzRjhYmGmYVDC7L38UNCVZySshkn9KA=; b=yCJ1E11b13zPZDCWHjo330D2IqQ8UhJLRowwjt19OkyiZ7no3+syYLNGA39KPYubxQ AMO0HB4eSj8UiKuDjZE0wMFni6UX+fBiXq/OldoFbZ0i6p7IXbNnwBDREB0avxPrNv73 paQtwhwCqSRxO29LDTHa4YysVrpuMyfRcY0pWjBIyP1Ez9nv574sdYU/n6xK+dXMFxCr b7hHZUYM8yxPYi8S2qrcoo58ngy+QwD6Aon3DY0oUsIBzZ8mBGV1ij/ffEtO7uNHPSrb S1v0AV/KSAAUF2AU4v4PZUPRd1wMaO8cfbR/QIUZ2valuaOc7eyzYbNzVhjDgmQndO3r yZmA== X-Received: by 10.180.86.136 with SMTP id p8mr7377157wiz.52.1442581143451; Fri, 18 Sep 2015 05:59:03 -0700 (PDT) Received: from Red.local (ANice-651-1-293-37.w83-201.abo.wanadoo.fr. [83.201.193.37]) by smtp.googlemail.com with ESMTPSA id kb5sm8789638wjc.17.2015.09.18.05.59.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Sep 2015 05:59:03 -0700 (PDT) From: LABBE Corentin To: herbert@gondor.apana.org.au, davem@davemloft.net, clabbe.montjoie@gmail.com, cristian.stoica@freescale.com, fabio.estevam@freescale.com, horia.geanta@freescale.com, steve.cornelius@freescale.com, vicki.milhoan@freescale.com, yanjiang.jin@windriver.com Cc: linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH v2 8/8] crypto: caam: replace __sg_count with sg_nents_len_chained Date: Fri, 18 Sep 2015 14:57:16 +0200 Message-Id: <1442581036-23789-9-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1442581036-23789-1-git-send-email-clabbe.montjoie@gmail.com> References: <1442581036-23789-1-git-send-email-clabbe.montjoie@gmail.com> 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 The caam driver use a modified version of sg_nents_for_len called __sg_count. This function is now availlable in lib/scatterlist.c Replace __sg_count by sg_nents_len_chained Signed-off-by: LABBE Corentin --- drivers/crypto/caam/caamhash.c | 14 ++++++++------ drivers/crypto/caam/sg_sw_sec4.h | 20 +------------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 94433b9..116af3e 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -797,8 +797,9 @@ static int ahash_update_ctx(struct ahash_request *req) to_hash = in_len - *next_buflen; if (to_hash) { - src_nents = __sg_count(req->src, req->nbytes - (*next_buflen), - &chained); + src_nents = sg_nents_len_chained(req->src, + req->nbytes - (*next_buflen), + &chained); sec4_sg_src_index = 1 + (*buflen ? 1 : 0); sec4_sg_bytes = (sec4_sg_src_index + src_nents) * sizeof(struct sec4_sg_entry); @@ -1000,7 +1001,7 @@ static int ahash_finup_ctx(struct ahash_request *req) int ret = 0; int sh_len; - src_nents = __sg_count(req->src, req->nbytes, &chained); + src_nents = sg_nents_len_chained(req->src, req->nbytes, &chained); sec4_sg_src_index = 1 + (buflen ? 1 : 0); sec4_sg_bytes = (sec4_sg_src_index + src_nents) * sizeof(struct sec4_sg_entry); @@ -1236,8 +1237,9 @@ static int ahash_update_no_ctx(struct ahash_request *req) to_hash = in_len - *next_buflen; if (to_hash) { - src_nents = __sg_count(req->src, req->nbytes - (*next_buflen), - &chained); + src_nents = sg_nents_len_chained(req->src, + req->nbytes - (*next_buflen), + &chained); sec4_sg_bytes = (1 + src_nents) * sizeof(struct sec4_sg_entry); @@ -1347,7 +1349,7 @@ static int ahash_finup_no_ctx(struct ahash_request *req) int sh_len; int ret = 0; - src_nents = __sg_count(req->src, req->nbytes, &chained); + src_nents = sg_nents_len_chained(req->src, req->nbytes, &chained); sec4_sg_src_index = 2; sec4_sg_bytes = (sec4_sg_src_index + src_nents) * sizeof(struct sec4_sg_entry); diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h index 18cd6d1..0575a8e 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h @@ -69,29 +69,11 @@ static inline struct sec4_sg_entry *sg_to_sec4_sg_len( return sec4_sg_ptr - 1; } -/* count number of elements in scatterlist */ -static inline int __sg_count(struct scatterlist *sg_list, int nbytes, - bool *chained) -{ - struct scatterlist *sg = sg_list; - int sg_nents = 0; - - while (nbytes > 0) { - sg_nents++; - nbytes -= sg->length; - if (!sg_is_last(sg) && (sg + 1)->length == 0) - *chained = true; - sg = sg_next(sg); - } - - return sg_nents; -} - /* derive number of elements in scatterlist, but return 0 for 1 */ static inline int sg_count(struct scatterlist *sg_list, int nbytes, bool *chained) { - int sg_nents = __sg_count(sg_list, nbytes, chained); + int sg_nents = sg_nents_len_chained(sg_list, nbytes, chained); if (likely(sg_nents == 1)) return 0;