Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 101

_service:tar_scm:grub2.spec Changed

_service:tar_scm:1000-port-Add-LoongArch-support.patch Added

@@ -0,0 +1,3574 @@
+From 781cdb1573ffb77ed6d507d8daa7c6ff92256c57 Mon Sep 17 00:00:00 2001
+From: mengyingkun <mengyingkun@loongson.cn>
+Date: Thu, 12 Jan 2023 14:44:13 +0800
+Subject: [PATCH] port: Add LoongArch support
+
+This patch adds support for LoongArch. From now on, we can boot up
+grub as a UEFI application on LoongArch platform.
+
+Signed-off-by: yangqiming <yangqiming@loongson.cn>
+Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
+---
+ Makefile.util.def                             |   1 +
+ bootstrap.conf                                |   4 +
+ configure.ac                                  |  24 +
+ gentpl.py                                     |   9 +-
+ grub-core/Makefile.am                         |   6 +
+ grub-core/Makefile.core.def                   |  23 +
+ grub-core/kern/dl.c                           |   9 +-
+ grub-core/kern/efi/mm.c                       |   3 +-
+ grub-core/kern/loongarch64/cache.S            |  26 +
+ grub-core/kern/loongarch64/dl.c               | 150 +++++
+ grub-core/kern/loongarch64/dl_helper.c        | 264 +++++++++
+ grub-core/kern/loongarch64/efi/init.c         |  73 +++
+ grub-core/kern/loongarch64/efi/startup.S      |  45 ++
+ grub-core/kern/loongarch64/init.c             |  47 ++
+ .../lib/gnulib-patches/fix-loongarch.patch    |  26 +
+ grub-core/lib/loongarch64/relocator.c         | 163 ++++++
+ grub-core/lib/loongarch64/relocator_asm.S     |  51 ++
+ grub-core/lib/loongarch64/setjmp.S            |  68 +++
+ grub-core/lib/setjmp.S                        |   2 +
+ grub-core/loader/efi/chainloader.c            |   2 +
+ grub-core/loader/loongarch64/linux-efi.c      | 144 +++++
+ grub-core/loader/loongarch64/linux-elf.c      | 529 ++++++++++++++++++
+ grub-core/loader/loongarch64/linux.c          | 398 +++++++++++++
+ include/grub/efi/api.h                        |   2 +-
+ include/grub/efi/efi.h                        |   6 +-
+ include/grub/efi/pe32.h                       |   4 +
+ include/grub/elf.h                            |  30 +
+ include/grub/fdt.h                            |   4 +-
+ include/grub/loongarch64/efi/loader.h         |  25 +
+ include/grub/loongarch64/efi/memory.h         |  15 +
+ include/grub/loongarch64/efi/time.h           |   0
+ include/grub/loongarch64/io.h                 |  62 ++
+ include/grub/loongarch64/linux.h              | 144 +++++
+ include/grub/loongarch64/loongarch64.h        |  30 +
+ include/grub/loongarch64/memory.h             |  59 ++
+ include/grub/loongarch64/reloc.h              | 113 ++++
+ include/grub/loongarch64/relocator.h          |  38 ++
+ include/grub/loongarch64/setjmp.h             |  27 +
+ include/grub/loongarch64/time.h               |  39 ++
+ include/grub/loongarch64/types.h              |  34 ++
+ include/grub/util/install.h                   |   1 +
+ util/grub-install-common.c                    |   1 +
+ util/grub-install.c                           |  16 +
+ util/grub-mkimagexx.c                         |  99 +++-
+ util/grub-module-verifier.c                   |  15 +
+ util/mkimage.c                                |  16 +
+ 46 files changed, 2833 insertions(+), 14 deletions(-)
+ create mode 100644 grub-core/kern/loongarch64/cache.S
+ create mode 100644 grub-core/kern/loongarch64/dl.c
+ create mode 100644 grub-core/kern/loongarch64/dl_helper.c
+ create mode 100644 grub-core/kern/loongarch64/efi/init.c
+ create mode 100644 grub-core/kern/loongarch64/efi/startup.S
+ create mode 100644 grub-core/kern/loongarch64/init.c
+ create mode 100644 grub-core/lib/gnulib-patches/fix-loongarch.patch
+ create mode 100644 grub-core/lib/loongarch64/relocator.c
+ create mode 100644 grub-core/lib/loongarch64/relocator_asm.S
+ create mode 100644 grub-core/lib/loongarch64/setjmp.S
+ create mode 100644 grub-core/loader/loongarch64/linux-efi.c
+ create mode 100644 grub-core/loader/loongarch64/linux-elf.c
+ create mode 100644 grub-core/loader/loongarch64/linux.c
+ create mode 100644 include/grub/loongarch64/efi/loader.h
+ create mode 100644 include/grub/loongarch64/efi/memory.h
+ create mode 100644 include/grub/loongarch64/efi/time.h
+ create mode 100644 include/grub/loongarch64/io.h
+ create mode 100644 include/grub/loongarch64/linux.h
+ create mode 100644 include/grub/loongarch64/loongarch64.h
+ create mode 100644 include/grub/loongarch64/memory.h
+ create mode 100644 include/grub/loongarch64/reloc.h
+ create mode 100644 include/grub/loongarch64/relocator.h
+ create mode 100644 include/grub/loongarch64/setjmp.h
+ create mode 100644 include/grub/loongarch64/time.h
+ create mode 100644 include/grub/loongarch64/types.h
+
+diff --git a/Makefile.util.def b/Makefile.util.def
+index b7a6311..932a8c2 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -169,6 +169,7 @@ library = {
+   common = grub-core/kern/ia64/dl_helper.c;
+   common = grub-core/kern/arm/dl_helper.c;
+   common = grub-core/kern/arm64/dl_helper.c;
++  common = grub-core/kern/loongarch64/dl_helper.c;
+   common = grub-core/lib/minilzo/minilzo.c;
+   common = grub-core/lib/xzembed/xz_dec_bcj.c;
+   common = grub-core/lib/xzembed/xz_dec_lzma2.c;
+diff --git a/bootstrap.conf b/bootstrap.conf
+index 03f1093..854d3c0 100644
+--- a/bootstrap.conf
++++ b/bootstrap.conf
+@@ -85,6 +85,10 @@ cp -a INSTALL INSTALL.grub
+ 
+ bootstrap_post_import_hook () {
+   set -e
++  for patchname in fix-loongarch; do
++    patch -d gnulib -p1 \
++      < "grub-core/lib/gnulib-patches/$patchname.patch"
++  done
+   for patchname in \
+       0001-Support-POTFILES-shell \
+       0002-Handle-gettext_printf-shell-function \
+diff --git a/configure.ac b/configure.ac
+index 0a9522a..d03e089 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,6 +149,10 @@ case "$target_cpu" in
+   riscv64*)
+ 		target_cpu=riscv64
+ 		;;
++  loongarch64)
++		target_cpu=loongarch64
++		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_LOONGARCH64=1"
++		;;
+ esac
+ 
+ # Specify the platform (such as firmware).
+@@ -167,6 +171,7 @@ if test "x$with_platform" = x; then
+     powerpc64-*) platform=ieee1275 ;;
+     powerpc64le-*) platform=ieee1275 ;;
+     sparc64-*) platform=ieee1275 ;;
++    loongarch64-*) platform=efi ;;
+     mipsel-*) platform=loongson ;;
+     mips-*) platform=arc ;;
+     ia64-*) platform=efi ;;
+@@ -218,6 +223,7 @@ case "$target_cpu"-"$platform" in
+   mipsel-yeeloong) platform=loongson ;;
+   mipsel-fuloong) platform=loongson ;;
+   mipsel-loongson) ;;
++  loongarch64-efi) ;;
+   arm-uboot) ;;
+   arm-coreboot) ;;
+   arm-efi) ;;
+@@ -276,6 +282,7 @@ case "$platform" in
+   pc)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_PCBIOS=1" ;;
+   emu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_EMU=1" ;;
+   loongson)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_LOONGSON=1" ;;
++  loongson64)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_LOONARCH64=1" ;;
+   qemu_mips)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_QEMU_MIPS=1" ;;
+   arc)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_ARC=1" ;;
+ esac
+@@ -890,6 +897,21 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
+   TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
+ fi
+ 
++if test "x$target_cpu" = xloongarch64; then
++  AC_CACHE_CHECK([whether _mno_explicit_relocs works], [grub_cv_cc_mno_explicit_relocs], [
++    CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs -Werror"
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++       [grub_cv_cc_mno_explicit_relocs=yes],
++       [grub_cv_cc_mno_explicit_relocs=no])
++  ])
++  if test "x$grub_cv_cc_mno_explicit_relocs" = xyes; then
++    TARGET_CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs -fno-plt"
++    TARGET_CCASFLAGS="$TARGET_CCASFLAGS -mno-explicit-relocs -fno-plt"
++  fi
++  TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mla-global-with-abs"
++  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mla-global-with-abs"
++fi
++
+ # Should grub utils get the host CFLAGS, or the target CFLAGS?
+ AC_ARG_WITH([utils],
+             AS_HELP_STRING([--with-utils=host|target|build],
+@@ -2166,6 +2188,8 @@ AM_CONDITIONAL([COND_mips_arc], [test "(" x$target_cpu = xmips -o x$target_cpu =
+ AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
+ AM_CONDITIONAL([COND_sparc64_emu], [test x$target_cpu = xsparc64 -a x$platform = xemu])
+ AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
++AM_CONDITIONAL([COND_loongarch64_efi], [test x$target_cpu = xloongarch64 -a x$platform = xefi])
++AM_CONDITIONAL([COND_loongarch64], [test x$target_cpu = xloongarch64])
+ AM_CONDITIONAL([COND_mips], [test x$target_cpu = xmips -o x$target_cpu = xmipsel])
+ AM_CONDITIONAL([COND_mipsel], [test x$target_cpu = xmipsel])
+ AM_CONDITIONAL([COND_mipseb], [test x$target_cpu = xmips])
+diff --git a/gentpl.py b/gentpl.py
+index 59f62ef..f03aff8 100644
+--- a/gentpl.py
++++ b/gentpl.py
+@@ -32,7 +32,8 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
+                    "mips_loongson", "sparc64_ieee1275",
+                    "powerpc_ieee1275", "mips_arc", "ia64_efi",
+                    "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi",
+-                   "arm_coreboot", "riscv32_efi", "riscv64_efi" ]
++                   "arm_coreboot", "riscv32_efi", "riscv64_efi",
++                   "loongarch64_efi" ]
+ 
+ GROUPS = {}
+ 
+@@ -49,11 +50,12 @@ GROUPS["arm"]      = [ "arm_uboot", "arm_efi", "arm_coreboot" ]
+ GROUPS["arm64"]    = [ "arm64_efi" ]
+ GROUPS["riscv32"]  = [ "riscv32_efi" ]
+ GROUPS["riscv64"]  = [ "riscv64_efi" ]

_service:tar_scm:1001-loongarch-Modify-the-location-where-initrd-is-loaded.patch Added

@@ -0,0 +1,82 @@
+From 062741f3d9878bcbd4556f3bfe73d1bead458255 Mon Sep 17 00:00:00 2001
+From: mengyingkun <mengyingkun@loongson.cn>
+Date: Thu, 2 Feb 2023 20:32:17 +0800
+Subject: [PATCH] loongarch: Modify the location where initrd is loaded into
+ memory
+
+Try to allocate memory from higher than 256MB to
+avoid kernel relocation overlaying initrd. If failed,
+allocate memory in range 0~256MB, and high address
+takes precedence.
+
+Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
+---
+ grub-core/loader/loongarch64/linux-elf.c | 21 +++++++++++++++++++++
+ grub-core/loader/loongarch64/linux.c     |  2 +-
+ include/grub/loongarch64/linux.h         |  5 +++++
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
+index 85585b4..8260e4c 100644
+--- a/grub-core/loader/loongarch64/linux-elf.c
++++ b/grub-core/loader/loongarch64/linux-elf.c
+@@ -304,6 +304,27 @@ grub_linux_loongarch_alloc_virtual_mem_align (grub_size_t size,
+   return get_virtual_current_address (ch);
+ }
+ 
++void*
++grub_linux_loongarch_alloc_initrd_mem_align (grub_size_t size,
++                 grub_size_t align,
++                 grub_err_t *err)
++{
++  grub_relocator_chunk_t ch;
++
++  /* Firstly try to allocate from memory higher than 256MB */
++  *err = grub_relocator_alloc_chunk_align (relocator, &ch,
++              0x10000000, (0xffffffff - size) + 1, size, align,
++              GRUB_RELOCATOR_PREFERENCE_LOW, 0);
++  if (*err != GRUB_ERR_NONE)
++    {
++      /* Failed, try to allocate in range 0 ~ 256MB */
++      *err = grub_relocator_alloc_chunk_align (relocator, &ch,
++                  0, (0xfffffff - size) + 1, size, align,
++                  GRUB_RELOCATOR_PREFERENCE_HIGH, 0);
++    }
++  return get_virtual_current_address (ch);
++}
++
+ int
+ grub_linux_loongarch_elf_get_boot_params (struct boot_params_interface **boot_params)
+ {
+diff --git a/grub-core/loader/loongarch64/linux.c b/grub-core/loader/loongarch64/linux.c
+index 783054b..4c02194 100644
+--- a/grub-core/loader/loongarch64/linux.c
++++ b/grub-core/loader/loongarch64/linux.c
+@@ -351,7 +351,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+       initrd_mem = allocate_initrd_mem (initrd_pages);
+   } else {
+       grub_err_t err;
+-      initrd_mem = grub_linux_loongarch_alloc_virtual_mem_align (initrd_size, 0x10000, &err);
++      initrd_mem = grub_linux_loongarch_alloc_initrd_mem_align (initrd_size, 0x10000, &err);
+       if (err)
+ 	goto fail;
+   }
+diff --git a/include/grub/loongarch64/linux.h b/include/grub/loongarch64/linux.h
+index af1f51d..f4b198a 100644
+--- a/include/grub/loongarch64/linux.h
++++ b/include/grub/loongarch64/linux.h
+@@ -129,6 +129,11 @@ grub_linux_loongarch_alloc_virtual_mem_align (grub_size_t size,
+ 					      grub_size_t align,
+ 					      grub_err_t *err);
+ 
++void*
++grub_linux_loongarch_alloc_initrd_mem_align (grub_size_t size,
++                          grub_size_t align,
++                          grub_err_t *err);
++
+ void
+ grub_linux_loongarch_elf_relocator_unload (void);
+ 
+-- 
+2.33.0
+

_service:tar_scm:1002-loongarch-Add-EFI-frame-buffer-support.patch Added

@@ -0,0 +1,337 @@
+From 1ebd229556ba767f76c829b6d00d8a7b5bf28e65 Mon Sep 17 00:00:00 2001
+From: mengyingkun <mengyingkun@loongson.cn>
+Date: Wed, 8 Feb 2023 09:24:05 +0800
+Subject: [PATCH] loongarch: Add EFI frame buffer support
+
+Signed-off-by: yangqiming <yangqiming@loongson.cn>
+Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
+---
+ grub-core/loader/loongarch64/linux-elf.c | 232 +++++++++++++++++++++++
+ include/grub/loongarch64/linux.h         |  47 +++++
+ 2 files changed, 279 insertions(+)
+
+diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
+index 8260e4c..852e8f4 100644
+--- a/grub-core/loader/loongarch64/linux-elf.c
++++ b/grub-core/loader/loongarch64/linux-elf.c
+@@ -23,6 +23,7 @@
+ #include <grub/elfload.h>
+ #include <grub/cpu/relocator.h>
+ #include <grub/efi/memory.h>
++#include <grub/efi/graphics_output.h>
+ 
+ #define GRUB_ADDRESS_TYPE_SYSRAM	1
+ #define GRUB_ADDRESS_TYPE_RESERVED	2
+@@ -34,13 +35,242 @@
+ 	{ 0x89, 0x9a, 0x43, 0x18, 0x02, 0x50, 0xa0, 0xc9 } \
+     }
+ 
++#define GRUB_EFI_LARCH_SCREEN_INFO_GUID \
++  { 0x07fd51a6, 0x9532, 0x926f, \
++    { 0x51, 0xdc, 0x6a, 0x63, 0x60, 0x2f, 0x84, 0xb4 } \
++  }
++
++#define GRUB_EFI_LARCH_CONSOLE_OUT_DEVICE_GUID \
++  { 0xd3b36f2c, 0xd551, 0x11d4,  \
++    { 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
++  }
++
+ static struct grub_relocator *relocator;
++static grub_efi_guid_t screen_info_guid = GRUB_EFI_LARCH_SCREEN_INFO_GUID;
+ 
+ void grub_linux_loongarch_elf_relocator_unload (void)
+ {
+   grub_relocator_unload (relocator);
+ }
+ 
++static void
++find_bits (unsigned long mask, grub_efi_uint8_t *pos, grub_efi_uint8_t *size)
++{
++  grub_efi_uint8_t first, len;
++
++  first = 0;
++  len = 0;
++
++  if (mask)
++    {
++      while (!(mask & 0x1))
++        {
++    mask = mask >> 1;
++    first++;
++        }
++
++      while (mask & 0x1)
++        {
++    mask = mask >> 1;
++    len++;
++        }
++    }
++
++  *pos = first;
++  *size = len;
++}
++
++static void
++setup_pixel_info (struct screen_info *si, grub_efi_uint32_t pixels_per_scan_line,
++                  struct grub_efi_gop_pixel_bitmask pixel_info, int pixel_format)
++{
++  if (pixel_format == GRUB_EFI_GOT_RGBA8)
++    {
++      si->lfb_depth = 32;
++      si->lfb_linelength = pixels_per_scan_line * 4;
++      si->red_size = 8;
++      si->red_pos = 0;
++      si->green_size = 8;
++      si->green_pos = 8;
++      si->blue_size = 8;
++      si->blue_pos = 16;
++      si->rsvd_size = 8;
++      si->rsvd_pos = 24;
++    }
++  else if (pixel_format == GRUB_EFI_GOT_BGRA8)
++    {
++      si->lfb_depth = 32;
++      si->lfb_linelength = pixels_per_scan_line * 4;
++      si->red_size = 8;
++      si->red_pos = 16;
++      si->green_size = 8;
++      si->green_pos = 8;
++      si->blue_size = 8;
++      si->blue_pos = 0;
++      si->rsvd_size = 8;
++      si->rsvd_pos = 24;
++    }
++  else if (pixel_format == GRUB_EFI_GOT_BITMASK)
++    {
++      find_bits(pixel_info.r, &si->red_pos, &si->red_size);
++      find_bits(pixel_info.g, &si->green_pos, &si->green_size);
++      find_bits(pixel_info.b, &si->blue_pos, &si->blue_size);
++      find_bits(pixel_info.a, &si->rsvd_pos, &si->rsvd_size);
++      si->lfb_depth = si->red_size + si->green_size +
++                      si->blue_size + si->rsvd_size;
++      si->lfb_linelength = (pixels_per_scan_line * si->lfb_depth) / 8;
++    }
++  else
++    {
++      si->lfb_depth = 4;
++      si->lfb_linelength = si->lfb_width / 2;
++      si->red_size = 0;
++      si->red_pos = 0;
++      si->green_size = 0;
++      si->green_pos = 0;
++      si->blue_size = 0;
++      si->blue_pos = 0;
++      si->rsvd_size = 0;
++      si->rsvd_pos = 0;
++    }
++}
++
++static struct screen_info *
++alloc_screen_info (void)
++{
++  grub_efi_status_t status;
++  grub_efi_boot_services_t *b;
++  struct screen_info *si;
++
++  b = grub_efi_system_table->boot_services;
++  status = efi_call_3 (b->allocate_pool, GRUB_EFI_RUNTIME_SERVICES_DATA,
++                           sizeof(*si), (void**)&si);
++  if (status != GRUB_EFI_SUCCESS)
++    return NULL;
++
++  status = b->install_configuration_table (&screen_info_guid, si);
++  if (status == GRUB_EFI_SUCCESS)
++    return si;
++
++  efi_call_1 (b->free_pool, si);
++
++  return NULL;
++}
++
++static struct screen_info *
++setup_screen_info (void)
++{
++  grub_efi_boot_services_t *b;
++  grub_efi_handle_t gop_handle;
++  struct screen_info *si = NULL;
++  struct grub_efi_gop *gop, *first_gop;
++  grub_efi_handle_t *handles;
++  grub_efi_uintn_t num_handles, i;
++  grub_efi_guid_t graphics_output_guid = GRUB_EFI_GOP_GUID;
++  grub_efi_uint16_t width, height;
++  grub_efi_uint32_t ext_lfb_base, pixels_per_scan_line;
++  grub_efi_uint64_t fb_base;
++  struct grub_efi_gop_pixel_bitmask pixel_info;
++  grub_efi_gop_pixel_format_t pixel_format;
++
++  si = alloc_screen_info();
++  if (!si)
++    return NULL;
++
++  handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL,
++                    &graphics_output_guid, NULL, &num_handles);
++  if (!handles || num_handles == 0)
++    goto free_screen_info;
++
++  gop = NULL;
++  first_gop = NULL;
++
++  for (i = 0; i < num_handles; i++)
++    {
++      struct grub_efi_gop_mode *mode;
++      struct grub_efi_gop_mode_info *info = NULL;
++      grub_efi_guid_t conout_proto = GRUB_EFI_LARCH_CONSOLE_OUT_DEVICE_GUID;
++      void *dummy = NULL;
++      grub_efi_uint8_t conout_found = 0;
++      grub_efi_uint64_t current_fb_base;
++
++      gop_handle = handles[i];
++      gop = grub_efi_open_protocol (gop_handle, &graphics_output_guid,
++            GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
++
++      dummy = grub_efi_open_protocol (gop_handle, &conout_proto,
++                GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
++      if (dummy != NULL)
++        conout_found = 1;
++
++      mode = gop->mode;
++      info = mode->info;
++      current_fb_base = mode->fb_base;

_service:tar_scm:1003-loongarch-Add-support-for-v4.0-interface.patch Added

@@ -0,0 +1,434 @@
+From d984a64ff93443630fde3211e1a8ec42d92a6b56 Mon Sep 17 00:00:00 2001
+From: mengyingkun <mengyingkun@loongson.cn>
+Date: Mon, 13 Feb 2023 14:40:16 +0800
+Subject: [PATCH] loongarch: Add support for v4.0 interface
+
+This patch adds support for parameter passing converntion
+between bootloader and kernel, defined in the document
+"loongson devsys firmware kernel interface specification v4.0"
+
+Signed-off-by: yangqiming <yangqiming@loongson.cn>
+Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
+---
+ grub-core/lib/loongarch64/relocator.c    |   2 +-
+ grub-core/loader/loongarch64/linux-elf.c | 177 ++++++++++++++++++++---
+ grub-core/loader/loongarch64/linux.c     |  49 ++-----
+ include/grub/loongarch64/linux.h         |  20 +++
+ 4 files changed, 190 insertions(+), 58 deletions(-)
+
+diff --git a/grub-core/lib/loongarch64/relocator.c b/grub-core/lib/loongarch64/relocator.c
+index faa4553..587fc58 100644
+--- a/grub-core/lib/loongarch64/relocator.c
++++ b/grub-core/lib/loongarch64/relocator.c
+@@ -122,7 +122,7 @@ grub_relocator64_boot (struct grub_relocator *rel,
+   unsigned i;
+   grub_addr_t vtarget;
+ 
+-  err = grub_relocator_alloc_chunk_align (rel, &ch, 0,
++  err = grub_relocator_alloc_chunk_align (rel, &ch, 0x3000000,
+ 					  (0xffffffff - stateset_size)
+ 					  + 1, stateset_size,
+ 					  grub_relocator_align,
+diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
+index 852e8f4..15f9984 100644
+--- a/grub-core/loader/loongarch64/linux-elf.c
++++ b/grub-core/loader/loongarch64/linux-elf.c
+@@ -25,11 +25,14 @@
+ #include <grub/efi/memory.h>
+ #include <grub/efi/graphics_output.h>
+ 
++#define GRUB_EFI_MMAP_NR_SLACK_SLOTS 8
++
+ #define GRUB_ADDRESS_TYPE_SYSRAM	1
+ #define GRUB_ADDRESS_TYPE_RESERVED	2
+ #define GRUB_ADDRESS_TYPE_ACPI		3
+ #define GRUB_ADDRESS_TYPE_NVS		4
+ #define GRUB_ADDRESS_TYPE_PMEM		5
++
+ #define GRUB_EFI_LOONGSON_BPI_TABLE_GUID	\
+     { 0x4660f721, 0x2ec5, 0x416a, \
+ 	{ 0x89, 0x9a, 0x43, 0x18, 0x02, 0x50, 0xa0, 0xc9 } \
+@@ -45,6 +48,16 @@
+     { 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
+   }
+ 
++#define GRUB_EFI_LARCH_BOOT_MEMMAP_GUID \
++  { 0x800f683f, 0xd08b, 0x423a,  \
++    { 0xa2, 0x93, 0x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4 } \
++  }
++
++#define GRUB_EFI_LARCH_INITRD_MEDIA_GUID \
++  { 0x5568e427, 0x68fc, 0x4f3d,  \
++    { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
++  }
++
+ static struct grub_relocator *relocator;
+ static grub_efi_guid_t screen_info_guid = GRUB_EFI_LARCH_SCREEN_INFO_GUID;
+ 
+@@ -271,6 +284,135 @@ free_screen_info:
+   return NULL;
+ }
+ 
++static grub_err_t
++allocate_memmap_and_exit_boot (struct linux_loongarch64_kernel_params *kernel_params)
++{
++  grub_err_t err;
++  grub_efi_status_t status;
++  grub_efi_uintn_t mmap_size, desc_size, size;
++  grub_efi_uint32_t desc_version;
++  grub_efi_memory_descriptor_t *mmap_buf;
++  grub_efi_boot_services_t *b;
++  struct efi_boot_memmap *m, tmp;
++  struct efi_initrd *tbl = NULL;
++  grub_efi_guid_t boot_memmap_guid = GRUB_EFI_LARCH_BOOT_MEMMAP_GUID;
++  grub_efi_guid_t initrd_media_guid = GRUB_EFI_LARCH_INITRD_MEDIA_GUID;
++
++  setup_screen_info();
++
++  b = grub_efi_system_table->boot_services;
++
++  grub_dprintf ("loongson", "ramdisk_addr:0x%"PRIxGRUB_UINT64_T", \
++          size:0x%"PRIxGRUB_UINT64_T"\n",
++          kernel_params->ramdisk_addr,
++          kernel_params->ramdisk_size);
++#if 0
++  char string[64];
++
++  /* Set initrd info to cmdline*/
++  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
++  {
++    grub_printf ( "Initrd @ %p-%p\n",
++            (void *) kernel_params->ramdisk_addr,
++            (void *) (kernel_params->ramdisk_addr + kernel_params->ramdisk_size));
++    /* initrd */
++    grub_snprintf (string,
++         sizeof (GRUB_INITRD_STRING),
++         "initrd=0x%lx,0x%lx",
++         ((grub_uint64_t) kernel_params->ramdisk_addr & 0xffffffff),
++         (grub_uint64_t) kernel_params->ramdisk_size);
++    *(char*) ((grub_addr_t) kernel_params->linux_args + kernel_params->ramdisk_args_len - 2) = ' ';
++    grub_memcpy ((char*) ((grub_addr_t) kernel_params->linux_args + kernel_params->ramdisk_args_len - 1),
++            string, sizeof (GRUB_INITRD_STRING));
++  }
++#else
++  /* Set initrd info to system table*/
++  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
++  {
++    tbl = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (sizeof(struct efi_initrd)));
++    if (!tbl)
++      return grub_error (GRUB_ERR_IO, "cannot allocate tbl memory");
++    tbl->base = kernel_params->ramdisk_addr;
++    tbl->size = kernel_params->ramdisk_size;
++
++    status = b->install_configuration_table (&initrd_media_guid, tbl);
++    if (status != GRUB_EFI_SUCCESS) {
++      grub_error (GRUB_ERR_IO, "failed to install initrd media");
++      goto free_tbl;
++    }
++  }
++#endif
++
++  tmp.map_size = 0;
++  status = grub_efi_get_memory_map (&tmp.map_size, NULL, &tmp.map_key,
++                    &tmp.desc_size, &tmp.desc_ver);
++  if (status != 0) {
++    grub_error (GRUB_ERR_IO, "cannot get memory map");
++    goto uninstall_initrd_table;
++  }
++  size = tmp.map_size + tmp.desc_size * GRUB_EFI_MMAP_NR_SLACK_SLOTS;
++  m = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (sizeof(*m) + size));
++  if (!m) {
++    grub_error (GRUB_ERR_IO, "cannot allocate m memory");
++    goto uninstall_initrd_table;
++  }
++
++  status = b->install_configuration_table (&boot_memmap_guid, m);
++  if (status != GRUB_EFI_SUCCESS) {
++    grub_error (GRUB_ERR_IO, "failed to install boot memmap");
++    goto free_m;
++  }
++
++  m->buff_size = m->map_size = size;
++  if (grub_efi_get_memory_map (&m->map_size, m->map,
++                   &m->map_key, &m->desc_size,
++                   &m->desc_ver) <= 0)
++    {
++      grub_error (GRUB_ERR_IO, "cannot get EFI memory map");
++      goto uninstall_mem_table;
++    }
++
++  mmap_size = grub_efi_find_mmap_size ();
++  if (! mmap_size)
++    goto uninstall_mem_table;
++
++  mmap_buf = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (mmap_size));
++  err = grub_efi_finish_boot_services (&mmap_size, mmap_buf, NULL,
++                                         &desc_size, &desc_version);
++  if (err) {
++    grub_error (GRUB_ERR_IO, "failed to finish boot services");
++    goto free_map;
++  }
++
++  return 0;
++
++free_map:
++  if (mmap_buf)
++    grub_efi_free_pages ((grub_addr_t) mmap_buf,
++               GRUB_EFI_BYTES_TO_PAGES (mmap_size));
++
++uninstall_mem_table:
++  b->install_configuration_table (&boot_memmap_guid, NULL);
++
++free_m:
++  if (m)
++    grub_efi_free_pages ((grub_addr_t) m,
++               GRUB_EFI_BYTES_TO_PAGES (sizeof(*m) + size));
++
++uninstall_initrd_table:
++  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
++    b->install_configuration_table (&initrd_media_guid, NULL);
++
++free_tbl:
++  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size) {
++    if (tbl)
++      grub_efi_free_pages ((grub_addr_t) tbl,
++               GRUB_EFI_BYTES_TO_PAGES (sizeof(struct efi_initrd)));
++  }
++
++  return grub_error(GRUB_ERR_BAD_OS, "failed to V40 boot");
++}

_service:tar_scm:1004-loongarch-Add-support-for-new-EFI-screen-info-GUID.patch Added

@@ -0,0 +1,62 @@
+From dc3d6e1b080e61a02a8e02e090e3910ca168e616 Mon Sep 17 00:00:00 2001
+From: mengyingkun <mengyingkun@loongson.cn>
+Date: Fri, 10 Mar 2023 11:00:51 +0800
+Subject: [PATCH] loongarch: Add support for new EFI screen info GUID
+
+Support new screen info GUID defined by upstream kernel, and
+keep compatible with old GUID defined by loongson.
+
+Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
+---
+ grub-core/loader/loongarch64/linux-elf.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
+index 15f9984..86a90e7 100644
+--- a/grub-core/loader/loongarch64/linux-elf.c
++++ b/grub-core/loader/loongarch64/linux-elf.c
+@@ -58,8 +58,14 @@
+     { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
+   }
+ 
++#define GRUB_EFI_SCREEN_INFO_GUID \
++  { 0xe03fc20a, 0x85dc, 0x406e,  \
++    { 0xb9, 0x0e, 0x4a, 0xb5, 0x02, 0x37, 0x1d, 0x95 } \
++  }
++
+ static struct grub_relocator *relocator;
+-static grub_efi_guid_t screen_info_guid = GRUB_EFI_LARCH_SCREEN_INFO_GUID;
++static grub_efi_guid_t compat_screen_info_guid = GRUB_EFI_LARCH_SCREEN_INFO_GUID;
++static grub_efi_guid_t screen_info_guid = GRUB_EFI_SCREEN_INFO_GUID;
+ 
+ void grub_linux_loongarch_elf_relocator_unload (void)
+ {
+@@ -161,10 +167,17 @@ alloc_screen_info (void)
+   if (status != GRUB_EFI_SUCCESS)
+     return NULL;
+ 
++  status = b->install_configuration_table (&compat_screen_info_guid, si);
++  if (status != GRUB_EFI_SUCCESS)
++    goto free_mem;
++
+   status = b->install_configuration_table (&screen_info_guid, si);
+   if (status == GRUB_EFI_SUCCESS)
+     return si;
+ 
++free_table:
++  b->install_configuration_table (&compat_screen_info_guid, NULL);
++free_mem:
+   efi_call_1 (b->free_pool, si);
+ 
+   return NULL;
+@@ -276,6 +289,7 @@ setup_screen_info (void)
+ 
+ free_screen_info:
+   b = grub_efi_system_table->boot_services;
++  b->install_configuration_table (&compat_screen_info_guid, NULL);
+   b->install_configuration_table (&screen_info_guid, NULL);
+   if (si)
+     efi_call_1 (b->free_pool, si);
+-- 
+2.33.0
+

_service:tar_scm:1005-loongarch-Force-initrd-load-address-64KiB-alignment.patch Added

@@ -0,0 +1,26 @@
+From 1107e231094bf2e6cde9daea3bb22b1fccb92bc5 Mon Sep 17 00:00:00 2001
+From: mengyingkun <mengyingkun@loongson.cn>
+Date: Sat, 18 Mar 2023 09:33:41 +0800
+Subject: [PATCH] loongarch: Force initrd load address 64KiB alignment
+
+Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
+---
+ grub-core/loader/loongarch64/linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/loongarch64/linux.c b/grub-core/loader/loongarch64/linux.c
+index 03b7940..5f1d845 100644
+--- a/grub-core/loader/loongarch64/linux.c
++++ b/grub-core/loader/loongarch64/linux.c
+@@ -329,7 +329,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+   initrd_size = grub_get_initrd_size (&initrd_ctx);
+   grub_dprintf ("linux", "Loading initrd\n");
+ 
+-  initrd_mem = grub_linux_loongarch_alloc_initrd_mem_align (initrd_size, 0x1000, &err);
++  initrd_mem = grub_linux_loongarch_alloc_initrd_mem_align (initrd_size, 0x10000, &err);
+   if (err)
+     goto fail;
+ 
+-- 
+2.33.0
+

_service:tar_scm:1006-loongarch-Implement-cache-synchronization-operation.patch Added

_service:tar_scm:1007-loongarch-Fix-the-initrd-parameter-passing.patch Added

@@ -0,0 +1,276 @@
+From 3881d41c2fcd1eece2faca8b08577e8e8b30257c Mon Sep 17 00:00:00 2001
+From: Yingkun Meng <mengyingkun@loongson.cn>
+Date: Mon, 7 Aug 2023 11:47:54 +0800
+Subject: [PATCH] loongarch: Fix the initrd parameter passing
+
+When booting with EFI kernel, the kernel can't get
+initrd parameter, resulting in the inability to
+find the initrd.
+
+Change-Id: I61c6cee35853cd3ee5ce98a0bce949f6833d85b1
+Signed-off-by: Yingkun Meng <mengyingkun@loongson.cn>
+---
+ grub-core/loader/loongarch64/linux-efi.c | 44 +---------------
+ grub-core/loader/loongarch64/linux-elf.c | 53 +++----------------
+ grub-core/loader/loongarch64/linux.c     | 66 ++++++++++++++++++++++++
+ include/grub/loongarch64/linux.h         |  6 +++
+ 4 files changed, 80 insertions(+), 89 deletions(-)
+
+diff --git a/grub-core/loader/loongarch64/linux-efi.c b/grub-core/loader/loongarch64/linux-efi.c
+index 4dcefd9d9e27..8e2726163725 100644
+--- a/grub-core/loader/loongarch64/linux-efi.c
++++ b/grub-core/loader/loongarch64/linux-efi.c
+@@ -16,11 +16,9 @@
+  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include <grub/linux.h>
+-#include <grub/fdt.h>
+ #include <grub/efi/efi.h>
+ #include <grub/cpu/linux.h>
+ #include <grub/efi/memory.h>
+-#include <grub/efi/fdtload.h>
+ #include <grub/charset.h>
+ 
+ #define GRUB_EFI_PE_MAGIC	0x5A4D
+@@ -28,47 +26,7 @@
+ grub_err_t
+ finalize_efi_params_linux (struct linux_loongarch64_kernel_params *kernel_params)
+ {
+-  int node, retval;
+-
+-  void *fdt;
+-
+-  fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE);
+-
+-  if (!fdt)
+-    goto failure;
+-
+-  node = grub_fdt_find_subnode (fdt, 0, "chosen");
+-  if (node < 0)
+-    node = grub_fdt_add_subnode (fdt, 0, "chosen");
+-
+-  if (node < 1)
+-    goto failure;
+-
+-  /* Set initrd info */
+-  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
+-    {
+-      grub_dprintf ("linux", "Initrd @ %p-%p\n",
+-		    (void *) kernel_params->ramdisk_addr,
+-		    (void *) (kernel_params->ramdisk_addr + kernel_params->ramdisk_size));
+-
+-      retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-start",
+-				    kernel_params->ramdisk_addr);
+-      if (retval)
+-	goto failure;
+-      retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-end",
+-				    kernel_params->ramdisk_addr + kernel_params->ramdisk_size);
+-      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");
++  return grub_loongarch_setup_initrd_params();
+ }
+ 
+ grub_err_t
+diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
+index 86a90e76b4c3..28d3c90ad6e6 100644
+--- a/grub-core/loader/loongarch64/linux-elf.c
++++ b/grub-core/loader/loongarch64/linux-elf.c
+@@ -308,54 +308,22 @@ allocate_memmap_and_exit_boot (struct linux_loongarch64_kernel_params *kernel_pa
+   grub_efi_memory_descriptor_t *mmap_buf;
+   grub_efi_boot_services_t *b;
+   struct efi_boot_memmap *m, tmp;
+-  struct efi_initrd *tbl = NULL;
+   grub_efi_guid_t boot_memmap_guid = GRUB_EFI_LARCH_BOOT_MEMMAP_GUID;
+-  grub_efi_guid_t initrd_media_guid = GRUB_EFI_LARCH_INITRD_MEDIA_GUID;
+ 
+   setup_screen_info();
+ 
+-  b = grub_efi_system_table->boot_services;
+-
+   grub_dprintf ("loongson", "ramdisk_addr:0x%"PRIxGRUB_UINT64_T", \
+           size:0x%"PRIxGRUB_UINT64_T"\n",
+           kernel_params->ramdisk_addr,
+           kernel_params->ramdisk_size);
+-#if 0
+-  char string[64];
+ 
+-  /* Set initrd info to cmdline*/
+-  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
+-  {
+-    grub_printf ( "Initrd @ %p-%p\n",
+-            (void *) kernel_params->ramdisk_addr,
+-            (void *) (kernel_params->ramdisk_addr + kernel_params->ramdisk_size));
+-    /* initrd */
+-    grub_snprintf (string,
+-         sizeof (GRUB_INITRD_STRING),
+-         "initrd=0x%lx,0x%lx",
+-         ((grub_uint64_t) kernel_params->ramdisk_addr & 0xffffffff),
+-         (grub_uint64_t) kernel_params->ramdisk_size);
+-    *(char*) ((grub_addr_t) kernel_params->linux_args + kernel_params->ramdisk_args_len - 2) = ' ';
+-    grub_memcpy ((char*) ((grub_addr_t) kernel_params->linux_args + kernel_params->ramdisk_args_len - 1),
+-            string, sizeof (GRUB_INITRD_STRING));
+-  }
+-#else
+   /* Set initrd info to system table*/
+-  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
+-  {
+-    tbl = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (sizeof(struct efi_initrd)));
+-    if (!tbl)
+-      return grub_error (GRUB_ERR_IO, "cannot allocate tbl memory");
+-    tbl->base = kernel_params->ramdisk_addr;
+-    tbl->size = kernel_params->ramdisk_size;
+-
+-    status = b->install_configuration_table (&initrd_media_guid, tbl);
+-    if (status != GRUB_EFI_SUCCESS) {
+-      grub_error (GRUB_ERR_IO, "failed to install initrd media");
+-      goto free_tbl;
++  err = grub_loongarch_setup_initrd_params();
++  if (err != GRUB_ERR_NONE)
++    {
++      grub_error(GRUB_ERR_IO, "failed to install initrd media");
++      return err;
+     }
+-  }
+-#endif
+ 
+   tmp.map_size = 0;
+   status = grub_efi_get_memory_map (&tmp.map_size, NULL, &tmp.map_key,
+@@ -371,6 +339,7 @@ allocate_memmap_and_exit_boot (struct linux_loongarch64_kernel_params *kernel_pa
+     goto uninstall_initrd_table;
+   }
+ 
++  b = grub_efi_system_table->boot_services;
+   status = b->install_configuration_table (&boot_memmap_guid, m);
+   if (status != GRUB_EFI_SUCCESS) {
+     grub_error (GRUB_ERR_IO, "failed to install boot memmap");
+@@ -414,15 +383,7 @@ free_m:
+                GRUB_EFI_BYTES_TO_PAGES (sizeof(*m) + size));
+ 
+ uninstall_initrd_table:
+-  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
+-    b->install_configuration_table (&initrd_media_guid, NULL);
+-
+-free_tbl:
+-  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size) {
+-    if (tbl)
+-      grub_efi_free_pages ((grub_addr_t) tbl,
+-               GRUB_EFI_BYTES_TO_PAGES (sizeof(struct efi_initrd)));
+-  }
++  grub_loongarch_remove_initrd_params();
+ 
+   return grub_error(GRUB_ERR_BAD_OS, "failed to V40 boot");
+ }
+diff --git a/grub-core/loader/loongarch64/linux.c b/grub-core/loader/loongarch64/linux.c
+index 5f1d8453b090..0b65249e64d9 100644
+--- a/grub-core/loader/loongarch64/linux.c
++++ b/grub-core/loader/loongarch64/linux.c
+@@ -29,6 +29,11 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ #define INITRD_MAX_ADDRESS_OFFSET (32ULL * 1024 * 1024 * 1024)
+ 
++#define GRUB_EFI_LARCH_INITRD_MEDIA_GUID \
++  { 0x5568e427, 0x68fc, 0x4f3d,  \
++      { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
++  }
++
+ static struct linux_loongarch64_kernel_params kernel_params;
+ 
+ static grub_addr_t phys_addr;
+@@ -36,6 +41,67 @@ static grub_dl_t my_mod;
+ static int loaded;
+ static int is_bpi_boot;
+ static int grub_loongarch_linux_type = GRUB_LOONGARCH_LINUX_BAD;
++struct efi_initrd *initrd_tbl;
++
++grub_err_t
++grub_loongarch_setup_initrd_params (void)
++{
++  grub_efi_boot_services_t *b;
++  grub_efi_guid_t initrd_media_guid = GRUB_EFI_LARCH_INITRD_MEDIA_GUID;

_service:tar_scm:1008-loongarch-Disable-relaxation-relocations.patch Added

@@ -0,0 +1,64 @@
+From 115c628cc44f89207858d0c79e970e43da75c772 Mon Sep 17 00:00:00 2001
+From: Yingkun Meng <mengyingkun@loongson.cn>
+Date: Tue, 5 Dec 2023 19:22:14 +0800
+Subject: [PATCH] loongarch: Disable relaxation relocations
+
+commit 87247635c0d583cfbc1947107d23b40877d107b8 upstream.
+
+A working GRUB cannot be built with upcoming binutils and GCC, because linker
+relaxation was added [1] causing new unsupported relocations to appear in modules.
+
+So we pass -mno-relax to GCC if it is supported, to disable relaxation and make
+GRUB forward-compatible with new toolchains.
+
+While similar code already exists for sparc64 in configure.ac, sparc64 sets
+LDFLAGS while LoongArch requires CFLAGS to be set. If we only set LDFLAGS on
+LoongArch, GCC will still generate relaxation relocations in the .o files, so
+the sparc64 code cannot be reused.
+
+[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=56576f4a722b7398d35802ecf7d4185c27d6d69b
+
+Signed-off-by: Xiaotian Wu <wuxiaotian@loongson.cn>
+Signed-off-by: Yingkun Meng <mengyingkun@loongson.cn>
+Change-Id: I09ef306dc8a0f8a59e9b7dbc53ae3fd3cc09ec55
+---
+ configure.ac | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0db9d7d111b8..e010bc0db465 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -908,6 +908,29 @@ if test "x$target_cpu" = xloongarch64; then
+     TARGET_CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs -fno-plt"
+     TARGET_CCASFLAGS="$TARGET_CCASFLAGS -mno-explicit-relocs -fno-plt"
+   fi
++
++  AC_CACHE_CHECK([for no-relax options], grub_cv_target_cc_mno_relax, [
++    grub_cv_target_cc_mno_relax=no
++    for cand in "-mno-relax" "-Wa,-mno-relax"; do
++      if test x"$grub_cv_target_cc_mno_relax" != xno ; then
++        break
++      fi
++      CFLAGS="$TARGET_CFLAGS $cand -Werror"
++      AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++            asm (".globl start; start:");
++            void __main (void);
++            void __main (void) {}
++            int main (void);
++            ]], [[]])], [grub_cv_target_cc_mno_relax="$cand"], [])
++    done
++  ])
++  CFLAGS="$TARGET_CFLAGS"
++
++  if test x"$grub_cv_target_cc_mno_relax" != xno ; then
++    TARGET_CFLAGS="$TARGET_CFLAGS $grub_cv_target_cc_mno_relax"
++    TARGET_CCASFLAGS="$TARGET_CCASFLAGS $grub_cv_target_cc_mno_relax"
++  fi
++
+   TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mla-global-with-abs"
+   TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mla-global-with-abs"
+ fi
+-- 
+2.33.0
+

_service:tar_scm:grub.patches Changed

@@ -286,13 +286,9 @@
 Patch0287: backport-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch
 Patch0288: backport-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch
 Patch0289: backport-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch
-%ifarch loongarch64
-Patch0290: port-Add-LoongArch-support.patch
-%endif
+Patch0290: 1000-port-Add-LoongArch-support.patch
 Patch0291: disable-some-unsupported-filesystems.patch
-%ifarch loongarch64
-Patch0292: loongarch-Modify-the-location-where-initrd-is-loaded.patch
-%endif
+Patch0292: 1001-loongarch-Modify-the-location-where-initrd-is-loaded.patch
 Patch0293: backport-disk-diskfilter-Check-calloc-result-for-NULL.patch
 Patch0294: backport-kern-buffer-Handle-NULL-input-pointer-in-grub_buffer.patch
 Patch0295: backport-disk-diskfilter-Don-t-make-a-RAID-array-with-more-th.patch
@@ -304,16 +300,12 @@
 Patch0301: backport-fs-xfs-Fix-memory-leaks-in-XFS-module.patch
 Patch0302: backport-fs-squash4-Fix-memory-leaks-in-grub_squash_iterate_d.patch
 Patch0303: backport-fs-iso9660-Fix-memory-leaks-in-grub_iso9660_susp_ite.patch
-%ifarch loongarch64
-Patch0304: loongarch-Add-EFI-frame-buffer-support.patch
-Patch0305: loongarch-Add-support-for-v4.0-interface.patch
-Patch0306: loongarch-Add-support-for-new-EFI-screen-info-GUID.patch
-%endif
+Patch0304: 1002-loongarch-Add-EFI-frame-buffer-support.patch
+Patch0305: 1003-loongarch-Add-support-for-v4.0-interface.patch
+Patch0306: 1004-loongarch-Add-support-for-new-EFI-screen-info-GUID.patch
 Patch0307: 0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
-%ifarch loongarch64
-Patch0308: loongarch-Force-initrd-load-address-64KiB-alignment.patch
-Patch0309: loongarch-Implement-cache-synchronization-operation.patch
-%endif
+Patch0308: 1005-loongarch-Force-initrd-load-address-64KiB-alignment.patch
+Patch0309: 1006-loongarch-Implement-cache-synchronization-operation.patch
 Patch0310: backport-font-Check-return-value-of-grub_malloc-in-ascii_glyph_lookup.patch
 Patch0311: backport-font-Assign-null_font-to-unknown_glyph.patch
 Patch0312: backport-font-Reject-fonts-with-negative-max_char_width-or-max_char_height.patch
@@ -331,9 +323,7 @@
 Patch0324: backport-commands-acpi-Use-xsdt_addr-if-present.patch
 Patch0325: backport-kern-acpi-Use-xsdt_addr-if-present.patch
 Patch0326: remove-the-items-of-unsupported-filesystems-in-fs.ls.patch
-%ifarch loongarch64
-Patch0327: loongarch-Fix-the-initrd-parameter-passing.patch
-%endif
+Patch0327: 1007-loongarch-Fix-the-initrd-parameter-passing.patch
 Patch0328: backport-net-dns-Fix-removal-of-DNS-server.patch
 Patch0329: backport-net-dns-Simplify-error-handling-of-recv_hook-function.patch
 Patch0330: backport-net-dns-Fix-lookup-error-when-no-IPv6-is-returned.patch
@@ -352,3 +342,4 @@
 Patch0343: backport-fs-ntfs-Make-code-more-readable.patch
 Patch0344: add-TPCM-support-with-ipmi-channel.patch
 Patch0345: skip-verification-when-not-loading-grub.cfg.patch
+Patch0346: 1008-loongarch-Disable-relaxation-relocations.patch

_service:tar_scm:loongarch-Add-EFI-frame-buffer-support.patch Deleted

@@ -1,337 +0,0 @@
-From 1ebd229556ba767f76c829b6d00d8a7b5bf28e65 Mon Sep 17 00:00:00 2001
-From: mengyingkun <mengyingkun@loongson.cn>
-Date: Wed, 8 Feb 2023 09:24:05 +0800
-Subject: [PATCH] loongarch: Add EFI frame buffer support
-
-Signed-off-by: yangqiming <yangqiming@loongson.cn>
-Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
----
- grub-core/loader/loongarch64/linux-elf.c | 232 +++++++++++++++++++++++
- include/grub/loongarch64/linux.h         |  47 +++++
- 2 files changed, 279 insertions(+)
-
-diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
-index 8260e4c..852e8f4 100644
---- a/grub-core/loader/loongarch64/linux-elf.c
-+++ b/grub-core/loader/loongarch64/linux-elf.c
-@@ -23,6 +23,7 @@
- #include <grub/elfload.h>
- #include <grub/cpu/relocator.h>
- #include <grub/efi/memory.h>
-+#include <grub/efi/graphics_output.h>
- 
- #define GRUB_ADDRESS_TYPE_SYSRAM	1
- #define GRUB_ADDRESS_TYPE_RESERVED	2
-@@ -34,13 +35,242 @@
- 	{ 0x89, 0x9a, 0x43, 0x18, 0x02, 0x50, 0xa0, 0xc9 } \
-     }
- 
-+#define GRUB_EFI_LARCH_SCREEN_INFO_GUID \
-+  { 0x07fd51a6, 0x9532, 0x926f, \
-+    { 0x51, 0xdc, 0x6a, 0x63, 0x60, 0x2f, 0x84, 0xb4 } \
-+  }
-+
-+#define GRUB_EFI_LARCH_CONSOLE_OUT_DEVICE_GUID \
-+  { 0xd3b36f2c, 0xd551, 0x11d4,  \
-+    { 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
-+  }
-+
- static struct grub_relocator *relocator;
-+static grub_efi_guid_t screen_info_guid = GRUB_EFI_LARCH_SCREEN_INFO_GUID;
- 
- void grub_linux_loongarch_elf_relocator_unload (void)
- {
-   grub_relocator_unload (relocator);
- }
- 
-+static void
-+find_bits (unsigned long mask, grub_efi_uint8_t *pos, grub_efi_uint8_t *size)
-+{
-+  grub_efi_uint8_t first, len;
-+
-+  first = 0;
-+  len = 0;
-+
-+  if (mask)
-+    {
-+      while (!(mask & 0x1))
-+        {
-+    mask = mask >> 1;
-+    first++;
-+        }
-+
-+      while (mask & 0x1)
-+        {
-+    mask = mask >> 1;
-+    len++;
-+        }
-+    }
-+
-+  *pos = first;
-+  *size = len;
-+}
-+
-+static void
-+setup_pixel_info (struct screen_info *si, grub_efi_uint32_t pixels_per_scan_line,
-+                  struct grub_efi_gop_pixel_bitmask pixel_info, int pixel_format)
-+{
-+  if (pixel_format == GRUB_EFI_GOT_RGBA8)
-+    {
-+      si->lfb_depth = 32;
-+      si->lfb_linelength = pixels_per_scan_line * 4;
-+      si->red_size = 8;
-+      si->red_pos = 0;
-+      si->green_size = 8;
-+      si->green_pos = 8;
-+      si->blue_size = 8;
-+      si->blue_pos = 16;
-+      si->rsvd_size = 8;
-+      si->rsvd_pos = 24;
-+    }
-+  else if (pixel_format == GRUB_EFI_GOT_BGRA8)
-+    {
-+      si->lfb_depth = 32;
-+      si->lfb_linelength = pixels_per_scan_line * 4;
-+      si->red_size = 8;
-+      si->red_pos = 16;
-+      si->green_size = 8;
-+      si->green_pos = 8;
-+      si->blue_size = 8;
-+      si->blue_pos = 0;
-+      si->rsvd_size = 8;
-+      si->rsvd_pos = 24;
-+    }
-+  else if (pixel_format == GRUB_EFI_GOT_BITMASK)
-+    {
-+      find_bits(pixel_info.r, &si->red_pos, &si->red_size);
-+      find_bits(pixel_info.g, &si->green_pos, &si->green_size);
-+      find_bits(pixel_info.b, &si->blue_pos, &si->blue_size);
-+      find_bits(pixel_info.a, &si->rsvd_pos, &si->rsvd_size);
-+      si->lfb_depth = si->red_size + si->green_size +
-+                      si->blue_size + si->rsvd_size;
-+      si->lfb_linelength = (pixels_per_scan_line * si->lfb_depth) / 8;
-+    }
-+  else
-+    {
-+      si->lfb_depth = 4;
-+      si->lfb_linelength = si->lfb_width / 2;
-+      si->red_size = 0;
-+      si->red_pos = 0;
-+      si->green_size = 0;
-+      si->green_pos = 0;
-+      si->blue_size = 0;
-+      si->blue_pos = 0;
-+      si->rsvd_size = 0;
-+      si->rsvd_pos = 0;
-+    }
-+}
-+
-+static struct screen_info *
-+alloc_screen_info (void)
-+{
-+  grub_efi_status_t status;
-+  grub_efi_boot_services_t *b;
-+  struct screen_info *si;
-+
-+  b = grub_efi_system_table->boot_services;
-+  status = efi_call_3 (b->allocate_pool, GRUB_EFI_RUNTIME_SERVICES_DATA,
-+                           sizeof(*si), (void**)&si);
-+  if (status != GRUB_EFI_SUCCESS)
-+    return NULL;
-+
-+  status = b->install_configuration_table (&screen_info_guid, si);
-+  if (status == GRUB_EFI_SUCCESS)
-+    return si;
-+
-+  efi_call_1 (b->free_pool, si);
-+
-+  return NULL;
-+}
-+
-+static struct screen_info *
-+setup_screen_info (void)
-+{
-+  grub_efi_boot_services_t *b;
-+  grub_efi_handle_t gop_handle;
-+  struct screen_info *si = NULL;
-+  struct grub_efi_gop *gop, *first_gop;
-+  grub_efi_handle_t *handles;
-+  grub_efi_uintn_t num_handles, i;
-+  grub_efi_guid_t graphics_output_guid = GRUB_EFI_GOP_GUID;
-+  grub_efi_uint16_t width, height;
-+  grub_efi_uint32_t ext_lfb_base, pixels_per_scan_line;
-+  grub_efi_uint64_t fb_base;
-+  struct grub_efi_gop_pixel_bitmask pixel_info;
-+  grub_efi_gop_pixel_format_t pixel_format;
-+
-+  si = alloc_screen_info();
-+  if (!si)
-+    return NULL;
-+
-+  handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL,
-+                    &graphics_output_guid, NULL, &num_handles);
-+  if (!handles || num_handles == 0)
-+    goto free_screen_info;
-+
-+  gop = NULL;
-+  first_gop = NULL;
-+
-+  for (i = 0; i < num_handles; i++)
-+    {
-+      struct grub_efi_gop_mode *mode;
-+      struct grub_efi_gop_mode_info *info = NULL;
-+      grub_efi_guid_t conout_proto = GRUB_EFI_LARCH_CONSOLE_OUT_DEVICE_GUID;
-+      void *dummy = NULL;
-+      grub_efi_uint8_t conout_found = 0;
-+      grub_efi_uint64_t current_fb_base;
-+
-+      gop_handle = handles[i];
-+      gop = grub_efi_open_protocol (gop_handle, &graphics_output_guid,
-+            GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
-+
-+      dummy = grub_efi_open_protocol (gop_handle, &conout_proto,
-+                GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
-+      if (dummy != NULL)
-+        conout_found = 1;
-+
-+      mode = gop->mode;
-+      info = mode->info;
-+      current_fb_base = mode->fb_base;

_service:tar_scm:loongarch-Add-support-for-new-EFI-screen-info-GUID.patch Deleted

@@ -1,62 +0,0 @@
-From dc3d6e1b080e61a02a8e02e090e3910ca168e616 Mon Sep 17 00:00:00 2001
-From: mengyingkun <mengyingkun@loongson.cn>
-Date: Fri, 10 Mar 2023 11:00:51 +0800
-Subject: [PATCH] loongarch: Add support for new EFI screen info GUID
-
-Support new screen info GUID defined by upstream kernel, and
-keep compatible with old GUID defined by loongson.
-
-Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
----
- grub-core/loader/loongarch64/linux-elf.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
-index 15f9984..86a90e7 100644
---- a/grub-core/loader/loongarch64/linux-elf.c
-+++ b/grub-core/loader/loongarch64/linux-elf.c
-@@ -58,8 +58,14 @@
-     { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
-   }
- 
-+#define GRUB_EFI_SCREEN_INFO_GUID \
-+  { 0xe03fc20a, 0x85dc, 0x406e,  \
-+    { 0xb9, 0x0e, 0x4a, 0xb5, 0x02, 0x37, 0x1d, 0x95 } \
-+  }
-+
- static struct grub_relocator *relocator;
--static grub_efi_guid_t screen_info_guid = GRUB_EFI_LARCH_SCREEN_INFO_GUID;
-+static grub_efi_guid_t compat_screen_info_guid = GRUB_EFI_LARCH_SCREEN_INFO_GUID;
-+static grub_efi_guid_t screen_info_guid = GRUB_EFI_SCREEN_INFO_GUID;
- 
- void grub_linux_loongarch_elf_relocator_unload (void)
- {
-@@ -161,10 +167,17 @@ alloc_screen_info (void)
-   if (status != GRUB_EFI_SUCCESS)
-     return NULL;
- 
-+  status = b->install_configuration_table (&compat_screen_info_guid, si);
-+  if (status != GRUB_EFI_SUCCESS)
-+    goto free_mem;
-+
-   status = b->install_configuration_table (&screen_info_guid, si);
-   if (status == GRUB_EFI_SUCCESS)
-     return si;
- 
-+free_table:
-+  b->install_configuration_table (&compat_screen_info_guid, NULL);
-+free_mem:
-   efi_call_1 (b->free_pool, si);
- 
-   return NULL;
-@@ -276,6 +289,7 @@ setup_screen_info (void)
- 
- free_screen_info:
-   b = grub_efi_system_table->boot_services;
-+  b->install_configuration_table (&compat_screen_info_guid, NULL);
-   b->install_configuration_table (&screen_info_guid, NULL);
-   if (si)
-     efi_call_1 (b->free_pool, si);
--- 
-2.33.0
-

_service:tar_scm:loongarch-Add-support-for-v4.0-interface.patch Deleted

@@ -1,434 +0,0 @@
-From d984a64ff93443630fde3211e1a8ec42d92a6b56 Mon Sep 17 00:00:00 2001
-From: mengyingkun <mengyingkun@loongson.cn>
-Date: Mon, 13 Feb 2023 14:40:16 +0800
-Subject: [PATCH] loongarch: Add support for v4.0 interface
-
-This patch adds support for parameter passing converntion
-between bootloader and kernel, defined in the document
-"loongson devsys firmware kernel interface specification v4.0"
-
-Signed-off-by: yangqiming <yangqiming@loongson.cn>
-Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
----
- grub-core/lib/loongarch64/relocator.c    |   2 +-
- grub-core/loader/loongarch64/linux-elf.c | 177 ++++++++++++++++++++---
- grub-core/loader/loongarch64/linux.c     |  49 ++-----
- include/grub/loongarch64/linux.h         |  20 +++
- 4 files changed, 190 insertions(+), 58 deletions(-)
-
-diff --git a/grub-core/lib/loongarch64/relocator.c b/grub-core/lib/loongarch64/relocator.c
-index faa4553..587fc58 100644
---- a/grub-core/lib/loongarch64/relocator.c
-+++ b/grub-core/lib/loongarch64/relocator.c
-@@ -122,7 +122,7 @@ grub_relocator64_boot (struct grub_relocator *rel,
-   unsigned i;
-   grub_addr_t vtarget;
- 
--  err = grub_relocator_alloc_chunk_align (rel, &ch, 0,
-+  err = grub_relocator_alloc_chunk_align (rel, &ch, 0x3000000,
- 					  (0xffffffff - stateset_size)
- 					  + 1, stateset_size,
- 					  grub_relocator_align,
-diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
-index 852e8f4..15f9984 100644
---- a/grub-core/loader/loongarch64/linux-elf.c
-+++ b/grub-core/loader/loongarch64/linux-elf.c
-@@ -25,11 +25,14 @@
- #include <grub/efi/memory.h>
- #include <grub/efi/graphics_output.h>
- 
-+#define GRUB_EFI_MMAP_NR_SLACK_SLOTS 8
-+
- #define GRUB_ADDRESS_TYPE_SYSRAM	1
- #define GRUB_ADDRESS_TYPE_RESERVED	2
- #define GRUB_ADDRESS_TYPE_ACPI		3
- #define GRUB_ADDRESS_TYPE_NVS		4
- #define GRUB_ADDRESS_TYPE_PMEM		5
-+
- #define GRUB_EFI_LOONGSON_BPI_TABLE_GUID	\
-     { 0x4660f721, 0x2ec5, 0x416a, \
- 	{ 0x89, 0x9a, 0x43, 0x18, 0x02, 0x50, 0xa0, 0xc9 } \
-@@ -45,6 +48,16 @@
-     { 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
-   }
- 
-+#define GRUB_EFI_LARCH_BOOT_MEMMAP_GUID \
-+  { 0x800f683f, 0xd08b, 0x423a,  \
-+    { 0xa2, 0x93, 0x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4 } \
-+  }
-+
-+#define GRUB_EFI_LARCH_INITRD_MEDIA_GUID \
-+  { 0x5568e427, 0x68fc, 0x4f3d,  \
-+    { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
-+  }
-+
- static struct grub_relocator *relocator;
- static grub_efi_guid_t screen_info_guid = GRUB_EFI_LARCH_SCREEN_INFO_GUID;
- 
-@@ -271,6 +284,135 @@ free_screen_info:
-   return NULL;
- }
- 
-+static grub_err_t
-+allocate_memmap_and_exit_boot (struct linux_loongarch64_kernel_params *kernel_params)
-+{
-+  grub_err_t err;
-+  grub_efi_status_t status;
-+  grub_efi_uintn_t mmap_size, desc_size, size;
-+  grub_efi_uint32_t desc_version;
-+  grub_efi_memory_descriptor_t *mmap_buf;
-+  grub_efi_boot_services_t *b;
-+  struct efi_boot_memmap *m, tmp;
-+  struct efi_initrd *tbl = NULL;
-+  grub_efi_guid_t boot_memmap_guid = GRUB_EFI_LARCH_BOOT_MEMMAP_GUID;
-+  grub_efi_guid_t initrd_media_guid = GRUB_EFI_LARCH_INITRD_MEDIA_GUID;
-+
-+  setup_screen_info();
-+
-+  b = grub_efi_system_table->boot_services;
-+
-+  grub_dprintf ("loongson", "ramdisk_addr:0x%"PRIxGRUB_UINT64_T", \
-+          size:0x%"PRIxGRUB_UINT64_T"\n",
-+          kernel_params->ramdisk_addr,
-+          kernel_params->ramdisk_size);
-+#if 0
-+  char string[64];
-+
-+  /* Set initrd info to cmdline*/
-+  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
-+  {
-+    grub_printf ( "Initrd @ %p-%p\n",
-+            (void *) kernel_params->ramdisk_addr,
-+            (void *) (kernel_params->ramdisk_addr + kernel_params->ramdisk_size));
-+    /* initrd */
-+    grub_snprintf (string,
-+         sizeof (GRUB_INITRD_STRING),
-+         "initrd=0x%lx,0x%lx",
-+         ((grub_uint64_t) kernel_params->ramdisk_addr & 0xffffffff),
-+         (grub_uint64_t) kernel_params->ramdisk_size);
-+    *(char*) ((grub_addr_t) kernel_params->linux_args + kernel_params->ramdisk_args_len - 2) = ' ';
-+    grub_memcpy ((char*) ((grub_addr_t) kernel_params->linux_args + kernel_params->ramdisk_args_len - 1),
-+            string, sizeof (GRUB_INITRD_STRING));
-+  }
-+#else
-+  /* Set initrd info to system table*/
-+  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
-+  {
-+    tbl = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (sizeof(struct efi_initrd)));
-+    if (!tbl)
-+      return grub_error (GRUB_ERR_IO, "cannot allocate tbl memory");
-+    tbl->base = kernel_params->ramdisk_addr;
-+    tbl->size = kernel_params->ramdisk_size;
-+
-+    status = b->install_configuration_table (&initrd_media_guid, tbl);
-+    if (status != GRUB_EFI_SUCCESS) {
-+      grub_error (GRUB_ERR_IO, "failed to install initrd media");
-+      goto free_tbl;
-+    }
-+  }
-+#endif
-+
-+  tmp.map_size = 0;
-+  status = grub_efi_get_memory_map (&tmp.map_size, NULL, &tmp.map_key,
-+                    &tmp.desc_size, &tmp.desc_ver);
-+  if (status != 0) {
-+    grub_error (GRUB_ERR_IO, "cannot get memory map");
-+    goto uninstall_initrd_table;
-+  }
-+  size = tmp.map_size + tmp.desc_size * GRUB_EFI_MMAP_NR_SLACK_SLOTS;
-+  m = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (sizeof(*m) + size));
-+  if (!m) {
-+    grub_error (GRUB_ERR_IO, "cannot allocate m memory");
-+    goto uninstall_initrd_table;
-+  }
-+
-+  status = b->install_configuration_table (&boot_memmap_guid, m);
-+  if (status != GRUB_EFI_SUCCESS) {
-+    grub_error (GRUB_ERR_IO, "failed to install boot memmap");
-+    goto free_m;
-+  }
-+
-+  m->buff_size = m->map_size = size;
-+  if (grub_efi_get_memory_map (&m->map_size, m->map,
-+                   &m->map_key, &m->desc_size,
-+                   &m->desc_ver) <= 0)
-+    {
-+      grub_error (GRUB_ERR_IO, "cannot get EFI memory map");
-+      goto uninstall_mem_table;
-+    }
-+
-+  mmap_size = grub_efi_find_mmap_size ();
-+  if (! mmap_size)
-+    goto uninstall_mem_table;
-+
-+  mmap_buf = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (mmap_size));
-+  err = grub_efi_finish_boot_services (&mmap_size, mmap_buf, NULL,
-+                                         &desc_size, &desc_version);
-+  if (err) {
-+    grub_error (GRUB_ERR_IO, "failed to finish boot services");
-+    goto free_map;
-+  }
-+
-+  return 0;
-+
-+free_map:
-+  if (mmap_buf)
-+    grub_efi_free_pages ((grub_addr_t) mmap_buf,
-+               GRUB_EFI_BYTES_TO_PAGES (mmap_size));
-+
-+uninstall_mem_table:
-+  b->install_configuration_table (&boot_memmap_guid, NULL);
-+
-+free_m:
-+  if (m)
-+    grub_efi_free_pages ((grub_addr_t) m,
-+               GRUB_EFI_BYTES_TO_PAGES (sizeof(*m) + size));
-+
-+uninstall_initrd_table:
-+  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
-+    b->install_configuration_table (&initrd_media_guid, NULL);
-+
-+free_tbl:
-+  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size) {
-+    if (tbl)
-+      grub_efi_free_pages ((grub_addr_t) tbl,
-+               GRUB_EFI_BYTES_TO_PAGES (sizeof(struct efi_initrd)));
-+  }
-+
-+  return grub_error(GRUB_ERR_BAD_OS, "failed to V40 boot");
-+}

_service:tar_scm:loongarch-Fix-the-initrd-parameter-passing.patch Deleted

@@ -1,276 +0,0 @@
-From 3881d41c2fcd1eece2faca8b08577e8e8b30257c Mon Sep 17 00:00:00 2001
-From: Yingkun Meng <mengyingkun@loongson.cn>
-Date: Mon, 7 Aug 2023 11:47:54 +0800
-Subject: [PATCH] loongarch: Fix the initrd parameter passing
-
-When booting with EFI kernel, the kernel can't get
-initrd parameter, resulting in the inability to
-find the initrd.
-
-Change-Id: I61c6cee35853cd3ee5ce98a0bce949f6833d85b1
-Signed-off-by: Yingkun Meng <mengyingkun@loongson.cn>
----
- grub-core/loader/loongarch64/linux-efi.c | 44 +---------------
- grub-core/loader/loongarch64/linux-elf.c | 53 +++----------------
- grub-core/loader/loongarch64/linux.c     | 66 ++++++++++++++++++++++++
- include/grub/loongarch64/linux.h         |  6 +++
- 4 files changed, 80 insertions(+), 89 deletions(-)
-
-diff --git a/grub-core/loader/loongarch64/linux-efi.c b/grub-core/loader/loongarch64/linux-efi.c
-index 4dcefd9d9e27..8e2726163725 100644
---- a/grub-core/loader/loongarch64/linux-efi.c
-+++ b/grub-core/loader/loongarch64/linux-efi.c
-@@ -16,11 +16,9 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- #include <grub/linux.h>
--#include <grub/fdt.h>
- #include <grub/efi/efi.h>
- #include <grub/cpu/linux.h>
- #include <grub/efi/memory.h>
--#include <grub/efi/fdtload.h>
- #include <grub/charset.h>
- 
- #define GRUB_EFI_PE_MAGIC	0x5A4D
-@@ -28,47 +26,7 @@
- grub_err_t
- finalize_efi_params_linux (struct linux_loongarch64_kernel_params *kernel_params)
- {
--  int node, retval;
--
--  void *fdt;
--
--  fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE);
--
--  if (!fdt)
--    goto failure;
--
--  node = grub_fdt_find_subnode (fdt, 0, "chosen");
--  if (node < 0)
--    node = grub_fdt_add_subnode (fdt, 0, "chosen");
--
--  if (node < 1)
--    goto failure;
--
--  /* Set initrd info */
--  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
--    {
--      grub_dprintf ("linux", "Initrd @ %p-%p\n",
--		    (void *) kernel_params->ramdisk_addr,
--		    (void *) (kernel_params->ramdisk_addr + kernel_params->ramdisk_size));
--
--      retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-start",
--				    kernel_params->ramdisk_addr);
--      if (retval)
--	goto failure;
--      retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-end",
--				    kernel_params->ramdisk_addr + kernel_params->ramdisk_size);
--      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");
-+  return grub_loongarch_setup_initrd_params();
- }
- 
- grub_err_t
-diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
-index 86a90e76b4c3..28d3c90ad6e6 100644
---- a/grub-core/loader/loongarch64/linux-elf.c
-+++ b/grub-core/loader/loongarch64/linux-elf.c
-@@ -308,54 +308,22 @@ allocate_memmap_and_exit_boot (struct linux_loongarch64_kernel_params *kernel_pa
-   grub_efi_memory_descriptor_t *mmap_buf;
-   grub_efi_boot_services_t *b;
-   struct efi_boot_memmap *m, tmp;
--  struct efi_initrd *tbl = NULL;
-   grub_efi_guid_t boot_memmap_guid = GRUB_EFI_LARCH_BOOT_MEMMAP_GUID;
--  grub_efi_guid_t initrd_media_guid = GRUB_EFI_LARCH_INITRD_MEDIA_GUID;
- 
-   setup_screen_info();
- 
--  b = grub_efi_system_table->boot_services;
--
-   grub_dprintf ("loongson", "ramdisk_addr:0x%"PRIxGRUB_UINT64_T", \
-           size:0x%"PRIxGRUB_UINT64_T"\n",
-           kernel_params->ramdisk_addr,
-           kernel_params->ramdisk_size);
--#if 0
--  char string[64];
- 
--  /* Set initrd info to cmdline*/
--  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
--  {
--    grub_printf ( "Initrd @ %p-%p\n",
--            (void *) kernel_params->ramdisk_addr,
--            (void *) (kernel_params->ramdisk_addr + kernel_params->ramdisk_size));
--    /* initrd */
--    grub_snprintf (string,
--         sizeof (GRUB_INITRD_STRING),
--         "initrd=0x%lx,0x%lx",
--         ((grub_uint64_t) kernel_params->ramdisk_addr & 0xffffffff),
--         (grub_uint64_t) kernel_params->ramdisk_size);
--    *(char*) ((grub_addr_t) kernel_params->linux_args + kernel_params->ramdisk_args_len - 2) = ' ';
--    grub_memcpy ((char*) ((grub_addr_t) kernel_params->linux_args + kernel_params->ramdisk_args_len - 1),
--            string, sizeof (GRUB_INITRD_STRING));
--  }
--#else
-   /* Set initrd info to system table*/
--  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
--  {
--    tbl = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (sizeof(struct efi_initrd)));
--    if (!tbl)
--      return grub_error (GRUB_ERR_IO, "cannot allocate tbl memory");
--    tbl->base = kernel_params->ramdisk_addr;
--    tbl->size = kernel_params->ramdisk_size;
--
--    status = b->install_configuration_table (&initrd_media_guid, tbl);
--    if (status != GRUB_EFI_SUCCESS) {
--      grub_error (GRUB_ERR_IO, "failed to install initrd media");
--      goto free_tbl;
-+  err = grub_loongarch_setup_initrd_params();
-+  if (err != GRUB_ERR_NONE)
-+    {
-+      grub_error(GRUB_ERR_IO, "failed to install initrd media");
-+      return err;
-     }
--  }
--#endif
- 
-   tmp.map_size = 0;
-   status = grub_efi_get_memory_map (&tmp.map_size, NULL, &tmp.map_key,
-@@ -371,6 +339,7 @@ allocate_memmap_and_exit_boot (struct linux_loongarch64_kernel_params *kernel_pa
-     goto uninstall_initrd_table;
-   }
- 
-+  b = grub_efi_system_table->boot_services;
-   status = b->install_configuration_table (&boot_memmap_guid, m);
-   if (status != GRUB_EFI_SUCCESS) {
-     grub_error (GRUB_ERR_IO, "failed to install boot memmap");
-@@ -414,15 +383,7 @@ free_m:
-                GRUB_EFI_BYTES_TO_PAGES (sizeof(*m) + size));
- 
- uninstall_initrd_table:
--  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size)
--    b->install_configuration_table (&initrd_media_guid, NULL);
--
--free_tbl:
--  if (kernel_params->ramdisk_addr && kernel_params->ramdisk_size) {
--    if (tbl)
--      grub_efi_free_pages ((grub_addr_t) tbl,
--               GRUB_EFI_BYTES_TO_PAGES (sizeof(struct efi_initrd)));
--  }
-+  grub_loongarch_remove_initrd_params();
- 
-   return grub_error(GRUB_ERR_BAD_OS, "failed to V40 boot");
- }
-diff --git a/grub-core/loader/loongarch64/linux.c b/grub-core/loader/loongarch64/linux.c
-index 5f1d8453b090..0b65249e64d9 100644
---- a/grub-core/loader/loongarch64/linux.c
-+++ b/grub-core/loader/loongarch64/linux.c
-@@ -29,6 +29,11 @@ GRUB_MOD_LICENSE ("GPLv3+");
- 
- #define INITRD_MAX_ADDRESS_OFFSET (32ULL * 1024 * 1024 * 1024)
- 
-+#define GRUB_EFI_LARCH_INITRD_MEDIA_GUID \
-+  { 0x5568e427, 0x68fc, 0x4f3d,  \
-+      { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
-+  }
-+
- static struct linux_loongarch64_kernel_params kernel_params;
- 
- static grub_addr_t phys_addr;
-@@ -36,6 +41,67 @@ static grub_dl_t my_mod;
- static int loaded;
- static int is_bpi_boot;
- static int grub_loongarch_linux_type = GRUB_LOONGARCH_LINUX_BAD;
-+struct efi_initrd *initrd_tbl;
-+
-+grub_err_t
-+grub_loongarch_setup_initrd_params (void)
-+{
-+  grub_efi_boot_services_t *b;
-+  grub_efi_guid_t initrd_media_guid = GRUB_EFI_LARCH_INITRD_MEDIA_GUID;

_service:tar_scm:loongarch-Force-initrd-load-address-64KiB-alignment.patch Deleted

@@ -1,26 +0,0 @@
-From 1107e231094bf2e6cde9daea3bb22b1fccb92bc5 Mon Sep 17 00:00:00 2001
-From: mengyingkun <mengyingkun@loongson.cn>
-Date: Sat, 18 Mar 2023 09:33:41 +0800
-Subject: [PATCH] loongarch: Force initrd load address 64KiB alignment
-
-Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
----
- grub-core/loader/loongarch64/linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/loader/loongarch64/linux.c b/grub-core/loader/loongarch64/linux.c
-index 03b7940..5f1d845 100644
---- a/grub-core/loader/loongarch64/linux.c
-+++ b/grub-core/loader/loongarch64/linux.c
-@@ -329,7 +329,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-   initrd_size = grub_get_initrd_size (&initrd_ctx);
-   grub_dprintf ("linux", "Loading initrd\n");
- 
--  initrd_mem = grub_linux_loongarch_alloc_initrd_mem_align (initrd_size, 0x1000, &err);
-+  initrd_mem = grub_linux_loongarch_alloc_initrd_mem_align (initrd_size, 0x10000, &err);
-   if (err)
-     goto fail;
- 
--- 
-2.33.0
-

_service:tar_scm:loongarch-Implement-cache-synchronization-operation.patch Deleted

_service:tar_scm:loongarch-Modify-the-location-where-initrd-is-loaded.patch Deleted

@@ -1,82 +0,0 @@
-From 062741f3d9878bcbd4556f3bfe73d1bead458255 Mon Sep 17 00:00:00 2001
-From: mengyingkun <mengyingkun@loongson.cn>
-Date: Thu, 2 Feb 2023 20:32:17 +0800
-Subject: [PATCH] loongarch: Modify the location where initrd is loaded into
- memory
-
-Try to allocate memory from higher than 256MB to
-avoid kernel relocation overlaying initrd. If failed,
-allocate memory in range 0~256MB, and high address
-takes precedence.
-
-Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
----
- grub-core/loader/loongarch64/linux-elf.c | 21 +++++++++++++++++++++
- grub-core/loader/loongarch64/linux.c     |  2 +-
- include/grub/loongarch64/linux.h         |  5 +++++
- 3 files changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c
-index 85585b4..8260e4c 100644
---- a/grub-core/loader/loongarch64/linux-elf.c
-+++ b/grub-core/loader/loongarch64/linux-elf.c
-@@ -304,6 +304,27 @@ grub_linux_loongarch_alloc_virtual_mem_align (grub_size_t size,
-   return get_virtual_current_address (ch);
- }
- 
-+void*
-+grub_linux_loongarch_alloc_initrd_mem_align (grub_size_t size,
-+                 grub_size_t align,
-+                 grub_err_t *err)
-+{
-+  grub_relocator_chunk_t ch;
-+
-+  /* Firstly try to allocate from memory higher than 256MB */
-+  *err = grub_relocator_alloc_chunk_align (relocator, &ch,
-+              0x10000000, (0xffffffff - size) + 1, size, align,
-+              GRUB_RELOCATOR_PREFERENCE_LOW, 0);
-+  if (*err != GRUB_ERR_NONE)
-+    {
-+      /* Failed, try to allocate in range 0 ~ 256MB */
-+      *err = grub_relocator_alloc_chunk_align (relocator, &ch,
-+                  0, (0xfffffff - size) + 1, size, align,
-+                  GRUB_RELOCATOR_PREFERENCE_HIGH, 0);
-+    }
-+  return get_virtual_current_address (ch);
-+}
-+
- int
- grub_linux_loongarch_elf_get_boot_params (struct boot_params_interface **boot_params)
- {
-diff --git a/grub-core/loader/loongarch64/linux.c b/grub-core/loader/loongarch64/linux.c
-index 783054b..4c02194 100644
---- a/grub-core/loader/loongarch64/linux.c
-+++ b/grub-core/loader/loongarch64/linux.c
-@@ -351,7 +351,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-       initrd_mem = allocate_initrd_mem (initrd_pages);
-   } else {
-       grub_err_t err;
--      initrd_mem = grub_linux_loongarch_alloc_virtual_mem_align (initrd_size, 0x10000, &err);
-+      initrd_mem = grub_linux_loongarch_alloc_initrd_mem_align (initrd_size, 0x10000, &err);
-       if (err)
- 	goto fail;
-   }
-diff --git a/include/grub/loongarch64/linux.h b/include/grub/loongarch64/linux.h
-index af1f51d..f4b198a 100644
---- a/include/grub/loongarch64/linux.h
-+++ b/include/grub/loongarch64/linux.h
-@@ -129,6 +129,11 @@ grub_linux_loongarch_alloc_virtual_mem_align (grub_size_t size,
- 					      grub_size_t align,
- 					      grub_err_t *err);
- 
-+void*
-+grub_linux_loongarch_alloc_initrd_mem_align (grub_size_t size,
-+                          grub_size_t align,
-+                          grub_err_t *err);
-+
- void
- grub_linux_loongarch_elf_relocator_unload (void);
- 
--- 
-2.33.0
-

_service:tar_scm:port-Add-LoongArch-support.patch Deleted

@@ -1,3574 +0,0 @@
-From 781cdb1573ffb77ed6d507d8daa7c6ff92256c57 Mon Sep 17 00:00:00 2001
-From: mengyingkun <mengyingkun@loongson.cn>
-Date: Thu, 12 Jan 2023 14:44:13 +0800
-Subject: [PATCH] port: Add LoongArch support
-
-This patch adds support for LoongArch. From now on, we can boot up
-grub as a UEFI application on LoongArch platform.
-
-Signed-off-by: yangqiming <yangqiming@loongson.cn>
-Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
----
- Makefile.util.def                             |   1 +
- bootstrap.conf                                |   4 +
- configure.ac                                  |  24 +
- gentpl.py                                     |   9 +-
- grub-core/Makefile.am                         |   6 +
- grub-core/Makefile.core.def                   |  23 +
- grub-core/kern/dl.c                           |   9 +-
- grub-core/kern/efi/mm.c                       |   3 +-
- grub-core/kern/loongarch64/cache.S            |  26 +
- grub-core/kern/loongarch64/dl.c               | 150 +++++
- grub-core/kern/loongarch64/dl_helper.c        | 264 +++++++++
- grub-core/kern/loongarch64/efi/init.c         |  73 +++
- grub-core/kern/loongarch64/efi/startup.S      |  45 ++
- grub-core/kern/loongarch64/init.c             |  47 ++
- .../lib/gnulib-patches/fix-loongarch.patch    |  26 +
- grub-core/lib/loongarch64/relocator.c         | 163 ++++++
- grub-core/lib/loongarch64/relocator_asm.S     |  51 ++
- grub-core/lib/loongarch64/setjmp.S            |  68 +++
- grub-core/lib/setjmp.S                        |   2 +
- grub-core/loader/efi/chainloader.c            |   2 +
- grub-core/loader/loongarch64/linux-efi.c      | 144 +++++
- grub-core/loader/loongarch64/linux-elf.c      | 529 ++++++++++++++++++
- grub-core/loader/loongarch64/linux.c          | 398 +++++++++++++
- include/grub/efi/api.h                        |   2 +-
- include/grub/efi/efi.h                        |   6 +-
- include/grub/efi/pe32.h                       |   4 +
- include/grub/elf.h                            |  30 +
- include/grub/fdt.h                            |   4 +-
- include/grub/loongarch64/efi/loader.h         |  25 +
- include/grub/loongarch64/efi/memory.h         |  15 +
- include/grub/loongarch64/efi/time.h           |   0
- include/grub/loongarch64/io.h                 |  62 ++
- include/grub/loongarch64/linux.h              | 144 +++++
- include/grub/loongarch64/loongarch64.h        |  30 +
- include/grub/loongarch64/memory.h             |  59 ++
- include/grub/loongarch64/reloc.h              | 113 ++++
- include/grub/loongarch64/relocator.h          |  38 ++
- include/grub/loongarch64/setjmp.h             |  27 +
- include/grub/loongarch64/time.h               |  39 ++
- include/grub/loongarch64/types.h              |  34 ++
- include/grub/util/install.h                   |   1 +
- util/grub-install-common.c                    |   1 +
- util/grub-install.c                           |  16 +
- util/grub-mkimagexx.c                         |  99 +++-
- util/grub-module-verifier.c                   |  15 +
- util/mkimage.c                                |  16 +
- 46 files changed, 2833 insertions(+), 14 deletions(-)
- create mode 100644 grub-core/kern/loongarch64/cache.S
- create mode 100644 grub-core/kern/loongarch64/dl.c
- create mode 100644 grub-core/kern/loongarch64/dl_helper.c
- create mode 100644 grub-core/kern/loongarch64/efi/init.c
- create mode 100644 grub-core/kern/loongarch64/efi/startup.S
- create mode 100644 grub-core/kern/loongarch64/init.c
- create mode 100644 grub-core/lib/gnulib-patches/fix-loongarch.patch
- create mode 100644 grub-core/lib/loongarch64/relocator.c
- create mode 100644 grub-core/lib/loongarch64/relocator_asm.S
- create mode 100644 grub-core/lib/loongarch64/setjmp.S
- create mode 100644 grub-core/loader/loongarch64/linux-efi.c
- create mode 100644 grub-core/loader/loongarch64/linux-elf.c
- create mode 100644 grub-core/loader/loongarch64/linux.c
- create mode 100644 include/grub/loongarch64/efi/loader.h
- create mode 100644 include/grub/loongarch64/efi/memory.h
- create mode 100644 include/grub/loongarch64/efi/time.h
- create mode 100644 include/grub/loongarch64/io.h
- create mode 100644 include/grub/loongarch64/linux.h
- create mode 100644 include/grub/loongarch64/loongarch64.h
- create mode 100644 include/grub/loongarch64/memory.h
- create mode 100644 include/grub/loongarch64/reloc.h
- create mode 100644 include/grub/loongarch64/relocator.h
- create mode 100644 include/grub/loongarch64/setjmp.h
- create mode 100644 include/grub/loongarch64/time.h
- create mode 100644 include/grub/loongarch64/types.h
-
-diff --git a/Makefile.util.def b/Makefile.util.def
-index b7a6311..932a8c2 100644
---- a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -169,6 +169,7 @@ library = {
-   common = grub-core/kern/ia64/dl_helper.c;
-   common = grub-core/kern/arm/dl_helper.c;
-   common = grub-core/kern/arm64/dl_helper.c;
-+  common = grub-core/kern/loongarch64/dl_helper.c;
-   common = grub-core/lib/minilzo/minilzo.c;
-   common = grub-core/lib/xzembed/xz_dec_bcj.c;
-   common = grub-core/lib/xzembed/xz_dec_lzma2.c;
-diff --git a/bootstrap.conf b/bootstrap.conf
-index 03f1093..854d3c0 100644
---- a/bootstrap.conf
-+++ b/bootstrap.conf
-@@ -85,6 +85,10 @@ cp -a INSTALL INSTALL.grub
- 
- bootstrap_post_import_hook () {
-   set -e
-+  for patchname in fix-loongarch; do
-+    patch -d gnulib -p1 \
-+      < "grub-core/lib/gnulib-patches/$patchname.patch"
-+  done
-   for patchname in \
-       0001-Support-POTFILES-shell \
-       0002-Handle-gettext_printf-shell-function \
-diff --git a/configure.ac b/configure.ac
-index 0a9522a..d03e089 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -149,6 +149,10 @@ case "$target_cpu" in
-   riscv64*)
- 		target_cpu=riscv64
- 		;;
-+  loongarch64)
-+		target_cpu=loongarch64
-+		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_LOONGARCH64=1"
-+		;;
- esac
- 
- # Specify the platform (such as firmware).
-@@ -167,6 +171,7 @@ if test "x$with_platform" = x; then
-     powerpc64-*) platform=ieee1275 ;;
-     powerpc64le-*) platform=ieee1275 ;;
-     sparc64-*) platform=ieee1275 ;;
-+    loongarch64-*) platform=efi ;;
-     mipsel-*) platform=loongson ;;
-     mips-*) platform=arc ;;
-     ia64-*) platform=efi ;;
-@@ -218,6 +223,7 @@ case "$target_cpu"-"$platform" in
-   mipsel-yeeloong) platform=loongson ;;
-   mipsel-fuloong) platform=loongson ;;
-   mipsel-loongson) ;;
-+  loongarch64-efi) ;;
-   arm-uboot) ;;
-   arm-coreboot) ;;
-   arm-efi) ;;
-@@ -276,6 +282,7 @@ case "$platform" in
-   pc)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_PCBIOS=1" ;;
-   emu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_EMU=1" ;;
-   loongson)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_LOONGSON=1" ;;
-+  loongson64)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_LOONARCH64=1" ;;
-   qemu_mips)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_QEMU_MIPS=1" ;;
-   arc)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_ARC=1" ;;
- esac
-@@ -890,6 +897,21 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
-   TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
- fi
- 
-+if test "x$target_cpu" = xloongarch64; then
-+  AC_CACHE_CHECK([whether _mno_explicit_relocs works], [grub_cv_cc_mno_explicit_relocs], [
-+    CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs -Werror"
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-+       [grub_cv_cc_mno_explicit_relocs=yes],
-+       [grub_cv_cc_mno_explicit_relocs=no])
-+  ])
-+  if test "x$grub_cv_cc_mno_explicit_relocs" = xyes; then
-+    TARGET_CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs -fno-plt"
-+    TARGET_CCASFLAGS="$TARGET_CCASFLAGS -mno-explicit-relocs -fno-plt"
-+  fi
-+  TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mla-global-with-abs"
-+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mla-global-with-abs"
-+fi
-+
- # Should grub utils get the host CFLAGS, or the target CFLAGS?
- AC_ARG_WITH([utils],
-             AS_HELP_STRING([--with-utils=host|target|build],
-@@ -2166,6 +2188,8 @@ AM_CONDITIONAL([COND_mips_arc], [test "(" x$target_cpu = xmips -o x$target_cpu =
- AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
- AM_CONDITIONAL([COND_sparc64_emu], [test x$target_cpu = xsparc64 -a x$platform = xemu])
- AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
-+AM_CONDITIONAL([COND_loongarch64_efi], [test x$target_cpu = xloongarch64 -a x$platform = xefi])
-+AM_CONDITIONAL([COND_loongarch64], [test x$target_cpu = xloongarch64])
- AM_CONDITIONAL([COND_mips], [test x$target_cpu = xmips -o x$target_cpu = xmipsel])
- AM_CONDITIONAL([COND_mipsel], [test x$target_cpu = xmipsel])
- AM_CONDITIONAL([COND_mipseb], [test x$target_cpu = xmips])
-diff --git a/gentpl.py b/gentpl.py
-index 59f62ef..f03aff8 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -32,7 +32,8 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
-                    "mips_loongson", "sparc64_ieee1275",
-                    "powerpc_ieee1275", "mips_arc", "ia64_efi",
-                    "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi",
--                   "arm_coreboot", "riscv32_efi", "riscv64_efi" ]
-+                   "arm_coreboot", "riscv32_efi", "riscv64_efi",
-+                   "loongarch64_efi" ]
- 
- GROUPS = {}
- 
-@@ -49,11 +50,12 @@ GROUPS["arm"]      = [ "arm_uboot", "arm_efi", "arm_coreboot" ]
- GROUPS["arm64"]    = [ "arm64_efi" ]
- GROUPS["riscv32"]  = [ "riscv32_efi" ]
- GROUPS["riscv64"]  = [ "riscv64_efi" ]

_service:tar_scm:grub2-1703315889.c2dd5e0.tar Deleted

_service:tar_scm:grub2-1703728480.d8f6ba6.tar Added