diff options
author | Matt Domsch <Matt_Domsch@dell.com> | 2006-03-26 04:37:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:56:54 -0500 |
commit | 3ed3bce846abc7ef460104b461cac793e41afe5e (patch) | |
tree | 6db86a6cdfd3600db4e24cd91f53ba6f4f661280 /include | |
parent | 10dbe196a8da6b3196881269c6639c0ec11c36cb (diff) |
[PATCH] ia64: use i386 dmi_scan.c
Enable DMI table parsing on ia64.
Andi Kleen has a patch in his x86_64 tree which enables the use of i386
dmi_scan.c on x86_64. dmi_scan.c functions are being used by the
drivers/char/ipmi/ipmi_si_intf.c driver for autodetecting the ports or
memory spaces where the IPMI controllers may be found.
This patch adds equivalent changes for ia64 as to what is in the x86_64
tree. In addition, I reworked the DMI detection, such that on EFI-capable
systems, it uses the efi.smbios pointer to find the table, rather than
brute-force searching from 0xF0000. On non-EFI systems, it continues the
brute-force search.
My test system, an Intel S870BN4 'Tiger4', aka Dell PowerEdge 7250, with
latest BIOS, does not list the IPMI controller in the ACPI namespace, nor
does it have an ACPI SPMI table. Also note, currently shipping Dell x8xx
EM64T servers don't have these either, so DMI is the only method for
obtaining the address of the IPMI controller.
Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Acked-by: "Luck, Tony" <tony.luck@intel.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ia64/dmi.h | 6 | ||||
-rw-r--r-- | include/asm-ia64/io.h | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-ia64/dmi.h b/include/asm-ia64/dmi.h new file mode 100644 index 000000000000..f3efaa229525 --- /dev/null +++ b/include/asm-ia64/dmi.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_DMI_H | ||
2 | #define _ASM_DMI_H 1 | ||
3 | |||
4 | #include <asm/io.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h index b64fdb985494..0d9bcc36f2a9 100644 --- a/include/asm-ia64/io.h +++ b/include/asm-ia64/io.h | |||
@@ -435,6 +435,11 @@ iounmap (volatile void __iomem *addr) | |||
435 | 435 | ||
436 | #define ioremap_nocache(o,s) ioremap(o,s) | 436 | #define ioremap_nocache(o,s) ioremap(o,s) |
437 | 437 | ||
438 | /* Use normal IO mappings for DMI */ | ||
439 | #define dmi_ioremap ioremap | ||
440 | #define dmi_iounmap(x,l) iounmap(x) | ||
441 | #define dmi_alloc(l) kmalloc(l, GFP_ATOMIC) | ||
442 | |||
438 | # ifdef __KERNEL__ | 443 | # ifdef __KERNEL__ |
439 | 444 | ||
440 | /* | 445 | /* |