[PATCH] I8K: use standard DMI interface

I8K: Change to use stock dmi infrastructure instead of homegrown parsing code. The driver now requires box's DMI data to match list of supported models so driver can be safely compiled-in by default without fear of it poking into random SMM BIOS code. DMI checks can be ignored with i8k.ignore_dmi option. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] I8K: use standard DMI interface
I8K: Change to use stock dmi infrastructure instead of homegrown parsing code. The driver now requires box's DMI data to match list of supported models so driver can be safely compiled-in by default without fear of it poking into random SMM BIOS code. DMI checks can be ignored with i8k.ignore_dmi option. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dmitry Torokhov · Linus Torvalds
1 parent dec63ec32e
Showing 4 changed files with 60 additions and 252 deletions Side-by-side Diff
Documentation/kernel-parameters.txt
arch/i386/kernel/dmi_scan.c
drivers/char/i8k.c
include/linux/dmi.h
@@ -548,6 +548,9 @@
  
 	i810=		[HW,DRM]
  
+	i8k.ignore_dmi	[HW] Continue probing hardware even if DMI data
+			indicates that the driver is running on unsupported
+			hardware.
 	i8k.force	[HW] Activate i8k driver even if SMM BIOS signature
 			does not match list of supported models.
 	i8k.power_status
@@ -414,6 +414,7 @@
 			dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
 			dmi_printk(("Serial Number: %s\n",
 				dmi_string(dm, data[7])));
+			dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
 			break;
 		case 2:
 			dmi_printk(("Board Vendor: %s\n",
@@ -470,7 +471,6 @@
  
 	return count;
 }
-
 EXPORT_SYMBOL(dmi_check_system);
  
 /**
  
@@ -480,8 +480,9 @@
  *	Returns one DMI data value, can be used to perform
  *	complex DMI data checks.
  */
-char * dmi_get_system_info(int field)
+char *dmi_get_system_info(int field)
 {
 	return dmi_ident[field];
 }
+EXPORT_SYMBOL(dmi_get_system_info);
@@ -20,7 +20,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
-#include <linux/apm_bios.h>
+#include <linux/dmi.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
  
  
@@ -52,19 +52,8 @@
  
 #define I8K_TEMPERATURE_BUG	1
  
-#define DELL_SIGNATURE		"Dell Computer"
+static char bios_version[4];
  
-static char *supported_models[] = {
-	"Inspiron",
-	"Latitude",
-	NULL
-};
-
-static char system_vendor[48] = "?";
-static char product_name[48] = "?";
-static char bios_version[4] = "?";
-static char serial_number[16] = "?";
-
 MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
 MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
 MODULE_LICENSE("GPL");
@@ -73,6 +62,10 @@
 module_param(force, bool, 0);
 MODULE_PARM_DESC(force, "Force loading without checking for supported models");
  
+static int ignore_dmi;
+module_param(ignore_dmi, bool, 0);
+MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match");
+
 static int restricted;
 module_param(restricted, bool, 0);
 MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set");
@@ -99,11 +92,10 @@
 	unsigned int edi __attribute__ ((packed));
 } SMMRegisters;
  
-typedef struct {
-	u8 type;
-	u8 length;
-	u16 handle;
-} DMIHeader;
+static inline char *i8k_get_dmi_data(int field)
+{
+	return dmi_get_system_info(field) ? : "N/A";
+}
  
 /*
  * Call the System Management Mode BIOS. Code provided by Jonathan Buzzard.
@@ -163,15 +155,6 @@
 }
  
 /*
- * Read the machine id.
- */
-static int i8k_get_serial_number(unsigned char *buff)
-{
-	strlcpy(buff, serial_number, sizeof(serial_number));
-	return 0;
-}
-
-/*
  * Read the Fn key status.
  */
 static int i8k_get_fn_status(void)
@@ -328,7 +311,7 @@
 static int i8k_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
 		     unsigned long arg)
 {
-	int val;
+	int val = 0;
 	int speed;
 	unsigned char buff[16];
 	int __user *argp = (int __user *)arg;
@@ -343,7 +326,7 @@
  
 	case I8K_MACHINE_ID:
 		memset(buff, 0, 16);
-		val = i8k_get_serial_number(buff);
+		strlcpy(buff, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), sizeof(buff));
 		break;
  
 	case I8K_FN_STATUS:
  
