Different architectures have some different configuration file fields that need to be handled. In particular, x86 has ucode and ARM has device tree files to be loaded. This arch specific function is used to allow each architecture to implement these features in arch specific code.
Signed-off-by: Roy Franz roy.franz@linaro.org --- xen/common/efi/boot.c | 30 ++++++++++++++---------------- xen/include/asm-x86/efi-boot.h | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index ca86beb..a33a8f6 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -31,11 +31,6 @@ typedef struct { EFI_SHIM_LOCK_VERIFY Verify; } EFI_SHIM_LOCK_PROTOCOL;
-static CHAR16 *__init FormatDec(UINT64 Val, CHAR16 *Buffer); -static CHAR16 *__init FormatHex(UINT64 Val, UINTN Width, CHAR16 *Buffer); -static void __init DisplayUint(UINT64 Val, INTN Width); -static CHAR16 *__init wstrcpy(CHAR16 *d, const CHAR16 *s); - union string { CHAR16 *w; char *s; @@ -50,6 +45,17 @@ struct file { }; };
+static CHAR16 *__init FormatDec(UINT64 Val, CHAR16 *Buffer); +static CHAR16 *__init FormatHex(UINT64 Val, UINTN Width, CHAR16 *Buffer); +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 bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, + struct file *file); + static EFI_BOOT_SERVICES *__initdata efi_bs; static EFI_HANDLE __initdata efi_ih;
@@ -752,6 +758,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) } if ( !name.s ) blexit(L"No Dom0 kernel image specified."); + + efi_arch_cfg_file(dir_handle, section.s); + split_value(name.s); read_file(dir_handle, s2w(&name), &kernel); efi_bs->FreePool(name.w); @@ -769,17 +778,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_bs->FreePool(name.w); }
- name.s = get_value(&cfg, section.s, "ucode"); - if ( !name.s ) - name.s = get_value(&cfg, "global", "ucode"); - 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); - } - name.s = get_value(&cfg, section.s, "xsm"); if ( name.s ) { diff --git a/xen/include/asm-x86/efi-boot.h b/xen/include/asm-x86/efi-boot.h index 08ff9a5..42b087e 100644 --- a/xen/include/asm-x86/efi-boot.h +++ b/xen/include/asm-x86/efi-boot.h @@ -591,3 +591,18 @@ static void __init efi_arch_post_exit_boot(void) "D" (&mbi) : "memory" ); } + +static void __init efi_arch_cfg_file(EFI_FILE_HANDLE dir_handle, char *section) +{ + union string name; + name.s = get_value(&cfg, section, "ucode"); + if ( !name.s ) + name.s = get_value(&cfg, "global", "ucode"); + 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); + } +}