]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dma: ti: k3-udma: invalidate prepared buffers before pushing to recv ring
authorMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Fri, 26 Apr 2024 08:02:28 +0000 (10:02 +0200)
committerTom Rini <trini@konsulko.com>
Wed, 15 May 2024 16:46:47 +0000 (10:46 -0600)
Buffers must not have an unclean cache before being used for DMA - a
pending write-back may corrupt the next dev-to-mem transfer otherwise.

This was consistently noticeable during long TFTP transfers, when an ARP
request is answered by U-Boot in the middle of the transfer:

As U-Boot's arp_receive() reuses the receive buffer to prepare its
reply packet, the beginning of one of the next incoming TFTP packets
is overwritten by the ARP reply. The corrupted packet is ignored, but
the TFTP transfer stalls for a few seconds until a timeout is detected
and a retransmit is triggered.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Tested-by: Alexander Sverdlin <alexander.sverdlin@siemens.com>
drivers/dma/ti/k3-udma.c

index e92ede570cf3f91ea8a142ccb00a260a9b57e764..da341a2477839ccd53ee8e6d5b0378fccf88738f 100644 (file)
@@ -2677,6 +2677,9 @@ int udma_prepare_rcv_buf(struct dma *dma, void *dst, size_t size)
        cppi5_hdesc_set_pktlen(desc_rx, size);
        cppi5_hdesc_attach_buf(desc_rx, dma_dst, size, dma_dst, size);
 
+       invalidate_dcache_range((unsigned long)dma_dst,
+                               (unsigned long)(dma_dst + size));
+
        flush_dcache_range((unsigned long)desc_rx,
                           ALIGN((unsigned long)desc_rx + uc->config.hdesc_size,
                                 ARCH_DMA_MINALIGN));