@@ -451,10 +434,10 @@
 	n = sprintf(buffer, "%s %s %s %d %d %d %d %d %d %d\n",
 		    I8K_PROC_FMT,
 		    bios_version,
-		    serial_number,
+		    dmi_get_system_info(DMI_PRODUCT_SERIAL) ? : "N/A",
 		    cpu_temp,
-		    left_fan,
-		    right_fan, left_speed, right_speed, ac_power, fn_key);
+		    left_fan, right_fan, left_speed, right_speed,
+		    ac_power, fn_key);
  
 	return n;
 }
  
  
  
  
  
  
  
@@ -486,226 +469,55 @@
 	return len;
 }
  
-static char *__init string_trim(char *s, int size)
-{
-	int len;
-	char *p;
+static struct dmi_system_id __initdata i8k_dmi_table[] = {
+	{
+		.ident = "Dell Inspiron",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron"),
+		},
+	},
+	{
+		.ident = "Dell Latitude",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
+		},
+	},
+	{ }
+};
  
-	if ((len = strlen(s)) > size) {
-		len = size;
-	}
-
-	for (p = s + len - 1; len && (*p == ' '); len--, p--) {
-		*p = '\0';
-	}
-
-	return s;
-}
-
-/* DMI code, stolen from arch/i386/kernel/dmi_scan.c */
-
 /*
- * |<-- dmi->length -->|
- * |                   |
- * |dmi header    s=N  | string1,\0, ..., stringN,\0, ..., \0
- *                |                       |
- *                +-----------------------+
- */
-static char *__init dmi_string(DMIHeader * dmi, u8 s)
-{
-	u8 *p;
-
-	if (!s) {
-		return "";
-	}
-	s--;
-
-	p = (u8 *) dmi + dmi->length;
-	while (s > 0) {
-		p += strlen(p);
-		p++;
-		s--;
-	}
-
-	return p;
-}
-
-static void __init dmi_decode(DMIHeader * dmi)
-{
-	u8 *data = (u8 *) dmi;
-	char *p;
-
-#ifdef I8K_DEBUG
-	int i;
-	printk("%08x ", (int)data);
-	for (i = 0; i < data[1] && i < 64; i++) {
-		printk("%02x ", data[i]);
-	}
-	printk("\n");
-#endif
-
-	switch (dmi->type) {
-	case 0:		/* BIOS Information */
-		p = dmi_string(dmi, data[5]);
-		if (*p) {
-			strlcpy(bios_version, p, sizeof(bios_version));
-			string_trim(bios_version, sizeof(bios_version));
-		}
-		break;
-	case 1:		/* System Information */
-		p = dmi_string(dmi, data[4]);
-		if (*p) {
-			strlcpy(system_vendor, p, sizeof(system_vendor));
-			string_trim(system_vendor, sizeof(system_vendor));
-		}
-		p = dmi_string(dmi, data[5]);
-		if (*p) {
-			strlcpy(product_name, p, sizeof(product_name));
-			string_trim(product_name, sizeof(product_name));
-		}
-		p = dmi_string(dmi, data[7]);
-		if (*p) {
-			strlcpy(serial_number, p, sizeof(serial_number));
-			string_trim(serial_number, sizeof(serial_number));
-		}
-		break;
-	}
-}
-
-static int __init dmi_table(u32 base, int len, int num,
-			    void (*fn) (DMIHeader *))
-{
-	u8 *buf;
-	u8 *data;
-	DMIHeader *dmi;
-	int i = 1;
-
-	buf = ioremap(base, len);
-	if (buf == NULL) {
-		return -1;
-	}
-	data = buf;
-
-	/*
-	 * Stop when we see al the items the table claimed to have
-	 * or we run off the end of the table (also happens)
-	 */
-	while ((i < num) && ((data - buf) < len)) {
-		dmi = (DMIHeader *) data;
-		/*
-		 * Avoid misparsing crud if the length of the last
-		 * record is crap
-		 */
-		if ((data - buf + dmi->length) >= len) {
-			break;
-		}
-		fn(dmi);
-		data += dmi->length;
-		/*
-		 * Don't go off the end of the data if there is
-		 * stuff looking like string fill past the end
-		 */
-		while (((data - buf) < len) && (*data || data[1])) {
-			data++;
-		}
-		data += 2;
-		i++;
-	}
-	iounmap(buf);
-
-	return 0;
-}
-
-static int __init dmi_iterate(void (*decode) (DMIHeader *))
-{
-	unsigned char buf[20];
-	void __iomem *p = ioremap(0xe0000, 0x20000), *q;
-
-	if (!p)
-		return -1;
-
-	for (q = p; q < p + 0x20000; q += 16) {
-		memcpy_fromio(buf, q, 20);
-		if (memcmp(buf, "_DMI_", 5) == 0) {
-			u16 num  = buf[13] << 8 | buf[12];
-			u16 len  = buf[7] << 8 | buf[6];
-			u32 base = buf[11] << 24 | buf[10] << 16 | buf[9] << 8 | buf[8];
-#ifdef I8K_DEBUG
-			printk(KERN_INFO "DMI %d.%d present.\n",
-			       buf[14] >> 4, buf[14] & 0x0F);
-			printk(KERN_INFO "%d structures occupying %d bytes.\n",
-			       buf[13] << 8 | buf[12], buf[7] << 8 | buf[6]);
-			printk(KERN_INFO "DMI table at 0x%08X.\n",
-			       buf[11] << 24 | buf[10] << 16 | buf[9] << 8 |
-			       buf[8]);
-#endif
-			if (dmi_table(base, len, num, decode) == 0) {
-				iounmap(p);
-				return 0;
-			}
-		}
-	}
-	iounmap(p);
-	return -1;
-}
-
-/* end of DMI code */
-
-/*
- * Get DMI information.
- */
-static int __init i8k_dmi_probe(void)
-{
-	char **p;
-
-	if (dmi_iterate(dmi_decode) != 0) {
-		printk(KERN_INFO "i8k: unable to get DMI information\n");
-		return -ENODEV;
-	}
-
-	if (strncmp(system_vendor, DELL_SIGNATURE, strlen(DELL_SIGNATURE)) != 0) {
-		printk(KERN_INFO "i8k: not running on a Dell system\n");
-		return -ENODEV;
-	}
-
-	for (p = supported_models;; p++) {
-		if (!*p) {
-			printk(KERN_INFO "i8k: unsupported model: %s\n",
-			       product_name);
-			return -ENODEV;
-		}
-		if (strncmp(product_name, *p, strlen(*p)) == 0) {
-			break;
-		}
-	}
-
-	return 0;
-}
-
-/*
  * Probe for the presence of a supported laptop.
  */
 static int __init i8k_probe(void)
 {
 	char buff[4];
 	int version;
-	int smm_found = 0;
  
 	/*
 	 * Get DMI information
 	 */
-	if (i8k_dmi_probe() != 0) {
+	if (!dmi_check_system(i8k_dmi_table)) {
+		if (!ignore_dmi && !force)
+			return -ENODEV;
+
+		printk(KERN_INFO "i8k: not running on a supported Dell system.\n");
 		printk(KERN_INFO "i8k: vendor=%s, model=%s, version=%s\n",
-		       system_vendor, product_name, bios_version);
+			i8k_get_dmi_data(DMI_SYS_VENDOR),
+			i8k_get_dmi_data(DMI_PRODUCT_NAME),
+			i8k_get_dmi_data(DMI_BIOS_VERSION));
 	}
  
+	strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), sizeof(bios_version));
+
 	/*
 	 * Get SMM Dell signature
 	 */
 	if (i8k_get_dell_signature() != 0) {
-		printk(KERN_INFO "i8k: unable to get SMM Dell signature\n");
-	} else {
-		smm_found = 1;
+		printk(KERN_ERR "i8k: unable to get SMM Dell signature\n");
+		if (!force)
+			return -ENODEV;
 	}
  
 	/*
  
@@ -713,9 +525,8 @@
 	 */
 	version = i8k_get_bios_version();
 	if (version <= 0) {
-		printk(KERN_INFO "i8k: unable to get SMM BIOS version\n");
+		printk(KERN_WARNING "i8k: unable to get SMM BIOS version\n");
 	} else {
-		smm_found = 1;
 		buff[0] = (version >> 16) & 0xff;
 		buff[1] = (version >> 8) & 0xff;
 		buff[2] = (version) & 0xff;
  
  
@@ -723,23 +534,17 @@
 		/*
 		 * If DMI BIOS version is unknown use SMM BIOS version.
 		 */
-		if (bios_version[0] == '?') {
-			strcpy(bios_version, buff);
-		}
+		if (!dmi_get_system_info(DMI_BIOS_VERSION))
+			strlcpy(bios_version, buff, sizeof(bios_version));
+
 		/*
 		 * Check if the two versions match.
 		 */
-		if (strncmp(buff, bios_version, sizeof(bios_version)) != 0) {
-			printk(KERN_INFO
-			       "i8k: BIOS version mismatch: %s != %s\n", buff,
-			       bios_version);
-		}
+		if (strncmp(buff, bios_version, sizeof(bios_version)) != 0)
+			printk(KERN_WARNING "i8k: BIOS version mismatch: %s != %s\n",
+				buff, bios_version);
 	}
  
