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

Pull EFI update from Ingo Molnar:
 "This tree includes various fixes, cleanups, a new efi=debug boot
  option and EFI boot stub memory allocation optimizations"

* 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/libstub: Retrieve FDT size when loaded from UEFI config table
  efi: Clean up the efi_call_phys_[prolog|epilog]() save/restore interaction
  efi: Disable interrupts around EFI calls, not in the epilog/prolog calls
  x86/efi: Add a "debug" option to the efi= cmdline
  firmware: dmi_scan: Use direct access to static vars
  firmware: dmi_scan: Use full dmi version for SMBIOS3

diff --combined drivers/firmware/dmi_scan.c
index 2eebd28b4c40af2789c32e0008f2b60006fc03ac,c9cb725520c557b0262fed0f3bda78252a3abd48..6e45a43ffe8476686bcaee1157a7acc641fc3e6b
--- 1/drivers/firmware/dmi_scan.c
--- 2/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@@ -17,7 -17,9 +17,9 @@@
   */
  static const char dmi_empty_string[] = "        ";
  
- static u16 __initdata dmi_ver;
+ static u32 dmi_ver __initdata;
+ static u32 dmi_len;
+ static u16 dmi_num;
  /*
   * Catch too early calls to dmi_check_system():
   */
@@@ -78,7 -80,7 +80,7 @@@ static const char * __init dmi_string(c
   *    We have to be cautious here. We have seen BIOSes with DMI pointers
   *    pointing to completely the wrong place for example
   */
- static void dmi_table(u8 *buf, u32 len, int num,
+ static void dmi_table(u8 *buf,
                      void (*decode)(const struct dmi_header *, void *),
                      void *private_data)
  {
@@@ -86,13 -88,11 +88,13 @@@
        int i = 0;
  
        /*
 -       *      Stop when we see all the items the table claimed to have
 -       *      OR we run off the end of the table (also happens)
 +       * Stop when we have seen all the items the table claimed to have
 +       * (SMBIOS < 3.0 only) OR we reach an end-of-table marker OR we run
 +       * off the end of the table (should never happen but sometimes does
 +       * on bogus implementations.)
         */
-       while ((!num || i < num) &&
-              (data - buf + sizeof(struct dmi_header)) <= len) {
 -      while ((i < dmi_num) && (data - buf + sizeof(struct dmi_header))
 -              <= dmi_len) {
++      while ((!dmi_num || i < dmi_num) &&
++             (data - buf + sizeof(struct dmi_header)) <= dmi_len) {
                const struct dmi_header *dm = (const struct dmi_header *)data;
  
                /*
@@@ -101,9 -101,9 +103,9 @@@
                 *  table in dmi_decode or dmi_string
                 */
                data += dm->length;
-               while ((data - buf < len - 1) && (data[0] || data[1]))
+               while ((data - buf < dmi_len - 1) && (data[0] || data[1]))
                        data++;
-               if (data - buf < len - 1)
+               if (data - buf < dmi_len - 1)
                        decode(dm, private_data);
  
                /*
@@@ -118,8 -118,6 +120,6 @@@
  }
  
  static phys_addr_t dmi_base;
- static u32 dmi_len;
- static u16 dmi_num;
  
  static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,
                void *))
@@@ -130,7 -128,7 +130,7 @@@
        if (buf == NULL)
                return -1;
  
-       dmi_table(buf, dmi_len, dmi_num, decode, NULL);
+       dmi_table(buf, decode, NULL);
  
        add_device_randomness(buf, dmi_len);
  
@@@ -201,7 -199,7 +201,7 @@@ static void __init dmi_save_uuid(const 
         * the UUID are supposed to be little-endian encoded.  The specification
         * says that this is the defacto standard.
         */
-       if (dmi_ver >= 0x0206)
+       if (dmi_ver >= 0x020600)
                sprintf(s, "%pUL", d);
        else
                sprintf(s, "%pUB", d);
@@@ -473,7 -471,7 +473,7 @@@ static void __init dmi_format_ids(char 
   */
  static int __init dmi_present(const u8 *buf)
  {
-       int smbios_ver;
+       u32 smbios_ver;
  
        if (memcmp(buf, "_SM_", 4) == 0 &&
            buf[5] < 32 && dmi_checksum(buf, buf[5])) {
@@@ -506,14 -504,16 +506,16 @@@
                if (dmi_walk_early(dmi_decode) == 0) {
                        if (smbios_ver) {
                                dmi_ver = smbios_ver;
-                               pr_info("SMBIOS %d.%d present.\n",
-                                      dmi_ver >> 8, dmi_ver & 0xFF);
+                               pr_info("SMBIOS %d.%d%s present.\n",
+                                       dmi_ver >> 8, dmi_ver & 0xFF,
+                                       (dmi_ver < 0x0300) ? "" : ".x");
                        } else {
                                dmi_ver = (buf[14] & 0xF0) << 4 |
                                           (buf[14] & 0x0F);
                                pr_info("Legacy DMI %d.%d present.\n",
                                       dmi_ver >> 8, dmi_ver & 0xFF);
                        }
+                       dmi_ver <<= 8;
                        dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
                        printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string);
                        return 0;
@@@ -531,14 -531,27 +533,16 @@@ static int __init dmi_smbios3_present(c
  {
        if (memcmp(buf, "_SM3_", 5) == 0 &&
            buf[6] < 32 && dmi_checksum(buf, buf[6])) {
-               dmi_ver = get_unaligned_be16(buf + 7);
+               dmi_ver = get_unaligned_be32(buf + 6);
+               dmi_ver &= 0xFFFFFF;
 +              dmi_num = 0;                    /* No longer specified */
                dmi_len = get_unaligned_le32(buf + 12);
                dmi_base = get_unaligned_le64(buf + 16);
  
 -              /*
 -               * The 64-bit SMBIOS 3.0 entry point no longer has a field
 -               * containing the number of structures present in the table.
 -               * Instead, it defines the table size as a maximum size, and
 -               * relies on the end-of-table structure type (#127) to be used
 -               * to signal the end of the table.
 -               * So let's define dmi_num as an upper bound as well: each
 -               * structure has a 4 byte header, so dmi_len / 4 is an upper
 -               * bound for the number of structures in the table.
 -               */
 -              dmi_num = dmi_len / 4;
 -
                if (dmi_walk_early(dmi_decode) == 0) {
-                       pr_info("SMBIOS %d.%d present.\n",
-                               dmi_ver >> 8, dmi_ver & 0xFF);
+                       pr_info("SMBIOS %d.%d.%d present.\n",
+                               dmi_ver >> 16, (dmi_ver >> 8) & 0xFF,
+                               dmi_ver & 0xFF);
                        dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
                        pr_debug("DMI: %s\n", dmi_ids_string);
                        return 0;
@@@ -893,7 -906,7 +897,7 @@@ int dmi_walk(void (*decode)(const struc
        if (buf == NULL)
                return -1;
  
-       dmi_table(buf, dmi_len, dmi_num, decode, private_data);
+       dmi_table(buf, decode, private_data);
  
        dmi_unmap(buf);
        return 0;