aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 18:17:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 18:17:40 -0400
commite533b227055598b1f7dc8503a3b4f36b14b9da8a (patch)
tree28fec4125eac45c8e2fac75b3d10ff5cd987d2f6 /drivers/firmware
parent0999d978dcdcf59350dafa25afd70def9f924eee (diff)
parent6b2ada82101a08e2830fb29d7dc9b858be637dd4 (diff)
Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: do_generic_file_read: s/EINTR/EIO/ if lock_page_killable() fails softirq, warning fix: correct a format to avoid a warning softirqs, debug: preemption check x86, pci-hotplug, calgary / rio: fix EBDA ioremap() IO resources, x86: ioremap sanity check to catch mapping requests exceeding, fix IO resources, x86: ioremap sanity check to catch mapping requests exceeding the BAR sizes softlockup: Documentation/sysctl/kernel.txt: fix softlockup_thresh description dmi scan: warn about too early calls to dmi_check_system() generic: redefine resource_size_t as phys_addr_t generic: make PFN_PHYS explicitly return phys_addr_t generic: add phys_addr_t for holding physical addresses softirq: allocate less vectors IO resources: fix/remove printk printk: robustify printk, update comment printk: robustify printk, fix #2 printk: robustify printk, fix printk: robustify printk Fixed up conflicts in: arch/powerpc/include/asm/types.h arch/powerpc/platforms/Kconfig.cputype manually.
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/dmi_scan.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 455575be3560..3e526b6d00cb 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -15,6 +15,11 @@
15 */ 15 */
16static char dmi_empty_string[] = " "; 16static char dmi_empty_string[] = " ";
17 17
18/*
19 * Catch too early calls to dmi_check_system():
20 */
21static int dmi_initialized;
22
18static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s) 23static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s)
19{ 24{
20 const u8 *bp = ((u8 *) dm) + dm->length; 25 const u8 *bp = ((u8 *) dm) + dm->length;
@@ -366,7 +371,7 @@ void __init dmi_scan_machine(void)
366 371
367 if (efi_enabled) { 372 if (efi_enabled) {
368 if (efi.smbios == EFI_INVALID_TABLE_ADDR) 373 if (efi.smbios == EFI_INVALID_TABLE_ADDR)
369 goto out; 374 goto error;
370 375
371 /* This is called as a core_initcall() because it isn't 376 /* This is called as a core_initcall() because it isn't
372 * needed during early boot. This also means we can 377 * needed during early boot. This also means we can
@@ -374,13 +379,13 @@ void __init dmi_scan_machine(void)
374 */ 379 */
375 p = dmi_ioremap(efi.smbios, 32); 380 p = dmi_ioremap(efi.smbios, 32);
376 if (p == NULL) 381 if (p == NULL)
377 goto out; 382 goto error;
378 383
379 rc = dmi_present(p + 0x10); /* offset of _DMI_ string */ 384 rc = dmi_present(p + 0x10); /* offset of _DMI_ string */
380 dmi_iounmap(p, 32); 385 dmi_iounmap(p, 32);
381 if (!rc) { 386 if (!rc) {
382 dmi_available = 1; 387 dmi_available = 1;
383 return; 388 goto out;
384 } 389 }
385 } 390 }
386 else { 391 else {
@@ -391,19 +396,22 @@ void __init dmi_scan_machine(void)
391 */ 396 */
392 p = dmi_ioremap(0xF0000, 0x10000); 397 p = dmi_ioremap(0xF0000, 0x10000);
393 if (p == NULL) 398 if (p == NULL)
394 goto out; 399 goto error;
395 400
396 for (q = p; q < p + 0x10000; q += 16) { 401 for (q = p; q < p + 0x10000; q += 16) {
397 rc = dmi_present(q); 402 rc = dmi_present(q);
398 if (!rc) { 403 if (!rc) {
399 dmi_available = 1; 404 dmi_available = 1;
400 dmi_iounmap(p, 0x10000); 405 dmi_iounmap(p, 0x10000);
401 return; 406 goto out;
402 } 407 }
403 } 408 }
404 dmi_iounmap(p, 0x10000); 409 dmi_iounmap(p, 0x10000);
405 } 410 }
406 out: printk(KERN_INFO "DMI not present or invalid.\n"); 411 error:
412 printk(KERN_INFO "DMI not present or invalid.\n");
413 out:
414 dmi_initialized = 1;
407} 415}
408 416
409/** 417/**
@@ -424,6 +432,8 @@ int dmi_check_system(const struct dmi_system_id *list)
424 int i, count = 0; 432 int i, count = 0;
425 const struct dmi_system_id *d = list; 433 const struct dmi_system_id *d = list;
426 434
435 WARN(!dmi_initialized, KERN_ERR "dmi check: not initialized yet.\n");
436
427 while (d->ident) { 437 while (d->ident) {
428 for (i = 0; i < ARRAY_SIZE(d->matches); i++) { 438 for (i = 0; i < ARRAY_SIZE(d->matches); i++) {
429 int s = d->matches[i].slot; 439 int s = d->matches[i].slot;