Linaro-uefi

linaro-uefi@lists.linaro.org

811 discussions

[PATCH 01/11] efi/arm64: Store Runtime Services revision

by Ard Biesheuvel

From: Semen Protsenko <semen.protsenko(a)linaro.org> "efi" global data structure contains "runtime_version" field which must be assigned in order to use it later in Runtime Services virtual calls (virt_efi_* functions). Before this patch "runtime_version" was unassigned (0), so each Runtime Service virtual call that checks revision would fail. Signed-off-by: Semen Protsenko <semen.protsenko(a)linaro.org> Acked-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: Matt Fleming <matt.fleming(a)intel.com> --- arch/arm64/kernel/efi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index 865fdf5c7344..219a59f2ae97 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -455,6 +455,8 @@ static int __init arm64_enter_virtual_mode(void) efi_native_runtime_setup(); set_bit(EFI_RUNTIME_SERVICES, &efi.flags); + efi.runtime_version = efi.systab->hdr.revision; + return 0; err_unmap: -- 1.8.3.2

11 years

Fwd: Building UEFI (14.09)

by Leif Lindholm

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/build.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

11 years

[PATCH 4/4] arm64: Add multiboot/module command support into linux module

by Fu Wei

arm64: finally add multiboot/module command support 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 | 6 ++++++ 2 files changed, 7 insertions(+) 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 44f6e3d..1d8c0e8 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> @@ -491,6 +492,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; } @@ -499,4 +503,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 (); } -- 1.9.1

11 years

[PATCH 2/4] arm64: export some accessor functions of dtb and the "loaded" flag

by Fu Wei

arm64: export some accessor functions of dtb and the "loaded" flag for sharing code to multiboot.c Signed-off-by: Fu Wei <fu.wei(a)linaro.org> --- grub-core/loader/arm64/linux.c | 19 +++++++++++++++++++ include/grub/arm64/linux.h | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 5050a82..44f6e3d 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -50,6 +50,25 @@ static grub_addr_t initrd_end; static void *loaded_fdt; static void *fdt; +/* The accessor functions for dtb and the "loaded" flag */ +static void get_fdt (void); + +int grub_arm64_linux_get_loaded (void) +{ + return (loaded); +} + +void grub_arm64_linux_set_loaded (int loaded_flag) +{ + loaded = loaded_flag; +} + +void *grub_arm64_linux_get_fdt (void) +{ + get_fdt (); + return (fdt); +} + static void * get_firmware_fdt (void) { diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index 22ffbaa..a438840 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -42,4 +42,11 @@ struct grub_arm64_linux_kernel_header grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ }; +/* Export the accessor functions for dtb and the "loaded" flag */ +void EXPORT_FUNC (*grub_arm64_linux_get_fdt) (void); + +int EXPORT_FUNC (grub_arm64_linux_get_loaded) (void); + +void EXPORT_FUNC (grub_arm64_linux_set_loaded) (int loaded_flag); + #endif /* ! GRUB_LINUX_CPU_HEADER */ -- 1.9.1

11 years

