Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull EFI updates from Ingo Molnar:
 "The main changes in this cycle were:

   - Drop the unused EFI_SYSTEM_TABLES efi.flags bit and ensure the
     ARM/arm64 EFI System Table mapping is read-only (Ard Biesheuvel)

   - Add a comment to explain that one of the code paths in the x86/pat
     code is only executed for EFI boot (Matt Fleming)

   - Improve Secure Boot status checks on arm64 and handle unexpected
     errors (Linn Crosetto)

   - Remove the global EFI memory map variable 'memmap' as the same
     information is already available in efi::memmap (Matt Fleming)

   - Add EFI Memory Attribute table support for ARM/arm64 (Ard
     Biesheuvel)

   - Add EFI GOP framebuffer support for ARM/arm64 (Ard Biesheuvel)

   - Add EFI Bootloader Control driver for storing reboot(2) data in EFI
     variables for consumption by bootloaders (Jeremy Compostella)

   - Add Core EFI capsule support (Matt Fleming)

   - Add EFI capsule char driver (Kweh, Hock Leong)

   - Unify EFI memory map code for ARM and arm64 (Ard Biesheuvel)

   - Add generic EFI support for detecting when firmware corrupts CPU
     status register bits (like IRQ flags) when performing EFI runtime
     service calls (Mark Rutland)

  ... and other misc cleanups"

* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  efivarfs: Make efivarfs_file_ioctl() static
  efi: Merge boolean flag arguments
  efi/capsule: Move 'capsule' to the stack in efi_capsule_supported()
  efibc: Fix excessive stack footprint warning
  efi/capsule: Make efi_capsule_pending() lockless
  efi: Remove unnecessary (and buggy) .memmap initialization from the Xen EFI driver
  efi/runtime-wrappers: Remove ARCH_EFI_IRQ_FLAGS_MASK #ifdef
  x86/efi: Enable runtime call flag checking
  arm/efi: Enable runtime call flag checking
  arm64/efi: Enable runtime call flag checking
  efi/runtime-wrappers: Detect firmware IRQ flag corruption
  efi/runtime-wrappers: Remove redundant #ifdefs
  x86/efi: Move to generic {__,}efi_call_virt()
  arm/efi: Move to generic {__,}efi_call_virt()
  arm64/efi: Move to generic {__,}efi_call_virt()
  efi/runtime-wrappers: Add {__,}efi_call_virt() templates
  efi/arm-init: Reserve rather than unmap the memory map for ARM as well
  efi: Add misc char driver interface to update EFI firmware
  x86/efi: Force EFI reboot to process pending capsules
  efi: Add 'capsule' update support
  ...

1 files changed, 40 insertions, 8 deletions

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 3a69ed5ecfcb..05509f3aaee8 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -43,6 +43,7 @@ struct efi __read_mostly efi = {
         .config_table           = EFI_INVALID_TABLE_ADDR,
         .esrt                   = EFI_INVALID_TABLE_ADDR,
         .properties_table       = EFI_INVALID_TABLE_ADDR,
+        .mem_attr_table         = EFI_INVALID_TABLE_ADDR,
 };
 EXPORT_SYMBOL(efi);
 
@@ -256,7 +257,7 @@ subsys_initcall(efisubsys_init);
  */
 int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md)
 {
-        struct efi_memory_map *map = efi.memmap;
+        struct efi_memory_map *map = &efi.memmap;
         phys_addr_t p, e;
 
         if (!efi_enabled(EFI_MEMMAP)) {
@@ -338,6 +339,7 @@ static __initdata efi_config_table_type_t common_tables[] = {
         {UGA_IO_PROTOCOL_GUID, "UGA", &efi.uga},
         {EFI_SYSTEM_RESOURCE_TABLE_GUID, "ESRT", &efi.esrt},
         {EFI_PROPERTIES_TABLE_GUID, "PROP", &efi.properties_table},
+        {EFI_MEMORY_ATTRIBUTES_TABLE_GUID, "MEMATTR", &efi.mem_attr_table},
         {NULL_GUID, NULL, NULL},
 };
 
@@ -351,8 +353,9 @@ static __init int match_config_table(efi_guid_t *guid,
                 for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) {
                         if (!efi_guidcmp(*guid, table_types[i].guid)) {
                                 *(table_types[i].ptr) = table;
-                                pr_cont(" %s=0x%lx ",
-                                        table_types[i].name, table);
+                                if (table_types[i].name)
+                                        pr_cont(" %s=0x%lx ",
+                                                table_types[i].name, table);
                                 return 1;
                         }
                 }
@@ -620,16 +623,12 @@ char * __init efi_md_typeattr_format(char *buf, size_t size,
  */
 u64 __weak efi_mem_attributes(unsigned long phys_addr)
 {
-        struct efi_memory_map *map;
         efi_memory_desc_t *md;
-        void *p;
 
         if (!efi_enabled(EFI_MEMMAP))
                 return 0;
 
-        map = efi.memmap;
-        for (p = map->map; p < map->map_end; p += map->desc_size) {
-                md = p;
+        for_each_efi_memory_desc(md) {
                 if ((md->phys_addr <= phys_addr) &&
                     (phys_addr < (md->phys_addr +
                     (md->num_pages << EFI_PAGE_SHIFT))))
@@ -637,3 +636,36 @@ u64 __weak efi_mem_attributes(unsigned long phys_addr)
         }
         return 0;
 }
+
+int efi_status_to_err(efi_status_t status)
+{
+        int err;
+
+        switch (status) {
+        case EFI_SUCCESS:
+                err = 0;
+                break;
+        case EFI_INVALID_PARAMETER:
+                err = -EINVAL;
+                break;
+        case EFI_OUT_OF_RESOURCES:
+                err = -ENOSPC;
+                break;
+        case EFI_DEVICE_ERROR:
+                err = -EIO;
+                break;
+        case EFI_WRITE_PROTECTED:
+                err = -EROFS;
+                break;
+        case EFI_SECURITY_VIOLATION:
+                err = -EACCES;
+                break;
+        case EFI_NOT_FOUND:
+                err = -ENOENT;
+                break;
+        default:
+                err = -EINVAL;
+        }
+
+        return err;
+}