Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp643974pxb; Wed, 3 Feb 2021 14:03:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyfwchTPMGDZytgfqSLZ6S7zL3DRNLjvzkBl5yfZkIvOICAq1HAQh/occu0QC1JfPn/wdUo X-Received: by 2002:a17:906:78a:: with SMTP id l10mr3403378ejc.264.1612389798780; Wed, 03 Feb 2021 14:03:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612389798; cv=none; d=google.com; s=arc-20160816; b=BlqXDUVCBq36vIkNn/YDliVjj7Qf2XeNBW5jNiJbE8vG+/oNDRZIxL3iysnu6kSrya bcXHUrPgyPKQIfIZkd4q9GprzNWGSIn9hehu9VdxfdwldwO32RdH22E4icU84tmXxTD4 B7sNZdo/Vti8ORD9TkWHGVp2gBexUrgTxUsTyRFZSF3Vic4yfYH0DyzPVELWYLPDTv/0 98tnz3V3E4dK9RGJ5DY7A9Rf3Lvb5gZI3QAKFxc/H4ns64/97hA+Hwz9HxD6ogyg+TZ6 9dJ+xlddM2ozQJ7PzH7dThnaJZ/VpfrrLaf0lmXsJ3CpiX2NJQJ5rxPvm8PrbP/qCLYm qFQQ== 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=n5QGupPeRL7ALZ5HcMhVB2w6Jr4VEs2judRhQR25VJkqprfxXpyFbGuQOZGJHtIcIR Ujfwt1p3FgCCad3WedcYcAIWmn6teeTWkmdUfRBiwGtVt+bWltJt44Sp1n+IWwyDi8WA gYmo10j2cuTRn43jzdI5oBLjf4t11otytrhH0ab+k4nk2rCrGDJgwSE+F5TgbbMY+O+7 ww2EcwH5GnDj0AKPg4OcwV3Tq2lTmYX6a20P5wOfBZi8sYA25I9Qexd2OawbaXOEsbZ/ e6ogeCNARnHZEPhf9GG4EZ1ninoLg8s4JpP+rEAtrqz8/mkIa1ymS2CoxT77mr5og7+W iZFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=gpkrBn8f; 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 i12si2119181edk.461.2021.02.03.14.02.53; Wed, 03 Feb 2021 14:03:18 -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=gpkrBn8f; 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 S232801AbhBCWBG (ORCPT + 99 others); Wed, 3 Feb 2021 17:01:06 -0500 Received: from smtprelay-out1.synopsys.com ([149.117.73.133]:60284 "EHLO smtprelay-out1.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232664AbhBCV71 (ORCPT ); Wed, 3 Feb 2021 16:59:27 -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 061EC404A0; Wed, 3 Feb 2021 21:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1612389507; bh=WnHPY+sRUSSJJQq7Jc0VtKP64lY4iaChTFLji7S/MT0=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=gpkrBn8fEoMQJYGKJysQvgf2NYWEEA+GFnepWAuRg8hjx21g5RPxScAm0eCxLBi0/ rVPBpR6EnIKdG7NGYzIvorm8UrLUpVrd4cbxxuEZZQjQiz4e1PpSLt1cBllDkk/7Hj eAt+zJPiWn+H/sY5LDlUfm9rBe7FdH9h6eczTHi55jnbC9WjlGU48tf0bVWQWVOyOm hT1nJ7DrUL95y7E7B9x+lFfXZVALe7OTfG48OwEbOwRukeZS/vpdQBa4QkEcAOh2+s p3RtHSDB/nYKqWLbLBxXGSPMhbFS3tZonBDjbKzCzBvVzZ0Zz+f1EIg3SkHZYU+iW8 0qYe7seAs9GZA== Received: from de02dwia024.internal.synopsys.com (de02dwia024.internal.synopsys.com [10.225.19.81]) by mailhost.synopsys.com (Postfix) with ESMTP id D164BA0249; Wed, 3 Feb 2021 21:58:25 +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, Vinod Koul , Dan Williams , Bjorn Helgaas , Gustavo Pimentel Subject: [PATCH v4 14/15] dmaengine: dw-edma: Revert fix scatter-gather address calculation Date: Wed, 3 Feb 2021 22:58:05 +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