From patchwork Mon Mar 6 09:43:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 9605573 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 199F4601D2 for ; Mon, 6 Mar 2017 09:45:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBE2A279B3 for ; Mon, 6 Mar 2017 09:45:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D08F728346; Mon, 6 Mar 2017 09:45:30 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6A26E279B3 for ; Mon, 6 Mar 2017 09:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=W4aP5/j27ZpSOY6LhrD/h6ndDPhNVc5hVR3lwgGTMAw=; b=Xwogrimkt3c70neCrfwxc1FZ3r BQbtPiBDQ2KOypgNYVBZip6tWNjli8NK/gj23Dq3CaYJGkPfMMV85Elx2Xf4iZ9JrJxLQ9Z5zUYen ehq6Fmxza52E1DP5ZTIExM6BKKPYnX/UMd/uYNQ9cz2Mxjy4x7QVDbQo12AtMO5wKFF/WRm5v75UW K7H8vQpb55rMuau+MvTX512mxgT0KeYlUGQdjnBIr/AtBOh5Ziz5InzXfq7JRjMRPf3Ad/A6mOWXo BBjZQ6yIm38BqtGLeROd9Nm6jLDW1CJTrhLVD5PVl2wda0uzliiAvJmbz3ZElJG2XxLzqTlyVvKiU Rt3hVFag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ckpCo-00070t-8K; Mon, 06 Mar 2017 09:45:26 +0000 Received: from mail-qk0-x230.google.com ([2607:f8b0:400d:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ckpC1-00055o-Gt for linux-arm-kernel@lists.infradead.org; Mon, 06 Mar 2017 09:44:39 +0000 Received: by mail-qk0-x230.google.com with SMTP id v125so83033810qkh.2 for ; Mon, 06 Mar 2017 01:44:17 -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=92Sq4I4UInpzq2CbNnJQfee071l2ERx49mmNUjUXieo=; b=AhIt2zrLKQcNU6zAfHN57PCiV1jCWCnNuucVBbNt+Ij66381Av5seNwWOtZJviGs+J cUjtYjOFzMhmYtgJVXoO+PVe/gPGM5Bf1zFrjo9DgmNejHGxTyQ/Z0I6lFofzSc2q3+U iO14ABVrUiiwVAJzEq3P6RQn1QD4K9TBZcX2s= 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=92Sq4I4UInpzq2CbNnJQfee071l2ERx49mmNUjUXieo=; b=kdaQ+6Z2N35JNC9oKCkyOsNIwU/59SF7AJ/4qL5VRS668lbLTd6MpH2z5Px1mJjmfr kH7F3RYPcEjcLGLT7l8wono+V8IC43hAd9/o3LjsBOI40Z37xqdE3MqjYvi048Ca1aOG BActjDrUbqc//HqN8dpZ3Wu1t/ovMmf5I12YZNwP75rHMqiYxzLgTE0AT1j0m2mEruRh 1OYvap1OSO5EUhQtmLy71FcgIogpjn6v4KDRFN1O5jXlmyO7edkdGEy+jUN9fQpXhkY7 H2+7Ni5iDEBTs+Pxk7H33V7I4G+ZB4kCYcdecJd6SRjezUXp7r9zUSmK7AlEzOKn4TYr Szow== X-Gm-Message-State: AMke39mT0WNgSsV7g53fx5NzqFMRyIcO2BC8Osu2nZR04RmAm/cgftD+lWWt1nq/FsxPZ0GD X-Received: by 10.55.94.6 with SMTP id s6mr15585163qkb.166.1488793456280; Mon, 06 Mar 2017 01:44:16 -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 q66sm13017276qkd.69.2017.03.06.01.44.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Mar 2017 01:44:15 -0800 (PST) From: Anup Patel To: Vinod Koul , Rob Herring , Mark Rutland , Herbert Xu , "David S . Miller" , Jassi Brar Subject: [PATCH v6 2/4] async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome() Date: Mon, 6 Mar 2017 15:13:26 +0530 Message-Id: <1488793408-25592-3-git-send-email-anup.patel@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488793408-25592-1-git-send-email-anup.patel@broadcom.com> References: <1488793408-25592-1-git-send-email-anup.patel@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170306_014437_643909_F196657C X-CRM114-Status: GOOD ( 12.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Anup Patel , Scott Branden , Jon Mason , Ray Jui , linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-crypto@vger.kernel.org, Rob Rice , dmaengine@vger.kernel.org, Dan Williams , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 f83de99..56bd612 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