arch-drivers-replace-for_each_membock-with-for_each_mem_range.patch removed from -mm tree
The patch titled
Subject: arch, drivers: replace for_each_membock() with for_each_mem_range()
has been removed from the -mm tree. Its filename was
arch-drivers-replace-for_each_membock-with-for_each_mem_range.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: arch, drivers: replace for_each_membock() with for_each_mem_range()
There are several occurrences of the following pattern:
for_each_memblock(memory, reg) {
start = __pfn_to_phys(memblock_region_memory_base_pfn(reg);
end = __pfn_to_phys(memblock_region_memory_end_pfn(reg));
/* do something with start and end */
}Using for_each_mem_range() iterator is more appropriate in such cases and allows simpler and cleaner code.
---
arch/arm/kernel/setup.c | 18 +++++-- arch/arm/mm/mmu.c | 39 +++++----------- arch/arm/mm/pmsa-v7.c | 23 ++++----- arch/arm/mm/pmsa-v8.c | 17 +++---- arch/arm/xen/mm.c | 7 +- arch/arm64/mm/kasan_init.c | 10 ++-- arch/arm64/mm/mmu.c | 11 +--- arch/c6x/kernel/setup.c | 9 ++- arch/microblaze/mm/init.c | 9 ++- arch/mips/cavium-octeon/dma-octeon.c | 14 ++--- arch/mips/kernel/setup.c | 31 ++++++------- arch/openrisc/mm/init.c | 8 ++- arch/powerpc/kernel/fadump.c | 50 +++++++++------------ arch/powerpc/kexec/file_load_64.c | 10 +--- arch/powerpc/mm/book3s64/hash_utils.c | 16 +++--- arch/powerpc/mm/book3s64/radix_pgtable.c | 10 ++-- arch/powerpc/mm/kasan/kasan_init_32.c | 8 +-- arch/powerpc/mm/mem.c | 16 ++++-- arch/powerpc/mm/pgtable_32.c | 8 +-- arch/riscv/mm/init.c | 25 ++++------ arch/riscv/mm/kasan_init.c | 10 ++-- arch/s390/kernel/setup.c | 23 ++++++--- arch/s390/mm/vmem.c | 7 +- arch/sparc/mm/init_64.c | 12 +---- drivers/bus/mvebu-mbus.c | 12 ++--- 25 files changed, 195 insertions(+), 208 deletions(-)
arch/arm64/mm/kasan_init.c renamed from arch/arm64/mm/kasan_init.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +5 -5
@@ -212,8 +212,8 @@ void __init kasan_init(void) {u64 kimg_shadow_start, kimg_shadow_end;u64 mod_shadow_start, mod_shadow_end; -struct memblock_region *reg; -int i; +phys_addr_t pa_start, pa_end; +u64 i; kimg_shadow_start = (u64 )kasan_mem_to_shadow (_text) &PAGE_MASK ; kimg_shadow_end =PAGE_ALIGN ((u64 )kasan_mem_to_shadow (_end));
@@ -246,9 +246,9 @@ void __init kasan_init(void)kasan_populate_early_shadow ((void *)mod_shadow_end, (void *)kimg_shadow_start); -for_each_memblock (memory, reg) { -void *start = (void *)__phys_to_virt (reg->base); -void *end = (void *)__phys_to_virt (reg->base + reg->size); +for_each_mem_range (i, &pa_start, &pa_end) { +void *start = (void *)__phys_to_virt (pa_start); +void *end = (void *)__phys_to_virt (pa_end);if (start >= end)break ;
arch/arm64/mm/mmu.c renamed from arch/arm64/mm/mmu.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +3 -8
@@ -473,8 +473,9 @@ static void __init map_mem(pgd_t *pgdp) {phys_addr_t kernel_start =__pa_symbol (_text);phys_addr_t kernel_end =__pa_symbol (__init_begin); -struct memblock_region *reg; +phys_addr_t start, end;int flags =0 ; +u64 i;if (rodata_full ||debug_pagealloc_enabled ()) flags =NO_BLOCK_MAPPINGS |NO_CONT_MAPPINGS ;
@@ -493,15 +494,9 @@ static void __init map_mem(pgd_t *pgdp)#endif /* map all the memory banks */ -for_each_memblock (memory, reg) { -phys_addr_t start = reg->base; -phys_addr_t end = start + reg->size; - +for_each_mem_range (i, &start, &end) {if (start >= end)break ; -if (memblock_is_nomap (reg)) -continue ; -/* * The linear map must allow allocation tags reading/writing * if MTE is present. Otherwise, it has the same attributes as
arch/arm/kernel/setup.c renamed from arch/arm/kernel/setup.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +12 -6
@@ -843,20 +843,26 @@ early_param("mem", early_mem);static void __init request_standard_resources (const struct machine_desc *mdesc) { -struct memblock_region *region; +phys_addr_t start, end, res_end;struct resource *res; +u64 i; kernel_code.start =virt_to_phys (_text); kernel_code.end =virt_to_phys (__init_begin -1 ); kernel_data.start =virt_to_phys (_sdata); kernel_data.end =virt_to_phys (_end -1 ); -for_each_memblock (memory, region) { -phys_addr_t start =__pfn_to_phys (memblock_region_memory_base_pfn (region)); -phys_addr_t end =__pfn_to_phys (memblock_region_memory_end_pfn (region)) -1 ; +for_each_mem_range (i, &start, &end) {unsigned long boot_alias_start;/* +* In memblock, end points to the first byte after the +* range while in resourses, end points to the last byte in +* the range. +*/ + res_end = end -1 ; + +/* * Some systems have a special memory alias which is only * used for booting. We need to advertise this region to * kexec-tools so they know where bootable RAM is located.
@@ -869,7 +875,7 @@ static void __init request_standard_reso __func__, sizeof(*res)); res->name ="System RAM (boot alias)" ; res->start = boot_alias_start; - res->end =phys_to_idmap (end); + res->end =phys_to_idmap (res_end); res->flags =IORESOURCE_MEM |IORESOURCE_BUSY ;request_resource (&iomem_resource, res); }
@@ -880,7 +886,7 @@ static void __init request_standard_reso sizeof(*res)); res->name ="System RAM" ; res->start = start; - res->end = end; + res->end = res_end; res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ;request_resource (&iomem_resource, res);
arch/arm/mm/mmu.c renamed from arch/arm/mm/mmu.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +13 -26
@@ -1154,9 +1154,8 @@ phys_addr_t arm_lowmem_limit __initdatavoid __init adjust_lowmem_bounds (void ) { -phys_addr_t memblock_limit =0 ; -u64 vmalloc_limit; -struct memblock_region *reg; +phys_addr_t block_start, block_end, memblock_limit =0 ; +u64 vmalloc_limit, i;phys_addr_t lowmem_limit =0 ;/*
@@ -1172,26 +1171,18 @@ void __init adjust_lowmem_bounds(void)* The first usable region must be PMD aligned. Mark its start * as MEMBLOCK_NOMAP if it isn't */ -for_each_memblock (memory, reg) { -if (!memblock_is_nomap (reg)) { -if (!IS_ALIGNED (reg->base,PMD_SIZE )) { -phys_addr_t len; +for_each_mem_range (i, &block_start, &block_end) { +if (!IS_ALIGNED (block_start,PMD_SIZE )) { +phys_addr_t len; - len =round_up (reg->base,PMD_SIZE ) - reg->base; -memblock_mark_nomap (reg->base, len); - } -break ; + len =round_up (block_start,PMD_SIZE ) - block_start; +memblock_mark_nomap (block_start, len); } +break ; } -for_each_memblock (memory, reg) { -phys_addr_t block_start = reg->base; -phys_addr_t block_end = reg->base + reg->size; - -if (memblock_is_nomap (reg)) -continue ; - -if (reg->base < vmalloc_limit) { +for_each_mem_range (i, &block_start, &block_end) { +if (block_start < vmalloc_limit) {if (block_end > lowmem_limit)/* * Compare as u64 to ensure vmalloc_limit does
@@ -1440,19 +1431,15 @@ static void __init kmap_init(void)static void __init map_lowmem (void ) { -struct memblock_region *reg;phys_addr_t kernel_x_start =round_down (__pa (KERNEL_START ),SECTION_SIZE );phys_addr_t kernel_x_end =round_up (__pa (__init_end),SECTION_SIZE ); +phys_addr_t start, end; +u64 i;/* Map all the lowmem memory banks. */ -for_each_memblock (memory, reg) { -phys_addr_t start = reg->base; -phys_addr_t end = start + reg->size; +for_each_mem_range (i, &start, &end) {struct map_desc map; -if (memblock_is_nomap (reg)) -continue ; -if (end > arm_lowmem_limit) end = arm_lowmem_limit;if (start >= end)
arch/arm/mm/pmsa-v7.c renamed from arch/arm/mm/pmsa-v7.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +11 -12
@@ -231,12 +231,12 @@ static int __init allocate_region(phys_avoid __init pmsav7_adjust_lowmem_bounds (void ) {phys_addr_t specified_mem_size =0 , total_mem_size =0 ; -struct memblock_region *reg; -bool first = true;phys_addr_t mem_start;phys_addr_t mem_end; +phys_addr_t reg_start, reg_end;unsigned int mem_max_regions; -int num, i; +int num; +u64 i;/* Free-up PMSAv7_PROBE_REGION */ mpu_min_region_order =__mpu_min_region_order ();
@@ -262,20 +262,19 @@ void __init pmsav7_adjust_lowmem_bounds( mem_max_regions -= num;#endif -for_each_memblock (memory, reg) { -if (first) { +for_each_mem_range (i, ®_start, ®_end) { +if (i ==0 ) {phys_addr_t phys_offset =PHYS_OFFSET ;/* * Initially only use memory continuous from * PHYS_OFFSET */ -if (reg->base != phys_offset) +if (reg_start != phys_offset)panic ("First memory bank must be contiguous from PHYS_OFFSET" ); - mem_start = reg->base; - mem_end = reg->base + reg->size; - specified_mem_size = reg->size; - first = false; + mem_start = reg_start; + mem_end = reg_end; + specified_mem_size = mem_end - mem_start; }else {/* * memblock auto merges contiguous blocks, remove
@@ -283,8 +282,8 @@ void __init pmsav7_adjust_lowmem_bounds(* blocks separately while iterating) */ pr_notice ("Ignoring RAM after %pa, memory at %pa ignored\n" , - &mem_end, ®->base); -memblock_remove (reg->base,0 - reg->base); + &mem_end, ®_start); +memblock_remove (reg_start,0 - reg_start);break ; } }
arch/arm/mm/pmsa-v8.c renamed from arch/arm/mm/pmsa-v8.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +8 -9
@@ -94,20 +94,19 @@ static __init bool is_region_fixed(int nvoid __init pmsav8_adjust_lowmem_bounds (void ) {phys_addr_t mem_end; -struct memblock_region *reg; -bool first = true; +phys_addr_t reg_start, reg_end; +u64 i; -for_each_memblock (memory, reg) { -if (first) { +for_each_mem_range (i, ®_start, ®_end) { +if (i ==0 ) {phys_addr_t phys_offset =PHYS_OFFSET ;/* * Initially only use memory continuous from * PHYS_OFFSET */ -if (reg->base != phys_offset) +if (reg_start != phys_offset)panic ("First memory bank must be contiguous from PHYS_OFFSET" ); - mem_end = reg->base + reg->size; - first = false; + mem_end = reg_end; }else {/* * memblock auto merges contiguous blocks, remove
@@ -115,8 +114,8 @@ void __init pmsav8_adjust_lowmem_bounds(* blocks separately while iterating) */ pr_notice ("Ignoring RAM after %pa, memory at %pa ignored\n" , - &mem_end, ®->base); -memblock_remove (reg->base,0 - reg->base); + &mem_end, ®_start); +memblock_remove (reg_start,0 - reg_start);break ; } }
arch/arm/xen/mm.c renamed from arch/arm/xen/mm.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +4 -3
@@ -25,11 +25,12 @@unsigned long xen_get_swiotlb_free_pages (unsigned int order) { -struct memblock_region *reg; +phys_addr_t base;gfp_t flags = __GFP_NOWARN|__GFP_KSWAPD_RECLAIM; +u64 i; -for_each_memblock (memory, reg) { -if (reg->base < (phys_addr_t )0xffffffff ) { +for_each_mem_range (i, &base,NULL ) { +if (base < (phys_addr_t )0xffffffff ) {if (IS_ENABLED (CONFIG_ZONE_DMA32 )) flags |= __GFP_DMA32;else
arch/c6x/kernel/setup.c renamed from arch/c6x/kernel/setup.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +5 -4
@@ -287,7 +287,8 @@ notrace void __init machine_init(unsignevoid __init setup_arch (char **cmdline_p) { -struct memblock_region *reg; +phys_addr_t start, end; +u64 i;printk (KERN_INFO "Initializing kernel\n" );
@@ -351,9 +352,9 @@ void __init setup_arch(char **cmdline_p)disable_caching (ram_start, ram_end -1 );/* Set caching of external RAM used by Linux */ -for_each_memblock (memory, reg) -enable_caching (CACHE_REGION_START (reg->base), -CACHE_REGION_START (reg->base + reg->size -1 )); +for_each_mem_range (i, &start, &end) +enable_caching (CACHE_REGION_START (start), +CACHE_REGION_START (end -1 ));#ifdef CONFIG_BLK_DEV_INITRD /*
arch/microblaze/mm/init.c renamed from arch/microblaze/mm/init.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +5 -4
@@ -109,13 +109,14 @@ static void __init paging_init(void)void __init setup_memory (void ) {#ifndef CONFIG_MMU -struct memblock_region *reg;u32 kernel_align_start, kernel_align_size; +phys_addr_t start, end; +u64 i;/* Find main memory where is the kernel */ -for_each_memblock (memory, reg) { - memory_start = (u32 )reg->base; - lowmem_size = reg->size; +for_each_mem_range (i, &start, &end) { + memory_start = start; + lowmem_size = end - start;if ((memory_start <= (u32 )_text) && ((u32 )_text <= (memory_start + lowmem_size -1 ))) { memory_size = lowmem_size;
arch/mips/cavium-octeon/dma-octeon.c renamed from arch/mips/cavium-octeon/dma-octeon.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +7 -7
@@ -190,25 +190,25 @@ char *octeon_swiotlb;void __init plat_swiotlb_setup (void ) { -struct memblock_region *mem; +phys_addr_t start, end;phys_addr_t max_addr;phys_addr_t addr_size;size_t swiotlbsize;unsigned long swiotlb_nslabs; +u64 i; max_addr =0 ; addr_size =0 ; -for_each_memblock (memory, mem) { +for_each_mem_range (i, &start, &end) {/* These addresses map low for PCI. */ -if (mem->base >0x410000000ull && !OCTEON_IS_OCTEON2 ()) +if (start >0x410000000ull && !OCTEON_IS_OCTEON2 ())continue ; - addr_size += mem->size; - -if (max_addr < mem->base + mem->size) - max_addr = mem->base + mem->size; + addr_size += (end - start); +if (max_addr < end) + max_addr = end; } swiotlbsize =PAGE_SIZE ;
arch/mips/kernel/setup.c renamed from arch/mips/kernel/setup.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +15 -16
@@ -300,8 +300,9 @@ static void __init bootmem_init(void)static void __init bootmem_init (void ) { -struct memblock_region *mem;phys_addr_t ramstart, ramend; +phys_addr_t start, end; +u64 i; ramstart =memblock_start_of_DRAM (); ramend =memblock_end_of_DRAM ();
@@ -338,18 +339,13 @@ static void __init bootmem_init(void) min_low_pfn =ARCH_PFN_OFFSET ; max_pfn =PFN_DOWN (ramend); -for_each_memblock (memory, mem) { -unsigned long start =memblock_region_memory_base_pfn (mem); -unsigned long end =memblock_region_memory_end_pfn (mem); - +for_each_mem_range (i, &start, &end) {/* * Skip highmem here so we get an accurate max_low_pfn if low * memory stops short of high memory. * If the region overlaps HIGHMEM_START, end is clipped so * max_pfn excludes the highmem portion. */ -if (memblock_is_nomap (mem)) -continue ;if (start >=PFN_DOWN (HIGHMEM_START ))continue ;if (end >PFN_DOWN (HIGHMEM_START ))
@@ -450,13 +446,12 @@ early_param("memmap", early_parse_memmapunsigned long setup_elfcorehdr, setup_elfcorehdr_size;static int __init early_parse_elfcorehdr (char *p) { -struct memblock_region *mem; +phys_addr_t start, end; +u64 i; setup_elfcorehdr =memparse (p, &p); -for_each_memblock (memory, mem) { -unsigned long start = mem->base; -unsigned long end = start + mem->size; +for_each_mem_range (i, &start, &end) {if (setup_elfcorehdr >= start && setup_elfcorehdr < end) {/* * Reserve from the elf core header to the end of
@@ -720,7 +715,8 @@ static void __init arch_mem_init(char **static void __init resource_init (void ) { -struct memblock_region *region; +phys_addr_t start, end; +u64 i;if (UNCAC_BASE !=IO_BASE )return ;
@@ -732,9 +728,7 @@ static void __init resource_init(void) bss_resource.start =__pa_symbol (&__bss_start); bss_resource.end =__pa_symbol (&__bss_stop) -1 ; -for_each_memblock (memory, region) { -phys_addr_t start =PFN_PHYS (memblock_region_memory_base_pfn (region)); -phys_addr_t end =PFN_PHYS (memblock_region_memory_end_pfn (region)) -1 ; +for_each_mem_range (i, &start, &end) {struct resource *res; res =memblock_alloc (sizeof (struct resource ),SMP_CACHE_BYTES );
@@ -743,7 +737,12 @@ static void __init resource_init(void) sizeof(struct resource)); res->start = start; - res->end = end; +/* +* In memblock, end points to the first byte after the +* range while in resourses, end points to the last byte in +* the range. +*/ + res->end = end -1 ; res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ; res->name ="System RAM" ;
arch/openrisc/mm/init.c renamed from arch/openrisc/mm/init.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +5 -3
@@ -64,6 +64,7 @@ extern const char _s_kernel_ro[], _e_ker*/ static void __init map_ram (void ) { +phys_addr_t start, end;unsigned long v, p, e;pgprot_t prot;pgd_t *pge;
@@ -71,6 +72,7 @@ static void __init map_ram(void)pud_t *pue;pmd_t *pme;pte_t *pte; +u64 i;/* These mark extents of read-only kernel pages... * ...from vmlinux.lds.S */
@@ -78,9 +80,9 @@ static void __init map_ram(void) v =PAGE_OFFSET ; -for_each_memblock (memory, region) { - p = (u32 ) region->base &PAGE_MASK ; - e = p + (u32 ) region->size; +for_each_mem_range (i, &start, &end) { + p = (u32 ) start &PAGE_MASK ; + e = (u32 ) end; v = (u32 )__va (p); pge =pgd_offset_k (v);
arch/powerpc/kernel/fadump.c renamed from arch/powerpc/kernel/fadump.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +23 -27
108 lines not on this page · raw message
arch/powerpc/kexec/file_load_64.c renamed from arch/powerpc/kexec/file_load_64.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +4 -6
@@ -138,15 +138,13 @@ out:*/ static int get_crash_memory_ranges (struct crash_mem **mem_ranges) { -struct memblock_region *reg; +phys_addr_t base, end;struct crash_mem *tmem; +u64 i;int ret; -for_each_memblock (memory, reg) { -u64 base, size; - - base = (u64 )reg->base; - size = (u64 )reg->size; +for_each_mem_range (i, &base, &end) { +u64 size = end - base;/* Skip backup memory region, which needs a separate entry */ if (base ==BACKUP_SRC_START ) {
arch/powerpc/mm/book3s64/hash_utils.c renamed from arch/powerpc/mm/book3s64/hash_utils.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +8 -8
@@ -7,7 +7,7 @@* * SMP scalability work: * Copyright (C) 2001 Anton Blanchard <[email protected]>, IBM -* +* * Module name: htab.c * * Description:
@@ -867,8 +867,8 @@ static void __init htab_initialize(void)unsigned long table;unsigned long pteg_count;unsigned long prot; -unsigned long base =0 , size =0 ; -struct memblock_region *reg; +phys_addr_t base =0 , size =0 , end; +u64 i;DBG (" -> htab_initialize()\n" );
@@ -884,7 +884,7 @@ static void __init htab_initialize(void)/* * Calculate the required size of the htab. We want the number of * PTEGs to equal one half the number of real pages. -*/ +*/ htab_size_bytes =htab_get_table_size (); pteg_count = htab_size_bytes >>7 ;
@@ -894,7 +894,7 @@ static void __init htab_initialize(void) firmware_has_feature(FW_FEATURE_PS3_LV1)) {/* Using a hypervisor which owns the htab */ htab_address =NULL ; - _SDR1 =0 ; + _SDR1 =0 ;#ifdef CONFIG_FA_DUMP /* * If firmware assisted dump is active firmware preserves
@@ -960,9 +960,9 @@ static void __init htab_initialize(void)#endif /* CONFIG_DEBUG_PAGEALLOC */ /* create bolted the linear mapping in the hash table */ -for_each_memblock (memory, reg) { - base = (unsigned long )__va (reg->base); - size = reg->size; +for_each_mem_range (i, &base, &end) { + size = end - base; + base = (unsigned long )__va (base);DBG ("creating mapping for region: %lx..%lx (prot: %lx)\n" , base, size, prot);
arch/powerpc/mm/book3s64/radix_pgtable.c renamed from arch/powerpc/mm/book3s64/radix_pgtable.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +5 -5
@@ -329,7 +329,8 @@ static int __meminit create_physical_mapstatic void __init radix_init_pgtable (void ) {unsigned long rts_field; -struct memblock_region *reg; +phys_addr_t start, end; +u64 i;/* We don't support slb for radix */ mmu_slb_size =0 ;
@@ -337,20 +338,19 @@ static void __init radix_init_pgtable(vo/* * Create the linear mapping */ -for_each_memblock (memory, reg) { +for_each_mem_range (i, &start, &end) {/* * The memblock allocator is up at this point, so the * page tables will be allocated within the range. No * need or a node (which we don't have yet). */ -if ((reg->base + reg->size) >=RADIX_VMALLOC_START ) { +if (end >=RADIX_VMALLOC_START ) {pr_warn ("Outside the supported range\n" );continue ; } -WARN_ON (create_physical_mapping (reg->base, - reg->base + reg->size, +WARN_ON (create_physical_mapping (start, end, radix_mem_block_size,-1 ,PAGE_KERNEL )); }
arch/powerpc/mm/kasan/kasan_init_32.c renamed from arch/powerpc/mm/kasan/kasan_init_32.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +4 -4
@@ -138,11 +138,11 @@ void __init kasan_mmu_init(void)void __init kasan_init (void ) { -struct memblock_region *reg; +phys_addr_t base, end; +u64 i; -for_each_memblock (memory, reg) { -phys_addr_t base = reg->base; -phys_addr_t top =min (base + reg->size, total_lowmem); +for_each_mem_range (i, &base, &end) { +phys_addr_t top =min (end, total_lowmem);int ret;if (base >= top)
arch/powerpc/mm/mem.c renamed from arch/powerpc/mm/mem.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +10 -6
@@ -585,20 +585,24 @@ void flush_icache_user_page(struct vm_ar*/ static int __init add_system_ram_resources (void ) { -struct memblock_region *reg; +phys_addr_t start, end; +u64 i; -for_each_memblock (memory, reg) { +for_each_mem_range (i, &start, &end) {struct resource *res; -unsigned long base = reg->base; -unsigned long size = reg->size; res =kzalloc (sizeof (struct resource ),GFP_KERNEL );WARN_ON (!res);if (res) { res->name ="System RAM" ; - res->start = base; - res->end = base + size -1 ; + res->start = start; +/* +* In memblock, end points to the first byte after +* the range while in resourses, end points to the +* last byte in the range. +*/ + res->end = end -1 ; res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ;WARN_ON (request_resource (&iomem_resource, res) <0 ); }
arch/powerpc/mm/pgtable_32.c renamed from arch/powerpc/mm/pgtable_32.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +4 -4
@@ -123,11 +123,11 @@ static void __init __mapin_ram_chunk(unsvoid __init mapin_ram (void ) { -struct memblock_region *reg; +phys_addr_t base, end; +u64 i; -for_each_memblock (memory, reg) { -phys_addr_t base = reg->base; -phys_addr_t top =min (base + reg->size, total_lowmem); +for_each_mem_range (i, &base, &end) { +phys_addr_t top =min (end, total_lowmem);if (base >= top)continue ;
arch/riscv/mm/init.c renamed from arch/riscv/mm/init.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +10 -15
@@ -145,21 +145,21 @@ static phys_addr_t dtb_early_pa __initdavoid __init setup_bootmem (void ) { -struct memblock_region *reg;phys_addr_t mem_size =0 ;phys_addr_t total_mem =0 ; -phys_addr_t mem_start, end =0 ; +phys_addr_t mem_start, start, end =0 ;phys_addr_t vmlinux_end =__pa_symbol (&_end);phys_addr_t vmlinux_start =__pa_symbol (&_start); +u64 i;/* Find the memory region containing the kernel */ -for_each_memblock (memory, reg) { - end = reg->base + reg->size; +for_each_mem_range (i, &start, &end) { +phys_addr_t size = end - start;if (!total_mem) - mem_start = reg->base; -if (reg->base <= vmlinux_start && vmlinux_end <= end) -BUG_ON (reg->size ==0 ); - total_mem = total_mem + reg->size; + mem_start = start; +if (start <= vmlinux_start && vmlinux_end <= end) +BUG_ON (size ==0 ); + total_mem = total_mem + size; }/*
@@ -455,7 +455,7 @@ static void __init setup_vm_final(void) {uintptr_t va, map_size;phys_addr_t pa, start, end; -struct memblock_region *reg; +u64 i;/* Set mmu_enabled flag */ mmu_enabled = true;
@@ -466,14 +466,9 @@ static void __init setup_vm_final(void) PGDIR_SIZE, PAGE_TABLE);/* Map all memory banks */ -for_each_memblock (memory, reg) { - start = reg->base; - end = start + reg->size; - +for_each_mem_range (i, &start, &end) {if (start >= end)break ; -if (memblock_is_nomap (reg)) -continue ;if (start <=__pa (PAGE_OFFSET ) &&__pa (PAGE_OFFSET ) < end) start =__pa (PAGE_OFFSET );
arch/riscv/mm/kasan_init.c renamed from arch/riscv/mm/kasan_init.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +5 -5
@@ -85,16 +85,16 @@ static void __init populate(void *start,void __init kasan_init (void ) { -struct memblock_region *reg; -unsigned long i; +phys_addr_t _start, _end; +u64 i;kasan_populate_early_shadow ((void *)KASAN_SHADOW_START , (void *)kasan_mem_to_shadow ((void *)VMALLOC_END )); -for_each_memblock (memory, reg) { -void *start = (void *)__va (reg->base); -void *end = (void *)__va (reg->base + reg->size); +for_each_mem_range (i, &_start, &_end) { +void *start = (void *)_start; +void *end = (void *)_end;if (start >= end)break ;
arch/s390/kernel/setup.c renamed from arch/s390/kernel/setup.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +15 -8
@@ -484,8 +484,9 @@ static struct resource __initdata *standstatic void __init setup_resources (void ) {struct resource *res, *std_res, *sub_res; -struct memblock_region *reg; +phys_addr_t start, end;int j; +u64 i; code_resource.start = (unsigned long ) _text; code_resource.end = (unsigned long ) _etext -1 ;
@@ -494,7 +495,7 @@ static void __init setup_resources(void) bss_resource.start = (unsigned long ) __bss_start; bss_resource.end = (unsigned long ) __bss_stop -1 ; -for_each_memblock (memory, reg) { +for_each_mem_range (i, &start, &end) { res =memblock_alloc (sizeof (*res),8 );if (!res) panic("%s: Failed to allocate %zu bytes align=0x%x\n",
@@ -502,8 +503,13 @@ static void __init setup_resources(void) res->flags =IORESOURCE_BUSY |IORESOURCE_SYSTEM_RAM ; res->name ="System RAM" ; - res->start = reg->base; - res->end = reg->base + reg->size -1 ; + res->start = start; +/* +* In memblock, end points to the first byte after the +* range while in resourses, end points to the last byte in +* the range. +*/ + res->end = end -1 ;request_resource (&iomem_resource, res);for (j =0 ; j <ARRAY_SIZE (standard_resources); j++) {
@@ -819,14 +825,15 @@ static void __init reserve_kernel(void)static void __init setup_memory (void ) { -struct memblock_region *reg; +phys_addr_t start, end; +u64 i;/* * Init storage key for present memory */ -for_each_memblock (memory, reg) { -storage_key_init_range (reg->base, reg->base + reg->size); - } +for_each_mem_range (i, &start, &end) +storage_key_init_range (start, end); +psw_set_key (PAGE_DEFAULT_KEY );/* Only cosmetics */
arch/s390/mm/vmem.c renamed from arch/s390/mm/vmem.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +4 -3
@@ -555,10 +555,11 @@ int vmem_add_mapping(unsigned long start*/ void __init vmem_map_init (void ) { -struct memblock_region *reg; +phys_addr_t base, end; +u64 i; -for_each_memblock (memory, reg) -vmem_add_range (reg->base, reg->size); +for_each_mem_range (i, &base, &end) +vmem_add_range (base, end - base);__set_memory ((unsigned long )_stext, (unsigned long )(_etext - _stext) >>PAGE_SHIFT ,SET_MEMORY_RO |SET_MEMORY_X );
arch/sparc/mm/init_64.c renamed from arch/sparc/mm/init_64.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +4 -8
@@ -1192,18 +1192,14 @@ int of_node_to_nid(struct device_node *dstatic void __init add_node_ranges (void ) { -struct memblock_region *reg; +phys_addr_t start, end;unsigned long prev_max; +u64 i; memblock_resized: prev_max = memblock.memory.max; -for_each_memblock (memory, reg) { -unsigned long size = reg->size; -unsigned long start, end; - - start = reg->base; - end = start + size; +for_each_mem_range (i, &start, &end) {while (start < end) {unsigned long this_end;int nid;
@@ -1211,7 +1207,7 @@ memblock_resized: this_end =memblock_nid_range (start, end, &nid);numadbg ("Setting memblock NUMA node nid[%d] " -"start[%lx] end[%lx]\n" , +"start[%llx] end[%lx]\n" , nid, start, this_end); memblock_set_node(start, this_end - start,
drivers/bus/mvebu-mbus.c renamed from drivers/bus/mvebu-mbus.c~arch-drivers-replace-for_each_membock-with-for_each_mem_range +6 -6
@@ -610,23 +610,23 @@ static unsigned int armada_xp_mbus_win_rstatic void __init mvebu_mbus_find_bridge_hole (uint64_t *start,uint64_t *end) { -struct memblock_region *r; -uint64_t s =0 ; +phys_addr_t reg_start, reg_end; +uint64_t i, s =0 ; -for_each_memblock (memory, r) { +for_each_mem_range (i, ®_start, ®_end) {/* * This part of the memory is above 4 GB, so we don't * care for the MBus bridge hole. */ -if (r->base >=0x100000000ULL ) +if (reg_start >=0x100000000ULL )continue ;/* * The MBus bridge hole is at the end of the RAM under * the 4 GB limit. */ -if (r->base + r->size > s) - s = r->base + r->size; +if (reg_end > s) + s = reg_end; } *start = s;
_
Patches currently in -mm which might be from [email protected] are
mm-remove-unused-early_pfn_valid.patch