diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-01-15 07:58:30 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-01-15 07:58:30 +0100 |
commit | 56c313fe1751756ba978824798f61b4abe6ac49c (patch) | |
tree | 9e98f6bee10468f8b58667e41d2f3dc3e842477a /arch/arm/cpu | |
parent | 38188906dce22189462cea0b23e67fd122e22dea (diff) | |
parent | 184050d9972b37557cdff40805ee04582c8e54e6 (diff) | |
download | barebox-56c313fe1751756ba978824798f61b4abe6ac49c.tar.gz barebox-56c313fe1751756ba978824798f61b4abe6ac49c.tar.xz |
Merge branch 'for-next/rpi'
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/mmu-common.c | 33 | ||||
-rw-r--r-- | arch/arm/cpu/mmu.c | 4 | ||||
-rw-r--r-- | arch/arm/cpu/mmu_64.c | 4 |
3 files changed, 39 insertions, 2 deletions
diff --git a/arch/arm/cpu/mmu-common.c b/arch/arm/cpu/mmu-common.c index aeefbb2daa..287622b203 100644 --- a/arch/arm/cpu/mmu-common.c +++ b/arch/arm/cpu/mmu-common.c @@ -11,9 +11,32 @@ #include "mmu.h" +static inline dma_addr_t cpu_to_dma(struct device_d *dev, unsigned long cpu_addr) +{ + dma_addr_t dma_addr = cpu_addr; + + if (dev) + dma_addr -= dev->dma_offset; + + return dma_addr; +} + +static inline unsigned long dma_to_cpu(struct device_d *dev, dma_addr_t addr) +{ + unsigned long cpu_addr = addr; + + if (dev) + cpu_addr += dev->dma_offset; + + return cpu_addr; +} + void dma_sync_single_for_cpu(dma_addr_t address, size_t size, enum dma_data_direction dir) { + /* + * FIXME: This function needs a device argument to support non 1:1 mappings + */ if (dir != DMA_TO_DEVICE) dma_inv_range((void *)address, size); } @@ -25,12 +48,14 @@ dma_addr_t dma_map_single(struct device_d *dev, void *ptr, size_t size, dma_sync_single_for_device(addr, size, dir); - return addr; + return cpu_to_dma(dev, addr); } -void dma_unmap_single(struct device_d *dev, dma_addr_t addr, size_t size, +void dma_unmap_single(struct device_d *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { + unsigned long addr = dma_to_cpu(dev, dma_addr); + dma_sync_single_for_cpu(addr, size, dir); } @@ -53,6 +78,10 @@ void *dma_alloc_map(size_t size, dma_addr_t *dma_handle, unsigned flags) void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle) { + /* + * FIXME: This function needs a device argument to support non 1:1 mappings + */ + return dma_alloc_map(size, dma_handle, MAP_UNCACHED); } diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c index 158b130b57..1f97c28ec6 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu.c @@ -491,6 +491,10 @@ void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle) void dma_sync_single_for_device(dma_addr_t address, size_t size, enum dma_data_direction dir) { + /* + * FIXME: This function needs a device argument to support non 1:1 mappings + */ + if (dir == DMA_FROM_DEVICE) { __dma_inv_range(address, address + size); if (outer_cache.inv_range) diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c index f7a13014af..98cd4c754e 100644 --- a/arch/arm/cpu/mmu_64.c +++ b/arch/arm/cpu/mmu_64.c @@ -245,6 +245,10 @@ void dma_flush_range(void *ptr, size_t size) void dma_sync_single_for_device(dma_addr_t address, size_t size, enum dma_data_direction dir) { + /* + * FIXME: This function needs a device argument to support non 1:1 mappings + */ + if (dir == DMA_FROM_DEVICE) v8_inv_dcache_range(address, address + size - 1); else |