Add RISC-V support
v5 cover Add RISC-V support
As part of the plan for total world domination, we would like to make sure that booting on RISC-V is in a sane state before anyone goes and does quick hacks "just because".
For that reason, U-Boot supports UEFI booting on RISC-V for a while now. This patch set is the second part of the puzzle, with grub learning how to deal with a UEFI enabled RISC-V target.
The third bit (still missing) is to actually make a working Linux UEFI port. But that will come, I'm sure :).
Looking forward to review feedback and testing,
v1 -> v2:
- adapt to new grub_open_file() API
- adapt to new grub_create_loader_cmdline() API
v2 -> v3:
- fix riscv32 target
v3 -> v4:
- Rebase onto current git master
- Change copyright from 2013 to 2018
- Coding style fixes
- Add spec reference
- Resurrect time reading code
v4 -> v5:
- Mark grub_arch_sync_dma_caches args as unused
- Whitespace fix
- Add spec link to mkimagexx.c
- Remove curly braces
- Use GRUB_EFI_LINUX_FDT_EXTRA_SPACE
- Fix whitespace
- s/failure/fail
- Remove blank line at EOF
- Add blank lines before and after license tag
- New patch: RISC-V: Add libgcc helpers for clz
Alexander Graf (11):
efi: Rename armxx to arch
PE: Add RISC-V definitions
elf.h: Add RISC-V definitions
RISC-V: Add setjmp implementation
RISC-V: Add early startup code
RISC-V: Add Linux load logic
RISC-V: Add awareness for RISC-V reloations
RISC-V: Add auxiliary files
RISC-V: Add libgcc helpers for clz
RISC-V: Add to build system
fdt: Treat device tree file type like ACPI
configure.ac | 28 ++- gentpl.py | 11 +- grub-core/Makefile.am | 12 ++ grub-core/Makefile.core.def | 29 +++ grub-core/commands/efi/shim_lock.c | 1 + grub-core/commands/file.c | 14 +- grub-core/kern/compiler-rt.c | 48 ++++- grub-core/kern/dl.c | 6 +- grub-core/kern/efi/mm.c | 2 +- grub-core/kern/emu/cache.c | 6 + grub-core/kern/emu/cache_s.S | 1 + grub-core/kern/emu/lite.c | 2 + grub-core/kern/riscv/cache.c | 63 +++++++ grub-core/kern/riscv/cache_flush.S | 44 +++++ grub-core/kern/riscv/dl.c | 340 +++++++++++++++++++++++++++++++++++ grub-core/kern/riscv/efi/init.c | 76 ++++++++ grub-core/kern/riscv/efi/startup.S | 48 +++++ grub-core/lib/efi/halt.c | 3 +- grub-core/lib/riscv/setjmp.S | 84 +++++++++ grub-core/lib/setjmp.S | 2 + grub-core/loader/arm64/linux.c | 10 +- grub-core/loader/arm64/xen_boot.c | 6 +- grub-core/loader/riscv/linux.c | 350 +++++++++++++++++++++++++++++++++++++ include/grub/arm/linux.h | 2 +- include/grub/arm64/linux.h | 2 +- include/grub/compiler-rt.h | 19 +- include/grub/dl.h | 6 +- include/grub/efi/api.h | 3 +- include/grub/efi/efi.h | 6 +- include/grub/efi/pe32.h | 5 + include/grub/elf.h | 58 ++++++ include/grub/file.h | 4 +- include/grub/misc.h | 3 +- include/grub/riscv32/efi/memory.h | 6 + include/grub/riscv32/linux.h | 41 +++++ include/grub/riscv32/setjmp.h | 27 +++ include/grub/riscv32/time.h | 28 +++ include/grub/riscv32/types.h | 34 ++++ include/grub/riscv64/efi/memory.h | 6 + include/grub/riscv64/linux.h | 43 +++++ include/grub/riscv64/setjmp.h | 27 +++ include/grub/riscv64/time.h | 28 +++ include/grub/riscv64/types.h | 34 ++++ include/grub/util/install.h | 2 + util/grub-install-common.c | 2 + util/grub-install.c | 28 +++ util/grub-mkimagexx.c | 259 +++++++++++++++++++++++++++ util/grub-mknetdir.c | 4 +- util/grub-mkrescue.c | 16 +- util/grub-module-verifier.c | 56 ++++++ util/mkimage.c | 32 ++++ 51 files changed, 1928 insertions(+), 39 deletions(-) create mode 100644 grub-core/kern/riscv/cache.c create mode 100644 grub-core/kern/riscv/cache_flush.S create mode 100644 grub-core/kern/riscv/dl.c create mode 100644 grub-core/kern/riscv/efi/init.c create mode 100644 grub-core/kern/riscv/efi/startup.S create mode 100644 grub-core/lib/riscv/setjmp.S create mode 100644 grub-core/loader/riscv/linux.c create mode 100644 include/grub/riscv32/efi/memory.h create mode 100644 include/grub/riscv32/linux.h create mode 100644 include/grub/riscv32/setjmp.h create mode 100644 include/grub/riscv32/time.h create mode 100644 include/grub/riscv32/types.h create mode 100644 include/grub/riscv64/efi/memory.h create mode 100644 include/grub/riscv64/linux.h create mode 100644 include/grub/riscv64/setjmp.h create mode 100644 include/grub/riscv64/time.h create mode 100644 include/grub/riscv64/types.h
Signature · 1 line
2.12.3
PATCH v5 1/11 efi: Rename armxx to arch
Some architectures want to boot Linux as plain UEFI binary. Today that really only encompasses ARM and AArch64, but going forward more architectures may adopt that model.
So rename our internal API accordingly.
---
v3 -> v4:
- Rebase
--- grub-core/loader/arm64/linux.c | 10 +++++----- grub-core/loader/arm64/xen_boot.c | 6 +++--- include/grub/arm/linux.h | 2 +- include/grub/arm64/linux.h | 2 +- include/grub/efi/efi.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-)
grub-core/loader/arm64/linux.c +5 -5
@@ -49,7 +49,7 @@ static grub_addr_t initrd_start;static grub_addr_t initrd_end;grub_err_t -grub_armxx_efi_linux_check_image (struct linux_armxx_kernel_header * lh) +grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh) {if (lh->magic !=GRUB_LINUX_ARMXX_MAGIC_SIGNATURE )return grub_error (GRUB_ERR_BAD_OS ,"invalid magic number" );
@@ -110,7 +110,7 @@ failure: }grub_err_t -grub_armxx_efi_linux_boot_image (grub_addr_t addr,grub_size_t size,char *args) +grub_arch_efi_linux_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;
@@ -173,7 +173,7 @@ grub_linux_boot (void)if (finalize_params_linux () !=GRUB_ERR_NONE )return grub_errno; -return (grub_armxx_efi_linux_boot_image ((grub_addr_t )kernel_addr, +return (grub_arch_efi_linux_boot_image ((grub_addr_t )kernel_addr, kernel_size, linux_args)); }
@@ -287,7 +287,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[]) { grub_file_t file = 0; -struct linux_armxx_kernel_header lh; +struct linux_arch_kernel_header lh;grub_err_t err;grub_dl_ref (my_mod);
@@ -307,7 +307,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 (grub_armxx_efi_linux_check_image (&lh) !=GRUB_ERR_NONE ) +if (grub_arch_efi_linux_check_image (&lh) !=GRUB_ERR_NONE ) goto fail;grub_loader_unset ();
grub-core/loader/arm64/xen_boot.c +3 -3
@@ -265,7 +265,7 @@ xen_boot (void)if (err)return err; -return grub_armxx_efi_linux_boot_image (xen_hypervisor->start, +return grub_arch_efi_linux_boot_image (xen_hypervisor->start, xen_hypervisor->size, xen_hypervisor->cmdline); }
@@ -469,8 +469,8 @@ grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)),if (grub_file_read (file, &sh,sizeof (sh)) != (long )sizeof (sh)) goto fail; -if (grub_armxx_efi_linux_check_image - ((struct linux_armxx_kernel_header *) &sh) !=GRUB_ERR_NONE ) +if (grub_arch_efi_linux_check_image + ((struct linux_arch_kernel_header *) &sh) !=GRUB_ERR_NONE ) goto fail;grub_file_seek (file,0 );
include/grub/arm/linux.h +1 -1
@@ -36,7 +36,7 @@ struct linux_arm_kernel_header {#if defined(__arm__)# define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE -# define linux_armxx_kernel_header linux_arm_kernel_header +# define linux_arch_kernel_header linux_arm_kernel_header#endif #if definedGRUB_MACHINE_UBOOT
include/grub/arm64/linux.h +1 -1
@@ -38,7 +38,7 @@ struct linux_arm64_kernel_header#if defined(__aarch64__)# define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE -# define linux_armxx_kernel_header linux_arm64_kernel_header +# define linux_arch_kernel_header linux_arm64_kernel_header#endif #endif /* ! GRUB_ARM64_LINUX_HEADER */
include/grub/efi/efi.h +2 -2
@@ -94,8 +94,8 @@ extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd,void *EXPORT_FUNC (grub_efi_get_firmware_fdt )(void );grub_err_t EXPORT_FUNC (grub_efi_get_ram_base )(grub_addr_t *);#include <grub/cpu/linux.h> -grub_err_t grub_armxx_efi_linux_check_image (struct linux_armxx_kernel_header *lh); -grub_err_t grub_armxx_efi_linux_boot_image (grub_addr_t addr,grub_size_t size, +grub_err_t grub_arch_efi_linux_check_image (struct linux_arch_kernel_header *lh); +grub_err_t grub_arch_efi_linux_boot_image (grub_addr_t addr,grub_size_t size,char *args);#endif
Signature · 1 line
2.12.3
PATCH v5 2/11 PE: Add RISC-V definitions
In reply to Alexander GrafThe PE format defines magic numbers as well as relocation identifiers for RISC-V. Add them to our include file, so we can make use of them.
--- include/grub/efi/pe32.h | 5 +++++ 1 file changed, 5 insertions(+)
include/grub/efi/pe32.h +5 -0
@@ -70,6 +70,8 @@ struct grub_pe32_coff_header#define GRUB_PE32_MACHINE_X86_64 0x8664#define GRUB_PE32_MACHINE_ARMTHUMB_MIXED 0x01c2#define GRUB_PE32_MACHINE_ARM64 0xAA64 +#define GRUB_PE32_MACHINE_RISCV32 0x5032 +#define GRUB_PE32_MACHINE_RISCV64 0x5064#define GRUB_PE32_RELOCS_STRIPPED 0x0001#define GRUB_PE32_EXECUTABLE_IMAGE 0x0002
@@ -281,9 +283,12 @@ struct grub_pe32_fixup_block#define GRUB_PE32_REL_BASED_HIGHADJ 4#define GRUB_PE32_REL_BASED_MIPS_JMPADDR 5#define GRUB_PE32_REL_BASED_ARM_MOV32A 5 +#define GRUB_PE32_REL_BASED_RISCV_HI20 5#define GRUB_PE32_REL_BASED_SECTION 6#define GRUB_PE32_REL_BASED_REL 7#define GRUB_PE32_REL_BASED_ARM_MOV32T 7 +#define GRUB_PE32_REL_BASED_RISCV_LOW12I 7 +#define GRUB_PE32_REL_BASED_RISCV_LOW12S 8#define GRUB_PE32_REL_BASED_IA64_IMM64 9#define GRUB_PE32_REL_BASED_DIR64 10#define GRUB_PE32_REL_BASED_HIGH3ADJ 11
Signature · 1 line
2.12.3
PATCH v5 3/11 elf.h: Add RISC-V definitions
In reply to Alexander GrafThe RISC-V ABI document outlines ELF header structure and relocation information. Pull the respective magic numbers into our elf header so we can make use of them.
--- include/grub/elf.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)
include/grub/elf.h +58 -0
@@ -247,6 +247,7 @@ typedef struct#define EM_XTENSA 94/* Tensilica Xtensa Architecture */ #define EM_NUM 95#define EM_AARCH64 183/* ARM 64-bit architecture */ +#define EM_RISCV 243/* RISC-V */ /* If it is necessary to assign new unofficial EM_* values, please pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
@@ -2473,6 +2474,63 @@ typedef Elf32_Addr Elf32_Conflict;#define R_X86_64_NUM 24 +/* RISC-V relocations */ +#define R_RISCV_NONE 0 +#define R_RISCV_32 1 +#define R_RISCV_64 2 +#define R_RISCV_RELATIVE 3 +#define R_RISCV_COPY 4 +#define R_RISCV_JUMP_SLOT 5 +#define R_RISCV_TLS_DTPMOD32 6 +#define R_RISCV_TLS_DTPMOD64 7 +#define R_RISCV_TLS_DTPREL32 8 +#define R_RISCV_TLS_DTPREL64 9 +#define R_RISCV_TLS_TPREL32 10 +#define R_RISCV_TLS_TPREL64 11 + +#define R_RISCV_BRANCH 16 +#define R_RISCV_JAL 17 +#define R_RISCV_CALL 18 +#define R_RISCV_CALL_PLT 19 +#define R_RISCV_GOT_HI20 20 +#define R_RISCV_TLS_GOT_HI20 21 +#define R_RISCV_TLS_GD_HI20 22 +#define R_RISCV_PCREL_HI20 23 +#define R_RISCV_PCREL_LO12_I 24 +#define R_RISCV_PCREL_LO12_S 25 +#define R_RISCV_HI20 26 +#define R_RISCV_LO12_I 27 +#define R_RISCV_LO12_S 28 +#define R_RISCV_TPREL_HI20 29 +#define R_RISCV_TPREL_LO12_I 30 +#define R_RISCV_TPREL_LO12_S 31 +#define R_RISCV_TPREL_ADD 32 +#define R_RISCV_ADD8 33 +#define R_RISCV_ADD16 34 +#define R_RISCV_ADD32 35 +#define R_RISCV_ADD64 36 +#define R_RISCV_SUB8 37 +#define R_RISCV_SUB16 38 +#define R_RISCV_SUB32 39 +#define R_RISCV_SUB64 40 +#define R_RISCV_GNU_VTINHERIT 41 +#define R_RISCV_GNU_VTENTRY 42 +#define R_RISCV_ALIGN 43 +#define R_RISCV_RVC_BRANCH 44 +#define R_RISCV_RVC_JUMP 45 +#define R_RISCV_LUI 46 +#define R_RISCV_GPREL_I 47 +#define R_RISCV_GPREL_S 48 +#define R_RISCV_TPREL_I 49 +#define R_RISCV_TPREL_S 50 +#define R_RISCV_RELAX 51 +#define R_RISCV_SUB6 52 +#define R_RISCV_SET6 53 +#define R_RISCV_SET8 54 +#define R_RISCV_SET16 55 +#define R_RISCV_SET32 56 +#define R_RISCV_32_PCREL 57 +#ifdef GRUB_TARGET_WORDSIZE #if GRUB_TARGET_WORDSIZE ==32
Signature · 1 line
2.12.3
PATCH v5 4/11 RISC-V: Add setjmp implementation
In reply to Alexander GrafThis patch adds a 32/64 capable setjmp implementation for RISC-V.
---
v3 -> v4:
- Change copyright from 2013 to 2018
v4 -> v5:
- Add blank lines before and after license tag
--- grub-core/lib/riscv/setjmp.S | 84 +++++++++++++++++++++++++++++++++++++++++++ include/grub/riscv32/setjmp.h | 27 ++++++++++++++ include/grub/riscv64/setjmp.h | 27 ++++++++++++++ 3 files changed, 138 insertions(+) create mode 100644 grub-core/lib/riscv/setjmp.S create mode 100644 include/grub/riscv32/setjmp.h create mode 100644 include/grub/riscv64/setjmp.h
grub-core/lib/riscv/setjmp.S new file +84 -0
@@ -0,0 +1,84 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2018 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/symbol.h> +#include <grub/dl.h> + + .file "setjmp.S" + +GRUB_MOD_LICENSE "GPLv3+" + + .text + +#if __riscv_xlen == 64 +#define STORE_IDX(reg, idx) sd reg, (idx*8)(a0) +#define LOAD_IDX(reg, idx) ld reg, (idx*8)(a0) +#else +#define STORE_IDX(reg, idx) sw reg, (idx*4)(a0) +#define LOAD_IDX(reg, idx) lw reg, (idx*4)(a0) +#endif + +/* + * int grub_setjmp (grub_jmp_buf env) + */ +FUNCTION(grub_setjmp) + /* Preserve all callee-saved registers and the SP */ + STORE_IDX(s0, 0) + STORE_IDX(s1, 1) + STORE_IDX(s2, 2) + STORE_IDX(s3, 3) + STORE_IDX(s4, 4) + STORE_IDX(s5, 5) + STORE_IDX(s6, 6) + STORE_IDX(s7, 7) + STORE_IDX(s8, 8) + STORE_IDX(s9, 9) + STORE_IDX(s10, 10) + STORE_IDX(s11, 11) + STORE_IDX(ra, 12) + STORE_IDX(sp, 13) + li a0, 0 + ret + +/* + * int grub_longjmp (grub_jmp_buf env, int val) + */ +FUNCTION(grub_longjmp) + LOAD_IDX(s0, 0) + LOAD_IDX(s1, 1) + LOAD_IDX(s2, 2) + LOAD_IDX(s3, 3) + LOAD_IDX(s4, 4) + LOAD_IDX(s5, 5) + LOAD_IDX(s6, 6) + LOAD_IDX(s7, 7) + LOAD_IDX(s8, 8) + LOAD_IDX(s9, 9) + LOAD_IDX(s10, 10) + LOAD_IDX(s11, 11) + LOAD_IDX(ra, 12) + LOAD_IDX(sp, 13) + + /* Move the return value in place, but return 1 if passed 0. */ + beq a1, zero, longjmp_1 + mv a0, a1 + ret + + longjmp_1: + li a0, 1 + ret
include/grub/riscv32/setjmp.h new file +27 -0
@@ -0,0 +1,27 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2018 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 GRUB_SETJMP_CPU_HEADER +#define GRUB_SETJMP_CPU_HEADER 1 + +typedef unsigned long long grub_jmp_buf [14 ]; + +int grub_setjmp (grub_jmp_buf env) RETURNS_TWICE; +void grub_longjmp (grub_jmp_buf env,int val) __attribute__ ((noreturn)); + +#endif /* ! GRUB_SETJMP_CPU_HEADER */
include/grub/riscv64/setjmp.h new file +27 -0
@@ -0,0 +1,27 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2018 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 GRUB_SETJMP_CPU_HEADER +#define GRUB_SETJMP_CPU_HEADER 1 + +typedef unsigned long long grub_jmp_buf [14 ]; + +int grub_setjmp (grub_jmp_buf env) RETURNS_TWICE; +void grub_longjmp (grub_jmp_buf env,int val) __attribute__ ((noreturn)); + +#endif /* ! GRUB_SETJMP_CPU_HEADER */
Signature · 1 line
2.12.3
PATCH v5 5/11 RISC-V: Add early startup code
In reply to Alexander GrafOn entry, we need to save the system table pointer as well as our image handle. Add an early startup file that saves them and then brings us into our main function.
---
v3 -> v4:
- Change copyright from 2013 to 2018
v4 -> v5:
- Remove blank line at EOF
--- grub-core/kern/riscv/efi/startup.S | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 grub-core/kern/riscv/efi/startup.S
grub-core/kern/riscv/efi/startup.S new file +48 -0
@@ -0,0 +1,48 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2018 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/symbol.h> + +#if __riscv_xlen == 64 +#define sl sd +#define ll ld +#else +#define sl sw +#define ll lw +#endif + + + .file "startup.S" + .text +FUNCTION(_start) + /* + * EFI_SYSTEM_TABLE and EFI_HANDLE are passed in a1/a0. + */ + + ll a2, efi_image_handle_val + sl a0, 0(a2) + ll a2, efi_system_table_val + sl a1, 0(a2) + ll a2, grub_main_val + jr a2 +grub_main_val: + .quad EXT_C(grub_main) +efi_system_table_val: + .quad EXT_C(grub_efi_system_table) +efi_image_handle_val: + .quad EXT_C(grub_efi_image_handle)
Signature · 1 line
2.12.3
PATCH v5 6/11 RISC-V: Add Linux load logic
In reply to Alexander GrafWe currently only support to run grub on RISC-V as UEFI payload. Ideally, we also only want to support running Linux underneath as UEFI payload.
Prepare that with a Linux boot case that is not enabled in Linux yet. At least it will give people something to test against when they enable the Linux UEFI port.
This implementation will eventually have to get merged with the ARM one, as they really do almost the same thing. But for that, let's wait for the ARM one to get cleaned up. We can then merge the two by generalizing the clean ARM one.
---
v1 -> v2:
- adapt to new grub_open_file() API
- adapt to new grub_create_loader_cmdline() API
v3 -> v4:
- Change copyright from 2013 to 2018
- Coding style fixes
v4 -> v5:
- Use GRUB_EFI_LINUX_FDT_EXTRA_SPACE
- Fix whitespace
- s/failure/fail
--- grub-core/loader/riscv/linux.c | 350 +++++++++++++++++++++++++++++++++++++++++ include/grub/riscv32/linux.h | 41 +++++ include/grub/riscv64/linux.h | 43 +++++ 3 files changed, 434 insertions(+) create mode 100644 grub-core/loader/riscv/linux.c create mode 100644 include/grub/riscv32/linux.h create mode 100644 include/grub/riscv64/linux.h
grub-core/loader/riscv/linux.c new file +350 -0
@@ -0,0 +1,350 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2018 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/charset.h> +#include <grub/command.h> +#include <grub/err.h> +#include <grub/file.h> +#include <grub/fdt.h> +#include <grub/linux.h> +#include <grub/loader.h> +#include <grub/mm.h> +#include <grub/types.h> +#include <grub/cpu/linux.h> +#include <grub/efi/efi.h> +#include <grub/efi/fdtload.h> +#include <grub/efi/memory.h> +#include <grub/efi/pe32.h> +#include <grub/i18n.h> +#include <grub/lib/cmdline.h> + +GRUB_MOD_LICENSE ("GPLv3+" ); + +static grub_dl_t my_mod; +static int loaded; + +static void *kernel_addr; +static grub_uint64_t kernel_size; + +static char *linux_args; +static grub_uint32_t cmdline_size; + +static grub_addr_t initrd_start; +static grub_addr_t initrd_end; + +grub_err_t +grub_arch_efi_linux_check_image (struct linux_riscv_kernel_header * lh) +{ +if (lh->magic !=GRUB_LINUX_RISCV_MAGIC_SIGNATURE ) +return grub_error (GRUB_ERR_BAD_OS ,"invalid magic number" ); + +if ((lh->code0 &0xffff ) !=GRUB_PE32_MAGIC ) +return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET , +N_ ("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled" )); + +grub_dprintf ("linux" ,"UEFI stub kernel:\n" ); +grub_dprintf ("linux" ,"PE/COFF header @ %08x\n" , lh->hdr_offset); + +return GRUB_ERR_NONE ; +} + +static grub_err_t +finalize_params_linux (void ) +{ +int node, retval; +void *fdt; + + fdt =grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE ); + +if (!fdt) + goto fail; + + node =grub_fdt_find_subnode (fdt,0 ,"chosen" ); +if (node <0 ) + node =grub_fdt_add_subnode (fdt,0 ,"chosen" ); + +if (node <1 ) + goto fail; + +/* Set initrd info */ +if (initrd_start && initrd_end > initrd_start) + { +grub_dprintf ("linux" ,"Initrd @ %p-%p\n" , + (void *) initrd_start, (void *) initrd_end); + + retval =grub_fdt_set_prop64 (fdt, node,"linux,initrd-start" , + initrd_start); +if (retval) + goto fail; + retval =grub_fdt_set_prop64 (fdt, node,"linux,initrd-end" , + initrd_end); +if (retval) + goto fail; + } + +if (grub_fdt_install () !=GRUB_ERR_NONE ) + goto fail; + +return GRUB_ERR_NONE ; + + fail: +grub_fdt_unload (); +return grub_error (GRUB_ERR_BAD_OS ,"failed to install/update FDT" ); +} + +grub_err_t +grub_arch_efi_linux_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_any_pages (GRUB_EFI_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_addr_t ) loaded_image->load_options, +GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size)); + +return grub_errno; +} + +static grub_err_t +grub_linux_boot (void ) +{ +if (finalize_params_linux () !=GRUB_ERR_NONE ) +return grub_errno; + +return (grub_arch_efi_linux_boot_image ((grub_addr_t )kernel_addr, + kernel_size, linux_args)); +} + +static 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, +GRUB_EFI_BYTES_TO_PAGES (initrd_end - initrd_start)); + initrd_start = initrd_end =0 ; +grub_free (linux_args); +if (kernel_addr) +grub_efi_free_pages ((grub_addr_t ) kernel_addr, +GRUB_EFI_BYTES_TO_PAGES (kernel_size)); +grub_fdt_unload (); +return GRUB_ERR_NONE ; +} + +static grub_err_t +grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), +int argc,char *argv[]) +{ +struct grub_linux_initrd_context initrd_ctx = {0 ,0 ,0 }; +int initrd_size, initrd_pages; +void *initrd_mem =NULL ; + +if (argc ==0 ) + { +grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("filename expected" )); + goto fail; + } + +if (!loaded) + { +grub_error (GRUB_ERR_BAD_ARGUMENT , +N_ ("you need to load the kernel first" )); + goto fail; + } + +if (grub_initrd_init (argc, argv, &initrd_ctx)) + goto fail; + + initrd_size =grub_get_initrd_size (&initrd_ctx); +grub_dprintf ("linux" ,"Loading initrd\n" ); + + initrd_pages = (GRUB_EFI_BYTES_TO_PAGES (initrd_size)); + initrd_mem =grub_efi_allocate_any_pages (initrd_pages); +if (!initrd_mem) + { +grub_error (GRUB_ERR_OUT_OF_MEMORY ,N_ ("out of memory" )); + goto fail; + } + +if (grub_initrd_load (&initrd_ctx, argv, initrd_mem)) + goto fail; + + initrd_start = (grub_addr_t ) initrd_mem; + initrd_end = initrd_start + initrd_size; +grub_dprintf ("linux" ,"[addr=%p, size=0x%x]\n" , + (void *) initrd_start, initrd_size); + + fail: +grub_initrd_close (&initrd_ctx); +if (initrd_mem && !initrd_start) +grub_efi_free_pages ((grub_addr_t ) initrd_mem, initrd_pages); + +return grub_errno; +} + +static grub_err_t +grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +int argc,char *argv[]) +{ +grub_file_t file =0 ; +struct linux_riscv_kernel_header lh; + +grub_dl_ref (my_mod); + +if (argc ==0 ) + { +grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("filename expected" )); + goto fail; + } + + file =grub_file_open (argv[0 ],GRUB_FILE_TYPE_LINUX_KERNEL ); +if (!file) + goto fail; + + kernel_size =grub_file_size (file); + +if (grub_file_read (file, &lh,sizeof (lh)) < (long )sizeof (lh)) +return grub_errno; + +if (grub_arch_efi_linux_check_image (&lh) !=GRUB_ERR_NONE ) + goto fail; + +grub_loader_unset (); + +grub_dprintf ("linux" ,"kernel file size: %lld\n" , (long long ) kernel_size); + kernel_addr =grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (kernel_size)); +grub_dprintf ("linux" ,"kernel numpages: %lld\n" , + (long long )GRUB_EFI_BYTES_TO_PAGES (kernel_size)); +if (!kernel_addr) + { +grub_error (GRUB_ERR_OUT_OF_MEMORY ,N_ ("out of memory" )); + goto fail; + } + +grub_file_seek (file,0 ); +if (grub_file_read (file, kernel_addr, kernel_size) + < (grub_int64_t ) kernel_size) + { +if (!grub_errno) +grub_error (GRUB_ERR_BAD_OS ,N_ ("premature end of file %s" ), argv[0 ]); + goto fail; + } + +grub_dprintf ("linux" ,"kernel @ %p\n" , kernel_addr); + + cmdline_size =grub_loader_cmdline_size (argc, argv) +sizeof (LINUX_IMAGE ); + linux_args =grub_malloc (cmdline_size); +if (!linux_args) + { +grub_error (GRUB_ERR_OUT_OF_MEMORY ,N_ ("out of memory" )); + goto fail; + } +grub_memcpy (linux_args,LINUX_IMAGE ,sizeof (LINUX_IMAGE )); +grub_create_loader_cmdline (argc, argv, + linux_args +sizeof (LINUX_IMAGE ) -1 , + cmdline_size, +GRUB_VERIFY_KERNEL_CMDLINE ); + +if (grub_errno ==GRUB_ERR_NONE ) + { +grub_loader_set (grub_linux_boot, grub_linux_unload,0 ); + loaded =1 ; + } + + fail: +if (file) +grub_file_close (file); + +if (grub_errno !=GRUB_ERR_NONE ) + { +grub_dl_unref (my_mod); + loaded =0 ; + } + +if (linux_args && !loaded) +grub_free (linux_args); + +if (kernel_addr && !loaded) +grub_efi_free_pages ((grub_addr_t ) kernel_addr, +GRUB_EFI_BYTES_TO_PAGES (kernel_size)); + +return grub_errno; +} + +static grub_command_t cmd_linux, cmd_initrd; + +GRUB_MOD_INIT (linux) +{ + cmd_linux =grub_register_command ("linux" , grub_cmd_linux,0 , +N_ ("Load Linux." )); + cmd_initrd =grub_register_command ("initrd" , grub_cmd_initrd,0 , +N_ ("Load initrd." )); + my_mod = mod; +} + +GRUB_MOD_FINI (linux) +{ +grub_unregister_command (cmd_linux); +grub_unregister_command (cmd_initrd); +}
include/grub/riscv32/linux.h new file +41 -0
41 lines not on this page · raw message
include/grub/riscv64/linux.h new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
2.12.3
PATCH v5 7/11 RISC-V: Add awareness for RISC-V reloations
In reply to Alexander GrafThis patch adds awareness of RISC-V relocations throughout the grub tools as well as dynamic linkage and elf->PE relocation conversion support.
---
v2 -> v3:
- Fix riscv32 target
v3 -> v4:
- Change copyright from 2013 to 2018
- Add spec reference
v4 -> v5:
- Add spec link to mkimagexx.c
- Remove curly braces
--- grub-core/kern/dl.c | 6 +- grub-core/kern/riscv/dl.c | 340 ++++++++++++++++++++++++++++++++++++++++++++ include/grub/dl.h | 6 +- util/grub-mkimagexx.c | 259 +++++++++++++++++++++++++++++++++ util/grub-module-verifier.c | 56 ++++++++ 5 files changed, 662 insertions(+), 5 deletions(-) create mode 100644 grub-core/kern/riscv/dl.c
grub-core/kern/dl.c +3 -3
@@ -225,7 +225,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)unsigned i;const Elf_Shdr *s;grub_size_t tsize =0 , talign =1 ; -#if !defined (__i386__) && !defined (__x86_64__) +#if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv)grub_size_t tramp;grub_size_t got;grub_err_t err;
@@ -241,7 +241,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e) talign = s->sh_addralign; } -#if !defined (__i386__) && !defined (__x86_64__) +#if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv) err =grub_arch_dl_get_tramp_got_size (e, &tramp, &got);if (err)return err;
@@ -304,7 +304,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e) mod->segment = seg; } } -#if !defined (__i386__) && !defined (__x86_64__) +#if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv) ptr = (char *)ALIGN_UP ((grub_addr_t ) ptr,GRUB_ARCH_DL_TRAMP_ALIGN ); mod->tramp = ptr; mod->trampptr = ptr;
grub-core/kern/riscv/dl.c new file +340 -0
340 lines not on this page · raw message
include/grub/dl.h +4 -2
@@ -292,12 +292,14 @@ grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp, grub_size_t *got);#endif -#if defined (__powerpc__) || defined (__mips__) || defined (__arm__) +#if defined (__powerpc__) || defined (__mips__) || defined (__arm__) || \ + (defined(__riscv) && (__riscv_xlen ==32 ))#define GRUB_ARCH_DL_TRAMP_ALIGN 4#define GRUB_ARCH_DL_GOT_ALIGN 4#endif -#if defined (__aarch64__) || defined (__sparc__) +#if defined (__aarch64__) || defined (__sparc__) || \ + (defined(__riscv) && (__riscv_xlen ==64 ))#define GRUB_ARCH_DL_TRAMP_ALIGN 8#define GRUB_ARCH_DL_GOT_ALIGN 8#endif
util/grub-mkimagexx.c +259 -0
271 lines not on this page · raw message
util/grub-module-verifier.c +56 -0
62 lines not on this page · raw message
Signature · 1 line
2.12.3
PATCH v5 8/11 RISC-V: Add auxiliary files
In reply to Alexander GrafTo support a new architecture we need to provide a few helper functions for memory, cache, timer, etc support.
This patch adds the remainders of those. Some bits are still disabled, as I couldn't guarantee that we're always running on models / in modes where the respective hardware is available.
---
v2 -> v3:
- Fix riscv32 target
v3 -> v4:
- Change copyright from 2013 to 2018
- Fix coding style
- Resurrect time reading code
- Add fence.i for icache flush
v4 -> v5:
- Mark grub_arch_sync_dma_caches args as unused
- Whitespace fix
--- grub-core/kern/riscv/cache.c | 63 +++++++++++++++++++++++++++++++ grub-core/kern/riscv/cache_flush.S | 44 ++++++++++++++++++++++ grub-core/kern/riscv/efi/init.c | 76 ++++++++++++++++++++++++++++++++++++++ include/grub/riscv32/efi/memory.h | 6 +++ include/grub/riscv32/time.h | 28 ++++++++++++++ include/grub/riscv32/types.h | 34 +++++++++++++++++ include/grub/riscv64/efi/memory.h | 6 +++ include/grub/riscv64/time.h | 28 ++++++++++++++ include/grub/riscv64/types.h | 34 +++++++++++++++++ 9 files changed, 319 insertions(+) create mode 100644 grub-core/kern/riscv/cache.c create mode 100644 grub-core/kern/riscv/cache_flush.S create mode 100644 grub-core/kern/riscv/efi/init.c create mode 100644 include/grub/riscv32/efi/memory.h create mode 100644 include/grub/riscv32/time.h create mode 100644 include/grub/riscv32/types.h create mode 100644 include/grub/riscv64/efi/memory.h create mode 100644 include/grub/riscv64/time.h create mode 100644 include/grub/riscv64/types.h
grub-core/kern/riscv/cache.c new file +63 -0
@@ -0,0 +1,63 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2018 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/misc.h> + +static grub_int64_t dlinesz; +static grub_int64_t ilinesz; + +/* Prototypes for asm functions. */ +void grub_arch_clean_dcache_range (grub_addr_t beg,grub_addr_t end, +grub_size_t line_size); +void grub_arch_invalidate_icache_range (grub_addr_t beg,grub_addr_t end, +grub_size_t line_size); + +static void +probe_caches (void ) +{ +/* TODO */ + dlinesz =32 ; + ilinesz =32 ; +} + +void +grub_arch_sync_caches (void *address,grub_size_t len) +{ +grub_size_t start, end, max_align; + +if (dlinesz ==0 ) +probe_caches (); +if (dlinesz ==0 ) +grub_fatal ("Unknown cache line size!" ); + + max_align = dlinesz > ilinesz ? dlinesz : ilinesz; + + start =ALIGN_DOWN ((grub_size_t ) address, max_align); + end =ALIGN_UP ((grub_size_t ) address + len, max_align); + +grub_arch_clean_dcache_range (start, end, dlinesz); +grub_arch_invalidate_icache_range (start, end, ilinesz); +} + +void +grub_arch_sync_dma_caches (volatile void *address __attribute__((unused)), +grub_size_t len __attribute__((unused))) +{ +/* DMA incoherent devices not supported yet */ +}
grub-core/kern/riscv/cache_flush.S new file +44 -0
44 lines not on this page · raw message
grub-core/kern/riscv/efi/init.c new file +76 -0
76 lines not on this page · raw message
include/grub/riscv32/efi/memory.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef GRUB_MEMORY_CPU_HEADER +#include <grub/efi/memory.h> + +#define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffUL + +#endif /* ! GRUB_MEMORY_CPU_HEADER */
include/grub/riscv32/time.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2018 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 KERNEL_CPU_TIME_HEADER +#define KERNEL_CPU_TIME_HEADER 1 + +static __inlinevoid +grub_cpu_idle (void ) +{ +/* TODO */ +} + +#endif /* ! KERNEL_CPU_TIME_HEADER */
include/grub/riscv32/types.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2018 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 GRUB_TYPES_CPU_HEADER +#define GRUB_TYPES_CPU_HEADER 1 + +/* The size of void *. */ +#define GRUB_TARGET_SIZEOF_VOID_P 4 + +/* The size of long. */ +#define GRUB_TARGET_SIZEOF_LONG 4 + +/* currently only support little-endian. */ +#undef GRUB_TARGET_WORDS_BIGENDIAN + +/* Unaligned accesses can be very slow, so avoid them */ +#undef GRUB_HAVE_UNALIGNED_ACCESS + +#endif /* ! GRUB_TYPES_CPU_HEADER */
include/grub/riscv64/efi/memory.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef GRUB_MEMORY_CPU_HEADER +#include <grub/efi/memory.h> + +#define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffffffULL + +#endif /* ! GRUB_MEMORY_CPU_HEADER */
include/grub/riscv64/time.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2018 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 KERNEL_CPU_TIME_HEADER +#define KERNEL_CPU_TIME_HEADER 1 + +static __inlinevoid +grub_cpu_idle (void ) +{ +/* TODO */ +} + +#endif /* ! KERNEL_CPU_TIME_HEADER */
include/grub/riscv64/types.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2018 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 GRUB_TYPES_CPU_HEADER +#define GRUB_TYPES_CPU_HEADER 1 + +/* The size of void *. */ +#define GRUB_TARGET_SIZEOF_VOID_P 8 + +/* The size of long. */ +#define GRUB_TARGET_SIZEOF_LONG 8 + +/* currently only support little-endian. */ +#undef GRUB_TARGET_WORDS_BIGENDIAN + +/* Unaligned accesses can be very slow, so avoid them */ +#undef GRUB_HAVE_UNALIGNED_ACCESS + +#endif /* ! GRUB_TYPES_CPU_HEADER */
Signature · 1 line
2.12.3
PATCH v5 9/11 RISC-V: Add libgcc helpers for clz
In reply to Alexander GrafGcc may decide it wants to call helper functions to execute clz. Provide them in our own copy of libgcc.
--- grub-core/kern/compiler-rt.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/grub/compiler-rt.h | 7 +++++++ 2 files changed, 49 insertions(+)
grub-core/kern/compiler-rt.c +42 -0
@@ -417,3 +417,45 @@ __aeabi_llsl (grub_uint64_t u, int b) __attribute__ ((alias ("__ashldi3")));#endif + +#ifdef __riscv + +/* Based on libgcc from gcc suite. */ +int +__clzsi2 (grub_uint32_t val) +{ +int i =32 ; +int j =16 ; +int temp; + +for (; j; j >>=1 ) + { +if ((temp = val) >> j) + { +if (j ==1 ) + { +return (i -2 ); + } +else + { + i -= j; + val = temp; + } + } + } +return (i - val); +} + +int +__clzdi2 (grub_uint64_t val) +{ +if (val >>32 ) + { +return __clzsi2 (val >>32 ); + } +else + { +return __clzsi2 (val) +32 ; + } +} +#endif
include/grub/compiler-rt.h +7 -0
@@ -108,6 +108,13 @@ EXPORT_FUNC (__aeabi_llsr) (grub_uint64_t u, int b);#endif +#ifdef __riscv +int +EXPORT_FUNC (__clzsi2 ) (grub_uint32_t val); + +int +EXPORT_FUNC (__clzdi2 ) (grub_uint64_t val); +#endif #if defined (__powerpc__)
Signature · 1 line
2.12.3
PATCH v5 10/11 RISC-V: Add to build system
In reply to Alexander GrafThis patch adds support for RISC-V to the grub build system. With this patch, I can successfully build grub on RISC-V as a UEFI application.
---
v2 -> v3:
- Fix riscv32 target
--- configure.ac | 28 ++++++++++++++++++++++++++-- gentpl.py | 11 +++++++---- grub-core/Makefile.am | 12 ++++++++++++ grub-core/Makefile.core.def | 29 +++++++++++++++++++++++++++++ grub-core/commands/file.c | 14 +++++++++++++- grub-core/kern/compiler-rt.c | 6 ++++-- grub-core/kern/efi/mm.c | 2 +- grub-core/kern/emu/cache.c | 6 ++++++ grub-core/kern/emu/cache_s.S | 1 + grub-core/kern/emu/lite.c | 2 ++ grub-core/lib/efi/halt.c | 3 ++- grub-core/lib/setjmp.S | 2 ++ include/grub/compiler-rt.h | 12 ++++++++---- include/grub/efi/api.h | 3 ++- include/grub/efi/efi.h | 2 +- include/grub/misc.h | 3 ++- include/grub/util/install.h | 2 ++ util/grub-install-common.c | 2 ++ util/grub-install.c | 28 ++++++++++++++++++++++++++++ util/grub-mknetdir.c | 4 +++- util/grub-mkrescue.c | 16 +++++++++++++++- util/mkimage.c | 32 ++++++++++++++++++++++++++++++++ 22 files changed, 200 insertions(+), 20 deletions(-)
configure.ac +26 -2
@@ -104,6 +104,12 @@ case "$target_cpu" in aarch64*) target_cpu=arm64 ;; + riscv32*) + target_cpu=riscv32 + ;; + riscv64*) + target_cpu=riscv64 + ;; esac # Specify the platform (such as firmware).
@@ -127,6 +133,8 @@ if test "x$with_platform" = x; then ia64-*) platform=efi ;; arm-*) platform=uboot ;; arm64-*) platform=efi ;; + riscv32-*) platform=efi ;; + riscv64-*) platform=efi ;; *) AC_MSG_WARN([unsupported CPU: "$target_cpu" - only building utilities]) platform=none
@@ -175,6 +183,8 @@ case "$target_cpu"-"$platform" in arm-coreboot) ;; arm-efi) ;; arm64-efi) ;; + riscv32-efi) ;; + riscv64-efi) ;; *-emu) ;; *-none) ;; *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
@@ -828,6 +838,16 @@ if test x"$platform" != xemu ; then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [grub_cv_target_cc_soft_float="-mgeneral-regs-only"], []) fi + if test "x$target_cpu" = xriscv32; then + CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], + [grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], []) + fi + if test "x$target_cpu" = xriscv64; then + CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], + [grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], []) + fi if test "x$target_cpu" = xia64; then CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
@@ -1143,7 +1163,7 @@ AC_SUBST(TARGET_LDFLAGS_OLDMAGIC) LDFLAGS="$TARGET_LDFLAGS" -if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 ; then +if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64 ; then # Use large model to support 4G memory AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [ CFLAGS="$TARGET_CFLAGS -mcmodel=large"
@@ -1153,7 +1173,7 @@ if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 ; then ]) if test "x$grub_cv_cc_mcmodel" = xyes; then TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large" - elif test "$target_cpu" = sparc64; then + elif test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64; then TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany" fi fi
@@ -1916,6 +1936,10 @@ AM_CONDITIONAL([COND_arm_coreboot], [test x$target_cpu = xarm -a x$platform = xc AM_CONDITIONAL([COND_arm_efi], [test x$target_cpu = xarm -a x$platform = xefi]) AM_CONDITIONAL([COND_arm64], [test x$target_cpu = xarm64 ]) AM_CONDITIONAL([COND_arm64_efi], [test x$target_cpu = xarm64 -a x$platform = xefi]) +AM_CONDITIONAL([COND_riscv32], [test x$target_cpu = xriscv32 ]) +AM_CONDITIONAL([COND_riscv64], [test x$target_cpu = xriscv64 ]) +AM_CONDITIONAL([COND_riscv32_efi], [test x$target_cpu = xriscv32 -a x$platform = xefi]) +AM_CONDITIONAL([COND_riscv64_efi], [test x$target_cpu = xriscv64 -a x$platform = xefi]) AM_CONDITIONAL([COND_HOST_HURD], [test x$host_kernel = xhurd]) AM_CONDITIONAL([COND_HOST_LINUX], [test x$host_kernel = xlinux])
gentpl.py +7 -4
@@ -32,7 +32,7 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "mips_loongson", "sparc64_ieee1275", "powerpc_ieee1275", "mips_arc", "ia64_efi", "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi", - "arm_coreboot"] + "arm_coreboot", "riscv32_efi", "riscv64_efi" ] GROUPS = {}
@@ -47,9 +47,12 @@ GROUPS["sparc64"] = [ "sparc64_ieee1275" ] GROUPS["powerpc"] = [ "powerpc_ieee1275" ] GROUPS["arm"] = [ "arm_uboot", "arm_efi", "arm_coreboot" ] GROUPS["arm64"] = [ "arm64_efi" ] +GROUPS["riscv32"] = [ "riscv32_efi" ] +GROUPS["riscv64"] = [ "riscv64_efi" ] # Groups based on firmware -GROUPS["efi"] = [ "i386_efi", "x86_64_efi", "ia64_efi", "arm_efi", "arm64_efi" ] +GROUPS["efi"] = [ "i386_efi", "x86_64_efi", "ia64_efi", "arm_efi", "arm64_efi", + "riscv32_efi", "riscv64_efi" ] GROUPS["ieee1275"] = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ] GROUPS["uboot"] = [ "arm_uboot" ] GROUPS["xen"] = [ "i386_xen", "x86_64_xen" ]
@@ -76,11 +79,11 @@ GROUPS["terminfomodule"] = GRUB_PLATFORMS[:]; for i in GROUPS["terminfoinkernel"]: GROUPS["terminfomodule"].remove(i) # Flattened Device Trees (FDT) -GROUPS["fdt"] = [ "arm64_efi", "arm_uboot", "arm_efi" ] +GROUPS["fdt"] = [ "arm64_efi", "arm_uboot", "arm_efi", "riscv32_efi", "riscv64_efi" ] # Needs software helpers for division # Must match GRUB_DIVISION_IN_SOFTWARE in misc.h -GROUPS["softdiv"] = GROUPS["arm"] + ["ia64_efi"] +GROUPS["softdiv"] = GROUPS["arm"] + ["ia64_efi"] + GROUPS["riscv32"] GROUPS["no_softdiv"] = GRUB_PLATFORMS[:] for i in GROUPS["softdiv"]: GROUPS["no_softdiv"].remove(i)
grub-core/Makefile.am +12 -0
@@ -284,6 +284,18 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h endif +if COND_riscv32_efi +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h +endif + +if COND_riscv64_efi +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h +endif + if COND_emu KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
grub-core/Makefile.core.def +29 -0
@@ -65,6 +65,12 @@ kernel = { arm64_efi_ldflags = '-Wl,-r,-d'; arm64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame'; + riscv32_efi_ldflags = '-Wl,-r,-d'; + riscv32_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame'; + + riscv64_efi_ldflags = '-Wl,-r,-d'; + riscv64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame'; + i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)'; i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x9000'; i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)';
@@ -114,6 +120,8 @@ kernel = { arm_coreboot_startup = kern/arm/startup.S; arm_efi_startup = kern/arm/efi/startup.S; arm64_efi_startup = kern/arm64/efi/startup.S; + riscv32_efi_startup = kern/riscv/efi/startup.S; + riscv64_efi_startup = kern/riscv/efi/startup.S; common = kern/command.c; common = kern/corecmd.c;
@@ -246,6 +254,12 @@ kernel = { arm64_efi = kern/arm64/efi/init.c; arm64_efi = kern/efi/fdt.c; + riscv32_efi = kern/riscv/efi/init.c; + riscv32_efi = kern/efi/fdt.c; + + riscv64_efi = kern/riscv/efi/init.c; + riscv64_efi = kern/efi/fdt.c; + i386_pc = kern/i386/pc/init.c; i386_pc = kern/i386/pc/mmap.c; i386_pc = term/i386/pc/console.c;
@@ -317,6 +331,14 @@ kernel = { arm64 = kern/arm64/dl.c; arm64 = kern/arm64/dl_helper.c; + riscv32 = kern/riscv/cache.c; + riscv32 = kern/riscv/cache_flush.S; + riscv32 = kern/riscv/dl.c; + + riscv64 = kern/riscv/cache.c; + riscv64 = kern/riscv/cache_flush.S; + riscv64 = kern/riscv/dl.c; + emu = disk/host.c; emu = kern/emu/cache_s.S; emu = kern/emu/hostdisk.c;
@@ -792,6 +814,8 @@ module = { enable = arm64_efi; enable = arm_uboot; enable = arm_coreboot; + enable = riscv32_efi; + enable = riscv64_efi; }; module = {
@@ -1649,6 +1673,7 @@ module = { extra_dist = lib/ia64/longjmp.S; extra_dist = lib/arm/setjmp.S; extra_dist = lib/arm64/setjmp.S; + extra_dist = lib/riscv/setjmp.S; }; module = {
@@ -1750,6 +1775,8 @@ module = { arm_efi = loader/arm64/linux.c; arm_uboot = loader/arm/linux.c; arm64 = loader/arm64/linux.c; + riscv32 = loader/riscv/linux.c; + riscv64 = loader/riscv/linux.c; common = loader/linux.c; common = lib/cmdline.c; enable = noemu;
@@ -1844,6 +1871,8 @@ module = { enable = ia64_efi; enable = arm_efi; enable = arm64_efi; + enable = riscv32_efi; + enable = riscv64_efi; enable = mips; };
grub-core/commands/file.c +13 -1
@@ -90,6 +90,10 @@ static const struct grub_arg_option options[] = { N_("Check if FILE is ARM64 EFI file"), 0, 0}, {"is-arm-efi" ,0 ,0 , N_("Check if FILE is ARM EFI file"), 0, 0}, + {"is-riscv32-efi", 0, 0, + N_("Check if FILE is RISC-V 32bit EFI file"), 0, 0}, + {"is-riscv64-efi", 0, 0, + N_("Check if FILE is RISC-V 64bit EFI file"), 0, 0}, {"is-hibernated-hiberfil", 0, 0, N_("Check if FILE is hiberfil.sys in hibernated state"), 0, 0}, {"is-x86_64-xnu", 0, 0,
@@ -130,6 +134,7 @@ enumIS_IA_EFI ,IS_ARM64_EFI ,IS_ARM_EFI , +IS_RISCV_EFI ,IS_HIBERNATED ,IS_XNU64 , IS_XNU32,
@@ -571,6 +576,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)case IS_IA_EFI :case IS_ARM64_EFI :case IS_ARM_EFI : +case IS_RISCV_EFI : {char signature[4 ];grub_uint32_t pe_offset;
@@ -616,7 +622,13 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args) && coff_head.machine != grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARMTHUMB_MIXED)) break; -if (type ==IS_IA_EFI || type ==IS_64_EFI || type ==IS_ARM64_EFI ) +if (type ==IS_RISCV_EFI + && coff_head.machine != +grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_RISCV64 )) +/* TODO: Determine bitness dynamically */ +break ; +if (type ==IS_IA_EFI || type ==IS_64_EFI || type ==IS_ARM64_EFI || + type ==IS_RISCV_EFI ) {struct grub_pe64_optional_header o64;if (grub_file_read (file, &o64,sizeof (o64)) !=sizeof (o64))
grub-core/kern/compiler-rt.c +4 -2
@@ -237,7 +237,8 @@ union component64 }; }; -#if defined (__powerpc__) || defined (__arm__) || defined(__mips__) +#if defined (__powerpc__) || defined (__arm__) || defined(__mips__) || \ + (defined(__riscv) && (__riscv_xlen ==32 ))/* Based on libgcc2.c from gcc suite. */ grub_uint64_t
@@ -343,7 +344,8 @@ __ucmpdi2 (grub_uint64_t a, grub_uint64_t b)#endif -#if defined (__powerpc__) || defined(__mips__) || defined(__sparc__) || defined(__arm__) +#if defined (__powerpc__) || defined(__mips__) || defined(__sparc__) || \ + defined(__arm__) || defined(__riscv)/* Based on libgcc2.c from gcc suite. */ grub_uint32_t
grub-core/kern/efi/mm.c +1 -1
@@ -634,7 +634,7 @@ grub_efi_mm_init (void) 2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE)); } -#if defined (__aarch64__) || defined (__arm__) +#if defined (__aarch64__) || defined (__arm__) || defined (__riscv)grub_err_t grub_efi_get_ram_base (grub_addr_t *base_addr) {
grub-core/kern/emu/cache.c +6 -0
@@ -25,5 +25,11 @@ grub_arch_sync_caches (void *address, grub_size_t len) return _flush_cache (address, len, 0); } +#elif defined(__riscv) +void +grub_arch_sync_caches (void *address,grub_size_t len) +{ +} +#endif
grub-core/kern/emu/cache_s.S +1 -0
@@ -9,6 +9,7 @@ #elif defined(__powerpc__) #include "../powerpc/cache.S" #elif defined(__ia64__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) +#elif defined(__riscv) #else #error "No target cpu type is defined" #endif
grub-core/kern/emu/lite.c +2 -0
@@ -24,6 +24,8 @@#elif defined(__aarch64__)#include "../arm64/dl_helper.c" #include "../arm64/dl.c" +#elif defined(__riscv) +#include "../riscv/dl.c" #else #error "No target cpu type is defined"#endif
grub-core/lib/efi/halt.c +2 -1
@@ -29,7 +29,8 @@ voidgrub_halt (void) {grub_machine_fini (GRUB_LOADER_FLAG_NORETURN ); -#if !defined(__ia64__) && !defined(__arm__) && !defined(__aarch64__) +#if !defined(__ia64__) && !defined(__arm__) && !defined(__aarch64__) && \ + !defined(__riscv)grub_acpi_halt ();#endif efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
grub-core/lib/setjmp.S +2 -0
@@ -15,6 +15,8 @@ #include "./arm/setjmp.S" #elif defined(__aarch64__) #include "./arm64/setjmp.S" +#elif defined(__riscv) +#include "./riscv/setjmp.S" #else #error "Unknown target cpu type" #endif
include/grub/compiler-rt.h +8 -4
@@ -53,13 +53,15 @@ EXPORT_FUNC (__umoddi3) (grub_uint64_t a, grub_uint64_t b);#endif -#if defined (__sparc__) || defined (__powerpc__) || defined (__mips__) || defined (__arm__) +#if defined (__sparc__) || defined (__powerpc__) || defined (__mips__) || \ + defined (__arm__) || defined(__riscv)unsigned EXPORT_FUNC (__ctzdi2 ) (grub_uint64_t x);#define NEED_CTZDI2 1#endif -#if defined (__mips__) || defined (__arm__) +#if defined (__mips__) || defined (__arm__) || \ + (defined(__riscv) && (__riscv_xlen ==32 ))unsigned EXPORT_FUNC (__ctzsi2 ) (grub_uint32_t x);#define NEED_CTZSI2 1
@@ -157,7 +159,8 @@ void EXPORT_FUNC (_savegpr_31) (void);#endif -#if defined (__powerpc__) || defined(__mips__) || defined (__arm__) +#if defined (__powerpc__) || defined(__mips__) || defined (__arm__) || \ + (defined(__riscv) && (__riscv_xlen ==32 ))int EXPORT_FUNC (__ucmpdi2 ) (grub_uint64_t a,grub_uint64_t b);
@@ -172,7 +175,8 @@ grub_uint64_tEXPORT_FUNC (__lshrdi3) (grub_uint64_t u,int b);#endif -#if defined (__powerpc__) || defined(__mips__) || defined(__sparc__) || defined (__arm__) +#if defined (__powerpc__) || defined(__mips__) || defined(__sparc__) || \ + defined (__arm__) || defined(__riscv)grub_uint32_t EXPORT_FUNC (__bswapsi2 ) (grub_uint32_t u);
include/grub/efi/api.h +2 -1
@@ -1686,7 +1686,8 @@ struct grub_efi_block_iotypedef struct grub_efi_block_io grub_efi_block_io_t ;#if (GRUB_TARGET_SIZEOF_VOID_P ==4 ) || defined (__ia64__) \ - || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) + || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \ + || defined(__riscv)#define efi_call_0 (func) func()#define efi_call_1 (func, a) func(a)
include/grub/efi/efi.h +1 -1
@@ -90,7 +90,7 @@ extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd,char **device, char **path); -#if defined(__arm__) || defined(__aarch64__) +#if defined(__arm__) || defined(__aarch64__) || defined(__riscv)void *EXPORT_FUNC (grub_efi_get_firmware_fdt )(void );grub_err_t EXPORT_FUNC (grub_efi_get_ram_base )(grub_addr_t *);#include <grub/cpu/linux.h>
include/grub/misc.h +2 -1
@@ -340,7 +340,8 @@ grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n, grub_uint64_t *r);/* Must match softdiv group in gentpl.py. */ -#if !defined(GRUB_MACHINE_EMU ) && (defined(__arm__) || defined(__ia64__)) +#if !defined(GRUB_MACHINE_EMU ) && (defined(__arm__) || defined(__ia64__) || \ + (defined(__riscv) && (__riscv_xlen ==32 )))#define GRUB_DIVISION_IN_SOFTWARE 1#else #define GRUB_DIVISION_IN_SOFTWARE 0
include/grub/util/install.h +2 -0
@@ -103,6 +103,8 @@ enum grub_install_platGRUB_INSTALL_PLATFORM_I386_XEN_PVH ,GRUB_INSTALL_PLATFORM_ARM64_EFI ,GRUB_INSTALL_PLATFORM_ARM_COREBOOT , +GRUB_INSTALL_PLATFORM_RISCV32_EFI , +GRUB_INSTALL_PLATFORM_RISCV64_EFI , GRUB_INSTALL_PLATFORM_MAX };
util/grub-install-common.c +2 -0
@@ -729,6 +729,8 @@ static struct [GRUB_INSTALL_PLATFORM_ARM64_EFI] = { "arm64", "efi" }, [GRUB_INSTALL_PLATFORM_ARM_UBOOT] = { "arm", "uboot" }, [GRUB_INSTALL_PLATFORM_ARM_COREBOOT] = { "arm", "coreboot" }, + [GRUB_INSTALL_PLATFORM_RISCV32_EFI] = { "riscv32", "efi" }, + [GRUB_INSTALL_PLATFORM_RISCV64_EFI] = { "riscv64", "efi" }, }; char *
util/grub-install.c +28 -0
@@ -477,6 +477,8 @@ have_bootdev (enum grub_install_plat pl)case GRUB_INSTALL_PLATFORM_IA64_EFI :case GRUB_INSTALL_PLATFORM_ARM_EFI :case GRUB_INSTALL_PLATFORM_ARM64_EFI : +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : +case GRUB_INSTALL_PLATFORM_RISCV64_EFI :case GRUB_INSTALL_PLATFORM_I386_IEEE1275 :case GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275 :case GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275 :
@@ -900,6 +902,8 @@ main (int argc, char *argv[])case GRUB_INSTALL_PLATFORM_X86_64_EFI :case GRUB_INSTALL_PLATFORM_ARM_EFI :case GRUB_INSTALL_PLATFORM_ARM64_EFI : +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : +case GRUB_INSTALL_PLATFORM_RISCV64_EFI :case GRUB_INSTALL_PLATFORM_IA64_EFI :case GRUB_INSTALL_PLATFORM_I386_IEEE1275 :case GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275 :
@@ -945,6 +949,8 @@ main (int argc, char *argv[])case GRUB_INSTALL_PLATFORM_X86_64_EFI :case GRUB_INSTALL_PLATFORM_ARM_EFI :case GRUB_INSTALL_PLATFORM_ARM64_EFI : +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : +case GRUB_INSTALL_PLATFORM_RISCV64_EFI :case GRUB_INSTALL_PLATFORM_IA64_EFI :case GRUB_INSTALL_PLATFORM_I386_IEEE1275 :case GRUB_INSTALL_PLATFORM_ARM_UBOOT :
@@ -998,6 +1004,8 @@ main (int argc, char *argv[])case GRUB_INSTALL_PLATFORM_X86_64_EFI :case GRUB_INSTALL_PLATFORM_ARM_EFI :case GRUB_INSTALL_PLATFORM_ARM64_EFI : +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : +case GRUB_INSTALL_PLATFORM_RISCV64_EFI :case GRUB_INSTALL_PLATFORM_IA64_EFI : is_efi =1 ;break ;
@@ -1111,6 +1119,12 @@ main (int argc, char *argv[])case GRUB_INSTALL_PLATFORM_ARM64_EFI : efi_file ="BOOTAA64.EFI" ;break ; +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : + efi_file ="BOOTRISCV32.EFI" ; +break ; +case GRUB_INSTALL_PLATFORM_RISCV64_EFI : + efi_file ="BOOTRISCV64.EFI" ; +break ;default :grub_util_error ("%s" ,_ ("You've found a bug" ));break ;
@@ -1138,6 +1152,12 @@ main (int argc, char *argv[])case GRUB_INSTALL_PLATFORM_ARM64_EFI : efi_file ="grubaa64.efi" ;break ; +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : + efi_file ="grubriscv32.efi" ; +break ; +case GRUB_INSTALL_PLATFORM_RISCV64_EFI : + efi_file ="grubriscv64.efi" ; +break ;default : efi_file ="grub.efi" ;break ;
@@ -1440,6 +1460,8 @@ main (int argc, char *argv[])case GRUB_INSTALL_PLATFORM_X86_64_EFI :case GRUB_INSTALL_PLATFORM_ARM_EFI :case GRUB_INSTALL_PLATFORM_ARM64_EFI : +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : +case GRUB_INSTALL_PLATFORM_RISCV64_EFI :case GRUB_INSTALL_PLATFORM_IA64_EFI : g =grub_util_guess_efi_drive (*curdev);break ;
@@ -1533,6 +1555,8 @@ main (int argc, char *argv[])case GRUB_INSTALL_PLATFORM_X86_64_EFI :case GRUB_INSTALL_PLATFORM_ARM_EFI :case GRUB_INSTALL_PLATFORM_ARM64_EFI : +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : +case GRUB_INSTALL_PLATFORM_RISCV64_EFI :case GRUB_INSTALL_PLATFORM_IA64_EFI : core_name ="core.efi" ; snprintf (mkimage_target, sizeof (mkimage_target),
@@ -1636,6 +1660,8 @@ main (int argc, char *argv[])break ;case GRUB_INSTALL_PLATFORM_ARM_EFI :case GRUB_INSTALL_PLATFORM_ARM64_EFI : +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : +case GRUB_INSTALL_PLATFORM_RISCV64_EFI :case GRUB_INSTALL_PLATFORM_IA64_EFI :case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS :case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS :
@@ -1871,6 +1897,8 @@ main (int argc, char *argv[])/* FALLTHROUGH */ case GRUB_INSTALL_PLATFORM_ARM_EFI :case GRUB_INSTALL_PLATFORM_ARM64_EFI : +case GRUB_INSTALL_PLATFORM_RISCV32_EFI : +case GRUB_INSTALL_PLATFORM_RISCV64_EFI :case GRUB_INSTALL_PLATFORM_IA64_EFI : {char *dst =grub_util_path_concat (2 , efidir, efi_file);
util/grub-mknetdir.c +3 -1
@@ -107,7 +107,9 @@ static const struct [GRUB_INSTALL_PLATFORM_X86_64_EFI] = { "x86_64-efi", "efinet", ".efi" }, [GRUB_INSTALL_PLATFORM_IA64_EFI] = { "ia64-efi", "efinet", ".efi" }, [GRUB_INSTALL_PLATFORM_ARM_EFI] = { "arm-efi", "efinet", ".efi" }, - [GRUB_INSTALL_PLATFORM_ARM64_EFI ] = {"arm64-efi" ,"efinet" ,".efi" } + [GRUB_INSTALL_PLATFORM_ARM64_EFI] = { "arm64-efi", "efinet", ".efi" }, + [GRUB_INSTALL_PLATFORM_RISCV32_EFI] = { "riscv32-efi", "efinet", ".efi" }, + [GRUB_INSTALL_PLATFORM_RISCV64_EFI] = { "riscv64-efi", "efinet", ".efi" }, }; static void
util/grub-mkrescue.c +15 -1
@@ -538,6 +538,8 @@ main (int argc, char *argv[]) || source_dirs[GRUB_INSTALL_PLATFORM_IA64_EFI] || source_dirs[GRUB_INSTALL_PLATFORM_ARM_EFI] || source_dirs[GRUB_INSTALL_PLATFORM_ARM64_EFI] + || source_dirs[GRUB_INSTALL_PLATFORM_RISCV32_EFI] + || source_dirs[GRUB_INSTALL_PLATFORM_RISCV64_EFI] || source_dirs[GRUB_INSTALL_PLATFORM_X86_64_EFI]) system_area =SYS_AREA_COMMON ; else if (source_dirs[GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275])
@@ -735,7 +737,9 @@ main (int argc, char *argv[]) || source_dirs[GRUB_INSTALL_PLATFORM_X86_64_EFI] || source_dirs[GRUB_INSTALL_PLATFORM_IA64_EFI] || source_dirs[GRUB_INSTALL_PLATFORM_ARM_EFI] - || source_dirs[GRUB_INSTALL_PLATFORM_ARM64_EFI]) + || source_dirs[GRUB_INSTALL_PLATFORM_ARM64_EFI] + || source_dirs[GRUB_INSTALL_PLATFORM_RISCV32_EFI] + || source_dirs[GRUB_INSTALL_PLATFORM_RISCV64_EFI]) {char *efidir =grub_util_make_temporary_dir ();char *efidir_efi =grub_util_path_concat (2 , efidir,"efi" );
@@ -770,6 +774,16 @@ main (int argc, char *argv[]) imgname);free (imgname); + imgname =grub_util_path_concat (2 , efidir_efi_boot,"bootriscv32.efi" ); +make_image_fwdisk_abs (GRUB_INSTALL_PLATFORM_RISCV32_EFI ,"riscv32-efi" , + imgname); +free (imgname); + + imgname =grub_util_path_concat (2 , efidir_efi_boot,"bootriscv64.efi" ); +make_image_fwdisk_abs (GRUB_INSTALL_PLATFORM_RISCV64_EFI ,"riscv64-efi" , + imgname); +free (imgname); +if (source_dirs[GRUB_INSTALL_PLATFORM_I386_EFI ]) { imgname =grub_util_path_concat (2 , efidir_efi_boot,"boot.efi" );
util/mkimage.c +32 -0
@@ -627,6 +627,38 @@ static const struct grub_install_image_target_desc image_targets[] = .pe_target = GRUB_PE32_MACHINE_ARM64, .elf_target = EM_AARCH64, }, + { + .dirname = "riscv32-efi", + .names = { "riscv32-efi", NULL }, + .voidp_sizeof = 4, + .bigendian = 0, + .id = IMAGE_EFI, + .flags = PLATFORM_FLAGS_NONE, + .total_module_size = TARGET_NO_FIELD, + .decompressor_compressed_size = TARGET_NO_FIELD, + .decompressor_uncompressed_size = TARGET_NO_FIELD, + .decompressor_uncompressed_addr = TARGET_NO_FIELD, + .section_align = GRUB_PE32_SECTION_ALIGNMENT, + .vaddr_offset = EFI32_HEADER_SIZE, + .pe_target = GRUB_PE32_MACHINE_RISCV32, + .elf_target = EM_RISCV, + }, + { + .dirname = "riscv64-efi", + .names = { "riscv64-efi", NULL }, + .voidp_sizeof = 8, + .bigendian = 0, + .id = IMAGE_EFI, + .flags = PLATFORM_FLAGS_NONE, + .total_module_size = TARGET_NO_FIELD, + .decompressor_compressed_size = TARGET_NO_FIELD, + .decompressor_uncompressed_size = TARGET_NO_FIELD, + .decompressor_uncompressed_addr = TARGET_NO_FIELD, + .section_align = GRUB_PE32_SECTION_ALIGNMENT, + .vaddr_offset = EFI64_HEADER_SIZE, + .pe_target = GRUB_PE32_MACHINE_RISCV64, + .elf_target = EM_RISCV, + }, }; #include <grub/lib/LzmaEnc.h>
Signature · 1 line
2.12.3
PATCH v5 11/11 fdt: Treat device tree file type like ACPI
In reply to Alexander GrafWe now have signature check logic in grub which allows us to treat files differently depending on their file type.
Treat a loaded device tree like an overlayed ACPI table. Both describe hardware, so I suppose their threat level is the same.
---
v3 -> v4:
- Rebase onto current git master
--- grub-core/commands/efi/shim_lock.c | 1 + include/grub/file.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
grub-core/commands/efi/shim_lock.c +1 -0
@@ -81,6 +81,7 @@ shim_lock_init (grub_file_t io, enum grub_file_type type,/* Fall through. */ case GRUB_FILE_TYPE_ACPI_TABLE : +case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE : *flags =GRUB_VERIFY_FLAGS_DEFER_AUTH ;return GRUB_ERR_NONE ;
include/grub/file.h +2 -2
@@ -74,8 +74,6 @@ enum grub_file_typeGRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE , -GRUB_FILE_TYPE_DEVICE_TREE_IMAGE , -/* File holding signature. */ GRUB_FILE_TYPE_SIGNATURE,/* File holding public key to verify signature once. */
@@ -100,6 +98,8 @@ enum grub_file_typeGRUB_FILE_TYPE_FILE_ID ,/* File holding ACPI table. */ GRUB_FILE_TYPE_ACPI_TABLE , +/* File holding Device Tree. */ +GRUB_FILE_TYPE_DEVICE_TREE_IMAGE ,/* File we intend show to user. */ GRUB_FILE_TYPE_CAT , GRUB_FILE_TYPE_HEXCAT,
Signature · 1 line
2.12.3