-	if (!smm_found && !force) {
-		return -ENODEV;
-	}
-
 	return 0;
 }
  
  
@@ -751,9 +556,8 @@
 	struct proc_dir_entry *proc_i8k;
  
 	/* Are we running on an supported laptop? */
-	if (i8k_probe() != 0) {
+	if (i8k_probe())
 		return -ENODEV;
-	}
  
 	/* Register the proc entry */
 	proc_i8k = create_proc_info_entry("i8k", 0, NULL, i8k_get_info);
@@ -9,6 +9,7 @@
 	DMI_SYS_VENDOR,
 	DMI_PRODUCT_NAME,
 	DMI_PRODUCT_VERSION,
+	DMI_PRODUCT_SERIAL,
 	DMI_BOARD_VENDOR,
 	DMI_BOARD_NAME,
 	DMI_BOARD_VERSION,
...	...	@@ -548,6 +548,9 @@
548	548
549	549	i810= [HW,DRM]
550	550
	551	+ i8k.ignore_dmi [HW] Continue probing hardware even if DMI data
	552	+ indicates that the driver is running on unsupported
	553	+ hardware.
551	554	i8k.force [HW] Activate i8k driver even if SMM BIOS signature
552	555	does not match list of supported models.
553	556	i8k.power_status
...	...	@@ -414,6 +414,7 @@
414	414	dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
415	415	dmi_printk(("Serial Number: %s\n",
416	416	dmi_string(dm, data[7])));
	417	+ dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
