[v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Atish Patra]

This series unifies the linux loader for ARM64 & RISC-V. The linux loader
for ARM64 is pretty much arch independent. Thus, this series just moves
it to the common directory and update the make files.

This series is rebased on top of Ard's LoadFile2 series[1].

The unification effort was a little mess and I was to blame :(.
I started the effort but couldn't follow up after. Nikita picked it up
and rebased all the patches along with LoadFile2.

However, Nikita did not follow up after v3 as well. Ard revised his
LoadFile2 series few weeks back. As the ocotober deadline for next grub
release is closing, I decided to rebase the patches so that RISC-V support
can be officially part of the release. Sorry for the mess/confusion.

This series has been tested with OpenSuse image in Qemu. It would be good
to get more testing on ARM64 and real RISC-V boards as well.

Changes from v4->v5:
1. Removed redundant macros from header file and updated the rv32
   kernel header structure.

Changes from v3->V4:
1. Added all the comments on v3.
2. Dropped LoadFile2 patches as Ard's series[1] updated those patches

[1] https://lists.gnu.org/archive/html/grub-devel/2022-09/msg00057.html

Atish Patra (3):
loader: Move arm64 linux loader to common code
RISC-V: Update image header
RISC-V: Use common linux loader

grub-core/Makefile.core.def             |  8 ++--
grub-core/loader/{arm64 => efi}/linux.c |  0
grub-core/loader/riscv/linux.c          | 59 -------------------------
include/grub/riscv32/linux.h            | 19 ++++----
include/grub/riscv64/linux.h            | 19 ++++----
5 files changed, 25 insertions(+), 80 deletions(-)
rename grub-core/loader/{arm64 => efi}/linux.c (100%)
delete mode 100644 grub-core/loader/riscv/linux.c

--
2.25.1

[v5 PATCH 1/3] loader: Move arm64 linux loader to common code

[Atish Patra]

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.

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Atish Patra <atishp@rivosinc.com>
---
 grub-core/Makefile.core.def             | 4 ++--
 grub-core/loader/{arm64 => efi}/linux.c | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename grub-core/loader/{arm64 => efi}/linux.c (100%)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 5212dfab1369..ce95c76eaffa 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1817,9 +1817,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/efi/linux.c
similarity index 100%
rename from grub-core/loader/arm64/linux.c
rename to grub-core/loader/efi/linux.c
-- 
2.25.1

[v5 PATCH 2/3] RISC-V: Update image header

[Atish Patra]

Update the RISC-V Linux kernel image headers as per the current header.

Reference:
<Linux kernel source>/Documentation/riscv/boot-image-header.rst

474efecb65dc: ("riscv: modify the Image header to improve compatibility with the ARM64 header")

Acked-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Signed-off-by: Atish Patra <atishp@rivosinc.com>
---
 include/grub/riscv32/linux.h | 19 ++++++++++---------
 include/grub/riscv64/linux.h | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/include/grub/riscv32/linux.h b/include/grub/riscv32/linux.h
index 512b777c8a41..f50b1df1e84a 100644
--- a/include/grub/riscv32/linux.h
+++ b/include/grub/riscv32/linux.h
@@ -19,21 +19,22 @@
 #ifndef GRUB_RISCV32_LINUX_HEADER
 #define GRUB_RISCV32_LINUX_HEADER 1
 
-#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
-
-/* 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_uint64_t magic;		/* magic (RISC-V specifc, deprecated)*/
+  grub_uint32_t magic2;		/* Magic number 2 (to match the ARM64 'magic' field pos) */
   grub_uint32_t hdr_offset;	/* Offset of PE/COFF header */
+
+  struct grub_coff_image_header coff_image_header;
 };
 
 #define linux_arch_kernel_header linux_riscv_kernel_header
