| Message ID | 20240526110104.470429-1-namcao@linutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7bed51617401dab2be930b13ed5aacf581f7c8ef |
| Headers | show |
| Series | riscv: enable HAVE_ARCH_HUGE_VMAP for XIP kernel | expand |
Hi Nam, On 26/05/2024 13:01, Nam Cao wrote: > HAVE_ARCH_HUGE_VMAP also works on XIP kernel, so remove its dependency on > !XIP_KERNEL. > > This also fixes a boot problem for XIP kernel introduced by the commit in > "Fixes:". This commit used huge page mapping for vmemmap, but huge page > vmap was not enabled for XIP kernel. > > Fixes: ff172d4818ad ("riscv: Use hugepage mappings for vmemmap") > Signed-off-by: Nam Cao <namcao@linutronix.de> > Cc: <stable@vger.kernel.org> > --- > This patch replaces: > https://patchwork.kernel.org/project/linux-riscv/patch/20240508173116.2866192-1-namcao@linutronix.de/ > > arch/riscv/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index b94176e25be1..0525ee2d63c7 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -106,7 +106,7 @@ config RISCV > select HAS_IOPORT if MMU > select HAVE_ARCH_AUDITSYSCALL > select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP > - select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT && !XIP_KERNEL > + select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT > select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL > select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL > select HAVE_ARCH_KASAN if MMU && 64BIT Great, thanks! Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Alex
Hello: This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <palmer@rivosinc.com>: On Sun, 26 May 2024 13:01:04 +0200 you wrote: > HAVE_ARCH_HUGE_VMAP also works on XIP kernel, so remove its dependency on > !XIP_KERNEL. > > This also fixes a boot problem for XIP kernel introduced by the commit in > "Fixes:". This commit used huge page mapping for vmemmap, but huge page > vmap was not enabled for XIP kernel. > > [...] Here is the summary with links: - riscv: enable HAVE_ARCH_HUGE_VMAP for XIP kernel https://git.kernel.org/riscv/c/7bed51617401 You are awesome, thank you!
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index b94176e25be1..0525ee2d63c7 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -106,7 +106,7 @@ config RISCV select HAS_IOPORT if MMU select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP - select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT && !XIP_KERNEL + select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL select HAVE_ARCH_KASAN if MMU && 64BIT
HAVE_ARCH_HUGE_VMAP also works on XIP kernel, so remove its dependency on !XIP_KERNEL. This also fixes a boot problem for XIP kernel introduced by the commit in "Fixes:". This commit used huge page mapping for vmemmap, but huge page vmap was not enabled for XIP kernel. Fixes: ff172d4818ad ("riscv: Use hugepage mappings for vmemmap") Signed-off-by: Nam Cao <namcao@linutronix.de> Cc: <stable@vger.kernel.org> --- This patch replaces: https://patchwork.kernel.org/project/linux-riscv/patch/20240508173116.2866192-1-namcao@linutronix.de/ arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)