417	418	break;
418	419	case 2:
419	420	dmi_printk(("Board Vendor: %s\n",
...	...	@@ -470,7 +471,6 @@
470	471
471	472	return count;
472	473	}
473		-
474	474	EXPORT_SYMBOL(dmi_check_system);
475	475
476	476	/**
477	477
...	...	@@ -480,8 +480,9 @@
480	480	* Returns one DMI data value, can be used to perform
481	481	* complex DMI data checks.
482	482	*/
483		-char * dmi_get_system_info(int field)
	483	+char *dmi_get_system_info(int field)
484	484	{
485	485	return dmi_ident[field];
486	486	}
	487	+EXPORT_SYMBOL(dmi_get_system_info);
...	...	@@ -20,7 +20,7 @@
20	20	#include <linux/types.h>
21	21	#include <linux/init.h>
22	22	#include <linux/proc_fs.h>
23		-#include <linux/apm_bios.h>
	23	+#include <linux/dmi.h>
24	24	#include <asm/uaccess.h>
25	25	#include <asm/io.h>
26	26
27	27
...	...	@@ -52,19 +52,8 @@
52	52
53	53	#define I8K_TEMPERATURE_BUG 1
54	54
55		-#define DELL_SIGNATURE "Dell Computer"
	55	+static char bios_version[4];
56	56
57		-static char *supported_models[] = {
58		- "Inspiron",
59		- "Latitude",
60		- NULL
61		-};
62		-
63		-static char system_vendor[48] = "?";
64		-static char product_name[48] = "?";
65		-static char bios_version[4] = "?";
66		-static char serial_number[16] = "?";
67		-
68	57	MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
69	58	MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
70	59	MODULE_LICENSE("GPL");
...	...	@@ -73,6 +62,10 @@
73	62	module_param(force, bool, 0);
74	63	MODULE_PARM_DESC(force, "Force loading without checking for supported models");
75	64
	65	+static int ignore_dmi;
	66	+module_param(ignore_dmi, bool, 0);
	67	+MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match");
	68	+
76	69	static int restricted;
77	70	module_param(restricted, bool, 0);
78	71	MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set");
...	...	@@ -99,11 +92,10 @@
99	92	unsigned int edi __attribute__ ((packed));
100	93	} SMMRegisters;
101	94
102		-typedef struct {
103		- u8 type;
104		- u8 length;
105		- u16 handle;
106		-} DMIHeader;
	95	+static inline char *i8k_get_dmi_data(int field)
	96	+{
	97	+ return dmi_get_system_info(field) ? : "N/A";
	98	+}