[PATCH 3/4] 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 - This multiboot support will be built in linux module for aarch64, and can not be used alone. - 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. - Add multiboot command for loading multiboot kernel image. Usage: multiboot <the path of kernel image file> [cmdline] - Add module command for loading multiboot module. Usage: module [option] <the path of module file> [cmdline] The [option] for Xen is [--type <compatible stream in FDT>]. For now, the <compatible stream in FDT> could be : "multiboot,kernel", "multiboot,ramdisk", "multiboot,module", "xen,xsm-policy" or the custom compatible stream - Only support stub-kernel for arm64: support stub-kernel detection and alignment info detection - 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> --- grub-core/loader/arm64/multiboot.c | 676 +++++++++++++++++++++++++++++++++++++ include/grub/arm64/multiboot.h | 109 ++++++ 2 files changed, 785 insertions(+) create mode 100644 grub-core/loader/arm64/multiboot.c create mode 100644 include/grub/arm64/multiboot.h diff --git a/grub-core/loader/arm64/multiboot.c b/grub-core/loader/arm64/multiboot.c new file mode 100644 index 0000000..020476e --- /dev/null +++ b/grub-core/loader/arm64/multiboot.c @@ -0,0 +1,676 @@ +/* + * 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 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 grub_size_t multiboot_fdt_size = 0; +static int chosen_node = 0; +static const compatible_struct_t default_compatible[] = + { + FDT_COMPATIBLE(FDT_MODULE_IMAGE_COMPATIBLE), + FDT_COMPATIBLE(FDT_MODULE_INITRD_COMPATIBLE), + FDT_COMPATIBLE(FDT_MODULE_OTHER_COMPATIBLE) + }; + +static grub_err_t +clean_extra_info_fdt (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_fdt_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_fdt (multiboot_module_t module) +{ + int retval; + + multiboot_fdt = grub_arm64_linux_get_fdt (); + multiboot_fdt_size = grub_fdt_get_totalsize (multiboot_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_fdt (multiboot_module_t module) +{ + int retval, module_node = 0; + fdt_node_info_t node_info = NULL; + char module_name[FDT_MODULE_NAME_MAX_SIZE]; + grub_uint64_t reg_64[2]; + + 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); + + reg_64[0] = grub_cpu_to_be64(module->start); + reg_64[1] = grub_cpu_to_be64(module->size); + retval = grub_fdt_set_prop (multiboot_fdt, module_node, "reg", reg_64, 16); + 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 void * +install_all_params_fdt (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 NULL; + } + + grub_dprintf ("multiboot_loader", "Installed/updated FDT configuration table @ %p\n", + multiboot_fdt); + return ((void *)multiboot_fdt); +} + +static grub_err_t +clean_all_params_fdt (void) +{ + if (multiboot_fdt) + { + grub_efi_free_pages ((grub_efi_physical_address_t) multiboot_fdt, + BYTES_TO_PAGES (multiboot_fdt_size)); + multiboot_fdt = NULL; + multiboot_fdt_size = 0; + } + return (GRUB_ERR_NONE); +} + +static grub_err_t +init_module_info_fdt (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_fdt_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_fdt_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 +check_multiboot_kernel (stub_header_t sh) +{ + if (sh->efi_head.magic != GRUB_ARM64_LINUX_MAGIC) + return (grub_error(GRUB_ERR_BAD_OS, "invalid magic number")); + + if ((sh->efi_head.code0 & 0xffff) == GRUB_EFI_PE_MAGIC) + { + grub_dprintf ("multiboot_loader", "UEFI stub kernel:\n"); + grub_dprintf ("multiboot_loader", "text_offset = 0x%012llx\n", + (long long unsigned) sh->efi_head.text_offset); + grub_dprintf ("multiboot_loader", "PE/COFF header @ %08x\n", sh->efi_head.hdr_offset); + return (GRUB_ERR_NONE); + } + + return (grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, + N_("plain image not supported - rebuild with STUB support"))); +} + +static void * +finalize_params_multiboot (void) +{ + multiboot_module_t module; + grub_err_t retval; + void *params_blob = NULL; + + /* 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_fdt (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_fdt (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)); + + params_blob = (void *)install_all_params_fdt (); + if (!params_blob) + { + goto failure_kernel; + } + + return (params_blob); + + failure_module: + grub_list_push (GRUB_AS_LIST_P (&module_head), GRUB_AS_LIST (kernel)); + failure_kernel: + clean_all_params_fdt (); + failure: + return NULL; +} + +static grub_err_t +grub_multiboot_boot (void) +{ + void *params_blob; + 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; + + params_blob = finalize_params_multiboot(); + if (!params_blob) + return (grub_error (GRUB_ERR_BAD_OS, "failed to finalize boot params")); + + mempath = grub_zalloc (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 = kernel->start; + mempath[0].end_address = kernel->start + 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, + (void *)kernel->start, kernel->size, + &image_handle); + if (status != GRUB_EFI_SUCCESS) + return (grub_error (GRUB_ERR_BAD_OS, "cannot load stub-kernel image")); + + /* Set command line to NULL, we have added this info to params blob */ + loaded_image = grub_efi_get_loaded_image (image_handle); + loaded_image->load_options_size = 0; + loaded_image->load_options = NULL; + + grub_dprintf("linux", "starting stub-kernel @ %p\n", image_handle); + status = b->start_image (image_handle, 0, NULL); + + /* When successful, not reached */ + b->unload_image (image_handle); + return (grub_error (GRUB_ERR_BAD_OS, "Multiboot call returned")); +} + +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_fdt(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; +} + +static 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_multiboot_unload (void) +{ + grub_dl_unref (linux_mod); + + grub_arm64_linux_set_loaded(0); + grub_module_unload_all (); + clean_all_params_fdt (); + + return (GRUB_ERR_NONE); +} + +static grub_err_t +grub_module_load (multiboot_module_t module, grub_file_t file, + int argc, char *argv[]) +{ + grub_ssize_t temp = 0; + + 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; + + grub_dprintf ("multiboot_loader", "Multiboot %s address align(0x%lx) from 0x%lx to 0x%lx\n", + module->name, module->align, module->start_unaligned, module->start); + + temp = grub_file_read (file, (void *)module->start, module->size); + if (temp != (grub_ssize_t) module->size) + { + grub_dprintf ("multiboot_loader", "Multiboot %s(%p) load fail size: %ld,(expect 0x%lx)\n", + module->name, file, temp, module->size); + single_module_unload(module); + return (grub_error (GRUB_ERR_BAD_OS, + N_("premature end of file %s"), argv[0])); + } + + grub_dprintf ("multiboot_loader", "Multiboot %s loaded to 0x%lx size: 0x%lx\n", + module->name, module->start, temp); + + /* 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; + grub_dprintf ("multiboot_loader", "Multiboot %s has not cmdline\n", module->name); + } + + 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_arm64_linux_get_loaded()) + { + 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_fdt (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)) + return (grub_errno); + if (check_multiboot_kernel (&sh) != GRUB_ERR_NONE) + goto fail; + grub_file_seek (file, 0); + + grub_loader_unset(); + + grub_module_unload_all (); + + 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_dprintf ("multiboot_loader", "Init the alignment of %s from stub header: 0x%lx\n", + module->name, module->align); + + 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)); + grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 0); + grub_arm64_linux_set_loaded(1); + } + + fail: + if (file) + grub_file_close (file); + if (grub_errno != GRUB_ERR_NONE) + { + grub_dl_unref (linux_mod); + grub_arm64_linux_set_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..f15c5ea --- /dev/null +++ b/include/grub/arm64/multiboot.h @@ -0,0 +1,109 @@ +/* multiboot.h - Multiboot header file. */ +/* Copyright (C) 2014 Free Software Foundation, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY + * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#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 FDT_MODULE_IMAGE_COMPATIBLE "multiboot,kernel\0multiboot,module" +#define FDT_MODULE_INITRD_COMPATIBLE "multiboot,ramdisk\0multiboot,module" +#define FDT_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); + +#endif /* ! MULTIBOOT_HEADER */ -- 1.9.1

11 years

[PATCH 1/4] arm64: move some #define to header file

by Fu Wei

arm64: 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 | 4 ---- include/grub/arm64/linux.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 564a75a..5050a82 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -33,10 +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; diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index 864e5dc..22ffbaa 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 { -- 1.9.1

11 years

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

by Fu Wei

This multiboot support will be built in linux module for aarch64, and can not be used alone. - 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. - Add multiboot command for loading multiboot kernel image. Usage: multiboot <the path of kernel image file> [cmdline] - Add module command for loading multiboot module. Usage: module [option] <the path of module file> [cmdline] The [option] for Xen is [--type <compatible stream in FDT>]. For now, the <compatible stream in FDT> could be : "multiboot,kernel", "multiboot,ramdisk", "multiboot,module", "xen,xsm-policy" or the custom compatible stream - Only support stub-kernel for arm64: support stub-kernel detection and alignment info detection - 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 Export some accessor functions of dtb and the "loaded" flag for sharing code to multiboot.c Signed-off-by: Fu Wei <fu.wei(a)linaro.org>

11 years

The GRUB multiboot support patch for aarch64(V3.7)

by Fu Wei

Hi Leif, I have made a new multiboot support patch V3.7, because Roy has updated the stub-xen support. Compared with V3.6, I added the stub-kernel boot support: provide device_handle data in loaded_image provide file_path data in loaded_image(Do we need to provide it?) *Please review this patch and provide some advice or suggestion. If it is fine for you, I will make a serial patch for upstream.* Some pending changes: (1)delete "grub_arm64_disable_caches_mmu" and the relevant code(misc.c and misc_irq.S)(If we don't want to support raw kernel anymore) (2)grub coding style (I have checked the patch, but maybe I need to improve it in somewhere) (3)integrate multiboot_fdt.c back to multiboot.c (will make a new patch/branch for it, but I think multiboot_fdt.c make multiboot.c more generic) Notice: This patch bases on master branch of upstream grub This patch can works with: (1)Roy's repo(https://git.linaro.org/people/roy.franz/xen.git) tag: rfranz/efi-stub-v3 or his prebuild binary(http://people.linaro.org/~roy.franz/lava/xen/xen) (2)master branch of upstream xen.(non-stub) -- Best regards, Fu Wei Enterprise Server 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 V3 00/15] arm64 EFI stub

by Roy Franz

This patch series adds EFI boot support for arm64. A PE/COFF header is created in head.S, as there is no toolchain support for PE/COFF on arm64. This also has the advantage that the file is both an "Image" file and a PE/COFF executable - the same binary can be loaded and run either way. The EFI 'stub' code is a shim layer that serves as the loader for the XEN kernel in the EFI environment. The stub loads the dom0 kernel and initrd if required, and adds entries for them as well as for the EFI data structures into the device tree passed to XEN. Once the device tree is constructed, EFI boot services are exited, and the stub transfers control to the normal XEN entry point. The only indication XEN has that it was loaded via the stub is that the device tree contains EFI properties. This is all very similar to the arm/arm64 Linux kernel EFI stubs. I'm not really that happy with how the x86 build works, in particular the rule I added to arch/x86/Makefile to build boot.init.o to fix parallel builds. Due to the way the EFI build is done - building 2 executables at the same time with different EFI code included in each, the normal common build infrastructure doesn't work. Changes since v2: * Major refactor to use common EFI entry point and factor out arch specific code, rather than factoring out the common code. * Update entire libfdt to v1.4.0 to provide fdt_create_empty_tree() Changes since v1: * Added common/efi directory for shared EFI code, and arch/arm/efi for arm-specfic code. Global build hacking of -fshort-wchar removed. arm32, arm64, and x86 with/without EFI enabled toolchain all build. The x86 build previously autodetected whether the EFI version should be built or not based on toolchain support. I couldn't get this working nicely with the common code, so for x86 I have the common code always build, and the EFI autodection works as normal for building the EFI version. * Basic use of the EFI memory map instead of FDT based memory description. More work needed to resolve differences between FDT description of a small number of large memory banks with reserved regions, and EFI's potentially long list of available regions, which can be long. * More refactoring of common EFI code to not directly exit using blexit(), as this broke the pre-linking targets. All shared code returns status, and it is up to the caller to exit and clean up. * Reduced the number of patches. Refactoring of x86 code first, then moving all code to efi-shared.c in one patch. * Fixed formatting/tab issues in new files, added Emacs footer. * Fixed efi_get_memory_map to return NULL map pointer on error in addition to failed status. * Added comments in head.S regarding PE/COFF specification, and 1:1 mapping used by EFI code. * Updated device tree bindings to use new multiboot bindings. Since the stub is always built into XEN, we don't have to support older bindings. Roy Franz (15): move EFI boot code to common/efi Move x86 specific funtions/variables to arch header create arch functions to get and process EFI memory map. Add architecture functions for pre/post ExitBootServices Add efi_arch_cfg_file() to handle arch specific cfg file fields Add efi_arch_handle_cmdline() for processing commandline Move x86 specific video and disk probing code Add efi_arch_memory() for arch specific memory setup Add arch specific module handling to read_file() Add SMBIOS and runtime services setup arch functions. Add several misc. arch functions for EFI boot code. Add efi_arch_use_config_file() function to control use of config file add arm64 cache flushing code from linux v3.16 Update libfdt to v1.4.0 Add ARM EFI boot support .gitignore | 2 + xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/cache.S | 100 ++ xen/arch/arm/arm64/head.S | 145 ++- xen/arch/arm/xen.lds.S | 1 + xen/arch/x86/Makefile | 15 +- xen/arch/x86/efi/Makefile | 4 +- xen/arch/x86/efi/boot.c | 1723 ----------------------------------- xen/arch/x86/efi/efi.h | 39 - xen/arch/x86/efi/runtime.c | 2 +- xen/common/Makefile | 1 + xen/common/efi/Makefile | 17 + xen/common/efi/boot.c | 823 +++++++++++++++++ xen/common/efi/check.c | 4 + xen/common/efi/dummy.c | 1 + xen/common/efi/efi.h | 39 + xen/common/libfdt/Makefile.libfdt | 4 +- xen/common/libfdt/fdt.c | 30 +- xen/common/libfdt/fdt_empty_tree.c | 84 ++ xen/common/libfdt/fdt_ro.c | 7 +- xen/common/libfdt/fdt_rw.c | 31 +- xen/common/libfdt/fdt_sw.c | 4 +- xen/common/libfdt/fdt_wip.c | 2 +- xen/common/libfdt/version.lds | 6 + xen/include/asm-arm/arm64/efibind.h | 216 +++++ xen/include/asm-arm/efi-boot.h | 602 ++++++++++++ xen/include/asm-arm/efi.h | 29 + xen/include/asm-arm/efibind.h | 2 + xen/include/asm-arm/setup.h | 2 +- xen/include/asm-x86/efi-boot.h | 1064 +++++++++++++++++++++ xen/include/asm-x86/efi.h | 39 + xen/include/xen/libfdt/fdt.h | 93 +- xen/include/xen/libfdt/libfdt.h | 315 ++++++- xen/include/xen/libfdt/libfdt_env.h | 4 + 34 files changed, 3627 insertions(+), 1824 deletions(-) create mode 100644 xen/arch/arm/arm64/cache.S delete mode 100644 xen/arch/x86/efi/boot.c delete mode 100644 xen/arch/x86/efi/efi.h create mode 100644 xen/common/efi/Makefile create mode 100644 xen/common/efi/boot.c create mode 100644 xen/common/efi/check.c create mode 100644 xen/common/efi/dummy.c create mode 100644 xen/common/efi/efi.h create mode 100644 xen/common/libfdt/fdt_empty_tree.c create mode 100644 xen/include/asm-arm/arm64/efibind.h create mode 100644 xen/include/asm-arm/efi-boot.h create mode 100644 xen/include/asm-arm/efi.h create mode 100644 xen/include/asm-arm/efibind.h create mode 100644 xen/include/asm-x86/efi-boot.h create mode 100644 xen/include/asm-x86/efi.h -- 2.1.0.rc1

11 years, 1 month

LEG Kernel & ACPI Tables

by Narinder Dhillon

Hi All, I am booting latest LEG kernel from UEFI that has ACPI tables for ARMv8 core. ACPI tables are parsed but kernel stops at a certain point in the boot cycle and I am not sure where and why. In particular, this statement seems odd because it should not be looking for device tree at all. No CPU information found in DT Kernel console output pasted below. Any help would be appreciated. Thanx, EFI stub: Booting Linux Kernel... Initializing cgroup subsys cpu Linux version 3.17.0-rc2+ (narinder@ndhillon-lnx) (gcc version 4.7.0 (Cavium Development Version) ) #3 SMP PREEMPT Thu Sep 4 15:33:38 PDT 2014 CPU: AArch64 Processor [430f0a10] revision 0 Detected VIPT I-cache on CPU0 L1_CACHE_BYTES smaller than the Cache Writeback Granule (64 < 128) Memory limited to 1024MB Early serial console at I/O port 0x0 (options '') bootconsole [uart0] enabled efi: Getting EFI parameters from FDT: EFI v2.40 by Cavium Thunder cn88xx EFI Sep 1 2014 20:10:17 efi: ACPI=0x7ab85000 ACPI 2.0=0x7ab85014 cma: Reserved 16 MiB at 78c00000 ACPI: Early table checksum verification disabled ACPI: RSDP 0x000000007AB85014 000024 (v02 CAVIUM) ACPI: XSDT 0x000000007AB840E8 00003C (v01 CAVIUM THUNDERX 00000000 01000013) ACPI: FACP 0x000000007AB81000 00010C (v05 CAVIUM THUNDERX 00000000 INTL 20140828) ACPI BIOS Warning (bug): 32/64X FACS address mismatch in FADT: 0x7AB80000/0x0000000000000001, using 32-bit address (20140724/tbfadt-283) ACPI: DSDT 0x000000007AB82000 000117 (v02 CAVIUM THUNDERX 00000001 INTL 20140828) ACPI: APIC 0x000000007AB83000 0002B4 (v04 CAVIUM THUNDERX 00000001 INTL 20140828) ACPI: GTDT 0x000000007AB7F000 0000E0 (v02 CAVIUM THUNDERX 00000001 INTL 20140828) On node 0 totalpages: 521216 DMA zone: 7126 pages used for memmap DMA zone: 0 pages reserved DMA zone: 521216 pages, LIFO batch:31 BUG: not creating id mapping for 0x00008ee000000000 psci: probing for conduit method from ACPI. psci: Using standard PSCI v0.2 function IDs ACPI: GICC (acpi_id[0x0000] address[0000801000000000] MPDIR[0x0] enabled) ACPI: GICC (acpi_id[0x0001] address[0000801000000000] MPDIR[0x1] enabled) ACPI: GICC (acpi_id[0x0002] address[0000801000000000] MPDIR[0x2] enabled) ACPI: GICC (acpi_id[0x0003] address[0000801000000000] MPDIR[0x3] enabled) ACPI: GICC (acpi_id[0x0004] address[0000801000000000] MPDIR[0x4] enabled) ACPI: GICC (acpi_id[0x0005] address[0000801000000000] MPDIR[0x5] enabled) ACPI: GICC (acpi_id[0x0006] address[0000801000000000] MPDIR[0x6] enabled) ACPI: GICC (acpi_id[0x0007] address[0000801000000000] MPDIR[0x7] enabled) ACPI: 8 CPUs enabled, 8 CPUs total PERCPU: Embedded 12 pages/cpu @ffffffc07edbc000 s17472 r8192 d23488 u49152 pcpu-alloc: s17472 r8192 d23488 u49152 alloc=12*4096 pcpu-alloc: [0] 0 [0] 1 [0] 2 [0] 3 [0] 4 [0] 5 [0] 6 [0] 7 Built 1 zonelists in Zone order, mobility grouping on. Total pages: 514090 Kernel command line: BOOT_IMAGE=/boot/Image root=/dev/sda2 console=ttyAMA0 mem=1024M earlycon=pl011,0x87e024000000 debug maxcpus=16 rw log_buf_len individual max cpu contribution: 4096 bytes log_buf_len total cpu_extra contributions: 28672 bytes log_buf_len min size: 16384 bytes log_buf_len: 65536 bytes early log buf free: 12956(79%) PID hash table entries: 4096 (order: 3, 32768 bytes) Dentry cache hash table entries: 262144 (order: 9, 2097152 bytes) Inode-cache hash table entries: 131072 (order: 8, 1048576 bytes) Memory: 1957372K/2084864K available (4948K kernel code, 446K rwdata, 1928K rodata, 305K init, 229K bss, 127492K reserved) Virtual kernel memory layout: vmalloc : 0xffffff8000000000 - 0xffffffbdffff0000 ( 247 GB) vmemmap : 0xffffffbe00000000 - 0xffffffbfc0000000 ( 7 GB maximum) 0xffffffbe0002a000 - 0xffffffbe01c00000 ( 27 MB actual) PCI I/O : 0xffffffbffa000000 - 0xffffffbffb000000 ( 16 MB) fixed : 0xffffffbffbdfe000 - 0xffffffbffbdff000 ( 4 KB) modules : 0xffffffbffc000000 - 0xffffffc000000000 ( 64 MB) memory : 0xffffffc000000000 - 0xffffffc07f400000 ( 2036 MB) .init : 0xffffffc000739000 - 0xffffffc000785440 ( 306 KB) .text : 0xffffffc000080000 - 0xffffffc0007380f4 ( 6881 KB) .data : 0xffffffc000786000 - 0xffffffc0007f5b98 ( 447 KB) SLUB: HWalign=128, Order=0-3, MinObjects=0, CPUs=8, Nodes=1 Preemptible hierarchical RCU implementation. NR_IRQS:64 nr_irqs:64 0 clocksource_of_init: no matching clocksources found Architected cp15 timer(s) running at 100.00MHz (phys). sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 2748779069440ns Console: colour dummy device 80x25 allocated 8388608 bytes of page_cgroup please try 'cgroup_disable=memory' option if you don't want memory cgroups Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=1000000) pid_max: default: 32768 minimum: 301 ACPI: Core revision 20140724 ACPI: All ACPI Tables successfully acquired Security Framework initialized Mount-cache hash table entries: 4096 (order: 3, 32768 bytes) Mountpoint-cache hash table entries: 4096 (order: 3, 32768 bytes) Initializing cgroup subsys memory Initializing cgroup subsys hugetlb No CPU information found in DT hw perfevents: enabled with arm/armv8-pmuv3 PMU driver, 7 counters available Remapping and enabling EFI services. Freed 0x44f8000 bytes of EFI boot services memory

11 years, 1 month

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-uefi