From patchwork Tue Sep 8 15:24:40 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: 249349 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4793240ilg; Tue, 8 Sep 2020 11:26:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcqA52eH9zivvcp4iFmKkYeXn02+U9KDlw7vQM2Yyh7mK+JyCB4z26FxPgWd5QkQy2zFyc X-Received: by 2002:a17:906:5046:: with SMTP id e6mr28604551ejk.449.1599589600260; Tue, 08 Sep 2020 11:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599589600; cv=none; d=google.com; s=arc-20160816; b=p/4lnXWmY/Wlk01kfhGz5vl8mTq/RrrbbYWtbsmvooAwvAmf+bDPLvphoXQwFnfsKN zTJrS08tmJtesl2aGGhuB/XejtxORSt8OCTHr+hWLTbqGBnsDUaI05WIVr5Ma6bqDSOu mO735O8AZUApAd2/RFknURzwPv0ihqWt3683GhznmkHKC3fEMFF5YxXVMirCbMTa4ale 1YBwZhAaueg9HWvNHCpw0a50n0j+d2VFgktvzbWaK+ggNsS/Rr/M9HS1Y1hy2x8fNeIN XfAAGTvKhHW6pFaV8qfkh+INR8SlzNZkyH4knO19fg2phr41rzDmcmXuzMs/kQUNe0Gn /yNQ== 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=2BGkAb0qBS8jMku5vlrfFnoIlrefeb8X+h3UYQ/3Qe0=; b=ILuKw7DnNCiEvYtVr/dUEBBbpqttIKA0n9vVOhFaeLd2Q51+Bb8JfEiaejTJ6yrkoj XRawuDhIYEjhg8MFPOUFZrybngwUSp9Y4Qel7rXn+HS0HlWpvE4HFZ7tPGwzRvEWnLzG 4W4EYXic0AJPIKl5SRLIBbZaK58m5pW6rjCd3fAbUkr8GEeqP6pBVrMqx8n3VIM5zcus Q0KI6YB5qeHPI1oH5MHL0KOTKgPqFZ9w2SY7+DrIJ0jnAJe2JmgYYBRM50XHHcNGPcAr Ele0pTrLX27bCiaAJIf0h1VTCqioH9p4yTWmHYNtf/OpmPMcOTt+6knhmTIP1Oe35D1x jD6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IPt9hvXE; 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 ha1si7694035ejb.406.2020.09.08.11.26.40; Tue, 08 Sep 2020 11:26:40 -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=IPt9hvXE; 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 S1729404AbgIHS0g (ORCPT + 15 others); Tue, 8 Sep 2020 14:26:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:56080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731441AbgIHQKg (ORCPT ); Tue, 8 Sep 2020 12:10:36 -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 689E124807; Tue, 8 Sep 2020 15:43:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579801; bh=LuqAQTUqtL6HFzAzTGMqWk172HN34Be2mNrwsMi8xN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IPt9hvXEUnR6jGKLceVAc7nZFc0r6nlLde3I1U16K+qnZirl0w+NcAOOoIpaITUWY TgNJrD2oBPzT5+nBGCKXXEQSESpLCefNVqmSqQH5sZJlY9T6Bqkk1AyNVdLEgl1Xf1 /p7GaV9HCadl/lAT0/wk6Nw9L7URi9mRs2zCeVWM= 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.4 039/129] dmaengine: pl330: Fix burst length if burst size is smaller than bus width Date: Tue, 8 Sep 2020 17:24:40 +0200 Message-Id: <20200908152231.630693284@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152229.689878733@linuxfoundation.org> References: <20200908152229.689878733@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 6cce9ef61b294..cd81d10974a29 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;