Linaro-uefi

linaro-uefi@lists.linaro.org

811 discussions

[PATCH v3 1/3] fdt: Add grub_fdt_set_reg64 macro into fdt.h header file

by Fu Wei

fdt: Add grub_fdt_set_reg64 macro into fdt.h header file for inserting "reg" properiy, while #address-cells = <0x2> and #size-cells = <0x2> Signed-off-by: Fu Wei <fu.wei(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.9.1

11 years, 1 month

[PATCH v3 2/3] arm64: Make some shared functions for multiboot.c in linux.c

by Fu Wei

arm64: Make some shared functions for multiboot.c Move some #define from 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 Signed-off-by: Fu Wei <fu.wei(a)linaro.org> --- grub-core/loader/arm64/linux.c | 160 ++++++++++++++++++++--------------------- include/grub/arm64/linux.h | 15 +++- 2 files changed, 90 insertions(+), 85 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 564a75a..b030b05 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,13 +105,14 @@ 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"); + return grub_error (GRUB_ERR_BAD_OS, "invalid magic number"); if ((lh->code0 & 0xffff) != GRUB_EFI_PE_MAGIC) return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, @@ -130,15 +126,74 @@ check_kernel (struct grub_arm64_linux_kernel_header *lh) return GRUB_ERR_NONE; } +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_efi_loaded_image_t *loaded_image; + int len; + + mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t)); + if (!mempath) + return grub_errno; + + mempath[0].header.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE; + 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 = 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; + mempath[1].header.length = sizeof (grub_efi_device_path_t); + + b = grub_efi_system_table->boot_services; + status = b->load_image (0, grub_efi_image_handle, + (grub_efi_device_path_t *) mempath, + (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", args); + + /* Convert command line to UCS-2 */ + loaded_image = grub_efi_get_loaded_image (image_handle); + loaded_image->load_options_size = len = + (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)); + if (!loaded_image->load_options) + return grub_errno; + + loaded_image->load_options_size = + 2 * grub_utf8_to_utf16 (loaded_image->load_options, len, + (grub_uint8_t *) args, len, NULL); + + grub_dprintf ("linux", "starting image %p\n", image_handle); + status = b->start_image (image_handle, 0, NULL); + + /* When successful, not reached */ + b->unload_image (image_handle); + grub_efi_free_pages ((grub_efi_physical_address_t) loaded_image->load_options, + BYTES_TO_PAGES (loaded_image->load_options_size)); + + return grub_errno; +} + 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"); @@ -189,13 +244,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")); @@ -243,65 +291,11 @@ out: static grub_err_t grub_linux_boot (void) { - 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; - - mempath[0].header.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE; - 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[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE; - mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE; - mempath[1].header.length = sizeof (grub_efi_device_path_t); - - 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); - 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); - - /* 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); - loaded_image->load_options = - grub_efi_allocate_pages (0, - BYTES_TO_PAGES (loaded_image->load_options_size)); - if (!loaded_image->load_options) + if (finalize_params_linux () != GRUB_ERR_NONE) return grub_errno; - loaded_image->load_options_size = - 2 * grub_utf8_to_utf16 (loaded_image->load_options, len, - (grub_uint8_t *) linux_args, len, NULL); - - grub_dprintf("linux", "starting image %p\n", image_handle); - status = b->start_image (image_handle, 0, NULL); - - /* When successful, not reached */ - b->unload_image (image_handle); - grub_efi_free_pages ((grub_efi_physical_address_t) loaded_image->load_options, - BYTES_TO_PAGES (loaded_image->load_options_size)); - - return grub_errno; + return (grub_arm64_uefi_boot_image((grub_addr_t)kernel_addr, + kernel_size, linux_args)); } static grub_err_t @@ -367,7 +361,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), grub_dprintf ("linux", "[addr=%p, size=0x%x]\n", (void *) initrd_start, initrd_size); - fail: +fail: grub_initrd_close (&initrd_ctx); if (initrd_mem && !initrd_start) grub_efi_free_pages ((grub_efi_physical_address_t) initrd_mem, @@ -400,10 +394,10 @@ 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(); + grub_loader_unset (); grub_dprintf ("linux", "kernel file size: %lld\n", (long long) kernel_size); kernel_addr = grub_efi_allocate_pages (0, BYTES_TO_PAGES (kernel_size)); @@ -450,8 +444,8 @@ fail: if (grub_errno != GRUB_ERR_NONE) { - grub_dl_unref (my_mod); loaded = 0; + grub_dl_unref (my_mod); } if (linux_args && !loaded) diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index 864e5dc..81f050b 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -21,14 +21,18 @@ #include <grub/efi/efi.h> -#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ +#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 { grub_uint32_t code0; /* Executable code */ grub_uint32_t code1; /* Executable code */ - grub_uint64_t text_offset; /* Image load offset */ + grub_uint64_t text_offset; /* Image load offset */ grub_uint64_t res0; /* reserved */ grub_uint64_t res1; /* reserved */ grub_uint64_t res2; /* reserved */ @@ -38,4 +42,11 @@ struct grub_arm64_linux_kernel_header grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ }; +/* Declare the accessor 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.9.1

11 years, 1 month

