* [PATCH] riscv: mm: fix wrong phys_ram_base value for RV64
@ 2021-12-02 15:36 Jisheng Zhang
2021-12-02 15:52 ` Alexandre ghiti
2022-01-11 17:28 ` Palmer Dabbelt
0 siblings, 2 replies; 4+ messages in thread
From: Jisheng Zhang @ 2021-12-02 15:36 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou
Cc: Alexandre Ghiti, linux-riscv, linux-kernel
Currently, if 64BIT and !XIP_KERNEL, the phys_ram_base is always 0,
no matter the real start of dram reported by memblock is. The original
patch[1] is correct, I believe it's not corrected merged due to lots
of #ifdef in arch/riscv/mm/init.c, I plan to send a clean up series
soon.
[1] http://lists.infradead.org/pipermail/linux-riscv/2021-July/007650.html
Fixes: 6d7f91d914bc ("riscv: Get rid of CONFIG_PHYS_RAM_BASE in kernel physical address conversion")
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/mm/init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 24b2b8044602..3c0649dba4ff 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -187,10 +187,10 @@ static void __init setup_bootmem(void)
phys_ram_end = memblock_end_of_DRAM();
-#ifndef CONFIG_64BIT
#ifndef CONFIG_XIP_KERNEL
phys_ram_base = memblock_start_of_DRAM();
#endif
+#ifndef CONFIG_64BIT
/*
* 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.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] riscv: mm: fix wrong phys_ram_base value for RV64
2021-12-02 15:36 [PATCH] riscv: mm: fix wrong phys_ram_base value for RV64 Jisheng Zhang
@ 2021-12-02 15:52 ` Alexandre ghiti
2021-12-26 8:10 ` Jisheng Zhang
2022-01-11 17:28 ` Palmer Dabbelt
1 sibling, 1 reply; 4+ messages in thread
From: Alexandre ghiti @ 2021-12-02 15:52 UTC (permalink / raw)
To: Jisheng Zhang, Paul Walmsley, Palmer Dabbelt, Albert Ou
Cc: linux-riscv, linux-kernel
On 12/2/21 16:36, Jisheng Zhang wrote:
> Currently, if 64BIT and !XIP_KERNEL, the phys_ram_base is always 0,
> no matter the real start of dram reported by memblock is. The original
> patch[1] is correct, I believe it's not corrected merged due to lots
> of #ifdef in arch/riscv/mm/init.c, I plan to send a clean up series
> soon.
>
> [1] http://lists.infradead.org/pipermail/linux-riscv/2021-July/007650.html
>
> Fixes: 6d7f91d914bc ("riscv: Get rid of CONFIG_PHYS_RAM_BASE in kernel physical address conversion")
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/mm/init.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index 24b2b8044602..3c0649dba4ff 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -187,10 +187,10 @@ static void __init setup_bootmem(void)
>
>
> phys_ram_end = memblock_end_of_DRAM();
> -#ifndef CONFIG_64BIT
> #ifndef CONFIG_XIP_KERNEL
> phys_ram_base = memblock_start_of_DRAM();
> #endif
> +#ifndef CONFIG_64BIT
> /*
> * 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
Good catch, you can add:
Reviewed-by: Alexandre Ghiti <alex@ghiti.fr>
And looking forward to your cleanup patch ;)
Thanks,
Alex
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] riscv: mm: fix wrong phys_ram_base value for RV64
2021-12-02 15:52 ` Alexandre ghiti
@ 2021-12-26 8:10 ` Jisheng Zhang
0 siblings, 0 replies; 4+ messages in thread
From: Jisheng Zhang @ 2021-12-26 8:10 UTC (permalink / raw)
To: Alexandre ghiti
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-riscv, linux-kernel
On Thu, 2 Dec 2021 16:52:08 +0100
Alexandre ghiti <alex@ghiti.fr> wrote:
> On 12/2/21 16:36, Jisheng Zhang wrote:
> > Currently, if 64BIT and !XIP_KERNEL, the phys_ram_base is always 0,
> > no matter the real start of dram reported by memblock is. The original
> > patch[1] is correct, I believe it's not corrected merged due to lots
> > of #ifdef in arch/riscv/mm/init.c, I plan to send a clean up series
> > soon.
> >
> > [1] http://lists.infradead.org/pipermail/linux-riscv/2021-July/007650.html
> >
> > Fixes: 6d7f91d914bc ("riscv: Get rid of CONFIG_PHYS_RAM_BASE in kernel physical address conversion")
> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> > ---
> > arch/riscv/mm/init.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> > index 24b2b8044602..3c0649dba4ff 100644
> > --- a/arch/riscv/mm/init.c
> > +++ b/arch/riscv/mm/init.c
> > @@ -187,10 +187,10 @@ static void __init setup_bootmem(void)
> >
> >
> > phys_ram_end = memblock_end_of_DRAM();
> > -#ifndef CONFIG_64BIT
> > #ifndef CONFIG_XIP_KERNEL
> > phys_ram_base = memblock_start_of_DRAM();
> > #endif
> > +#ifndef CONFIG_64BIT
> > /*
> > * 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
>
>
> Good catch, you can add:
>
> Reviewed-by: Alexandre Ghiti <alex@ghiti.fr>
>
Hi Palmer,
I noticed this patch is missing in recent riscv fixes pull.
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] riscv: mm: fix wrong phys_ram_base value for RV64
2021-12-02 15:36 [PATCH] riscv: mm: fix wrong phys_ram_base value for RV64 Jisheng Zhang
2021-12-02 15:52 ` Alexandre ghiti
@ 2022-01-11 17:28 ` Palmer Dabbelt
1 sibling, 0 replies; 4+ messages in thread
From: Palmer Dabbelt @ 2022-01-11 17:28 UTC (permalink / raw)
To: jszhang; +Cc: Paul Walmsley, aou, alex, linux-riscv, linux-kernel
On Thu, 02 Dec 2021 07:36:41 PST (-0800), jszhang@kernel.org wrote:
> Currently, if 64BIT and !XIP_KERNEL, the phys_ram_base is always 0,
> no matter the real start of dram reported by memblock is. The original
> patch[1] is correct, I believe it's not corrected merged due to lots
> of #ifdef in arch/riscv/mm/init.c, I plan to send a clean up series
> soon.
>
> [1] http://lists.infradead.org/pipermail/linux-riscv/2021-July/007650.html
>
> Fixes: 6d7f91d914bc ("riscv: Get rid of CONFIG_PHYS_RAM_BASE in kernel physical address conversion")
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Thanks, this is on for-next.
> ---
> arch/riscv/mm/init.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index 24b2b8044602..3c0649dba4ff 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -187,10 +187,10 @@ static void __init setup_bootmem(void)
>
>
> phys_ram_end = memblock_end_of_DRAM();
> -#ifndef CONFIG_64BIT
> #ifndef CONFIG_XIP_KERNEL
> phys_ram_base = memblock_start_of_DRAM();
> #endif
> +#ifndef CONFIG_64BIT
> /*
> * 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-11 17:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-02 15:36 [PATCH] riscv: mm: fix wrong phys_ram_base value for RV64 Jisheng Zhang
2021-12-02 15:52 ` Alexandre ghiti
2021-12-26 8:10 ` Jisheng Zhang
2022-01-11 17:28 ` Palmer Dabbelt
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).