From 464b25e6db484a8f4b014e8bc37b1da53ae6e32d Mon Sep 17 00:00:00 2001
From: GuEe-GUI <2991707448@qq.com>
Date: Sun, 25 Apr 2021 19:31:54 +0800
Subject: [PATCH 1/3] Add-riscv-linux-command-support.patch
---
Add-riscv-linux-command-support.patch | 492 ++++++++++++++++++++++++++
1 file changed, 492 insertions(+)
create mode 100644 Add-riscv-linux-command-support.patch
diff --git a/Add-riscv-linux-command-support.patch b/Add-riscv-linux-command-support.patch
new file mode 100644
index 0000000..2e8586c
--- /dev/null
+++ b/Add-riscv-linux-command-support.patch
@@ -0,0 +1,492 @@
+diff -uNr grub-2.04/grub-core/loader/riscv/linux.c grub-2.04-p/grub-core/loader/riscv/linux.c
+--- grub-2.04/grub-core/loader/riscv/linux.c 2019-04-23 16:54:47.000000000 +0800
++++ grub-2.04-p/grub-core/loader/riscv/linux.c 2021-03-31 15:27:18.000000000 +0800
+@@ -1,59 +1,385 @@
+-/*
+- * 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 .
+- */
+-
+-#include
+-#include
+-#include
+-
+-GRUB_MOD_LICENSE ("GPLv3+");
+-
+-static grub_err_t
+-grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+- int argc __attribute__ ((unused)),
+- char *argv[] __attribute__ ((unused)))
+-{
+- grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("Linux not supported yet"));
+-
+- return grub_errno;
+-}
+-
+-static grub_err_t
+-grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+- int argc __attribute__ ((unused)),
+- char *argv[] __attribute__ ((unused)))
+-{
+- grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("Linux not supported yet"));
+-
+- 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."));
+-}
+-
+-GRUB_MOD_FINI (linux)
+-{
+- grub_unregister_command (cmd_linux);
+- grub_unregister_command (cmd_initrd);
+-}
++/*
++ * 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 .
++ */
++
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++
++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_arch_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\
++ONFIG_(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 failure;
++
++ node = grub_fdt_find_subnode (fdt, 0, "chosen");
++ if (node < 0)
++ node = grub_fdt_add_subnode (fdt, 0, "chosen");
++
++ if (node < 1)
++ goto failure;
++
++ /* 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 failure;
++ retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-end",
++ initrd_end);
++ if (retval)
++ goto failure;
++ }
++
++ if (grub_fdt_install() != GRUB_ERR_NONE)
++ goto failure;
++
++ return GRUB_ERR_NONE;
++
++failure:
++ 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_loaded_image_t *loaded_image = NULL;
++ 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;
++ 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);
++ if (!loaded_image)
++ return grub_error(GRUB_ERR_BAD_OS, "cannot get image");
++ 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;
++}
++
++/* According to the Linux arch/riscv/include/asm/efi.h */
++#define INITRD_MAX_ADDRESS_OFFSET (256ULL << 20)
++
++/*
++ * This function returns a pointer to a legally allocated initrd buffer,
++ * or NULL if unsuccessful
++ */
++static void *
++allocate_initrd_mem (int initrd_pages)
++{
++ grub_addr_t max_addr;
++
++ if (grub_efi_get_ram_base (&max_addr) != GRUB_ERR_NONE)
++ return NULL;
++
++ max_addr += INITRD_MAX_ADDRESS_OFFSET - 1;
++
++ return grub_efi_allocate_pages_real (max_addr, initrd_pages,
++ GRUB_EFI_ALLOCATE_MAX_ADDRESS,
++ GRUB_EFI_LOADER_DATA);
++}
++
++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 = allocate_initrd_mem (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_arch_kernel_header lh;
++ grub_err_t err;
++
++ 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));
++ err = grub_create_loader_cmdline (argc, argv,
++ linux_args + sizeof (LINUX_IMAGE) - 1,
++ cmdline_size,
++ GRUB_VERIFY_KERNEL_CMDLINE);
++ if (err)
++ goto fail;
++
++ 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);
++}
+diff -uNr grub-2.04/include/grub/riscv32/linux.h grub-2.04-p/include/grub/riscv32/linux.h
+--- grub-2.04/include/grub/riscv32/linux.h 2019-04-23 16:54:47.000000000 +0800
++++ grub-2.04-p/include/grub/riscv32/linux.h 2021-03-31 15:06:58.000000000 +0800
+@@ -19,7 +19,8 @@
+ #ifndef GRUB_RISCV32_LINUX_HEADER
+ #define GRUB_RISCV32_LINUX_HEADER 1
+
+-#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
++#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* little endian,
++'RSC\x05' */
+
+ /* From linux/Documentation/riscv/booting.txt */
+ struct linux_riscv_kernel_header
+@@ -32,7 +33,7 @@
+ grub_uint64_t res2; /* reserved */
+ grub_uint64_t res3; /* reserved */
+ grub_uint64_t res4; /* reserved */
+- grub_uint32_t magic; /* Magic number, little endian, "RSCV" */
++ grub_uint32_t magic; /* Magic number, little endian, "RSC\x05" */
+ grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
+ };
+
+diff -uNr grub-2.04/include/grub/riscv64/linux.h grub-2.04-p/include/grub/riscv64/linux.h
+--- grub-2.04/include/grub/riscv64/linux.h 2019-04-23 16:54:47.000000000 +0800
++++ grub-2.04-p/include/grub/riscv64/linux.h 2021-03-31 15:04:54.000000000 +0800
+@@ -19,7 +19,8 @@
+ #ifndef GRUB_RISCV64_LINUX_HEADER
+ #define GRUB_RISCV64_LINUX_HEADER 1
+
+-#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
++#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* little endian,
++'RSC\x05' */
+
+ #define GRUB_EFI_PE_MAGIC 0x5A4D
+
+@@ -34,7 +35,7 @@
+ grub_uint64_t res2; /* reserved */
+ grub_uint64_t res3; /* reserved */
+ grub_uint64_t res4; /* reserved */
+- grub_uint32_t magic; /* Magic number, little endian, "RSCV" */
++ grub_uint32_t magic; /* Magic number, little endian, "RSC\x05" */
+ grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
+ };
+
--
Gitee
From 24efedaa1c1c56ca7dced3c12333eb5f1a18ad4e Mon Sep 17 00:00:00 2001
From: GuEe-GUI <2991707448@qq.com>
Date: Tue, 4 May 2021 12:46:55 +0800
Subject: [PATCH 2/3] Update Format
---
0354-add-riscv-linux-command-support.patch | 506 +++++++++++++++++++++
grub.patches | 3 +-
2 files changed, 508 insertions(+), 1 deletion(-)
create mode 100644 0354-add-riscv-linux-command-support.patch
diff --git a/0354-add-riscv-linux-command-support.patch b/0354-add-riscv-linux-command-support.patch
new file mode 100644
index 0000000..de6d2c2
--- /dev/null
+++ b/0354-add-riscv-linux-command-support.patch
@@ -0,0 +1,506 @@
+From: Nikita Ermakov
+Subject: [PATCH 1/2] RISC-V: Update magic number,
+ [PATCH 2/2] RISC-V: Allow to boot Linux with EFI stub on riscv64
+Date: Wed, 24 Mar 2021 17:50:28 +0300
+
+---
+ include/grub/riscv32/linux.h | 4 ++--
+ include/grub/riscv64/linux.h | 4 ++--
+ grub-core/loader/riscv64/linux.c | 380 ++++++++++++++++++++
+ 3 files changed, 384 insertions(+), 4 deletions(-)
+
+diff --git a/include/grub/riscv32/linux.h b/include/grub/riscv32/linux.h
+index 512b777c8..2720ca55d 100644
+--- a/include/grub/riscv32/linux.h
++++ b/include/grub/riscv32/linux.h
+@@ -19,7 +19,8 @@
+ #ifndef GRUB_RISCV32_LINUX_HEADER
+ #define GRUB_RISCV32_LINUX_HEADER 1
+
+-#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
++#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* little endian,
++'RSC\x05' */
+
+ /* From linux/Documentation/riscv/booting.txt */
+ struct linux_riscv_kernel_header
+@@ -32,7 +33,7 @@ struct linux_riscv_kernel_header
+ grub_uint64_t res2; /* reserved */
+ grub_uint64_t res3; /* reserved */
+ grub_uint64_t res4; /* reserved */
+- grub_uint32_t magic; /* Magic number, little endian, "RSCV" */
++ grub_uint32_t magic; /* Magic number, little endian, "RSC\x05" */
+ grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
+ };
+
+diff --git a/include/grub/riscv64/linux.h b/include/grub/riscv64/linux.h
+index 3630c30fb..7f6177c50 100644
+--- a/include/grub/riscv64/linux.h
++++ b/include/grub/riscv64/linux.h
+@@ -19,7 +19,8 @@
+ #ifndef GRUB_RISCV64_LINUX_HEADER
+ #define GRUB_RISCV64_LINUX_HEADER 1
+
+-#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
++#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* little endian,
++'RSC\x05' */
+
+ #define GRUB_EFI_PE_MAGIC 0x5A4D
+
+@@ -34,7 +35,7 @@ struct linux_riscv_kernel_header
+ grub_uint64_t res2; /* reserved */
+ grub_uint64_t res3; /* reserved */
+ grub_uint64_t res4; /* reserved */
+- grub_uint32_t magic; /* Magic number, little endian, "RSCV" */
++ grub_uint32_t magic; /* Magic number, little endian, "RSC\x05" */
+ grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
+ };
+
+diff --git a/grub-core/loader/riscv/linux.c b/grub-core/loader/riscv/linux.c
+index d17c488e1..b136966ac 100644
+--- a/grub-core/loader/riscv/linux.c
++++ b/grub-core/loader/riscv/linux.c
+@@ -1,59 +1,385 @@
+-/*
+- * 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 .
+- */
+-
+-#include
+-#include
+-#include
+-
+-GRUB_MOD_LICENSE ("GPLv3+");
+-
+-static grub_err_t
+-grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+- int argc __attribute__ ((unused)),
+- char *argv[] __attribute__ ((unused)))
+-{
+- grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("Linux not supported yet"));
+-
+- return grub_errno;
+-}
+-
+-static grub_err_t
+-grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+- int argc __attribute__ ((unused)),
+- char *argv[] __attribute__ ((unused)))
+-{
+- grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("Linux not supported yet"));
+-
+- 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."));
+-}
+-
+-GRUB_MOD_FINI (linux)
+-{
+- grub_unregister_command (cmd_linux);
+- grub_unregister_command (cmd_initrd);
+-}
++/*
++ * 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 .
++ */
++
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++
++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_arch_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\
++ONFIG_(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 failure;
++
++ node = grub_fdt_find_subnode (fdt, 0, "chosen");
++ if (node < 0)
++ node = grub_fdt_add_subnode (fdt, 0, "chosen");
++
++ if (node < 1)
++ goto failure;
++
++ /* 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 failure;
++ retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-end",
++ initrd_end);
++ if (retval)
++ goto failure;
++ }
++
++ if (grub_fdt_install() != GRUB_ERR_NONE)
++ goto failure;
++
++ return GRUB_ERR_NONE;
++
++failure:
++ 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_loaded_image_t *loaded_image = NULL;
++ 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;
++ 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);
++ if (!loaded_image)
++ return grub_error(GRUB_ERR_BAD_OS, "cannot get image");
++ 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;
++}
++
++/* According to the Linux arch/riscv/include/asm/efi.h */
++#define INITRD_MAX_ADDRESS_OFFSET (256ULL << 20)
++
++/*
++ * This function returns a pointer to a legally allocated initrd buffer,
++ * or NULL if unsuccessful
++ */
++static void *
++allocate_initrd_mem (int initrd_pages)
++{
++ grub_addr_t max_addr;
++
++ if (grub_efi_get_ram_base (&max_addr) != GRUB_ERR_NONE)
++ return NULL;
++
++ max_addr += INITRD_MAX_ADDRESS_OFFSET - 1;
++
++ return grub_efi_allocate_pages_real (max_addr, initrd_pages,
++ GRUB_EFI_ALLOCATE_MAX_ADDRESS,
++ GRUB_EFI_LOADER_DATA);
++}
++
++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 = allocate_initrd_mem (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_arch_kernel_header lh;
++ grub_err_t err;
++
++ 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));
++ err = grub_create_loader_cmdline (argc, argv,
++ linux_args + sizeof (LINUX_IMAGE) - 1,
++ cmdline_size,
++ GRUB_VERIFY_KERNEL_CMDLINE);
++ if (err)
++ goto fail;
++
++ 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);
++}
diff --git a/grub.patches b/grub.patches
index 176fb5e..da98759 100644
--- a/grub.patches
+++ b/grub.patches
@@ -217,7 +217,7 @@ Patch0216: 0216-fix-build-with-rpm-4.16.patch
Patch0217: 0217-Only-mark-GRUB-as-BLS-supported-in-OSTree-systems-wi.patch
Patch0218: 0218-support-TPM2.0-in-grub2-both-legacy-and-efi.patch
Patch0219: 0219-Workaround-for-EFI-Bug-Plan3.patch
-Patch0220: 0220-bugfix-remove-excess-qutos.patch
+Patch0220: 0220-bugfix-remove-excess-qutos.patch
Patch0221: 0221-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
Patch0222: 0222-safemath-Add-some-arithmetic-primitives-that-check-f.patch
Patch0223: 0223-calloc-Make-sure-we-always-have-an-overflow-checking.patch
@@ -351,3 +351,4 @@ Patch0350: backport-0077-efi-tpm-Fix-memory-leak-in-grub_tpm1-2_log_event.patch
Patch0351: backport-0078-powerpc-mkimage-Fix-CHRP-note-descsz.patch
Patch0352: backport-0079-efi-tpm-Fix-typo-in-grub_efi_tpm2_protocol-struct.patch
Patch0353: backport-0080-misc-Add-parentheses-around-ALIGN_UP-and-ALIGN_DOWN-.patch
+Patch0354: 0354-add-riscv-linux-command-support.patch
--
Gitee
From 59d835751ed981872493c6d54178fc08ac5c329e Mon Sep 17 00:00:00 2001
From: GuEe-GUI <2991707448@qq.com>
Date: Tue, 4 May 2021 13:43:01 +0800
Subject: [PATCH 3/3] Update
---
0354-add-riscv-linux-command-support.patch | 3 +-
Add-riscv-linux-command-support.patch | 492 ---------------------
2 files changed, 1 insertion(+), 494 deletions(-)
delete mode 100644 Add-riscv-linux-command-support.patch
diff --git a/0354-add-riscv-linux-command-support.patch b/0354-add-riscv-linux-command-support.patch
index de6d2c2..503eb86 100644
--- a/0354-add-riscv-linux-command-support.patch
+++ b/0354-add-riscv-linux-command-support.patch
@@ -1,6 +1,5 @@
From: Nikita Ermakov
-Subject: [PATCH 1/2] RISC-V: Update magic number,
- [PATCH 2/2] RISC-V: Allow to boot Linux with EFI stub on riscv64
+Subject: RISC-V: Update magic number, Allow to boot Linux with EFI stub on riscv64
Date: Wed, 24 Mar 2021 17:50:28 +0300
---
diff --git a/Add-riscv-linux-command-support.patch b/Add-riscv-linux-command-support.patch
deleted file mode 100644
index 2e8586c..0000000
--- a/Add-riscv-linux-command-support.patch
+++ /dev/null
@@ -1,492 +0,0 @@
-diff -uNr grub-2.04/grub-core/loader/riscv/linux.c grub-2.04-p/grub-core/loader/riscv/linux.c
---- grub-2.04/grub-core/loader/riscv/linux.c 2019-04-23 16:54:47.000000000 +0800
-+++ grub-2.04-p/grub-core/loader/riscv/linux.c 2021-03-31 15:27:18.000000000 +0800
-@@ -1,59 +1,385 @@
--/*
-- * 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 .
-- */
--
--#include
--#include
--#include
--
--GRUB_MOD_LICENSE ("GPLv3+");
--
--static grub_err_t
--grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-- int argc __attribute__ ((unused)),
-- char *argv[] __attribute__ ((unused)))
--{
-- grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("Linux not supported yet"));
--
-- return grub_errno;
--}
--
--static grub_err_t
--grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-- int argc __attribute__ ((unused)),
-- char *argv[] __attribute__ ((unused)))
--{
-- grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("Linux not supported yet"));
--
-- 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."));
--}
--
--GRUB_MOD_FINI (linux)
--{
-- grub_unregister_command (cmd_linux);
-- grub_unregister_command (cmd_initrd);
--}
-+/*
-+ * 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 .
-+ */
-+
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+
-+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_arch_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\
-+ONFIG_(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 failure;
-+
-+ node = grub_fdt_find_subnode (fdt, 0, "chosen");
-+ if (node < 0)
-+ node = grub_fdt_add_subnode (fdt, 0, "chosen");
-+
-+ if (node < 1)
-+ goto failure;
-+
-+ /* 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 failure;
-+ retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-end",
-+ initrd_end);
-+ if (retval)
-+ goto failure;
-+ }
-+
-+ if (grub_fdt_install() != GRUB_ERR_NONE)
-+ goto failure;
-+
-+ return GRUB_ERR_NONE;
-+
-+failure:
-+ 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_loaded_image_t *loaded_image = NULL;
-+ 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;
-+ 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);
-+ if (!loaded_image)
-+ return grub_error(GRUB_ERR_BAD_OS, "cannot get image");
-+ 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;
-+}
-+
-+/* According to the Linux arch/riscv/include/asm/efi.h */
-+#define INITRD_MAX_ADDRESS_OFFSET (256ULL << 20)
-+
-+/*
-+ * This function returns a pointer to a legally allocated initrd buffer,
-+ * or NULL if unsuccessful
-+ */
-+static void *
-+allocate_initrd_mem (int initrd_pages)
-+{
-+ grub_addr_t max_addr;
-+
-+ if (grub_efi_get_ram_base (&max_addr) != GRUB_ERR_NONE)
-+ return NULL;
-+
-+ max_addr += INITRD_MAX_ADDRESS_OFFSET - 1;
-+
-+ return grub_efi_allocate_pages_real (max_addr, initrd_pages,
-+ GRUB_EFI_ALLOCATE_MAX_ADDRESS,
-+ GRUB_EFI_LOADER_DATA);
-+}
-+
-+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 = allocate_initrd_mem (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_arch_kernel_header lh;
-+ grub_err_t err;
-+
-+ 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));
-+ err = grub_create_loader_cmdline (argc, argv,
-+ linux_args + sizeof (LINUX_IMAGE) - 1,
-+ cmdline_size,
-+ GRUB_VERIFY_KERNEL_CMDLINE);
-+ if (err)
-+ goto fail;
-+
-+ 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);
-+}
-diff -uNr grub-2.04/include/grub/riscv32/linux.h grub-2.04-p/include/grub/riscv32/linux.h
---- grub-2.04/include/grub/riscv32/linux.h 2019-04-23 16:54:47.000000000 +0800
-+++ grub-2.04-p/include/grub/riscv32/linux.h 2021-03-31 15:06:58.000000000 +0800
-@@ -19,7 +19,8 @@
- #ifndef GRUB_RISCV32_LINUX_HEADER
- #define GRUB_RISCV32_LINUX_HEADER 1
-
--#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
-+#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* little endian,
-+'RSC\x05' */
-
- /* From linux/Documentation/riscv/booting.txt */
- struct linux_riscv_kernel_header
-@@ -32,7 +33,7 @@
- grub_uint64_t res2; /* reserved */
- grub_uint64_t res3; /* reserved */
- grub_uint64_t res4; /* reserved */
-- grub_uint32_t magic; /* Magic number, little endian, "RSCV" */
-+ grub_uint32_t magic; /* Magic number, little endian, "RSC\x05" */
- grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
- };
-
-diff -uNr grub-2.04/include/grub/riscv64/linux.h grub-2.04-p/include/grub/riscv64/linux.h
---- grub-2.04/include/grub/riscv64/linux.h 2019-04-23 16:54:47.000000000 +0800
-+++ grub-2.04-p/include/grub/riscv64/linux.h 2021-03-31 15:04:54.000000000 +0800
-@@ -19,7 +19,8 @@
- #ifndef GRUB_RISCV64_LINUX_HEADER
- #define GRUB_RISCV64_LINUX_HEADER 1
-
--#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
-+#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* little endian,
-+'RSC\x05' */
-
- #define GRUB_EFI_PE_MAGIC 0x5A4D
-
-@@ -34,7 +35,7 @@
- grub_uint64_t res2; /* reserved */
- grub_uint64_t res3; /* reserved */
- grub_uint64_t res4; /* reserved */
-- grub_uint32_t magic; /* Magic number, little endian, "RSCV" */
-+ grub_uint32_t magic; /* Magic number, little endian, "RSC\x05" */
- grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
- };
-
--
Gitee