Commit fa5a1983 authored by Atish Patra's avatar Atish Patra Committed by Palmer Dabbelt

riscv: Parse all memory blocks to remove unusable memory

Currently, maximum physical memory allowed is equal to -PAGE_OFFSET.
That's why we remove any memory blocks spanning beyond that size. However,
it is done only for memblock containing linux kernel which will not work
if there are multiple memblocks.

Process all memory blocks to figure out how much memory needs to be removed
and remove at the end instead of updating the memblock list in place.
Signed-off-by: default avatarAtish Patra <atish.patra@wdc.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 4400231c
...@@ -147,26 +147,29 @@ void __init setup_bootmem(void) ...@@ -147,26 +147,29 @@ void __init setup_bootmem(void)
{ {
struct memblock_region *reg; 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 mem_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);
/* Find the memory region containing the kernel */ /* Find the memory region containing the kernel */
for_each_memblock(memory, reg) { for_each_memblock(memory, reg) {
phys_addr_t end = reg->base + reg->size; end = reg->base + reg->size;
if (!total_mem)
if (reg->base <= vmlinux_start && vmlinux_end <= end) { mem_start = reg->base;
mem_size = min(reg->size, (phys_addr_t)-PAGE_OFFSET); if (reg->base <= vmlinux_start && vmlinux_end <= end)
BUG_ON(reg->size == 0);
total_mem = total_mem + reg->size;
}
/* /*
* Remove memblock from the end of usable area to the * Remove memblock from the end of usable area to the
* end of region * end of region
*/ */
if (reg->base + mem_size < end) mem_size = min(total_mem, (phys_addr_t)-PAGE_OFFSET);
memblock_remove(reg->base + mem_size, if (mem_start + mem_size < end)
end - reg->base - mem_size); memblock_remove(mem_start + mem_size,
} end - mem_start - mem_size);
}
BUG_ON(mem_size == 0);
/* Reserve from the start of the kernel to the end of the kernel */ /* Reserve from the start of the kernel to the end of the kernel */
memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start); memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start);
......
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