From 8b411663cf86e67c8bbdc561a5a821b37c3bed33 Mon Sep 17 00:00:00 2001
From: A1ive <10670106+a1ive@users.noreply.github.com>
Date: Wed, 6 Apr 2022 15:13:37 +0800
Subject: [PATCH] add support for uefi driver loading (#1552)
---
.../grub-2.04/grub-core/Makefile.core.def | 6 +
.../grub-2.04/grub-core/commands/efi/fwload.c | 205 ++++++++++++++++++
GRUB2/MOD_SRC/grub-2.04/install.sh | 2 +-
3 files changed, 212 insertions(+), 1 deletion(-)
create mode 100644 GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c
diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def b/GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def
index 5daba477..dbb1f1cc 100644
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def
@@ -913,6 +913,12 @@ module = {
enable = x86_64_efi;
};
+module = {
+ name = fwload;
+ efi = commands/efi/fwload.c;
+ enable = efi;
+};
+
module = {
name = gptsync;
common = commands/gptsync.c;
diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c
new file mode 100644
index 00000000..6adaf6a9
--- /dev/null
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c
@@ -0,0 +1,205 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2022 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
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+static grub_efi_guid_t loaded_image_guid = GRUB_EFI_LOADED_IMAGE_GUID;
+
+static grub_efi_status_t
+grub_efi_connect_all (void)
+{
+ grub_efi_status_t status;
+ grub_efi_uintn_t handle_count;
+ grub_efi_handle_t *handle_buffer;
+ grub_efi_uintn_t index;
+ grub_efi_boot_services_t *b;
+ grub_dprintf ("efi", "Connecting ...\n");
+ b = grub_efi_system_table->boot_services;
+ status = efi_call_5 (b->locate_handle_buffer,
+ GRUB_EFI_ALL_HANDLES, NULL, NULL,
+ &handle_count, &handle_buffer);
+
+ if (status != GRUB_EFI_SUCCESS)
+ return status;
+
+ for (index = 0; index < handle_count; index++)
+ {
+ status = efi_call_4 (b->connect_controller,
+ handle_buffer[index], NULL, NULL, 1);
+ }
+
+ if (handle_buffer)
+ {
+ efi_call_1 (b->free_pool, handle_buffer);
+ }
+ return GRUB_EFI_SUCCESS;
+}
+
+static grub_err_t
+grub_efi_load_driver (grub_size_t size, void *boot_image, int connect)
+{
+ grub_efi_status_t status;
+ grub_efi_handle_t driver_handle;
+ grub_efi_boot_services_t *b;
+ grub_efi_loaded_image_t *loaded_image;
+
+ b = grub_efi_system_table->boot_services;
+
+ status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, NULL,
+ boot_image, size, &driver_handle);
+ if (status != GRUB_EFI_SUCCESS)
+ {
+ if (status == GRUB_EFI_OUT_OF_RESOURCES)
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of resources");
+ else
+ grub_error (GRUB_ERR_BAD_OS, "cannot load image");
+ goto fail;
+ }
+ loaded_image = grub_efi_get_loaded_image (driver_handle);
+ if (! loaded_image)
+ {
+ grub_error (GRUB_ERR_BAD_OS, "no loaded image available");
+ goto fail;
+ }
+ grub_dprintf ("efi", "Registering loaded image\n");
+ status = efi_call_3 (b->handle_protocol, driver_handle,
+ &loaded_image_guid, (void **)&loaded_image);
+ if (status != GRUB_EFI_SUCCESS)
+ {
+ grub_error (GRUB_ERR_BAD_OS, "not a dirver");
+ goto fail;
+ }
+ grub_dprintf ("efi", "StartImage: %p\n", boot_image);
+ status = efi_call_3 (b->start_image, driver_handle, NULL, NULL);
+ if (status != GRUB_EFI_SUCCESS)
+ {
+ grub_error (GRUB_ERR_BAD_OS, "StartImage failed");
+ goto fail;
+ }
+ if (connect)
+ {
+ status = grub_efi_connect_all ();
+ if (status != GRUB_EFI_SUCCESS)
+ {
+ grub_error (GRUB_ERR_BAD_OS, "cannot connect controllers\n");
+ goto fail;
+ }
+ }
+ grub_dprintf ("efi", "Driver installed\n");
+ return 0;
+fail:
+ return grub_errno;
+}
+
+static const struct grub_arg_option options_fwload[] =
+{
+ {"nc", 'n', 0, N_("Loads the driver, but does not connect the driver."), 0, 0},
+ {0, 0, 0, 0, 0, 0}
+};
+
+static grub_err_t
+grub_cmd_fwload (grub_extcmd_context_t ctxt, int argc, char **args)
+{
+ struct grub_arg_list *state = ctxt->state;
+ int connect = 1;
+ grub_file_t file = 0;
+ grub_efi_boot_services_t *b;
+ grub_efi_status_t status;
+ grub_efi_uintn_t pages = 0;
+ grub_ssize_t size;
+ grub_efi_physical_address_t address;
+ void *boot_image = 0;
+
+ b = grub_efi_system_table->boot_services;
+ if (argc != 1)
+ goto fail;
+
+ file = grub_file_open (args[0], GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);
+ if (! file)
+ goto fail;
+ size = grub_file_size (file);
+ if (!size)
+ {
+ grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), args[0]);
+ goto fail;
+ }
+ pages = (((grub_efi_uintn_t) size + ((1 << 12) - 1)) >> 12);
+ status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
+ GRUB_EFI_LOADER_CODE, pages, &address);
+ if (status != GRUB_EFI_SUCCESS)
+ {
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
+ goto fail;
+ }
+ boot_image = (void *) ((grub_addr_t) address);
+ if (grub_file_read (file, boot_image, size) != size)
+ {
+ if (grub_errno == GRUB_ERR_NONE)
+ grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), args[0]);
+ goto fail;
+ }
+ grub_file_close (file);
+ if (state[0].set)
+ connect = 0;
+ if (grub_efi_load_driver (size, boot_image, connect))
+ goto fail;
+ return GRUB_ERR_NONE;
+fail:
+ if (file)
+ grub_file_close (file);
+ if (address)
+ efi_call_2 (b->free_pages, address, pages);
+ return grub_errno;
+}
+
+static grub_err_t
+grub_cmd_fwconnect (grub_extcmd_context_t ctxt __attribute__ ((unused)),
+ int argc __attribute__ ((unused)),
+ char **args __attribute__ ((unused)))
+{
+ grub_efi_connect_all ();
+ return GRUB_ERR_NONE;
+}
+
+static grub_extcmd_t cmd_fwload, cmd_fwconnect;
+
+GRUB_MOD_INIT(fwload)
+{
+ cmd_fwload = grub_register_extcmd ("fwload", grub_cmd_fwload, 0, N_("FILE"),
+ N_("Install UEFI driver."), options_fwload);
+ cmd_fwconnect = grub_register_extcmd ("fwconnect", grub_cmd_fwconnect, 0,
+ NULL, N_("Connect drivers."), 0);
+}
+
+GRUB_MOD_FINI(fwload)
+{
+ grub_unregister_extcmd (cmd_fwload);
+ grub_unregister_extcmd (cmd_fwconnect);
+}
diff --git a/GRUB2/MOD_SRC/grub-2.04/install.sh b/GRUB2/MOD_SRC/grub-2.04/install.sh
index c6b0d0f2..6222037b 100644
--- a/GRUB2/MOD_SRC/grub-2.04/install.sh
+++ b/GRUB2/MOD_SRC/grub-2.04/install.sh
@@ -15,7 +15,7 @@ net_modules_legacy="net tftp http"
all_modules_legacy="file setkey date drivemap blocklist regexp newc vga_text ntldr search at_keyboard usb_keyboard gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe video_fb font video gettext extcmd terminal linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal udf gfxmenu gfxterm gfxterm_background gfxterm_menu"
net_modules_uefi="efinet net tftp http"
-all_modules_uefi="file setkey blocklist ventoy test true regexp newc search at_keyboard usb_keyboard gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu mouse"
+all_modules_uefi="file setkey blocklist ventoy test true regexp newc search at_keyboard usb_keyboard gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu mouse fwload"
all_modules_arm64_uefi="file setkey blocklist ventoy test true regexp newc search gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop video video_fb gfxterm_background gfxterm_menu"