diff options
| author | Kefeng Wang <wangkefeng.wang@huawei.com> | 2021-02-09 09:01:51 +0800 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-02-26 21:25:17 -0800 |
| commit | dd2d082b57602156e0c587ddb5ba04d0d624a6df (patch) | |
| tree | e276ced71c12b99704ef2040edaf82f19ffefef4 /arch/riscv/mm | |
| parent | b122c7a32593190c8a82f5470e2788bed451f98f (diff) | |
| download | linux-dd2d082b57602156e0c587ddb5ba04d0d624a6df.tar.bz2 | |
riscv: Cleanup setup_bootmem()
After the following patches,
commit de043da0b9e7 ("RISC-V: Fix usage of memblock_enforce_memory_limit")
commit 1bd14a66ee52 ("RISC-V: Remove any memblock representing unusable memory area")
commit b10d6bca8720 ("arch, drivers: replace for_each_membock() with for_each_mem_range()")
some logic is useless, kill the mem_start/start/end and unneeded code.
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Diffstat (limited to 'arch/riscv/mm')
| -rw-r--r-- | arch/riscv/mm/init.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 9dfb8b2dffd6..067583ab1bd7 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -108,34 +108,17 @@ void __init mem_init(void) void __init setup_bootmem(void) { - phys_addr_t mem_start = 0; - phys_addr_t start, dram_end, end = 0; phys_addr_t vmlinux_end = __pa_symbol(&_end); phys_addr_t vmlinux_start = __pa_symbol(&_start); + phys_addr_t dram_end = memblock_end_of_DRAM(); phys_addr_t max_mapped_addr = __pa(~(ulong)0); - u64 i; - - /* Find the memory region containing the kernel */ - for_each_mem_range(i, &start, &end) { - phys_addr_t size = end - start; - if (!mem_start) - mem_start = start; - if (start <= vmlinux_start && vmlinux_end <= end) - BUG_ON(size == 0); - } - /* - * The maximal physical memory size is -PAGE_OFFSET. - * Make sure that any memory beyond mem_start + (-PAGE_OFFSET) is removed - * as it is unusable by kernel. - */ + /* The maximal physical memory size is -PAGE_OFFSET. */ memblock_enforce_memory_limit(-PAGE_OFFSET); /* Reserve from the start of the kernel to the end of the kernel */ memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start); - dram_end = memblock_end_of_DRAM(); - /* * memblock allocator is not aware of the fact that last 4K bytes of * the addressable memory can not be mapped because of IS_ERR_VALUE |