Merge tag 'efi-loongarch-for-v6.1-2' into HEAD

Second shared stable tag between EFI and LoongArch trees

This is necessary because the EFI libstub refactoring patches are mostly
directed at enabling LoongArch to wire up generic EFI boot support
without being forced to consume DT properties that conflict with
information that EFI also provides, e.g., memory map and reservations,
etc.

diff --cc drivers/firmware/efi/libstub/Makefile
index 4c59f39dbd404c631c0a64d0cbef20e4be775915,6234edf3d8278d5145b4b3ae85517de7fcc1c2e6..a7cadf7b1471402f19548a2a58303f5e802a6ca0
--- 1/drivers/firmware/efi/libstub/Makefile
--- 2/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@@ -65,9 -69,7 +69,7 @@@ lib-$(CONFIG_EFI_PARAMS_FROM_FDT) += fd
  $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE
        $(call if_changed_rule,cc_o_c)
  
- lib-$(CONFIG_EFI_GENERIC_STUB)        += efi-stub.o fdt.o string.o intrinsics.o \
-                                  $(patsubst %.c,lib-%.o,$(efi-deps-y)) \
-                                  systable.o
 -lib-$(CONFIG_EFI_GENERIC_STUB)        += efi-stub.o string.o
++lib-$(CONFIG_EFI_GENERIC_STUB)        += efi-stub.o string.o intrinsics.o systable.o
  
  lib-$(CONFIG_ARM)             += arm32-stub.o
  lib-$(CONFIG_ARM64)           += arm64-stub.o

diff --cc drivers/firmware/efi/libstub/efi-stub-helper.c
Simple merge

diff --cc drivers/firmware/efi/libstub/efi-stub.c
Simple merge

diff --cc drivers/firmware/efi/libstub/efistub.h
index 02fb5f7c8effec0ee165d6f797ba57f8b2f36183,fc90e453bbbb5cd581714208b608b79f0cda8109..9ed5889594ed9e5af7c1683d3bc57b9467a084c8
--- 1/drivers/firmware/efi/libstub/efistub.h
--- 2/drivers/firmware/efi/libstub/efistub.h
+++ b/drivers/firmware/efi/libstub/efistub.h
@@@ -160,34 -160,8 +160,25 @@@ void efi_set_u64_split(u64 data, u32 *l
   */
  #define EFI_MMAP_NR_SLACK_SLOTS       8
  
- struct efi_boot_memmap {
-       efi_memory_desc_t       **map;
-       unsigned long           *map_size;
-       unsigned long           *desc_size;
-       u32                     *desc_ver;
-       unsigned long           *key_ptr;
-       unsigned long           *buff_size;
- };
- 
  typedef struct efi_generic_dev_path efi_device_path_protocol_t;
  
 +union efi_device_path_to_text_protocol {
 +      struct {
 +              efi_char16_t *(__efiapi *convert_device_node_to_text)(
 +                                      const efi_device_path_protocol_t *,
 +                                      bool, bool);
 +              efi_char16_t *(__efiapi *convert_device_path_to_text)(
 +                                      const efi_device_path_protocol_t *,
 +                                      bool, bool);
 +      };
 +      struct {
 +              u32 convert_device_node_to_text;
 +              u32 convert_device_path_to_text;
 +      } mixed_mode;
 +};
 +
 +typedef union efi_device_path_to_text_protocol efi_device_path_to_text_protocol_t;
 +
  typedef void *efi_event_t;
  /* Note that notifications won't work in mixed mode */
  typedef void (__efiapi *efi_event_notify_t)(efi_event_t, void *);

diff --cc drivers/firmware/efi/libstub/file.c
Simple merge

diff --cc include/linux/efi.h
index 5efc3105f8e055cae6d399611611986f489328dc,252b9b328577e77de5695422e1cc3cff5beee5cd..89f16ec3ebab963a8b1485965284ca1120bb6a36
--- 1/include/linux/efi.h
--- 2/include/linux/efi.h
+++ b/include/linux/efi.h
@@@ -411,9 -408,9 +411,10 @@@ void efi_native_runtime_setup(void)
  #define LINUX_EFI_TPM_FINAL_LOG_GUID          EFI_GUID(0x1e2ed096, 0x30e2, 0x4254,  0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25)
  #define LINUX_EFI_MEMRESERVE_TABLE_GUID               EFI_GUID(0x888eb0c6, 0x8ede, 0x4ff5,  0xa8, 0xf0, 0x9a, 0xee, 0x5c, 0xb9, 0x77, 0xc2)
  #define LINUX_EFI_INITRD_MEDIA_GUID           EFI_GUID(0x5568e427, 0x68fc, 0x4f3d,  0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68)
 +#define LINUX_EFI_ZBOOT_MEDIA_GUID            EFI_GUID(0xe565a30d, 0x47da, 0x4dbd,  0xb3, 0x54, 0x9b, 0xb5, 0xc8, 0x4f, 0x8b, 0xe2)
  #define LINUX_EFI_MOK_VARIABLE_TABLE_GUID     EFI_GUID(0xc451ed2b, 0x9694, 0x45d3,  0xba, 0xba, 0xed, 0x9f, 0x89, 0x88, 0xa3, 0x89)
  #define LINUX_EFI_COCO_SECRET_AREA_GUID               EFI_GUID(0xadf956ad, 0xe98c, 0x484c,  0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47)
+ #define LINUX_EFI_BOOT_MEMMAP_GUID            EFI_GUID(0x800f683f, 0xd08b, 0x423a,  0xa2, 0x93, 0x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4)
  
  #define RISCV_EFI_BOOT_PROTOCOL_GUID          EFI_GUID(0xccd15fec, 0x6f73, 0x4eec,  0x83, 0x95, 0x3e, 0x69, 0xe4, 0xb9, 0x40, 0xbf)