Linaro-uefi

linaro-uefi@lists.linaro.org

811 discussions

by Sandeep Paulraj

Hi, Has anybody tried using efibootmgr on the Juno Board? I am using linaro-image-lamp-genericarmv8-20141212-729.rootfs.tar.gz <http://releases.linaro.org/latest/members/arm/openembedded/juno-lsk/linaro-…> from http://releases.linaro.org/latest/members/arm/openembedded/juno-lsk However, i see issues while using efibootmgr root@genericarmv8:~# efibootmgr -V version unknown (fix Makefile!) root@genericarmv8:~# efibootmgr -a Fatal: Couldn't open either sysfs or procfs directories for accessing EFI variables. Try 'modprobe efivars' as root. --Sandeep

10 years, 3 months

kernel memory allocation issue with uefi

by varadgautam＠gmail.com

I get the following error while loading the LEG-UEFI kernel [1] on a BeagleBone Black (omap2plus_defconfig + efi stub support) when the kernel requests memory from UEFI.: Shell> zImage EFI stub: Booting Linux Kernel... ConvertPages: failed to find range 80800000 - 81FFFFFF EFI stub: ERROR: Unable to allocate memory for uncompressed kernel. EFI stub: ERROR: Failed to relocate kernel Error: Image at 0009A3F8000 start failed: Load Error Unloading driver at 0x0009A3F8000 Error reported: Load Error `memmap` shows the map to have a gap from 80800000 - 81FFFFFF (PcdFdBaseAddress for BBB UEFI is 0x80800000, so that's where I have UEFI loaded). Does this mean I should adjust the BBB memory map so that all external allocations are done *after* the UEFI region (possibly by reserving the lower addresses)? Is there an alternate way of getting the kernel up? Shell> memmap Type Start End #pages Attributes LoaderData 0000000080000000-00000000807FFFFF 0000000000000800 000000000000000F Available 0000000080A00000-000000009A6BBFFF 0000000000019CBC 000000000000000F LoaderCode 000000009A6BC000-000000009A779FFF 00000000000000BE 000000000000000F Reserved 000000009A77A000-000000009A77DFFF 0000000000000004 000000000000000F RT_Code 000000009A77E000-000000009A78AFFF 000000000000000D 800000000000000F Available 000000009A78B000-000000009EE54FFF 00000000000046CA 000000000000000F BS_Data 000000009EE55000-000000009EE79FFF 0000000000000025 000000000000000F Available 000000009EE7A000-000000009EE9EFFF 0000000000000025 000000000000000F BS_Data 000000009EE9F000-000000009EEABFFF 000000000000000D 000000000000000F Available 000000009EEAC000-000000009EEB2FFF 0000000000000007 000000000000000F BS_Data 000000009EEB3000-000000009F400FFF 000000000000054E 000000000000000F Available 000000009F401000-000000009F401FFF 0000000000000001 000000000000000F BS_Data 000000009F402000-000000009F5BEFFF 00000000000001BD 000000000000000F Available 000000009F5BF000-000000009F646FFF 0000000000000088 000000000000000F BS_Code 000000009F647000-000000009F74EFFF 0000000000000108 000000000000000F RT_Code 000000009F74F000-000000009F762FFF 0000000000000014 800000000000000F RT_Data 000000009F763000-000000009F794FFF 0000000000000032 800000000000000F BS_Data 000000009F795000-000000009F795FFF 0000000000000001 000000000000000F RT_Data 000000009F796000-000000009F796FFF 0000000000000001 800000000000000F BS_Data 000000009F797000-000000009F7ACFFF 0000000000000016 000000000000000F RT_Data 000000009F7AD000-000000009F7ADFFF 0000000000000001 800000000000000F BS_Data 000000009F7AE000-000000009FFFFFFF 0000000000000852 000000000000000F Reserved : 4 Pages (16,384) LoaderCode: 190 Pages (778,240) LoaderData: 2,048 Pages (8,388,608) BS_Code : 264 Pages (1,081,344) BS_Data : 4,006 Pages (16,408,576) RT_Code : 33 Pages (135,168) RT_Data : 52 Pages (212,992) ACPI Recl : 0 Pages (0) ACPI NVS : 0 Pages (0) MMIO : 0 Pages (0) Available : 123,963 Pages (507,752,448) Total Memory: 510 MB (534,773,760 Bytes) [1] https://git.linaro.org/people/leif.lindholm/linux.git/shortlog/refs/heads/t… Thanks, Varad

10 years, 3 months

[RFC PATCH 0/5] OvmfPkg/XenBusDxe: add ARM support

by Ard Biesheuvel

This series adds ARM support to the XenBusDxe driver. It consists of an implementation of the hypercall interface, changes to work around the lack of PCI, and a bugfix. Finally, patch #5 wires it up to the VirtFdtDxe driver that is used in the ARM VM port, and will also be used by the Xen/ARM targeted port. Note that this is build tested only, both on ARM and x86. I am struggling to get access to suitable ARM hardware, and running Xen on my Macbook has proven to be a discouraging experience, hence the 'RFC' status of this patches. If anyone feels adventurous and bored, it would be good to know that I did not break x86 support in this series, so any testing is highly appreciated. Ard Biesheuvel (5): Ovmf/Xen: move arch specific hypercall implementation to XenHypercallLib Ovmf/Xen: allow non-PCI usage of XenBusDxe Ovmf/Xen: add ARM and AArch64 support to XenBusDxe Ovmf/Xen: fix pointer to int cast in XenBusDxe ArmVirtualizationPkg/VirtFdtDxe: wire up XenBusDxe to "xen,xen" DT node .../ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c | 33 ++ .../ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf | 1 + .../Include/IndustryStandard/Xen/arch-arm/xen.h | 436 +++++++++++++++++++++ OvmfPkg/Include/IndustryStandard/Xen/xen.h | 2 +- OvmfPkg/Include/Library/XenHypercallLib.h | 36 ++ OvmfPkg/Include/Protocol/XenIo.h | 48 +++ .../Library/XenHypercallLib/Aarch64/Hypercall.S | 26 ++ OvmfPkg/Library/XenHypercallLib/Arm/Hypercall.S | 25 ++ .../XenHypercallLib}/Ia32/hypercall.nasm | 6 +- .../XenHypercallLib}/X64/hypercall.nasm | 6 +- .../Library/XenHypercallLib/XenHypercallLibArm.inf | 37 ++ .../Library/XenHypercallLib/XenHypercallLibIntel.c | 77 ++++ .../XenHypercallLib/XenHypercallLibIntel.inf | 48 +++ OvmfPkg/OvmfPkg.dec | 5 + OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + OvmfPkg/XenBusDxe/AtomicsGcc.c | 44 +++ OvmfPkg/XenBusDxe/ComponentName.c | 2 +- OvmfPkg/XenBusDxe/GrantTable.c | 9 +- OvmfPkg/XenBusDxe/GrantTable.h | 3 +- OvmfPkg/XenBusDxe/XenBus.c | 6 +- OvmfPkg/XenBusDxe/XenBusDxe.c | 192 +++++++-- OvmfPkg/XenBusDxe/XenBusDxe.h | 3 +- OvmfPkg/XenBusDxe/XenBusDxe.inf | 13 +- OvmfPkg/XenBusDxe/XenHypercall.c | 30 +- OvmfPkg/XenBusDxe/XenHypercall.h | 31 -- 27 files changed, 1002 insertions(+), 120 deletions(-) create mode 100644 OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h create mode 100644 OvmfPkg/Include/Library/XenHypercallLib.h create mode 100644 OvmfPkg/Include/Protocol/XenIo.h create mode 100644 OvmfPkg/Library/XenHypercallLib/Aarch64/Hypercall.S create mode 100644 OvmfPkg/Library/XenHypercallLib/Arm/Hypercall.S rename OvmfPkg/{XenBusDxe => Library/XenHypercallLib}/Ia32/hypercall.nasm (81%) rename OvmfPkg/{XenBusDxe => Library/XenHypercallLib}/X64/hypercall.nasm (78%) create mode 100644 OvmfPkg/Library/XenHypercallLib/XenHypercallLibArm.inf create mode 100644 OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.c create mode 100644 OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf create mode 100644 OvmfPkg/XenBusDxe/AtomicsGcc.c -- 1.8.3.2

10 years, 3 months

[PATCH 5/5] arm64: Add the introduction of multiboot/module command

by Fu Wei

in docs/grub.texi Signed-off-by: Fu Wei <fu.wei(a)linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm(a)linaro.org> --- docs/grub.texi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/grub.texi b/docs/grub.texi index 46b9e7f..f903413 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -4512,6 +4512,14 @@ Alias for @code{hashsum --hash md5 arg @dots{}}. See command @command{hashsum} @deffn Command module [--nounzip] file [arguments] Load a module for multiboot kernel image. The rest of the line is passed verbatim as the module command line. +Platforms that use the Xen fdt multiboot protocol differ in the following way: + +- The --nounzip option is not supported. + +- There is a [--type <compatible stream>] option to override default +compatible string for the current module. +See @uref{http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot}, + to obtain more information. @end deffn @node multiboot @@ -4523,6 +4531,8 @@ line is passed verbatim as the @dfn{kernel command-line}. Any module must be reloaded after using this command (@pxref{module}). Some kernels have known problems. You need to specify --quirk-* for those. +Platforms that use the Xen fdt multiboot protocol do not support --quirk-*. + --quirk-bad-kludge is a problem seen in several products that they include loading kludge information with invalid data in ELF file. GRUB prior to 0.97 and some custom builds prefered ELF information while 0.97 and GRUB 2 -- 1.8.3.1

10 years, 4 months

[PATCH 4/5] arm64: Add multiboot support file

by Fu Wei

grub-core/loader/arm64/multiboot.c include/grub/arm64/multiboot.h Add commands register code and hearder file into grub-core/loader/arm64/linux.c - This multiboot support is built into linux module for aarch64. - The implementation for Xen is following <Multiboot on ARM Specification>: http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot and xen/docs/misc/arm/device-tree/booting.txt in Xen source code. - This adds support for the Xen Multiboot on ARM specification for arm64, enabling config file portability across the architectures. - The multiboot command is currently x86-only, so reusing these command names should not conflict with any future additions of ARM support to multiboot2. - The reason of adding this functionality to the existing "linux" module rather than "multiboot(2)" (1)multiboot is x86 only (2)Multiboot is added to "linux" module because it reuses existing code. Signed-off-by: Fu Wei <fu.wei(a)linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm(a)linaro.org> --- grub-core/Makefile.core.def | 1 + grub-core/loader/arm64/linux.c | 6 + grub-core/loader/arm64/multiboot.c | 593 +++++++++++++++++++++++++++++++++++++ include/grub/arm64/multiboot.h | 115 +++++++ 4 files changed, 715 insertions(+) create mode 100644 grub-core/loader/arm64/multiboot.c create mode 100644 include/grub/arm64/multiboot.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 42443bc..b963a62 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1673,6 +1673,7 @@ module = { ia64_efi = loader/ia64/efi/linux.c; arm = loader/arm/linux.c; arm64 = loader/arm64/linux.c; + arm64 = loader/arm64/multiboot.c; fdt = lib/fdt.c; common = loader/linux.c; common = lib/cmdline.c; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index e9e9a29..4416535 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -26,6 +26,7 @@ #include <grub/mm.h> #include <grub/types.h> #include <grub/cpu/linux.h> +#include <grub/cpu/multiboot.h> #include <grub/efi/efi.h> #include <grub/efi/pe32.h> #include <grub/i18n.h> @@ -470,6 +471,9 @@ GRUB_MOD_INIT (linux) cmd_devicetree = grub_register_command ("devicetree", grub_cmd_devicetree, 0, N_("Load DTB file.")); + + grub_arm64_linux_register_multiboot_command (mod); + my_mod = mod; } @@ -478,4 +482,6 @@ GRUB_MOD_FINI (linux) grub_unregister_command (cmd_linux); grub_unregister_command (cmd_initrd); grub_unregister_command (cmd_devicetree); + + grub_arm64_linux_unregister_multiboot_command (); } diff --git a/grub-core/loader/arm64/multiboot.c b/grub-core/loader/arm64/multiboot.c new file mode 100644 index 0000000..a9538b8 --- /dev/null +++ b/grub-core/loader/arm64/multiboot.c @@ -0,0 +1,593 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2014 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <grub/cache.h> +#include <grub/charset.h> +#include <grub/command.h> +#include <grub/err.h> +#include <grub/file.h> +#include <grub/fdt.h> +#include <grub/linux.h> +#include <grub/list.h> +#include <grub/loader.h> +#include <grub/misc.h> +#include <grub/mm.h> +#include <grub/types.h> +#include <grub/cpu/linux.h> +#include <grub/cpu/multiboot.h> +#include <grub/efi/efi.h> +#include <grub/efi/pe32.h> +#include <grub/i18n.h> +#include <grub/lib/cmdline.h> + +static grub_dl_t linux_mod; +static int loaded; + +static struct multiboot_binary *multiboot_kernel = NULL; +static struct multiboot_binary *module_head = NULL; +static const grub_size_t module_default_align[] = { + MODULE_IMAGE_MIN_ALIGN, + MODULE_INITRD_MIN_ALIGN, + MODULE_OTHER_MIN_ALIGN, + MODULE_CUSTOM_MIN_ALIGN +}; + +static void *multiboot_fdt = NULL; +static const compat_string_struct_t default_compat_string[] = { + FDT_COMPATIBLE (MODULE_IMAGE_COMPATIBLE), + FDT_COMPATIBLE (MODULE_INITRD_COMPATIBLE), + FDT_COMPATIBLE (MODULE_OTHER_COMPATIBLE) +}; + +static grub_err_t +set_module_type (struct multiboot_binary *module, + int argc, char *argv[], int *file_name_index) +{ + static module_type_t default_type = MODULE_IMAGE; + char *temp = NULL; + grub_size_t total_size = 0; + int num_types = 0, i; + char **compat_string_temp_array = + (char **) grub_zalloc (sizeof (char *) * argc); + + *file_name_index = 0; + + /* if there are some options we need to process. */ + if (argc >= 3) + { + while (argc > 1) + { + if (grub_strcmp (argv[0], "--type") == 0) + { + module->node_info.type = MODULE_CUSTOM; + ARG_SHIFT(argc, argv); + total_size += grub_strlen (argv[0]) + 1; + compat_string_temp_array[num_types++] = argv[0]; + ARG_SHIFT(argc, argv); + (*file_name_index) += 2; + } + else + /* we can add more options process code here. */ + break; + } + } + + /* For the default module type : + * The implementation is following <Multiboot on ARM Specification>: + * Each module will be given a default compatibility property + * based on the order in which the modules are added. + * The 1st module: compatible = "multiboot,kernel", "multiboot,module" + * The 2nd module: compatible = "multiboot,ramdisk", "multiboot,module" + * All subsequent modules: compatible = "multiboot,module" + * But this order will NOT be interfered with "--type"(MODULE_CUSTOM) + * For more detail, please refer to: + * http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot + */ + if (module->node_info.type != MODULE_CUSTOM) + { + /* the module type is set by the load order */ + module->node_info.type = default_type; + switch (default_type) + { + case MODULE_IMAGE: + default_type = MODULE_INITRD; + break; + + case MODULE_INITRD: + default_type = MODULE_OTHER; + break; + + case MODULE_OTHER: + break; + + default: + default_type = MODULE_IMAGE; /* error, reset the type */ + return (grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid argument"))); + } + } + else + { + /* the module type is set by "--type"(MODULE_CUSTOM) */ + module->node_info.compat_string = temp = + (char *) grub_zalloc (total_size); + module->node_info.compat_string_size = total_size; + for (i = 0; num_types > 0; num_types--, i++, temp++) + { + grub_strcpy (temp, compat_string_temp_array[i]); + temp += grub_strlen (compat_string_temp_array[i]); + } + } + + grub_free (compat_string_temp_array); + return (GRUB_ERR_NONE); +} + +static grub_err_t +prepare_kernel_params (void) +{ + int retval; + int chosen_node = 0; + + multiboot_fdt = grub_linux_get_fdt (); + if (!multiboot_fdt) + return (grub_error (GRUB_ERR_BAD_OS, "failed to install/update FDT")); + + chosen_node = grub_fdt_find_subnode (multiboot_fdt, 0, "chosen"); + if (chosen_node < 0) + chosen_node = grub_fdt_add_subnode (multiboot_fdt, 0, "chosen"); + if (chosen_node < 1) + return (grub_error (GRUB_ERR_BAD_OS, "failed to install/update FDT")); + + grub_dprintf ("multiboot_loader", + "Multiboot Kernel cmdline : %s @ %p size:%d\n", + multiboot_kernel->cmdline, multiboot_kernel->cmdline, + multiboot_kernel->cmdline_size); + + retval = grub_fdt_set_prop (multiboot_fdt, chosen_node, "bootargs", + multiboot_kernel->cmdline, + multiboot_kernel->cmdline_size); + if (retval) + return grub_error (GRUB_ERR_BAD_OS, "failed to install/update FDT"); + + return (GRUB_ERR_NONE); +} + +static grub_err_t +prepare_module_params (struct multiboot_binary *module) +{ + int retval, chosen_node = 0, module_node = 0; + char module_name[FDT_NODE_NAME_MAX_SIZE]; + + retval = grub_snprintf (module_name, FDT_NODE_NAME_MAX_SIZE, + "module@%lx", + multiboot_address_align (module->start, + module->align)); + grub_dprintf ("multiboot_loader", "Module node name %s \n", module_name); + + if (retval < (int) sizeof ("module@")) + return (grub_error (GRUB_ERR_BAD_OS, + N_("failed to install/update FDT"))); + + chosen_node = grub_fdt_find_subnode (multiboot_fdt, 0, "chosen"); + if (chosen_node < 0) + chosen_node = grub_fdt_add_subnode (multiboot_fdt, 0, "chosen"); + if (chosen_node < 1) + return (grub_error (GRUB_ERR_BAD_OS, "failed to install/update FDT")); + + module_node = + grub_fdt_find_subnode (multiboot_fdt, chosen_node, module_name); + if (module_node < 0) + module_node = + grub_fdt_add_subnode (multiboot_fdt, chosen_node, module_name); + + retval = grub_fdt_set_prop (multiboot_fdt, module_node, "compatible", + module->node_info.compat_string, + (grub_uint32_t) module->node_info.compat_string_size); + if (retval) + return (grub_error (GRUB_ERR_BAD_OS, + N_("failed to install/update FDT"))); + + grub_dprintf ("multiboot_loader", + "Module %s compatible = %s size = 0x%lx\n", module->name, + module->node_info.compat_string, + module->node_info.compat_string_size); + + retval = grub_fdt_set_reg64 (multiboot_fdt, module_node, + multiboot_address_align (module->start, + module->align), + module->size); + if (retval) + return (grub_error (GRUB_ERR_BAD_OS, + N_("failed to install/update FDT"))); + + if ((module->cmdline) && (module->cmdline_size > 0)) + { + grub_dprintf ("multiboot_loader", + "Module %s cmdline : %s @ %p size:%d\n", module->name, + module->cmdline, module->cmdline, module->cmdline_size); + + retval = grub_fdt_set_prop (multiboot_fdt, module_node, + "bootargs", module->cmdline, + module->cmdline_size + 1); + if (retval) + return (grub_error (GRUB_ERR_BAD_OS, + "failed to install/update FDT")); + } + else + { + grub_dprintf ("multiboot_loader", "Module %s has not bootargs!\n", + module->name); + } + + return (GRUB_ERR_NONE); +} + +static grub_err_t +install_all_params (void) +{ + grub_efi_boot_services_t *b; + grub_efi_status_t status; + grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; + + b = grub_efi_system_table->boot_services; + status = b->install_configuration_table (&fdt_guid, multiboot_fdt); + if (status != GRUB_EFI_SUCCESS) + return grub_error (GRUB_ERR_BAD_OS, "failed to install/update FDT"); + + grub_dprintf ("multiboot_loader", + "Installed/updated FDT configuration table @ %p\n", + multiboot_fdt); + return (GRUB_ERR_NONE); +} + +static grub_err_t +clean_all_params (void) +{ + if (multiboot_fdt) + { + grub_efi_free_pages ((grub_efi_physical_address_t) multiboot_fdt, + BYTES_TO_PAGES (grub_fdt_get_totalsize + (multiboot_fdt))); + multiboot_fdt = NULL; + } + return (GRUB_ERR_NONE); +} + +static grub_err_t +finalize_params_multiboot (void) +{ + struct multiboot_binary *module; + + if (multiboot_kernel) + { + if (prepare_kernel_params () != GRUB_ERR_NONE) + goto fail; + } + else + { + grub_dprintf ("multiboot_loader", + "Failed to get Multiboot Kernel info!\n"); + goto fail; + } + + /* Set module params info */ + FOR_LIST_ELEMENTS (module, module_head) + { + if (module->start && module->size > 0) + { + grub_dprintf ("multiboot_loader", "Module %s @ 0x%lx size:0x%lx\n", + module->name, + multiboot_address_align (module->start, module->align), + module->size); + if (prepare_module_params (module) != GRUB_ERR_NONE) + goto fail; + } + else + { + grub_dprintf ("multiboot_loader", "Module info error: %s!\n", + module->name); + goto fail; + } + } + + if (install_all_params () == GRUB_ERR_NONE) + return (GRUB_ERR_NONE); + +fail: + clean_all_params (); + return (grub_error (GRUB_ERR_BAD_OS, "failed to install/update FDT")); +} + + +static grub_err_t +multiboot_boot (void) +{ + if (finalize_params_multiboot () != GRUB_ERR_NONE) + return (grub_errno); + + return (grub_arm64_uefi_boot_image + (multiboot_kernel->start, multiboot_kernel->size, + multiboot_kernel->cmdline)); +} + +static void +single_binary_unload (struct multiboot_binary *binary) +{ + if (binary && binary->start && binary->size > 0) + { + grub_efi_free_pages ((grub_efi_physical_address_t) binary->start, + BYTES_TO_PAGES (binary->size + binary->align)); + } + if (binary && binary->cmdline && binary->cmdline_size > 0) + { + grub_free (binary->cmdline); + grub_dprintf ("multiboot_loader", + "Module %s cmdline memory free @ %p size: %d\n", + binary->name, binary->cmdline, binary->cmdline_size); + } + if (binary) + { + if (binary->node_info.type == MODULE_CUSTOM) + grub_free ((void *) binary->node_info.compat_string); + if (grub_strcmp (binary->name, MULTIBOOT_KERNEL_NAME) != 0) + grub_list_remove (GRUB_AS_LIST (binary)); + grub_dprintf ("multiboot_loader", + "Module %s struct memory free @ %p size: 0x%lx\n", + binary->name, binary, sizeof (binary)); + grub_free (binary); + } + return; +} + +static void +all_binaries_unload (void) +{ + struct multiboot_binary *binary; + + FOR_LIST_ELEMENTS (binary, module_head) + { + single_binary_unload (binary); + } + + if (multiboot_kernel) + single_binary_unload (multiboot_kernel); + + return; +} + +static grub_err_t +multiboot_unload (void) +{ + loaded = 0; + all_binaries_unload (); + clean_all_params (); + grub_dl_unref (linux_mod); + + return (GRUB_ERR_NONE); +} + +static grub_err_t +multiboot_binary_load (struct multiboot_binary *binary, grub_file_t file, + int argc, char *argv[]) +{ + binary->size = grub_file_size (file); + grub_dprintf ("multiboot_loader", "Multiboot %s file size: 0x%lx\n", + binary->name, binary->size); + + binary->start = (grub_addr_t) grub_efi_allocate_pages (0, + (BYTES_TO_PAGES + (binary->size + + binary->align))); + if (!binary->start) + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + + grub_dprintf ("multiboot_loader", "Multiboot %s numpages: 0x%lx\n", + binary->name, BYTES_TO_PAGES (binary->size + binary->align)); + + if (grub_file_read (file, + (void *) multiboot_address_align (binary->start, + binary->align), + binary->size) < (grub_ssize_t) binary->size) + { + single_binary_unload (binary); + return (grub_error (GRUB_ERR_BAD_OS, + N_("premature end of file %s"), argv[0])); + } + + /* Skip the multiboot binary file name */ + ARG_SHIFT(argc, argv); + + if (argc > 0) + { + binary->cmdline_size = grub_loader_cmdline_size (argc, argv); + binary->cmdline = grub_zalloc (binary->cmdline_size); + if (!binary->cmdline) + { + single_binary_unload (binary); + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + } + grub_create_loader_cmdline (argc, argv, + binary->cmdline, binary->cmdline_size); + grub_dprintf ("multiboot_loader", + "Multiboot %s cmdline @ %p %s, size: %d\n", binary->name, + binary->cmdline, binary->cmdline, binary->cmdline_size); + } + else + { + binary->cmdline_size = 0; + binary->cmdline = NULL; + } + + return (GRUB_ERR_NONE); +} + +static grub_err_t +grub_cmd_module (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) +{ + + grub_file_t file = 0; + struct multiboot_binary *module = NULL; + int file_name_index = 0; + + if (argc == 0) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + goto fail; + } + + if (!loaded) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("you need to load the kernel first")); + goto fail; + } + + module = + (struct multiboot_binary *) + grub_zalloc (sizeof (struct multiboot_binary)); + if (!module) + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + + /* process all the options and get module type */ + if (set_module_type (module, argc, argv, &file_name_index) != GRUB_ERR_NONE) + goto fail; + switch (module->node_info.type) + { + case MODULE_IMAGE: + case MODULE_INITRD: + case MODULE_OTHER: + module->node_info.compat_string = + default_compat_string[module->node_info.type].compat_string; + module->node_info.compat_string_size = + default_compat_string[module->node_info.type].size; + break; + + case MODULE_CUSTOM: + /* we have set the node_info in set_module_type */ + break; + + default: + return (grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid argument"))); + } + module->name = module->node_info.compat_string; + module->align = module_default_align[module->node_info.type]; + + grub_dprintf ("multiboot_loader", "Init %s module and node info:\n" + "compatible %s\ncompat_string_size 0x%lx\n", + module->name, + module->node_info.compat_string, + module->node_info.compat_string_size); + + file = grub_file_open (argv[file_name_index]); + if (!file) + goto fail; + + grub_errno = multiboot_binary_load (module, file, + (argc - file_name_index), + (argv + file_name_index)); + + if (grub_errno == GRUB_ERR_NONE) + grub_list_push (GRUB_AS_LIST_P (&module_head), GRUB_AS_LIST (module)); + +fail: + if (file) + grub_file_close (file); + if (grub_errno != GRUB_ERR_NONE) + single_binary_unload (module); + + return (grub_errno); +} + +static grub_err_t +grub_cmd_multiboot (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) +{ + grub_file_t file = NULL; + struct kernel_header sh; + + grub_dl_ref (linux_mod); + + if (argc == 0) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + goto fail; + } + + file = grub_file_open (argv[0]); + if (!file) + goto fail; + + if (grub_file_read (file, &sh, sizeof (sh)) < (long) sizeof (sh)) + goto fail; + if (grub_arm64_uefi_check_image + ((struct grub_arm64_linux_kernel_header *) &sh) != GRUB_ERR_NONE) + goto fail; + grub_file_seek (file, 0); + + grub_loader_unset (); + + multiboot_kernel = + (struct multiboot_binary *) + grub_zalloc (sizeof (struct multiboot_binary)); + if (!multiboot_kernel) + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + + multiboot_kernel->name = MULTIBOOT_KERNEL_NAME; + multiboot_kernel->align = (grub_size_t) sh.optional_header.section_alignment; + + grub_errno = multiboot_binary_load (multiboot_kernel, file, argc, argv); + if (grub_errno == GRUB_ERR_NONE) + { + grub_loader_set (multiboot_boot, multiboot_unload, 0); + loaded = 1; + } + +fail: + if (file) + grub_file_close (file); + if (grub_errno != GRUB_ERR_NONE) + { + loaded = 0; + all_binaries_unload (); + grub_dl_unref (linux_mod); + } + + return (grub_errno); +} + +static grub_command_t cmd_multiboot, cmd_module; + +void +grub_arm64_linux_register_multiboot_command (grub_dl_t mod) +{ + cmd_multiboot = + grub_register_command ("multiboot", grub_cmd_multiboot, 0, + N_("Load a multiboot kernel.")); + cmd_module = + grub_register_command ("module", grub_cmd_module, 0, + N_("Load a multiboot module.")); + linux_mod = mod; +} + +void +grub_arm64_linux_unregister_multiboot_command (void) +{ + grub_unregister_command (cmd_multiboot); + grub_unregister_command (cmd_module); +} diff --git a/include/grub/arm64/multiboot.h b/include/grub/arm64/multiboot.h new file mode 100644 index 0000000..d69c92a --- /dev/null +++ b/include/grub/arm64/multiboot.h @@ -0,0 +1,115 @@ +/* + * multiboot.h - Multiboot header file for Xen multiboot via FDT + * on AArch64 architecture. + * Copyright (C) 2014 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MULTIBOOT_HEADER +#define MULTIBOOT_HEADER 1 + +#include <grub/list.h> +#include <grub/types.h> +#include <grub/efi/pe32.h> /* required by struct kernel_header */ + +#define MULTIBOOT_KERNEL_NAME "multiboot_kernel" + +#define MODULE_DEFAULT_ALIGN (0x0) +#define MODULE_IMAGE_MIN_ALIGN MODULE_DEFAULT_ALIGN +#define MODULE_INITRD_MIN_ALIGN MODULE_DEFAULT_ALIGN +#define MODULE_OTHER_MIN_ALIGN MODULE_DEFAULT_ALIGN +#define MODULE_CUSTOM_MIN_ALIGN MODULE_DEFAULT_ALIGN + +#define MODULE_IMAGE_COMPATIBLE "multiboot,kernel\0multiboot,module" +#define MODULE_INITRD_COMPATIBLE "multiboot,ramdisk\0multiboot,module" +#define MODULE_OTHER_COMPATIBLE "multiboot,module" + +/* This maximum size is defined in Power.org ePAPR V1.1 + * https://www.power.org/documentation/epapr-version-1-1/ + * 2.2.1.1 Node Name Requirements + * node-name@unit-address + * 31 + 1(@) + 16(64bit address in hex format) + 1(\0) = 49 + */ +#define FDT_NODE_NAME_MAX_SIZE (49) + +#define ARG_SHIFT(argc, argv) \ + do { \ + (argc)--; \ + (argv)++; \ + } while (0) + +struct compat_string_struct +{ + grub_size_t size; + const char *compat_string; +}; +typedef struct compat_string_struct compat_string_struct_t; +#define FDT_COMPATIBLE(x) {.size = sizeof(x), .compat_string = x} + +enum module_type +{ + MODULE_IMAGE, + MODULE_INITRD, + MODULE_OTHER, + MODULE_CUSTOM +}; +typedef enum module_type module_type_t; + +struct fdt_node_info +{ + module_type_t type; + + const char *compat_string; + grub_size_t compat_string_size; +}; + +struct kernel_header +{ + struct grub_arm64_linux_kernel_header efi_head; + + /* This is always PE\0\0. */ + grub_uint8_t signature[GRUB_PE32_SIGNATURE_SIZE]; + /* The COFF file header. */ + struct grub_pe32_coff_header coff_header; + /* The Optional header. */ + struct grub_pe64_optional_header optional_header; +}; + +struct multiboot_binary +{ + struct multiboot_binary *next; + struct multiboot_binary **prev; + const char *name; + + grub_addr_t start; + grub_size_t size; + grub_size_t align; + + char *cmdline; + int cmdline_size; + + struct fdt_node_info node_info; +}; + +void grub_arm64_linux_register_multiboot_command (grub_dl_t mod); +void grub_arm64_linux_unregister_multiboot_command (void); + +static __inline grub_addr_t +multiboot_address_align (grub_addr_t start, grub_size_t align) +{ + return (align ? (ALIGN_UP (start, align)) : start); +} + +#endif /* ! MULTIBOOT_HEADER */ -- 1.8.3.1

10 years, 4 months

[PATCH 3/5] arm64: Remove "loaded" checking in the grub_cmd_devicetree of linux.c

by Fu Wei

Reason: (1)we don't need the check, actually (2)it is a prerequisite for multiboot support Signed-off-by: Fu Wei <fu.wei(a)linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm(a)linaro.org> --- grub-core/loader/arm64/linux.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 987f5b9..e9e9a29 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -185,13 +185,6 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)), void *blob = NULL; int size; - if (!loaded) - { - grub_error (GRUB_ERR_BAD_ARGUMENT, - N_("you need to load the kernel first")); - return GRUB_ERR_BAD_OS; - } - if (argc != 1) return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); -- 1.8.3.1

10 years, 4 months

[PATCH 2/5] arm64: Move some #define from

by Fu Wei

grub-core/loader/arm64/linux.c to include/grub/arm64/linux.h Reason: (1)make code more orderly (2)these #define can be used by other files which includs include/grub/arm64/linux.h Make some shared functions for multiboot.c Signed-off-by: Fu Wei <fu.wei(a)linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm(a)linaro.org> --- grub-core/loader/arm64/linux.c | 59 +++++++++++++++++++++--------------------- include/grub/arm64/linux.h | 11 ++++++++ 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 564a75a..987f5b9 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -33,12 +33,6 @@ GRUB_MOD_LICENSE ("GPLv3+"); -#define GRUB_EFI_PAGE_SHIFT 12 -#define BYTES_TO_PAGES(bytes) (((bytes) + 0xfff) >> GRUB_EFI_PAGE_SHIFT) -#define GRUB_EFI_PE_MAGIC 0x5A4D - -static grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; - static grub_dl_t my_mod; static int loaded; @@ -58,6 +52,7 @@ static void * get_firmware_fdt (void) { grub_efi_configuration_table_t *tables; + grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; void *firmware_fdt = NULL; unsigned int i; @@ -75,8 +70,8 @@ get_firmware_fdt (void) return firmware_fdt; } -static void -get_fdt (void) +void * +grub_linux_get_fdt (void) { void *raw_fdt; grub_size_t size; @@ -99,7 +94,7 @@ get_fdt (void) grub_dprintf ("linux", "allocating %ld bytes for fdt\n", size); fdt = grub_efi_allocate_pages (0, BYTES_TO_PAGES (size)); if (!fdt) - return; + return NULL; if (raw_fdt) { @@ -110,10 +105,11 @@ get_fdt (void) { grub_fdt_create_empty_tree (fdt, size); } + return fdt; } -static grub_err_t -check_kernel (struct grub_arm64_linux_kernel_header *lh) +grub_err_t +grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh) { if (lh->magic != GRUB_ARM64_LINUX_MAGIC) return grub_error(GRUB_ERR_BAD_OS, "invalid magic number"); @@ -131,14 +127,14 @@ check_kernel (struct grub_arm64_linux_kernel_header *lh) } static grub_err_t -finalize_params (void) +finalize_params_linux (void) { grub_efi_boot_services_t *b; + grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; grub_efi_status_t status; int node, retval; - get_fdt (); - if (!fdt) + if (!grub_linux_get_fdt ()) goto failure; node = grub_fdt_find_subnode (fdt, 0, "chosen"); @@ -240,21 +236,16 @@ out: return grub_errno; } -static grub_err_t -grub_linux_boot (void) +grub_err_t +grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args) { grub_efi_memory_mapped_device_path_t *mempath; grub_efi_handle_t image_handle; grub_efi_boot_services_t *b; grub_efi_status_t status; - grub_err_t retval; grub_efi_loaded_image_t *loaded_image; int len; - retval = finalize_params(); - if (retval != GRUB_ERR_NONE) - return retval; - mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t)); if (!mempath) return grub_errno; @@ -263,8 +254,8 @@ grub_linux_boot (void) mempath[0].header.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE; mempath[0].header.length = grub_cpu_to_le16_compile_time (sizeof (*mempath)); mempath[0].memory_type = GRUB_EFI_LOADER_DATA; - mempath[0].start_address = (grub_addr_t) kernel_addr; - mempath[0].end_address = (grub_addr_t) kernel_addr + kernel_size; + mempath[0].start_address = addr; + mempath[0].end_address = addr + size; mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE; mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE; @@ -273,16 +264,16 @@ grub_linux_boot (void) b = grub_efi_system_table->boot_services; status = b->load_image (0, grub_efi_image_handle, (grub_efi_device_path_t *) mempath, - kernel_addr, kernel_size, &image_handle); + (void *) addr, size, &image_handle); if (status != GRUB_EFI_SUCCESS) return grub_error (GRUB_ERR_BAD_OS, "cannot load image"); - grub_dprintf ("linux", "linux command line: '%s'\n", linux_args); + grub_dprintf ("linux", "linux command line: '%s'\n", args); /* Convert command line to UCS-2 */ loaded_image = grub_efi_get_loaded_image (image_handle); loaded_image->load_options_size = len = - (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t); + (grub_strlen (args) + 1) * sizeof (grub_efi_char16_t); loaded_image->load_options = grub_efi_allocate_pages (0, BYTES_TO_PAGES (loaded_image->load_options_size)); @@ -291,9 +282,9 @@ grub_linux_boot (void) loaded_image->load_options_size = 2 * grub_utf8_to_utf16 (loaded_image->load_options, len, - (grub_uint8_t *) linux_args, len, NULL); + (grub_uint8_t *) args, len, NULL); - grub_dprintf("linux", "starting image %p\n", image_handle); + grub_dprintf ("linux", "starting image %p\n", image_handle); status = b->start_image (image_handle, 0, NULL); /* When successful, not reached */ @@ -305,6 +296,16 @@ grub_linux_boot (void) } static grub_err_t +grub_linux_boot (void) +{ + if (finalize_params_linux () != GRUB_ERR_NONE) + return grub_errno; + + return (grub_arm64_uefi_boot_image((grub_addr_t)kernel_addr, + kernel_size, linux_args)); +} + +static grub_err_t grub_linux_unload (void) { grub_dl_unref (my_mod); @@ -400,7 +401,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), if (grub_file_read (file, &lh, sizeof (lh)) < (long) sizeof (lh)) return grub_errno; - if (check_kernel (&lh) != GRUB_ERR_NONE) + if (grub_arm64_uefi_check_image (&lh) != GRUB_ERR_NONE) goto fail; grub_loader_unset(); diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index 864e5dc..65796d9 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -23,6 +23,10 @@ #define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ +#define GRUB_EFI_PAGE_SHIFT 12 +#define BYTES_TO_PAGES(bytes) (((bytes) + 0xfff) >> GRUB_EFI_PAGE_SHIFT) +#define GRUB_EFI_PE_MAGIC 0x5A4D + /* From linux/Documentation/arm64/booting.txt */ struct grub_arm64_linux_kernel_header { @@ -38,4 +42,11 @@ struct grub_arm64_linux_kernel_header grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ }; +/* Declare the functions for getting dtb and checking/booting image */ +void *grub_linux_get_fdt (void); +grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header + *lh); +grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, + char *args); + #endif /* ! GRUB_LINUX_CPU_HEADER */ -- 1.8.3.1

10 years, 4 months

[PATCH 1/5] Add grub_fdt_set_reg64 macro into fdt.h header file for

by Fu Wei

inserting "reg" properiy, while #address-cells = <0x2> and #size-cells = <0x2> Signed-off-by: Fu Wei <fu.wei(a)linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm(a)linaro.org> --- include/grub/fdt.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/grub/fdt.h b/include/grub/fdt.h index 3016998..fdfca75 100644 --- a/include/grub/fdt.h +++ b/include/grub/fdt.h @@ -117,4 +117,16 @@ int grub_fdt_set_prop (void *fdt, unsigned int nodeoffset, const char *name, grub_fdt_set_prop ((fdt), (nodeoffset), (name), &_val, 8); \ }) +/* Setup "reg" property for + * #address-cells = <0x2> + * #size-cells = <0x2> + */ +#define grub_fdt_set_reg64(fdt, nodeoffset, addr, size) \ +({ \ + grub_uint64_t reg_64[2]; \ + reg_64[0] = grub_cpu_to_be64(addr); \ + reg_64[1] = grub_cpu_to_be64(size); \ + grub_fdt_set_prop ((fdt), (nodeoffset), "reg", reg_64, 16); \ +}) + #endif /* ! GRUB_FDT_HEADER */ -- 1.8.3.1

10 years, 4 months

[PATCH v5 5/5] arm64: Add the introduction of multiboot/module, command in docs/grub.texi

by Fu Wei

Signed-off-by: Fu Wei <fu.wei(a)linaro.org> --- docs/grub.texi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/grub.texi b/docs/grub.texi index 46b9e7f..2c69182 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -4512,6 +4512,23 @@ Alias for @code{hashsum --hash md5 arg @dots{}}. See command @command{hashsum} @deffn Command module [--nounzip] file [arguments] Load a module for multiboot kernel image. The rest of the line is passed verbatim as the module command line. +There is not --nounzip support on ARM64 machine. + +On the platforms those support the Xen fdt multiboot protocol, +each module will be given a default compatibility property based on the order +in which the modules are added: + +(1)"multiboot,kernel", "multiboot,module" + +(2)"multiboot,ramdisk", "multiboot,module" + +All subsequent modules will be: "multiboot,module" + +There is a [--type <compatible stream>] option to +override default compatible string for the current module. +Note that --type is only for ARM64 currently. +See @uref{http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot}, + to obtain more information. @end deffn @node multiboot @@ -4523,6 +4540,8 @@ line is passed verbatim as the @dfn{kernel command-line}. Any module must be reloaded after using this command (@pxref{module}). Some kernels have known problems. You need to specify --quirk-* for those. +There is not --quirk-* support on ARM64 machine. + --quirk-bad-kludge is a problem seen in several products that they include loading kludge information with invalid data in ELF file. GRUB prior to 0.97 and some custom builds prefered ELF information while 0.97 and GRUB 2 -- 1.8.3.1

10 years, 4 months

[PATCH] arm: efi: use instr_sync macro instead of isb

by Varad Gautam

Fix assembler error when building for older targets with unsupported isb. Signed-off-by: Varad Gautam <varadgautam(a)gmail.com> --- arch/arm/kernel/efi_phys.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/efi_phys.S b/arch/arm/kernel/efi_phys.S index e808b57..6dd3f67 100644 --- a/arch/arm/kernel/efi_phys.S +++ b/arch/arm/kernel/efi_phys.S @@ -39,7 +39,7 @@ ENTRY(uefi_phys_call) @ Disable MMU ldr r5, =(CR_M) update_sctlr r12, , r5 - isb + instr_sync @ Make call blx lr @@ -47,7 +47,7 @@ ENTRY(uefi_phys_call) @ Enable MMU + Caches ldr r4, =(CR_I | CR_C | CR_M) update_sctlr r12, r4 - isb + instr_sync ldr sp, =tmpstack_top ldmfd sp, {r4-r5, r12, lr} -- 1.9.3

10 years, 4 months

← Newer
1
...
62
63
64
65
66
67
68
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-uefi