107	99
108	100	/*
109	101	* Call the System Management Mode BIOS. Code provided by Jonathan Buzzard.
...	...	@@ -163,15 +155,6 @@
163	155	}
164	156
165	157	/*
166		- * Read the machine id.
167		- */
168		-static int i8k_get_serial_number(unsigned char *buff)
169		-{
170		- strlcpy(buff, serial_number, sizeof(serial_number));
171		- return 0;
172		-}
173		-
174		-/*
175	158	* Read the Fn key status.
176	159	*/
177	160	static int i8k_get_fn_status(void)
...	...	@@ -328,7 +311,7 @@
328	311	static int i8k_ioctl(struct inode ip, struct file fp, unsigned int cmd,
329	312	unsigned long arg)
330	313	{
331		- int val;
	314	+ int val = 0;
332	315	int speed;
333	316	unsigned char buff[16];
334	317	int __user argp = (int __user )arg;
...	...	@@ -343,7 +326,7 @@
343	326
344	327	case I8K_MACHINE_ID:
345	328	memset(buff, 0, 16);
346		- val = i8k_get_serial_number(buff);
	329	+ strlcpy(buff, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), sizeof(buff));
347	330	break;
348	331
349	332	case I8K_FN_STATUS:
350	333
...	...	@@ -451,10 +434,10 @@
451	434	n = sprintf(buffer, "%s %s %s %d %d %d %d %d %d %d\n",
452	435	I8K_PROC_FMT,
453	436	bios_version,
454		- serial_number,
	437	+ dmi_get_system_info(DMI_PRODUCT_SERIAL) ? : "N/A",
455	438	cpu_temp,
456		- left_fan,
457		- right_fan, left_speed, right_speed, ac_power, fn_key);
	439	+ left_fan, right_fan, left_speed, right_speed,
	440	+ ac_power, fn_key);
