Merge ~xypron/grub:riscv into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Heinrich Schuchardt]

With this pull request GRUB is built for riscv64.

* for ARM keep the broken existing code path
* for RISC-V use a new implementation of LoadImage(), StartImage() in peimage.c
* signing is not foreseen for RISC-V currently

This replaces https://code.launchpad.net/~xypron/grub/+git/grub/+merge/415323 and considers the comments provided.

diff --git a/debian/control b/debian/control
index cdcb96f..f88631f 100644
--- a/debian/control
+++ b/debian/control
@@ -34,8 +34,8 @@ Build-Depends: debhelper-compat (= 10),
  libparted-dev [any-powerpc any-ppc64 any-ppc64el],
  pkg-config,
  bash-completion,
- libefiboot-dev [i386 amd64 ia64 x32 armel armhf arm64],
- libefivar-dev [i386 amd64 ia64 x32 armel armhf arm64],
+ libefiboot-dev [i386 amd64 ia64 x32 armel armhf arm64 riscv64],
+ libefivar-dev [i386 amd64 ia64 x32 armel armhf arm64 riscv64],
 Build-Conflicts: autoconf2.13, libzfs-dev, libnvpair-dev
 Standards-Version: 3.9.6
 Homepage: https://www.gnu.org/software/grub/
@@ -63,9 +63,9 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
  This is a dummy transitional package that depends on grub-coreboot.
 
 Package: grub-efi
-Architecture: any-i386 any-amd64 any-arm64 any-ia64 any-arm
+Architecture: any-i386 any-amd64 any-arm64 any-ia64 any-arm any-riscv64
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, grub-efi-ia32 (= ${binary:Version}) [any-i386], grub-efi-amd64 (>= ${binary:Version}) [any-amd64], grub-efi-arm64 (>= ${binary:Version}) [any-arm64], grub-efi-ia64 (= ${binary:Version}) [any-ia64], grub-efi-arm (= ${binary:Version}) [any-arm]
+Depends: ${misc:Depends}, grub-efi-ia32 (= ${binary:Version}) [any-i386], grub-efi-amd64 (>= ${binary:Version}) [any-amd64], grub-efi-arm64 (>= ${binary:Version}) [any-arm64], grub-efi-ia64 (= ${binary:Version}) [any-ia64], grub-efi-arm (= ${binary:Version}) [any-arm], grub-efi-riscv64 (= ${binary:Version}) [any-riscv64]
 Multi-Arch: foreign
 Description: GRand Unified Bootloader, version 2 (dummy package)
  This is a dummy package that depends on the grub-efi-$ARCH package most likely
@@ -77,7 +77,7 @@ Built-Using: ${Built-Using}
 Depends: ${shlibs:Depends}, ${misc:Depends}, gettext-base, ${lsb-base-depends}
 Replaces: grub-pc (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-efi (<< 1.99-1), grub-coreboot (<< 2.00-4), grub-linuxbios (<< 1.96+20080831-1), grub-efi-ia32 (<< 2.00-4), grub-efi-amd64 (<< 2.00-4), grub-efi-ia64 (<< 2.00-4), grub-yeeloong (<< 2.00-4), init-select
 Recommends: os-prober (>= 1.33)
-Suggests: multiboot-doc, grub-emu [any-i386 any-amd64 any-powerpc], mtools [any-i386 any-amd64 any-ia64 any-arm any-arm64], xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
+Suggests: multiboot-doc, grub-emu [any-i386 any-amd64 any-powerpc], mtools [any-i386 any-amd64 any-ia64 any-arm any-arm64 riscv64], xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
 Conflicts: init-select
 # mdadm: See bugs #435983 and #455746
 Breaks: mdadm (<< 2.6.7-2), lupin-support (<< 0.55), friendly-recovery (<< 0.2.13), apport (<< 2.1.1)
@@ -94,7 +94,7 @@ Package: grub2-common
 # Not Architecture: any because this package contains some things which are
 # only built when there is a real platform (e.g. grub-install), and the rest
 # of the package is not very useful in a utilities-only build.
-Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64 any-mipsel any-ia64 any-arm any-arm64
+Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64 any-mipsel any-ia64 any-arm any-arm64 any-riscv64
 Depends: grub-common (= ${binary:Version}), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
 Replaces: grub, grub-legacy, ${legacy-doc-br}, grub-common (<< 1.99-1), grub-pc (<< 2.02+dfsg1-7), grub-coreboot (<< 2.02+dfsg1-7), grub-efi-ia32 (<< 2.02+dfsg1-7), grub-efi-amd64 (<< 2.02+dfsg1-7), grub-efi-ia64 (<< 2.02+dfsg1-7), grub-efi-arm (<< 2.02+dfsg1-7), grub-efi-arm64 (<< 2.02+dfsg1-7), grub-ieee1275 (<< 2.02+dfsg1-7), grub-uboot (<< 2.02+dfsg1-7), grub-xen (<< 2.02+dfsg1-7), grub-yeeloong (<< 2.02+dfsg1-7), grub-cloud-amd64 (<< 0.0.4)
 Conflicts: grub-legacy
@@ -526,6 +526,56 @@ Description: GRand Unified Bootloader, version 2 (ARM64 UEFI signing template)
  This package contains template files for grub-efi-arm64-signed.
  This is only needed for Secure Boot signing.
 
+Package: grub-efi-riscv64-bin
+Architecture: any-riscv64
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (>= 2.02~beta2-9)
+Recommends: efibootmgr [linux-any]
+Multi-Arch: foreign
+XB-Efi-Vendor: ${efi:Vendor}
+Description: GRand Unified Bootloader, version 2 (riscv64 UEFI modules)
+ GRUB is a portable, powerful bootloader.  This version of GRUB is based on a
+ cleaner design than its predecessors, and provides the following new features:
+ .
+  - Scripting in grub.cfg using BASH-like syntax.
+  - Support for modern partition maps such as GPT.
+  - Modular generation of grub.cfg via update-grub.  Packages providing GRUB
+    add-ons can plug in their own script rules and trigger updates by invoking
+    update-grub.
+ .
+ This package contains GRUB modules that have been built for use on riscv64
+ systems with UEFI.  It can be installed in parallel with other flavours,
+ but will not automatically install GRUB as the active boot loader nor
+ automatically update grub.cfg on upgrade unless grub-efi-riscv64 is also
+ installed.
+
+Package: grub-efi-riscv64-dbg
+Section: debug
+Architecture: any-riscv64
+Depends: ${misc:Depends}, grub-efi-riscv64-bin (= ${binary:Version})
+Multi-Arch: foreign
+Description: GRand Unified Bootloader, version 2 (riscv64 UEFI debug files)
+ This package contains debugging files for grub-efi-riscv64-bin.  You only
+ need these if you are trying to debug GRUB using its GDB stub.
+
+Package: grub-efi-riscv64
+Architecture: any-riscv64
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (>= 2.02~beta2-9), grub-efi-riscv64-bin (= ${binary:Version}), ucf
+Multi-Arch: foreign
+Description: GRand Unified Bootloader, version 2 (riscv64 UEFI version)
+ GRUB is a portable, powerful bootloader.  This version of GRUB is based on a
+ cleaner design than its predecessors, and provides the following new features:
+ .
+  - Scripting in grub.cfg using BASH-like syntax.
+  - Support for modern partition maps such as GPT.
+  - Modular generation of grub.cfg via update-grub.  Packages providing GRUB
+    add-ons can plug in their own script rules and trigger updates by invoking
+    update-grub.
+ .
+ This is a dependency package for a version of GRUB that has been built for
+ use on RISC-V 64-bit systems with UEFI.  Installing this package indicates that
+ this version of GRUB should be the active boot loader.
+
 Package: grub-ieee1275-bin
 Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64
 Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
@@ -765,7 +815,7 @@ Description: GRand Unified Bootloader, version 2 (Yeeloong version)
 Package: grub-theme-starfield
 # Could be Architecture: any, but in practice this package is useless in a
 # utilities-only build.
-Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64 any-mipsel any-ia64 any-arm any-arm64
+Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64 any-mipsel any-ia64 any-arm any-arm64 any-riscv64
 Depends: ${misc:Depends}, grub-common (= ${binary:Version})
 Multi-Arch: foreign
 Description: GRand Unified Bootloader, version 2 (starfield theme)
diff --git a/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch b/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
index 53b5557..c225492 100644
--- a/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
+++ b/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
@@ -50,7 +50,7 @@ index 382ff52..9241fed 100644
  
    params = grub_efi_allocate_pages_max (0x3fffffff,
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index d55b7cd..1649342 100644
+index b6c13d7..e764e2a 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -665,35 +665,40 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
index 433780e..360e21c 100644
--- a/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+++ b/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
@@ -12,16 +12,28 @@ CVE-2020-15705
 Reported-by: Mathieu Trudel-Lapierre <[e-mail]>
 Signed-off-by: Dimitri John Ledkov <[e-mail]>
 ---
- grub-core/loader/arm64/linux.c     | 13 +++++++++----
  grub-core/loader/efi/chainloader.c |  1 +
- grub-core/loader/efi/linux.c       |  1 +
+ grub-core/loader/efi/linux.c       | 13 +++++++++----
+ grub-core/loader/efi/linux_sb.c    |  1 +
  grub-core/loader/i386/efi/linux.c  |  2 +-
  4 files changed, 12 insertions(+), 5 deletions(-)
 
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 4e9eac3..f60ca2f 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 2b74d79..9042603 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -1097,6 +1097,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+ 
+       return 0;
+     }
++  // -1 fall-through to fail
+ 
+   grub_file_close (file);
+   grub_device_close (dev);
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 93e4cfc..56d6745 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
 @@ -34,6 +34,7 @@
  #include <grub/i18n.h>
  #include <grub/lib/cmdline.h>
@@ -30,7 +42,7 @@ index 4e9eac3..f60ca2f 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -345,11 +346,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -455,11 +456,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
  
@@ -50,22 +62,10 @@ index 4e9eac3..f60ca2f 100644
      }
  
    pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
-diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index cf76f48..d64c851 100644
---- a/grub-core/loader/efi/chainloader.c
-+++ b/grub-core/loader/efi/chainloader.c
-@@ -1098,6 +1098,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
- 
-       return 0;
-     }
-+  // -1 fall-through to fail
- 
-   grub_file_close (file);
-   grub_device_close (dev);
-diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+diff --git a/grub-core/loader/efi/linux_sb.c b/grub-core/loader/efi/linux_sb.c
 index 73a7196..a09479c 100644
---- a/grub-core/loader/efi/linux.c
-+++ b/grub-core/loader/efi/linux.c
+--- a/grub-core/loader/efi/linux_sb.c
++++ b/grub-core/loader/efi/linux_sb.c
 @@ -34,6 +34,7 @@ struct grub_efi_shim_lock
  };
  typedef struct grub_efi_shim_lock grub_efi_shim_lock_t;
