riscv: mm: fix wrong phys_ram_base value for RV64
PATCH 1/1 riscv: mm: fix wrong phys_ram_base value for RV64
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
--- arch/riscv/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/mm/init.c +1 -1
@@ -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
Signature · 1 line
2.34.1
Quoted 20 lines · Jisheng Zhang
Currently, if 64BIT and !XIP_KERNEL, the
phys_ram_baseis 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 inarch/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 <[email protected]>--- arch/riscv/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/mm/init.c +0
-0@@ -187,10 +187,10 @@ static void __init setup_bootmem(void)
arch/riscv/mm/init.c static void __init setup_bootmem(void) · line 196
Quoted 10 lines
arch/riscv/mm/init.c +1
-1phys_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:
And looking forward to your cleanup patch ;)
Thanks,
Alex
Quoted 35 lines · On Thu, 2 Dec 2021 16:52:08 +0100 Alexandre ghiti <[email protected]> wrote:
Quoted 20 lines · Jisheng Zhang
Currently, if 64BIT and !XIP_KERNEL, the
phys_ram_baseis 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 inarch/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 <[email protected]>--- arch/riscv/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/mm/init.c +0
-0@@ -187,10 +187,10 @@ static void __init setup_bootmem(void)arch/riscv/mm/init.c static void __init setup_bootmem(void) · line 196
Quoted 10 lines
arch/riscv/mm/init.c +1
-1phys_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:
Quoted 2 lines
Reviewed-by Alexandre Ghiti <[email protected]>
Hi Palmer,
I noticed this patch is missing in recent riscv fixes pull.
Thanks
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Palmer Dabbelt
maintainerQuoted 10 lines · On Thu, 02 Dec 2021 07:36:41 PST (-0800), [email protected] wrote:
Currently, if 64BIT and !XIP_KERNEL, the
phys_ram_baseis 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 inarch/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 <[email protected]>
Thanks, this is on for-next.
Quoted 10 lines
--- arch/riscv/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/mm/init.c +0
-0@@ -187,10 +187,10 @@ static void __init setup_bootmem(void)
arch/riscv/mm/init.c static void __init setup_bootmem(void) · line 196
Quoted 10 lines
arch/riscv/mm/init.c +1
-1phys_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
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv