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

[sfrench/cifs-2.6.git] / drivers / firmware / dmi_scan.c

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 16dd5ca212c61a2e0e1f76ea4e34f3038f98d1e8..54e66adef2525179e49ecfe9fc04e253ecc18e51 100644 (file)
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -32,6 +32,7 @@ static char dmi_ids_string[128] __initdata;
 static struct dmi_memdev_info {
        const char *device;
        const char *bank;
+       u64 size;               /* bytes */
        u16 handle;
 } *dmi_memdev;
 static int dmi_memdev_nr;
@@ -386,6 +387,8 @@ static void __init save_mem_devices(const struct dmi_header *dm, void *v)
 {
        const char *d = (const char *)dm;
        static int nr;
+       u64 bytes;
+       u16 size;
 
        if (dm->type != DMI_ENTRY_MEM_DEVICE || dm->length < 0x12)
                return;
@@ -396,6 +399,20 @@ static void __init save_mem_devices(const struct dmi_header *dm, void *v)
        dmi_memdev[nr].handle = get_unaligned(&dm->handle);
        dmi_memdev[nr].device = dmi_string(dm, d[0x10]);
        dmi_memdev[nr].bank = dmi_string(dm, d[0x11]);
+
+       size = get_unaligned((u16 *)&d[0xC]);
+       if (size == 0)
+               bytes = 0;
+       else if (size == 0xffff)
+               bytes = ~0ull;
+       else if (size & 0x8000)
+               bytes = (u64)(size & 0x7fff) << 10;
+       else if (size != 0x7fff)
+               bytes = (u64)size << 20;
+       else
+               bytes = (u64)get_unaligned((u32 *)&d[0x1C]) << 20;
+
+       dmi_memdev[nr].size = bytes;
        nr++;
 }
 
@@ -1012,6 +1029,26 @@ out:
 }
 EXPORT_SYMBOL(dmi_get_date);
 
+/**
+ *     dmi_get_bios_year - get a year out of DMI_BIOS_DATE field
+ *
+ *     Returns year on success, -ENXIO if DMI is not selected,
+ *     or a different negative error code if DMI field is not present
+ *     or not parseable.
+ */
+int dmi_get_bios_year(void)
+{
+       bool exists;
+       int year;
+
+       exists = dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL);
+       if (!exists)
+               return -ENODATA;
+
+       return year ? year : -ERANGE;
+}
+EXPORT_SYMBOL(dmi_get_bios_year);
+
 /**
  *     dmi_walk - Walk the DMI table and get called back for every record
  *     @decode: Callback function
@@ -1073,3 +1110,17 @@ void dmi_memdev_name(u16 handle, const char **bank, const char **device)
        }
 }
 EXPORT_SYMBOL_GPL(dmi_memdev_name);
+
+u64 dmi_memdev_size(u16 handle)
+{
+       int n;
+
+       if (dmi_memdev) {
+               for (n = 0; n < dmi_memdev_nr; n++) {
+                       if (handle == dmi_memdev[n].handle)
+                               return dmi_memdev[n].size;
+               }
+       }
+       return ~0ull;
+}
+EXPORT_SYMBOL_GPL(dmi_memdev_size);