[PATCH v3 0/3]arm64: Add multiboot support (via fdt) for Xen boot

by Fu Wei

arm64:Add multiboot support (via fdt) for Xen boot - 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. - The example of this support is <How to boot Xen with GRUB on AArch64 the Foundation FVP model> https://wiki.linaro.org/LEG/Engineering/Grub2/Xen_booting_on_Foundation_FVP… - 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. - Some changes in original linux module code Move some #define from 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 - Add grub_fdt_set_reg64 macro into fdt.h header file for inserting "reg" properiy, while #address-cells = <0x2> and #size-cells = <0x2> This multiboot support will be built in linux module for aarch64, and can not be used alone. grub-core/Makefile.core.def | 1 + grub-core/loader/arm64/linux.c | 166 +++++----- grub-core/loader/arm64/multiboot.c | 623 +++++++++++++++++++++++++++++++++++++ include/grub/arm64/linux.h | 15 +- include/grub/arm64/multiboot.h | 114 +++++++ include/grub/fdt.h | 12 + 6 files changed, 846 insertions(+), 85 deletions(-) create mode 100644 grub-core/loader/arm64/multiboot.c create mode 100644 include/grub/arm64/multiboot.h Signed-off-by: Fu Wei <fu.wei(a)linaro.org>

11 years, 1 month

linaro-edk2-2014.10

by Leif Lindholm

has now been tagged, pushed and built. Images available in: http://snapshots.linaro.org/components/kernel/linaro-edk2/28 Changes since 2014.09: - All platforms build successfully. - QEMU platforms added, both aarch32 and aarch64. - Some bugfixes in core code. Known issues: - The VExpress A9 topic branch was broken, so only the upstream support was included. This builds correctly, but results in the image being built in a different directory, so it was not copied into the release.

11 years, 1 month

[PATCH V2 0/4] arm64: Add multiboot support (via fdt) for Xen boot

by Fu Wei

arm64:Add multiboot support (via fdt) for Xen boot - 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. - The example of this support is <How to boot Xen with GRUB on AArch64 the Foundation FVP model> https://wiki.linaro.org/LEG/Engineering/Grub2/Xen_booting_on_Foundation_FVP… - 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. - Some changes in original linux module code Move some #define from 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 Share some functions and variables for multiboot.c - Add grub_fdt_set_reg64 macro into fdt.h header file for inserting "reg" properiy, while #address-cells = <0x2> and #size-cells = <0x2> This multiboot support will be built in linux module for aarch64, and can not be used alone. Signed-off-by: Fu Wei <fu.wei(a)linaro.org>

11 years, 1 month

[PATCH V2 3/3] arm64: Add multiboot support file

by Fu Wei

arm64: Add multiboot support file grub-core/loader/arm64/multiboot.c and dependent header file include/grub/arm64/multiboot.h Add commands register code and header file into grub-core/loader/arm64/linux.c - 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. - The example of this support is <How to boot Xen with GRUB on AArch64 the Foundation FVP model> https://wiki.linaro.org/LEG/Engineering/Grub2/Xen_booting_on_Foundation_FVP… - 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. - This multiboot support is built into linux module for aarch64. Signed-off-by: Fu Wei <fu.wei(a)linaro.org> --- grub-core/Makefile.core.def | 1 + grub-core/loader/arm64/linux.c | 9 + grub-core/loader/arm64/multiboot.c | 582 +++++++++++++++++++++++++++++++++++++ include/grub/arm64/multiboot.h | 110 +++++++ 4 files changed, 702 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 4f2fa74..2fef7ec 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -324,6 +324,11 @@ grub_linux_unload (void) BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt))); fdt = NULL; } + else if (grub_linux_loaded == LOADED_MULTIBOOT) + { + grub_module_unload_all(); + clean_all_params (); + } grub_linux_loaded = 0; return GRUB_ERR_NONE; @@ -483,6 +488,8 @@ GRUB_MOD_INIT (linux) grub_register_command ("devicetree", grub_cmd_devicetree, 0, N_("Load DTB file.")); + grub_arm64_linux_register_multiboot_command (mod); + my_mod = mod; } @@ -491,4 +498,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..d3f92db --- /dev/null +++ b/grub-core/loader/arm64/multiboot.c @@ -0,0 +1,582 @@ +/* + * 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> + +extern loaded_type_t grub_linux_loaded; +extern void *kernel_addr; +extern grub_uint64_t kernel_size; +extern char *linux_args; +extern finalize_params_t finalize_params; + +static grub_dl_t linux_mod; +static multiboot_module_t kernel = NULL; +static multiboot_module_t module_head = NULL; +static module_type_t module_type = MODULE_IMAGE; +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 grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; +static void *multiboot_fdt = NULL; +static int chosen_node = 0; +static const compatible_struct_t default_compatible[] = + { + FDT_COMPATIBLE(MODULE_IMAGE_COMPATIBLE), + FDT_COMPATIBLE(MODULE_INITRD_COMPATIBLE), + FDT_COMPATIBLE(MODULE_OTHER_COMPATIBLE) + }; + +static grub_err_t +clean_extra_info (multiboot_module_t module) +{ + if (module && module->extra_info) + { + if (((fdt_node_info_t)module->extra_info)->type == MODULE_CUSTOM) + grub_free(((fdt_node_info_t)module->extra_info)->compatible_custom); + + grub_free (module->extra_info); + module->extra_info = NULL; + } + return (GRUB_ERR_NONE); +} + +static grub_err_t +set_module_type (multiboot_module_t module, int *argc, char **argv[]) +{ + fdt_node_info_t node_info = (fdt_node_info_t) module->extra_info; + char *temp = NULL; + grub_size_t temp_size = 0, total_size = 0; + int compatible_counter = 0, i = 0; + char **compatible_temp_array = (char **)grub_zalloc (sizeof(char *) * (*argc)); + + if ((*argc) >= 3) + { + while ((*argc) > 1) + { + if (grub_strcmp (*argv[0], "--type") == 0) + { + node_info->type = MODULE_CUSTOM; + (*argc)--; + (*argv)++; + temp_size = grub_strlen(*argv[0]) + 1; + temp = (char *)grub_zalloc (temp_size); + grub_strcpy (temp, *argv[0]); + compatible_temp_array[compatible_counter] = temp; + total_size += temp_size; + compatible_counter++; + (*argc)--; + (*argv)++; + } + else + break; + } + } + + if (node_info->type != MODULE_CUSTOM) + { + node_info->type = module_type++; + if (module_type > MODULE_OTHER) + module_type = MODULE_OTHER; + } + else + { + node_info->compatible_custom = temp = (char *)grub_zalloc (total_size); + node_info->compatible_size = total_size; + for (i = 0; compatible_counter > 0; compatible_counter--, i++, temp++) + { + grub_strcpy (temp, compatible_temp_array[i]); + temp += grub_strlen(compatible_temp_array[i]); + grub_free (compatible_temp_array[i]); + } + } + + grub_free (compatible_temp_array); + return (GRUB_ERR_NONE); +} + +static grub_err_t +prepare_kernel_params (multiboot_module_t module) +{ + int retval; + + multiboot_fdt = grub_linux_get_fdt (); + if (!multiboot_fdt) + return (grub_error(GRUB_ERR_BAD_OS, "failed to get 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 get chosen node")); + + grub_dprintf ("multiboot_loader", "Multiboot Kernel cmdline : %s @ %p size:%d\n", + module->cmdline, module->cmdline, module->cmdline_size); + + retval = grub_fdt_set_prop (multiboot_fdt, chosen_node, + "bootargs", module->cmdline, module->cmdline_size); + if (retval) + return (grub_error(GRUB_ERR_BAD_OS, + "failed to set kernel cmdline info to chosen node")); + + return (GRUB_ERR_NONE); +} + +static grub_err_t +prepare_module_params (multiboot_module_t module) +{ + int retval, module_node = 0; + fdt_node_info_t node_info = NULL; + char module_name[FDT_MODULE_NAME_MAX_SIZE]; + + if (module && module->extra_info) + { + node_info = (fdt_node_info_t) module->extra_info; + } + else + { + return (grub_error (GRUB_ERR_BAD_ARGUMENT, N_("failed to get module"))); + } + + retval = grub_snprintf(module_name, FDT_MODULE_NAME_MAX_SIZE, + "module@%lx", module->start); + 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 set node name for module"))); + + 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", + node_info->compatible, + (grub_uint32_t)node_info->compatible_size); + if (retval) + return (grub_error(GRUB_ERR_BAD_OS, + N_("failed to get module node in chosen node"))); + + grub_dprintf ("multiboot_loader", "Module %s compatible = %s size = 0x%lx\n", + module->name, + node_info->compatible, + node_info->compatible_size); + + retval = grub_fdt_set_reg64 (multiboot_fdt, module_node, + module->start, module->size); + if (retval) + return (grub_error(GRUB_ERR_BAD_OS, + N_("failed to set reg info in module node"))); + + 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 set module cmdline info to chosen node")); + } + 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; + + b = grub_efi_system_table->boot_services; + status = b->install_configuration_table (&fdt_guid, multiboot_fdt); + if (status != GRUB_EFI_SUCCESS) + { + grub_dprintf ("multiboot_loader", "Installed/updated FDT configuration table fail %p\n", + multiboot_fdt); + return (GRUB_ERR_BAD_OS); + } + + grub_dprintf ("multiboot_loader", "Installed/updated FDT configuration table @ %p\n", + multiboot_fdt); + return (GRUB_ERR_NONE); +} + +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 +init_module_info (multiboot_module_t module, int *argc, char **argv[]) +{ + fdt_node_info_t node_info = + (fdt_node_info_t) grub_zalloc (sizeof(struct fdt_node_info)); + if (!node_info) + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + module->extra_info = (void *) node_info; + + /* get module type */ + grub_errno = set_module_type (module, argc, argv); + if (grub_errno != GRUB_ERR_NONE) + return (grub_errno); + + switch (node_info->type) + { + case MODULE_IMAGE: + case MODULE_INITRD: + case MODULE_OTHER: + node_info->compatible = default_compatible[node_info->type].compatible; + node_info->compatible_size = default_compatible[node_info->type].size; + break; + + case MODULE_CUSTOM: + /* node_info->compatible_size has set in set_module_type() */ + node_info->compatible = node_info->compatible_custom; + break; + + default: + return (grub_error (GRUB_ERR_BAD_ARGUMENT, N_("error module type"))); + } + module->name = node_info->compatible; + module->align = module_default_align[node_info->type]; + + grub_dprintf ("multiboot_loader", "Init %s module and node info:\n" + "compatible %s\ncompatible_size 0x%lx\n", + module->name, + node_info->compatible, + node_info->compatible_size); + + return (GRUB_ERR_NONE); +} + +static grub_err_t +finalize_params_multiboot (void) +{ + multiboot_module_t module; + grub_err_t retval; + + /* Set Multiboot Kernel params info */ + module = (multiboot_module_t) grub_named_list_find ( + GRUB_AS_NAMED_LIST (module_head), + GRUB_MULTIBOOT_KERNEL_NAME); + + if (module) + { + kernel = module; + retval = prepare_kernel_params (module); + if (retval != GRUB_ERR_NONE) + goto failure_kernel; + grub_list_remove(GRUB_AS_LIST (module)); + } + else + { + grub_dprintf ("multiboot_loader", "Please load Multiboot Kernel first!\n"); + goto failure; + } + + /* 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, module->start, module->size); + retval = prepare_module_params (module); + if (retval != GRUB_ERR_NONE) + goto failure_module; + } + else + { + grub_dprintf ("multiboot_loader", "Module info error: %s!\n", module->name); + goto failure_module; + } + } + grub_list_push (GRUB_AS_LIST_P (&module_head), GRUB_AS_LIST (kernel)); + + if (install_all_params () != GRUB_ERR_NONE) + { + goto failure_kernel; + } + + return (GRUB_ERR_NONE); + + failure_module: + grub_list_push (GRUB_AS_LIST_P (&module_head), GRUB_AS_LIST (kernel)); + failure_kernel: + clean_all_params (); + failure: + return (grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT")); +} + +static void +single_module_unload (multiboot_module_t module) +{ + if (module && module->start_unaligned && module->size > 0) + { + grub_efi_free_pages ((grub_efi_physical_address_t) module->start_unaligned, + BYTES_TO_PAGES (module->size + module->align)); + } + if (module && module->cmdline && module->cmdline_size > 0) + { + grub_free (module->cmdline); + grub_dprintf ("multiboot_loader", "Module %s cmdline memory free @ %p size: %d\n", + module->name, module->cmdline, module->cmdline_size); + } + if (module) + { + clean_extra_info(module); + grub_list_remove (GRUB_AS_LIST (module)); + grub_dprintf ("multiboot_loader", "Module %s struct memory free @ %p size: 0x%lx\n", + module->name, module, sizeof(module)); + grub_free (module); + } + return; +} + +/* We make the func can be called by linux.c */ +grub_err_t +grub_module_unload_all (void) +{ + multiboot_module_t module; + + FOR_LIST_ELEMENTS (module, module_head) + { + single_module_unload (module); + } + + return (GRUB_ERR_NONE); +} + +static grub_err_t +grub_module_load (multiboot_module_t module, grub_file_t file, + int argc, char *argv[]) +{ + module->size = grub_file_size (file); + grub_dprintf ("multiboot_loader", "Multiboot %s file size: 0x%lx\n", + module->name, module->size); + + module->start_unaligned = (grub_addr_t) grub_efi_allocate_pages (0, + (BYTES_TO_PAGES (module->size + module->align))); + if (!module->start_unaligned) + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + + grub_dprintf ("multiboot_loader", "Multiboot %s numpages: 0x%lx\n", + module->name, BYTES_TO_PAGES (module->size + module->align)); + + if (module->align) + module->start = ALIGN_UP(module->start_unaligned, module->align); + else + module->start = module->start_unaligned; + + if (grub_file_read (file, (void *)module->start, module->size) < (grub_ssize_t) module->size) + { + single_module_unload(module); + return (grub_error (GRUB_ERR_BAD_OS, + N_("premature end of file %s"), argv[0])); + } + + /* Skip the multiboot module file name */ + argc--; + argv++; + + if (argc > 0) + { + module->cmdline_size = grub_loader_cmdline_size (argc, argv); + module->cmdline = grub_zalloc (module->cmdline_size); + if (!module->cmdline) + { + single_module_unload(module); + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + } + grub_create_loader_cmdline (argc, argv, + module->cmdline, module->cmdline_size); + grub_dprintf ("multiboot_loader", "Multiboot %s cmdline @ %p %s, size: %d\n", + module->name, module->cmdline, module->cmdline, module->cmdline_size); + } + else + { + module->cmdline_size = 0; + module->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; + multiboot_module_t module = NULL; + + if (argc == 0) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + goto fail; + } + + if (grub_linux_loaded != LOADED_MULTIBOOT) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("Please use multiboot command first")); + goto fail; + } + + module = (multiboot_module_t) grub_zalloc (sizeof(struct multiboot_module)); + if (!module) + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + + grub_errno = init_module_info (module, &argc, &argv); + if (grub_errno != GRUB_ERR_NONE) + goto fail; + + file = grub_file_open (argv[0]); + if (!file) + goto fail; + + grub_errno = grub_module_load (module, file, argc, argv); + + 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_module_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; + multiboot_module_t module = NULL; + struct stub_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_linux_check_kernel ((struct grub_arm64_linux_kernel_header *)&sh) != GRUB_ERR_NONE) + goto fail; + grub_file_seek (file, 0); + + grub_loader_unset(); + + module = (multiboot_module_t) grub_zalloc (sizeof(struct multiboot_module)); + if (!module) + return (grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"))); + + module->name = GRUB_MULTIBOOT_KERNEL_NAME; + module->extra_info = NULL; + module->align =(grub_size_t) sh.optional_header.section_alignment; + + grub_errno = grub_module_load (module, file, argc, argv); + + if (grub_errno == GRUB_ERR_NONE) + { + grub_list_push (GRUB_AS_LIST_P (&module_head), GRUB_AS_LIST (module)); + kernel_addr = (void *)module->start; + kernel_size = module->size; + linux_args = module->cmdline; + finalize_params = finalize_params_multiboot; + grub_loader_set (grub_linux_boot, grub_linux_unload, 0); + grub_linux_loaded = LOADED_MULTIBOOT; + } + + fail: + if (file) + grub_file_close (file); + if (grub_errno != GRUB_ERR_NONE) + { + grub_dl_unref (linux_mod); + grub_linux_loaded = 0; + grub_module_unload_all (); + } + + 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..9aaefe7 --- /dev/null +++ b/include/grub/arm64/multiboot.h @@ -0,0 +1,110 @@ +/* + * 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 stub_header */ + +#define GRUB_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 (31 + 1<\0>) is defined in ePAPR */ +#define FDT_MODULE_NAME_MAX_SIZE (32) + +struct compatible_struct +{ + grub_size_t size; + const char *compatible; +}; +typedef struct compatible_struct compatible_struct_t; +#define FDT_COMPATIBLE(x) {.size = sizeof(x), .compatible = 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 *compatible; + char *compatible_custom; + grub_size_t compatible_size; +}; +typedef struct fdt_node_info *fdt_node_info_t; + +struct stub_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; +}; +typedef struct stub_header *stub_header_t; + +struct multiboot_module +{ + struct multiboot_module *next; + struct multiboot_module **prev; + const char *name; + + /* int flags; */ + + grub_addr_t start_unaligned; + grub_addr_t start; + grub_size_t size; + grub_size_t align; + + char *cmdline; + int cmdline_size; + + /* for more info */ + void *extra_info; +}; +typedef struct multiboot_module *multiboot_module_t; + +void grub_arm64_linux_register_multiboot_command (grub_dl_t mod); + +void grub_arm64_linux_unregister_multiboot_command (void); + +grub_err_t grub_module_unload_all (void); +grub_err_t clean_all_params (void); + +#endif /* ! MULTIBOOT_HEADER */ -- 1.9.1

