[PATCH v2 02/11] arm: use generic dma_zone_size
From: Nicolas Saenz Julienne <hidden>
Date: 2019-08-20 14:59:42
Also in:
linux-arm-kernel, linux-devicetree, linux-iommu, linux-riscv, lkml
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
'dma_zone_size' was created as a generic replacement to 'arm_dma_zone_size'. Use it accordingly. Signed-off-by: Nicolas Saenz Julienne <redacted> --- Changes in v2: None arch/arm/include/asm/dma.h | 8 +++++--- arch/arm/mm/init.c | 12 ++++-------- 2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index a81dda65c576..52d19ffd92b4 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h@@ -2,16 +2,18 @@ #ifndef __ASM_ARM_DMA_H #define __ASM_ARM_DMA_H +#include <asm-generic/dma.h> + /* * This is the maximum virtual address which can be DMA'd from. */ +#undef MAX_DMA_ADDRESS #ifndef CONFIG_ZONE_DMA #define MAX_DMA_ADDRESS 0xffffffffUL #else #define MAX_DMA_ADDRESS ({ \ - extern phys_addr_t arm_dma_zone_size; \ - arm_dma_zone_size && arm_dma_zone_size < (0x10000000 - PAGE_OFFSET) ? \ - (PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; }) + dma_zone_size && dma_zone_size < (0x10000000 - PAGE_OFFSET) ? \ + (PAGE_OFFSET + dma_zone_size) : 0xffffffffUL; }) #endif #ifdef CONFIG_ISA_DMA_API
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 16d373d587c4..95680bad245a 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c@@ -79,10 +79,6 @@ static void __init find_limits(unsigned long *min, unsigned long *max_low, } #ifdef CONFIG_ZONE_DMA - -phys_addr_t arm_dma_zone_size __read_mostly; -EXPORT_SYMBOL(arm_dma_zone_size); - /* * The DMA mask corresponding to the maximum bus address allocatable * using GFP_DMA. The default here places no restriction on DMA
@@ -109,8 +105,8 @@ void __init setup_dma_zone(const struct machine_desc *mdesc) { #ifdef CONFIG_ZONE_DMA if (mdesc->dma_zone_size) { - arm_dma_zone_size = mdesc->dma_zone_size; - arm_dma_limit = PHYS_OFFSET + arm_dma_zone_size - 1; + dma_zone_size = mdesc->dma_zone_size; + arm_dma_limit = PHYS_OFFSET + dma_zone_size - 1; } else arm_dma_limit = 0xffffffff; arm_dma_pfn_limit = arm_dma_limit >> PAGE_SHIFT;
@@ -164,9 +160,9 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low, * Adjust the sizes according to any special requirements for * this machine type. */ - if (arm_dma_zone_size) + if (dma_zone_size) arm_adjust_dma_zone(zone_size, zhole_size, - arm_dma_zone_size >> PAGE_SHIFT); + dma_zone_size >> PAGE_SHIFT); #endif free_area_init_node(0, zone_size, min, zhole_size);
--
2.22.0