summaryrefslogtreecommitdiff
path: root/drivers/thunderbolt/stream.c
diff options
context:
space:
mode:
authorXu Rao <raoxu@uniontech.com>2026-06-11 14:45:30 +0800
committerMika Westerberg <mika.westerberg@linux.intel.com>2026-06-23 14:04:58 +0200
commitdac35cd606d091120acba9213c70a9dd85fd9f5e (patch)
treef5aae965cdf8ae2c01baca71a16eb90eed799b0a /drivers/thunderbolt/stream.c
parent502d801f0ab03e4f32f9a33d203154ce84887921 (diff)
downloadlinux-next-dac35cd606d091120acba9213c70a9dd85fd9f5e.tar.gz
linux-next-dac35cd606d091120acba9213c70a9dd85fd9f5e.zip
thunderbolt: stream: Unmap buffers with mapped size
The size passed to dma_unmap_page() must match the size used for the corresponding dma_map_page() call. Stream RX and TX buffers are mapped with TB_MAX_FRAME_SIZE when the buffer pools are allocated. However, tbstream_ring_free() currently uses tb_ring_frame_size() as the unmap size. That helper returns the current frame payload size, not the DMA mapping size. On the TX path, tbstream_dev_alloc_tx() stores a shorter payload length in frame.size when the payload is smaller than TB_MAX_FRAME_SIZE. This happens for a short final DATA frame, and also for the CLOSE frame, which is allocated with SZ_256. In those cases the buffer was mapped with TB_MAX_FRAME_SIZE, but tb_ring_frame_size() returns the shorter frame payload length. This makes the dma_unmap_page() size differ from the original dma_map_page() size. Use TB_MAX_FRAME_SIZE when unmapping stream buffers so the unmap size matches the DMA mapping size used by the buffer allocation paths. Signed-off-by: Xu Rao <raoxu@uniontech.com> Fixes: 6db21d817b43 ("thunderbolt: Add support for USB4STREAM") Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/thunderbolt/stream.c')
-rw-r--r--drivers/thunderbolt/stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thunderbolt/stream.c b/drivers/thunderbolt/stream.c
index c1f5c55583d0..4cc86d8d6491 100644
--- a/drivers/thunderbolt/stream.c
+++ b/drivers/thunderbolt/stream.c
@@ -257,7 +257,7 @@ static void tbstream_ring_free(struct tbstream_ring *ring)
if (sf->frame.buffer_phy)
dma_unmap_page(dma_dev, sf->frame.buffer_phy,
- tb_ring_frame_size(&sf->frame), dir);
+ TB_MAX_FRAME_SIZE, dir);
sf->frame.buffer_phy = 0;
if (sf->page)
__free_page(sf->page);