From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Bin Meng <bmeng.cn@gmail.com>,
Palmer Dabbelt <palmerdabbelt@google.com>,
Atish Patra <atish.patra@wdc.com>,
<linux-kernel@vger.kernel.org>, <linux-riscv@lists.infradead.org>
Cc: <stable@vger.kernel.org>
Subject: Re: [PATCH] riscv: Fix 32-bit RISC-V boot failure
Date: Mon, 28 Jun 2021 08:53:16 +0800 [thread overview]
Message-ID: <11706f7e-a53a-5640-d713-bc4562db71fa@huawei.com> (raw)
In-Reply-To: <20210627135117.28641-1-bmeng.cn@gmail.com>
Hi, sorry for the mistake,the bug is fixed by
https://lore.kernel.org/linux-riscv/20210602085517.127481-2-wangkefeng.wang@huawei.com/
On 2021/6/27 21:51, Bin Meng wrote:
> Commit dd2d082b5760 ("riscv: Cleanup setup_bootmem()") adjusted
> the calling sequence in setup_bootmem(), which invalidates the fix
> commit de043da0b9e7 ("RISC-V: Fix usage of memblock_enforce_memory_limit")
> did for 32-bit RISC-V unfortunately.
>
> So now 32-bit RISC-V does not boot again when testing booting kernel
> on QEMU 'virt' with '-m 2G', which was exactly what the original
> commit de043da0b9e7 ("RISC-V: Fix usage of memblock_enforce_memory_limit")
> tried to fix.
>
> Fixes: dd2d082b5760 ("riscv: Cleanup setup_bootmem()")
> Cc: stable@vger.kernel.org # v5.12+
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
> arch/riscv/mm/init.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index 4c4c92ce0bb8..9b23b95c50cf 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -123,7 +123,7 @@ void __init setup_bootmem(void)
> {
> 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 dram_end;
> phys_addr_t max_mapped_addr = __pa(~(ulong)0);
>
> #ifdef CONFIG_XIP_KERNEL
> @@ -146,6 +146,8 @@ void __init setup_bootmem(void)
> #endif
> 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
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2021-06-28 0:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-27 13:51 [PATCH] riscv: Fix 32-bit RISC-V boot failure Bin Meng
2021-06-28 0:53 ` Kefeng Wang [this message]
2021-06-28 1:15 ` Bin Meng
2021-06-28 2:28 ` Kefeng Wang
2021-06-28 3:21 ` Bin Meng
2021-06-30 11:58 ` Bin Meng
2021-07-01 2:08 ` Kefeng Wang
2021-07-01 2:20 ` Bin Meng
2021-07-08 13:29 ` Bin Meng
2021-07-16 2:14 ` Bin Meng
2021-07-22 5:53 ` Palmer Dabbelt
2021-07-22 6:29 ` Bin Meng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11706f7e-a53a-5640-d713-bc4562db71fa@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=atish.patra@wdc.com \
--cc=bmeng.cn@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmerdabbelt@google.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).