Changeset a1d88954b2913bb6b992077accad6b23c6767abe

Timestamp:

10/30/09 21:00:09 (2 years ago)

Author:

Erwan Velu <erwan.velu@…>

Children:

512de9792b2fd4a9af1033ea6ef6c8033e4dfb9f, dee3fa2de1912a9ad88982f6e412656375d8ca3e, aa1724e7a975430c7b8b53359e94c225622f4957

Parents:

cf14910be4b9941247f5aebb8d901455532553dc

git-committer:

Erwan Velu <erwan.velu@free.fr> / 2009-10-30T22:00:09Z+0100

Message:

dmi: Adding smbios detection

Impact: Avoid misdetection of dmi version

On some hosts, the legacy DMI version is reported as 0.0.
We can use SMBIOS to get the real version.
Solves HDT's ticket #8

Location:

com32

Files:

• gplinclude/dmi/dmi.h (modified) (2 diffs)
• gpllib/dmi/dmi.c (modified) (9 diffs)
• hdt/hdt-cli-dmi.c (modified) (1 diff)
• modules/dmitest.c (modified) (1 diff)

com32/gplinclude/dmi/dmi.h

@@ -14 +14 @@
 #define DMI_H
 #include <inttypes.h>
+#define DMI_BUFFER_SIZE 16 
 #define MAX_DMI_MEMORY_ITEMS 32
 #define MAX_DMI_CACHE_ITEMS 32
@@ -87 +88 @@
 void dmi_bios_runtime_size(uint32_t code, s_dmi * dmi);
 const char *dmi_string(struct dmi_header *dm, uint8_t s);
-int dmi_checksum(uint8_t * buf);
+int dmi_checksum(uint8_t * buf, int len);
 void parse_dmitable(s_dmi * dmi);
 void dmi_decode(struct dmi_header *h, uint16_t ver, s_dmi * dmi);

com32/gpllib/dmi/dmi.c

@@ -407 +407 @@
             if (cpu_flags_strings[i] != NULL && edx & (1 << i))
                 ((bool *) (&dmi->processor.cpu_flags))[i] = true;
-        //printf("%s\t%s\n", prefix, flags[i]);
     }
 }
@@ -446 +445 @@
 }
 
-int dmi_checksum(uint8_t * buf)
+int dmi_checksum(uint8_t * buf, int len)
 {
     uint8_t sum = 0;
     int a;
 
-    for (a = 0; a < 15; a++)
+    for (a = 0; a < len; a++)
         sum += buf[a];
     return (sum == 0);
 }
 