diff --git a/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch b/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
index 73748a8..defec76 100644
--- a/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
+++ b/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
@@ -7,10 +7,10 @@ Subject: chainloader: Avoid a double free when validation fails
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index d64c851..8515f89 100644
+index 9042603..4a85f41 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -1086,6 +1086,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -1085,6 +1085,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (rc > 0)
      {
        grub_file_close (file);
@@ -20,7 +20,7 @@ index d64c851..8515f89 100644
        grub_loader_set (grub_secureboot_chainloader_boot,
  		       grub_secureboot_chainloader_unload, 0);
        return 0;
-@@ -1094,15 +1097,15 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -1093,15 +1096,15 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      {
        grub_load_and_start_image(boot_image);
        grub_file_close (file);
diff --git a/debian/patches/RISC-V-Update-image-header.patch b/debian/patches/RISC-V-Update-image-header.patch
 new file mode 100644
index 0000000..224165a
--- /dev/null
+++ b/debian/patches/RISC-V-Update-image-header.patch
@@ -0,0 +1,84 @@
+From: Atish Patra <[e-mail]>
+Date: Thu, 28 Oct 2021 23:31:19 +0300
+Subject: RISC-V: Update image header
+
+Update the RISC-V Linux kernel image headers as per the current header.
+
+Reference:
+<Linux kernel source>/Documentation/riscv/boot-image-header.rst
+
+Signed-off-by: Atish Patra <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2021-10/msg00213.html
+---
+ include/grub/riscv32/linux.h | 15 ++++++++-------
+ include/grub/riscv64/linux.h | 15 ++++++++-------
+ 2 files changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/include/grub/riscv32/linux.h b/include/grub/riscv32/linux.h
+index 512b777..de0dbdc 100644
+--- a/include/grub/riscv32/linux.h
++++ b/include/grub/riscv32/linux.h
+@@ -19,20 +19,21 @@
+ #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 /* 'RSC\0x5' */
+ 
+-/* From linux/Documentation/riscv/booting.txt */
++/* From linux/Documentation/riscv/boot-image-header.rst */
+ struct linux_riscv_kernel_header
+ {
+   grub_uint32_t code0;		/* Executable code */
+   grub_uint32_t code1;		/* Executable code */
+-  grub_uint64_t text_offset;	/* Image load offset */
+-  grub_uint64_t res0;		/* reserved */
+-  grub_uint64_t res1;		/* reserved */
++  grub_uint64_t text_offset;	/* Image load offset, little endian */
++  grub_uint64_t image_size;	/* Effective Image size, little endian */
++  grub_uint64_t flags;		/* kernel flags, little endian */
++  grub_uint32_t version;	/* Version of this header */
++  grub_uint32_t res1;		/* reserved */
+   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 3630c30..7c28bc9 100644
+--- a/include/grub/riscv64/linux.h
++++ b/include/grub/riscv64/linux.h
+@@ -19,22 +19,23 @@
+ #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 /* 'RSC\0x5' */
+ 
+ #define GRUB_EFI_PE_MAGIC	0x5A4D
+ 
+-/* From linux/Documentation/riscv/booting.txt */
++/* From linux/Documentation/riscv/boot-image-header.rst */
+ struct linux_riscv_kernel_header
+ {
+   grub_uint32_t code0;		/* Executable code */
+   grub_uint32_t code1;		/* Executable code */
+-  grub_uint64_t text_offset;	/* Image load offset */
+-  grub_uint64_t res0;		/* reserved */
+-  grub_uint64_t res1;		/* reserved */
++  grub_uint64_t text_offset;	/* Image load offset, little endian */
++  grub_uint64_t image_size;	/* Effective Image size, little endian */
++  grub_uint64_t flags;		/* kernel flags, little endian */
++  grub_uint32_t version;	/* Version of this header */
++  grub_uint32_t res1;		/* reserved */
+   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/debian/patches/RISC-V-Use-common-linux-loader.patch b/debian/patches/RISC-V-Use-common-linux-loader.patch
 new file mode 100644
index 0000000..de50acc
--- /dev/null
+++ b/debian/patches/RISC-V-Use-common-linux-loader.patch
@@ -0,0 +1,120 @@
+From: Atish Patra <[e-mail]>
+Date: Thu, 28 Oct 2021 23:31:20 +0300
+Subject: RISC-V: Use common linux loader
+
+RISC-V doesn't have to do anything very different from other architectures
+to loader EFI stub linux kernel. As a result, just use the common linux
+loader instead of defining a RISC-V specific linux loader.
+
+Signed-off-by: Atish Patra <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2021-10/msg00211.html
+---
+ grub-core/Makefile.core.def    |  4 +--
+ grub-core/loader/riscv/linux.c | 59 ------------------------------------------
+ include/grub/riscv32/linux.h   |  1 +
+ include/grub/riscv64/linux.h   |  1 +
+ 4 files changed, 4 insertions(+), 61 deletions(-)
+ delete mode 100644 grub-core/loader/riscv/linux.c
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index b36cf66..0536575 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -1809,8 +1809,8 @@ module = {
+   arm_efi = loader/efi/linux.c;
+   arm_uboot = loader/arm/linux.c;
+   arm64 = loader/efi/linux.c;
+-  riscv32 = loader/riscv/linux.c;
+-  riscv64 = loader/riscv/linux.c;
++  riscv32 = loader/efi/linux.c;
++  riscv64 = loader/efi/linux.c;
+   common = loader/linux.c;
+   common = lib/cmdline.c;
+   enable = noemu;
+diff --git a/grub-core/loader/riscv/linux.c b/grub-core/loader/riscv/linux.c
+deleted file mode 100644
+index d17c488..0000000
+--- a/grub-core/loader/riscv/linux.c
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/*
+- *  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/command.h>
+-#include <grub/dl.h>
+-#include <grub/lib/cmdline.h>
+-
+-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);
+-}
+diff --git a/include/grub/riscv32/linux.h b/include/grub/riscv32/linux.h
+index de0dbdc..706c690 100644
+--- a/include/grub/riscv32/linux.h
++++ b/include/grub/riscv32/linux.h
+@@ -38,5 +38,6 @@ struct linux_riscv_kernel_header
+ };
+ 
+ #define linux_arch_kernel_header linux_riscv_kernel_header
++# define GRUB_LINUX_ARCH_MAGIC_SIGNATURE GRUB_LINUX_RISCV_MAGIC_SIGNATURE
+ 
+ #endif /* ! GRUB_RISCV32_LINUX_HEADER */
+diff --git a/include/grub/riscv64/linux.h b/include/grub/riscv64/linux.h
+index 7c28bc9..88d5df7 100644
+--- a/include/grub/riscv64/linux.h
++++ b/include/grub/riscv64/linux.h
+@@ -40,5 +40,6 @@ struct linux_riscv_kernel_header
+ };
+ 
+ #define linux_arch_kernel_header linux_riscv_kernel_header
++# define GRUB_LINUX_ARCH_MAGIC_SIGNATURE GRUB_LINUX_RISCV_MAGIC_SIGNATURE
+ 
+ #endif /* ! GRUB_RISCV64_LINUX_HEADER */
diff --git a/debian/patches/dejavu-font-path.patch b/debian/patches/dejavu-font-path.patch
index 18b8376..2d9d197 100644
--- a/debian/patches/dejavu-font-path.patch
+++ b/debian/patches/dejavu-font-path.patch
@@ -8,10 +8,10 @@ Patch-Name: dejavu-font-path.patch
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index b3fb743..22c6cf7 100644
+index d422626..a29beb9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1719,7 +1719,7 @@ fi
+@@ -1727,7 +1727,7 @@ fi
  
  if test x"$starfield_excuse" = x; then
     for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
diff --git a/debian/patches/efi-add-definition-of-LoadFile2-protocol.patch b/debian/patches/efi-add-definition-of-LoadFile2-protocol.patch
 new file mode 100644
index 0000000..d2263d3
--- /dev/null
+++ b/debian/patches/efi-add-definition-of-LoadFile2-protocol.patch
@@ -0,0 +1,61 @@
+From: Ard Biesheuvel <[e-mail]>
+Date: Thu, 28 Oct 2021 23:31:15 +0300
+Subject: efi: add definition of LoadFile2 protocol
+
+Incorporate the EFI_LOAD_FILE2_PROTOCOL GUID and C types from the
+UEFI spec.
+
+Signed-off-by: Ard Biesheuvel <[e-mail]>
+Reviewed-by: Heinrich Schuchardt <[e-mail]>
+Signed-off-by: Nikita Ermakov <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2021-10/msg00210.html
+---
+ grub-core/commands/efi/lsefi.c |  1 +
+ include/grub/efi/api.h         | 15 +++++++++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c
+index d1ce99a..4085f5d 100644
+--- a/grub-core/commands/efi/lsefi.c
++++ b/grub-core/commands/efi/lsefi.c
+@@ -55,6 +55,7 @@ struct known_protocol
+     { GRUB_EFI_ABSOLUTE_POINTER_PROTOCOL_GUID, "absolute pointer" },
+     { GRUB_EFI_DRIVER_BINDING_PROTOCOL_GUID, "EFI driver binding" },
+     { GRUB_EFI_LOAD_FILE_PROTOCOL_GUID, "load file" },
++    { GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID, "load file2" },
+     { GRUB_EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID, "simple FS" },
+     { GRUB_EFI_TAPE_IO_PROTOCOL_GUID, "tape I/O" },
+     { GRUB_EFI_UNICODE_COLLATION_PROTOCOL_GUID, "unicode collation" },
+diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
+index f1a5221..3de0a7d 100644
+--- a/include/grub/efi/api.h
++++ b/include/grub/efi/api.h
+@@ -149,6 +149,11 @@
+     { 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \
+   }
+ 
++#define GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID \
++  { 0x4006c0c1, 0xfcb3, 0x403e, \
++    { 0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d } \
++  }
++
+ #define GRUB_EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID \
+   { 0x0964e5b22, 0x6459, 0x11d2, \
+     { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
+@@ -1729,6 +1734,16 @@ struct grub_efi_rng_protocol
+ };
+ typedef struct grub_efi_rng_protocol grub_efi_rng_protocol_t;
+ 
++struct grub_efi_load_file2
++{
++  grub_efi_status_t (*load_file)(struct grub_efi_load_file2 *this,
++				 grub_efi_device_path_t *file_path,
++				 grub_efi_boolean_t boot_policy,
++				 grub_efi_uintn_t *buffer_size,
++				 void *buffer);
++};
++typedef struct grub_efi_load_file2 grub_efi_load_file2_t;
++
+ #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \
+   || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \
+   || defined(__riscv)
diff --git a/debian/patches/efi-correct-struct-grub_efi_boot_services.patch b/debian/patches/efi-correct-struct-grub_efi_boot_services.patch
 new file mode 100644
index 0000000..a4bf2c2
--- /dev/null
+++ b/debian/patches/efi-correct-struct-grub_efi_boot_services.patch
@@ -0,0 +1,28 @@
+From: Heinrich Schuchardt <[e-mail]>
+Date: Sat, 22 Jan 2022 11:11:32 +0100
+Subject: efi: correct struct grub_efi_boot_services
+
+The UEFI specification defines that the EFI_BOOT_SERVICES.Exit(() service
+may return EFI_SUCCESS or EFI_INVALID_PARAMETER. So it cannot be
+__attribute__((noreturn)).
+
+Signed-off-by: Heinrich Schuchardt <[e-mail]>
+Reviewed-by: Daniel Kiper <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2022-01/msg00121.html
+---
+ include/grub/efi/api.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
+index 3211f04..c5dd4af 100644
+--- a/include/grub/efi/api.h
++++ b/include/grub/efi/api.h
+@@ -1267,7 +1267,7 @@ struct grub_efi_boot_services
+   (*exit) (grub_efi_handle_t image_handle,
+ 	   grub_efi_status_t exit_status,
+ 	   grub_efi_uintn_t exit_data_size,
+-	   grub_efi_char16_t *exit_data) __attribute__((noreturn));
++	   grub_efi_char16_t *exit_data);
+ 
+   grub_efi_status_t
+   (*unload_image) (grub_efi_handle_t image_handle);
diff --git a/debian/patches/efi-implement-grub_efi_run_image.patch b/debian/patches/efi-implement-grub_efi_run_image.patch
 new file mode 100644
index 0000000..1ab5ba0
--- /dev/null
+++ b/debian/patches/efi-implement-grub_efi_run_image.patch
@@ -0,0 +1,898 @@
+From: Heinrich Schuchardt <[e-mail]>
+Date: Tue, 18 Jan 2022 11:55:56 +0100
+Subject: efi: implement grub_efi_run_image
+
+Provide function grub_efi_run_image() which consumes a PE-COFF image
+loaded into memory. The function
+
+* checks validity of header
+* copies the sections
+* relocates the code
+* invalidates the instruction cache
+* executes the image
+* returns to caller
+
+Signed-off-by: Heinrich Schuchardt <[e-mail]>
+---
+ grub-core/Makefile.core.def    |   4 +
+ grub-core/loader/efi/linux.c   |  21 ++
+ grub-core/loader/efi/peimage.c | 765 +++++++++++++++++++++++++++++++++++++++++
+ include/grub/efi/linux.h       |   3 +
+ include/grub/efi/peimage.h     |  28 ++
+ 5 files changed, 821 insertions(+)
+ create mode 100644 grub-core/loader/efi/peimage.c
+ create mode 100644 include/grub/efi/peimage.h
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 3b06462..2cfea95 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -1822,13 +1822,17 @@ module = {
+   arm_coreboot = loader/arm/linux.c;
+   arm_efi = loader/efi/linux.c;
+   arm_efi = loader/efi/linux_sb.c;
++  arm_efi = loader/efi/peimage.c;
+   arm_uboot = loader/arm/linux.c;
+   arm64 = loader/efi/linux.c;
+   arm64 = loader/efi/linux_sb.c;
++  arm64 = loader/efi/peimage.c;
+   riscv32 = loader/efi/linux.c;
+   riscv32 = loader/efi/linux_sb.c;
++  riscv32 = loader/efi/peimage.c;
+   riscv64 = loader/efi/linux.c;
+   riscv64 = loader/efi/linux_sb.c;
++  riscv64 = loader/efi/peimage.c;
+   cflags = '-Wno-error=cast-align';
+   common = loader/linux.c;
+   common = lib/cmdline.c;
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 56d6745..18e7fe2 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -190,7 +190,28 @@ grub_arch_efi_linux_boot_image (grub_addr_t addr __attribute__((unused)),
+ 
+   grub_dprintf ("linux", "linux command line: '%s'\n", args);
+ 
++/*
++ * FIXME:
++ *
++ * We know that grub_efi_linux_boot() is broken:
++ *
++ * - The entry point address is not correctly determined.
++ * - Section addresses are ignored.
++ * - Sections having a raw size that is smaller than the virtual size are not
++ *   filled up with zeros.
++ * - Relocations are ignored.
++ * - Binaries calling Exit() quit GRUB.
++ *
++ * Thus we expect kernels to fail badly.
++ *
++ * Yet reviewers suggested to only change the code path for RISC-V until a
++ * security audit of the code in grub_efi_run_image() is completed.
++ */
++#ifndef __riscv
+   retval = grub_efi_linux_boot (kernel_addr, handover_offset, kernel_addr);
++#else
++  retval = grub_efi_run_image (kernel_addr, kernel_size, linux_args);
++#endif
+ 
+   /* When successful, not reached */
+   free_params();
+diff --git a/grub-core/loader/efi/peimage.c b/grub-core/loader/efi/peimage.c
+new file mode 100644
+index 0000000..f9735ab
+--- /dev/null
++++ b/grub-core/loader/efi/peimage.c
+@@ -0,0 +1,765 @@
++// SPDX-License-Identifier: GPL-3.0+
++
++#include <grub/cache.h>
++#include <grub/cpu/efi/memory.h>
++#include <grub/efi/efi.h>
++#include <grub/efi/linux.h>
++#include <grub/efi/pe32.h>
++#include <grub/efi/peimage.h>
++#include <grub/env.h>
++#include <grub/misc.h>
++#include <grub/mm.h>
++#include <grub/setjmp.h>
++
++struct image_info {
++	void *data;
++	grub_efi_uint32_t data_size;
++	grub_efi_uint16_t machine;
++	grub_efi_uint16_t num_sections;
++	struct grub_pe32_section_table *section;
++	struct grub_pe32_data_directory *reloc;
++	grub_uint64_t image_base;
++	grub_uint32_t section_alignment;
++	grub_uint32_t image_size;
++	void *alloc_addr;
++	grub_uint32_t alloc_pages;
++	void *image_addr;
++	grub_efi_entry_point entry_point;
++};
++
++static struct {
++	grub_jmp_buf jmp;
++	grub_efi_handle_t image_handle;
++	grub_efi_status_t exit_status;
++	grub_efi_status_t EFIAPI (*exit)(grub_efi_handle_t image_handle,
++					 grub_efi_status_t exit_status,
++					 grub_efi_uintn_t exit_data_size,
++					 grub_efi_char16_t *exit_data);
++} started_image;
++
++static int
++debug_enabled(const char *condition)
++{
++	const char *debug;
++
++	debug = grub_env_get ("debug");
++	if (!debug || !grub_strword(debug, condition))
++		return 0;
++
++	return 1;
++}
++
++static void
++debug(const char *constraint)
++{
++	volatile grub_uint64_t x;
++
++	if (!debug_enabled(constraint))
++		return;
++
++	grub_printf("Attach debugger\n");
++	for (x = 1; x; ++x)
++		;
++}
++
++__attribute__((unused)) static void
++dump(const char *text, void *addr, unsigned int size)
++{
++	char *pos = addr;
++
++	grub_printf("%s @ 0x%lx\n", text, (unsigned long)addr);
++	for (unsigned int i = 0; i < size; i += 16)
++		grub_printf("%04x: %02x%02x %02x%02x %02x%02x %02x%02x "
++			    "%02x%02x %02x%02x %02x%02x %02x%02x\n", i,
++			    pos[i + 0], pos[i + 1], pos[i + 2], pos[i + 3],
++			    pos[i + 4], pos[i + 5], pos[i + 6], pos[i + 7],
++			    pos[i + 8], pos[i + 9], pos[i + 10], pos[i + 11],
++			    pos[i + 12], pos[i + 13], pos[i + 14], pos[i + 15]);
++}
++
++static grub_uint16_t machines[] = {
++#if defined(__x86_64__)
++	GRUB_PE32_MACHINE_AMD64,
++#elif defined(__i386__) || defined(__i486__) || defined(__i686__)
++	GRUB_PE32_MACHINE_AMD64,
++	GRUB_PE32_MACHINE_I386,
++#elif defined(__aarch64__)
++	GRUB_PE32_MACHINE_ARM64,
++#elif defined(__arm__)
++	GRUB_PE32_MACHINE_ARMTHUMB_MIXED,
++#elif defined(__riscv) && __riscv_xlen == 32
++	GRUB_PE32_MACHINE_RISCV32,
++#elif defined(__riscv) && __riscv_xlen == 64
++	GRUB_PE32_MACHINE_RISCV64,
++#endif
++};
++
++/**
++ * check_machine_type() - check if the machine type matches the architecture
++ *
++ * @machine:	the value of the Machine field of the COFF file header.
++ * Return:	status code
++ */
++static grub_efi_status_t check_machine_type(grub_uint16_t machine)
++{
++	for (grub_size_t i = 0; i < sizeof(machines) / sizeof(*machines); ++i) {
++		if (machine == machines[i])
++			return GRUB_EFI_SUCCESS;
++	}
++
++	return GRUB_EFI_LOAD_ERROR;
++}
++
++/**
++ * check_pe_header() - check the headers of a PE-COFF image
++ *
++ * @info:	information about the image
++ */
++static grub_efi_status_t check_pe_header(struct image_info *info)
++{
++	struct grub_dos_stub *dos_stub = info->data;
++	void *pe_magic;
++	struct grub_pe32_coff_header *coff_header;
++	struct grub_pe32_optional_header *pe32_header;
++	struct grub_pe64_optional_header *pe64_header;
++	grub_uint32_t header_size;
++
++	if (info->data_size < sizeof(struct grub_dos_stub)) {
++		grub_error(GRUB_ERR_BAD_OS, "truncated image");
++		return GRUB_EFI_LOAD_ERROR;
++	}
++	if (dos_stub->magic != GRUB_PE32_MAGIC) {
++		grub_error(GRUB_ERR_BAD_OS, "not a PE-COFF file");
++		return GRUB_EFI_UNSUPPORTED;
++	}
++	if (info->data_size < dos_stub->pe_addr + sizeof(GRUB_PE_MAGIC) +
++			      sizeof(struct grub_pe32_coff_header) +
++			      sizeof(struct grub_pe64_optional_header)) {
++		grub_error(GRUB_ERR_BAD_OS, "truncated image");
++		return GRUB_EFI_LOAD_ERROR;
++	}
++	pe_magic = (void *)((unsigned long)info->data + dos_stub->pe_addr);
++	if (grub_memcmp(pe_magic, GRUB_PE_MAGIC, sizeof(GRUB_PE_MAGIC))) {
++		grub_error(GRUB_ERR_BAD_OS, "not a PE-COFF file");
++		return GRUB_EFI_LOAD_ERROR;
++	}
++
++	coff_header = (void *)((unsigned long)pe_magic + sizeof(GRUB_PE_MAGIC));
++	info->machine = coff_header->machine;
++	info->num_sections = coff_header->num_sections;
++
++	if (check_machine_type(info->machine) != GRUB_EFI_SUCCESS) {
++		grub_error(GRUB_ERR_BAD_OS, "wrong machine type %u",
++			   coff_header->machine);
++		return GRUB_EFI_LOAD_ERROR;
++	}
++
++	pe32_header = (void *)((unsigned long)coff_header +
++			       sizeof(*coff_header));
++	pe64_header = (void *)((unsigned long)coff_header +
++			       sizeof(*coff_header));
++
++	switch (pe32_header->magic) {
++	case GRUB_PE32_PE32_MAGIC:
++		info->section_alignment = pe32_header->section_alignment;
++		info->image_base = pe32_header->image_base;
++		info->image_size = pe32_header->image_size;
++		info->entry_point =
++			(void *)(unsigned long)pe32_header->entry_addr;
++		header_size = pe32_header->header_size;
++		if (info->data_size < header_size) {
++			grub_error(GRUB_ERR_BAD_OS, "truncated image");
++			return GRUB_EFI_LOAD_ERROR;
++		}
++
++		if (pe32_header->num_data_directories >= 6 &&
++		    pe32_header->base_relocation_table.size)
++			info->reloc = &pe32_header->base_relocation_table;
++
++		info->section = (void *)((unsigned long)&pe32_header->export_table +
++					 pe32_header->num_data_directories *
++					 sizeof(struct grub_pe32_data_directory));
++		break;
++	case GRUB_PE32_PE64_MAGIC:
++		info->section_alignment = pe64_header->section_alignment;
++		info->image_base = pe64_header->image_base;
++		info->image_size = pe64_header->image_size;
++		info->entry_point =
++			(void *)(unsigned long)pe64_header->entry_addr;
++		header_size = pe64_header->header_size;
++		if (info->data_size < header_size) {
++			grub_error(GRUB_ERR_BAD_OS, "truncated image");
++			return GRUB_EFI_LOAD_ERROR;
++		}
++
++		if (pe64_header->num_data_directories >= 6 &&
++		    pe64_header->base_relocation_table.size)
++			info->reloc = &pe64_header->base_relocation_table;
++
++		info->section = (void *)((unsigned long)&pe64_header->export_table +
++					 pe64_header->num_data_directories *
++					 sizeof(struct grub_pe32_data_directory));
++		break;
++	default:
++		grub_error(GRUB_ERR_BAD_OS, "not a PE-COFF file");
++		return GRUB_EFI_LOAD_ERROR;
++	}
++
++	if ((unsigned long)info->section +
++	    info->num_sections * sizeof(*info->section) >
++	    (unsigned long)info->data + info->data_size) {
++		grub_error(GRUB_ERR_BAD_OS, "truncated image");
++		return GRUB_EFI_LOAD_ERROR;
++	}
++
++	grub_dprintf("linux", "PE-COFF header checked\n");
++
++	return GRUB_EFI_SUCCESS;
++}
++
++/**
++ * load_sections() - load image sections into memory
++ *
++ * Allocate fresh memory and copy the image sections there.
++ *
++ * @info:	image information
++ */
++static grub_efi_status_t load_sections(struct image_info *info)
++{
++	struct grub_pe32_section_table *section;
++	unsigned long align_mask = 0xfff;
++
++	/* Section alignment must be a power of two */
++	if (info->section_alignment & (info->section_alignment - 1)) {
++		grub_error(GRUB_ERR_BAD_OS, "invalid section alignment");
++		return GRUB_EFI_LOAD_ERROR;
++	}
++
++	if (info->section_alignment > align_mask)
++		align_mask = info->section_alignment - 1;
++
++	info->alloc_pages = GRUB_EFI_BYTES_TO_PAGES(info->image_size +
++						    (align_mask & ~0xfffUL));
++
++	info->alloc_addr = grub_efi_allocate_pages_real(
++			GRUB_EFI_MAX_USABLE_ADDRESS, info->alloc_pages,
++			GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA);
++	if (!info->alloc_addr)
++		return GRUB_EFI_OUT_OF_RESOURCES;
++
++	info->image_addr =
++		(void *)(((unsigned long)info->alloc_addr + align_mask) &
++			 ~align_mask);
++
++	for (section = &info->section[0];
++	     section < &info->section[info->num_sections]; ++section) {
++		if (section->raw_data_offset + section->raw_data_size >
++		    info->data_size) {
++			grub_error(GRUB_ERR_BAD_OS, "truncated image");
++			return GRUB_EFI_LOAD_ERROR;
++		}
++		if (section->virtual_address + section->virtual_size >
++		    info->image_size) {
++			grub_error(GRUB_ERR_BAD_OS, "section outside image");
++			return GRUB_EFI_LOAD_ERROR;
++		}
++
++		grub_memset(
++			(void *)((unsigned long)info->image_addr +
++				 section->virtual_address), 0,
++			section->virtual_size);
++		grub_memcpy(
++			(void *)((unsigned long)info->image_addr +
++				 section->virtual_address),
++			(void *)((unsigned long)info->data +
++				 section->raw_data_offset),
++			section->raw_data_size);
++	}
++
++	info->entry_point = (void *)((unsigned long)info->entry_point +
++				     (unsigned long)info->image_addr);
++
++	grub_dprintf("linux", "sections loaded\n");
++
++	return GRUB_EFI_SUCCESS;
++}
++
++/**
++ * lo12i_get() - get the immediate value of a format I instruction
++ *
++ * Instruction format I::
++ *
++ *     +---------------------------------------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0 f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +-----------------------+---------+-----+---------+-------------+
++ *     |       imm[11:0]       |   rs1   |fun3 |   rd    |   opcode    |
++ *     +-----------------------+---------+-----+---------+-------------+
++ *
++ * @instr:	pointer to instruction
++ * Return:	immediate value
++ */
++static grub_uint16_t
++lo12i_get(grub_uint32_t *instr)
++{
++	return ((*instr & 0xfff00000) >> 20);
++}
++
++/**
++ * lo12i_set() - set the immediate value of a format I instruction
++ *
++ * Instruction format I::
++ *
++ *     +---------------------------------------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0 f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +-----------------------+---------+-----+---------+-------------+
++ *     |       imm[11:0]       |   rs1   |fun3 |   rd    |   opcode    |
++ *     +-----------------------+---------+-----+---------+-------------+
++ *
++ * @instr:	pointer to instruction
++ * @imm:	immediate value
++ */
++static void
++lo12i_set(grub_uint32_t *instr, grub_uint32_t imm)
++{
++	*instr = (*instr & 0x000fffff) |
++		 (imm & 0x00000fff << 20);
++}
++
++/**
++ * hi20_get() - get the immediate value of a format I instruction
++ *
++ * Instruction format U::
++ *
++ *     +---------------------------------------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0 f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +---------------------------------------+---------+-------------+
++ *     |                imm[31:12]             |   rd    |   opcode    |
++ *     +---------------------------------------+---------+-------------+
++ *
++ * @instr:	pointer to instruction
++ * Return:	immediate value
++ */
++static grub_uint16_t
++hi20_get(grub_uint32_t *instr)
++{
++	return *instr & 0xfffff000;
++}
++
++/**
++ * hi20_set() - set the immediate value of a format I instruction
++ *
++ * Instruction format U::
++ *
++ *     +---------------------------------------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0 f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +---------------------------------------+---------+-------------+
++ *     |                imm[31:12]             |   rd    |   opcode    |
++ *     +---------------------------------------+---------+-------------+
++ *
++ * @instr:	pointer to instruction
++ * @imm:	immediate value
++ */
++static void
++hi20_set(grub_uint32_t *instr, grub_uint32_t imm)
++{
++	*instr = (*instr & 0x00000fff) |
++		 (imm & 0xfffff000);
++}
++
++/**
++ * lo12s_get() - get the immediate value of a format I instruction
++ *
++ * Instruction format S::
++ *
++ *     +---------------------------------------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0 f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +-------------+---------+---------+-----+----+----+-------------+
++ *     |  imm[11:5]  |   rs2   |   rs1   |fun3 |imm[4:0] |   opcode    |
++ *     +-------------+---------+---------+-----+----+----+-------------+
++ *
++ * @instr:	pointer to instruction
++ * Return:	immediate value
++ */
++static grub_uint16_t
++lo12s_get(grub_uint32_t *instr)
++{
++	return ((*instr & 0x00000f80) >> 7) |
++	       ((*instr & 0xfe000000) >> 20);
++}
++
++/**
++ * lo12s_set() - set the immediate value of a format I instruction
++ *
++ * Instruction format S::
++ *
++ *     +---------------------------------------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0 f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +-------------+---------+---------+-----+----+----+-------------+
++ *     |  imm[11:5]  |   rs2   |   rs1   |fun3 |imm[4:0] |   opcode    |
++ *     +-------------+---------+---------+-----+----+----+-------------+
++ *
++ * @instr:	pointer to instruction
++ * @imm:	immediate value
++ */
++static void
++lo12s_set(grub_uint32_t *instr, grub_uint32_t imm)
++{
++	*instr = (*instr & 0x01fff07f) |
++		 (imm & 0x00000fe0 << 20) |
++		 (imm & 0x0000001f << 7);
++}
++
++/**
++ * movw_get_imm() - get the immediate value of MOVT and MOVT instructions
++ *
++ * MOVT::
++ *
++ *     +-------------------------------+-------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0|f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +---------+-+-----------+-------+-+-----+-------+---------------+
++ *     |1 1 1 1 0|i|1 0 1 1 0 0| imm4  |0| imm3|   Rd  |     imm8      |
++ *     +---------+-+-----------+-------+-+-----+-------+---------------+
++ *
++ * MOVW::
++ *
++ *     +-------------------------------+-------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0|f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +---------+-+-----------+-------+-+-----+-------+---------------+
++ *     |1 1 1 1 0|i|1 0 0 1 0 0| imm4  |0| imm3|   Rd  |     imm8      |
++ *     +---------+-+-----------+-------+-+-----+-------+---------------+
++ *
++ * @instr:	pointer to instruction
++ * Return:	immediate value
++ */
++static grub_uint16_t
++movw_get_imm(grub_uint16_t *instr)
++{
++	/* imm16 = imm4:i:imm3:imm8; */
++	return (instr[1] & 0x00ff) |
++	       ((instr[1] & 0x7000) >> 3) |
++	       ((instr[0] & 0x0400) >> 8) |
++	       ((instr[0] & 0x000f) << 12);
++}
++
++/**
++ * movw_set_imm() - set the immediate value of MOVT and MOVT instructions
++ *
++ * MOVT::
++ *
++ *     +-------------------------------+-------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0|f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +---------+-+-----------+-------+-+-----+-------+---------------+
++ *     |1 1 1 1 0|i|1 0 1 1 0 0| imm4  |0| imm3|   Rd  |     imm8      |
++ *     +---------+-+-----------+-------+-+-----+-------+---------------+
++ *
++ * MOVW::
++ *
++ *     +-------------------------------+-------------------------------+
++ *     |f e d c b a 9 8 7 6 5 4 3 2 1 0|f e d c b a 9 8 7 6 5 4 3 2 1 0|
++ *     +---------+-+-----------+-------+-+-----+-------+---------------+
++ *     |1 1 1 1 0|i|1 0 0 1 0 0| imm4  |0| imm3|   Rd  |     imm8      |
++ *     +---------+-+-----------+-------+-+-----+-------+---------------+
++ *
++ * @instr:	pointer to instruction
++ * @imm		immediate value
++ */
++static void
++movw_set_imm(grub_uint16_t *instr, grub_uint16_t imm)
++{
++	/* imm16 = imm4:i:imm3:imm8; */
++	instr[0] = (instr[0] & 0xfbf0) |
++		   (imm & 0xf000) >> 12 |
++		   (imm & 0x0800) << 3;
++	instr[1] = (instr[0] & 0x8f00) |
++		   (imm & 0xff) |
++		   (imm & 0x0700) >> 4;
++}
++
++/**
++ * relocate() - apply relocations to the image
++ *
++ * @info:	information about the loaded image
++ */
++static grub_efi_status_t
++relocate(struct image_info *info)
++{
++	struct grub_pe32_fixup_block *block, *reloc_end;
++	unsigned long offset;
++	grub_uint16_t reloc_type;
++	grub_uint16_t *reloc_entry;
++	grub_uint32_t *rvhi20_addr = NULL;
++
++	if (!info->reloc || !(info->reloc->size)) {
++		grub_dprintf("linux", "no relocations\n");
++		return GRUB_EFI_SUCCESS;
++	}
++
++	if (info->reloc->rva + info->reloc->size > info->image_size) {
++		grub_error(GRUB_ERR_BAD_OS, "relocation block outside image");
++		return GRUB_EFI_LOAD_ERROR;
++	}
++
++	/*
++	 * The relocations are based on the difference between
++	 * actual load address and the preferred base address.
++	 */
++	offset = (unsigned long)info->image_addr - info->image_base;
++
++	block = (void *)((unsigned long)info->image_addr + info->reloc->rva);
++	reloc_end = (void *)((unsigned long)block + info->reloc->size);
++
++	for (; block < reloc_end;
++	     block = (void *)((unsigned long)block + block->block_size)) {
++		reloc_entry = block->entries;
++		grub_uint16_t *block_end =
++			(void *)((unsigned long)block + block->block_size);
++
++		for (; reloc_entry < block_end; ++reloc_entry) {
++			void *addr = (void *)((unsigned long)info->image_addr +
++					      block->page_rva +
++					      (*reloc_entry & 0xfff));
++
++			reloc_type = *reloc_entry >> 12;
++
++			switch (reloc_type) {
++			case GRUB_PE32_REL_BASED_ABSOLUTE:
++				/* skip */
++				break;
++			case GRUB_PE32_REL_BASED_HIGH:
++				*(grub_uint16_t *)addr += offset >> 16;
++				break;
++			case GRUB_PE32_REL_BASED_LOW:
++				*(grub_uint16_t *)addr += offset;
++				break;
++			case GRUB_PE32_REL_BASED_HIGHLOW:
++				*(grub_uint32_t *)addr += offset;
++				break;
++			case GRUB_PE32_REL_BASED_RISCV_HI20:
++				switch (info->machine) {
++				case GRUB_PE32_MACHINE_RISCV32:
++				case GRUB_PE32_MACHINE_RISCV64:
++					rvhi20_addr = addr;
++					break;
++				default:
++					goto bad_reloc;
++				}
++				break;
++			case GRUB_PE32_REL_BASED_ARM_MOV32T:
++			/* = GRUB_PE32_REL_BASED_RISCV_LOW12I */
++				switch (info->machine) {
++				case GRUB_PE32_MACHINE_ARMTHUMB_MIXED: {
++					grub_uint16_t *instr = addr;
++					grub_uint32_t val;
++
++					val = movw_get_imm(&instr[0]) +
++					      (movw_get_imm(&instr[2]) << 16) +
++					      offset;
++					movw_set_imm(&instr[0], val);
++					movw_set_imm(&instr[2], val >> 16);
++					break;
++				}
++				case GRUB_PE32_MACHINE_RISCV32:
++				case GRUB_PE32_MACHINE_RISCV64:
++					if (rvhi20_addr) {
++						grub_uint32_t val =
++							hi20_get(rvhi20_addr) +
++							lo12i_get(addr) +
++							offset;
++						hi20_set(rvhi20_addr, val);
++						lo12i_set(addr, val);
++						rvhi20_addr = NULL;
++					} else {
++						goto bad_reloc;
++					}
++					break;
++				default:
++					goto bad_reloc;
++				}
++				break;
++			case GRUB_PE32_REL_BASED_RISCV_LOW12S:
++				switch (info->machine) {
++				case GRUB_PE32_MACHINE_RISCV32:
++				case GRUB_PE32_MACHINE_RISCV64:
++					if (rvhi20_addr) {
++						grub_uint32_t val =
++							hi20_get(rvhi20_addr) +
++							lo12s_get(addr) +
++							offset;
++						hi20_set(rvhi20_addr, val);
++						lo12s_set(addr, val);
++						rvhi20_addr = NULL;
++					} else {
++						goto bad_reloc;
++					}
++					break;
++				default:
++					goto bad_reloc;
++				}
++				break;
++			case GRUB_PE32_REL_BASED_DIR64:
++				*(grub_uint64_t *)addr += offset;
++				break;
++			default:
++				goto bad_reloc;
++			}
++		}
++	}
++
++	grub_dprintf("linux", "image relocated\n");
++
++	return GRUB_EFI_SUCCESS;
++
++bad_reloc:
++	grub_error(GRUB_ERR_BAD_OS,
++		   "unsupported relocation type %d, rva 0x%08lx\n",
++		   *reloc_entry >> 12,
++		   (unsigned long)reloc_entry -
++		   (unsigned long)info->image_addr);
++	return GRUB_EFI_LOAD_ERROR;
++}
++
++/**
++ * efi_exit() - replacement for EFI_BOOT_SERVICES.Exit()
++ *
++ * This function is inserted into system table to trap invocations of
++ * EFI_BOOT_SERVICES.Exit(). If Exit() is called with our handle
++ * return to our start routine using a long jump.
++ *
++ * @image_handle:	handle of the application as passed on entry
++ * @exit_status:	the images exit code
++ * @exit_data_size:	size of @exit_data
++ * @exit_data:		null terminated string followed by optional data
++ */
++static grub_efi_status_t EFIAPI
++efi_exit(grub_efi_handle_t image_handle,
++	 grub_efi_status_t exit_status,
++	 grub_efi_uintn_t exit_data_size,
++	 grub_efi_char16_t *exit_data)
++{
++	grub_efi_system_table->boot_services->exit = started_image.exit;
++
++	if (!image_handle)
++		return GRUB_EFI_INVALID_PARAMETER;
++
++	if (image_handle != started_image.image_handle) {
++		grub_dprintf("linux", "delegating Exit()\n");
++		return efi_call_4(started_image.exit, image_handle,
++				  exit_status, exit_data_size,
++				  (grub_efi_char16_t *)exit_data);
++	}
++
++	started_image.exit_status = exit_status;
++
++	if (exit_status != GRUB_EFI_SUCCESS) {
++		grub_printf("Application failed, r = %d\n",
++			    (int)exit_status & 0x7fffffff);
++		if (exit_data_size && exit_data) {
++			grub_printf("exit message: ");
++			for (grub_efi_uintn_t pos = 0;
++			     exit_data[pos] && pos < exit_data_size / 2; ++pos)
++				grub_printf("%C", exit_data[pos]);
++			grub_printf("\n");
++		}
++	}
++	if (exit_data_size && exit_data) {
++		/* exit data must be freed by the caller */
++		efi_call_1(grub_efi_system_table->boot_services->free_pool,
++			   exit_data);
++	}
++	grub_longjmp(started_image.jmp, 1);
++}
++
++/**
++ * start_image() - our implementation of StartImage()
++ *
++ * As we do not load the image via LoadImage() we need our own implementation
++ * of StartImage() to launch the PE-COFF image.
++ */
++static grub_efi_status_t
++start_image(struct image_info *info)
++{
++	int ret;
++	grub_efi_status_t status;
++	grub_efi_loaded_image_t *loaded_image;
++
++	/*
++	 * TODO: It would better comply to the UEFI specification to
++	 *	 use a separate handle for the image we are running.
++	 */
++	started_image.image_handle = grub_efi_image_handle;
++
++	loaded_image = grub_efi_get_loaded_image(grub_efi_image_handle);
++	if (loaded_image) {
++		loaded_image->image_base = info->image_addr;
++		loaded_image->image_size = info->image_size;
++	} else {
++		grub_dprintf ("linux", "Loaded image protocol missing\n");
++	}
++
++	ret = grub_setjmp(started_image.jmp);
++	if (ret) {
++		started_image.image_handle = NULL;
++
++		return started_image.exit_status;
++	}
++
++	started_image.exit = grub_efi_system_table->boot_services->exit;
++	grub_efi_system_table->boot_services->exit = efi_exit;
++
++	grub_dprintf("linux",
++		     "Executing image loaded at 0x%lx\nEntry point 0x%lx\nSize 0x%08x\n",
++		     (unsigned long)info->image_addr,
++		     (unsigned long)info->entry_point,
++		     info->image_size);
++
++	/* Invalidate the instruction cache */
++	grub_arch_sync_caches(info->image_addr, info->image_size);
++
++	debug("pestart");
++	status = efi_call_2(info->entry_point, started_image.image_handle,
++			    grub_efi_system_table);
++
++	grub_dprintf("linux", "Application returned\n");
++
++	return efi_exit(started_image.image_handle, status, 0, NULL);
++}
++
++/**
++ * grub_efi_run_image() - run a PE-COFF image from memory
++ *
++ * TODO: move the creation of the load options here
++ *
++ * @data:	buffer with PE-COFF image
++ * @data_size:	size of the buffer
++ * @args:	command line to be passed as load options
++ */
++grub_efi_boolean_t
++grub_efi_run_image(void *data, grub_efi_uint32_t data_size,
++		   const char *args __attribute__((unused)))
++{
++	struct image_info info = {
++		.data = data,
++		.data_size = data_size,
++	};
++
++	/* read and check header */
++	if (check_pe_header(&info) != GRUB_EFI_SUCCESS)
++		goto err;
++	/* load sections */
++	if (load_sections(&info) != GRUB_EFI_SUCCESS)
++		goto err;
++
++	if (relocate(&info) != GRUB_EFI_SUCCESS)
++		goto err;
++
++	if (start_image(&info) != GRUB_EFI_SUCCESS)
++		goto err;
++
++err:
++	/* free allocated memory */
++	if (info.alloc_addr)
++		grub_efi_free_pages((unsigned long)info.alloc_addr,
++				    info.alloc_pages);
++
++	return 0;
++}
+diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
+index 0033d93..39f5a9a 100644
+--- a/include/grub/efi/linux.h
++++ b/include/grub/efi/linux.h
+@@ -27,5 +27,8 @@ EXPORT_FUNC(grub_linuxefi_secure_validate) (void *data, grub_uint32_t size);
+ grub_err_t
+ EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
+ 				  void *kernel_param);
++grub_efi_boolean_t
++EXPORT_FUNC(grub_efi_run_image) (void *data, grub_efi_uint32_t data_size,
++				 const char *args);
+ 
+ #endif /* ! GRUB_EFI_LINUX_HEADER */
+diff --git a/include/grub/efi/peimage.h b/include/grub/efi/peimage.h
+new file mode 100644
+index 0000000..70bfdc7
+--- /dev/null
++++ b/include/grub/efi/peimage.h
+@@ -0,0 +1,28 @@
++/* SPDX-License-Identifier: GPL-3.0+ */
++
++#define GRUB_PE_MAGIC "PE\0"
++
++#ifdef __x86_64__
++#define EFIAPI __attribute__((ms_abi))
++#else
++#define EFIAPI
++#endif
++
++#define EFI_LOADED_IMAGE_PROTOCOL_REVISION (0x1000)
++
++typedef grub_efi_status_t (*grub_efi_entry_point)
++	(grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
++
++struct grub_dos_stub {
++	grub_uint16_t magic;		/* MZ magic */
++	grub_uint16_t lbsize;		/* size of last block */
++	grub_uint32_t res0;		/* reserved */
++	grub_uint64_t res1;		/* reserved */
++	grub_uint64_t res2;		/* reserved */
++	grub_uint64_t res3;		/* reserved */
++	grub_uint64_t res4;		/* reserved */
++	grub_uint64_t res5;		/* reserved */
++	grub_uint64_t res6;		/* reserved */
++	grub_uint32_t linux_arch;	/* linux architecture */
++	grub_uint32_t pe_addr;		/* offset of PE/COFF header */
++};
diff --git a/debian/patches/efi-implemented-LoadFile2-initrd-loading-protocol-fo.patch b/debian/patches/efi-implemented-LoadFile2-initrd-loading-protocol-fo.patch
 new file mode 100644
index 0000000..be73410
--- /dev/null
+++ b/debian/patches/efi-implemented-LoadFile2-initrd-loading-protocol-fo.patch
@@ -0,0 +1,183 @@
+From: Ard Biesheuvel <[e-mail]>
+Date: Thu, 28 Oct 2021 23:31:16 +0300
+Subject: efi: implemented LoadFile2 initrd loading protocol for Linux
+
+Recent Linux kernels will invoke the LoadFile2 protocol installed on
+a well-known vendor media path to load the initrd if it is exposed by
+the firmware. Using this method is preferred for two reasons:
+- the Linux kernel is in charge of allocating the memory, and so it can
+  implement any placement policy it wants (given that these tend to
+  change between kernel versions),
+- it is no longer necessary to modify the device tree provided by the
+  firmware.
+
+So let's install this protocol when handling the 'initrd' command if
+such a recent kernel was detected (based on the PE/COFF image version),
+and defer loading the initrd contents until the point where the kernel
+invokes the LoadFile2 protocol.
+
+Signed-off-by: Ard Biesheuvel <[e-mail]>
+Signed-off-by: Nikita Ermakov <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2021-10/msg00214.html
+---
+ grub-core/loader/arm64/linux.c | 117 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 116 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index aed7a20..6b03455 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -48,9 +48,18 @@ static grub_uint32_t cmdline_size;
+ static grub_addr_t initrd_start;
+ static grub_addr_t initrd_end;
+ 
++static struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
++static grub_efi_handle_t initrd_lf2_handle;
++static int initrd_use_loadfile2;
++static grub_efi_guid_t load_file2_guid = GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID;
++static grub_efi_guid_t device_path_guid = GRUB_EFI_DEVICE_PATH_GUID;
++
+ grub_err_t
+ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
+ {
++  struct grub_pe32_coff_header *coff_header;
++  struct grub_pe32_optional_header *optional_header;
++
+   if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE)
+     return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
+ 
+@@ -61,6 +70,21 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
+   grub_dprintf ("linux", "UEFI stub kernel:\n");
+   grub_dprintf ("linux", "PE/COFF header @ %08x\n", lh->hdr_offset);
+ 
++  coff_header = (struct grub_pe32_coff_header *)((unsigned long)lh + lh->hdr_offset);
++  optional_header = (struct grub_pe32_optional_header *)(coff_header + 1);
++
++  /*
++   * Linux kernels built for any architecture are guaranteed to support the
++   * LoadFile2 based initrd loading protocol if the image version is >= 1.
++   */
++  if (optional_header->major_image_version >= 1)
++    initrd_use_loadfile2 = 1;
++   else
++    initrd_use_loadfile2 = 0;
++
++  grub_dprintf ("linux", "LoadFile2 initrd loading %sabled\n",
++		initrd_use_loadfile2 ? "en" : "dis");
++
+   return GRUB_ERR_NONE;
+ }
+ 
+@@ -230,13 +254,86 @@ allocate_initrd_mem (int initrd_pages)
+ 				       GRUB_EFI_LOADER_DATA);
+ }
+ 
++struct initrd_media_device_path {
++  grub_efi_vendor_media_device_path_t	vendor;
++  grub_efi_device_path_t		end;
++} GRUB_PACKED;
++
++#define LINUX_EFI_INITRD_MEDIA_GUID  \
++  { 0x5568e427, 0x68fc, 0x4f3d, \
++    { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
++  }
++
++static struct initrd_media_device_path initrd_lf2_device_path = {
++  {
++    {
++      GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,
++      GRUB_EFI_VENDOR_MEDIA_DEVICE_PATH_SUBTYPE,
++      sizeof(grub_efi_vendor_media_device_path_t),
++    },
++    LINUX_EFI_INITRD_MEDIA_GUID
++  }, {
++    GRUB_EFI_END_DEVICE_PATH_TYPE,
++    GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,
++    sizeof(grub_efi_device_path_t)
++  }
++};
++
++static grub_efi_status_t
++grub_efi_initrd_load_file2(grub_efi_load_file2_t *this,
++                           grub_efi_device_path_t *device_path,
++                           grub_efi_boolean_t boot_policy,
++                           grub_efi_uintn_t *buffer_size,
++                           void *buffer);
++
++static grub_efi_load_file2_t initrd_lf2 = {
++  grub_efi_initrd_load_file2
++};
++
++static grub_efi_status_t
++grub_efi_initrd_load_file2(grub_efi_load_file2_t *this,
++			   grub_efi_device_path_t *device_path,
++			   grub_efi_boolean_t boot_policy,
++			   grub_efi_uintn_t *buffer_size,
++			   void *buffer)
++{
++  grub_efi_status_t status = GRUB_EFI_SUCCESS;
++  grub_efi_uintn_t initrd_size;
++
++  if (!this || this != &initrd_lf2 || !buffer_size)
++    return GRUB_EFI_INVALID_PARAMETER;
++
++  if (device_path->type != GRUB_EFI_END_DEVICE_PATH_TYPE ||
++      device_path->subtype != GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE)
++    return GRUB_EFI_NOT_FOUND;
++
++  if (boot_policy)
++    return GRUB_EFI_UNSUPPORTED;
++
++  initrd_size = grub_get_initrd_size (&initrd_ctx);
++  if (!buffer || *buffer_size < initrd_size)
++    {
++      *buffer_size = initrd_size;
++      return GRUB_EFI_BUFFER_TOO_SMALL;
++    }
++
++  grub_dprintf ("linux", "Providing initrd via LOAD_FILE2_PROTOCOL\n");
++
++  if (grub_initrd_load (&initrd_ctx, buffer))
++    status = GRUB_EFI_LOAD_ERROR;
++
++  grub_initrd_close (&initrd_ctx);
++  return status;
++}
++
+ 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;
++  grub_efi_boot_services_t *b;
++  grub_efi_status_t status;
+ 
+   if (argc == 0)
+     {
+@@ -254,6 +351,24 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+   if (grub_initrd_init (argc, argv, &initrd_ctx))
+     goto fail;
+ 
++  if (initrd_use_loadfile2 && !initrd_lf2_handle)
++    {
++      b = grub_efi_system_table->boot_services;
++      status = b->install_multiple_protocol_interfaces (&initrd_lf2_handle,
++							&load_file2_guid,
++							&initrd_lf2,
++							&device_path_guid,
++							&initrd_lf2_device_path,
++							NULL);
++      if (status == GRUB_EFI_OUT_OF_RESOURCES)
++        {
++	  grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
++	  return grub_errno;
++	}
++      grub_dprintf ("linux", "LoadFile2 initrd loading protocol installed\n");
++      return GRUB_ERR_NONE;
++    }
++
+   initrd_size = grub_get_initrd_size (&initrd_ctx);
+   grub_dprintf ("linux", "Loading initrd\n");
+ 
diff --git a/debian/patches/efi-variable-storage-minimise-writes.patch b/debian/patches/efi-variable-storage-minimise-writes.patch
index 4d3d134..7609e21 100644
--- a/debian/patches/efi-variable-storage-minimise-writes.patch
+++ b/debian/patches/efi-variable-storage-minimise-writes.patch
@@ -179,7 +179,7 @@ index 27f9482..a3d134b 100644
  
  script = {
 diff --git a/configure.ac b/configure.ac
-index e11df6b..b3fb743 100644
+index b4e33a6..d422626 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -452,6 +452,18 @@ AC_CHECK_HEADER([util.h], [
diff --git a/debian/patches/efinet-set-dns-from-uefi-proto.patch b/debian/patches/efinet-set-dns-from-uefi-proto.patch
index 4588309..03da490 100644
--- a/debian/patches/efinet-set-dns-from-uefi-proto.patch
+++ b/debian/patches/efinet-set-dns-from-uefi-proto.patch
@@ -245,10 +245,10 @@ index 2d3b00f..82a28fb 100644
      }
  
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 4b4652c..9cab1a5 100644
+index d67c3f1..479c2a8 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -354,6 +354,16 @@
+@@ -359,6 +359,16 @@
      { 0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44 } \
    }
  
@@ -265,9 +265,9 @@ index 4b4652c..9cab1a5 100644
  struct grub_efi_sal_system_table
  {
    grub_uint32_t signature;
-@@ -1793,6 +1803,72 @@ struct grub_efi_rng_protocol
+@@ -1808,6 +1818,72 @@ struct grub_efi_load_file2
  };
- typedef struct grub_efi_rng_protocol grub_efi_rng_protocol_t;
+ typedef struct grub_efi_load_file2 grub_efi_load_file2_t;
  
 +enum grub_efi_ip4_config2_data_type {
 +  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_INTERFACEINFO,
diff --git a/debian/patches/efinet-set-network-from-uefi-devpath.patch b/debian/patches/efinet-set-network-from-uefi-devpath.patch
index af95c63..bd19f83 100644
--- a/debian/patches/efinet-set-network-from-uefi-devpath.patch
+++ b/debian/patches/efinet-set-network-from-uefi-devpath.patch
@@ -357,10 +357,10 @@ index fc90415..2d3b00f 100644
    }
  }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 50ab8e8..4b4652c 100644
+index 2c649cf..d67c3f1 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -849,6 +849,8 @@ struct grub_efi_ipv4_device_path
+@@ -854,6 +854,8 @@ struct grub_efi_ipv4_device_path
    grub_efi_uint16_t remote_port;
    grub_efi_uint16_t protocol;
    grub_efi_uint8_t static_ip_address;
@@ -369,7 +369,7 @@ index 50ab8e8..4b4652c 100644
  } GRUB_PACKED;
  typedef struct grub_efi_ipv4_device_path grub_efi_ipv4_device_path_t;
  
-@@ -903,6 +905,15 @@ struct grub_efi_sata_device_path
+@@ -908,6 +910,15 @@ struct grub_efi_sata_device_path
  } GRUB_PACKED;
  typedef struct grub_efi_sata_device_path grub_efi_sata_device_path_t;
  
diff --git a/debian/patches/efinet-uefi-ipv6-pxe-support.patch b/debian/patches/efinet-uefi-ipv6-pxe-support.patch
index 13f69ed..d256127 100644
--- a/debian/patches/efinet-uefi-ipv6-pxe-support.patch
+++ b/debian/patches/efinet-uefi-ipv6-pxe-support.patch
@@ -51,10 +51,10 @@ index 5388f95..fc90415 100644
    }
  }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index f1a5221..50ab8e8 100644
+index 3de0a7d..2c649cf 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -1476,14 +1476,67 @@ typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output
+@@ -1481,14 +1481,67 @@ typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output
  
  typedef grub_uint8_t grub_efi_pxe_packet_t[1472];
  
diff --git a/debian/patches/fat-fix-listing-the-root-directory.patch b/debian/patches/fat-fix-listing-the-root-directory.patch
 new file mode 100644
index 0000000..335ec4c
--- /dev/null
+++ b/debian/patches/fat-fix-listing-the-root-directory.patch
@@ -0,0 +1,46 @@
+From: Heinrich Schuchardt <[e-mail]>
+Date: Fri, 21 Jan 2022 20:15:41 +0100
+Subject: fat: fix listing the root directory
+
+ls / for a FAT partition leads to
+
+   error: invalid modification timestamp for /.
+
+Not all entries of the directory are displayed.
+
+Linux never updates the modification timestamp of the /. directory entry.
+The FAT specification allows the access and creation date fields to be
+zero.
+
+We should follow Linux and render initial FAT timestamps as start of
+the epoch.
+
+Signed-off-by: Heinrich Schuchardt <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2022-01/msg00116.html
+---
+ grub-core/fs/fat.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c
+index dd82e4e..35ff0b2 100644
+--- a/grub-core/fs/fat.c
++++ b/grub-core/fs/fat.c
+@@ -901,6 +901,18 @@ grub_fat_timestamp (grub_uint16_t time, grub_uint16_t date, grub_int64_t *nix) {
+     .second = (time & 0x001F) * 2,
+   };
+ 
++  /*
++   * The modification time of the root directory is never set by Linux.
++   * Creation and access time are optional and can be zero.
++   * Follow Linux and render FAT initial timestamps as the start of the epoch.
++   */
++  if (date == 0 && time == 0)
++    {
++      datetime.year = 1970;
++      datetime.month = 1;
++      datetime.day = 1;
++    }
++
+   /* The conversion below allows seconds=60, so don't trust its validation. */
+   if ((time & 0x1F) > 29)
+     return 0;
diff --git a/debian/patches/gfxpayload-dynamic.patch b/debian/patches/gfxpayload-dynamic.patch
index 0148257..e59cb02 100644
--- a/debian/patches/gfxpayload-dynamic.patch
+++ b/debian/patches/gfxpayload-dynamic.patch
@@ -21,10 +21,10 @@ Patch-Name: gfxpayload-dynamic.patch
  create mode 100644 grub-core/commands/i386/pc/hwmatch.c
 
 diff --git a/configure.ac b/configure.ac
-index c42e4c7..947fd52 100644
+index 4882eba..3203749 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1937,6 +1937,17 @@ else
+@@ -1945,6 +1945,17 @@ else
  fi
  AC_SUBST([QUICK_BOOT])
  
@@ -43,7 +43,7 @@ index c42e4c7..947fd52 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 715d137..10f839b 100644
+index 1a3ead6..0d7bce1 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -964,6 +964,14 @@ module = {
diff --git a/debian/patches/linux-ignore-FDT-unless-we-need-to-modify-it.patch b/debian/patches/linux-ignore-FDT-unless-we-need-to-modify-it.patch
 new file mode 100644
index 0000000..a37aea4
--- /dev/null
+++ b/debian/patches/linux-ignore-FDT-unless-we-need-to-modify-it.patch
@@ -0,0 +1,80 @@
+From: Ard Biesheuvel <[e-mail]>
+Date: Thu, 28 Oct 2021 23:31:17 +0300
+Subject: linux: ignore FDT unless we need to modify it
+
+Now that we implemented supported for the LoadFile2 protocol for initrd
+loading, there is no longer a need to pass the initrd parameters via
+the device tree. This means there is no longer a reason to update the
+device tree in the first place, and so we can ignore it entirely.
+
+The only remaining reason to deal with the devicetree is if we are
+using the 'devicetree' command to load one from disk, so tweak the
+logic in grub_fdt_install() to take that into account.
+
+Signed-off-by: Ard Biesheuvel <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2021-10/msg00216.html
+---
+ grub-core/loader/arm64/linux.c | 22 +++++++++++-----------
+ grub-core/loader/efi/fdt.c     |  7 +++++--
+ 2 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index 6b03455..65f1275 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -95,21 +95,21 @@ finalize_params_linux (void)
+ 
+   void *fdt;
+ 
+-  fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE);
++  /* Set initrd info */
++  if (initrd_start && initrd_end > initrd_start)
++    {
++      fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE);
+ 
+-  if (!fdt)
+-    goto failure;
++      if (!fdt)
++	goto failure;
+ 
+-  node = grub_fdt_find_subnode (fdt, 0, "chosen");
+-  if (node < 0)
+-    node = grub_fdt_add_subnode (fdt, 0, "chosen");
++      node = grub_fdt_find_subnode (fdt, 0, "chosen");
++      if (node < 0)
++	node = grub_fdt_add_subnode (fdt, 0, "chosen");
+ 
+-  if (node < 1)
+-    goto failure;
++      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);
+ 
+diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
+index c86f283..771d455 100644
+--- a/grub-core/loader/efi/fdt.c
++++ b/grub-core/loader/efi/fdt.c
+@@ -89,13 +89,16 @@ grub_fdt_install (void)
+   grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID;
+   grub_efi_status_t status;
+ 
++  if (!fdt && !loaded_fdt)
++    return GRUB_ERR_NONE;
++
+   b = grub_efi_system_table->boot_services;
+-  status = b->install_configuration_table (&fdt_guid, fdt);
++  status = b->install_configuration_table (&fdt_guid, fdt ?: loaded_fdt);
+   if (status != GRUB_EFI_SUCCESS)
+     return grub_error (GRUB_ERR_IO, "failed to install FDT");
+ 
+   grub_dprintf ("fdt", "Installed/updated FDT configuration table @ %p\n",
+-		fdt);
++		fdt ?: loaded_fdt);
+   return GRUB_ERR_NONE;
+ }
+ 
diff --git a/debian/patches/loader-Move-arm64-linux-loader-to-common-code.patch b/debian/patches/loader-Move-arm64-linux-loader-to-common-code.patch
 new file mode 100644
