From patchwork Fri Feb 10 09:07:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 9566193 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 A546660572 for ; Fri, 10 Feb 2017 09:08:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 917B628544 for ; Fri, 10 Feb 2017 09:08:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 830F228551; Fri, 10 Feb 2017 09:08:41 +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 1345D28544 for ; Fri, 10 Feb 2017 09:08:41 +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=YMPSjm4AlB/4M00iYVvvCR6wlY xreF2cW0HoNzade0kjtIWsnjEC4aMePnETuqFgpMqBC1aYpGPO2HqAcTXxMfTNgVdrJAqu63oUVNS KNY2lcotWAbbfIH/qu/+opueo93NVpMdMJWMUvxw4MmSTXcOc3YaL5Q/gQ4zrQ9i/grGTwvaVM8Zx LPU9HLegHuM/eqKwtXMa4cmGXfmnrYfmZmY8ZYw8iIUtZYrDt07j9ro4a30wgP0oE6EdX5bojNbsn 3klpf+oI7M9WofsL1TX4LSIp01CN4E55i/zjIfgUDCeOGTD3A5ypiPsSd6NIO7hFbk001nnoHq3os AXhJYTLw==; 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 1cc7C1-0005ul-DL; Fri, 10 Feb 2017 09:08:37 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cc7Bi-0005Po-6S for linux-arm-kernel@lists.infradead.org; Fri, 10 Feb 2017 09:08:25 +0000 Received: by mail-wm0-x22c.google.com with SMTP id v77so42355262wmv.0 for ; Fri, 10 Feb 2017 01:07:57 -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=STKM5QaAcV9QeGtPAOW2bIo+bTpBGHtQro7MTKWjSrgvpZJWxC41HmHIdjPHBhSU1W dUrxFXstZWnf6tLWB2vdZfAremT3Jt0qjksW2V954+zypv9xJKFyvc7LxzkR/u0bDkpQ PZMrYBxB3ElGztzKtmDU32ZbgRUJHrA0rFlAw= 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=RwnddKbdCPFfEItiN2No9e64lf5TR1wnMp/miZBsUDVsXWybtdZ7IdQq0Wkth/C1wX f+aYNYlPYcviT+nGJEdMK+gjmPU5wXjmP/84NNiBhGjoZ2gu5JqIqHCR7dGAfu8oq12Q Nf4LhlBE5AT9tescI+dzmtzzyjJCo7V3h0DJk8nt/oFQH4afmVh+XY7n9y///6yKhpTV EveaETE9v0MzBX+ZIgBmXyb5dGO+DXwo3ZEgAdkgXyBRLnmAGTXXebEA73quYCsPnMWg cRZAJouWW8AXPjWusyl6bEmFVnJTz/5BsbPMdISD0wkLEmPDVAptOmYeceFBiBoQy+8x jv3A== X-Gm-Message-State: AMke39kH+VkoRJRQWAeAY+8QBf6zMWQhJNth4YHc6f63Pxi/W3+JHd0ke8GVxE7bDy5yVJQQ X-Received: by 10.28.140.130 with SMTP id o124mr6825961wmd.48.1486717676171; Fri, 10 Feb 2017 01:07:56 -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 k4sm498095wmf.22.2017.02.10.01.07.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Feb 2017 01:07:55 -0800 (PST) From: Anup Patel To: Vinod Koul , Rob Herring , Mark Rutland , Herbert Xu , "David S . Miller" , Jassi Brar Subject: [PATCH v3 2/4] async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome() Date: Fri, 10 Feb 2017 14:37:06 +0530 Message-Id: <1486717628-17580-3-git-send-email-anup.patel@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486717628-17580-1-git-send-email-anup.patel@broadcom.com> References: <1486717628-17580-1-git-send-email-anup.patel@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170210_010818_842079_B488778C X-CRM114-Status: GOOD ( 12.23 ) 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