From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F96DC33CB2 for ; Tue, 28 Jan 2020 14:44:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C0DB207FD for ; Tue, 28 Jan 2020 14:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580222663; bh=aup8c8VAiXA2mmlBVw9VBciGQMmaaLaQFRAsPUaw8pg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OYbGD7RjCYwRoL47OPPaqH6u1k6QNcFj/NlN0fjNWZ5WQm/kJC0VNI0fyFaNlXCF+ S2F9Llq7TLDwZQa3YSA6EW/o43lEzIsK9u243aJHWFHSdxEAAPPIydy7SausdqS6zb EnANy70Cdpk/iuUVz47PXEKThE+ZoYy46UlelZcI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728273AbgA1OK0 (ORCPT ); Tue, 28 Jan 2020 09:10:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:59182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729148AbgA1OKW (ORCPT ); Tue, 28 Jan 2020 09:10:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8841E24693; Tue, 28 Jan 2020 14:10:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220622; bh=aup8c8VAiXA2mmlBVw9VBciGQMmaaLaQFRAsPUaw8pg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zZ9nX9MFnCo4Ixt1oN+u+JUn+IZl2s4B1Re3XlKIdLYszHMIrP3QVKPGlpeAuJOVT j65pkop37z9ms4xliCD511/V23ndjdwHDl8MI2lNHu520H+snFQwiBXNnTpjnHJf0G W8Exue1Bd1y+b3vW6tPbSiRSwOrXJge0UOhO1PkU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexandru Ardelean , Vinod Koul , Sasha Levin Subject: [PATCH 4.4 081/183] dmaengine: axi-dmac: Dont check the number of frames for alignment Date: Tue, 28 Jan 2020 15:05:00 +0100 Message-Id: <20200128135838.018128023@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexandru Ardelean [ Upstream commit 648865a79d8ee3d1aa64aab5eb2a9d12eeed14f9 ] In 2D transfers (for the AXI DMAC), the number of frames (numf) represents Y_LENGTH, and the length of a frame is X_LENGTH. 2D transfers are useful for video transfers where screen resolutions ( X * Y ) are typically aligned for X, but not for Y. There is no requirement for Y_LENGTH to be aligned to the bus-width (or anything), and this is also true for AXI DMAC. Checking the Y_LENGTH for alignment causes false errors when initiating DMA transfers. This change fixes this by checking only that the Y_LENGTH is non-zero. Fixes: 0e3b67b348b8 ("dmaengine: Add support for the Analog Devices AXI-DMAC DMA controller") Signed-off-by: Alexandru Ardelean Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/dma-axi-dmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c index 5b2395e7e04d8..6de3d2142c7d2 100644 --- a/drivers/dma/dma-axi-dmac.c +++ b/drivers/dma/dma-axi-dmac.c @@ -441,7 +441,7 @@ static struct dma_async_tx_descriptor *axi_dmac_prep_interleaved( if (chan->hw_2d) { if (!axi_dmac_check_len(chan, xt->sgl[0].size) || - !axi_dmac_check_len(chan, xt->numf)) + xt->numf == 0) return NULL; if (xt->sgl[0].size + dst_icg > chan->max_length || xt->sgl[0].size + src_icg > chan->max_length) -- 2.20.1