diff options
| author | Marek Vasut <[email protected]> | 2026-03-16 00:57:23 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-04-07 15:27:22 -0600 |
| commit | a383c9689282269bb9687ec6c115de094c27fa67 (patch) | |
| tree | 26f961e89b7a5583b91a9c14a60c4b9551663b0b /include/phys2bus.h | |
| parent | 6201fd7c1ffa134f8ba229b434e6f14a3fd5bb14 (diff) | |
dm: Respect dma-ranges size
Rework dev_phys_to_bus() and dev_bus_to_phys() to respect the size
of the area specified in dma-ranges DT property. The area outside
of ranges is remapped 1:1, while the area in the ranges is remapped
according to the description in the dma-ranges property.
Adjust the test to test the area within the remapped range, not area
outside the remapped range, which was incorrect.
Signed-off-by: Marek Vasut <[email protected]>
Reviewed-by: Markus Schneider-Pargmann <[email protected]>
Diffstat (limited to 'include/phys2bus.h')
| -rw-r--r-- | include/phys2bus.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/phys2bus.h b/include/phys2bus.h index 866b8b51a8c..80fa88adae1 100644 --- a/include/phys2bus.h +++ b/include/phys2bus.h @@ -21,17 +21,23 @@ static inline unsigned long bus_to_phys(unsigned long bus) } #endif -#if CONFIG_IS_ENABLED(DM) +#if CONFIG_IS_ENABLED(DM_DMA) #include <dm/device.h> static inline dma_addr_t dev_phys_to_bus(struct udevice *dev, phys_addr_t phys) { - return phys - dev_get_dma_offset(dev); + /* If the PA is in the remap range, apply remap. */ + if (phys >= dev->dma_cpu && phys < dev->dma_cpu + dev->dma_size) + phys -= dev->dma_cpu - dev->dma_bus; + return phys; } static inline phys_addr_t dev_bus_to_phys(struct udevice *dev, dma_addr_t bus) { - return bus + dev_get_dma_offset(dev); + /* If the DA is in the remap range, apply remap. */ + if (bus >= dev->dma_bus && bus < dev->dma_bus + dev->dma_size) + bus += dev->dma_cpu - dev->dma_bus; + return bus; } #else #define dev_phys_to_bus(_, _addr) _addr |