Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2000745pxb; Thu, 11 Feb 2021 01:27:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJzs87IfBcXrTSCdUI9DNtCstRifRm1A9dQxM0zHvjyW/t8VJiLcQDs+dLuOPnDBqFBWGF/G X-Received: by 2002:a05:6402:430c:: with SMTP id m12mr7660780edc.299.1613035626181; Thu, 11 Feb 2021 01:27:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613035626; cv=none; d=google.com; s=arc-20160816; b=FZ+qUnaiSZfz8pCxw4VcF10y6oW+17UsGjPrd80vhjW2EgXLdyYBdstqu45V6Hg90o xzLpoulixumsVjXVaoP9HV5XvHaJZAES/LGtTYveQLU4DrjTrw2Ep3Yhx6zdEjR+gmJX 8uIhno8NF2ls4kynBQ6xN/kEmzgvFQRO5Vss6aSGjLSaJ3k/tTAB1pFVPNBBKAfDnT5C o0AaJBa4UbfiznfXVpq4nNZ48ziAfpiVlovYGECFtj1kWBZgrox/bBNBwHj0q13QNHzl NMI95eCs5D1J1v2BI+1WWDxD4FCbnYpR3HPozBvsN5dN35ekJkN7N0nnjwFSAmAA4vKL 20jw== 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=Sfdel5dBtjWPSo7gDsJrtHa30MuTKOtg6Q/Qfbp4Ynsdtwm2Dxea3aUPHATWFu5ZWk 17i1ExjTUf9J6dYDnP7zMJnZ+yWeW01LMfwn3NZFTFQgd6UT/rUMTyoizepflSfPWX4R 31e0K8TD0geoRmwEG6mZymmIZjM/KQN39vuMg19grwBkTubV8usEU19Dmqne1YEl6G+1 LFW9kr+9gEyr1IOkE5LUR7Ez7bnDnSgHGCCJ2C8VBqM9JAiDqR6ljmEmqAaGrzj/XyOq SLoCDfyXAnNPddkiggdl1iS/1PWPWmT1jQYZww9zCRKgo8BWOBOPQMPNU017JAsJ3gyM PoTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=jquiJ2wI; 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 f7si4040874edd.595.2021.02.11.01.26.43; Thu, 11 Feb 2021 01:27:06 -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=jquiJ2wI; 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 S229947AbhBKJZr (ORCPT + 99 others); Thu, 11 Feb 2021 04:25:47 -0500 Received: from smtprelay-out1.synopsys.com ([149.117.73.133]:34204 "EHLO smtprelay-out1.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbhBKJOM (ORCPT ); Thu, 11 Feb 2021 04:14:12 -0500 Received: from mailhost.synopsys.com (mdc-mailhost2.synopsys.com [10.225.0.210]) (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 CE67D40173; Thu, 11 Feb 2021 09:13:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1613034790; bh=WnHPY+sRUSSJJQq7Jc0VtKP64lY4iaChTFLji7S/MT0=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=jquiJ2wIl9uIDg/KODiRJ7Ts2W8oRgwgg0q9e/RrtsygIJInLJfRkpKgWrT3gJ11C fiFbzvnlY9Uf1FGe/hogA+CRxdKS4jcj/m7EAS46dABwCTq9wWO/M8iTcUwlmRJ4x4 fhus7YJvnmJzHjH/KfVNaQqMg6SxpO//zzF3oAOQJcouQ7KaXVF6k64Pswav3OVvSD fG4CDjNCW+30ZhCCTu/4skRlTouRRXHBqsM3+y8FzaevEvW9OwzVjXe7UM/a9s0NVU OISRrGLIgiB1eKcfRZFmKptjbyhYxMPPIH0ouixuxHqVscAp5pZSprKXAd/iR4LVpw umD38hcQbIVkA== Received: from de02dwia024.internal.synopsys.com (de02dwia024.internal.synopsys.com [10.225.19.81]) by mailhost.synopsys.com (Postfix) with ESMTP id A36E1A0066; Thu, 11 Feb 2021 09:13:08 +0000 (UTC) X-SNPS-Relay: synopsys.com From: Gustavo Pimentel To: dmaengine@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Vinod Koul , Dan Williams , Bjorn Helgaas , Gustavo Pimentel Subject: [PATCH v5 14/15] dmaengine: dw-edma: Revert fix scatter-gather address calculation Date: Thu, 11 Feb 2021 10:12:47 +0100 Message-Id: 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