diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/device.h | 17 | ||||
| -rw-r--r-- | include/phys2bus.h | 12 |
2 files changed, 15 insertions, 14 deletions
diff --git a/include/dm/device.h b/include/dm/device.h index 678cd83c271..7bcf6df2892 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -166,8 +166,9 @@ enum { * When CONFIG_DEVRES is enabled, devm_kmalloc() and friends will * add to this list. Memory so-allocated will be freed * automatically when the device is removed / unbound - * @dma_offset: Offset between the physical address space (CPU's) and the - * device's bus address space + * @dma_cpu: DMA physical address space (CPU's) + * @dma_bus: DMA device's bus address space + * @dma_size: DMA window size * @iommu: IOMMU device associated with this device */ struct udevice { @@ -196,7 +197,9 @@ struct udevice { struct list_head devres_head; #endif #if CONFIG_IS_ENABLED(DM_DMA) - ulong dma_offset; + phys_addr_t dma_cpu; + dma_addr_t dma_bus; + u64 dma_size; #endif #if CONFIG_IS_ENABLED(IOMMU) struct udevice *iommu; @@ -272,14 +275,6 @@ static inline __attribute_const__ ofnode dev_ofnode(const struct udevice *dev) /* Returns non-zero if the device is active (probed and not removed) */ #define device_active(dev) (dev_get_flags(dev) & DM_FLAG_ACTIVATED) -#if CONFIG_IS_ENABLED(DM_DMA) -#define dev_set_dma_offset(_dev, _offset) _dev->dma_offset = _offset -#define dev_get_dma_offset(_dev) _dev->dma_offset -#else -#define dev_set_dma_offset(_dev, _offset) -#define dev_get_dma_offset(_dev) 0 -#endif - static inline __attribute_const__ int dev_of_offset(const struct udevice *dev) { #if CONFIG_IS_ENABLED(OF_REAL) 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 |