UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

efi/loongarch: Reintroduce efi_relocate_kernel() to relocate kernel 

Since Linux-6.3, LoongArch supports PIE kernel now, so let's reintroduce
efi_relocate_kernel() to relocate the core kernel.

Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Huacai Chen 2023-03-01 16:55:45 +08:00 committed by Ard Biesheuvel
parent 197b6b60ae
commit 8364f6d000
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/firmware/efi/libstub/loongarch-stub.c
View File

@ -21,27 +21,17 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
efi_loaded_image_t *image, efi_loaded_image_t *image,
efi_handle_t image_handle) efi_handle_t image_handle)
{ {
int nr_pages = round_up(kernel_asize, EFI_ALLOC_ALIGN) / EFI_PAGE_SIZE;
efi_physical_addr_t kernel_addr = EFI_KIMG_PREFERRED_ADDRESS;
efi_status_t status; efi_status_t status;
unsigned long kernel_addr = 0;
/* kernel_addr = (unsigned long)&kernel_offset - kernel_offset;
* Allocate space for the kernel image at the preferred offset. This is
* the only location in memory from where we can execute the image, so
* no point in falling back to another allocation.
*/
status = efi_bs_call(allocate_pages, EFI_ALLOCATE_ADDRESS,
EFI_LOADER_DATA, nr_pages, &kernel_addr);
if (status != EFI_SUCCESS)
return status;
*image_addr = EFI_KIMG_PREFERRED_ADDRESS; status = efi_relocate_kernel(&kernel_addr, kernel_fsize, kernel_asize,
EFI_KIMG_PREFERRED_ADDRESS, efi_get_kimg_min_align(), 0x0);
*image_addr = kernel_addr;
*image_size = kernel_asize; *image_size = kernel_asize;
memcpy((void *)EFI_KIMG_PREFERRED_ADDRESS,
(void *)&kernel_offset - kernel_offset,
kernel_fsize);
return status; return status;
} }