11 years, 1 month

[PATCH V2 2/3] arm64: Share some functions and variables in linux.c to multiboot.c

by Fu Wei

arm64: Share some functions and variables in linux.c to multiboot.c Move some #define from 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 Signed-off-by: Fu Wei <fu.wei(a)linaro.org> --- grub-core/loader/arm64/linux.c | 83 +++++++++++++++++++++++------------------- include/grub/arm64/linux.h | 18 +++++++++ 2 files changed, 63 insertions(+), 38 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 564a75a..4f2fa74 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> @@ -33,19 +34,15 @@ 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; +loaded_type_t grub_linux_loaded; -static void *kernel_addr; -static grub_uint64_t kernel_size; +void *kernel_addr; +grub_uint64_t kernel_size; -static char *linux_args; +char *linux_args; static grub_uint32_t cmdline_size; static grub_addr_t initrd_start; @@ -54,6 +51,8 @@ static grub_addr_t initrd_end; static void *loaded_fdt; static void *fdt; +finalize_params_t finalize_params; + static void * get_firmware_fdt (void) { @@ -75,8 +74,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 +98,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 +109,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_linux_check_kernel (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 +131,13 @@ 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_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"); @@ -189,7 +188,7 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)), void *blob = NULL; int size; - if (!loaded) + if (!grub_linux_loaded) { grub_error (GRUB_ERR_BAD_ARGUMENT, N_("you need to load the kernel first")); @@ -240,7 +239,7 @@ out: return grub_errno; } -static grub_err_t +grub_err_t grub_linux_boot (void) { grub_efi_memory_mapped_device_path_t *mempath; @@ -304,22 +303,28 @@ grub_linux_boot (void) return grub_errno; } -static grub_err_t +grub_err_t grub_linux_unload (void) { grub_dl_unref (my_mod); - loaded = 0; - if (initrd_start) - grub_efi_free_pages ((grub_efi_physical_address_t) initrd_start, - BYTES_TO_PAGES (initrd_end - initrd_start)); - initrd_start = initrd_end = 0; - grub_free (linux_args); - if (kernel_addr) - grub_efi_free_pages ((grub_efi_physical_address_t) kernel_addr, - BYTES_TO_PAGES (kernel_size)); - if (fdt) - grub_efi_free_pages ((grub_efi_physical_address_t) fdt, - BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt))); + + if (grub_linux_loaded == LOADED_LINUX) + { + if (kernel_addr) + grub_efi_free_pages ((grub_efi_physical_address_t) kernel_addr, + BYTES_TO_PAGES (kernel_size)); + if (linux_args) + grub_free (linux_args); + if (initrd_start) + grub_efi_free_pages ((grub_efi_physical_address_t) initrd_start, + BYTES_TO_PAGES (initrd_end - initrd_start)); + initrd_start = initrd_end = 0; + if (fdt) + grub_efi_free_pages ((grub_efi_physical_address_t) fdt, + BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt))); + fdt = NULL; + } + grub_linux_loaded = 0; return GRUB_ERR_NONE; } @@ -338,10 +343,10 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), goto fail; } - if (!loaded) + if (grub_linux_loaded != LOADED_LINUX) { grub_error (GRUB_ERR_BAD_ARGUMENT, - N_("you need to load the kernel first")); + N_("you need to load the Linux kernel first")); goto fail; } @@ -400,7 +405,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_linux_check_kernel (&lh) != GRUB_ERR_NONE) goto fail; grub_loader_unset(); @@ -440,8 +445,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), if (grub_errno == GRUB_ERR_NONE) { + finalize_params = finalize_params_linux; grub_loader_set (grub_linux_boot, grub_linux_unload, 0); - loaded = 1; + grub_linux_loaded = LOADED_LINUX; } fail: @@ -451,13 +457,13 @@ fail: if (grub_errno != GRUB_ERR_NONE) { grub_dl_unref (my_mod); - loaded = 0; + grub_linux_loaded = 0; } - if (linux_args && !loaded) + if (linux_args && !grub_linux_loaded) grub_free (linux_args); - if (kernel_addr && !loaded) + if (kernel_addr && !grub_linux_loaded) grub_efi_free_pages ((grub_efi_physical_address_t) kernel_addr, BYTES_TO_PAGES (kernel_size)); @@ -476,6 +482,7 @@ GRUB_MOD_INIT (linux) cmd_devicetree = grub_register_command ("devicetree", grub_cmd_devicetree, 0, N_("Load DTB file.")); + my_mod = mod; } diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index 864e5dc..0695ff6 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,18 @@ struct grub_arm64_linux_kernel_header grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ }; +/* Declare the accessor functions for dtb and the "loaded" flag */ +enum loaded_type +{ + LOADED_LINUX = 1, + LOADED_MULTIBOOT +}; +typedef enum loaded_type loaded_type_t; + +typedef grub_err_t (*finalize_params_t) (void); +void *grub_linux_get_fdt (void); +grub_err_t grub_linux_check_kernel (struct grub_arm64_linux_kernel_header *lh); +grub_err_t grub_linux_unload (void); +grub_err_t grub_linux_boot (void); + #endif /* ! GRUB_LINUX_CPU_HEADER */ -- 1.9.1 -- Best regards, Fu Wei Software Engineer From Red Hat LEG Team Linaro.org | Open source software for ARM SoCs Ph: +86 186 2020 4684 (mobile) IRC: fuwei Skype: tekkamanninja Room 1512, Regus One Corporate Avenue,Level 15, One Corporate Avenue,222 Hubin Road,Huangpu District, Shanghai,China 200021

