1 files changed, 38 insertions, 1 deletions

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index b3d22d659990..bcb1126e3d00 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -2,6 +2,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/ctype.h>
 #include <linux/dmi.h>
 #include <linux/efi.h>
 #include <linux/bootmem.h>
@@ -361,6 +362,40 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
         }
 }
 
+static void __init print_filtered(const char *info)
+{
+        const char *p;
+
+        if (!info)
+                return;
+
+        for (p = info; *p; p++)
+                if (isprint(*p))
+                        printk(KERN_CONT "%c", *p);
+                else
+                        printk(KERN_CONT "\\x%02x", *p & 0xff);
+}
+
+static void __init dmi_dump_ids(void)
+{
+        const char *board;      /* Board Name is optional */
+
+        printk(KERN_DEBUG "DMI: ");
+        print_filtered(dmi_get_system_info(DMI_SYS_VENDOR));
+        printk(KERN_CONT " ");
+        print_filtered(dmi_get_system_info(DMI_PRODUCT_NAME));
+        board = dmi_get_system_info(DMI_BOARD_NAME);
+        if (board) {
+                printk(KERN_CONT "/");
+                print_filtered(board);
+        }
+        printk(KERN_CONT ", BIOS ");
+        print_filtered(dmi_get_system_info(DMI_BIOS_VERSION));
+        printk(KERN_CONT " ");
+        print_filtered(dmi_get_system_info(DMI_BIOS_DATE));
+        printk(KERN_CONT "\n");
+}
+
 static int __init dmi_present(const char __iomem *p)
 {
         u8 buf[15];
@@ -381,8 +416,10 @@ static int __init dmi_present(const char __iomem *p)
                                buf[14] >> 4, buf[14] & 0xF);
                 else
                         printk(KERN_INFO "DMI present.\n");
-                if (dmi_walk_early(dmi_decode) == 0)
+                if (dmi_walk_early(dmi_decode) == 0) {
+                        dmi_dump_ids();
                         return 0;
+                }
         }
         return 1;
 }