From patchwork Thu Feb 2 04:47:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 9551009 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: 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 19CC860424 for ; Thu, 2 Feb 2017 04:49:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 087BA28458 for ; Thu, 2 Feb 2017 04:49:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFC5C28464; Thu, 2 Feb 2017 04:49:23 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable 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 8FA932844A for ; Thu, 2 Feb 2017 04:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751143AbdBBEs3 (ORCPT ); Wed, 1 Feb 2017 23:48:29 -0500 Received: from mail-qt0-f181.google.com ([209.85.216.181]:34157 "EHLO mail-qt0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751139AbdBBEs1 (ORCPT ); Wed, 1 Feb 2017 23:48:27 -0500 Received: by mail-qt0-f181.google.com with SMTP id w20so9817917qtb.1 for ; Wed, 01 Feb 2017 20:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=73qtmIJN7a4SoFgN593KttIT5pC13ELcPynEoytN7aU=; b=cj4C3TmJ8gvmfmhhKryLDJjfuPFYGokXd1f+YBvE3UqGjju9Ub2zHy2zFxf5CzwIve Aia+jjW0BW0A1L/Eft3vPko+RZSfNXgkkCDe6LjGE5NdHe0H2aJiHxqCFtnbuy/9j/hB ZtouPpORVQNjQdCXzlINWXo/N1egGZhOBJhYg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=73qtmIJN7a4SoFgN593KttIT5pC13ELcPynEoytN7aU=; b=V6L9sl4nuY+qrD0owqz/j9RurFC48uPsxDBFUKoGRJCuqLRphQqJ4OQlFIA1zB2CB4 WAoOv1ZJURFdDvR6bviN9RLWCt9Em5ZWoch/vqmcXRLzF5eHMgBCdRLTfz7OUB0cU7mn BvXZntntniQohC5hEBezNDwtK8nLKGQVtGriAjBQ7VvyTr9XGvHcnzYWdIDbNGMVwvsk y0gO6EoGqERDKR8mJP6jBc3xSjxLNTQoN/y5ZEH2WArs5d5OoacHOWc779qzcFTV0vNX o2xbfSFNbkfbzO/ZVQx6IMt1vVFGP0ftyl3u79M2LxJsxvXqEGgDfOOdOi5tDW6WaSZq 02yA== X-Gm-Message-State: AIkVDXI1Syei5zROxMJdZKpenDjWKa4yzjfZ6A8CUh45+GOyJOXgd137ZfzctVPETkqifdel X-Received: by 10.55.191.6 with SMTP id p6mr6389887qkf.79.1486010906360; Wed, 01 Feb 2017 20:48:26 -0800 (PST) Received: from anup-HP-Compaq-8100-Elite-CMT-PC.dhcp.avagotech.net ([192.19.237.250]) by smtp.gmail.com with ESMTPSA id y189sm20532696qky.39.2017.02.01.20.48.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Feb 2017 20:48:25 -0800 (PST) From: Anup Patel To: Vinod Koul , Rob Herring , Mark Rutland , Herbert Xu , "David S . Miller" , Jassi Brar Cc: Dan Williams , Ray Jui , Scott Branden , Jon Mason , Rob Rice , bcm-kernel-feedback-list@broadcom.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, linux-raid@vger.kernel.org, Anup Patel Subject: [PATCH 4/6] async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome() Date: Thu, 2 Feb 2017 10:17:14 +0530 Message-Id: <1486010836-25228-5-git-send-email-anup.patel@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486010836-25228-1-git-send-email-anup.patel@broadcom.com> References: <1486010836-25228-1-git-send-email-anup.patel@broadcom.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA_PREP_FENCE is to be used when preparing Tx descriptor if output of Tx descriptor is to be used by next/dependent Tx descriptor. The DMA_PREP_FENSE will not be set correctly in do_async_gen_syndrome() when calling dma->device_prep_dma_pq() under following conditions: 1. ASYNC_TX_FENCE not set in submit->flags 2. DMA_PREP_FENCE not set in dma_flags 3. src_cnt (= (disks - 2)) is greater than dma_maxpq(dma, dma_flags) This patch fixes DMA_PREP_FENCE usage in do_async_gen_syndrome() taking inspiration from do_async_xor() implementation. Signed-off-by: Anup Patel Reviewed-by: Ray Jui Reviewed-by: Scott Branden --- crypto/async_tx/async_pq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c index 16c6526..947cf35 100644 --- a/crypto/async_tx/async_pq.c +++ b/crypto/async_tx/async_pq.c @@ -62,9 +62,6 @@ do_async_gen_syndrome(struct dma_chan *chan, dma_addr_t dma_dest[2]; int src_off = 0; - if (submit->flags & ASYNC_TX_FENCE) - dma_flags |= DMA_PREP_FENCE; - while (src_cnt > 0) { submit->flags = flags_orig; pq_src_cnt = min(src_cnt, dma_maxpq(dma, dma_flags)); @@ -83,6 +80,8 @@ do_async_gen_syndrome(struct dma_chan *chan, if (cb_fn_orig) dma_flags |= DMA_PREP_INTERRUPT; } + if (submit->flags & ASYNC_TX_FENCE) + dma_flags |= DMA_PREP_FENCE; /* Drivers force forward progress in case they can not provide * a descriptor