11 years, 1 month

[PATCH V2 1/3] fdt: Add grub_fdt_set_reg64 macro into fdt.h header file

by Fu Wei

Add grub_fdt_set_reg64 macro into fdt.h header file for inserting "reg" properiy, while #address-cells = <0x2> and #size-cells = <0x2> Signed-off-by: Fu Wei <fu.wei(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.9.1

11 years, 1 month

Re: [Linaro-uefi] Fwd: Building UEFI (14.09)

by Olivier Brunel

Hi all, I managed to build it in the end. My solution is: Use Python 2.7.2. Don't use GCC 4.9 14.09 but GCC 4.9 14.07. It was just a matter of version but I can't understand wy it does not work with 14.09 when on the Linaro Website those vesions are under components/toolchain for the release I want to use which is the 14.09. Well anyway, thanks for your support. Regards, Olivier BRUNEL -----Original Message----- From: Olivier Martin [mailto:olivier.martin@arm.com] Sent: Monday, October 20, 2014 4:33 PM To: 'Leif Lindholm'; Linaro UEFI; Olivier Brunel Subject: RE: [Linaro-uefi] Fwd: Building UEFI (14.09) It's likely to be a python version issue. I have 'Python 2.6.5' on my Linux distribution. Leif, I think you add a similar issue once on your system. Maybe you were using Python 3.x. > -----Original Message----- > From: linaro-uefi-bounces(a)lists.linaro.org [mailto:linaro-uefi- > bounces(a)lists.linaro.org] On Behalf Of Leif Lindholm > Sent: 20 October 2014 16:09 > To: Linaro UEFI; Olivier Brunel > Subject: [Linaro-uefi] Fwd: Building UEFI (14.09) > > Hi Olivier, > > Not sure. > What is your build environment? > > And what did you do to be able to build BaseTools? > > / > Leif > > ---------- Forwarded message ---------- > From: Olivier Brunel <Olivier.Brunel(a)synopsys.com> > Date: 17 October 2014 17:11 > Subject: RE: Building UEFI (14.09) > To: Leif Lindholm <leif.lindholm(a)linaro.org> > > > Hi, > Well OK now I manage to build using this command: > make -C BaseTools > > Now the problem I have is that it cannot compile Tests. This directory > is added to SUBDIRS in GNUmakefile under BaseTools and I can't compile > it. > > I am using the tag 'linaro-edk2-2014.09'. > > I have traces like: > FAIL: test_build_build (CheckPythonSyntax.Tests) > ---------------------------------------------------------------------- > Traceback (most recent call last): > File "/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/uefi-image-linaro-edk2- > 2014.09/BaseTools/Tests/CheckPythonSyntax.py", > line 55, in <lambda> > newmethod = lambda self: self.SingleFileTest(filename) > File "/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/uefi-image-linaro-edk2- > 2014.09/BaseTools/Tests/CheckPythonSyntax.py", > line 33, in SingleFileTest > self.fail('syntax error: %s, Error is %s' % (filename, str(e))) > AssertionError: syntax error: > /localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/uefi-image-linaro-edk2- > 2014.09/BaseTools/Source/Python/build/build.py, > Error is File > "/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/uefi-image-linaro-edk2- > 2014.09/BaseTools/Source/Python/build/build.py", > line 677 > class PeImageInfo(): > ^ > SyntaxError: invalid syntax > > > ---------------------------------------------------------------------- > Ran 247 tests in 0.950s > > FAILED (failures=37) > make[1]: Leaving directory > `/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/uefi-image-linaro-edk2- > 2014.09/BaseTools/Tests' > make: Leaving directory > `/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/uefi-image-linaro-edk2- > 2014.09/BaseTools' > -build/uefi-image> build -a ARM -b DEBUG -t GCC48 -p > ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.dsc -D > EDK2_ARMVE_STANDALONE=1 > File "/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/uefi-image-linaro-edk2- > 2014.09/BaseTools/BinWrappers/PosixLike/../../Source/Python/build/buil > d > .py", > line 677 > class PeImageInfo(): > ^ > SyntaxError: invalid syntax > > Any idea where this could come from? I have made some research on the > internet but nothing maybe I miss something... > > Thanks, > Olivier > > -----Original Message----- > From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > Sent: Thursday, October 16, 2014 5:11 PM > To: Olivier Brunel > Subject: Re: Building UEFI (14.09) > > Hi Olivier, > > Adding linaro-uefi list to cc. Comments inline. > > On 16 October 2014 16:03, Olivier Brunel <Olivier.Brunel(a)synopsys.com> > wrote: > > Hi there, > > > > I have been on this page: > > > > https://wiki.linaro.org/LEG/Engineering/Kernel/UEFI/build > > > > and tried to build the hard way UEFI: > > > > # Get Linaro UEFI sources from git. > > > > $ git clone git://git.linaro.org/uefi/linaro-edk2.git > > > > $ cd linaro-edk2 > > > > $ git checkout master > > > > # Set up UEFI build environment. > > > > $. edksetup.sh > > > > $ make -C BaseTools > > > > > > > > When I try the last line of this $ make -C BaseTools I have the > > following > > trace: > > > > sh-3.2$ make -C BaseTools/ > > > > make: Entering directory > > `/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/linaro-edk2/edk2-linaro-edk2- > 0.1+git26+20140926+9e6f69e/BaseTools' > > > > make -C Source/C > > > > Attempting to detect ARCH from 'uname -m': x86_64 > > > > Detected ARCH of X64 using uname. > > > > make[1]: Entering directory > > `/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/linaro-edk2/edk2-linaro-edk2- > 0.1+git26+20140926+9e6f69e/BaseTools/Source/C' > > > > mkdir -p . > > > > make -C Common > > > > make[2]: Entering directory > > `/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/linaro-edk2/edk2-linaro-edk2- > 0.1+git26+20140926+9e6f69e/BaseTools/Source/C/Common' > > > > mkdir ../libs > > > > gcc -c -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror > > -Wno-deprecated-declarations -nostdlib -c -g -I .. -I > > ../Include/Common -I ../Include/ -I ../Include/IndustryStandard -I > > ../Common/ -I .. -I . -I ../Include/X64/ BasePeCoff.c -o > BasePeCoff.o > > > > BasePeCoff.c: In function 'PeCoffLoaderGetPeHeader': > > > > BasePeCoff.c:149:49: error: cast from pointer to integer of > > different size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:149:12: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c: In function 'PeCoffLoaderImageAddress': > > > > BasePeCoff.c:581:10: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c: In function 'PeCoffLoaderRelocateImage': > > > > BasePeCoff.c:647:13: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:700:25: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:709:17: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:715:51: error: cast from pointer to integer of > > different size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:715:20: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:729:19: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:736:30: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:737:30: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:775:35: error: cast from pointer to integer of > > different size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:775:35: error: cast from pointer to integer of > > different size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:775:35: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c: In function 'PeCoffLoaderLoadImage': > > > > BasePeCoff.c:942:29: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:945:13: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:950:20: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:963:29: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:966:25: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:968:20: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1006:26: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1006:15: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1007:26: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1007:15: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1063:51: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1121:20: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1144:36: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c: In function 'PeCoffLoaderGetPdbPointer': > > > > BasePeCoff.c:1264:43: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1264:16: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1285:60: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1285:24: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1355:24: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1354:24: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1385:37: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1384:36: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c: In function 'PeCoffLoaderGetEntryPoint': > > > > BasePeCoff.c:1433:43: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1433:16: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1446:20: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1447:28: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1447:19: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1450:19: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1452:22: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1454:22: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > BasePeCoff.c:1456:35: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1456:56: error: cast from pointer to integer of > different > > size [-Werror=pointer-to-int-cast] > > > > BasePeCoff.c:1456:19: error: cast to pointer from integer of > different > > size [-Werror=int-to-pointer-cast] > > > > cc1: all warnings being treated as errors > > > > make[2]: *** [BasePeCoff.o] Error 1 > > > > make[2]: Leaving directory > > `/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/linaro-edk2/edk2-linaro-edk2- > 0.1+git26+20140926+9e6f69e/BaseTools/Source/C/Common' > > > > make[1]: *** [Common] Error 2 > > > > make[1]: Leaving directory > > `/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/linaro-edk2/edk2-linaro-edk2- > 0.1+git26+20140926+9e6f69e/BaseTools/Source/C' > > > > make: *** [Source/C] Error 2 > > > > make: Leaving directory > > `/localdev/obrunel/obrunel_armvdk_stormcs315/j-liv-arm- > base/software/Vanilla-Cortex-Test/linaro-edk2/edk2-linaro-edk2- > 0.1+git26+20140926+9e6f69e/BaseTools' > > > > > > > > I have noticed that you have edited the document last, can you tell > me > > if you have had this kind of error as well? > > So, I think I might have seen this at some point, but I'm not getting > it now. > Could your gcc be defaulting to 32-bit or something? > > / > Leif > > _______________________________________________ > Linaro-uefi mailing list > Linaro-uefi(a)lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-uefi

