Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp620488pxb; Tue, 2 Feb 2021 13:26:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJygAQz8GQ75fCp99qp/2DWH0G8EGNu4nnUYsUUsDGAVNzOTZ37D6OhYJHCuV6aebPPQFVjK X-Received: by 2002:a05:6402:3116:: with SMTP id dc22mr27877edb.325.1612301193776; Tue, 02 Feb 2021 13:26:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612301193; cv=none; d=google.com; s=arc-20160816; b=gqufHkuRVi1NHxT2lBMYgZniNFjcFz+2cacNsDZHAuvxtwEkGUcoUtEbEO55Y7mQPb XKL5WWbw6uK2zLFeoL5O7k7aqSdeM4Kmqk27u0OVhahZUN+4/v+BzPet/UMW0vMo2bs7 y1nm9I4y+0F5XCM4ozmIgrc8od3qloCSIUCH8Sq3gFpCa0ExTk8CwCplo5AQWLlMQSle FXdTnbeO9PcL6eKEO0SxjYfiMGhiGcD5YndqF4rWuYivLLLgg2bgzcbLrrjRgAS7maUm /JcxjKfOXROV/iXcLdcW92C28LItViC1HCGB7BZnnhA4tCWdzJRxLykyis4WsaIYNlxH IX9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=8vW0MF03iYdy+tYM8whyD95s4d2jtSaCar8hm3G2Hyg=; b=Ge/tTTLNEYL3mwD8h7bQHwpdilxSn1jq2tK7ERnLh4ts/3nuET76+uDFfN2E51p6XM yfpm1b6zhyRx5Y7qDnT5QF8VTlz6GkWkaWkU0M6I+iw2XWrbvgITOttLpktIlMGaTfy8 L+xG0z8ty4kq0o95nsWIoe6YrZzOAEilzY31fHNpHrPFDix3p6FH7Q2Yvef4AP77/4YP dHivZFC/MEmVJaYDO1yPfLrDyQmVPq2+U8kG1CEAM+uqx9VLAdGLFjBFFO/pupJYndul NZWZ8biV/YAdqX/NOdfQEQnwGBryXlqL70FEE+H32rQF/KtLzeBuCrSVAu29m3M8RL4M 7uYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=BlGtGUiy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=synopsys.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ce16si13598841edb.87.2021.02.02.13.26.08; Tue, 02 Feb 2021 13:26:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=@synopsys.com header.s=mail header.b=BlGtGUiy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=synopsys.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232038AbhBBMpE (ORCPT + 99 others); Tue, 2 Feb 2021 07:45:04 -0500 Received: from smtprelay-out1.synopsys.com ([149.117.87.133]:56154 "EHLO smtprelay-out1.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231786AbhBBMmD (ORCPT ); Tue, 2 Feb 2021 07:42:03 -0500 Received: from mailhost.synopsys.com (mdc-mailhost1.synopsys.com [10.225.0.209]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtprelay-out1.synopsys.com (Postfix) with ESMTPS id 5126CC00C5; Tue, 2 Feb 2021 12:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1612269661; bh=WnHPY+sRUSSJJQq7Jc0VtKP64lY4iaChTFLji7S/MT0=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=BlGtGUiypuMGYD82Dy64f/V6EfJ6SOE1ypA0EnrqpPMP558q6ImCuWWKzkvHtIHSD InacHOTNSt/26dtWlfK102tDIvWkgMeAm1dC+JPiO+ypnLtYzXisz+dAiXGJX0hcIH vCAWEOWSrIi0JWfwCo1f1Mko4Jaatl9H0IqQvg3TpEQt9iHqJxNzGId/WFQz+9k1Fu 9cgeclW7MFTtitQ8HecmvlfEmZ+pUcfMrkJop61PetzQ7dJ1j+uf6CzyFHc7dicrYl 35SMIQG1mc8LYLPNkhZT5uJI6QycfP3jGZME7ZsCZ2NTFZ+FrTwf4XRSbuFMyP9Nep +YqjYwf+2gkcQ== Received: from de02dwia024.internal.synopsys.com (de02dwia024.internal.synopsys.com [10.225.19.81]) by mailhost.synopsys.com (Postfix) with ESMTP id 21ECEA024B; Tue, 2 Feb 2021 12:41:00 +0000 (UTC) X-SNPS-Relay: synopsys.com From: Gustavo Pimentel To: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Gustavo Pimentel , Vinod Koul , Dan Williams Subject: [PATCH v2 14/15] dmaengine: dw-edma: Revert fix scatter-gather address calculation Date: Tue, 2 Feb 2021 13:40:28 +0100 Message-Id: <9af4ac8c3833b81325787771476ed4f1ce027979.1612269537.git.gustavo.pimentel@synopsys.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reverting the applied patch because it caused a regression on ARC700 platform (32 bits). Signed-off-by: Gustavo Pimentel --- drivers/dma/dw-edma/dw-edma-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dma/dw-edma/dw-edma-core.c b/drivers/dma/dw-edma/dw-edma-core.c index a299eed..c198451 100644 --- a/drivers/dma/dw-edma/dw-edma-core.c +++ b/drivers/dma/dw-edma/dw-edma-core.c @@ -429,7 +429,8 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) if (xfer->type == EDMA_XFER_CYCLIC) { burst->dar = xfer->xfer.cyclic.paddr; } else if (xfer->type == EDMA_XFER_SCATTER_GATHER) { - burst->dar = dst_addr; + src_addr += sg_dma_len(sg); + burst->dar = sg_dma_address(sg); /* Unlike the typical assumption by other * drivers/IPs the peripheral memory isn't * a FIFO memory, in this case, it's a @@ -443,7 +444,8 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) if (xfer->type == EDMA_XFER_CYCLIC) { burst->sar = xfer->xfer.cyclic.paddr; } else if (xfer->type == EDMA_XFER_SCATTER_GATHER) { - burst->sar = src_addr; + dst_addr += sg_dma_len(sg); + burst->sar = sg_dma_address(sg); /* Unlike the typical assumption by other * drivers/IPs the peripheral memory isn't * a FIFO memory, in this case, it's a @@ -455,8 +457,6 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) } if (xfer->type == EDMA_XFER_SCATTER_GATHER) { - src_addr += sg_dma_len(sg); - dst_addr += sg_dma_len(sg); sg = sg_next(sg); } else if (xfer->type == EDMA_XFER_INTERLEAVED && xfer->xfer.il->frame_size > 0) { -- 2.7.4