458	441
459	442	return n;
460	443	}
461	444
462	445
463	446
464	447
465	448
466	449
467	450
...	...	@@ -486,226 +469,55 @@
486	469	return len;
487	470	}
488	471
489		-static char __init string_trim(char s, int size)
490		-{
491		- int len;
492		- char *p;
	472	+static struct dmi_system_id __initdata i8k_dmi_table[] = {
	473	+ {
	474	+ .ident = "Dell Inspiron",
	475	+ .matches = {
	476	+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer"),
	477	+ DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron"),
	478	+ },
	479	+ },
	480	+ {
	481	+ .ident = "Dell Latitude",
	482	+ .matches = {
	483	+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer"),
	484	+ DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
	485	+ },
	486	+ },
	487	+ { }
	488	+};
493	489
494		- if ((len = strlen(s)) > size) {
495		- len = size;
496		- }
497		-
498		- for (p = s + len - 1; len && (*p == ' '); len--, p--) {
499		- *p = '\0';
500		- }
501		-
502		- return s;
503		-}
504		-
505		-/* DMI code, stolen from arch/i386/kernel/dmi_scan.c */
506		-
507	490	/*
508		- * \|<-- dmi->length -->\|
509		- * \| \|
510		- * \|dmi header s=N \| string1,\0, ..., stringN,\0, ..., \0
511		- * \| \|
512		- * +-----------------------+
513		- */
514		-static char __init dmi_string(DMIHeader dmi, u8 s)
515		-{
516		- u8 *p;
517		-
518		- if (!s) {
519		- return "";
520		- }
521		- s--;
522		-
523		- p = (u8 *) dmi + dmi->length;
524		- while (s > 0) {
525		- p += strlen(p);
526		- p++;
527		- s--;
528		- }
529		-
530		- return p;
531		-}
532		-
533		-static void __init dmi_decode(DMIHeader * dmi)
534		-{
535		- u8 data = (u8 ) dmi;
536		- char *p;
537		-
538		-#ifdef I8K_DEBUG
539		- int i;
540		- printk("%08x ", (int)data);
541		- for (i = 0; i < data[1] && i < 64; i++) {
542		- printk("%02x ", data[i]);
543		- }
544		- printk("\n");
545		-#endif
546		-
547		- switch (dmi->type) {
548		- case 0: /* BIOS Information */
549		- p = dmi_string(dmi, data[5]);
550		- if (*p) {
551		- strlcpy(bios_version, p, sizeof(bios_version));
552		- string_trim(bios_version, sizeof(bios_version));
553		- }
554		- break;
555		- case 1: /* System Information */
556		- p = dmi_string(dmi, data[4]);
557		- if (*p) {
558		- strlcpy(system_vendor, p, sizeof(system_vendor));
559		- string_trim(system_vendor, sizeof(system_vendor));
560		- }
561		- p = dmi_string(dmi, data[5]);
562		- if (*p) {
563		- strlcpy(product_name, p, sizeof(product_name));
564		- string_trim(product_name, sizeof(product_name));
565		- }
566		- p = dmi_string(dmi, data[7]);
567		- if (*p) {
568		- strlcpy(serial_number, p, sizeof(serial_number));
569		- string_trim(serial_number, sizeof(serial_number));
570		- }
571		- break;
572		- }
573		-}
574		-
575		-static int __init dmi_table(u32 base, int len, int num,
576		- void (fn) (DMIHeader ))
577		-{
578		- u8 *buf;
579		- u8 *data;
580		- DMIHeader *dmi;
581		- int i = 1;
582		-
583		- buf = ioremap(base, len);
584		- if (buf == NULL) {
585		- return -1;
586		- }
587		- data = buf;
588		-
589		- /*
590		- * Stop when we see al the items the table claimed to have
591		- * or we run off the end of the table (also happens)
592		- */
593		- while ((i < num) && ((data - buf) < len)) {
594		- dmi = (DMIHeader *) data;
595		- /*
596		- * Avoid misparsing crud if the length of the last
597		- * record is crap
598		- */
599		- if ((data - buf + dmi->length) >= len) {
600		- break;
601		- }
602		- fn(dmi);
603		- data += dmi->length;
604		- /*
605		- * Don't go off the end of the data if there is
606		- * stuff looking like string fill past the end
607		- */
608		- while (((data - buf) < len) && (*data \|\| data[1])) {
609		- data++;
610		- }
611		- data += 2;
612		- i++;
613		- }
614		- iounmap(buf);
615		-
616		- return 0;
617		-}
618		-
619		-static int __init dmi_iterate(void (decode) (DMIHeader ))
620		-{
621		- unsigned char buf[20];
622		- void __iomem p = ioremap(0xe0000, 0x20000), q;
623		-
624		- if (!p)
625		- return -1;
626		-
627		- for (q = p; q < p + 0x20000; q += 16) {
628		- memcpy_fromio(buf, q, 20);
629		- if (memcmp(buf, "_DMI_", 5) == 0) {
630		- u16 num = buf[13] << 8 \| buf[12];
631		- u16 len = buf[7] << 8 \| buf[6];
632		- u32 base = buf[11] << 24 \| buf[10] << 16 \| buf[9] << 8 \| buf[8];
633		-#ifdef I8K_DEBUG
634		- printk(KERN_INFO "DMI %d.%d present.\n",
635		- buf[14] >> 4, buf[14] & 0x0F);
636		- printk(KERN_INFO "%d structures occupying %d bytes.\n",
637		- buf[13] << 8 \| buf[12], buf[7] << 8 \| buf[6]);
638		- printk(KERN_INFO "DMI table at 0x%08X.\n",
639		- buf[11] << 24 \| buf[10] << 16 \| buf[9] << 8 \|
640		- buf[8]);
641		-#endif
642		- if (dmi_table(base, len, num, decode) == 0) {
643		- iounmap(p);
644		- return 0;
645		- }
646		- }
647		- }
648		- iounmap(p);
649		- return -1;
650		-}
651		-
652		-/* end of DMI code */
653		-
654		-/*
655		- * Get DMI information.
656		- */
657		-static int __init i8k_dmi_probe(void)
658		-{
659		- char **p;
660		-
661		- if (dmi_iterate(dmi_decode) != 0) {
662		- printk(KERN_INFO "i8k: unable to get DMI information\n");
663		- return -ENODEV;
664		- }
665		-
666		- if (strncmp(system_vendor, DELL_SIGNATURE, strlen(DELL_SIGNATURE)) != 0) {
667		- printk(KERN_INFO "i8k: not running on a Dell system\n");
668		- return -ENODEV;
669		- }
670		-
671		- for (p = supported_models;; p++) {
672		- if (!*p) {
673		- printk(KERN_INFO "i8k: unsupported model: %s\n",
674		- product_name);
675		- return -ENODEV;
676		- }
677		- if (strncmp(product_name, p, strlen(p)) == 0) {
678		- break;
679		- }
680		- }
681		-
682		- return 0;
683		-}
684		-
685		-/*
686	491	* Probe for the presence of a supported laptop.
687	492	*/
688	493	static int __init i8k_probe(void)
689	494	{
690	495	char buff[4];
691	496	int version;
692		- int smm_found = 0;
693	497
694	498	/*
695	499	* Get DMI information
696	500	*/
697		- if (i8k_dmi_probe() != 0) {
	501	+ if (!dmi_check_system(i8k_dmi_table)) {
	502	+ if (!ignore_dmi && !force)
	503	+ return -ENODEV;
	504	+
	505	+ printk(KERN_INFO "i8k: not running on a supported Dell system.\n");
698	506	printk(KERN_INFO "i8k: vendor=%s, model=%s, version=%s\n",
699		- system_vendor, product_name, bios_version);
	507	+ i8k_get_dmi_data(DMI_SYS_VENDOR),
	508	+ i8k_get_dmi_data(DMI_PRODUCT_NAME),
	509	+ i8k_get_dmi_data(DMI_BIOS_VERSION));
700	510	}
701	511
	512	+ strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), sizeof(bios_version));
	513	+
