From patchwork Thu Sep 10 13:21:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 7154181 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 7F1019F326 for ; Thu, 10 Sep 2015 13:23:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ABD2220882 for ; Thu, 10 Sep 2015 13:23:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB91920881 for ; Thu, 10 Sep 2015 13:23:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754658AbbIJNW4 (ORCPT ); Thu, 10 Sep 2015 09:22:56 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:37092 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753573AbbIJNVw (ORCPT ); Thu, 10 Sep 2015 09:21:52 -0400 Received: by wicfx3 with SMTP id fx3so23010547wic.0; Thu, 10 Sep 2015 06:21:51 -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=pxBHxtgmF/D1L9sMSQvgvpmi2a2XB+FzNEW3UMZmyXc=; b=VvMX12gz8bquk5DzhGgHEuy2YzqHlKR9qv8BTipjuV1LfyTARqYg17M3UqPCAL+QaK 4i6V5rDBev2k7vBEx8r4xAoejzWSaMSKosjRgUb9jw5406jTlhcMJhKNLg6Jer2hwE00 6+BpmhXpwZtjq0mKqxXbw9Vre4XsmySssOImjS+2LzlQh03Sh8rCq+TK8qAks5AN8Cre HACjIdYSx+Ir1cUT7VZfje+49rkGcQOZV8FARuOpYMOM5ZW7KW7CQLzIQMpHBaz0Aj/n inKPfrBFvRSlrlZ7AEuau/005XqlLHx/PjCl6rjI7vmxyc+8+smB8iJxJ2hp5ESK9y4R UW7w== X-Received: by 10.180.87.198 with SMTP id ba6mr6488247wib.39.1441891311301; Thu, 10 Sep 2015 06:21:51 -0700 (PDT) Received: from Red.local (ANice-651-1-384-228.w86-205.abo.wanadoo.fr. [86.205.16.228]) by smtp.googlemail.com with ESMTPSA id h6sm9354122wiy.3.2015.09.10.06.21.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Sep 2015 06:21:50 -0700 (PDT) From: LABBE Corentin To: herbert@gondor.apana.org.au, davem@davemloft.net Cc: linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, LABBE Corentin Subject: [PATCH 6/7] crypto: qce replace qce_countsg with sg_nents_for_len2 Date: Thu, 10 Sep 2015 15:21:41 +0200 Message-Id: <1441891302-12014-7-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1441891302-12014-1-git-send-email-clabbe.montjoie@gmail.com> References: <1441891302-12014-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 Signed-off-by: LABBE Corentin --- drivers/crypto/qce/ablkcipher.c | 4 ++-- drivers/crypto/qce/dma.c | 19 ------------------- drivers/crypto/qce/dma.h | 1 - drivers/crypto/qce/sha.c | 2 +- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/crypto/qce/ablkcipher.c b/drivers/crypto/qce/ablkcipher.c index ad592de..0c589e7 100644 --- a/drivers/crypto/qce/ablkcipher.c +++ b/drivers/crypto/qce/ablkcipher.c @@ -80,10 +80,10 @@ 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_nents = sg_nents_for_len2(req->src, req->nbytes, &rctx->src_chained); if (diff_dst) { - rctx->dst_nents = qce_countsg(req->dst, req->nbytes, + rctx->dst_nents = sg_nents_for_len2(req->dst, req->nbytes, &rctx->dst_chained); } else { rctx->dst_nents = rctx->src_nents; 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..86fae62 100644 --- a/drivers/crypto/qce/sha.c +++ b/drivers/crypto/qce/sha.c @@ -92,7 +92,7 @@ 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_nents = sg_nents_for_len2(req->src, req->nbytes, &rctx->src_chained); ret = qce_mapsg(qce->dev, req->src, rctx->src_nents, DMA_TO_DEVICE, rctx->src_chained);