Commit 3ffcd578 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-7.0-2026-04-09' of... 

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
parents a55f7f5f 3d48c9fd

kernel/dma/debug.c

+1 −0
Original line number Diff line number Diff line
@@ -615,6 +615,7 @@ static void add_dma_entry(struct dma_debug_entry *entry, unsigned long attrs) 
	} else if (rc == -EEXIST &&

		   !(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&

		   !(entry->is_cache_clean && overlap_cache_clean) &&

		   dma_get_cache_alignment() >= L1_CACHE_BYTES &&

		   !(IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) &&

		     is_swiotlb_active(entry->dev))) {

		err_printk(entry->dev, entry,