@@ -51,11 +51,10 @@ static void __init DisplayUint(UINT64 Val, INTN Width);
static CHAR16 *__init wstrcpy(CHAR16 *d, const CHAR16 *s);
static char *__init get_value(const struct file *cfg, const char *section,
const char *item);
-static void __init split_value(char *s);
static CHAR16 *__init s2w(union string *str);
static char *__init w2s(const union string *str);
-static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,
- struct file *file);
+static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, struct file *file,
+ char *name_options);
static EFI_BOOT_SERVICES *__initdata efi_bs;
static EFI_HANDLE __initdata efi_ih;
@@ -398,18 +397,39 @@ static CHAR16 *__init point_tail(CHAR16 *fn)
break;
}
}
+/*
+ * Truncate string at first space, and return pointer
+ * to remainder of string.
+ */
+static char * __init truncate_string(char *s)
+{
+ while ( *s && !isspace(*s) )
+ ++s;
+ if ( *s )
+ {
+ *s = 0;
+ return(s + 1);
+ }
+ return(NULL);
+}
-static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,
- struct file *file)
+static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, struct file *file,
+ char *name_options)
{
EFI_FILE_HANDLE FileHandle = NULL;
UINT64 size;
EFI_STATUS ret;
CHAR16 *what = NULL;
+ char *options;
+ union string name;
+
+ options = truncate_string(name_options);
- if ( !name )
+ name.s=name_options;
+ s2w(&name);
+ if ( !name.w )
PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES);
- ret = dir_handle->Open(dir_handle, &FileHandle, name,
+ ret = dir_handle->Open(dir_handle, &FileHandle, name.w,
EFI_FILE_MODE_READ, 0);
if ( file == &cfg && ret == EFI_NOT_FOUND )
return 0;
@@ -441,20 +461,18 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,
}
else
{
+ file->size = size;
if ( file != &cfg )
{
- PrintStr(name);
+ PrintStr(name.w);
PrintStr(L": ");
DisplayUint(file->addr, 2 * sizeof(file->addr));
PrintStr(L"-");
DisplayUint(file->addr + size, 2 * sizeof(file->addr));
PrintStr(newline);
- mb_modules[mbi.mods_count].mod_start = file->addr >> PAGE_SHIFT;
- mb_modules[mbi.mods_count].mod_end = size;
- ++mbi.mods_count;
+ efi_arch_handle_module(file, name_options, options);
}
- file->size = size;
ret = FileHandle->Read(FileHandle, &file->size, file->ptr);
if ( !EFI_ERROR(ret) && file->size != size )
ret = EFI_ABORTED;
@@ -469,7 +487,7 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,
{
PrintErr(what);
PrintErr(L" failed for ");
- PrintErrMesg(name, ret);
+ PrintErrMesg(name.w, ret);
}
return 1;
@@ -525,7 +543,13 @@ static char *__init get_value(const struct file *cfg, const char *section,
break;
default:
if ( match && strncmp(ptr, item, ilen) == 0 && ptr[ilen] == '=' )
- return ptr + ilen + 1;
+ {
+ ptr += ilen + 1;
+ /* strip off any leading spaces */
+ while ( *ptr && isspace(*ptr) )
+ ptr++;
+ return ptr;
+ }
break;
}
ptr += strlen(ptr);
@@ -533,16 +557,6 @@ static char *__init get_value(const struct file *cfg, const char *section,
return NULL;
}
-static void __init split_value(char *s)
-{
- while ( *s && isspace(*s) )
- ++s;
- place_string(&mb_modules[mbi.mods_count].string, s);
- while ( *s && !isspace(*s) )
- ++s;
- *s = 0;
-}
-
void EFIAPI __init noreturn
efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
{
@@ -552,14 +566,14 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
EFI_LOADED_IMAGE *loaded_image;
EFI_STATUS status;
unsigned int i, argc;
- CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL;
+ CHAR16 **argv, *options = NULL;
UINTN cols, rows, depth, size, info_size;
EFI_HANDLE *handles = NULL;
EFI_SHIM_LOCK_PROTOCOL *shim_lock;
EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info;
EFI_FILE_HANDLE dir_handle;
- union string section = { NULL }, name;
+ union string section = { NULL }, name, file_name, cfg_file_name = {NULL};
bool_t base_video = 0;
UINT32 mmap_desc_ver = 0;
UINTN mmap_size, mmap_desc_size, mmap_key = 0;
@@ -590,7 +604,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
trampoline_xen_phys_start = xen_phys_start;
/* Get the file system interface. */
- dir_handle = get_parent_handle(loaded_image, &file_name);
+ dir_handle = get_parent_handle(loaded_image, &file_name.w);
argc = get_argv(0, NULL, loaded_image->LoadOptions,
loaded_image->LoadOptionsSize, &options);
@@ -614,9 +628,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
if ( wstrcmp(ptr + 1, L"basevideo") == 0 )
base_video = 1;
else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 )
- cfg_file_name = ptr + 5;
+ cfg_file_name.w = ptr + 5;
else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 )
- cfg_file_name = argv[++i];
+ cfg_file_name.w = argv[++i];
else if ( wstrcmp(ptr + 1, L"help") == 0 ||
(ptr[1] == L'?' && !ptr[2]) )
{
@@ -684,24 +698,26 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
gop = NULL;
/* Read and parse the config file. */
- if ( !cfg_file_name )
+ if ( !cfg_file_name.w )
{
CHAR16 *tail;
- while ( (tail = point_tail(file_name)) != NULL )
+ while ( (tail = point_tail(file_name.w)) != NULL )
{
wstrcpy(tail, L".cfg");
- if ( read_file(dir_handle, file_name, &cfg) )
+ if ( read_file(dir_handle, &cfg, w2s(&file_name)) )
break;
*tail = 0;
}
if ( !tail )
blexit(L"No configuration file found.");
PrintStr(L"Using configuration file '");
- PrintStr(file_name);
+ s2w(&file_name);
+ PrintStr(file_name.w);
PrintStr(L"'\r\n");
+ efi_bs->FreePool(file_name.w);
}
- else if ( !read_file(dir_handle, cfg_file_name, &cfg) )
+ else if ( !read_file(dir_handle, &cfg, w2s(&cfg_file_name)) )
blexit(L"Configuration file not found.");
pre_parse(&cfg);
@@ -720,7 +736,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
break;
efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size));
cfg.addr = 0;
- if ( !read_file(dir_handle, s2w(&name), &cfg) )
+ if ( !read_file(dir_handle, &cfg, name.s) )
{
PrintStr(L"Chained configuration file '");
PrintStr(name.w);
@@ -735,9 +751,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
efi_arch_cfg_file(dir_handle, section.s);
- split_value(name.s);
- read_file(dir_handle, s2w(&name), &kernel);
- efi_bs->FreePool(name.w);
+ read_file(dir_handle, &kernel, name.s);
if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL,
(void **)&shim_lock)) &&
@@ -747,17 +761,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
name.s = get_value(&cfg, section.s, "ramdisk");
if ( name.s )
{
- split_value(name.s);
- read_file(dir_handle, s2w(&name), &ramdisk);
- efi_bs->FreePool(name.w);
+ read_file(dir_handle, &ramdisk, name.s);
}
name.s = get_value(&cfg, section.s, "xsm");
if ( name.s )
{
- split_value(name.s);
- read_file(dir_handle, s2w(&name), &xsm);
- efi_bs->FreePool(name.w);
+ read_file(dir_handle, &xsm, name.s);
}
cols = rows = depth = 0;
@@ -601,9 +601,7 @@ static void __init efi_arch_cfg_file(EFI_FILE_HANDLE dir_handle, char *section)
if ( name.s )
{
microcode_set_module(mbi.mods_count);
- split_value(name.s);
- read_file(dir_handle, s2w(&name), &ucode);
- efi_bs->FreePool(name.w);
+ read_file(dir_handle, &ucode, name.s);
}
}
static void __init efi_arch_handle_cmdline(CHAR16 *image_name,
@@ -972,3 +970,14 @@ static void __init efi_arch_memory(void)
l3_bootmap[l3_table_offset(xen_phys_start + (8 << L2_PAGETABLE_SHIFT) - 1)] =
l3e_from_paddr((UINTN)l2_bootmap, __PAGE_HYPERVISOR);
}
+
+static void __init efi_arch_handle_module(struct file *file, char *name,
+ char *options)
+{
+ place_string(&mb_modules[mbi.mods_count].string, options);
+ place_string(&mb_modules[mbi.mods_count].string, "");
+ place_string(&mb_modules[mbi.mods_count].string, name);
+ mb_modules[mbi.mods_count].mod_start = file->addr >> PAGE_SHIFT;
+ mb_modules[mbi.mods_count].mod_end = file->size;
+ ++mbi.mods_count;
+}
Each architecture tracks modules differently internally, so add efi_arch_handle_module() routine to enable the common code to invoke the proper handling of modules as the are loaded. Signed-off-by: Roy Franz <roy.franz@linaro.org> --- xen/common/efi/boot.c | 98 +++++++++++++++++++++++------------------- xen/include/asm-x86/efi-boot.h | 15 +++++-- 2 files changed, 66 insertions(+), 47 deletions(-)