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=-8.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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 E2DE1C43613 for ; Mon, 24 Jun 2019 10:18:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADF9B20645 for ; Mon, 24 Jun 2019 10:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371520; bh=TvvvvmOjybsGV3RcCRc1tF+mAuzADsiX0iej91hyWrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wP5Iioy9SkHk05b+9krYkicA7g41NTA5CJE++VQrJKT/PG26CNRf07uB5hqMG12Vy FegaUVUnDPPvRLfHrIpn+RJd+1PufeTIJI01XWwQAgmbEce370BS38GhieXM97s5Bt EraC7HKo0bw7t42i0YVZsFCT69PDhwQ/PNgWj00I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730787AbfFXKSj (ORCPT ); Mon, 24 Jun 2019 06:18:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:53446 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729136AbfFXKQB (ORCPT ); Mon, 24 Jun 2019 06:16:01 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (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 1688D20645; Mon, 24 Jun 2019 10:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371360; bh=TvvvvmOjybsGV3RcCRc1tF+mAuzADsiX0iej91hyWrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EhZolR4Vm88H9VNrlmUUFIC0OatwWhtda1w6Uz8kiYsec8J5XYNKLZYyTQvFpJYLn vnttr129luas3pm0bt1uGiUW2pE+RM2UluYGfQrcPRgKvnb56ZYBnkhRYw0h/VoOgD l+Iu+4BkMuOdZm1+d8Zlg9RIVBFdOw4gBar6QrcU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Long , Baolin Wang , Vinod Koul , Sasha Levin Subject: [PATCH 5.1 039/121] dmaengine: sprd: Fix block length overflow Date: Mon, 24 Jun 2019 17:56:11 +0800 Message-Id: <20190624092322.803352022@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092320.652599624@linuxfoundation.org> References: <20190624092320.652599624@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 [ Upstream commit 89d03b3c126d683f7b2cd5b07178493993d12448 ] The maximum value of block length is 0xffff, so if the configured transfer length is more than 0xffff, that will cause block length overflow to lead a configuration error. Thus we can set block length as the maximum burst length to avoid this issue, since the maximum burst length will not be a big value which is more than 0xffff. Signed-off-by: Eric Long Signed-off-by: Baolin Wang Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/sprd-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index 0f92e60529d1..a01c23246632 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -778,7 +778,7 @@ static int sprd_dma_fill_desc(struct dma_chan *chan, temp |= slave_cfg->src_maxburst & SPRD_DMA_FRG_LEN_MASK; hw->frg_len = temp; - hw->blk_len = len & SPRD_DMA_BLK_LEN_MASK; + hw->blk_len = slave_cfg->src_maxburst & SPRD_DMA_BLK_LEN_MASK; hw->trsc_len = len & SPRD_DMA_TRSC_LEN_MASK; temp = (dst_step & SPRD_DMA_TRSF_STEP_MASK) << SPRD_DMA_DEST_TRSF_STEP_OFFSET; -- 2.20.1