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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA3D5C433F5 for ; Fri, 7 Oct 2022 17:11:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EE1F884E94; Fri, 7 Oct 2022 19:11:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="X3udwUGE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2404284E8D; Fri, 7 Oct 2022 19:11:25 +0200 (CEST) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 35C9184E8B for ; Fri, 7 Oct 2022 19:11:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=afd@ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 297HBF9u039051; Fri, 7 Oct 2022 12:11:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1665162675; bh=/3v8roSRc5qlKB6CcFrd8IMzvoIcSnltLXK0Qka515k=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=X3udwUGEyHd7I2p4GfWrPNGwA492cGv4mFxgzMIvWOmWRNXgQkd+IEYH6CE0H2Wuv yPqZWYC83Di6EZuZXywE/ogZqorfrpkM/sEc6fQPhj0IU1NRZ3GNsXorpo29DWx03k ITL+qEnuu8vjyTVsL35+8TVcnaC312oqdNBBzDks= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 297HBFvm115925 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 7 Oct 2022 12:11:15 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6; Fri, 7 Oct 2022 12:11:14 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6 via Frontend Transport; Fri, 7 Oct 2022 12:11:14 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 297HBDgj005642; Fri, 7 Oct 2022 12:11:14 -0500 From: Andrew Davis To: Simon Glass , Tom Rini , Vignesh Raghavendra , CC: Andrew Davis Subject: [PATCH 3/3] dma: Transfer dma_ops should use DMA address types Date: Fri, 7 Oct 2022 12:11:13 -0500 Message-ID: <20221007171113.31577-3-afd@ti.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221007171113.31577-1-afd@ti.com> References: <20221007171113.31577-1-afd@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean DMA operations should function on DMA addresses, not virtual addresses. Although these are usually the same in U-Boot, it is more correct to be explicit with our types here. Signed-off-by: Andrew Davis --- drivers/dma/dma-uclass.c | 2 +- drivers/dma/sandbox-dma-test.c | 4 ++-- drivers/dma/ti-edma3.c | 14 +++++++------- drivers/dma/ti/k3-udma.c | 4 ++-- include/dma-uclass.h | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c index 70f06f1f09..81dbb4da10 100644 --- a/drivers/dma/dma-uclass.c +++ b/drivers/dma/dma-uclass.c @@ -252,7 +252,7 @@ int dma_memcpy(void *dst, void *src, size_t len) destination = dma_map_single(dst, len, DMA_FROM_DEVICE); source = dma_map_single(src, len, DMA_TO_DEVICE); - ret = ops->transfer(dev, DMA_MEM_TO_MEM, dst, src, len); + ret = ops->transfer(dev, DMA_MEM_TO_MEM, destination, source, len); /* Clean+Invalidate the areas after, so we can see DMA'd data */ dma_unmap_single(destination, len, DMA_FROM_DEVICE); diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c index aebf3eef96..2b8259a35b 100644 --- a/drivers/dma/sandbox-dma-test.c +++ b/drivers/dma/sandbox-dma-test.c @@ -39,9 +39,9 @@ struct sandbox_dma_dev { }; static int sandbox_dma_transfer(struct udevice *dev, int direction, - void *dst, void *src, size_t len) + dma_addr_t dst, dma_addr_t src, size_t len) { - memcpy(dst, src, len); + memcpy((void *)dst, (void *)src, len); return 0; } diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c index 53dc4e8ce5..1ad3b92dbf 100644 --- a/drivers/dma/ti-edma3.c +++ b/drivers/dma/ti-edma3.c @@ -396,7 +396,7 @@ void qedma3_stop(u32 base, struct edma3_channel_config *cfg) } void __edma3_transfer(unsigned long edma3_base_addr, unsigned int edma_slot_num, - void *dst, void *src, size_t len, size_t s_len) + dma_addr_t dst, dma_addr_t src, size_t len, size_t s_len) { struct edma3_slot_config slot; struct edma3_channel_config edma_channel; @@ -484,7 +484,7 @@ void __edma3_transfer(unsigned long edma3_base_addr, unsigned int edma_slot_num, } void __edma3_fill(unsigned long edma3_base_addr, unsigned int edma_slot_num, - void *dst, u8 val, size_t len) + dma_addr_t dst, u8 val, size_t len) { int xfer_len; int max_xfer = EDMA_FILL_BUFFER_SIZE * 65535; @@ -499,7 +499,7 @@ void __edma3_fill(unsigned long edma3_base_addr, unsigned int edma_slot_num, xfer_len = max_xfer; __edma3_transfer(edma3_base_addr, edma_slot_num, dst, - edma_fill_buffer, xfer_len, + source, xfer_len, EDMA_FILL_BUFFER_SIZE); len -= xfer_len; dst += xfer_len; @@ -517,7 +517,7 @@ void edma3_transfer(unsigned long edma3_base_addr, unsigned int edma_slot_num, dma_addr_t destination = dma_map_single(dst, len, DMA_FROM_DEVICE); dma_addr_t source = dma_map_single(src, len, DMA_TO_DEVICE); - __edma3_transfer(edma3_base_addr, edma_slot_num, dst, src, len, len); + __edma3_transfer(edma3_base_addr, edma_slot_num, destination, source, len, len); /* Clean+Invalidate the areas after, so we can see DMA'd data */ dma_unmap_single(destination, len, DMA_FROM_DEVICE); @@ -530,7 +530,7 @@ void edma3_fill(unsigned long edma3_base_addr, unsigned int edma_slot_num, /* Clean the area, so no writeback into the RAM races with DMA */ dma_addr_t destination = dma_map_single(dst, len, DMA_FROM_DEVICE); - __edma3_fill(edma3_base_addr, edma_slot_num, dst, val, len); + __edma3_fill(edma3_base_addr, edma_slot_num, destination, val, len); /* Clean+Invalidate the area after, so we can see DMA'd data */ dma_unmap_single(destination, len, DMA_FROM_DEVICE); @@ -538,8 +538,8 @@ void edma3_fill(unsigned long edma3_base_addr, unsigned int edma_slot_num, #else -static int ti_edma3_transfer(struct udevice *dev, int direction, void *dst, - void *src, size_t len) +static int ti_edma3_transfer(struct udevice *dev, int direction, + dma_addr_t dst, dma_addr_t src, size_t len) { struct ti_edma3_priv *priv = dev_get_priv(dev); diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 86603d43f1..ab6639b4a1 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -2304,7 +2304,7 @@ err_res_free: } static int udma_transfer(struct udevice *dev, int direction, - void *dst, void *src, size_t len) + dma_addr_t dst, dma_addr_t src, size_t len) { struct udma_dev *ud = dev_get_priv(dev); /* Channel0 is reserved for memcpy */ @@ -2325,7 +2325,7 @@ static int udma_transfer(struct udevice *dev, int direction, if (ret) return ret; - udma_prep_dma_memcpy(uc, (dma_addr_t)dst, (dma_addr_t)src, len); + udma_prep_dma_memcpy(uc, dst, src, len); udma_start(uc); udma_poll_completion(uc, &paddr); udma_stop(uc); diff --git a/include/dma-uclass.h b/include/dma-uclass.h index 340437acc1..ea721baae6 100644 --- a/include/dma-uclass.h +++ b/include/dma-uclass.h @@ -132,8 +132,8 @@ struct dma_ops { * @len: Length of the data to be copied (number of bytes). * @return zero on success, or -ve error code. */ - int (*transfer)(struct udevice *dev, int direction, void *dst, - void *src, size_t len); + int (*transfer)(struct udevice *dev, int direction, dma_addr_t dst, + dma_addr_t src, size_t len); }; #endif /* _DMA_UCLASS_H */ -- 2.37.3