index 0000000..0cf0470
--- /dev/null
+++ b/debian/patches/loader-Move-arm64-linux-loader-to-common-code.patch
@@ -0,0 +1,1091 @@
+From: Atish Patra <[e-mail]>
+Date: Thu, 28 Oct 2021 23:31:18 +0300
+Subject: loader: Move arm64 linux loader to common code
+
+ARM64 linux loader code is written in such a way that it can be reused
+across different architectures without much change. Move it to common
+code so that RISC-V doesn't have to define a separate loader.
+
+Signed-off-by: Atish Patra <[e-mail]>
+Reviewed-by: Daniel Kiper <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2021-10/msg00215.html
+---
+ grub-core/Makefile.core.def    |   4 +-
+ grub-core/loader/arm64/linux.c | 508 -----------------------------------------
+ grub-core/loader/efi/linux.c   | 508 +++++++++++++++++++++++++++++++++++++++++
+ include/grub/arm/linux.h       |   2 +-
+ include/grub/arm64/linux.h     |   2 +-
+ 5 files changed, 512 insertions(+), 512 deletions(-)
+ delete mode 100644 grub-core/loader/arm64/linux.c
+ create mode 100644 grub-core/loader/efi/linux.c
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 8022e1c..b36cf66 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -1806,9 +1806,9 @@ module = {
+   sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
+   ia64_efi = loader/ia64/efi/linux.c;
+   arm_coreboot = loader/arm/linux.c;
+-  arm_efi = loader/arm64/linux.c;
++  arm_efi = loader/efi/linux.c;
+   arm_uboot = loader/arm/linux.c;
+-  arm64 = loader/arm64/linux.c;
++  arm64 = loader/efi/linux.c;
+   riscv32 = loader/riscv/linux.c;
+   riscv64 = loader/riscv/linux.c;
+   common = loader/linux.c;
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+deleted file mode 100644
+index 65f1275..0000000
+--- a/grub-core/loader/arm64/linux.c
++++ /dev/null
+@@ -1,508 +0,0 @@
+-/*
+- *  GRUB  --  GRand Unified Bootloader
+- *  Copyright (C) 2013  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>
+-#include <grub/verify.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;
+-
+-static struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
+-static grub_efi_handle_t initrd_lf2_handle;
+-static int initrd_use_loadfile2;
+-static grub_efi_guid_t load_file2_guid = GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID;
+-static grub_efi_guid_t device_path_guid = GRUB_EFI_DEVICE_PATH_GUID;
+-
+-grub_err_t
+-grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
+-{
+-  struct grub_pe32_coff_header *coff_header;
+-  struct grub_pe32_optional_header *optional_header;
+-
+-  if (lh->magic != GRUB_LINUX_ARMXX_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);
+-
+-  coff_header = (struct grub_pe32_coff_header *)((unsigned long)lh + lh->hdr_offset);
+-  optional_header = (struct grub_pe32_optional_header *)(coff_header + 1);
+-
+-  /*
+-   * Linux kernels built for any architecture are guaranteed to support the
+-   * LoadFile2 based initrd loading protocol if the image version is >= 1.
+-   */
+-  if (optional_header->major_image_version >= 1)
+-    initrd_use_loadfile2 = 1;
+-   else
+-    initrd_use_loadfile2 = 0;
+-
+-  grub_dprintf ("linux", "LoadFile2 initrd loading %sabled\n",
+-		initrd_use_loadfile2 ? "en" : "dis");
+-
+-  return GRUB_ERR_NONE;
+-}
+-
+-static grub_err_t
+-finalize_params_linux (void)
+-{
+-  int node, retval;
+-
+-  void *fdt;
+-
+-  /* Set initrd info */
+-  if (initrd_start && initrd_end > initrd_start)
+-    {
+-      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;
+-
+-      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_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;
+-}
+-
+-/*
+- * As per linux/Documentation/arm/Booting
+- * ARM initrd needs to be covered by kernel linear mapping,
+- * so place it in the first 512MB of DRAM.
+- *
+- * As per linux/Documentation/arm64/booting.txt
+- * ARM64 initrd needs to be contained entirely within a 1GB aligned window
+- * of up to 32GB of size that covers the kernel image as well.
+- * Since the EFI stub loader will attempt to load the kernel near start of
+- * RAM, place the buffer in the first 32GB of RAM.
+- */
+-#ifdef __arm__
+-#define INITRD_MAX_ADDRESS_OFFSET (512U * 1024 * 1024)
+-#else /* __aarch64__ */
+-#define INITRD_MAX_ADDRESS_OFFSET (32ULL * 1024 * 1024 * 1024)
+-#endif
+-
+-/*
+- * 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);
+-}
+-
+-struct initrd_media_device_path {
+-  grub_efi_vendor_media_device_path_t	vendor;
+-  grub_efi_device_path_t		end;
+-} GRUB_PACKED;
+-
+-#define LINUX_EFI_INITRD_MEDIA_GUID  \
+-  { 0x5568e427, 0x68fc, 0x4f3d, \
+-    { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
+-  }
+-
+-static struct initrd_media_device_path initrd_lf2_device_path = {
+-  {
+-    {
+-      GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,
+-      GRUB_EFI_VENDOR_MEDIA_DEVICE_PATH_SUBTYPE,
+-      sizeof(grub_efi_vendor_media_device_path_t),
+-    },
+-    LINUX_EFI_INITRD_MEDIA_GUID
+-  }, {
+-    GRUB_EFI_END_DEVICE_PATH_TYPE,
+-    GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,
+-    sizeof(grub_efi_device_path_t)
+-  }
+-};
+-
+-static grub_efi_status_t
+-grub_efi_initrd_load_file2(grub_efi_load_file2_t *this,
+-                           grub_efi_device_path_t *device_path,
+-                           grub_efi_boolean_t boot_policy,
+-                           grub_efi_uintn_t *buffer_size,
+-                           void *buffer);
+-
+-static grub_efi_load_file2_t initrd_lf2 = {
+-  grub_efi_initrd_load_file2
+-};
+-
+-static grub_efi_status_t
+-grub_efi_initrd_load_file2(grub_efi_load_file2_t *this,
+-			   grub_efi_device_path_t *device_path,
+-			   grub_efi_boolean_t boot_policy,
+-			   grub_efi_uintn_t *buffer_size,
+-			   void *buffer)
+-{
+-  grub_efi_status_t status = GRUB_EFI_SUCCESS;
+-  grub_efi_uintn_t initrd_size;
+-
+-  if (!this || this != &initrd_lf2 || !buffer_size)
+-    return GRUB_EFI_INVALID_PARAMETER;
+-
+-  if (device_path->type != GRUB_EFI_END_DEVICE_PATH_TYPE ||
+-      device_path->subtype != GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE)
+-    return GRUB_EFI_NOT_FOUND;
+-
+-  if (boot_policy)
+-    return GRUB_EFI_UNSUPPORTED;
+-
+-  initrd_size = grub_get_initrd_size (&initrd_ctx);
+-  if (!buffer || *buffer_size < initrd_size)
+-    {
+-      *buffer_size = initrd_size;
+-      return GRUB_EFI_BUFFER_TOO_SMALL;
+-    }
+-
+-  grub_dprintf ("linux", "Providing initrd via LOAD_FILE2_PROTOCOL\n");
+-
+-  if (grub_initrd_load (&initrd_ctx, buffer))
+-    status = GRUB_EFI_LOAD_ERROR;
+-
+-  grub_initrd_close (&initrd_ctx);
+-  return status;
+-}
+-
+-static grub_err_t
+-grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+-		 int argc, char *argv[])
+-{
+-  int initrd_size, initrd_pages;
+-  void *initrd_mem = NULL;
+-  grub_efi_boot_services_t *b;
+-  grub_efi_status_t status;
+-
+-  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;
+-
+-  if (initrd_use_loadfile2 && !initrd_lf2_handle)
+-    {
+-      b = grub_efi_system_table->boot_services;
+-      status = b->install_multiple_protocol_interfaces (&initrd_lf2_handle,
+-							&load_file2_guid,
+-							&initrd_lf2,
+-							&device_path_guid,
+-							&initrd_lf2_device_path,
+-							NULL);
+-      if (status == GRUB_EFI_OUT_OF_RESOURCES)
+-        {
+-	  grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
+-	  return grub_errno;
+-	}
+-      grub_dprintf ("linux", "LoadFile2 initrd loading protocol installed\n");
+-      return GRUB_ERR_NONE;
+-    }
+-
+-  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, 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-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+new file mode 100644
+index 0000000..3292cab
+--- /dev/null
++++ b/grub-core/loader/efi/linux.c
+@@ -0,0 +1,508 @@
++/*
++ *  GRUB  --  GRand Unified Bootloader
++ *  Copyright (C) 2013  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>
++#include <grub/verify.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;
++
++static struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
++static grub_efi_handle_t initrd_lf2_handle;
++static int initrd_use_loadfile2;
++static grub_efi_guid_t load_file2_guid = GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID;
++static grub_efi_guid_t device_path_guid = GRUB_EFI_DEVICE_PATH_GUID;
++
++grub_err_t
++grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
++{
++  struct grub_pe32_coff_header *coff_header;
++  struct grub_pe32_optional_header *optional_header;
++
++  if (lh->magic != GRUB_LINUX_ARCH_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);
++
++  coff_header = (struct grub_pe32_coff_header *)((unsigned long)lh + lh->hdr_offset);
++  optional_header = (struct grub_pe32_optional_header *)(coff_header + 1);
++
++  /*
++   * Linux kernels built for any architecture are guaranteed to support the
++   * LoadFile2 based initrd loading protocol if the image version is >= 1.
++   */
++  if (optional_header->major_image_version >= 1)
++    initrd_use_loadfile2 = 1;
++   else
++    initrd_use_loadfile2 = 0;
++
++  grub_dprintf ("linux", "LoadFile2 initrd loading %sabled\n",
++		initrd_use_loadfile2 ? "en" : "dis");
++
++  return GRUB_ERR_NONE;
++}
++
++static grub_err_t
++finalize_params_linux (void)
++{
++  int node, retval;
++
++  void *fdt = NULL;
++
++  /* Set initrd info */
++  if (initrd_start && initrd_end > initrd_start)
++    {
++      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;
++
++      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_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;
++}
++
++/*
++ * As per linux/Documentation/arm/Booting
++ * ARM initrd needs to be covered by kernel linear mapping,
++ * so place it in the first 512MB of DRAM.
++ *
++ * As per linux/Documentation/arm64/booting.txt
++ * ARM64 initrd needs to be contained entirely within a 1GB aligned window
++ * of up to 32GB of size that covers the kernel image as well.
++ * Since the EFI stub loader will attempt to load the kernel near start of
++ * RAM, place the buffer in the first 32GB of RAM.
++ */
++#ifdef __arm__
++#define INITRD_MAX_ADDRESS_OFFSET (512U * 1024 * 1024)
++#else /* __aarch64__ */
++#define INITRD_MAX_ADDRESS_OFFSET (32ULL * 1024 * 1024 * 1024)
++#endif
++
++/*
++ * 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);
++}
++
++struct initrd_media_device_path {
++  grub_efi_vendor_media_device_path_t	vendor;
++  grub_efi_device_path_t		end;
++} GRUB_PACKED;
++
++#define LINUX_EFI_INITRD_MEDIA_GUID  \
++  { 0x5568e427, 0x68fc, 0x4f3d, \
++    { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
++  }
++
++static struct initrd_media_device_path initrd_lf2_device_path = {
++  {
++    {
++      GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,
++      GRUB_EFI_VENDOR_MEDIA_DEVICE_PATH_SUBTYPE,
++      sizeof(grub_efi_vendor_media_device_path_t),
++    },
++    LINUX_EFI_INITRD_MEDIA_GUID
++  }, {
++    GRUB_EFI_END_DEVICE_PATH_TYPE,
++    GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,
++    sizeof(grub_efi_device_path_t)
++  }
++};
++
++static grub_efi_status_t
++grub_efi_initrd_load_file2(grub_efi_load_file2_t *this,
++                           grub_efi_device_path_t *device_path,
++                           grub_efi_boolean_t boot_policy,
++                           grub_efi_uintn_t *buffer_size,
++                           void *buffer);
++
++static grub_efi_load_file2_t initrd_lf2 = {
++  grub_efi_initrd_load_file2
++};
++
++static grub_efi_status_t
++grub_efi_initrd_load_file2(grub_efi_load_file2_t *this,
++			   grub_efi_device_path_t *device_path,
++			   grub_efi_boolean_t boot_policy,
++			   grub_efi_uintn_t *buffer_size,
++			   void *buffer)
++{
++  grub_efi_status_t status = GRUB_EFI_SUCCESS;
++  grub_efi_uintn_t initrd_size;
++
++  if (!this || this != &initrd_lf2 || !buffer_size)
++    return GRUB_EFI_INVALID_PARAMETER;
++
++  if (device_path->type != GRUB_EFI_END_DEVICE_PATH_TYPE ||
++      device_path->subtype != GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE)
++    return GRUB_EFI_NOT_FOUND;
++
++  if (boot_policy)
++    return GRUB_EFI_UNSUPPORTED;
++
++  initrd_size = grub_get_initrd_size (&initrd_ctx);
++  if (!buffer || *buffer_size < initrd_size)
++    {
++      *buffer_size = initrd_size;
++      return GRUB_EFI_BUFFER_TOO_SMALL;
++    }
++
++  grub_dprintf ("linux", "Providing initrd via LOAD_FILE2_PROTOCOL\n");
++
++  if (grub_initrd_load (&initrd_ctx, buffer))
++    status = GRUB_EFI_LOAD_ERROR;
++
++  grub_initrd_close (&initrd_ctx);
++  return status;
++}
++
++static grub_err_t
++grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
++		 int argc, char *argv[])
++{
++  int initrd_size, initrd_pages;
++  void *initrd_mem = NULL;
++  grub_efi_boot_services_t *b;
++  grub_efi_status_t status;
++
++  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;
++
++  if (initrd_use_loadfile2 && !initrd_lf2_handle)
++    {
++      b = grub_efi_system_table->boot_services;
++      status = b->install_multiple_protocol_interfaces (&initrd_lf2_handle,
++							&load_file2_guid,
++							&initrd_lf2,
++							&device_path_guid,
++							&initrd_lf2_device_path,
++							NULL);
++      if (status == GRUB_EFI_OUT_OF_RESOURCES)
++        {
++	  grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
++	  return grub_errno;
++	}
++      grub_dprintf ("linux", "LoadFile2 initrd loading protocol installed\n");
++      return GRUB_ERR_NONE;
++    }
++
++  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, 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/include/grub/arm/linux.h b/include/grub/arm/linux.h
+index bcd5a7e..8c13978 100644
+--- a/include/grub/arm/linux.h
++++ b/include/grub/arm/linux.h
+@@ -35,7 +35,7 @@ struct linux_arm_kernel_header {
+ };
+ 
+ #if defined(__arm__)
+-# define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
++# define GRUB_LINUX_ARCH_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
+ # define linux_arch_kernel_header linux_arm_kernel_header
+ #endif
+ 
+diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
+index 7e22b4a..effd870 100644
+--- a/include/grub/arm64/linux.h
++++ b/include/grub/arm64/linux.h
+@@ -39,7 +39,7 @@ struct linux_arm64_kernel_header
+ };
+ 
+ #if defined(__aarch64__)
+-# define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
++# define GRUB_LINUX_ARCH_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
+ # define linux_arch_kernel_header linux_arm64_kernel_header
+ #endif
+ 
diff --git a/debian/patches/loader-drop-argv-argument-in-grub_initrd_load.patch b/debian/patches/loader-drop-argv-argument-in-grub_initrd_load.patch
 new file mode 100644
index 0000000..a5af0f5
--- /dev/null
+++ b/debian/patches/loader-drop-argv-argument-in-grub_initrd_load.patch
@@ -0,0 +1,178 @@
+From: Nikita Ermakov <[e-mail]>
+Date: Thu, 28 Oct 2021 23:31:13 +0300
+Subject: loader: drop argv[] argument in grub_initrd_load()
+
+In the case of an error grub_initrd_load() uses argv[] to print the
+filename that caused the error. It is also possible to obtain the
+filename from the file handles and there is no need to duplicate that
+information in argv[], so let's drop it.
+
+Signed-off-by: Nikita Ermakov <[e-mail]>
+Reviewed-by: Daniel Kiper <[e-mail]>
+
+Last-Update: 2022-01-03
+Origin: https://lists.gnu.org/archive/html/grub-devel/2021-10/msg00212.html
+---
+ grub-core/loader/arm/linux.c              | 2 +-
+ grub-core/loader/arm64/linux.c            | 2 +-
+ grub-core/loader/i386/linux.c             | 2 +-
+ grub-core/loader/i386/pc/linux.c          | 2 +-
+ grub-core/loader/i386/xen.c               | 3 +--
+ grub-core/loader/ia64/efi/linux.c         | 2 +-
+ grub-core/loader/linux.c                  | 4 ++--
+ grub-core/loader/mips/linux.c             | 2 +-
+ grub-core/loader/powerpc/ieee1275/linux.c | 2 +-
+ grub-core/loader/sparc64/ieee1275/linux.c | 2 +-
+ include/grub/linux.h                      | 2 +-
+ 11 files changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
+index ed23dc7..1f7ab75 100644
+--- a/grub-core/loader/arm/linux.c
++++ b/grub-core/loader/arm/linux.c
+@@ -422,7 +422,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+   grub_dprintf ("loader", "Loading initrd to 0x%08x\n",
+ 		(grub_addr_t) initrd_start);
+ 
+-  if (grub_initrd_load (&initrd_ctx, argv, (void *) initrd_start))
++  if (grub_initrd_load (&initrd_ctx, (void *) initrd_start))
+     goto fail;
+ 
+   initrd_end = initrd_start + size;
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index ef3e9f9..aed7a20 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -266,7 +266,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+       goto fail;
+     }
+ 
+-  if (grub_initrd_load (&initrd_ctx, argv, initrd_mem))
++  if (grub_initrd_load (&initrd_ctx, initrd_mem))
+     goto fail;
+ 
+   initrd_start = (grub_addr_t) initrd_mem;
+diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
+index 9f74a96..f30a158 100644
+--- a/grub-core/loader/i386/linux.c
++++ b/grub-core/loader/i386/linux.c
+@@ -1107,7 +1107,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+     initrd_mem_target = get_physical_target_address (ch);
+   }
+ 
+-  if (grub_initrd_load (&initrd_ctx, argv, initrd_mem))
++  if (grub_initrd_load (&initrd_ctx, initrd_mem))
+     goto fail;
+ 
+   grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
+diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
+index 2a29952..efeeeb2 100644
+--- a/grub-core/loader/i386/pc/linux.c
++++ b/grub-core/loader/i386/pc/linux.c
+@@ -462,7 +462,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+     initrd_addr = get_physical_target_address (ch);
+   }
+ 
+-  if (grub_initrd_load (&initrd_ctx, argv, initrd_chunk))
++  if (grub_initrd_load (&initrd_ctx, initrd_chunk))
+     goto fail;
+ 
+   lh->ramdisk_image = initrd_addr;
+diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
+index cd24874..3b856e8 100644
+--- a/grub-core/loader/i386/xen.c
++++ b/grub-core/loader/i386/xen.c
+@@ -809,8 +809,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+       if (err)
+ 	goto fail;
+ 
+-      if (grub_initrd_load (&initrd_ctx, argv,
+-			    get_virtual_current_address (ch)))
++      if (grub_initrd_load (&initrd_ctx, get_virtual_current_address (ch)))
+ 	goto fail;
+     }
+ 
+diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
+index 7987fd1..8873b7a 100644
+--- a/grub-core/loader/ia64/efi/linux.c
++++ b/grub-core/loader/ia64/efi/linux.c
+@@ -563,7 +563,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+   grub_dprintf ("linux", "[addr=0x%lx, size=0x%lx]\n",
+ 		(grub_uint64_t) initrd_mem, initrd_size);
+ 
+-  if (grub_initrd_load (&initrd_ctx, argv, initrd_mem))
++  if (grub_initrd_load (&initrd_ctx, initrd_mem))
+     goto fail;
+  fail:
+   grub_initrd_close (&initrd_ctx);
+diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
+index 3fe390f..d19df67 100644
+--- a/grub-core/loader/linux.c
++++ b/grub-core/loader/linux.c
+@@ -271,7 +271,7 @@ grub_initrd_close (struct grub_linux_initrd_context *initrd_ctx)
+ 
+ grub_err_t
+ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
+-		  char *argv[], void *target)
++		  void *target)
+ {
+   grub_uint8_t *ptr = target;
+   int i;
+@@ -317,7 +317,7 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
+ 	{
+ 	  if (!grub_errno)
+ 	    grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
+-			argv[i]);
++			initrd_ctx->components[i].file->name);
+ 	  grub_initrd_close (initrd_ctx);
+ 	  return grub_errno;
+ 	}
+diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
+index e4ed959..9459472 100644
+--- a/grub-core/loader/mips/linux.c
++++ b/grub-core/loader/mips/linux.c
+@@ -452,7 +452,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+     initrd_dest = get_physical_target_address (ch) | 0x80000000;
+   }
+ 
+-  if (grub_initrd_load (&initrd_ctx, argv, initrd_src))
++  if (grub_initrd_load (&initrd_ctx, initrd_src))
+     goto fail;
+ 
+ #ifdef GRUB_MACHINE_MIPS_QEMU_MIPS
+diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
+index 818b2a8..a51e7a7 100644
+--- a/grub-core/loader/powerpc/ieee1275/linux.c
++++ b/grub-core/loader/powerpc/ieee1275/linux.c
+@@ -363,7 +363,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ 
+   grub_dprintf ("loader", "Loading initrd at 0x%x, size 0x%x\n", addr, size);
+ 
+-  if (grub_initrd_load (&initrd_ctx, argv, (void *) addr))
++  if (grub_initrd_load (&initrd_ctx, (void *) addr))
+     goto fail;
+ 
+   initrd_addr = addr;
+diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
+index bb47ee0..ac2206f 100644
+--- a/grub-core/loader/sparc64/ieee1275/linux.c
++++ b/grub-core/loader/sparc64/ieee1275/linux.c
+@@ -413,7 +413,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+   grub_dprintf ("loader", "Loading initrd at vaddr 0x%lx, paddr 0x%lx, size 0x%lx\n",
+ 		addr, paddr, size);
+ 
+-  if (grub_initrd_load (&initrd_ctx, argv, (void *) addr))
++  if (grub_initrd_load (&initrd_ctx, (void *) addr))
+     goto fail;
+ 
+   initrd_addr = addr;
+diff --git a/include/grub/linux.h b/include/grub/linux.h
+index 594a3f3..a96ac20 100644
+--- a/include/grub/linux.h
++++ b/include/grub/linux.h
+@@ -21,4 +21,4 @@ grub_initrd_close (struct grub_linux_initrd_context *initrd_ctx);
+ 
+ grub_err_t
+ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
+-		  char *argv[], void *target);
++		  void *target);
diff --git a/debian/patches/maybe-quiet.patch b/debian/patches/maybe-quiet.patch
index 819d9ca..5833f08 100644
--- a/debian/patches/maybe-quiet.patch
+++ b/debian/patches/maybe-quiet.patch
@@ -58,10 +58,10 @@ index 9e8f991..d2c4ce8 100644
  /* We don't need those.  */
  #define MINILZO_CFG_SKIP_LZO_PTR 1
 diff --git a/configure.ac b/configure.ac
-index 74778a6..256fc44 100644
+index fb980fd..2869155 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1915,6 +1915,17 @@ else
+@@ -1923,6 +1923,17 @@ else
  fi
  AC_SUBST([UBUNTU_RECOVERY])
  
@@ -79,7 +79,7 @@ index 74778a6..256fc44 100644
  LIBS=""
  
  AC_SUBST([FONT_SOURCE])
-@@ -2177,5 +2188,10 @@ echo "With stack smashing protector: Yes"
+@@ -2185,5 +2196,10 @@ echo "With stack smashing protector: Yes"
  else
  echo "With stack smashing protector: No"
  fi
diff --git a/debian/patches/mkconfig-ubuntu-recovery.patch b/debian/patches/mkconfig-ubuntu-recovery.patch
index 43beada..4d7a67d 100644
--- a/debian/patches/mkconfig-ubuntu-recovery.patch
+++ b/debian/patches/mkconfig-ubuntu-recovery.patch
@@ -22,10 +22,10 @@ Patch-Name: mkconfig-ubuntu-recovery.patch
  3 files changed, 26 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 7517fc4..74778a6 100644
+index e3d4d72..fb980fd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1904,6 +1904,17 @@ fi
+@@ -1912,6 +1912,17 @@ fi
  AC_SUBST([LIBZFS])
  AC_SUBST([LIBNVPAIR])
  
diff --git a/debian/patches/no-devicetree-if-secure-boot.patch b/debian/patches/no-devicetree-if-secure-boot.patch
index 3659f2d..50baa90 100644
--- a/debian/patches/no-devicetree-if-secure-boot.patch
+++ b/debian/patches/no-devicetree-if-secure-boot.patch
@@ -16,7 +16,7 @@ Patch-Name: no-devicetree-if-secure-boot.patch
  2 files changed, 20 insertions(+)
 
 diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index ed23dc7..2c85ca8 100644
+index 1f7ab75..feb707b 100644
 --- a/grub-core/loader/arm/linux.c
 +++ b/grub-core/loader/arm/linux.c
 @@ -30,6 +30,10 @@
@@ -46,10 +46,10 @@ index ed23dc7..2c85ca8 100644
    if (!dtb)
      return grub_errno;
 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index 7858d35..9b05e7e 100644
+index 971e84d..b846bf3 100644
 --- a/grub-core/loader/efi/fdt.c
 +++ b/grub-core/loader/efi/fdt.c
-@@ -128,6 +128,14 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
+@@ -131,6 +131,14 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
        return GRUB_ERR_NONE;
      }
  
