| From 466b30138b3e9cb57189bf8c86291241ae97f297 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 29 Jun 2021 15:40:18 +0200 |
| Subject: RISC-V: load initrd wherever it fits into memory |
| |
| From: Heinrich Schuchardt <xypron.glpk@gmx.de> |
| |
| [ Upstream commit c79e89ecaa246c880292ba68cbe08c9c30db77e3 ] |
| |
| Requiring that initrd is loaded below RAM start + 256 MiB led to failure |
| to boot SUSE Linux with GRUB on QEMU, cf. |
| https://lists.gnu.org/archive/html/grub-devel/2021-06/msg00037.html |
| |
| Remove the constraint. |
| |
| Reported-by: Andreas Schwab <schwab@linux-m68k.org> |
| Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> |
| Reviewed-by: Atish Patra <atish.patra@wdc.com> |
| Acked-by: Ard Biesheuvel <ardb@kernel.org> |
| Fixes: d7071743db31 ("RISC-V: Add EFI stub support.") |
| Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/riscv/include/asm/efi.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/riscv/include/asm/efi.h b/arch/riscv/include/asm/efi.h |
| index 6d98cd999680..7b3483ba2e84 100644 |
| --- a/arch/riscv/include/asm/efi.h |
| +++ b/arch/riscv/include/asm/efi.h |
| @@ -27,10 +27,10 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); |
| |
| #define ARCH_EFI_IRQ_FLAGS_MASK (SR_IE | SR_SPIE) |
| |
| -/* Load initrd at enough distance from DRAM start */ |
| +/* Load initrd anywhere in system RAM */ |
| static inline unsigned long efi_get_max_initrd_addr(unsigned long image_addr) |
| { |
| - return image_addr + SZ_256M; |
| + return ULONG_MAX; |
| } |
| |
| #define alloc_screen_info(x...) (&screen_info) |
| -- |
| 2.30.2 |
| |
