Skip to content

Commit 3ffcd57

Browse files
committed
Merge tag 'dma-mapping-7.0-2026-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux
Pull dma-mapping fix from Marek Szyprowski: "A fix for DMA-mapping subsystem, which hides annoying, false-positive warnings from DMA-API debug on coherent platforms like x86_64 (Mikhail Gavrilov)" * tag 'dma-mapping-7.0-2026-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux: dma-debug: suppress cacheline overlap warning when arch has no DMA alignment requirement
2 parents a55f7f5 + 3d48c9f commit 3ffcd57

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

kernel/dma/debug.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,7 @@ static void add_dma_entry(struct dma_debug_entry *entry, unsigned long attrs)
615615
} else if (rc == -EEXIST &&
616616
!(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
617617
!(entry->is_cache_clean && overlap_cache_clean) &&
618+
dma_get_cache_alignment() >= L1_CACHE_BYTES &&
618619
!(IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) &&
619620
is_swiotlb_active(entry->dev))) {
620621
err_printk(entry->dev, entry,

0 commit comments

Comments
 (0)