mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 23:50:26 +09:00
efi_loader: set loaded image code/data type properly
These should be set according to the image type. Shell.efi and SCT.efi use these fields to determine what sort of image they are loading. Signed-off-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
61b7e22479
commit
4657a3f1ac
@ -62,6 +62,12 @@ typedef struct _IMAGE_DATA_DIRECTORY {
|
|||||||
|
|
||||||
#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
|
#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
|
||||||
|
|
||||||
|
/* PE32+ Subsystem type for EFI images */
|
||||||
|
#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10
|
||||||
|
#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11
|
||||||
|
#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12
|
||||||
|
#define IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER 13
|
||||||
|
|
||||||
typedef struct _IMAGE_OPTIONAL_HEADER64 {
|
typedef struct _IMAGE_OPTIONAL_HEADER64 {
|
||||||
uint16_t Magic; /* 0x20b */
|
uint16_t Magic; /* 0x20b */
|
||||||
uint8_t MajorLinkerVersion;
|
uint8_t MajorLinkerVersion;
|
||||||
|
@ -94,6 +94,7 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info)
|
|||||||
unsigned long virt_size = 0;
|
unsigned long virt_size = 0;
|
||||||
bool can_run_nt64 = true;
|
bool can_run_nt64 = true;
|
||||||
bool can_run_nt32 = true;
|
bool can_run_nt32 = true;
|
||||||
|
uint16_t image_type;
|
||||||
|
|
||||||
#if defined(CONFIG_ARM64)
|
#if defined(CONFIG_ARM64)
|
||||||
can_run_nt32 = false;
|
can_run_nt32 = false;
|
||||||
@ -139,6 +140,7 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info)
|
|||||||
entry = efi_reloc + opt->AddressOfEntryPoint;
|
entry = efi_reloc + opt->AddressOfEntryPoint;
|
||||||
rel_size = opt->DataDirectory[rel_idx].Size;
|
rel_size = opt->DataDirectory[rel_idx].Size;
|
||||||
rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress;
|
rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress;
|
||||||
|
image_type = opt->Subsystem;
|
||||||
} else if (can_run_nt32 &&
|
} else if (can_run_nt32 &&
|
||||||
(nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
|
(nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
|
||||||
IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader;
|
IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader;
|
||||||
@ -152,12 +154,32 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info)
|
|||||||
entry = efi_reloc + opt->AddressOfEntryPoint;
|
entry = efi_reloc + opt->AddressOfEntryPoint;
|
||||||
rel_size = opt->DataDirectory[rel_idx].Size;
|
rel_size = opt->DataDirectory[rel_idx].Size;
|
||||||
rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress;
|
rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress;
|
||||||
|
image_type = opt->Subsystem;
|
||||||
} else {
|
} else {
|
||||||
printf("%s: Invalid optional header magic %x\n", __func__,
|
printf("%s: Invalid optional header magic %x\n", __func__,
|
||||||
nt->OptionalHeader.Magic);
|
nt->OptionalHeader.Magic);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch (image_type) {
|
||||||
|
case IMAGE_SUBSYSTEM_EFI_APPLICATION:
|
||||||
|
loaded_image_info->image_code_type = EFI_LOADER_CODE;
|
||||||
|
loaded_image_info->image_data_type = EFI_LOADER_DATA;
|
||||||
|
break;
|
||||||
|
case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER:
|
||||||
|
loaded_image_info->image_code_type = EFI_BOOT_SERVICES_CODE;
|
||||||
|
loaded_image_info->image_data_type = EFI_BOOT_SERVICES_DATA;
|
||||||
|
break;
|
||||||
|
case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
|
||||||
|
case IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER:
|
||||||
|
loaded_image_info->image_code_type = EFI_RUNTIME_SERVICES_CODE;
|
||||||
|
loaded_image_info->image_data_type = EFI_RUNTIME_SERVICES_DATA;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
printf("%s: invalid image type: %u\n", __func__, image_type);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
/* Load sections into RAM */
|
/* Load sections into RAM */
|
||||||
for (i = num_sections - 1; i >= 0; i--) {
|
for (i = num_sections - 1; i >= 0; i--) {
|
||||||
IMAGE_SECTION_HEADER *sec = §ions[i];
|
IMAGE_SECTION_HEADER *sec = §ions[i];
|
||||||
|
Loading…
Reference in New Issue
Block a user