GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 06:37:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm64/efi: efistub: don't abort if base of DRAM is occupied

Browse source 
If we cannot relocate the kernel Image to its preferred offset of base of DRAM
plus TEXT_OFFSET, instead relocate it to the lowest available 2 MB boundary plus
TEXT_OFFSET. We may lose a bit of memory at the low end, but we can still
proceed normally otherwise.

Acked-by: Mark Salter <msalter@redhat.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Leif Lindholm <leif.lindholm@linaro.org>
Tested-by: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Ard Biesheuvel 2014-07-30 11:59:04 +01:00 • committed by Will Deacon
parent c16173fa56
commit 58015ec6b8
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/arm64/kernel/efi-stub.c
View file

@ -28,20 +28,16 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
kernel_size = _edata - _text; kernel_size = _edata - _text;
if (*image_addr != (dram_base + TEXT_OFFSET)) { if (*image_addr != (dram_base + TEXT_OFFSET)) {
kernel_memsize = kernel_size + (_end - _edata); kernel_memsize = kernel_size + (_end - _edata);
status = efi_relocate_kernel(sys_table, image_addr, status = efi_low_alloc(sys_table, kernel_memsize + TEXT_OFFSET,
kernel_size, kernel_memsize, SZ_2M, reserve_addr);
dram_base + TEXT_OFFSET,
PAGE_SIZE);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
pr_efi_err(sys_table, "Failed to relocate kernel\n"); pr_efi_err(sys_table, "Failed to relocate kernel\n");
return status; return status;
} }
if (*image_addr != (dram_base + TEXT_OFFSET)) { memcpy((void *)*reserve_addr + TEXT_OFFSET, (void *)*image_addr,
pr_efi_err(sys_table, "Failed to alloc kernel memory\n"); kernel_size);
efi_free(sys_table, kernel_memsize, *image_addr); *image_addr = *reserve_addr + TEXT_OFFSET;
return EFI_LOAD_ERROR; *reserve_size = kernel_memsize + TEXT_OFFSET;
}
*image_size = kernel_memsize;
} }