From patchwork Fri Sep 11 12:46:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 249731 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ecf:0:0:0:0 with SMTP id i15csp71872ilk; Fri, 11 Sep 2020 10:22:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGZw6TERr9a6MYqWbuNXJsW6Fkr4r/TU6eMhU1HsPkJnOPz0k8DNmqfzNTDgLQlNdjZOcQ X-Received: by 2002:a17:906:1192:: with SMTP id n18mr3180805eja.515.1599844944488; Fri, 11 Sep 2020 10:22:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599844944; cv=none; d=google.com; s=arc-20160816; b=S2gepIhJjC270txLb67S0/edWWojFd66TfRJj0y3kbQaAt/TN2LpfBO2FtCV0uaQZG DVaqdkQ6eJwMgyWqPl5XSij7VRErIDCgubuR4IDk1ZYJk42VYGS/iKnjEbfUoWceoERI EFvmwY6Pvwqic7wBtklWW4jQJ8TMsQgHSachg3oXf+D0Nd5NXAOVkIn4SEvA9NwnY3Q/ 1OWz5YaxGJZ7aCvrVVRpmv6SSF+ia66M+CsbMDd7d334IzTtEphuc4SGv8yjy+JusHTg Vl+mdy7S/xajLBgq2UWM0ZfS1oqopuPRApr8sA3gdDBuYC8vkzB0l+ITMgiB12i0KoBq e9tA== 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=JSXiSn8aM77tCAYxjdwwtwq61/O6dhEOV/B5K7erocc=; b=vZ5AFnNYOKZRtY6fm7PJDAf6gncpAFcxWMMzhnwJV53WGBWW+iTt1ZlNd49+sUjqFh pSsToO6B8jL2Dellw144jvnsf8XDeEgiYgneXYTKgSFvzumET+iYv4p+04fnqcrcpMQu QATm2bQd5KHOpMJ5M2L8lyD+z1e5EcwPFaJYkwPkm3A937Ql+ULGlWB9KzP05tGlWkBJ 1MP6IKxrKzcZQuClknr8WyiT67Nc/LGXdEik6anT7OQ5RCcFFsLpGxXC+w+ID6AKRFKK AvaE5iaHZUUqP5SnahUjUawLOo/jXFE9lG7tAiUWLrPLOIm9sp05jm51F2bMuyu3a0Eb XDIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="AcLGz/D/"; 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 qt10si1700863ejb.2.2020.09.11.10.22.24; Fri, 11 Sep 2020 10:22:24 -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="AcLGz/D/"; 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 S1726011AbgIKRVk (ORCPT + 15 others); Fri, 11 Sep 2020 13:21:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:49870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726132AbgIKNAL (ORCPT ); Fri, 11 Sep 2020 09:00:11 -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 09FEB22272; Fri, 11 Sep 2020 12:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599828986; bh=4Vv2RDw7nKUlCzjSveipl9l0b2eKWH3UxDWSeO7rktA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AcLGz/D/E3donIIIn5JrUKp/rN2RukJcEAOiSHFwvXyI+LsYTMo2UT3HTKwiwuWRO W0pCiGBNtLHZn30jIF/chlRWo+2j29dobSfqYESuq6CkpFfqm9FHpGYx0kJ4qVbRV3 2Faw38BsiHv1tsSEuETBXVBiXHn4EM+c9x5GB6Xo= 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 4.9 21/71] dmaengine: pl330: Fix burst length if burst size is smaller than bus width Date: Fri, 11 Sep 2020 14:46:05 +0200 Message-Id: <20200911122505.999081976@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200911122504.928931589@linuxfoundation.org> References: <20200911122504.928931589@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 57b375d0de292..16c08846ea0e1 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2677,6 +2677,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. @@ -2684,7 +2685,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;