Commit b10d6bca authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds

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.

[akpm@linux-foundation.org: fix arch/arm/mm/pmsa-v7.c build]
[rppt@linux.ibm.com: mips: fix cavium-octeon build caused by memblock refactoring]
  Link: http://lkml.kernel.org/r/20200827124549.GD167163@linux.ibm.comSigned-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Baoquan He <bhe@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Daniel Axtens <dja@axtens.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Emil Renner Berthing <kernel@esmil.dk>
Cc: Hari Bathini <hbathini@linux.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: https://lkml.kernel.org/r/20200818151634.14343-13-rppt@kernel.orgSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c9118e6c
...@@ -843,19 +843,25 @@ early_param("mem", early_mem); ...@@ -843,19 +843,25 @@ early_param("mem", early_mem);
static void __init request_standard_resources(const struct machine_desc *mdesc) 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; struct resource *res;
u64 i;
kernel_code.start = virt_to_phys(_text); kernel_code.start = virt_to_phys(_text);
kernel_code.end = virt_to_phys(__init_begin - 1); kernel_code.end = virt_to_phys(__init_begin - 1);
kernel_data.start = virt_to_phys(_sdata); kernel_data.start = virt_to_phys(_sdata);
kernel_data.end = virt_to_phys(_end - 1); kernel_data.end = virt_to_phys(_end - 1);
for_each_memblock(memory, region) { for_each_mem_range(i, &start, &end) {
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;
unsigned long boot_alias_start; 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 * Some systems have a special memory alias which is only
* used for booting. We need to advertise this region to * used for booting. We need to advertise this region to
...@@ -869,7 +875,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) ...@@ -869,7 +875,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc)
__func__, sizeof(*res)); __func__, sizeof(*res));
res->name = "System RAM (boot alias)"; res->name = "System RAM (boot alias)";
res->start = boot_alias_start; res->start = boot_alias_start;
res->end = phys_to_idmap(end); res->end = phys_to_idmap(res_end);
res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
request_resource(&iomem_resource, res); request_resource(&iomem_resource, res);
} }
...@@ -880,7 +886,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) ...@@ -880,7 +886,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc)
sizeof(*res)); sizeof(*res));
res->name = "System RAM"; res->name = "System RAM";
res->start = start; res->start = start;
res->end = end; res->end = res_end;
res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY; res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
request_resource(&iomem_resource, res); request_resource(&iomem_resource, res);
......
...@@ -1154,9 +1154,8 @@ phys_addr_t arm_lowmem_limit __initdata = 0; ...@@ -1154,9 +1154,8 @@ phys_addr_t arm_lowmem_limit __initdata = 0;
void __init adjust_lowmem_bounds(void) void __init adjust_lowmem_bounds(void)
{ {
phys_addr_t memblock_limit = 0; phys_addr_t block_start, block_end, memblock_limit = 0;
u64 vmalloc_limit; u64 vmalloc_limit, i;
struct memblock_region *reg;
phys_addr_t lowmem_limit = 0; phys_addr_t lowmem_limit = 0;
/* /*
...@@ -1172,26 +1171,18 @@ void __init adjust_lowmem_bounds(void) ...@@ -1172,26 +1171,18 @@ void __init adjust_lowmem_bounds(void)
* The first usable region must be PMD aligned. Mark its start * The first usable region must be PMD aligned. Mark its start
* as MEMBLOCK_NOMAP if it isn't * as MEMBLOCK_NOMAP if it isn't
*/ */
for_each_memblock(memory, reg) { for_each_mem_range(i, &block_start, &block_end) {
if (!memblock_is_nomap(reg)) { if (!IS_ALIGNED(block_start, PMD_SIZE)) {
if (!IS_ALIGNED(reg->base, PMD_SIZE)) {
phys_addr_t len; phys_addr_t len;
len = round_up(reg->base, PMD_SIZE) - reg->base; len = round_up(block_start, PMD_SIZE) - block_start;
memblock_mark_nomap(reg->base, len); memblock_mark_nomap(block_start, len);
} }
break; 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) if (block_end > lowmem_limit)
/* /*
* Compare as u64 to ensure vmalloc_limit does * Compare as u64 to ensure vmalloc_limit does
...@@ -1440,19 +1431,15 @@ static void __init kmap_init(void) ...@@ -1440,19 +1431,15 @@ static void __init kmap_init(void)
static void __init map_lowmem(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_start = round_down(__pa(KERNEL_START), SECTION_SIZE);
phys_addr_t kernel_x_end = round_up(__pa(__init_end), 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. */ /* Map all the lowmem memory banks. */
for_each_memblock(memory, reg) { for_each_mem_range(i, &start, &end) {
phys_addr_t start = reg->base;
phys_addr_t end = start + reg->size;
struct map_desc map; struct map_desc map;
if (memblock_is_nomap(reg))
continue;
if (end > arm_lowmem_limit) if (end > arm_lowmem_limit)
end = arm_lowmem_limit; end = arm_lowmem_limit;
if (start >= end) if (start >= end)
......
...@@ -231,12 +231,12 @@ static int __init allocate_region(phys_addr_t base, phys_addr_t size, ...@@ -231,12 +231,12 @@ static int __init allocate_region(phys_addr_t base, phys_addr_t size,
void __init pmsav7_adjust_lowmem_bounds(void) void __init pmsav7_adjust_lowmem_bounds(void)
{ {
phys_addr_t specified_mem_size = 0, total_mem_size = 0; 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_start;
phys_addr_t mem_end; phys_addr_t mem_end;
phys_addr_t reg_start, reg_end;
unsigned int mem_max_regions; unsigned int mem_max_regions;
int num, i; int num;
u64 i;
/* Free-up PMSAv7_PROBE_REGION */ /* Free-up PMSAv7_PROBE_REGION */
mpu_min_region_order = __mpu_min_region_order(); mpu_min_region_order = __mpu_min_region_order();
...@@ -262,20 +262,19 @@ void __init pmsav7_adjust_lowmem_bounds(void) ...@@ -262,20 +262,19 @@ void __init pmsav7_adjust_lowmem_bounds(void)
mem_max_regions -= num; mem_max_regions -= num;
#endif #endif
for_each_memblock(memory, reg) { for_each_mem_range(i, &reg_start, &reg_end) {
if (first) { if (i == 0) {
phys_addr_t phys_offset = PHYS_OFFSET; phys_addr_t phys_offset = PHYS_OFFSET;
/* /*
* Initially only use memory continuous from * Initially only use memory continuous from
* PHYS_OFFSET */ * PHYS_OFFSET */
if (reg->base != phys_offset) if (reg_start != phys_offset)
panic("First memory bank must be contiguous from PHYS_OFFSET"); panic("First memory bank must be contiguous from PHYS_OFFSET");
mem_start = reg->base; mem_start = reg_start;
mem_end = reg->base + reg->size; mem_end = reg_end;
specified_mem_size = reg->size; specified_mem_size = mem_end - mem_start;
first = false;
} else { } else {
/* /*
* memblock auto merges contiguous blocks, remove * memblock auto merges contiguous blocks, remove
...@@ -283,8 +282,8 @@ void __init pmsav7_adjust_lowmem_bounds(void) ...@@ -283,8 +282,8 @@ void __init pmsav7_adjust_lowmem_bounds(void)
* blocks separately while iterating) * blocks separately while iterating)
*/ */
pr_notice("Ignoring RAM after %pa, memory at %pa ignored\n", pr_notice("Ignoring RAM after %pa, memory at %pa ignored\n",
&mem_end, &reg->base); &mem_end, &reg_start);
memblock_remove(reg->base, 0 - reg->base); memblock_remove(reg_start, 0 - reg_start);
break; break;
} }
} }
......
...@@ -94,20 +94,19 @@ static __init bool is_region_fixed(int number) ...@@ -94,20 +94,19 @@ static __init bool is_region_fixed(int number)
void __init pmsav8_adjust_lowmem_bounds(void) void __init pmsav8_adjust_lowmem_bounds(void)
{ {
phys_addr_t mem_end; phys_addr_t mem_end;
struct memblock_region *reg; phys_addr_t reg_start, reg_end;
bool first = true; u64 i;
for_each_memblock(memory, reg) { for_each_mem_range(i, &reg_start, &reg_end) {
if (first) { if (i == 0) {
phys_addr_t phys_offset = PHYS_OFFSET; phys_addr_t phys_offset = PHYS_OFFSET;
/* /*
* Initially only use memory continuous from * Initially only use memory continuous from
* PHYS_OFFSET */ * PHYS_OFFSET */
if (reg->base != phys_offset) if (reg_start != phys_offset)
panic("First memory bank must be contiguous from PHYS_OFFSET"); panic("First memory bank must be contiguous from PHYS_OFFSET");
mem_end = reg->base + reg->size; mem_end = reg_end;
first = false;
} else { } else {
/* /*
* memblock auto merges contiguous blocks, remove * memblock auto merges contiguous blocks, remove
...@@ -115,8 +114,8 @@ void __init pmsav8_adjust_lowmem_bounds(void) ...@@ -115,8 +114,8 @@ void __init pmsav8_adjust_lowmem_bounds(void)
* blocks separately while iterating) * blocks separately while iterating)
*/ */
pr_notice("Ignoring RAM after %pa, memory at %pa ignored\n", pr_notice("Ignoring RAM after %pa, memory at %pa ignored\n",
&mem_end, &reg->base); &mem_end, &reg_start);
memblock_remove(reg->base, 0 - reg->base); memblock_remove(reg_start, 0 - reg_start);
break; break;
} }
} }
......
...@@ -25,11 +25,12 @@ ...@@ -25,11 +25,12 @@
unsigned long xen_get_swiotlb_free_pages(unsigned int order) 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; gfp_t flags = __GFP_NOWARN|__GFP_KSWAPD_RECLAIM;
u64 i;
for_each_memblock(memory, reg) { for_each_mem_range(i, &base, NULL) {
if (reg->base < (phys_addr_t)0xffffffff) { if (base < (phys_addr_t)0xffffffff) {
if (IS_ENABLED(CONFIG_ZONE_DMA32)) if (IS_ENABLED(CONFIG_ZONE_DMA32))
flags |= __GFP_DMA32; flags |= __GFP_DMA32;
else else
......
...@@ -212,8 +212,8 @@ void __init kasan_init(void) ...@@ -212,8 +212,8 @@ void __init kasan_init(void)
{ {
u64 kimg_shadow_start, kimg_shadow_end; u64 kimg_shadow_start, kimg_shadow_end;
u64 mod_shadow_start, mod_shadow_end; u64 mod_shadow_start, mod_shadow_end;
struct memblock_region *reg; phys_addr_t pa_start, pa_end;
int i; u64 i;
kimg_shadow_start = (u64)kasan_mem_to_shadow(_text) & PAGE_MASK; kimg_shadow_start = (u64)kasan_mem_to_shadow(_text) & PAGE_MASK;
kimg_shadow_end = PAGE_ALIGN((u64)kasan_mem_to_shadow(_end)); kimg_shadow_end = PAGE_ALIGN((u64)kasan_mem_to_shadow(_end));
...@@ -246,9 +246,9 @@ void __init kasan_init(void) ...@@ -246,9 +246,9 @@ void __init kasan_init(void)
kasan_populate_early_shadow((void *)mod_shadow_end, kasan_populate_early_shadow((void *)mod_shadow_end,
(void *)kimg_shadow_start); (void *)kimg_shadow_start);
for_each_memblock(memory, reg) { for_each_mem_range(i, &pa_start, &pa_end) {
void *start = (void *)__phys_to_virt(reg->base); void *start = (void *)__phys_to_virt(pa_start);
void *end = (void *)__phys_to_virt(reg->base + reg->size); void *end = (void *)__phys_to_virt(pa_end);
if (start >= end) if (start >= end)
break; break;
......
...@@ -473,8 +473,9 @@ static void __init map_mem(pgd_t *pgdp) ...@@ -473,8 +473,9 @@ static void __init map_mem(pgd_t *pgdp)
{ {
phys_addr_t kernel_start = __pa_symbol(_text); phys_addr_t kernel_start = __pa_symbol(_text);
phys_addr_t kernel_end = __pa_symbol(__init_begin); phys_addr_t kernel_end = __pa_symbol(__init_begin);
struct memblock_region *reg; phys_addr_t start, end;
int flags = 0; int flags = 0;
u64 i;
if (rodata_full || debug_pagealloc_enabled()) if (rodata_full || debug_pagealloc_enabled())
flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS; flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;
...@@ -493,15 +494,9 @@ static void __init map_mem(pgd_t *pgdp) ...@@ -493,15 +494,9 @@ static void __init map_mem(pgd_t *pgdp)
#endif #endif
/* map all the memory banks */ /* map all the memory banks */
for_each_memblock(memory, reg) { for_each_mem_range(i, &start, &end) {
phys_addr_t start = reg->base;
phys_addr_t end = start + reg->size;
if (start >= end) if (start >= end)
break; break;
if (memblock_is_nomap(reg))
continue;
/* /*
* The linear map must allow allocation tags reading/writing * The linear map must allow allocation tags reading/writing
* if MTE is present. Otherwise, it has the same attributes as * if MTE is present. Otherwise, it has the same attributes as
......
...@@ -287,7 +287,8 @@ notrace void __init machine_init(unsigned long dt_ptr) ...@@ -287,7 +287,8 @@ notrace void __init machine_init(unsigned long dt_ptr)
void __init setup_arch(char **cmdline_p) void __init setup_arch(char **cmdline_p)
{ {
struct memblock_region *reg; phys_addr_t start, end;
u64 i;
printk(KERN_INFO "Initializing kernel\n"); printk(KERN_INFO "Initializing kernel\n");
...@@ -351,9 +352,9 @@ void __init setup_arch(char **cmdline_p) ...@@ -351,9 +352,9 @@ void __init setup_arch(char **cmdline_p)
disable_caching(ram_start, ram_end - 1); disable_caching(ram_start, ram_end - 1);
/* Set caching of external RAM used by Linux */ /* Set caching of external RAM used by Linux */
for_each_memblock(memory, reg) for_each_mem_range(i, &start, &end)
enable_caching(CACHE_REGION_START(reg->base), enable_caching(CACHE_REGION_START(start),
CACHE_REGION_START(reg->base + reg->size - 1)); CACHE_REGION_START(end - 1));
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
/* /*
......
...@@ -109,13 +109,14 @@ static void __init paging_init(void) ...@@ -109,13 +109,14 @@ static void __init paging_init(void)
void __init setup_memory(void) void __init setup_memory(void)
{ {
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
struct memblock_region *reg;
u32 kernel_align_start, kernel_align_size; u32 kernel_align_start, kernel_align_size;
phys_addr_t start, end;
u64 i;
/* Find main memory where is the kernel */ /* Find main memory where is the kernel */
for_each_memblock(memory, reg) { for_each_mem_range(i, &start, &end) {
memory_start = (u32)reg->base; memory_start = start;
lowmem_size = reg->size; lowmem_size = end - start;
if ((memory_start <= (u32)_text) && if ((memory_start <= (u32)_text) &&
((u32)_text <= (memory_start + lowmem_size - 1))) { ((u32)_text <= (memory_start + lowmem_size - 1))) {
memory_size = lowmem_size; memory_size = lowmem_size;
......
...@@ -190,25 +190,25 @@ char *octeon_swiotlb; ...@@ -190,25 +190,25 @@ char *octeon_swiotlb;
void __init plat_swiotlb_setup(void) void __init plat_swiotlb_setup(void)
{ {
struct memblock_region *mem; phys_addr_t start, end;
phys_addr_t max_addr; phys_addr_t max_addr;
phys_addr_t addr_size; phys_addr_t addr_size;
size_t swiotlbsize; size_t swiotlbsize;
unsigned long swiotlb_nslabs; unsigned long swiotlb_nslabs;
u64 i;
max_addr = 0; max_addr = 0;
addr_size = 0; addr_size = 0;
for_each_memblock(memory, mem) { for_each_mem_range(i, &start, &end) {
/* These addresses map low for PCI. */ /* These addresses map low for PCI. */
if (mem->base > 0x410000000ull && !OCTEON_IS_OCTEON2()) if (start > 0x410000000ull && !OCTEON_IS_OCTEON2())
continue; continue;
addr_size += mem->size; addr_size += (end - start);
if (max_addr < mem->base + mem->size)
max_addr = mem->base + mem->size;
if (max_addr < end)
max_addr = end;
} }
swiotlbsize = PAGE_SIZE; swiotlbsize = PAGE_SIZE;
......
...@@ -300,8 +300,9 @@ static void __init bootmem_init(void) ...@@ -300,8 +300,9 @@ static void __init bootmem_init(void)
static void __init bootmem_init(void) static void __init bootmem_init(void)
{ {
struct memblock_region *mem;
phys_addr_t ramstart, ramend; phys_addr_t ramstart, ramend;
phys_addr_t start, end;
u64 i;
ramstart = memblock_start_of_DRAM(); ramstart = memblock_start_of_DRAM();
ramend = memblock_end_of_DRAM(); ramend = memblock_end_of_DRAM();
...@@ -338,18 +339,13 @@ static void __init bootmem_init(void) ...@@ -338,18 +339,13 @@ static void __init bootmem_init(void)
min_low_pfn = ARCH_PFN_OFFSET; min_low_pfn = ARCH_PFN_OFFSET;
max_pfn = PFN_DOWN(ramend); max_pfn = PFN_DOWN(ramend);
for_each_memblock(memory, mem) { for_each_mem_range(i, &start, &end) {
unsigned long start = memblock_region_memory_base_pfn(mem);
unsigned long end = memblock_region_memory_end_pfn(mem);
/* /*
* Skip highmem here so we get an accurate max_low_pfn if low * Skip highmem here so we get an accurate max_low_pfn if low
* memory stops short of high memory. * memory stops short of high memory.
* If the region overlaps HIGHMEM_START, end is clipped so * If the region overlaps HIGHMEM_START, end is clipped so
* max_pfn excludes the highmem portion. * max_pfn excludes the highmem portion.
*/ */
if (memblock_is_nomap(mem))
continue;
if (start >= PFN_DOWN(HIGHMEM_START)) if (start >= PFN_DOWN(HIGHMEM_START))
continue; continue;
if (end > PFN_DOWN(HIGHMEM_START)) if (end > PFN_DOWN(HIGHMEM_START))
...@@ -450,13 +446,12 @@ early_param("memmap", early_parse_memmap); ...@@ -450,13 +446,12 @@ early_param("memmap", early_parse_memmap);
unsigned long setup_elfcorehdr, setup_elfcorehdr_size; unsigned long setup_elfcorehdr, setup_elfcorehdr_size;
static int __init early_parse_elfcorehdr(char *p) static int __init early_parse_elfcorehdr(char *p)
{ {
struct memblock_region *mem; phys_addr_t start, end;
u64 i;
setup_elfcorehdr = memparse(p, &p); setup_elfcorehdr = memparse(p, &p);
for_each_memblock(memory, mem) { for_each_mem_range(i, &start, &end) {
unsigned long start = mem->base;
unsigned long end = start + mem->size;
if (setup_elfcorehdr >= start && setup_elfcorehdr < end) { if (setup_elfcorehdr >= start && setup_elfcorehdr < end) {
/* /*
* Reserve from the elf core header to the end of * Reserve from the elf core header to the end of
...@@ -720,7 +715,8 @@ static void __init arch_mem_init(char **cmdline_p) ...@@ -720,7 +715,8 @@ static void __init arch_mem_init(char **cmdline_p)
static void __init resource_init(void) static void __init resource_init(void)
{ {
struct memblock_region *region; phys_addr_t start, end;
u64 i;
if (UNCAC_BASE != IO_BASE) if (UNCAC_BASE != IO_BASE)
return; return;
...@@ -732,9 +728,7 @@ static void __init resource_init(void) ...@@ -732,9 +728,7 @@ static void __init resource_init(void)
bss_resource.start = __pa_symbol(&__bss_start); bss_resource.start = __pa_symbol(&__bss_start);
bss_resource.end = __pa_symbol(&__bss_stop) - 1; bss_resource.end = __pa_symbol(&__bss_stop) - 1;
for_each_memblock(memory, region) { for_each_mem_range(i, &start, &end) {
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;
struct resource *res; struct resource *res;
res = memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES); res = memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES);
...@@ -743,7 +737,12 @@ static void __init resource_init(void) ...@@ -743,7 +737,12 @@ static void __init resource_init(void)
sizeof(struct resource)); sizeof(struct resource));
res->start = start; 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->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
res->name = "System RAM"; res->name = "System RAM";
......
...@@ -64,6 +64,7 @@ extern const char _s_kernel_ro[], _e_kernel_ro[]; ...@@ -64,6 +64,7 @@ extern const char _s_kernel_ro[], _e_kernel_ro[];
*/ */
static void __init map_ram(void) static void __init map_ram(void)
{ {
phys_addr_t start, end;
unsigned long v, p, e; unsigned long v, p, e;
pgprot_t prot; pgprot_t prot;
pgd_t *pge; pgd_t *pge;
...@@ -71,6 +72,7 @@ static void __init map_ram(void) ...@@ -71,6 +72,7 @@ static void __init map_ram(void)
pud_t *pue; pud_t *pue;
pmd_t *pme; pmd_t *pme;
pte_t *pte; pte_t *pte;
u64 i;
/* These mark extents of read-only kernel pages... /* These mark extents of read-only kernel pages...
* ...from vmlinux.lds.S * ...from vmlinux.lds.S
*/ */
...@@ -78,9 +80,9 @@ static void __init map_ram(void) ...@@ -78,9 +80,9 @@ static void __init map_ram(void)
v = PAGE_OFFSET; v = PAGE_OFFSET;
for_each_memblock(memory, region) { for_each_mem_range(i, &start, &end) {
p = (u32) region->base & PAGE_MASK; p = (u32) start & PAGE_MASK;
e = p + (u32) region->size; e = (u32) end;
v = (u32) __va(p); v = (u32) __va(p);
pge = pgd_offset_k(v); pge = pgd_offset_k(v);
......
...@@ -191,13 +191,13 @@ int is_fadump_active(void) ...@@ -191,13 +191,13 @@ int is_fadump_active(void)
*/ */
static bool is_fadump_mem_area_contiguous(u64 d_start, u64 d_end) static bool is_fadump_mem_area_contiguous(u64 d_start, u64 d_end)
{ {
struct memblock_region *reg; phys_addr_t reg_start, reg_end;
bool ret = false; bool ret = false;
u64 start, end; u64 i, start, end;
for_each_memblock(memory, reg) { for_each_mem_range(i, &reg_start, &reg_end) {
start = max_t(u64, d_start, reg->base); start = max_t(u64, d_start, reg_start);
end = min_t(u64, d_end, (reg->base + reg->size)); end = min_t(u64, d_end, reg_end);
if (d_start < end) { if (d_start < end) {
/* Memory hole from d_start to start */ /* Memory hole from d_start to start */
if (start > d_start) if (start > d_start)
...@@ -422,34 +422,34 @@ static int __init add_boot_mem_regions(unsigned long mstart, ...@@ -422,34 +422,34 @@ static int __init add_boot_mem_regions(unsigned long mstart,
static int __init fadump_get_boot_mem_regions(void) static int __init fadump_get_boot_mem_regions(void)
{ {
unsigned long base, size, cur_size, hole_size, last_end; unsigned long size, cur_size, hole_size, last_end;
unsigned long mem_size = fw_dump.boot_memory_size; unsigned long mem_size = fw_dump.boot_memory_size;
struct memblock_region *reg; phys_addr_t reg_start, reg_end;
int ret = 1; int ret = 1;
u64 i;
fw_dump.boot_mem_regs_cnt = 0; fw_dump.boot_mem_regs_cnt = 0;
last_end = 0; last_end = 0;
hole_size = 0; hole_size = 0;
cur_size = 0; cur_size = 0;
for_each_memblock(memory, reg) { for_each_mem_range(i, &reg_start, &reg_end) {
base = reg->base; size = reg_end - reg_start;
size = reg->size; hole_size += (reg_start - last_end);
hole_size += (base - last_end);
if ((cur_size + size) >= mem_size) { if ((cur_size + size) >= mem_size) {
size = (mem_size - cur_size); size = (mem_size - cur_size);
ret = add_boot_mem_regions(base, size); ret = add_boot_mem_regions(reg_start, size);
break; break;
} }
mem_size -= size; mem_size -= size;
cur_size += size; cur_size += size;
ret = add_boot_mem_regions(base, size); ret = add_boot_mem_regions(reg_start, size);
if (!ret) if (!ret)
break; break;
last_end = base + size; last_end = reg_end;
} }
fw_dump.boot_mem_top = PAGE_ALIGN(fw_dump.boot_memory_size + hole_size); fw_dump.boot_mem_top = PAGE_ALIGN(fw_dump.boot_memory_size + hole_size);
...@@ -985,9 +985,8 @@ static int fadump_init_elfcore_header(char *bufp) ...@@ -985,9 +985,8 @@ static int fadump_init_elfcore_header(char *bufp)
*/ */
static int fadump_setup_crash_memory_ranges(void) static int fadump_setup_crash_memory_ranges(void)
{ {
struct memblock_region *reg; u64 i, start, end;
u64 start, end; int ret;
int i, ret;
pr_debug("Setup crash memory ranges.\n"); pr_debug("Setup crash memory ranges.\n");
crash_mrange_info.mem_range_cnt = 0; crash_mrange_info.mem_range_cnt = 0;
...@@ -1005,10 +1004,7 @@ static int fadump_setup_crash_memory_ranges(void) ...@@ -1005,10 +1004,7 @@ static int fadump_setup_crash_memory_ranges(void)
return ret; return ret;
} }
for_each_memblock(memory, reg) { for_each_mem_range(i, &start, &end) {
start = (u64)reg->base;
end = start + (u64)reg->size;
/* /*
* skip the memory chunk that is already added * skip the memory chunk that is already added
* (0 through boot_memory_top). * (0 through boot_memory_top).
...@@ -1242,7 +1238,9 @@ static void fadump_free_reserved_memory(unsigned long start_pfn, ...@@ -1242,7 +1238,9 @@ static void fadump_free_reserved_memory(unsigned long start_pfn,
*/ */
static void fadump_release_reserved_area(u64 start, u64 end) static void fadump_release_reserved_area(u64 start, u64 end)
{ {
u64 tstart, tend, spfn, epfn, reg_spfn, reg_epfn, i; unsigned long reg_spfn, reg_epfn;
u64 tstart, tend, spfn, epfn;
int i;
spfn = PHYS_PFN(start); spfn = PHYS_PFN(start);
epfn = PHYS_PFN(end); epfn = PHYS_PFN(end);
...@@ -1685,12 +1683,10 @@ int __init fadump_reserve_mem(void) ...@@ -1685,12 +1683,10 @@ int __init fadump_reserve_mem(void)
/* Preserve everything above the base address */ /* Preserve everything above the base address */
static void __init fadump_reserve_crash_area(u64 base) static void __init fadump_reserve_crash_area(u64 base)
{ {
struct memblock_region *reg; u64 i, mstart, mend, msize;
u64 mstart, msize;
for_each_memblock(memory, reg) { for_each_mem_range(i, &mstart, &mend) {
mstart = reg->base; msize = mend - mstart;
msize = reg->size;
if ((mstart + msize) < base) if ((mstart + msize) < base)
continue; continue;
......
...@@ -138,15 +138,13 @@ static int get_usable_memory_ranges(struct crash_mem **mem_ranges) ...@@ -138,15 +138,13 @@ static int get_usable_memory_ranges(struct crash_mem **mem_ranges)
*/ */
static int get_crash_memory_ranges(struct crash_mem **mem_ranges) static int get_crash_memory_ranges(struct crash_mem **mem_ranges)
{ {
struct memblock_region *reg; phys_addr_t base, end;
struct crash_mem *tmem; struct crash_mem *tmem;
u64 i;
int ret; int ret;
for_each_memblock(memory, reg) { for_each_mem_range(i, &base, &end) {
u64 base, size; u64 size = end - base;
base = (u64)reg->base;
size = (u64)reg->size;
/* Skip backup memory region, which needs a separate entry */ /* Skip backup memory region, which needs a separate entry */
if (base == BACKUP_SRC_START) { if (base == BACKUP_SRC_START) {
......
...@@ -867,8 +867,8 @@ static void __init htab_initialize(void) ...@@ -867,8 +867,8 @@ static void __init htab_initialize(void)
unsigned long table; unsigned long table;
unsigned long pteg_count; unsigned long pteg_count;
unsigned long prot; unsigned long prot;
unsigned long base = 0, size = 0; phys_addr_t base = 0, size = 0, end;
struct memblock_region *reg; u64 i;
DBG(" -> htab_initialize()\n"); DBG(" -> htab_initialize()\n");
...@@ -960,9 +960,9 @@ static void __init htab_initialize(void) ...@@ -960,9 +960,9 @@ static void __init htab_initialize(void)
#endif /* CONFIG_DEBUG_PAGEALLOC */ #endif /* CONFIG_DEBUG_PAGEALLOC */
/* create bolted the linear mapping in the hash table */ /* create bolted the linear mapping in the hash table */
for_each_memblock(memory, reg) { for_each_mem_range(i, &base, &end) {
base = (unsigned long)__va(reg->base); size = end - base;
size = reg->size; base = (unsigned long)__va(base);
DBG("creating mapping for region: %lx..%lx (prot: %lx)\n", DBG("creating mapping for region: %lx..%lx (prot: %lx)\n",
base, size, prot); base, size, prot);
......
...@@ -329,7 +329,8 @@ static int __meminit create_physical_mapping(unsigned long start, ...@@ -329,7 +329,8 @@ static int __meminit create_physical_mapping(unsigned long start,
static void __init radix_init_pgtable(void) static void __init radix_init_pgtable(void)
{ {
unsigned long rts_field; unsigned long rts_field;
struct memblock_region *reg; phys_addr_t start, end;
u64 i;
/* We don't support slb for radix */ /* We don't support slb for radix */
mmu_slb_size = 0; mmu_slb_size = 0;
...@@ -337,20 +338,19 @@ static void __init radix_init_pgtable(void) ...@@ -337,20 +338,19 @@ static void __init radix_init_pgtable(void)
/* /*
* Create the linear mapping * 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 * The memblock allocator is up at this point, so the
* page tables will be allocated within the range. No * page tables will be allocated within the range. No
* need or a node (which we don't have yet). * 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"); pr_warn("Outside the supported range\n");
continue; continue;
} }
WARN_ON(create_physical_mapping(reg->base, WARN_ON(create_physical_mapping(start, end,
reg->base + reg->size,
radix_mem_block_size, radix_mem_block_size,
-1, PAGE_KERNEL)); -1, PAGE_KERNEL));
} }
......
...@@ -138,11 +138,11 @@ void __init kasan_mmu_init(void) ...@@ -138,11 +138,11 @@ void __init kasan_mmu_init(void)
void __init kasan_init(void) void __init kasan_init(void)
{ {
struct memblock_region *reg; phys_addr_t base, end;
u64 i;
for_each_memblock(memory, reg) { for_each_mem_range(i, &base, &end) {
phys_addr_t base = reg->base; phys_addr_t top = min(end, total_lowmem);
phys_addr_t top = min(base + reg->size, total_lowmem);
int ret; int ret;
if (base >= top) if (base >= top)
......
...@@ -585,20 +585,24 @@ void flush_icache_user_page(struct vm_area_struct *vma, struct page *page, ...@@ -585,20 +585,24 @@ void flush_icache_user_page(struct vm_area_struct *vma, struct page *page,
*/ */
static int __init add_system_ram_resources(void) 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; struct resource *res;
unsigned long base = reg->base;
unsigned long size = reg->size;
res = kzalloc(sizeof(struct resource), GFP_KERNEL); res = kzalloc(sizeof(struct resource), GFP_KERNEL);
WARN_ON(!res); WARN_ON(!res);
if (res) { if (res) {
res->name = "System RAM"; res->name = "System RAM";
res->start = base; res->start = start;
res->end = base + size - 1; /*
* 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->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
WARN_ON(request_resource(&iomem_resource, res) < 0); WARN_ON(request_resource(&iomem_resource, res) < 0);
} }
......
...@@ -123,11 +123,11 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top) ...@@ -123,11 +123,11 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top)
void __init mapin_ram(void) void __init mapin_ram(void)
{ {
struct memblock_region *reg; phys_addr_t base, end;
u64 i;
for_each_memblock(memory, reg) { for_each_mem_range(i, &base, &end) {
phys_addr_t base = reg->base; phys_addr_t top = min(end, total_lowmem);
phys_addr_t top = min(base + reg->size, total_lowmem);
if (base >= top) if (base >= top)
continue; continue;
......
...@@ -145,21 +145,21 @@ static phys_addr_t dtb_early_pa __initdata; ...@@ -145,21 +145,21 @@ static phys_addr_t dtb_early_pa __initdata;
void __init setup_bootmem(void) void __init setup_bootmem(void)
{ {
struct memblock_region *reg;
phys_addr_t mem_size = 0; phys_addr_t mem_size = 0;
phys_addr_t total_mem = 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_end = __pa_symbol(&_end);
phys_addr_t vmlinux_start = __pa_symbol(&_start); phys_addr_t vmlinux_start = __pa_symbol(&_start);
u64 i;
/* Find the memory region containing the kernel */ /* Find the memory region containing the kernel */
for_each_memblock(memory, reg) { for_each_mem_range(i, &start, &end) {
end = reg->base + reg->size; phys_addr_t size = end - start;
if (!total_mem) if (!total_mem)
mem_start = reg->base; mem_start = start;
if (reg->base <= vmlinux_start && vmlinux_end <= end) if (start <= vmlinux_start && vmlinux_end <= end)
BUG_ON(reg->size == 0); BUG_ON(size == 0);
total_mem = total_mem + reg->size; total_mem = total_mem + size;
} }
/* /*
...@@ -455,7 +455,7 @@ static void __init setup_vm_final(void) ...@@ -455,7 +455,7 @@ static void __init setup_vm_final(void)
{ {
uintptr_t va, map_size; uintptr_t va, map_size;
phys_addr_t pa, start, end; phys_addr_t pa, start, end;
struct memblock_region *reg; u64 i;
/* Set mmu_enabled flag */ /* Set mmu_enabled flag */
mmu_enabled = true; mmu_enabled = true;
...@@ -466,14 +466,9 @@ static void __init setup_vm_final(void) ...@@ -466,14 +466,9 @@ static void __init setup_vm_final(void)
PGDIR_SIZE, PAGE_TABLE); PGDIR_SIZE, PAGE_TABLE);
/* Map all memory banks */ /* Map all memory banks */
for_each_memblock(memory, reg) { for_each_mem_range(i, &start, &end) {
start = reg->base;
end = start + reg->size;
if (start >= end) if (start >= end)
break; break;
if (memblock_is_nomap(reg))
continue;
if (start <= __pa(PAGE_OFFSET) && if (start <= __pa(PAGE_OFFSET) &&
__pa(PAGE_OFFSET) < end) __pa(PAGE_OFFSET) < end)
start = __pa(PAGE_OFFSET); start = __pa(PAGE_OFFSET);
......
...@@ -85,16 +85,16 @@ static void __init populate(void *start, void *end) ...@@ -85,16 +85,16 @@ static void __init populate(void *start, void *end)
void __init kasan_init(void) void __init kasan_init(void)
{ {
struct memblock_region *reg; phys_addr_t _start, _end;
unsigned long i; u64 i;
kasan_populate_early_shadow((void *)KASAN_SHADOW_START, kasan_populate_early_shadow((void *)KASAN_SHADOW_START,
(void *)kasan_mem_to_shadow((void *) (void *)kasan_mem_to_shadow((void *)
VMALLOC_END)); VMALLOC_END));
for_each_memblock(memory, reg) { for_each_mem_range(i, &_start, &_end) {
void *start = (void *)__va(reg->base); void *start = (void *)_start;
void *end = (void *)__va(reg->base + reg->size); void *end = (void *)_end;
if (start >= end) if (start >= end)
break; break;
......
...@@ -484,8 +484,9 @@ static struct resource __initdata *standard_resources[] = { ...@@ -484,8 +484,9 @@ static struct resource __initdata *standard_resources[] = {
static void __init setup_resources(void) static void __init setup_resources(void)
{ {
struct resource *res, *std_res, *sub_res; struct resource *res, *std_res, *sub_res;
struct memblock_region *reg; phys_addr_t start, end;
int j; int j;
u64 i;
code_resource.start = (unsigned long) _text; code_resource.start = (unsigned long) _text;
code_resource.end = (unsigned long) _etext - 1; code_resource.end = (unsigned long) _etext - 1;
...@@ -494,7 +495,7 @@ static void __init setup_resources(void) ...@@ -494,7 +495,7 @@ static void __init setup_resources(void)
bss_resource.start = (unsigned long) __bss_start; bss_resource.start = (unsigned long) __bss_start;
bss_resource.end = (unsigned long) __bss_stop - 1; 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); res = memblock_alloc(sizeof(*res), 8);
if (!res) if (!res)
panic("%s: Failed to allocate %zu bytes align=0x%x\n", panic("%s: Failed to allocate %zu bytes align=0x%x\n",
...@@ -502,8 +503,13 @@ static void __init setup_resources(void) ...@@ -502,8 +503,13 @@ static void __init setup_resources(void)
res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM; res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM;
res->name = "System RAM"; res->name = "System RAM";
res->start = reg->base; res->start = start;
res->end = reg->base + reg->size - 1; /*
* 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); request_resource(&iomem_resource, res);
for (j = 0; j < ARRAY_SIZE(standard_resources); j++) { for (j = 0; j < ARRAY_SIZE(standard_resources); j++) {
...@@ -819,14 +825,15 @@ static void __init reserve_kernel(void) ...@@ -819,14 +825,15 @@ static void __init reserve_kernel(void)
static void __init setup_memory(void) static void __init setup_memory(void)
{ {
struct memblock_region *reg; phys_addr_t start, end;
u64 i;
/* /*
* Init storage key for present memory * Init storage key for present memory
*/ */
for_each_memblock(memory, reg) { for_each_mem_range(i, &start, &end)
storage_key_init_range(reg->base, reg->base + reg->size); storage_key_init_range(start, end);
}
psw_set_key(PAGE_DEFAULT_KEY); psw_set_key(PAGE_DEFAULT_KEY);
/* Only cosmetics */ /* Only cosmetics */
......
...@@ -555,10 +555,11 @@ int vmem_add_mapping(unsigned long start, unsigned long size) ...@@ -555,10 +555,11 @@ int vmem_add_mapping(unsigned long start, unsigned long size)
*/ */
void __init vmem_map_init(void) void __init vmem_map_init(void)
{ {
struct memblock_region *reg; phys_addr_t base, end;
u64 i;
for_each_memblock(memory, reg) for_each_mem_range(i, &base, &end)
vmem_add_range(reg->base, reg->size); vmem_add_range(base, end - base);
__set_memory((unsigned long)_stext, __set_memory((unsigned long)_stext,
(unsigned long)(_etext - _stext) >> PAGE_SHIFT, (unsigned long)(_etext - _stext) >> PAGE_SHIFT,
SET_MEMORY_RO | SET_MEMORY_X); SET_MEMORY_RO | SET_MEMORY_X);
......
...@@ -1192,18 +1192,14 @@ int of_node_to_nid(struct device_node *dp) ...@@ -1192,18 +1192,14 @@ int of_node_to_nid(struct device_node *dp)
static void __init add_node_ranges(void) static void __init add_node_ranges(void)
{ {
struct memblock_region *reg; phys_addr_t start, end;
unsigned long prev_max; unsigned long prev_max;
u64 i;
memblock_resized: memblock_resized:
prev_max = memblock.memory.max; prev_max = memblock.memory.max;
for_each_memblock(memory, reg) { for_each_mem_range(i, &start, &end) {
unsigned long size = reg->size;
unsigned long start, end;
start = reg->base;
end = start + size;
while (start < end) { while (start < end) {
unsigned long this_end; unsigned long this_end;
int nid; int nid;
...@@ -1211,7 +1207,7 @@ static void __init add_node_ranges(void) ...@@ -1211,7 +1207,7 @@ static void __init add_node_ranges(void)
this_end = memblock_nid_range(start, end, &nid); this_end = memblock_nid_range(start, end, &nid);
numadbg("Setting memblock NUMA node nid[%d] " numadbg("Setting memblock NUMA node nid[%d] "
"start[%lx] end[%lx]\n", "start[%llx] end[%lx]\n",
nid, start, this_end); nid, start, this_end);
memblock_set_node(start, this_end - start, memblock_set_node(start, this_end - start,
......
...@@ -610,23 +610,23 @@ static unsigned int armada_xp_mbus_win_remap_offset(int win) ...@@ -610,23 +610,23 @@ static unsigned int armada_xp_mbus_win_remap_offset(int win)
static void __init static void __init
mvebu_mbus_find_bridge_hole(uint64_t *start, uint64_t *end) mvebu_mbus_find_bridge_hole(uint64_t *start, uint64_t *end)
{ {
struct memblock_region *r; phys_addr_t reg_start, reg_end;
uint64_t s = 0; uint64_t i, s = 0;
for_each_memblock(memory, r) { for_each_mem_range(i, &reg_start, &reg_end) {
/* /*
* This part of the memory is above 4 GB, so we don't * This part of the memory is above 4 GB, so we don't
* care for the MBus bridge hole. * care for the MBus bridge hole.
*/ */
if (r->base >= 0x100000000ULL) if (reg_start >= 0x100000000ULL)
continue; continue;
/* /*
* The MBus bridge hole is at the end of the RAM under * The MBus bridge hole is at the end of the RAM under
* the 4 GB limit. * the 4 GB limit.
*/ */
if (r->base + r->size > s) if (reg_end > s)
s = r->base + r->size; s = reg_end;
} }
*start = s; *start = s;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment