From f6cfdf9288238ce61b9103cbeb9c63275b39b69f Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 17 Jan 2019 16:38:24 -0800 Subject: ARM: mmu: Share code for dma_sync_single_for_cpu() Both ARM and ARM64 have identical code for dma_sync_single_for_cpu(). Move it to mmu-common.c so it can be shared. Reviewed-by: Sam Ravnborg Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- arch/arm/cpu/mmu-common.c | 8 ++++++++ arch/arm/cpu/mmu.c | 7 ------- arch/arm/cpu/mmu_64.c | 7 ------- 3 files changed, 8 insertions(+), 14 deletions(-) (limited to 'arch') diff --git a/arch/arm/cpu/mmu-common.c b/arch/arm/cpu/mmu-common.c index 8c7d614470..a7d3b5b112 100644 --- a/arch/arm/cpu/mmu-common.c +++ b/arch/arm/cpu/mmu-common.c @@ -8,6 +8,14 @@ #include "mmu.h" + +void dma_sync_single_for_cpu(dma_addr_t address, size_t size, + enum dma_data_direction dir) +{ + if (dir != DMA_TO_DEVICE) + dma_inv_range((void *)address, size); +} + dma_addr_t dma_map_single(struct device_d *dev, void *ptr, size_t size, enum dma_data_direction dir) { diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c index 35ac00a8ff..97c459ff0c 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu.c @@ -506,13 +506,6 @@ void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle) return dma_alloc_map(size, dma_handle, ARCH_MAP_WRITECOMBINE); } -void dma_sync_single_for_cpu(dma_addr_t address, size_t size, - enum dma_data_direction dir) -{ - if (dir != DMA_TO_DEVICE) - dma_inv_range((void *)address, size); -} - void dma_sync_single_for_device(dma_addr_t address, size_t size, enum dma_data_direction dir) { diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c index ed4aa00a85..2cb62370e9 100644 --- a/arch/arm/cpu/mmu_64.c +++ b/arch/arm/cpu/mmu_64.c @@ -256,13 +256,6 @@ void dma_inv_range(void *ptr, size_t size) v8_inv_dcache_range(start, end); } -void dma_sync_single_for_cpu(dma_addr_t address, size_t size, - enum dma_data_direction dir) -{ - if (dir != DMA_TO_DEVICE) - v8_inv_dcache_range(address, address + size - 1); -} - void dma_sync_single_for_device(dma_addr_t address, size_t size, enum dma_data_direction dir) { -- cgit v1.2.3