dma-mapping: Use any dma_range_map for phys to DMA

pelwell · popcornmix · commit 4ca5346dfdbb · 2025-12-01T11:29:41.000Z
Device Tree properties ranges and dma-ranges describe address mappings
required when moving between buses. Ensure this translation happens when
mapping MMIO addresses for DMA accesses.

This commit replaces another downstream commit that no longer applies as
of 6.18:

  dma-direct: take dma-ranges/offsets into account in resource mapping

Signed-off-by: Phil Elwell &lt;phil@raspberrypi.com&gt;
diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h
@@ -94,7 +94,7 @@ static inline dma_addr_t dma_direct_map_phys(struct device *dev,
 	}
 
 	if (attrs & DMA_ATTR_MMIO) {
-		dma_addr = phys;
+		dma_addr = phys_to_dma(dev, phys);
 		if (unlikely(!dma_capable(dev, dma_addr, size, false)))
 			goto err_overflow;
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static inline dma_addr_t dma_direct_map_phys(struct device *dev,`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`if (attrs & DMA_ATTR_MMIO) {`
`97`		`- dma_addr = phys;`
	`97`	`+ dma_addr = phys_to_dma(dev, phys);`
`98`	`98`	`if (unlikely(!dma_capable(dev, dma_addr, size, false)))`
`99`	`99`	`goto err_overflow;`
`100`	`100`	`} else {`