From patchwork Tue Sep 8 15:23:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 249370 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4841278ilg; Tue, 8 Sep 2020 12:35:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz46xjijKB706PtQ2UxCHyHngxzLavhmUR7RtM3BaEWmdK5+jw4eRwL9jTbY8EDAzPUZTjZ X-Received: by 2002:a05:6402:45a:: with SMTP id p26mr676157edw.8.1599593757271; Tue, 08 Sep 2020 12:35:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599593757; cv=none; d=google.com; s=arc-20160816; b=XqxnW3aD7uvaCQ9tBo+GRt0tk3lP77WPR5QZ2///yj2XJ8ntDWI9vf6TjOseV+BqFk syzQSJOrEf7IrkbjY+f04Cgrc6X7KoXA4DWQud+3374ACgXXBhxyyJ+DtHFVAz/F1x8Y hh+3/232BTA2PSWHa35ikVevzgFYa2C63j1zHqyuQYX0e1yw7VKBssyu5hJuXX0EzB7/ BpBqZYu4oXBLpKGCnvT14d0X1Yb6jxRNVg9bmtTJF2Eq6OmxKDGHBghKhixp+2zaHKiV 0TyJ4LU1TnoaBUaGJkbPot6OkQANyFp8F1nx65P33YZjIHQQPNAfwEvHo0SMYcbGX1UX yoQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JQmPXmPG63Myl/y4swQAsCCcEX4xOW55oNQxJFCI6rg=; b=s0Wlb0HNz9/er8LZUuhF7vSrwcb2BNX9M5JwuUhJLwrJjquOp+B9sXzD57JN0fHMsr qh7rmmQdzq+OStcGPb4BAUDfb0kVX6XYox5/OqvcgOf6cgzSP14Pz0Jm8p9gPqVHZ69s HbwNbUsqhLMGe+30h7s5EySSpdcZnh8IJ05qT6JseiRJtfftnUUu5IIbm/6PhkSf3sUH h6/tYRxGqT8y/F7e3jSqokLqrtT4i6zvMTeVx0VI8ZMAmiYRY2nrrfDuG5B0aZrBo7oM mw3Les28JXUuVK+a1ZAMDCQL4HAC2feAt+smJa7AeKpoEC+QrdipA2hCCq6Idw/C0rze TaUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GjHeKX0O; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ds18si13176529ejc.745.2020.09.08.12.35.57; Tue, 08 Sep 2020 12:35:57 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GjHeKX0O; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732128AbgIHTfj (ORCPT + 15 others); Tue, 8 Sep 2020 15:35:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:47734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730931AbgIHP5Q (ORCPT ); Tue, 8 Sep 2020 11:57:16 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 CD3E023C8F; Tue, 8 Sep 2020 15:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579401; bh=eV+qXnupMAwukWY36dmb5snyjct3jFmB2JGnne6hUxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GjHeKX0Oeh4A6NZstKc4NT5dsN2PjtwgZhMrU7zwLjzfnI4ukmoWAeApNchFL0+1e XU/oPvNGMAhy9TKibMAPp0iXtA3+0OQ7R8kp5L70+0/0UL/oyTWxZ6fmxbRQkiU+iW aAhDNUHEprfx+NsJAs932xTxWaELFj9rFfXKEV4s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Marek Szyprowski , Vinod Koul , Sasha Levin Subject: [PATCH 5.8 062/186] dmaengine: pl330: Fix burst length if burst size is smaller than bus width Date: Tue, 8 Sep 2020 17:23:24 +0200 Message-Id: <20200908152244.666285989@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152241.646390211@linuxfoundation.org> References: <20200908152241.646390211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit 0661cef675d37e2c4b66a996389ebeae8568e49e ] Move the burst len fixup after setting the generic value for it. This finally enables the fixup introduced by commit 137bd11090d8 ("dmaengine: pl330: Align DMA memcpy operations to MFIFO width"), which otherwise was overwritten by the generic value. Reported-by: kernel test robot Fixes: 137bd11090d8 ("dmaengine: pl330: Align DMA memcpy operations to MFIFO width") Signed-off-by: Marek Szyprowski Link: https://lore.kernel.org/r/20200825064617.16193-1-m.szyprowski@samsung.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/pl330.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 88b884cbb7c1b..9d8a235a5b884 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2788,6 +2788,7 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst, while (burst != (1 << desc->rqcfg.brst_size)) desc->rqcfg.brst_size++; + desc->rqcfg.brst_len = get_burst_len(desc, len); /* * If burst size is smaller than bus width then make sure we only * transfer one at a time to avoid a burst stradling an MFIFO entry. @@ -2795,7 +2796,6 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst, if (desc->rqcfg.brst_size * 8 < pl330->pcfg.data_bus_width) desc->rqcfg.brst_len = 1; - desc->rqcfg.brst_len = get_burst_len(desc, len); desc->bytes_requested = len; desc->txd.flags = flags;