From patchwork Fri Sep 18 12:57:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 7216071 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 148599F32B for ; Fri, 18 Sep 2015 12:59:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31FE2208B8 for ; Fri, 18 Sep 2015 12:59:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 388E2208D1 for ; Fri, 18 Sep 2015 12:59:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753966AbbIRM6x (ORCPT ); Fri, 18 Sep 2015 08:58:53 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:35743 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751009AbbIRM6w (ORCPT ); Fri, 18 Sep 2015 08:58:52 -0400 Received: by wicge5 with SMTP id ge5so31780193wic.0; Fri, 18 Sep 2015 05:58:50 -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=r10Fxm5UKHX0CYT2XPukCeOs6/5ji1ljbIrHSCja3HQ=; b=LopwbQBcRDrVDVRkrxltLngwq5osx0ZqMIY2kNDAYyX9NCINQq+ODIfQEY/ifPWNHU L49YKDzKmvSWN6Ez4nzNuOu/GysoSIUhlAoDXFAB7/tRAbma7gyMKl4BR5iZDzuLZC08 clX10Bk9Yof2jjOqw1ghopFqeRMKEvz7RhEHBO9FxXPCRFU8+rUageLtfuiLOoUVEEY8 uwXM1hg4rCzMMJsJSZz6LlUIpO1K6nRhRxbF2ChczWtmC3rGyjHWdSNOGNxhWNfPSGqT f7mzCw+10ce1rXJPBemy+agFYgpyN6xF38jB/zaWjPqrLj9ZsxiZav1nXgddcDMgW62d lR6g== X-Received: by 10.180.75.176 with SMTP id d16mr16579366wiw.75.1442581130716; Fri, 18 Sep 2015 05:58:50 -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.58.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Sep 2015 05:58:50 -0700 (PDT) From: LABBE Corentin To: herbert@gondor.apana.org.au, davem@davemloft.net, axboe@fb.com, clabbe.montjoie@gmail.com, cristian.stoica@freescale.com, dan.j.williams@intel.com Cc: linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH v2 7/8] crypto: qce: replace qce_countsg with sg_nents_len_chained Date: Fri, 18 Sep 2015 14:57:15 +0200 Message-Id: <1442581036-23789-8-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 qce driver use a modified version of sg_nents_for_len called qce_countsg. This function is now availlable in lib/scatterlist.c Replace qce_countsg by sg_nents_len_chained Signed-off-by: LABBE Corentin --- drivers/crypto/qce/ablkcipher.c | 8 ++++---- drivers/crypto/qce/dma.c | 19 ------------------- drivers/crypto/qce/dma.h | 1 - drivers/crypto/qce/sha.c | 4 ++-- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/drivers/crypto/qce/ablkcipher.c b/drivers/crypto/qce/ablkcipher.c index ad592de..215bbd2 100644 --- a/drivers/crypto/qce/ablkcipher.c +++ b/drivers/crypto/qce/ablkcipher.c @@ -80,11 +80,11 @@ qce_ablkcipher_async_req_handle(struct crypto_async_request *async_req) dir_src = diff_dst ? DMA_TO_DEVICE : DMA_BIDIRECTIONAL; dir_dst = diff_dst ? DMA_FROM_DEVICE : DMA_BIDIRECTIONAL; - rctx->src_nents = qce_countsg(req->src, req->nbytes, - &rctx->src_chained); + rctx->src_nents = sg_nents_len_chained(req->src, req->nbytes, + &rctx->src_chained); if (diff_dst) { - rctx->dst_nents = qce_countsg(req->dst, req->nbytes, - &rctx->dst_chained); + rctx->dst_nents = sg_nents_len_chained(req->dst, req->nbytes, + &rctx->dst_chained); } else { rctx->dst_nents = rctx->src_nents; rctx->dst_chained = rctx->src_chained; diff --git a/drivers/crypto/qce/dma.c b/drivers/crypto/qce/dma.c index 378cb76..c18aaca 100644 --- a/drivers/crypto/qce/dma.c +++ b/drivers/crypto/qce/dma.c @@ -87,25 +87,6 @@ void qce_unmapsg(struct device *dev, struct scatterlist *sg, int nents, dma_unmap_sg(dev, sg, nents, dir); } -int qce_countsg(struct scatterlist *sglist, int nbytes, bool *chained) -{ - struct scatterlist *sg = sglist; - int nents = 0; - - if (chained) - *chained = false; - - while (nbytes > 0 && sg) { - nents++; - nbytes -= sg->length; - if (!sg_is_last(sg) && (sg + 1)->length == 0 && chained) - *chained = true; - sg = sg_next(sg); - } - - return nents; -} - struct scatterlist * qce_sgtable_add(struct sg_table *sgt, struct scatterlist *new_sgl) { diff --git a/drivers/crypto/qce/dma.h b/drivers/crypto/qce/dma.h index 65bedb8..4653e2d8 100644 --- a/drivers/crypto/qce/dma.h +++ b/drivers/crypto/qce/dma.h @@ -49,7 +49,6 @@ int qce_dma_prep_sgs(struct qce_dma_data *dma, struct scatterlist *sg_in, dma_async_tx_callback cb, void *cb_param); void qce_dma_issue_pending(struct qce_dma_data *dma); int qce_dma_terminate_all(struct qce_dma_data *dma); -int qce_countsg(struct scatterlist *sg_list, int nbytes, bool *chained); void qce_unmapsg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, bool chained); int qce_mapsg(struct device *dev, struct scatterlist *sg, int nents, diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c index be2f504..69c9495 100644 --- a/drivers/crypto/qce/sha.c +++ b/drivers/crypto/qce/sha.c @@ -92,8 +92,8 @@ static int qce_ahash_async_req_handle(struct crypto_async_request *async_req) rctx->authklen = AES_KEYSIZE_128; } - rctx->src_nents = qce_countsg(req->src, req->nbytes, - &rctx->src_chained); + rctx->src_nents = sg_nents_len_chained(req->src, req->nbytes, + &rctx->src_chained); ret = qce_mapsg(qce->dev, req->src, rctx->src_nents, DMA_TO_DEVICE, rctx->src_chained); if (ret < 0)