* [PATCH] riscv: Cleanup setup_bootmem()
@ 2021-02-07 12:38 Kefeng Wang
2021-02-08 22:03 ` Atish Patra
0 siblings, 1 reply; 3+ messages in thread
From: Kefeng Wang @ 2021-02-07 12:38 UTC (permalink / raw)
To: palmer, linux-riscv
Cc: atish.patra, Kefeng Wang, Palmer Dabbelt, Paul Walmsley
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 logical is useless, kill the mem_start/start/end and unneed code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/riscv/mm/init.c | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 0b86a1a12da2..241f22348403 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
--
2.26.2
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] riscv: Cleanup setup_bootmem()
2021-02-07 12:38 [PATCH] riscv: Cleanup setup_bootmem() Kefeng Wang
@ 2021-02-08 22:03 ` Atish Patra
2021-02-09 0:55 ` Kefeng Wang
0 siblings, 1 reply; 3+ messages in thread
From: Atish Patra @ 2021-02-08 22:03 UTC (permalink / raw)
To: Kefeng Wang
Cc: Atish Patra, linux-riscv, Palmer Dabbelt, Palmer Dabbelt, Paul Walmsley
On Sun, Feb 7, 2021 at 4:35 AM Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
>
> 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 logical is useless, kill the mem_start/start/end and unneed code.
>
/s/logical/logic
/s/unneed/uneeded
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> arch/riscv/mm/init.c | 21 ++-------------------
> 1 file changed, 2 insertions(+), 19 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index 0b86a1a12da2..241f22348403 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
> --
> 2.26.2
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
Thanks for the fix. Other than the nits,
Reviewed-by: Atish Patra <atish.patra@wdc.com>
--
Regards,
Atish
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] riscv: Cleanup setup_bootmem()
2021-02-08 22:03 ` Atish Patra
@ 2021-02-09 0:55 ` Kefeng Wang
0 siblings, 0 replies; 3+ messages in thread
From: Kefeng Wang @ 2021-02-09 0:55 UTC (permalink / raw)
To: Atish Patra
Cc: Atish Patra, linux-riscv, Palmer Dabbelt, Palmer Dabbelt, Paul Walmsley
On 2021/2/9 6:03, Atish Patra wrote:
> On Sun, Feb 7, 2021 at 4:35 AM Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
>> 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 logical is useless, kill the mem_start/start/end and unneed code.
>>
> /s/logical/logic
> /s/unneed/uneeded
oops, will update and send new one, thanks.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-09 0:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-07 12:38 [PATCH] riscv: Cleanup setup_bootmem() Kefeng Wang
2021-02-08 22:03 ` Atish Patra
2021-02-09 0:55 ` Kefeng Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.