+static int smbios_decode(s_dmi *dmi, uint8_t *buf)
+{
+
+        dmi->dmitable.ver = (buf[0x06] << 8) + buf[0x07];
+        /* Some BIOS report weird SMBIOS version, fix that up */
+        switch (dmi->dmitable.ver) {
+                case 0x021F:
+                        dmi->dmitable.ver = 0x0203;
+                        break;
+                case 0x0233:
+                        dmi->dmitable.ver = 0x0206;
+                        break;
+        }
+        dmi->dmitable.major_version=dmi->dmitable.ver >> 8;
+        dmi->dmitable.minor_version=dmi->dmitable.ver & 0xFF;
+
+        return DMI_TABLE_PRESENT;
+}
+
+
+static int legacy_decode(s_dmi *dmi, uint8_t *buf)
+{
+    dmi->dmitable.num = buf[13] << 8 | buf[12];
+    dmi->dmitable.len = buf[7] << 8 | buf[6];
+    dmi->dmitable.base =
+        buf[11] << 24 | buf[10] << 16 | buf[9] << 8 | buf[8];
+
+    if (dmi->dmitable.ver>0) return DMI_TABLE_PRESENT;
+
+    dmi->dmitable.ver = (buf[0x06] << 8) + buf[0x07];
+
+    /*
+     * DMI version 0.0 means that the real version is taken from
+     * the SMBIOS version, which we don't know at this point.
+     */
+    if (buf[14] != 0) {
+        dmi->dmitable.major_version = buf[14] >> 4;
+        dmi->dmitable.minor_version = buf[14] & 0x0F;
+    } else {
+        dmi->dmitable.major_version = 0;
+        dmi->dmitable.minor_version = 0;
+    }
+    return DMI_TABLE_PRESENT;
+}
+
+
 int dmi_iterate(s_dmi * dmi)
 {
-    uint8_t buf[16];
+    uint8_t buf[DMI_BUFFER_SIZE];
     char *p, *q;
 
@@ -484 +529 @@
     for (q = p; q < p + 0x10000; q += 16) {
         memcpy(buf, q, 15);
-        if (memcmp(buf, "_DMI_", 5) == 0 && dmi_checksum(buf)) {
-            dmi->dmitable.num = buf[13] << 8 | buf[12];
-            dmi->dmitable.len = buf[7] << 8 | buf[6];
-            dmi->dmitable.base =
-                buf[11] << 24 | buf[10] << 16 | buf[9] << 8 | buf[8];
-            dmi->dmitable.ver = (buf[0x06] << 8) + buf[0x07];
-
-            /*
-             * DMI version 0.0 means that the real version is taken from
-             * the SMBIOS version, which we don't know at this point.
-             */
-            if (buf[14] != 0) {
-                dmi->dmitable.major_version = buf[14] >> 4;
-                dmi->dmitable.minor_version = buf[14] & 0x0F;
-            } else {
-                dmi->dmitable.major_version = 0;
-                dmi->dmitable.minor_version = 0;
-
-            }
-/*              printf("DMI present (version %d.%d)\n", dmitable.major_version,dmitable.minor_version);
-              printf("%d structures occupying %d bytes.\n",dmitable.num, dmitable.len);
-              printf("DMI table at 0x%08X.\n",dmitable.base);*/
-            return DMI_TABLE_PRESENT;
+        if (memcmp(buf, "_SM_", 4) == 0) {
+                smbios_decode(dmi,buf);
+        }
+        if (memcmp(buf, "_DMI_", 5) == 0 && dmi_checksum(buf,sizeof(buf))) {
+                return legacy_decode(dmi,buf);
         }
     }
@@ -525 +552 @@
     switch (h->type) {
     case 0:                     /* 3.3.1 BIOS Information */
-//                        printf("BIOS Information\n");
         if (h->length < 0x12)
             break;
@@ -553 +579 @@
         break;
     case 1:                     /* 3.3.2 System Information */
-//                        printf("System Information\n");
         if (h->length < 0x08)
             break;
@@ -572 +597 @@
 
     case 2:                     /* 3.3.3 Base Board Information */
-//                        printf("Base Board Information\n");
         if (h->length < 0x08)
             break;
@@ -590 +614 @@
         break;
     case 3:                     /* 3.3.4 Chassis Information */
-//                        printf("Chassis Information\n");
                         if(h->length<0x09) break;
                         dmi->chassis.filled=true;
@@ -612 +635 @@
 
                         case 4: /* 3.3.5 Processor Information */
-//                        printf("Processor Information\n");
                         if(h->length<0x1A) break;
                         dmi->processor.filled=true;
@@ -844 +866 @@
             break;
         }
-//        printf("Handle 0x%04X, DMI type %d, %d bytes\n", h.handle, h.type, h.length);
 
         /* loo for the next handle */

com32/hdt/hdt-cli-dmi.c

@@ -506 +506 @@
     return;
   }
-  printf("DMI Table version %d.%d found\n",
+  printf("DMI Table version %u.%u found\n",
          hardware->dmi.dmitable.major_version,
          hardware->dmi.dmitable.minor_version);

com32/modules/dmitest.c

@@ -180 +180 @@
         return -1;
     } else {
-        printf("DMI %d.%d present.\n", dmi.dmitable.major_version,
+        printf("DMI %u.%u present.\n", dmi.dmitable.major_version,
                dmi.dmitable.minor_version);
         printf("%d structures occupying %d bytes.\n", dmi.dmitable.num,