Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

dma: Transfer dma_ops should use DMA address types

Browse source 
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 <afd@ti.com>
This commit is contained in:
Andrew Davis 2022-10-07 12:11:13 -05:00 committed by Tom Rini
parent b839265046
commit b9add6413d
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/dma/dma-uclass.c
View file

@ -252,7 +252,7 @@ int dma_memcpy(void *dst, void *src, size_t len)
destination = dma_map_single(dst, len, DMA_FROM_DEVICE); destination = dma_map_single(dst, len, DMA_FROM_DEVICE);
source = dma_map_single(src, len, DMA_TO_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 */ /* Clean+Invalidate the areas after, so we can see DMA'd data */
dma_unmap_single(destination, len, DMA_FROM_DEVICE); dma_unmap_single(destination, len, DMA_FROM_DEVICE);

4
drivers/dma/sandbox-dma-test.c
View file

@ -39,9 +39,9 @@ struct sandbox_dma_dev {
}; };
static int sandbox_dma_transfer(struct udevice *dev, int direction, 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; return 0;
} }

14
drivers/dma/ti-edma3.c
View file

@ -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 __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_slot_config slot;
struct edma3_channel_config edma_channel; 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 __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 xfer_len;
int max_xfer = EDMA_FILL_BUFFER_SIZE * 65535; 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; xfer_len = max_xfer;
__edma3_transfer(edma3_base_addr, edma_slot_num, dst, __edma3_transfer(edma3_base_addr, edma_slot_num, dst,
edma_fill_buffer, xfer_len, source, xfer_len,
EDMA_FILL_BUFFER_SIZE); EDMA_FILL_BUFFER_SIZE);
len -= xfer_len; len -= xfer_len;
dst += 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 destination = dma_map_single(dst, len, DMA_FROM_DEVICE);
dma_addr_t source = dma_map_single(src, len, DMA_TO_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 */ /* Clean+Invalidate the areas after, so we can see DMA'd data */
dma_unmap_single(destination, len, DMA_FROM_DEVICE); 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 */ /* Clean the area, so no writeback into the RAM races with DMA */
dma_addr_t destination = dma_map_single(dst, len, DMA_FROM_DEVICE); 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 */ /* Clean+Invalidate the area after, so we can see DMA'd data */
dma_unmap_single(destination, len, DMA_FROM_DEVICE); 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 #else
static int ti_edma3_transfer(struct udevice *dev, int direction, void *dst, static int ti_edma3_transfer(struct udevice *dev, int direction,
void *src, size_t len) dma_addr_t dst, dma_addr_t src, size_t len)
{ {
struct ti_edma3_priv *priv = dev_get_priv(dev); struct ti_edma3_priv *priv = dev_get_priv(dev);

4
drivers/dma/ti/k3-udma.c
View file

@ -2305,7 +2305,7 @@ err_res_free:
} }
static int udma_transfer(struct udevice *dev, int direction, 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); struct udma_dev *ud = dev_get_priv(dev);
/* Channel0 is reserved for memcpy */ /* Channel0 is reserved for memcpy */
@ -2326,7 +2326,7 @@ static int udma_transfer(struct udevice *dev, int direction,
if (ret) if (ret)
return 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_start(uc);
udma_poll_completion(uc, &paddr); udma_poll_completion(uc, &paddr);
udma_stop(uc); udma_stop(uc);

4
include/dma-uclass.h
View file

@ -132,8 +132,8 @@ struct dma_ops {
* @len: Length of the data to be copied (number of bytes). * @len: Length of the data to be copied (number of bytes).
* @return zero on success, or -ve error code. * @return zero on success, or -ve error code.
*/ */
int (*transfer)(struct udevice *dev, int direction, void *dst, int (*transfer)(struct udevice *dev, int direction, dma_addr_t dst,
void *src, size_t len); dma_addr_t src, size_t len);
}; };
#endif /* _DMA_UCLASS_H */ #endif /* _DMA_UCLASS_H */