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: 9566219 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 9449E60216 for ; Fri, 10 Feb 2017 09:09:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80DD428544 for ; Fri, 10 Feb 2017 09:09:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75B5728552; Fri, 10 Feb 2017 09:09:33 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 F0BE328544 for ; Fri, 10 Feb 2017 09:09:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751800AbdBJJII (ORCPT ); Fri, 10 Feb 2017 04:08:08 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:36251 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751638AbdBJJH5 (ORCPT ); Fri, 10 Feb 2017 04:07:57 -0500 Received: by mail-wm0-f52.google.com with SMTP id c85so254151173wmi.1 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=H8iwAv9oK2b4wKpzBypTPfEil4nHQSXnf61mRLXKw+NhxLBiN7FYlfLLOioEvzQxH0 oKvKg6Kigbwvg8/gBTbxH9CGEPr4NgUlf6gnljsxhtKjAaNoGYBbiXpOcndzfFzt2LQs hYcVj9hBx8zsGqvWA6FA/6F5dItq498wyl8icCcCR6HG5vmEohOfCVpYfxRwLpijqyOZ YTcoGCY2Jt8/ZIBUhaHfYkYLGAwZshHNhxtFG3OIfnQYjLimvSIexacjfc2KdOi+nZlq 9FQn0t91ObnlaTgUFU+VJoRAMxYm6NXZcxnntcSNutdgUaQc2d7Tfk81LvuT49gITWTD CfTQ== X-Gm-Message-State: AMke39lJ9mIOcwR5jiWNPIGGDN65zJV/oqyAtgVBrzrunFSDeHR580Za1FWDoR3YVaBbdJeM 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 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 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> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@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 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