702	514	/*
703	515	* Get SMM Dell signature
704	516	*/
705	517	if (i8k_get_dell_signature() != 0) {
706		- printk(KERN_INFO "i8k: unable to get SMM Dell signature\n");
707		- } else {
708		- smm_found = 1;
	518	+ printk(KERN_ERR "i8k: unable to get SMM Dell signature\n");
	519	+ if (!force)
	520	+ return -ENODEV;
709	521	}
710	522
711	523	/*
712	524
...	...	@@ -713,9 +525,8 @@
713	525	*/
714	526	version = i8k_get_bios_version();
715	527	if (version <= 0) {
716		- printk(KERN_INFO "i8k: unable to get SMM BIOS version\n");
	528	+ printk(KERN_WARNING "i8k: unable to get SMM BIOS version\n");
717	529	} else {
718		- smm_found = 1;
719	530	buff[0] = (version >> 16) & 0xff;
720	531	buff[1] = (version >> 8) & 0xff;
721	532	buff[2] = (version) & 0xff;
722	533
723	534
...	...	@@ -723,23 +534,17 @@
723	534	/*
724	535	* If DMI BIOS version is unknown use SMM BIOS version.
725	536	*/
726		- if (bios_version[0] == '?') {
727		- strcpy(bios_version, buff);
728		- }
	537	+ if (!dmi_get_system_info(DMI_BIOS_VERSION))
	538	+ strlcpy(bios_version, buff, sizeof(bios_version));
	539	+
729	540	/*
730	541	* Check if the two versions match.
731	542	*/
732		- if (strncmp(buff, bios_version, sizeof(bios_version)) != 0) {
733		- printk(KERN_INFO
734		- "i8k: BIOS version mismatch: %s != %s\n", buff,
735		- bios_version);
736		- }
	543	+ if (strncmp(buff, bios_version, sizeof(bios_version)) != 0)
	544	+ printk(KERN_WARNING "i8k: BIOS version mismatch: %s != %s\n",
	545	+ buff, bios_version);
737	546	}
738	547
739		- if (!smm_found && !force) {
740		- return -ENODEV;
741		- }
742		-
743	548	return 0;
744	549	}
745	550
746	551
...	...	@@ -751,9 +556,8 @@
751	556	struct proc_dir_entry *proc_i8k;
752	557
753	558	/* Are we running on an supported laptop? */
754		- if (i8k_probe() != 0) {
	559	+ if (i8k_probe())
755	560	return -ENODEV;
756		- }
757	561
758	562	/* Register the proc entry */
759	563	proc_i8k = create_proc_info_entry("i8k", 0, NULL, i8k_get_info);
...	...	@@ -9,6 +9,7 @@
9	9	DMI_SYS_VENDOR,
10	10	DMI_PRODUCT_NAME,
11	11	DMI_PRODUCT_VERSION,
	12	+ DMI_PRODUCT_SERIAL,
12	13	DMI_BOARD_VENDOR,
13	14	DMI_BOARD_NAME,
14	15	DMI_BOARD_VERSION,