diff --git a/debian/patches/pc-verifiers-module.patch b/debian/patches/pc-verifiers-module.patch
index 089e9e9..f372dda 100644
--- a/debian/patches/pc-verifiers-module.patch
+++ b/debian/patches/pc-verifiers-module.patch
@@ -52,7 +52,7 @@ index ee88e44..b6872d2 100644
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 10f839b..f953817 100644
+index 0d7bce1..f252725 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -141,7 +141,7 @@ kernel = {
diff --git a/debian/patches/quick-boot.patch b/debian/patches/quick-boot.patch
index b94aadc..a3675ac 100644
--- a/debian/patches/quick-boot.patch
+++ b/debian/patches/quick-boot.patch
@@ -32,10 +32,10 @@ Patch-Name: quick-boot.patch
  7 files changed, 141 insertions(+), 13 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 256fc44..c42e4c7 100644
+index 2869155..4882eba 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1926,6 +1926,17 @@ else
+@@ -1934,6 +1934,17 @@ else
  fi
  AC_SUBST([QUIET_BOOT])
  
diff --git a/debian/patches/riscv-adjust-march-flags-for-binutils-2.38.patch b/debian/patches/riscv-adjust-march-flags-for-binutils-2.38.patch
 new file mode 100644
index 0000000..afddd6c
--- /dev/null
+++ b/debian/patches/riscv-adjust-march-flags-for-binutils-2.38.patch
@@ -0,0 +1,43 @@
+From: Heinrich Schuchardt <[e-mail]>
+Date: Sat, 29 Jan 2022 11:26:58 +0100
+Subject: riscv: adjust -march flags for binutils 2.38
+
+As of version 2.38 binutils defaults to ISA specification version
[phone]. This version of the specification has has separated the
+the csr read/write (csrr*/csrw*) instructions and the fence.i from
+the I extension and put them into separate Zicsr and Zifencei
+extensions.
+
+This implies that we have to adjust the -march flag passed to the
+compiler accordingly.
+
+Signed-off-by: Heinrich Schuchardt <[e-mail]>
+Origin: https://lists.gnu.org/archive/html/grub-devel/2022-01/msg00173.html
+---
+ configure.ac | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 7517fc4..e3d4d72 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -852,11 +852,19 @@ if test x"$platform" != xemu ; 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"], [])
++       # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
++       CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32 -Werror"
++       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++		         [grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -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"], [])
++       # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
++       CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64 -Werror"
++       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++		         [grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], [])
+     fi
+     if test "x$target_cpu" = xia64; then
+        CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror"
diff --git a/debian/patches/series b/debian/patches/series
index 0f2405b..9e6fc4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,11 @@
+riscv-adjust-march-flags-for-binutils-2.38.patch
+loader-drop-argv-argument-in-grub_initrd_load.patch
+efi-add-definition-of-LoadFile2-protocol.patch
+efi-implemented-LoadFile2-initrd-loading-protocol-fo.patch
+linux-ignore-FDT-unless-we-need-to-modify-it.patch
+loader-Move-arm64-linux-loader-to-common-code.patch
+RISC-V-Update-image-header.patch
+RISC-V-Use-common-linux-loader.patch
 olpc-prefix-hack.patch
 core-in-fs.patch
 dpkg-version-comparison.patch
@@ -108,4 +116,10 @@ no-devicetree-if-secure-boot.patch
 0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
 0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
 ubuntu-verifiers-last.patch
+<<<<<<< debian/patches/series
 ubuntu-fuse3.patch
+=======
+efi-correct-struct-grub_efi_boot_services.patch
+efi-implement-grub_efi_run_image.patch
+fat-fix-listing-the-root-directory.patch
+>>>>>>> debian/patches/series
diff --git a/debian/patches/suse-add-support-for-UEFI-network-protocols.patch b/debian/patches/suse-add-support-for-UEFI-network-protocols.patch
index 9724f73..262f4d0 100644
--- a/debian/patches/suse-add-support-for-UEFI-network-protocols.patch
+++ b/debian/patches/suse-add-support-for-UEFI-network-protocols.patch
@@ -64,10 +64,10 @@ V6:
  create mode 100644 include/grub/net/efi.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 98cda49..a47c403 100644
+index 0b5b4e7..3b06462 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -2322,6 +2322,12 @@ module = {
+@@ -2324,6 +2324,12 @@ module = {
    common = net/ethernet.c;
    common = net/arp.c;
    common = net/netbuff.c;
@@ -3969,10 +3969,10 @@ index 15a2f29..34bf04f 100644
 +#endif
  }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 9cab1a5..3b2f2e3 100644
+index 479c2a8..3211f04 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -608,6 +608,23 @@ typedef grub_uint16_t grub_efi_ipv6_address_t[8];
+@@ -613,6 +613,23 @@ typedef grub_uint16_t grub_efi_ipv6_address_t[8];
  typedef grub_uint8_t grub_efi_ip_address_t[8] __attribute__ ((aligned(4)));
  typedef grub_efi_uint64_t grub_efi_physical_address_t;
  typedef grub_efi_uint64_t grub_efi_virtual_address_t;
@@ -3996,7 +3996,7 @@ index 9cab1a5..3b2f2e3 100644
  
  struct grub_efi_guid
  {
-@@ -875,6 +892,8 @@ struct grub_efi_ipv6_device_path
+@@ -880,6 +897,8 @@ struct grub_efi_ipv6_device_path
    grub_efi_uint16_t remote_port;
    grub_efi_uint16_t protocol;
    grub_efi_uint8_t static_ip_address;
@@ -4005,7 +4005,7 @@ index 9cab1a5..3b2f2e3 100644
  } GRUB_PACKED;
  typedef struct grub_efi_ipv6_device_path grub_efi_ipv6_device_path_t;
  
-@@ -924,6 +943,15 @@ struct grub_efi_uri_device_path
+@@ -929,6 +948,15 @@ struct grub_efi_uri_device_path
  } GRUB_PACKED;
  typedef struct grub_efi_uri_device_path grub_efi_uri_device_path_t;
  
@@ -4021,7 +4021,7 @@ index 9cab1a5..3b2f2e3 100644
  #define GRUB_EFI_VENDOR_MESSAGING_DEVICE_PATH_SUBTYPE	10
  
  /* Media Device Path.  */
-@@ -1006,6 +1034,23 @@ struct grub_efi_bios_device_path
+@@ -1011,6 +1039,23 @@ struct grub_efi_bios_device_path
  } GRUB_PACKED;
  typedef struct grub_efi_bios_device_path grub_efi_bios_device_path_t;
  
