Merge tag 'stable-shared-branch-for-driver-tree' of git://git.kernel.org/pub/scm...

Ard writes:

Stable shared branch between EFI and driver tree

Stable shared branch to ease the integration of Hans's series to support
device firmware loaded from EFI boot service memory regions.

[PATCH v12 00/10] efi/firmware/platform-x86: Add EFI embedded fw support
https://lore.kernel.org/linux-efi/20200115163554[email protected]/

* tag 'stable-shared-branch-for-driver-tree' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: Add embedded peripheral firmware support
  efi: Export boot-services code and data as debugfs-blobs

diff --combined drivers/firmware/efi/efi.c
index 21ea99f651134be47161831266f00cb43fb85f56,201a6799671dbb3e035c5735602a12f22a79e200..0c2d99dfd3c59af2a0d72ba59bf687602833cce2
--- 1/drivers/firmware/efi/efi.c
--- 2/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@@ -17,6 -17,7 +17,7 @@@
  #include <linux/kobject.h>
  #include <linux/module.h>
  #include <linux/init.h>
+ #include <linux/debugfs.h>
  #include <linux/device.h>
  #include <linux/efi.h>
  #include <linux/of.h>
@@@ -325,6 -326,59 +326,59 @@@ free_entry
  static inline int efivar_ssdt_load(void) { return 0; }
  #endif
  
+ #ifdef CONFIG_DEBUG_FS
+ 
+ #define EFI_DEBUGFS_MAX_BLOBS 32
+ 
+ static struct debugfs_blob_wrapper debugfs_blob[EFI_DEBUGFS_MAX_BLOBS];
+ 
+ static void __init efi_debugfs_init(void)
+ {
+       struct dentry *efi_debugfs;
+       efi_memory_desc_t *md;
+       char name[32];
+       int type_count[EFI_BOOT_SERVICES_DATA + 1] = {};
+       int i = 0;
+ 
+       efi_debugfs = debugfs_create_dir("efi", NULL);
+       if (IS_ERR_OR_NULL(efi_debugfs))
+               return;
+ 
+       for_each_efi_memory_desc(md) {
+               switch (md->type) {
+               case EFI_BOOT_SERVICES_CODE:
+                       snprintf(name, sizeof(name), "boot_services_code%d",
+                                type_count[md->type]++);
+                       break;
+               case EFI_BOOT_SERVICES_DATA:
+                       snprintf(name, sizeof(name), "boot_services_data%d",
+                                type_count[md->type]++);
+                       break;
+               default:
+                       continue;
+               }
+ 
+               if (i >= EFI_DEBUGFS_MAX_BLOBS) {
+                       pr_warn("More then %d EFI boot service segments, only showing first %d in debugfs\n",
+                               EFI_DEBUGFS_MAX_BLOBS, EFI_DEBUGFS_MAX_BLOBS);
+                       break;
+               }
+ 
+               debugfs_blob[i].size = md->num_pages << EFI_PAGE_SHIFT;
+               debugfs_blob[i].data = memremap(md->phys_addr,
+                                               debugfs_blob[i].size,
+                                               MEMREMAP_WB);
+               if (!debugfs_blob[i].data)
+                       continue;
+ 
+               debugfs_create_blob(name, 0400, efi_debugfs, &debugfs_blob[i]);
+               i++;
+       }
+ }
+ #else
+ static inline void efi_debugfs_init(void) {}
+ #endif
+ 
  /*
   * We register the efi subsystem with the firmware subsystem and the
   * efivars subsystem with the efi subsystem, if the system was booted with
@@@ -381,6 -435,9 +435,9 @@@ static int __init efisubsys_init(void
                goto err_remove_group;
        }
  
+       if (efi_enabled(EFI_DBG) && efi_enabled(EFI_PRESERVE_BS_REGIONS))
+               efi_debugfs_init();
+ 
        return 0;
  
  err_remove_group:
@@@ -552,7 -609,7 +609,7 @@@ int __init efi_config_parse_tables(voi
  
                seed = early_memremap(efi.rng_seed, sizeof(*seed));
                if (seed != NULL) {
 -                      size = seed->size;
 +                      size = READ_ONCE(seed->size);
                        early_memunmap(seed, sizeof(*seed));
                } else {
                        pr_err("Could not map UEFI random seed!\n");
@@@ -562,7 -619,7 +619,7 @@@
                                              sizeof(*seed) + size);
                        if (seed != NULL) {
                                pr_notice("seeding entropy pool\n");
 -                              add_bootloader_randomness(seed->bits, seed->size);
 +                              add_bootloader_randomness(seed->bits, size);
                                early_memunmap(seed, sizeof(*seed) + size);
                        } else {
                                pr_err("Could not map UEFI random seed!\n");