11 years, 1 month

[PATCH 00/11] arm64 EFI overhaul

by Ard Biesheuvel

I started out tweaking some things for kexec, and then things got out of hand... Anyway, there is hopefully some stuff here that we will reuse, but I am not getting my hopes up that this will land upstream unmodified. The main premise of these patches is that, in order to support kexec, we need to add code to the kernel that is able to deal with the state of the firmware after SetVirtualAddressMap() has been called. However, if we are going to deal with that anyway, why not make that the default state, and have only a single code path for both cases. This means SVAM() needs to move to the stub, and hence the code that invents the layout needs to move with it. The result is that the kernel proper is entered with the virt_addr members of all EFI_MEMORY_RUNTIME regions assigned, and the mapping installled in UEFI. The kernel proper needs to set up the page tables, and switch to them while performing the runtime services calls. Note that there is also an efi_to_phys() to translate the values of the fw_vendor and tables fields of the EFI system table. Again, this is something we need to do anyway under kexec, or we end up handing over state between one kernel and the next, which implies different code paths between non-kexec and kexec. One thing that may stand out is the reordering of the memory map. The reason for doing this is that we can use the same memory map as input to SVAM(). The alternative is allocating memory for it using boot services, but that clutters up the existing logic a bit between getting the memory map, populating the fdt, and loop again if it didn't fit. The current code works perfectly fine, but I am aware that it is an acquired taste :-) The first 2 patches are stuff that is missing from Matt Fleming's efi-next branch, which is what these patches are based on, so I included them for completeness. The meat is in patch #9, everything before that is groundwork and/or fixes, after that is dropping stuff that we don't need any longer. Ard Biesheuvel (9): arm64/efi: reserve regions of type ACPI_MEMORY_NVS arm64/efi: drop redundant set_bit(EFI_CONFIG_TABLES) arm64/efi: use UEFI memory map unconditionally if available arm64/mm: add explicit struct_mm argument to __create_mapping() arm64/mm: add create_pgd_mapping() to create private page tables efi: split off remapping code from efi_config_init() arm64/efi: move SetVirtualAddressMap() to UEFI stub arm64/efi: remove free_boot_services() and friends arm64/efi: remove idmap manipulations from UEFI code Leif Lindholm (1): arm64: ignore DT memreserve entries when booting in UEFI mode Semen Protsenko (1): efi/arm64: Store Runtime Services revision arch/arm64/include/asm/efi.h | 23 ++- arch/arm64/include/asm/mmu.h | 12 +- arch/arm64/kernel/efi.c | 368 +++++++++++++------------------------ arch/arm64/kernel/setup.c | 2 +- arch/arm64/mm/init.c | 4 +- arch/arm64/mm/mmu.c | 57 +++--- drivers/firmware/efi/efi.c | 49 +++-- drivers/firmware/efi/libstub/fdt.c | 110 ++++++++++- include/linux/efi.h | 2 + 9 files changed, 328 insertions(+), 299 deletions(-) -- 1.8.3.2

11 years, 1 month

← Newer
1
...
65
66
67
68
69
70
71
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-uefi