@@ -4045,7 +4045,7 @@ index 9cab1a5..3b2f2e3 100644
  struct grub_efi_open_protocol_information_entry
  {
    grub_efi_handle_t agent_handle;
-@@ -1497,23 +1542,28 @@ typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output
+@@ -1502,23 +1547,28 @@ typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output
  
  typedef grub_uint8_t grub_efi_pxe_packet_t[1472];
  
@@ -4088,7 +4088,7 @@ index 9cab1a5..3b2f2e3 100644
  
  #define GRUB_EFI_PXE_BASE_CODE_MAX_IPCNT 8
  typedef struct {
-@@ -1563,17 +1613,31 @@ typedef struct grub_efi_pxe_mode
+@@ -1568,17 +1618,31 @@ typedef struct grub_efi_pxe_mode
  typedef struct grub_efi_pxe
  {
    grub_uint64_t rev;
@@ -4124,7 +4124,7 @@ index 9cab1a5..3b2f2e3 100644
    void (*setpackets) (void);
    struct grub_efi_pxe_mode *mode;
  } grub_efi_pxe_t;
-@@ -1835,6 +1899,44 @@ struct grub_efi_ip4_config2_protocol
+@@ -1850,6 +1914,44 @@ struct grub_efi_ip4_config2_protocol
  };
  typedef struct grub_efi_ip4_config2_protocol grub_efi_ip4_config2_protocol_t;
  
@@ -4169,7 +4169,7 @@ index 9cab1a5..3b2f2e3 100644
  enum grub_efi_ip6_config_data_type {
    GRUB_EFI_IP6_CONFIG_DATA_TYPE_INTERFACEINFO,
    GRUB_EFI_IP6_CONFIG_DATA_TYPE_ALT_INTERFACEID,
-@@ -1869,6 +1971,49 @@ struct grub_efi_ip6_config_protocol
+@@ -1884,6 +1986,49 @@ struct grub_efi_ip6_config_protocol
  };
  typedef struct grub_efi_ip6_config_protocol grub_efi_ip6_config_protocol_t;
  
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
index 6dc4335..9a0ed6c 100644
--- a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
+++ b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
@@ -32,7 +32,7 @@ index bf9c1ba..353061e 100644
  
  syslinux_test: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg
 diff --git a/configure.ac b/configure.ac
-index 22c6cf7..3c87596 100644
+index a29beb9..15a2a50 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -314,6 +314,16 @@ AC_SUBST(grubdirname)
diff --git a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
index b0e49aa..7ab0799 100644
--- a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
+++ b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
@@ -40,7 +40,7 @@ index 41bebd1..99f4792 100644
  static unsigned long last_id = 0;
  
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 9e301f2..cf76f48 100644
+index c3144de..2b74d79 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -24,6 +24,7 @@
@@ -51,7 +51,7 @@ index 9e301f2..cf76f48 100644
  #include <grub/misc.h>
  #include <grub/charset.h>
  #include <grub/mm.h>
-@@ -906,6 +907,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -905,6 +906,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    grub_efi_status_t status;
    grub_efi_boot_services_t *b;
    grub_device_t dev = 0;
@@ -59,7 +59,7 @@ index 9e301f2..cf76f48 100644
    grub_efi_device_path_t *dp = 0;
    char *filename;
    void *boot_image = 0;
-@@ -963,6 +965,15 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -962,6 +964,15 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (! dev)
      goto fail;
  
@@ -75,7 +75,7 @@ index 9e301f2..cf76f48 100644
    if (dev->disk)
      dev_handle = grub_efidisk_get_device_handle (dev->disk);
    else if (dev->net && dev->net->server)
-@@ -1092,6 +1103,12 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -1091,6 +1102,12 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    grub_device_close (dev);
  
  fail:
diff --git a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
index 75ab70c..2c1a376 100644
--- a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
+++ b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
@@ -15,7 +15,7 @@ Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index f953817..98cda49 100644
+index f252725..0b5b4e7 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -550,7 +550,7 @@ image = {
diff --git a/debian/patches/ubuntu-linuxefi-arm64-set-base-addr.patch b/debian/patches/ubuntu-linuxefi-arm64-set-base-addr.patch
index e00ae03..9b5e997 100644
--- a/debian/patches/ubuntu-linuxefi-arm64-set-base-addr.patch
+++ b/debian/patches/ubuntu-linuxefi-arm64-set-base-addr.patch
@@ -30,13 +30,13 @@ Origin: https://github.com/rhboot/grub2/commit/1d5ef08216edec4d31d0e10cfdb30b5eb
 Last-Updated: 2020-11-09
 Patch-Name: ubuntu-linuxefi-arm64-set-base-addr.patch
 ---
- grub-core/loader/efi/linux.c | 15 +++++++++++++++
+ grub-core/loader/efi/linux_sb.c | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
-diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+diff --git a/grub-core/loader/efi/linux_sb.c b/grub-core/loader/efi/linux_sb.c
 index e372b26..73a7196 100644
---- a/grub-core/loader/efi/linux.c
-+++ b/grub-core/loader/efi/linux.c
+--- a/grub-core/loader/efi/linux_sb.c
++++ b/grub-core/loader/efi/linux_sb.c
 @@ -71,6 +71,7 @@ grub_err_t
  grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
  		     void *kernel_params)
diff --git a/debian/patches/ubuntu-linuxefi-arm64.patch b/debian/patches/ubuntu-linuxefi-arm64.patch
index e7f4e71..7789a5a 100644
--- a/debian/patches/ubuntu-linuxefi-arm64.patch
+++ b/debian/patches/ubuntu-linuxefi-arm64.patch
@@ -12,23 +12,22 @@ Bug-Ubuntu: https://bugs.launchpad.net/1862279
 Origin: vendor, https://github.com/rhboot/grub2/commit/2786ab864cf00c15123320671f653e9a36ba12b4
 Patch-Name: ubuntu-linuxefi-arm64.patch
 ---
- grub-core/loader/arm64/linux.c | 106 ++++++++++++++++++++++-------------------
- 1 file changed, 56 insertions(+), 50 deletions(-)
+ grub-core/loader/efi/linux.c | 101 ++++++++++++++++++++++---------------------
+ 1 file changed, 51 insertions(+), 50 deletions(-)
 
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 1a5296a..4e9eac3 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -42,6 +42,8 @@ static int loaded;
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index d81e7be..93e4cfc 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -42,6 +42,7 @@ static int loaded;
  
  static void *kernel_addr;
  static grub_uint64_t kernel_size;
 +static grub_uint32_t handover_offset;
-+
  
  static char *linux_args;
  static grub_uint32_t cmdline_size;
-@@ -75,7 +77,8 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
+@@ -99,7 +100,8 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
  static grub_err_t
  finalize_params_linux (void)
  {
@@ -36,9 +35,9 @@ index 1a5296a..4e9eac3 100644
 +  grub_efi_loaded_image_t *loaded_image = NULL;
 +  int node, retval, len;
  
-   void *fdt;
+   void *fdt = NULL;
  
-@@ -110,6 +113,27 @@ finalize_params_linux (void)
+@@ -134,6 +136,27 @@ finalize_params_linux (void)
    if (grub_fdt_install() != GRUB_ERR_NONE)
      goto failure;
  
@@ -66,28 +65,14 @@ index 1a5296a..4e9eac3 100644
    return GRUB_ERR_NONE;
  
  failure:
-@@ -117,70 +141,48 @@ failure:
+@@ -141,62 +164,36 @@ failure:
    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)
 +static void
 +free_params (void)
-+{
-+  grub_efi_loaded_image_t *loaded_image = NULL;
-+  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
-+  if (loaded_image)
-+    {
-+      if (loaded_image->load_options)
-+      grub_efi_free_pages ((grub_efi_physical_address_t)(grub_efi_uintn_t)
-+			      loaded_image->load_options,
-+			     GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
-+      loaded_image->load_options = NULL;
-+      loaded_image->load_options_size = 0;
-+    }
-+}
-+
- 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;
@@ -106,21 +91,35 @@ index 1a5296a..4e9eac3 100644
 -  mempath[0].memory_type = GRUB_EFI_LOADER_DATA;
 -  mempath[0].start_address = addr;
 -  mempath[0].end_address = addr + size;
-+  grub_err_t retval;
- 
+-
 -  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);
--
++  grub_efi_loaded_image_t *loaded_image = NULL;
++  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
++  if (loaded_image)
++    {
++      if (loaded_image->load_options)
++      grub_efi_free_pages ((grub_efi_physical_address_t)(grub_efi_uintn_t)
++			      loaded_image->load_options,
++			     GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
++      loaded_image->load_options = NULL;
++      loaded_image->load_options_size = 0;
++    }
++}
+ 
 -  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");
-+  retval = finalize_params_linux ();
-+  if (retval != GRUB_ERR_NONE)
-+    return grub_errno;
++grub_err_t
++grub_arch_efi_linux_boot_image (grub_addr_t addr __attribute__((unused)),
++				grub_size_t size __attribute__((unused)),
++				char *args)
++{
++  grub_err_t retval;
  
    grub_dprintf ("linux", "linux command line: '%s'\n", args);
  
@@ -136,35 +135,23 @@ index 1a5296a..4e9eac3 100644
 -  loaded_image->load_options_size =
 -    2 * grub_utf8_to_utf16 (loaded_image->load_options, len,
 -			    (grub_uint8_t *) args, len, NULL);
-+  (void) addr;
-+  (void) size;
- 
+-
 -  grub_dprintf ("linux", "starting image %p\n", image_handle);
 -  status = b->start_image (image_handle, 0, NULL);
++  retval = grub_efi_linux_boot (kernel_addr, handover_offset, kernel_addr);
  
--  /* When successful, not reached */
+   /* 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));
-+  retval = grub_efi_linux_boot ((char *)kernel_addr, handover_offset,
-+				kernel_addr);
- 
+-
 -  return grub_errno;
-+  /* Never reached... */
 +  free_params();
 +  return retval;
  }
  
  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));