diff --git a/include/grub/riscv64/linux.h b/include/grub/riscv64/linux.h
index 3630c30fbf1a..bdcc143c742e 100644
--- a/include/grub/riscv64/linux.h
+++ b/include/grub/riscv64/linux.h
@@ -19,23 +19,26 @@
 #ifndef GRUB_RISCV64_LINUX_HEADER
 #define GRUB_RISCV64_LINUX_HEADER 1
 
-#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
+#include <grub/efi/pe32.h>
 
 #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_uint64_t magic;		/* magic (RISC-V specifc, deprecated)*/
+  grub_uint32_t magic2;		/* Magic number 2 (to match the ARM64 'magic' field pos) */
   grub_uint32_t hdr_offset;	/* Offset of PE/COFF header */
+
+  struct grub_coff_image_header coff_image_header;
 };
 
 #define linux_arch_kernel_header linux_riscv_kernel_header
-- 
2.25.1

[v5 PATCH 3/3] RISC-V: Use common linux loader

[Atish Patra]

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 <atishp@rivosinc.com>
---
 grub-core/Makefile.core.def    |  4 +--
 grub-core/loader/riscv/linux.c | 59 ----------------------------------
 2 files changed, 2 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 ce95c76eaffa..d6cb8a673e1b 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1820,8 +1820,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 d17c488e118d..000000000000
--- 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);
-}
-- 
2.25.1

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Daniel Kiper]

On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
> This series unifies the linux loader for ARM64 & RISC-V. The linux loader
> for ARM64 is pretty much arch independent. Thus, this series just moves
> it to the common directory and update the make files.
>
> This series is rebased on top of Ard's LoadFile2 series[1].
>
> The unification effort was a little mess and I was to blame :(.
> I started the effort but couldn't follow up after. Nikita picked it up
> and rebased all the patches along with LoadFile2.
>
> However, Nikita did not follow up after v3 as well. Ard revised his
> LoadFile2 series few weeks back. As the ocotober deadline for next grub
> release is closing, I decided to rebase the patches so that RISC-V support
> can be officially part of the release. Sorry for the mess/confusion.

No worries, I know how it works. Thank you for rebase.

Ard, Atish, your patch series seem to conflict. I think I would review
and take Atish first. Then Ard would need to rebase. Any objections?

Daniel

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Ard Biesheuvel]

On Mon, 10 Oct 2022 at 16:58, Daniel Kiper <dkiper@net-space.pl> wrote:
>
> On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
> > This series unifies the linux loader for ARM64 & RISC-V. The linux loader
> > for ARM64 is pretty much arch independent. Thus, this series just moves
> > it to the common directory and update the make files.
> >
> > This series is rebased on top of Ard's LoadFile2 series[1].
> >
> > The unification effort was a little mess and I was to blame :(.
> > I started the effort but couldn't follow up after. Nikita picked it up
> > and rebased all the patches along with LoadFile2.
> >
> > However, Nikita did not follow up after v3 as well. Ard revised his
> > LoadFile2 series few weeks back. As the ocotober deadline for next grub
> > release is closing, I decided to rebase the patches so that RISC-V support
> > can be officially part of the release. Sorry for the mess/confusion.
>
> No worries, I know how it works. Thank you for rebase.
>
> Ard, Atish, your patch series seem to conflict. I think I would review
> and take Atish first. Then Ard would need to rebase. Any objections?
>

Why would you do that? You told me 2 months ago that you were going to
review the patches in september. Now you are telling me you are first
going to review and merge a series that Atish sent out on 7 october,
forcing me to put in additional work to do the rebase?

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Atish Kumar Patra]

[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]

On Mon, Oct 10, 2022 at 7:54 AM Daniel Kiper <dkiper@net-space.pl> wrote:

> On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
> > This series unifies the linux loader for ARM64 & RISC-V. The linux loader
> > for ARM64 is pretty much arch independent. Thus, this series just moves
> > it to the common directory and update the make files.
> >
> > This series is rebased on top of Ard's LoadFile2 series[1].
> >
> > The unification effort was a little mess and I was to blame :(.
> > I started the effort but couldn't follow up after. Nikita picked it up
> > and rebased all the patches along with LoadFile2.
> >
> > However, Nikita did not follow up after v3 as well. Ard revised his
> > LoadFile2 series few weeks back. As the ocotober deadline for next grub
> > release is closing, I decided to rebase the patches so that RISC-V
> support
> > can be officially part of the release. Sorry for the mess/confusion.
>
> No worries, I know how it works. Thank you for rebase.
>
> Ard, Atish, your patch series seem to conflict. I think I would review
> and take Atish first. Then Ard would need to rebase. Any objections?
>
>
I have rebased this series on top of Ard's series already. So I think it
would be easier if Ard's series
is merged first. As this series has minimal changes, it won't take much
time to rebase once again
if required.



> Daniel
>

[-- Attachment #2: Type: text/html, Size: 2005 bytes --]

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Daniel Kiper]

On Mon, Oct 10, 2022 at 05:51:15PM +0200, Ard Biesheuvel wrote:
> On Mon, 10 Oct 2022 at 16:58, Daniel Kiper <dkiper@net-space.pl> wrote:
> > On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
> > > This series unifies the linux loader for ARM64 & RISC-V. The linux loader
> > > for ARM64 is pretty much arch independent. Thus, this series just moves
> > > it to the common directory and update the make files.
> > >
> > > This series is rebased on top of Ard's LoadFile2 series[1].
> > >
> > > The unification effort was a little mess and I was to blame :(.
> > > I started the effort but couldn't follow up after. Nikita picked it up
> > > and rebased all the patches along with LoadFile2.
> > >
> > > However, Nikita did not follow up after v3 as well. Ard revised his
> > > LoadFile2 series few weeks back. As the ocotober deadline for next grub
> > > release is closing, I decided to rebase the patches so that RISC-V support
> > > can be officially part of the release. Sorry for the mess/confusion.
> >
> > No worries, I know how it works. Thank you for rebase.
> >
> > Ard, Atish, your patch series seem to conflict. I think I would review
> > and take Atish first. Then Ard would need to rebase. Any objections?
>
> Why would you do that? You told me 2 months ago that you were going to
> review the patches in september. Now you are telling me you are first

Sorry for delay but...

> going to review and merge a series that Atish sent out on 7 october,
> forcing me to put in additional work to do the rebase?

Atish said he rebased his own patch set on top of yours and is OK to do
it once again if it is needed. Then I will review and merge Ard's patch
set first. I hope it will happen in the following week or two.

Daniel

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Daniel Kiper]

On Mon, Oct 10, 2022 at 11:12:16AM -0700, Atish Kumar Patra wrote:
> On Mon, Oct 10, 2022 at 7:54 AM Daniel Kiper <dkiper@net-space.pl> wrote:
>      On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
>      > This series unifies the linux loader for ARM64 & RISC-V. The linux
>      loader
>      > for ARM64 is pretty much arch independent. Thus, this series just
>      moves
>      > it to the common directory and update the make files.
>      >
>      > This series is rebased on top of Ard's LoadFile2 series[1].
>      >
>      > The unification effort was a little mess and I was to blame :(.
>      > I started the effort but couldn't follow up after. Nikita picked it
>      up
>      > and rebased all the patches along with LoadFile2.
>      >
>      > However, Nikita did not follow up after v3 as well. Ard revised his
>      > LoadFile2 series few weeks back. As the ocotober deadline for next
>      grub
>      > release is closing, I decided to rebase the patches so that RISC-
>      V support
>      > can be officially part of the release. Sorry for the mess/
>      confusion.
>
>      No worries, I know how it works. Thank you for rebase.
>
>      Ard, Atish, your patch series seem to conflict. I think I would
>      review
>      and take Atish first. Then Ard would need to rebase. Any objections?
>
> I have rebased this series on top of Ard's series already. So I think it would
> be easier if Ard's series 
> is merged first. As this series has minimal changes, it won't take much time to
> rebase once again
> if required.

Cool! Thanks a lot!

Daniel

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Xiaotian Wu]

On 22-10-10 22:26:26, Daniel Kiper wrote:
> On Mon, Oct 10, 2022 at 11:12:16AM -0700, Atish Kumar Patra wrote:
> > On Mon, Oct 10, 2022 at 7:54 AM Daniel Kiper <dkiper@net-space.pl> wrote:
> >      On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
> >      > This series unifies the linux loader for ARM64 & RISC-V. The linux
> >      loader
> >      > for ARM64 is pretty much arch independent. Thus, this series just
> >      moves
> >      > it to the common directory and update the make files.
> >      >
> >      > This series is rebased on top of Ard's LoadFile2 series[1].
> >      >
> >      > The unification effort was a little mess and I was to blame :(.
> >      > I started the effort but couldn't follow up after. Nikita picked it
> >      up
> >      > and rebased all the patches along with LoadFile2.
> >      >
> >      > However, Nikita did not follow up after v3 as well. Ard revised his
> >      > LoadFile2 series few weeks back. As the ocotober deadline for next
> >      grub
> >      > release is closing, I decided to rebase the patches so that RISC-
> >      V support
> >      > can be officially part of the release. Sorry for the mess/
> >      confusion.
> >
> >      No worries, I know how it works. Thank you for rebase.
> >
> >      Ard, Atish, your patch series seem to conflict. I think I would
> >      review
> >      and take Atish first. Then Ard would need to rebase. Any objections?
> >
> > I have rebased this series on top of Ard's series already. So I think it would
> > be easier if Ard's series 
> > is merged first. As this series has minimal changes, it won't take much time to
> > rebase once again
> > if required.
> 
> Cool! Thanks a lot!
> 
> Daniel
 
Great, I hope the v4 and v5 patches are merged into the master branch soon.
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Daniel Kiper]

On Mon, Oct 10, 2022 at 11:12:16AM -0700, Atish Kumar Patra wrote:
> On Mon, Oct 10, 2022 at 7:54 AM Daniel Kiper <dkiper@net-space.pl> wrote:
>      On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
>      > This series unifies the linux loader for ARM64 & RISC-V. The linux
>      loader
>      > for ARM64 is pretty much arch independent. Thus, this series just
>      moves
>      > it to the common directory and update the make files.
>      >
>      > This series is rebased on top of Ard's LoadFile2 series[1].
>      >
>      > The unification effort was a little mess and I was to blame :(.
>      > I started the effort but couldn't follow up after. Nikita picked it
>      up
>      > and rebased all the patches along with LoadFile2.
>      >
>      > However, Nikita did not follow up after v3 as well. Ard revised his
>      > LoadFile2 series few weeks back. As the ocotober deadline for next
>      grub
>      > release is closing, I decided to rebase the patches so that RISC-
>      V support
>      > can be officially part of the release. Sorry for the mess/
>      confusion.
>
>      No worries, I know how it works. Thank you for rebase.
>
>      Ard, Atish, your patch series seem to conflict. I think I would
>      review
>      and take Atish first. Then Ard would need to rebase. Any objections?
>
> I have rebased this series on top of Ard's series already. So I think it would
> be easier if Ard's series 
> is merged first. As this series has minimal changes, it won't take much time to
> rebase once again
> if required.

Aitsh, right now Ard's LoadFile2 series is in. Please rebase and repost
your patch set.

Daniel

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Xiaotian Wu]

Is there any new message?

在 2022-10-27星期四的 21:18 +0200，Daniel Kiper写道：
> On Mon, Oct 10, 2022 at 11:12:16AM -0700, Atish Kumar Patra wrote:
> > On Mon, Oct 10, 2022 at 7:54 AM Daniel Kiper <dkiper@net-space.pl>
> > wrote:
> >      On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
> >      > This series unifies the linux loader for ARM64 & RISC-V. The
> > linux
> >      loader
> >      > for ARM64 is pretty much arch independent. Thus, this series
> > just
> >      moves
> >      > it to the common directory and update the make files.
> >      >
> >      > This series is rebased on top of Ard's LoadFile2 series[1].
> >      >
> >      > The unification effort was a little mess and I was to blame
> > :(.
> >      > I started the effort but couldn't follow up after. Nikita
> > picked it
> >      up
> >      > and rebased all the patches along with LoadFile2.
> >      >
> >      > However, Nikita did not follow up after v3 as well. Ard
> > revised his
> >      > LoadFile2 series few weeks back. As the ocotober deadline
> > for next
> >      grub
> >      > release is closing, I decided to rebase the patches so that
> > RISC-
> >      V support
> >      > can be officially part of the release. Sorry for the mess/
> >      confusion.
> > 
> >      No worries, I know how it works. Thank you for rebase.
> > 
> >      Ard, Atish, your patch series seem to conflict. I think I
> > would
> >      review
> >      and take Atish first. Then Ard would need to rebase. Any
> > objections?
> > 
> > I have rebased this series on top of Ard's series already. So I
> > think it would
> > be easier if Ard's series 
> > is merged first. As this series has minimal changes, it won't take
> > much time to
> > rebase once again
> > if required.
> 
> Aitsh, right now Ard's LoadFile2 series is in. Please rebase and
> repost
> your patch set.
> 
> Daniel

Re: [v5 PATCH 0/3] Unify ARM64 & RISC-V Linux Loader

[Atish Kumar Patra]

[-- Attachment #1: Type: text/plain, Size: 2223 bytes --]

On Thu, Nov 3, 2022 at 4:06 AM Xiaotian Wu <wuxiaotian@loongson.cn> wrote:

> Is there any new message?
>
> 在 2022-10-27星期四的 21:18 +0200，Daniel Kiper写道：
> > On Mon, Oct 10, 2022 at 11:12:16AM -0700, Atish Kumar Patra wrote:
> > > On Mon, Oct 10, 2022 at 7:54 AM Daniel Kiper <dkiper@net-space.pl>
> > > wrote:
> > >      On Fri, Oct 07, 2022 at 01:50:27AM -0700, Atish Patra wrote:
> > >      > This series unifies the linux loader for ARM64 & RISC-V. The
> > > linux
> > >      loader
> > >      > for ARM64 is pretty much arch independent. Thus, this series
> > > just
> > >      moves
> > >      > it to the common directory and update the make files.
> > >      >
> > >      > This series is rebased on top of Ard's LoadFile2 series[1].
> > >      >
> > >      > The unification effort was a little mess and I was to blame
> > > :(.
> > >      > I started the effort but couldn't follow up after. Nikita
> > > picked it
> > >      up
> > >      > and rebased all the patches along with LoadFile2.
> > >      >
> > >      > However, Nikita did not follow up after v3 as well. Ard
> > > revised his
> > >      > LoadFile2 series few weeks back. As the ocotober deadline
> > > for next
> > >      grub
> > >      > release is closing, I decided to rebase the patches so that
> > > RISC-
> > >      V support
> > >      > can be officially part of the release. Sorry for the mess/
> > >      confusion.
> > >
> > >      No worries, I know how it works. Thank you for rebase.
> > >
> > >      Ard, Atish, your patch series seem to conflict. I think I
> > > would
> > >      review
> > >      and take Atish first. Then Ard would need to rebase. Any
> > > objections?
> > >
> > > I have rebased this series on top of Ard's series already. So I
> > > think it would
> > > be easier if Ard's series
> > > is merged first. As this series has minimal changes, it won't take
> > > much time to
> > > rebase once again
> > > if required.
> >
> > Aitsh, right now Ard's LoadFile2 series is in. Please rebase and
> > repost
> > your patch set.
> >


Arrgh. I completely missed this message. Sorry.
I will send the patches today.


>
> > Daniel
>
>

[-- Attachment #2: Type: text/html, Size: 3346 bytes --]