Skip to content

L
linux
Commit 54b52d87 authored by Matt Fleming's avatar Matt Fleming
Browse files
Options

x86/efi: Build our own EFI services pointer table 

It's not possible to dereference the EFI System table directly when
booting a 64-bit kernel on a 32-bit EFI firmware because the size of
pointers don't match.

In preparation for supporting the above use case, build a list of
function pointers on boot so that callers don't have to worry about
converting pointer sizes through multiple levels of indirection.
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 677703ce
Hide whitespace changes
Inline Side-by-side
Showing with 377 additions and 211 deletions
arch/x86/boot/compressed/eboot.c
View file @ 54b52d87
...@@ -19,10 +19,145 @@ ...@@ -19,10 +19,145 @@
static efi_system_table_t *sys_table; static efi_system_table_t *sys_table;
static struct efi_config *efi_early;
#define BOOT_SERVICES(bits) \
static void setup_boot_services##bits(struct efi_config *c) \
{ \
efi_system_table_##bits##_t *table; \
efi_boot_services_##bits##_t *bt; \
\
table = (typeof(table))sys_table; \
\
c->text_output = table->con_out; \
\
bt = (typeof(bt))(unsigned long)(table->boottime); \
\
c->allocate_pool = bt->allocate_pool; \
c->allocate_pages = bt->allocate_pages; \
c->get_memory_map = bt->get_memory_map; \
c->free_pool = bt->free_pool; \
c->free_pages = bt->free_pages; \
c->locate_handle = bt->locate_handle; \
c->handle_protocol = bt->handle_protocol; \
c->exit_boot_services = bt->exit_boot_services; \
}
BOOT_SERVICES(32);
BOOT_SERVICES(64);
#include "../../../../drivers/firmware/efi/efi-stub-helper.c" static void efi_printk(efi_system_table_t *, char *);
static void efi_char16_printk(efi_system_table_t *, efi_char16_t *);
static efi_status_t
efi_file_size(efi_system_table_t *sys_table, void *__fh,
efi_char16_t *filename_16, void **handle, u64 *file_sz)
{
efi_file_handle_t *h, *fh = __fh;
efi_file_info_t *info;
efi_status_t status;
efi_guid_t info_guid = EFI_FILE_INFO_ID;
u32 info_sz;
status = efi_early->call((unsigned long)fh->open, fh, &h, filename_16,
EFI_FILE_MODE_READ, (u64)0);
if (status != EFI_SUCCESS) {
efi_printk(sys_table, "Failed to open file: ");
efi_char16_printk(sys_table, filename_16);
efi_printk(sys_table, "\n");
return status;
}
*handle = h;
info_sz = 0;
status = efi_early->call((unsigned long)h->get_info, h, &info_guid,
&info_sz, NULL);
if (status != EFI_BUFFER_TOO_SMALL) {
efi_printk(sys_table, "Failed to get file info size\n");
return status;
}
grow:
status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
info_sz, (void **)&info);
if (status != EFI_SUCCESS) {
efi_printk(sys_table, "Failed to alloc mem for file info\n");
return status;
}
status = efi_early->call((unsigned long)h->get_info, h, &info_guid,
&info_sz, info);
if (status == EFI_BUFFER_TOO_SMALL) {
efi_early->call(efi_early->free_pool, info);
goto grow;
}
*file_sz = info->file_size;
efi_early->call(efi_early->free_pool, info);
if (status != EFI_SUCCESS)
efi_printk(sys_table, "Failed to get initrd info\n");
return status;
}
static inline efi_status_t
efi_file_read(void *__fh, void *handle, unsigned long *size, void *addr)
{
efi_file_handle_t *fh = __fh;
return efi_early->call((unsigned long)fh->read, handle, size, addr);
}
static inline efi_status_t efi_file_close(void *__fh, void *handle)
{
efi_file_handle_t *fh = __fh;
return efi_early->call((unsigned long)fh->close, handle);
}
static inline efi_status_t
efi_open_volume(efi_system_table_t *sys_table, void *__image, void **__fh)
{
efi_file_io_interface_t *io;
efi_loaded_image_t *image = __image;
efi_file_handle_t *fh;
efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
efi_status_t status;
void *handle = (void *)(unsigned long)image->device_handle;
u32 func;
status = efi_early->call(efi_early->handle_protocol, handle,
&fs_proto, (void **)&io);
if (status != EFI_SUCCESS) {
efi_printk(sys_table, "Failed to handle fs_proto\n");
return status;
}
func = (unsigned long)io->open_volume;
status = efi_early->call(func, io, &fh);
if (status != EFI_SUCCESS)
efi_printk(sys_table, "Failed to open volume\n");
*__fh = fh;
return status;
}
static inline void
efi_char16_printk(efi_system_table_t *table, efi_char16_t *str)
{
struct efi_simple_text_output_protocol *out;
unsigned long output_string;
size_t offset;
unsigned long *func;
offset = offsetof(typeof(*out), output_string);
output_string = efi_early->text_output + offset;
func = (unsigned long *)output_string;
efi_early->call(*func, efi_early->text_output, str);
}
#include "../../../../drivers/firmware/efi/efi-stub-helper.c"
static void find_bits(unsigned long mask, u8 *pos, u8 *size) static void find_bits(unsigned long mask, u8 *pos, u8 *size)
{ {
...@@ -51,7 +186,7 @@ static efi_status_t setup_efi_pci(struct boot_params *params) ...@@ -51,7 +186,7 @@ static efi_status_t setup_efi_pci(struct boot_params *params)
{ {
efi_pci_io_protocol *pci; efi_pci_io_protocol *pci;
efi_status_t status; efi_status_t status;
void **pci_handle; void **pci_handle = NULL;
efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID; efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;
unsigned long nr_pci, size = 0; unsigned long nr_pci, size = 0;
int i; int i;
...@@ -62,20 +197,21 @@ static efi_status_t setup_efi_pci(struct boot_params *params) ...@@ -62,20 +197,21 @@ static efi_status_t setup_efi_pci(struct boot_params *params)
while (data && data->next) while (data && data->next)
data = (struct setup_data *)(unsigned long)data->next; data = (struct setup_data *)(unsigned long)data->next;
status = efi_call_phys5(sys_table->boottime->locate_handle, status = efi_early->call(efi_early->locate_handle,
EFI_LOCATE_BY_PROTOCOL, &pci_proto, EFI_LOCATE_BY_PROTOCOL,
NULL, &size, pci_handle); &pci_proto, NULL, &size, pci_handle);
if (status == EFI_BUFFER_TOO_SMALL) { if (status == EFI_BUFFER_TOO_SMALL) {
status = efi_call_phys3(sys_table->boottime->allocate_pool, status = efi_early->call(efi_early->allocate_pool,
EFI_LOADER_DATA, size, &pci_handle); EFI_LOADER_DATA,
size, (void **)&pci_handle);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
return status; return status;
status = efi_call_phys5(sys_table->boottime->locate_handle, status = efi_early->call(efi_early->locate_handle,
EFI_LOCATE_BY_PROTOCOL, &pci_proto, EFI_LOCATE_BY_PROTOCOL, &pci_proto,
NULL, &size, pci_handle); NULL, &size, pci_handle);
} }
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
...@@ -87,8 +223,8 @@ static efi_status_t setup_efi_pci(struct boot_params *params) ...@@ -87,8 +223,8 @@ static efi_status_t setup_efi_pci(struct boot_params *params)
uint64_t attributes; uint64_t attributes;
struct pci_setup_rom *rom; struct pci_setup_rom *rom;
status = efi_call_phys3(sys_table->boottime->handle_protocol, status = efi_early->call(efi_early->handle_protocol, h,
h, &pci_proto, &pci); &pci_proto, (void **)&pci);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
continue; continue;
...@@ -97,13 +233,13 @@ static efi_status_t setup_efi_pci(struct boot_params *params) ...@@ -97,13 +233,13 @@ static efi_status_t setup_efi_pci(struct boot_params *params)
continue; continue;
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
status = efi_call_phys4(pci->attributes, pci, status = efi_early->call((unsigned long)pci->attributes, pci,
EfiPciIoAttributeOperationGet, 0, EfiPciIoAttributeOperationGet, 0,
&attributes); &attributes);
#else #else
status = efi_call_phys5(pci->attributes, pci, status = efi_early->call((unsigned long)pci->attributes, pci,
EfiPciIoAttributeOperationGet, 0, 0, EfiPciIoAttributeOperationGet, 0, 0,
&attributes); &attributes);
#endif #endif
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
continue; continue;
...@@ -113,8 +249,8 @@ static efi_status_t setup_efi_pci(struct boot_params *params) ...@@ -113,8 +249,8 @@ static efi_status_t setup_efi_pci(struct boot_params *params)
size = pci->romsize + sizeof(*rom); size = pci->romsize + sizeof(*rom);
status = efi_call_phys3(sys_table->boottime->allocate_pool, status = efi_early->call(efi_early->allocate_pool,
EFI_LOADER_DATA, size, &rom); EFI_LOADER_DATA, size, &rom);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
continue; continue;
...@@ -124,23 +260,23 @@ static efi_status_t setup_efi_pci(struct boot_params *params) ...@@ -124,23 +260,23 @@ static efi_status_t setup_efi_pci(struct boot_params *params)
rom->data.next = 0; rom->data.next = 0;
rom->pcilen = pci->romsize; rom->pcilen = pci->romsize;
status = efi_call_phys5(pci->pci.read, pci, status = efi_early->call((unsigned long)pci->pci.read, pci,
EfiPciIoWidthUint16, PCI_VENDOR_ID, EfiPciIoWidthUint16, PCI_VENDOR_ID,
1, &(rom->vendor)); 1, &(rom->vendor));
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
goto free_struct; goto free_struct;
status = efi_call_phys5(pci->pci.read, pci, status = efi_early->call((unsigned long)pci->pci.read, pci,
EfiPciIoWidthUint16, PCI_DEVICE_ID, EfiPciIoWidthUint16, PCI_DEVICE_ID,
1, &(rom->devid)); 1, &(rom->devid));
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
goto free_struct; goto free_struct;
status = efi_call_phys5(pci->get_location, pci, status = efi_early->call((unsigned long)pci->get_location, pci,
&(rom->segment), &(rom->bus), &(rom->segment), &(rom->bus),
&(rom->device), &(rom->function)); &(rom->device), &(rom->function));
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
goto free_struct; goto free_struct;
...@@ -156,11 +292,11 @@ static efi_status_t setup_efi_pci(struct boot_params *params) ...@@ -156,11 +292,11 @@ static efi_status_t setup_efi_pci(struct boot_params *params)
continue; continue;
free_struct: free_struct:
efi_call_phys1(sys_table->boottime->free_pool, rom); efi_early->call(efi_early->free_pool, rom);
} }
free_handle: free_handle:
efi_call_phys1(sys_table->boottime->free_pool, pci_handle); efi_early->call(efi_early->free_pool, pci_handle);
return status; return status;
} }
...@@ -174,21 +310,21 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, ...@@ -174,21 +310,21 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
struct efi_pixel_bitmask pixel_info; struct efi_pixel_bitmask pixel_info;
unsigned long nr_gops; unsigned long nr_gops;
efi_status_t status; efi_status_t status;
void **gop_handle; void **gop_handle = NULL;
u16 width, height; u16 width, height;
u32 fb_base, fb_size; u32 fb_base, fb_size;
u32 pixels_per_scan_line; u32 pixels_per_scan_line;
int pixel_format; int pixel_format;
int i; int i;
status = efi_call_phys3(sys_table->boottime->allocate_pool, status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
EFI_LOADER_DATA, size, &gop_handle); size, (void **)&gop_handle);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
return status; return status;
status = efi_call_phys5(sys_table->boottime->locate_handle, status = efi_early->call(efi_early->locate_handle,
EFI_LOCATE_BY_PROTOCOL, proto, EFI_LOCATE_BY_PROTOCOL,
NULL, &size, gop_handle); proto, NULL, &size, gop_handle);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
goto free_handle; goto free_handle;
...@@ -202,19 +338,18 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, ...@@ -202,19 +338,18 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
void *dummy; void *dummy;
void *h = gop_handle[i]; void *h = gop_handle[i];
status = efi_call_phys3(sys_table->boottime->handle_protocol, status = efi_early->call(efi_early->handle_protocol, h,
h, proto, &gop); proto, (void **)&gop);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
continue; continue;
status = efi_call_phys3(sys_table->boottime->handle_protocol, status = efi_early->call(efi_early->handle_protocol, h,
h, &conout_proto, &dummy); &conout_proto, &dummy);
if (status == EFI_SUCCESS) if (status == EFI_SUCCESS)
conout_found = true; conout_found = true;
status = efi_call_phys4(gop->query_mode, gop, status = efi_early->call((unsigned long)gop->query_mode, gop,
gop->mode->mode, &size, &info); gop->mode->mode, &size, &info);
if (status == EFI_SUCCESS && (!first_gop || conout_found)) { if (status == EFI_SUCCESS && (!first_gop || conout_found)) {
/* /*
* Systems that use the UEFI Console Splitter may * Systems that use the UEFI Console Splitter may
...@@ -303,7 +438,7 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, ...@@ -303,7 +438,7 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS; si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS;
free_handle: free_handle:
efi_call_phys1(sys_table->boottime->free_pool, gop_handle); efi_early->call(efi_early->free_pool, gop_handle);
return status; return status;
} }
...@@ -320,14 +455,14 @@ static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto, ...@@ -320,14 +455,14 @@ static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto,
void **uga_handle = NULL; void **uga_handle = NULL;
int i; int i;
status = efi_call_phys3(sys_table->boottime->allocate_pool, status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
EFI_LOADER_DATA, size, &uga_handle); size, (void **)&uga_handle);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
return status; return status;
status = efi_call_phys5(sys_table->boottime->locate_handle, status = efi_early->call(efi_early->locate_handle,
EFI_LOCATE_BY_PROTOCOL, uga_proto, EFI_LOCATE_BY_PROTOCOL,
NULL, &size, uga_handle); uga_proto, NULL, &size, uga_handle);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
goto free_handle; goto free_handle;
...@@ -340,16 +475,16 @@ static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto, ...@@ -340,16 +475,16 @@ static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto,
u32 w, h, depth, refresh; u32 w, h, depth, refresh;
void *pciio; void *pciio;
status = efi_call_phys3(sys_table->boottime->handle_protocol, status = efi_early->call(efi_early->handle_protocol, handle,
handle, uga_proto, &uga); uga_proto, (void **)&uga);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
continue; continue;
efi_call_phys3(sys_table->boottime->handle_protocol, efi_early->call(efi_early->handle_protocol, handle,
handle, &pciio_proto, &pciio); &pciio_proto, &pciio);
status = efi_call_phys5(uga->get_mode, uga, &w, &h, status = efi_early->call((unsigned long)uga->get_mode, uga,
&depth, &refresh); &w, &h, &depth, &refresh);
if (status == EFI_SUCCESS && (!first_uga || pciio)) { if (status == EFI_SUCCESS && (!first_uga || pciio)) {
width = w; width = w;
height = h; height = h;
...@@ -386,7 +521,7 @@ static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto, ...@@ -386,7 +521,7 @@ static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto,
free_handle: free_handle:
efi_call_phys1(sys_table->boottime->free_pool, uga_handle); efi_early->call(efi_early->free_pool, uga_handle);
return status; return status;
} }
...@@ -404,29 +539,28 @@ void setup_graphics(struct boot_params *boot_params) ...@@ -404,29 +539,28 @@ void setup_graphics(struct boot_params *boot_params)
memset(si, 0, sizeof(*si)); memset(si, 0, sizeof(*si));
size = 0; size = 0;
status = efi_call_phys5(sys_table->boottime->locate_handle, status = efi_early->call(efi_early->locate_handle,
EFI_LOCATE_BY_PROTOCOL, &graphics_proto, EFI_LOCATE_BY_PROTOCOL,
NULL, &size, gop_handle); &graphics_proto, NULL, &size, gop_handle);
if (status == EFI_BUFFER_TOO_SMALL) if (status == EFI_BUFFER_TOO_SMALL)
status = setup_gop(si, &graphics_proto, size); status = setup_gop(si, &graphics_proto, size);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
size = 0; size = 0;
status = efi_call_phys5(sys_table->boottime->locate_handle, status = efi_early->call(efi_early->locate_handle,
EFI_LOCATE_BY_PROTOCOL, &uga_proto, EFI_LOCATE_BY_PROTOCOL,
NULL, &size, uga_handle); &uga_proto, NULL, &size, uga_handle);
if (status == EFI_BUFFER_TOO_SMALL) if (status == EFI_BUFFER_TOO_SMALL)
setup_uga(si, &uga_proto, size); setup_uga(si, &uga_proto, size);
} }
} }
/* /*
* Because the x86 boot code expects to be passed a boot_params we * Because the x86 boot code expects to be passed a boot_params we
* need to create one ourselves (usually the bootloader would create * need to create one ourselves (usually the bootloader would create
* one for us). * one for us).
*/ */
struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table) struct boot_params *make_boot_params(struct efi_config *c)
{ {
struct boot_params *boot_params; struct boot_params *boot_params;
struct sys_desc_table *sdt; struct sys_desc_table *sdt;
...@@ -434,7 +568,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table) ...@@ -434,7 +568,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
struct setup_header *hdr; struct setup_header *hdr;
struct efi_info *efi; struct efi_info *efi;
efi_loaded_image_t *image; efi_loaded_image_t *image;
void *options; void *options, *handle;
efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID; efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;
int options_size = 0; int options_size = 0;
efi_status_t status; efi_status_t status;
...@@ -445,14 +579,21 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table) ...@@ -445,14 +579,21 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
unsigned long ramdisk_addr; unsigned long ramdisk_addr;
unsigned long ramdisk_size; unsigned long ramdisk_size;
sys_table = _table; efi_early = c;
sys_table = (efi_system_table_t *)(unsigned long)efi_early->table;
handle = (void *)(unsigned long)efi_early->image_handle;
/* Check if we were booted by the EFI firmware */ /* Check if we were booted by the EFI firmware */
if (sys_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE) if (sys_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
return NULL; return NULL;
status = efi_call_phys3(sys_table->boottime->handle_protocol, if (efi_early->is64)
handle, &proto, (void *)&image); setup_boot_services64(efi_early);
else
setup_boot_services32(efi_early);
status = efi_early->call(efi_early->handle_protocol, handle,
&proto, (void *)&image);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
efi_printk(sys_table, "Failed to get handle for LOADED_IMAGE_PROTOCOL\n"); efi_printk(sys_table, "Failed to get handle for LOADED_IMAGE_PROTOCOL\n");
return NULL; return NULL;
...@@ -641,14 +782,13 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext, ...@@ -641,14 +782,13 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext,
sizeof(struct e820entry) * nr_desc; sizeof(struct e820entry) * nr_desc;
if (*e820ext) { if (*e820ext) {
efi_call_phys1(sys_table->boottime->free_pool, *e820ext); efi_early->call(efi_early->free_pool, *e820ext);
*e820ext = NULL; *e820ext = NULL;
*e820ext_size = 0; *e820ext_size = 0;
} }
status = efi_call_phys3(sys_table->boottime->allocate_pool, status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
EFI_LOADER_DATA, size, e820ext); size, (void **)e820ext);
if (status == EFI_SUCCESS) if (status == EFI_SUCCESS)
*e820ext_size = size; *e820ext_size = size;
...@@ -691,7 +831,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params, ...@@ -691,7 +831,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
goto free_mem_map; goto free_mem_map;
efi_call_phys1(sys_table->boottime->free_pool, mem_map); efi_early->call(efi_early->free_pool, mem_map);
goto get_map; /* Allocated memory, get map again */ goto get_map; /* Allocated memory, get map again */
} }
...@@ -708,8 +848,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params, ...@@ -708,8 +848,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
#endif #endif
/* Might as well exit boot services now */ /* Might as well exit boot services now */
status = efi_call_phys2(sys_table->boottime->exit_boot_services, status = efi_early->call(efi_early->exit_boot_services, handle, key);
handle, key);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
/* /*
* ExitBootServices() will fail if any of the event * ExitBootServices() will fail if any of the event
...@@ -722,7 +861,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params, ...@@ -722,7 +861,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
goto free_mem_map; goto free_mem_map;
called_exit = true; called_exit = true;
efi_call_phys1(sys_table->boottime->free_pool, mem_map); efi_early->call(efi_early->free_pool, mem_map);
goto get_map; goto get_map;
} }
...@@ -736,23 +875,31 @@ static efi_status_t exit_boot(struct boot_params *boot_params, ...@@ -736,23 +875,31 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
return EFI_SUCCESS; return EFI_SUCCESS;
free_mem_map: free_mem_map:
efi_call_phys1(sys_table->boottime->free_pool, mem_map); efi_early->call(efi_early->free_pool, mem_map);
return status; return status;
} }
/* /*
* On success we return a pointer to a boot_params structure, and NULL * On success we return a pointer to a boot_params structure, and NULL
* on failure. * on failure.
*/ */
struct boot_params *efi_main(void *handle, efi_system_table_t *_table, struct boot_params *efi_main(struct efi_config *c,
struct boot_params *boot_params) struct boot_params *boot_params)
{ {
struct desc_ptr *gdt; struct desc_ptr *gdt = NULL;
efi_loaded_image_t *image; efi_loaded_image_t *image;
struct setup_header *hdr = &boot_params->hdr; struct setup_header *hdr = &boot_params->hdr;
efi_status_t status; efi_status_t status;
struct desc_struct *desc; struct desc_struct *desc;
void *handle;
efi_system_table_t *_table;
bool is64;
efi_early = c;
_table = (efi_system_table_t *)(unsigned long)efi_early->table;
handle = (void *)(unsigned long)efi_early->image_handle;
is64 = efi_early->is64;
sys_table = _table; sys_table = _table;
...@@ -760,13 +907,17 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table, ...@@ -760,13 +907,17 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
if (sys_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE) if (sys_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
goto fail; goto fail;
if (is64)
setup_boot_services64(efi_early);
else
setup_boot_services32(efi_early);
setup_graphics(boot_params); setup_graphics(boot_params);
setup_efi_pci(boot_params); setup_efi_pci(boot_params);
status = efi_call_phys3(sys_table->boottime->allocate_pool, status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
EFI_LOADER_DATA, sizeof(*gdt), sizeof(*gdt), (void **)&gdt);
(void **)&gdt);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
efi_printk(sys_table, "Failed to alloc mem for gdt structure\n"); efi_printk(sys_table, "Failed to alloc mem for gdt structure\n");
goto fail; goto fail;
......
arch/x86/boot/compressed/eboot.h
View file @ 54b52d87
...@@ -103,4 +103,20 @@ struct efi_uga_draw_protocol { ...@@ -103,4 +103,20 @@ struct efi_uga_draw_protocol {
void *blt; void *blt;
}; };
struct efi_config {
u64 image_handle;
u64 table;
u64 allocate_pool;
u64 allocate_pages;
u64 get_memory_map;
u64 free_pool;
u64 free_pages;
u64 locate_handle;
u64 handle_protocol;
u64 exit_boot_services;
u64 text_output;
efi_status_t (*call)(unsigned long, ...);
bool is64;
} __packed;
#endif /* BOOT_COMPRESSED_EBOOT_H */ #endif /* BOOT_COMPRESSED_EBOOT_H */
arch/x86/boot/compressed/head_32.S
View file @ 54b52d87
...@@ -42,26 +42,53 @@ ENTRY(startup_32) ...@@ -42,26 +42,53 @@ ENTRY(startup_32)
ENTRY(efi_pe_entry) ENTRY(efi_pe_entry)
add $0x4, %esp add $0x4, %esp
call 1f
1: popl %esi
subl $1b, %esi
popl %ecx
movl %ecx, efi32_config(%esi) /* Handle */
popl %ecx
movl %ecx, efi32_config+8(%esi) /* EFI System table pointer */
/* Relocate efi_config->call() */
leal efi32_config(%esi), %eax
add %esi, 88(%eax)
pushl %eax
call make_boot_params call make_boot_params
cmpl $0, %eax cmpl $0, %eax
je 1f je fail
movl 0x4(%esp), %esi popl %ecx
movl (%esp), %ecx
pushl %eax pushl %eax
pushl %esi
pushl %ecx pushl %ecx
sub $0x4, %esp jmp 2f /* Skip efi_config initialization */
ENTRY(efi_stub_entry) ENTRY(efi_stub_entry)
add $0x4, %esp add $0x4, %esp
popl %ecx
popl %edx
call 1f
1: popl %esi
subl $1b, %esi
movl %ecx, efi32_config(%esi) /* Handle */
movl %edx, efi32_config+8(%esi) /* EFI System table pointer */
/* Relocate efi_config->call() */
leal efi32_config(%esi), %eax
add %esi, 88(%eax)
pushl %eax
2:
call efi_main call efi_main
cmpl $0, %eax cmpl $0, %eax
movl %eax, %esi movl %eax, %esi
jne 2f jne 2f
1: fail:
/* EFI init failed, so hang. */ /* EFI init failed, so hang. */
hlt hlt
jmp 1b jmp fail
2: 2:
call 3f call 3f
3: 3:
...@@ -202,6 +229,13 @@ relocated: ...@@ -202,6 +229,13 @@ relocated:
xorl %ebx, %ebx xorl %ebx, %ebx
jmp *%eax jmp *%eax
.data
efi32_config:
.fill 11,8,0
.long efi_call_phys
.long 0
.byte 0
/* /*
* Stack and heap for uncompression * Stack and heap for uncompression
*/ */
......
arch/x86/boot/compressed/head_64.S
View file @ 54b52d87
...@@ -209,26 +209,55 @@ ENTRY(startup_64) ...@@ -209,26 +209,55 @@ ENTRY(startup_64)
jmp preferred_addr jmp preferred_addr
ENTRY(efi_pe_entry) ENTRY(efi_pe_entry)
mov %rcx, %rdi movq %rcx, efi64_config(%rip) /* Handle */
mov %rdx, %rsi movq %rdx, efi64_config+8(%rip) /* EFI System table pointer */
pushq %rdi
pushq %rsi leaq efi64_config(%rip), %rax
movq %rax, efi_config(%rip)
call 1f
1: popq %rbp
subq $1b, %rbp
/*
* Relocate efi_config->call().
*/
addq %rbp, efi64_config+88(%rip)
movq %rax, %rdi
call make_boot_params call make_boot_params
cmpq $0,%rax cmpq $0,%rax
je 1f je fail
mov %rax, %rdx mov %rax, %rsi
popq %rsi jmp 2f /* Skip the relocation */
popq %rdi
ENTRY(efi_stub_entry) ENTRY(efi_stub_entry)
movq %rdi, efi64_config(%rip) /* Handle */
movq %rsi, efi64_config+8(%rip) /* EFI System table pointer */
leaq efi64_config(%rip), %rax
movq %rax, efi_config(%rip)
call 1f
1: popq %rbp
subq $1b, %rbp
/*
* Relocate efi_config->call().
*/
movq efi_config(%rip), %rax
addq %rbp, 88(%rax)
movq %rdx, %rsi
2:
movq efi_config(%rip), %rdi
call efi_main call efi_main
movq %rax,%rsi movq %rax,%rsi
cmpq $0,%rax cmpq $0,%rax
jne 2f jne 2f
1: fail:
/* EFI init failed, so hang. */ /* EFI init failed, so hang. */
hlt hlt
jmp 1b jmp fail
2: 2:
call 3f call 3f
3: 3:
...@@ -372,6 +401,14 @@ gdt: ...@@ -372,6 +401,14 @@ gdt:
.quad 0x0000000000000000 /* TS continued */ .quad 0x0000000000000000 /* TS continued */
gdt_end: gdt_end:
efi_config:
.quad 0
.global efi64_config
efi64_config:
.fill 11,8,0
.quad efi_call6
.byte 1
/* /*
* Stack and heap for uncompression * Stack and heap for uncompression
*/ */
......
drivers/firmware/efi/efi-stub-helper.c
View file @ 54b52d87
...@@ -16,18 +16,6 @@ struct file_info { ...@@ -16,18 +16,6 @@ struct file_info {
u64 size; u64 size;
}; };
static void efi_char16_printk(efi_system_table_t *sys_table_arg,
efi_char16_t *str)
{
struct efi_simple_text_output_protocol *out;
out = (struct efi_simple_text_output_protocol *)sys_table_arg->con_out;
efi_call_phys2(out->output_string, out, str);
}
static void efi_printk(efi_system_table_t *sys_table_arg, char *str) static void efi_printk(efi_system_table_t *sys_table_arg, char *str)
{ {
char *s8; char *s8;
...@@ -65,20 +53,23 @@ static efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg, ...@@ -65,20 +53,23 @@ static efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg,
* allocation which may be in a new descriptor region. * allocation which may be in a new descriptor region.
*/ */
*map_size += sizeof(*m); *map_size += sizeof(*m);
status = efi_call_phys3(sys_table_arg->boottime->allocate_pool, status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
EFI_LOADER_DATA, *map_size, (void **)&m); *map_size, (void **)&m);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
goto fail; goto fail;
status = efi_call_phys5(sys_table_arg->boottime->get_memory_map, *desc_size = 0;
map_size, m, &key, desc_size, &desc_version); key = 0;
status = efi_early->call(efi_early->get_memory_map, map_size, m,
&key, desc_size, &desc_version);
if (status == EFI_BUFFER_TOO_SMALL) { if (status == EFI_BUFFER_TOO_SMALL) {
efi_call_phys1(sys_table_arg->boottime->free_pool, m); efi_early->call(efi_early->free_pool, m);
goto again; goto again;
} }
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
efi_call_phys1(sys_table_arg->boottime->free_pool, m); efi_early->call(efi_early->free_pool, m);
if (key_ptr && status == EFI_SUCCESS) if (key_ptr && status == EFI_SUCCESS)
*key_ptr = key; *key_ptr = key;
if (desc_ver && status == EFI_SUCCESS) if (desc_ver && status == EFI_SUCCESS)
...@@ -158,9 +149,9 @@ static efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg, ...@@ -158,9 +149,9 @@ static efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg,
if (!max_addr) if (!max_addr)
status = EFI_NOT_FOUND; status = EFI_NOT_FOUND;
else { else {
status = efi_call_phys4(sys_table_arg->boottime->allocate_pages, status = efi_early->call(efi_early->allocate_pages,
EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA, EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
nr_pages, &max_addr); nr_pages, &max_addr);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
max = max_addr; max = max_addr;
max_addr = 0; max_addr = 0;
...@@ -170,8 +161,7 @@ static efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg, ...@@ -170,8 +161,7 @@ static efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg,
*addr = max_addr; *addr = max_addr;
} }
efi_call_phys1(sys_table_arg->boottime->free_pool, map); efi_early->call(efi_early->free_pool, map);
fail: fail:
return status; return status;
} }
...@@ -231,9 +221,9 @@ static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg, ...@@ -231,9 +221,9 @@ static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
if ((start + size) > end) if ((start + size) > end)
continue; continue;
status = efi_call_phys4(sys_table_arg->boottime->allocate_pages, status = efi_early->call(efi_early->allocate_pages,
EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA, EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
nr_pages, &start); nr_pages, &start);
if (status == EFI_SUCCESS) { if (status == EFI_SUCCESS) {
*addr = start; *addr = start;
break; break;
...@@ -243,7 +233,7 @@ static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg, ...@@ -243,7 +233,7 @@ static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
if (i == map_size / desc_size) if (i == map_size / desc_size)
status = EFI_NOT_FOUND; status = EFI_NOT_FOUND;
efi_call_phys1(sys_table_arg->boottime->free_pool, map); efi_early->call(efi_early->free_pool, map);
fail: fail:
return status; return status;
} }
...@@ -257,7 +247,7 @@ static void efi_free(efi_system_table_t *sys_table_arg, unsigned long size, ...@@ -257,7 +247,7 @@ static void efi_free(efi_system_table_t *sys_table_arg, unsigned long size,
return; return;
nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
efi_call_phys2(sys_table_arg->boottime->free_pages, addr, nr_pages); efi_early->call(efi_early->free_pages, addr, nr_pages);
} }
...@@ -276,9 +266,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, ...@@ -276,9 +266,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
{ {
struct file_info *files; struct file_info *files;
unsigned long file_addr; unsigned long file_addr;
efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
u64 file_size_total; u64 file_size_total;
efi_file_io_interface_t *io;
efi_file_handle_t *fh; efi_file_handle_t *fh;
efi_status_t status; efi_status_t status;
int nr_files; int nr_files;
...@@ -319,10 +307,8 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, ...@@ -319,10 +307,8 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
if (!nr_files) if (!nr_files)
return EFI_SUCCESS; return EFI_SUCCESS;
status = efi_call_phys3(sys_table_arg->boottime->allocate_pool, status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
EFI_LOADER_DATA, nr_files * sizeof(*files), (void **)&files);
nr_files * sizeof(*files),
(void **)&files);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
efi_printk(sys_table_arg, "Failed to alloc mem for file handle list\n"); efi_printk(sys_table_arg, "Failed to alloc mem for file handle list\n");
goto fail; goto fail;
...@@ -331,13 +317,8 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, ...@@ -331,13 +317,8 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
str = cmd_line; str = cmd_line;
for (i = 0; i < nr_files; i++) { for (i = 0; i < nr_files; i++) {
struct file_info *file; struct file_info *file;
efi_file_handle_t *h;
efi_file_info_t *info;
efi_char16_t filename_16[256]; efi_char16_t filename_16[256];
unsigned long info_sz;
efi_guid_t info_guid = EFI_FILE_INFO_ID;
efi_char16_t *p; efi_char16_t *p;
u64 file_sz;
str = strstr(str, option_string); str = strstr(str, option_string);
if (!str) if (!str)
...@@ -368,71 +349,18 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, ...@@ -368,71 +349,18 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
/* Only open the volume once. */ /* Only open the volume once. */
if (!i) { if (!i) {
efi_boot_services_t *boottime; status = efi_open_volume(sys_table_arg, image,
(void **)&fh);
boottime = sys_table_arg->boottime; if (status != EFI_SUCCESS)
status = efi_call_phys3(boottime->handle_protocol,
image->device_handle, &fs_proto,
(void **)&io);
if (status != EFI_SUCCESS) {
efi_printk(sys_table_arg, "Failed to handle fs_proto\n");
goto free_files;
}
status = efi_call_phys2(io->open_volume, io, &fh);
if (status != EFI_SUCCESS) {
efi_printk(sys_table_arg, "Failed to open volume\n");
goto free_files; goto free_files;
}
} }
status = efi_call_phys5(fh->open, fh, &h, filename_16, status = efi_file_size(sys_table_arg, fh, filename_16,
EFI_FILE_MODE_READ, (u64)0); (void **)&file->handle, &file->size);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS)
efi_printk(sys_table_arg, "Failed to open file: ");
efi_char16_printk(sys_table_arg, filename_16);
efi_printk(sys_table_arg, "\n");
goto close_handles; goto close_handles;
}
file->handle = h; file_size_total += file->size;
info_sz = 0;
status = efi_call_phys4(h->get_info, h, &info_guid,
&info_sz, NULL);
if (status != EFI_BUFFER_TOO_SMALL) {
efi_printk(sys_table_arg, "Failed to get file info size\n");
goto close_handles;
}
grow:
status = efi_call_phys3(sys_table_arg->boottime->allocate_pool,
EFI_LOADER_DATA, info_sz,
(void **)&info);
if (status != EFI_SUCCESS) {
efi_printk(sys_table_arg, "Failed to alloc mem for file info\n");
goto close_handles;
}
status = efi_call_phys4(h->get_info, h, &info_guid,
&info_sz, info);
if (status == EFI_BUFFER_TOO_SMALL) {
efi_call_phys1(sys_table_arg->boottime->free_pool,
info);
goto grow;
}
file_sz = info->file_size;
efi_call_phys1(sys_table_arg->boottime->free_pool, info);
if (status != EFI_SUCCESS) {
efi_printk(sys_table_arg, "Failed to get file info\n");
goto close_handles;
}
file->size = file_sz;
file_size_total += file_sz;
} }
if (file_size_total) { if (file_size_total) {
...@@ -468,10 +396,10 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, ...@@ -468,10 +396,10 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
chunksize = EFI_READ_CHUNK_SIZE; chunksize = EFI_READ_CHUNK_SIZE;
else else
chunksize = size; chunksize = size;
status = efi_call_phys3(fh->read,
files[j].handle, status = efi_file_read(fh, files[j].handle,
&chunksize, &chunksize,
(void *)addr); (void *)addr);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
efi_printk(sys_table_arg, "Failed to read file\n"); efi_printk(sys_table_arg, "Failed to read file\n");
goto free_file_total; goto free_file_total;
...@@ -480,12 +408,12 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, ...@@ -480,12 +408,12 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
size -= chunksize; size -= chunksize;
} }
efi_call_phys1(fh->close, files[j].handle); efi_file_close(fh, files[j].handle);
} }
} }
efi_call_phys1(sys_table_arg->boottime->free_pool, files); efi_early->call(efi_early->free_pool, files);
*load_addr = file_addr; *load_addr = file_addr;
*load_size = file_size_total; *load_size = file_size_total;
...@@ -497,9 +425,9 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, ...@@ -497,9 +425,9 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
close_handles: close_handles:
for (k = j; k < i; k++) for (k = j; k < i; k++)
efi_call_phys1(fh->close, files[k].handle); efi_file_close(fh, files[k].handle);
free_files: free_files:
efi_call_phys1(sys_table_arg->boottime->free_pool, files); efi_early->call(efi_early->free_pool, files);
fail: fail:
*load_addr = 0; *load_addr = 0;
*load_size = 0; *load_size = 0;
...@@ -545,9 +473,9 @@ static efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg, ...@@ -545,9 +473,9 @@ static efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg,
* as possible while respecting the required alignment. * as possible while respecting the required alignment.
*/ */
nr_pages = round_up(alloc_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; nr_pages = round_up(alloc_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
status = efi_call_phys4(sys_table_arg->boottime->allocate_pages, status = efi_early->call(efi_early->allocate_pages,
EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA, EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
nr_pages, &efi_addr); nr_pages, &efi_addr);
new_addr = efi_addr; new_addr = efi_addr;
/* /*
* If preferred address allocation failed allocate as low as * If preferred address allocation failed allocate as low as
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7