- }
-@@ -296,6 +298,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -411,6 +408,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  {
    grub_file_t file = 0;
    struct linux_arch_kernel_header lh;
@@ -172,7 +159,7 @@ index 1a5296a..4e9eac3 100644
    grub_err_t err;
    int rc;
  
-@@ -349,6 +352,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -464,6 +462,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
diff --git a/debian/patches/ubuntu-linuxefi.patch b/debian/patches/ubuntu-linuxefi.patch
index eb99d16..533b900 100644
--- a/debian/patches/ubuntu-linuxefi.patch
+++ b/debian/patches/ubuntu-linuxefi.patch
@@ -318,17 +318,17 @@ Last-Update: 2018-12-07
 Updated 2021-12-13: If we cannot allocate kernel at preferred address,
 reset errno so that we do not fail erroneously with out of memory.
 ---
- grub-core/Makefile.core.def            |  15 +-
+ grub-core/Makefile.core.def            |  17 +-
  grub-core/commands/iorw.c              |   7 +
  grub-core/commands/memrw.c             |   7 +
  grub-core/kern/arm/coreboot/coreboot.S |   6 +
  grub-core/kern/dl.c                    |   1 +
  grub-core/kern/efi/mm.c                |  32 ++
- grub-core/loader/arm64/linux.c         |  16 +
  grub-core/loader/efi/appleloader.c     |   7 +
- grub-core/loader/efi/chainloader.c     | 816 ++++++++++++++++++++++++++++++---
+ grub-core/loader/efi/chainloader.c     | 815 ++++++++++++++++++++++++++++++---
  grub-core/loader/efi/fdt.c             |   1 +
- grub-core/loader/efi/linux.c           |  86 ++++
+ grub-core/loader/efi/linux.c           |  16 +
+ grub-core/loader/efi/linux_sb.c        |  86 ++++
  grub-core/loader/i386/bsd.c            |   7 +
  grub-core/loader/i386/efi/linux.c      | 382 +++++++++++++++
  grub-core/loader/i386/linux.c          |  78 +++-
@@ -344,8 +344,8 @@ reset errno so that we do not fail erroneously with out of memory.
  include/grub/mips/linux.h              |   0
  include/grub/powerpc/linux.h           |   0
  include/grub/sparc64/linux.h           |   0
- 26 files changed, 1510 insertions(+), 100 deletions(-)
- create mode 100644 grub-core/loader/efi/linux.c
+ 26 files changed, 1511 insertions(+), 100 deletions(-)
+ create mode 100644 grub-core/loader/efi/linux_sb.c
  create mode 100644 grub-core/loader/i386/efi/linux.c
  create mode 100644 include/grub/efi/linux.h
  create mode 100644 include/grub/ia64/linux.h
@@ -354,24 +354,26 @@ reset errno so that we do not fail erroneously with out of memory.
  create mode 100644 include/grub/sparc64/linux.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 8022e1c..715d137 100644
+index 0536575..1a3ead6 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -1807,10 +1807,13 @@ module = {
+@@ -1807,10 +1807,15 @@ module = {
    ia64_efi = loader/ia64/efi/linux.c;
    arm_coreboot = loader/arm/linux.c;
-   arm_efi = loader/arm64/linux.c;
-+  arm_efi = loader/efi/linux.c;
+   arm_efi = loader/efi/linux.c;
++  arm_efi = loader/efi/linux_sb.c;
    arm_uboot = loader/arm/linux.c;
-   arm64 = loader/arm64/linux.c;
-+  arm64 = loader/efi/linux.c;
-   riscv32 = loader/riscv/linux.c;
-   riscv64 = loader/riscv/linux.c;
+   arm64 = loader/efi/linux.c;
++  arm64 = loader/efi/linux_sb.c;
+   riscv32 = loader/efi/linux.c;
++  riscv32 = loader/efi/linux_sb.c;
+   riscv64 = loader/efi/linux.c;
++  riscv64 = loader/efi/linux_sb.c;
 +  cflags = '-Wno-error=cast-align';
    common = loader/linux.c;
    common = lib/cmdline.c;
    enable = noemu;
-@@ -1819,7 +1822,7 @@ module = {
+@@ -1819,7 +1824,7 @@ module = {
  module = {
    name = fdt;
    efi = loader/efi/fdt.c;
@@ -380,14 +382,14 @@ index 8022e1c..715d137 100644
    enable = fdt;
  };
  
-@@ -1874,12 +1877,22 @@ module = {
+@@ -1874,12 +1879,22 @@ module = {
    enable = x86_64_efi;
  };
  
 +module = {
 +  name = linuxefi;
 +  efi = loader/i386/efi/linux.c;
-+  efi = loader/efi/linux.c;
++  efi = loader/efi/linux_sb.c;
 +  cflags = '-Wno-error=cast-align';
 +  enable = i386_efi;
 +  enable = x86_64_efi;
@@ -536,54 +538,6 @@ index 9838fb2..f6aef0e 100644
  /* Allocate pages. Return the pointer to the first of allocated pages.  */
  void *
  grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index ef3e9f9..1a5296a 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -27,6 +27,7 @@
- #include <grub/types.h>
- #include <grub/cpu/linux.h>
- #include <grub/efi/efi.h>
-+#include <grub/efi/linux.h>
- #include <grub/efi/fdtload.h>
- #include <grub/efi/memory.h>
- #include <grub/efi/pe32.h>
-@@ -48,6 +49,13 @@ static grub_uint32_t cmdline_size;
- static grub_addr_t initrd_start;
- static grub_addr_t initrd_end;
- 
-+struct grub_arm64_linux_pe_header
-+{
-+  grub_uint32_t magic;
-+  struct grub_pe32_coff_header coff;
-+  struct grub_pe64_optional_header opt;
-+};
-+
- grub_err_t
- grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
- {
-@@ -289,6 +297,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   grub_file_t file = 0;
-   struct linux_arch_kernel_header lh;
-   grub_err_t err;
-+  int rc;
- 
-   grub_dl_ref (my_mod);
- 
-@@ -333,6 +342,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 
-   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
- 
-+  rc = grub_linuxefi_secure_validate (kernel_addr, kernel_size);
-+  if (rc < 0)
-+    {
-+      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
-+      goto fail;
-+    }
-+
-   cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
-   linux_args = grub_malloc (cmdline_size);
-   if (!linux_args)
 diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
 index 74888c4..07677f0 100644
 --- a/grub-core/loader/efi/appleloader.c
@@ -616,7 +570,7 @@ index 74888c4..07677f0 100644
    grub_unregister_command (cmd);
  }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 2bd80f4..9e301f2 100644
+index 2bd80f4..c3144de 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -32,6 +32,9 @@
@@ -652,7 +606,7 @@ index 2bd80f4..9e301f2 100644
  
    grub_dl_unref (my_mod);
    return GRUB_ERR_NONE;
-@@ -213,20 +222,694 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
+@@ -213,20 +222,693 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
    return file_path;
  }
  
@@ -767,6 +721,8 @@ index 2bd80f4..9e301f2 100644
 +  GRUB_PE32_MACHINE_I386;
 +#elif defined(__ia64__)
 +  GRUB_PE32_MACHINE_IA64;
++#elif defined(__riscv) && __riscv_xlen == 64
++  GRUB_PE32_MACHINE_RISCV64;
 +#else
 +#error this architecture is not supported by grub2
 +#endif
@@ -782,9 +738,7 @@ index 2bd80f4..9e301f2 100644
 +  char *fixup, *fixup_base, *fixup_data = NULL;
 +  grub_efi_uint16_t *fixup_16;
 +  grub_efi_uint32_t *fixup_32;
-+#if defined(__x86_64__) || defined(__aarch64__)
 +  grub_efi_uint64_t *fixup_64;
-+#endif /* defined(__x86_64__) || defined(__aarch64__) */
 +  grub_efi_uint64_t size = context->image_size;
 +  void *image_end = (char *)orig + size;
 +  int n = 0;
@@ -911,7 +865,6 @@ index 2bd80f4..9e301f2 100644
 +                    fixup_data += sizeof (grub_uint32_t);
 +                  }
 +                break;
-+#if defined(__x86_64__) || defined(__aarch64__)
 +              case GRUB_PE32_REL_BASED_DIR64:
 +                fixup_64 = (grub_uint64_t *)fixup;
 +                *fixup_64 = *fixup_64 + (grub_uint64_t)adjust;
@@ -922,7 +875,7 @@ index 2bd80f4..9e301f2 100644
 +                    fixup_data += sizeof (grub_uint64_t);
 +                  }
 +                break;
-+#endif /* defined(__x86_64__) || defined(__aarch64__) */
++              /* TODO: GRUB_PE32_REL_BASED_RISCV_HI20, GRUB_PE32_REL_BASED_RISCV_LOW12I/S */	
 +              default:
 +                grub_error (GRUB_ERR_BAD_ARGUMENT,
 +			    "Reloc %d unknown relocation type %d",
@@ -1350,7 +1303,7 @@ index 2bd80f4..9e301f2 100644
  
    if (argc == 0)
      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -238,15 +921,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -238,15 +920,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    address = 0;
    image_handle = 0;
    file_path = 0;
@@ -1398,7 +1351,7 @@ index 2bd80f4..9e301f2 100644
    if (! dev)
      goto fail;
  
-@@ -283,17 +996,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -283,17 +995,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (! file_path)
      goto fail;
  
@@ -1419,7 +1372,7 @@ index 2bd80f4..9e301f2 100644
  
    status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
  			      GRUB_EFI_LOADER_CODE,
-@@ -307,7 +1017,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -307,7 +1016,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
    boot_image = (void *) ((grub_addr_t) address);
@@ -1428,7 +1381,7 @@ index 2bd80f4..9e301f2 100644
      {
        if (grub_errno == GRUB_ERR_NONE)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -317,7 +1027,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -317,7 +1026,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
  #if defined (__i386__) || defined (__x86_64__)
@@ -1437,7 +1390,7 @@ index 2bd80f4..9e301f2 100644
      {
        struct grub_macho_fat_header *head = boot_image;
        if (head->magic
-@@ -326,6 +1036,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -326,6 +1035,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  	  grub_uint32_t i;
  	  struct grub_macho_fat_arch *archs
  	    = (struct grub_macho_fat_arch *) (head + 1);
@@ -1452,7 +1405,7 @@ index 2bd80f4..9e301f2 100644
  	  for (i = 0; i < grub_cpu_to_le32 (head->nfat_arch); i++)
  	    {
  	      if (GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT (archs[i].cputype))
-@@ -340,79 +1058,40 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -340,79 +1057,40 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  	      > ~grub_cpu_to_le32 (archs[i].size)
  	      || grub_cpu_to_le32 (archs[i].offset)
  	      + grub_cpu_to_le32 (archs[i].size)
@@ -1547,7 +1500,7 @@ index 2bd80f4..9e301f2 100644
    if (dev)
      grub_device_close (dev);
  
-@@ -424,6 +1103,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -424,6 +1102,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (address)
      efi_call_2 (b->free_pages, address, pages);
  
@@ -1558,7 +1511,7 @@ index 2bd80f4..9e301f2 100644
  
    return grub_errno;
 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index c86f283..7858d35 100644
+index 771d455..971e84d 100644
 --- a/grub-core/loader/efi/fdt.c
 +++ b/grub-core/loader/efi/fdt.c
 @@ -26,6 +26,7 @@
@@ -1570,10 +1523,58 @@ index c86f283..7858d35 100644
  static void *loaded_fdt;
  static void *fdt;
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 3292cab..d81e7be 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -27,6 +27,7 @@
+ #include <grub/types.h>
+ #include <grub/cpu/linux.h>
+ #include <grub/efi/efi.h>
++#include <grub/efi/linux.h>
+ #include <grub/efi/fdtload.h>
+ #include <grub/efi/memory.h>
+ #include <grub/efi/pe32.h>
+@@ -54,6 +55,13 @@ static int initrd_use_loadfile2;
+ static grub_efi_guid_t load_file2_guid = GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID;
+ static grub_efi_guid_t device_path_guid = GRUB_EFI_DEVICE_PATH_GUID;
+ 
++struct grub_arm64_linux_pe_header
++{
++  grub_uint32_t magic;
++  struct grub_pe32_coff_header coff;
++  struct grub_pe64_optional_header opt;
++};
++
+ grub_err_t
+ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
+ {
+@@ -404,6 +412,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   grub_file_t file = 0;
+   struct linux_arch_kernel_header lh;
+   grub_err_t err;
++  int rc;
+ 
+   grub_dl_ref (my_mod);
+ 
+@@ -448,6 +457,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 
+   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
+ 
++  rc = grub_linuxefi_secure_validate (kernel_addr, kernel_size);
++  if (rc < 0)
++    {
++      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
++      goto fail;
++    }
++
+   cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
+   linux_args = grub_malloc (cmdline_size);
+   if (!linux_args)
+diff --git a/grub-core/loader/efi/linux_sb.c b/grub-core/loader/efi/linux_sb.c
 new file mode 100644
 index 0000000..e372b26
 --- /dev/null
-+++ b/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux_sb.c
 @@ -0,0 +1,86 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
@@ -2082,7 +2083,7 @@ index 0000000..382ff52
 +  grub_unregister_command (cmd_initrd);
 +}
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 9f74a96..d55b7cd 100644
+index f30a158..b6c13d7 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -78,6 +78,8 @@ static grub_size_t maximal_cmdline_size;
@@ -2243,7 +2244,7 @@ index 9f74a96..d55b7cd 100644
      {
        grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 2a29952..f4ab6ad 100644
+index efeeeb2..69db786 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -36,6 +36,7 @@
@@ -2420,7 +2421,7 @@ index 1c0cf6a..c5ba84c 100644
    grub_unregister_command (cmd_resume);
  #endif
 diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index 7e22b4a..6785b78 100644
+index effd870..9efd37a 100644
 --- a/include/grub/arm64/linux.h
 +++ b/include/grub/arm64/linux.h
 @@ -22,6 +22,8 @@
diff --git a/debian/patches/vt-handoff.patch b/debian/patches/vt-handoff.patch
index 94f8f4f..78c15da 100644
--- a/debian/patches/vt-handoff.patch
+++ b/debian/patches/vt-handoff.patch
@@ -17,10 +17,10 @@ Patch-Name: vt-handoff.patch
  2 files changed, 38 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 947fd52..e11df6b 100644
+index 3203749..b4e33a6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1948,6 +1948,17 @@ else
+@@ -1956,6 +1956,17 @@ else
  fi
  AC_SUBST([GFXPAYLOAD_DYNAMIC])
  
diff --git a/debian/postinst.in b/debian/postinst.in
index 5a64439..98020ab 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -759,7 +759,7 @@ case "$1" in
         fi
       ;;
 
-      grub-efi-ia32|grub-efi-amd64|grub-efi-ia64|grub-efi-arm|grub-efi-arm64)
+      grub-efi-ia32|grub-efi-amd64|grub-efi-ia64|grub-efi-arm|grub-efi-arm64|grub-efi-riscv64)
         bootloader_id="$(config_item GRUB_DISTRIBUTOR | tr A-Z a-z | \
                          cut -d' ' -f1)"
         case $bootloader_id in
@@ -787,6 +787,7 @@ case "$1" in
           grub-efi-ia64)  target=ia64-efi ;;
           grub-efi-arm)   target=arm-efi ;;
           grub-efi-arm64) target=arm64-efi ;;
+          grub-efi-riscv64) target=riscv64-efi ;;
         esac
         # Check /boot/grub to see if we previously installed to an ESP. We don't
         # want to trigger the install code just by installing the package,
diff --git a/debian/rules b/debian/rules
index 9505998..90678d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ BUILD_PACKAGES := $(strip $(shell dh_listpackages))
 # REAL_PACKAGES build an actual grub variant (and therefore have both configure
 # and build stages). EXTRA_PACKAGES do not build grub but may depend on a
 # REAL_PACKAGE (and therefore only have a build stage)
-REAL_PACKAGES = grub-common grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-efi-arm grub-efi-arm64 grub-ieee1275 grub-firmware-qemu grub-uboot grub-xen grub-yeeloong
+REAL_PACKAGES = grub-common grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-efi-arm grub-efi-arm64 grub-efi-riscv64 grub-ieee1275 grub-firmware-qemu grub-uboot grub-xen grub-yeeloong
 EXTRA_PACKAGES = grub-rescue-pc grub-xen-host
 
 ifneq (,$(filter amd64,$(DEB_HOST_ARCH_CPU)))
@@ -85,6 +85,8 @@ else ifeq (arm,$(DEB_HOST_ARCH_CPU))
 COMMON_PLATFORM := uboot
 else ifeq (arm64,$(DEB_HOST_ARCH_CPU))
 COMMON_PLATFORM := efi-arm64
+else ifeq (riscv64,$(DEB_HOST_ARCH_CPU))
+COMMON_PLATFORM := efi-riscv64
 else
 COMMON_PLATFORM := none
 BUILD_PACKAGES += grub-none
@@ -95,6 +97,8 @@ DEFAULT_CMDLINE := quiet splash
 DEFAULT_TIMEOUT := 10
 ifeq ($(DEB_HOST_ARCH_CPU),ppc64el)
 FLICKER_FREE_BOOT := no
+else ifeq ($(DEB_HOST_ARCH_CPU),riscv64)
+FLICKER_FREE_BOOT := no
 else
 FLICKER_FREE_BOOT := yes
 endif
@@ -263,7 +267,7 @@ debian/stamps/configure-grub-efi-amd64:
 	mkdir -p debian/stamps $(subst debian/stamps/configure-,obj/,$@)
 	dh_auto_configure -- $(confflags) --with-platform=efi --target=amd64-pe --program-prefix=""
 	touch $@
-debian/stamps/configure-grub-efi-ia64 debian/stamps/configure-grub-efi-arm debian/stamps/configure-grub-efi-arm64:
+debian/stamps/configure-grub-efi-ia64 debian/stamps/configure-grub-efi-arm debian/stamps/configure-grub-efi-arm64 debian/stamps/configure-grub-efi-riscv64:
 	mkdir -p debian/stamps $(subst debian/stamps/configure-,obj/,$@)
 	dh_auto_configure -- $(confflags) --with-platform=efi
 	touch $@
@@ -284,7 +288,7 @@ debian/stamps/configure-grub-firmware-qemu:
 	dh_auto_configure -- $(confflags) --with-platform=qemu
 	touch $@
 
-debian/stamps/build-grub-none debian/stamps/build-grub-efi-ia64 debian/stamps/build-grub-efi-arm debian/stamps/build-grub-coreboot debian/stamps/build-grub-emu debian/stamps/build-grub-uboot debian/stamps/build-grub-xen-i386 debian/stamps/build-grub-xen-amd64 debian/stamps/build-grub-xen-pvh-i386 debian/stamps/build-grub-yeeloong: debian/stamps/build-%: debian/stamps/configure-%
+debian/stamps/build-grub-none debian/stamps/build-grub-efi-ia64 debian/stamps/build-grub-efi-arm debian/stamps/build-grub-efi-riscv64 debian/stamps/build-grub-coreboot debian/stamps/build-grub-emu debian/stamps/build-grub-uboot debian/stamps/build-grub-xen-i386 debian/stamps/build-grub-xen-amd64 debian/stamps/build-grub-xen-pvh-i386 debian/stamps/build-grub-yeeloong: debian/stamps/build-%: debian/stamps/configure-%
 	dh_auto_build
 	touch $@
 
@@ -426,7 +430,7 @@ install/grub-none:
 	# files.
 	mkdir -p debian/tmp-$(package)/usr/share/locale
 
-install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia64 install/grub-efi-arm install/grub-efi-arm64 install/grub-ieee1275 install/grub-coreboot install/grub-emu install/grub-uboot install/grub-xen install/grub-yeeloong:
+install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia64 install/grub-efi-arm install/grub-efi-arm64 install/grub-efi-riscv64 install/grub-ieee1275 install/grub-coreboot install/grub-emu install/grub-uboot install/grub-xen install/grub-yeeloong:
 	set -e ; \
 	if [ "$@" = "install/grub-xen" ] ; then \
 		dh_auto_install -Bobj/grub-xen-i386 --destdir=debian/tmp-$(package); \
@@ -571,7 +575,7 @@ endif
 
 NON_PLATFORM_PACKAGES = $(filter grub2 grub-linuxbios grub-efi grub-rescue-pc grub-firmware-qemu grub-xen-host,$(BUILD_PACKAGES))
 COMMON_PLATFORM_PACKAGES = $(filter grub-common grub2-common grub-theme-starfield grub-mount-udeb,$(BUILD_PACKAGES))
-PLATFORM_PACKAGES = $(filter grub-pc grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-efi-arm grub-efi-arm64 grub-ieee1275 grub-coreboot grub-uboot grub-xen grub-yeeloong,$(BUILD_PACKAGES))
+PLATFORM_PACKAGES = $(filter grub-pc grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-efi-arm grub-efi-arm64 grub-efi-riscv64 grub-ieee1275 grub-coreboot grub-uboot grub-xen grub-yeeloong,$(BUILD_PACKAGES))
 
 override_dh_install:
 ifneq (,$(NON_PLATFORM_PACKAGES))