diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | AUTHORS | 8 | ||||
| -rw-r--r-- | CHANGELOG | 461 | ||||
| -rw-r--r-- | LICENSE | 39 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | biosdecode.c | 35 | ||||
| -rw-r--r-- | dmidecode.c | 419 | ||||
| -rw-r--r-- | dmidecode.h | 5 | ||||
| -rw-r--r-- | dmioem.c | 197 | ||||
| -rw-r--r-- | dmioem.h | 2 | ||||
| -rw-r--r-- | dmiopt.c | 8 | ||||
| -rw-r--r-- | dmiopt.h | 5 | ||||
| -rw-r--r-- | man/biosdecode.8 | 2 | ||||
| -rw-r--r-- | man/dmidecode.8 | 21 | ||||
| -rw-r--r-- | ownership.c | 4 | ||||
| -rw-r--r-- | util.c | 68 | ||||
| -rw-r--r-- | util.h | 5 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vpddecode.c | 2 | ||||
| -rw-r--r-- | vpdopt.c | 4 | ||||
| -rw-r--r-- | vpdopt.h | 2 |
21 files changed, 962 insertions, 340 deletions
@@ -1,3 +1,8 @@ .bzr .bzrignore -.pc
\ No newline at end of file +.pc +biosdecode +dmidecode +ownership +vpddecode +*.o @@ -1,9 +1,9 @@ DEVELOPER AND MAINTAINER -Anton Arapov <anton@redhat.com> +Jean Delvare <jdelvare@suse.de> ORIGINAL AUTHORS Alan Cox <alan@redhat.com> -Jean Delvare <khali@linux-fr.org> +Jean Delvare <jdelvare@suse.de> CODE CONTRIBUTORS (IN CHRONOLOGICAL ORDER) Matt Domsch <Matt_Domsch@dell.com> @@ -16,6 +16,9 @@ Roberto Nibali <ratz@tac.ch> John Cagle <jcagle@kernel.org> Jens Elkner <elkner@linofee.org> Jarod Wilson <jarod@redhat.com> +Anton Arapov <anton@redhat.com> +Roy Franz <roy.franz@linaro.org> +Tyler Bell <tyler.bell@hp.com> MANY THANKS TO (IN CHRONOLOGICAL ORDER) Werner Heuser @@ -84,3 +87,4 @@ Thomas Mingarelli Andrey Matveyev Stefan Tauner Naga Chumbalkar +Jens Rosenboom @@ -1,3 +1,132 @@ +2015-09-03 Jean Delvare <jdelvare@suse.de> + + * version.h: Set version to 3.0. + +2015-08-04 Tyler Bell <tyler.bell@hp.com> + + * dmioem.c: Decode HP-specific DMI type 233 + * dmioem.c: Refactored HP-specific types 209 and 221 to use common code + * dmioem.c: Documented spec for HP-specific types 209, 221 and 233 + +2015-05-21 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Fix up invalid DMI type 34 structure length. + * dmioem.c: Decode HP-specific DMI types 212 and 219. + * dmioem.c: Move function is_printable to dmidecode.c. + +2015-05-13 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Add support for SMBIOS3 EFI table. + * dmidecode.c: Fix warnings about comparison between signed and + unsigned integers. + * util.c: Fix warnings about unused labels when building without + -DUSE_MMAP. + * dmioem.c: Strip spaces at the end of vendor names. + * dmioem.c: Decode Acer-specific DMI type 170. + +2015-05-12 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Remove extra blank line after hidden DMI type 40 + structure. + +2015-05-04 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Move table decoding to a separate function. + * dmidecode.c: Simplify function dmi_table_dump. + * dmidecode.c: Display types 41 and 42 in quiet mode too. + * dmidecode.c: Get OEM vendor from System Information (DMI type 1). + +2015-04-28 Jean Delvare <jdelvare@suse.de> + + * dmidecode.h, dmiopt.h: Fix sparse errors. + * biosdecode.c, dmiopt.c, ownership.c, vpdopt.c: Fix sparse warnings. + * util.c: Fix sparse warning. + +2015-04-27 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Fix --dump-bin when reading from sysfs. + +2015-04-27 Jean Delvare <jdelvare@suse.de> + + Update to support SMBIOS specification version 3.0.0. + + * dmidecode.c: Add support for the new _SM3_ 64-bit entry point + defined in the SMBIOS specification version 3.0.0, including + support of 64-bit addresses and 32-bit table lengths. + * dmidecode.c: Add 3 new chassis types (DMI type 3). + * dmidecode.c: Add 4 new processor families (DMI type 4). + * dmidecode.c: Add 4 new Intel socket types (DMI type 4). + * dmidecode.c: Add 13 new slot types (DMI type 9). + * dmidecode.c: Add 4 new memory device types (DMI type 17). + * dmidecode.c: Add support for processors with more than 255 cores + or threads (DMI type 4). + * dmidecode.c: Stop decoding v3 tables at End-of-Table marker. + +2015-04-21 Roy Franz <roy.franz@linaro.org> + + * util.c, util.h: Add utility function read_file, which reads an + entire binary file into a buffer. + * dmidecode.c: Add passing of flags parameter to dmi_table. + * dmidecode.c: Add reading of SMBIOS tables from sysfs. + * dmidecode.c, dmiopt.c, dmiopt.h: Add --no-sysfs option to disable + use of sysfs. + * dmidecode.8: Document the changes above. + +2015-04-20 Jean Delvare <jdelvare@suse.de> + + * biosdecode.c: Add support for the _SM3_ entry point, as defined in + the SMBIOS 3.0.0 specification. + +2014-11-14 Jean Delvare <jdelvare@suse.de> + + * man/dmidecode.8: Add a note about DMI strings available from sysfs + on Linux. + +2014-10-13 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Add support for DDR4 (DMI type 17). Patch from Tomohiro + Kimura. The value was taken from preliminary SMBIOS specification + version 3.0.0d. + This fixes Savannah bug #43370: + https://savannah.nongnu.org/bugs/?43370 + +2014-07-11 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Decode the CPUID of recent AMD processors (DMI type 4). + +2014-03-20 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Let legacy_decode be quiet in dump mode too. + * dmidecode.c: Skip the SMBIOS version comparison in quiet mode. + Patch from Jens Rosenboom. + +2014-02-25 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Fix spacing of memory module voltage attributes + (DMI type 17). + +2014-01-13 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Decode ID of PCI Express 3 slots (DMI type 9). + This fixes Savannah bug #40178: + https://savannah.nongnu.org/bugs/?40178 + +2014-01-13 Jean Delvare <jdelvare@suse.de> + + * LICENSE: Update to the latest upstream version. Amongst other + things, this fixes the FSF address. + +2013-04-24 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Strip trailing zeroes from memory voltage values + (DMI type 17). + * dmidecode.c: Fix support for new processor upgrade types (DMI + type 4) and new memory device type (DMI type 17.) + +2013-04-17 Anton Arapov <anton@redhat.com> + + * version.h: Set version to 2.12. + 2013-04-17 Anton Arapov <anton@redhat.com> Update to support SMBIOS specification version 2.8.0. @@ -20,7 +149,7 @@ * dmioem.c: Add "PXE" to the HP OEM Type 209 output so it is similar to the "iSCSI" description in HP OEM Type 221. Patch from Naga Chumbalkar. -2011-11-18 Jean Delvare <khali@linux-fr.org> +2011-11-18 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Properly print the hexadecimal value of invalid string characters. @@ -32,7 +161,7 @@ * config.h: Haiku dropped the _BEOS_ definition in favor of its own platform identification _HAIKU_. Patch from Francois Revol. -2011-04-20 Jean Delvare <khali@linux-fr.org> +2011-04-20 Jean Delvare <jdelvare@suse.de> Update to support SMBIOS specification version 2.7.1. @@ -41,12 +170,16 @@ "20-way Set-associative" (DMI type 7). * dmidecode.c: Add PCI Express 3 slot types (DMI type 9). -2011-01-25 Jean Delvare <khali@linux-fr.org> +2011-01-25 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Fix boundary checks of memory array location codes (DMI type 16). Reported by Andrey Matveyev. -2010-11-24 Jean Delvare <khali@linux-fr.org> +2011-01-19 Anton Arapov <anton@redhat.com> + + * version.h: Set version to 2.11. + +2010-11-24 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Assume that the max power capacity is expressed in Watts, not milliWatts (DMI type 39). The specification isn't @@ -63,7 +196,7 @@ * dmidecode.c: Decode the slot ID for all PCI Express and PCI Express 2 slots (DMI type 9). -2010-11-24 Jean Delvare <khali@linux-fr.org> +2010-11-24 Jean Delvare <jdelvare@suse.de> Update to support SMBIOS specification version 2.7.0. @@ -87,7 +220,7 @@ * dmidecode.c: Add limited support for new DMI type 42 (Management Controller Host Interface). -2010-11-16 Jean Delvare <khali@linux-fr.org> +2010-11-16 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Handle ambiguous processor family value 0x30 (DMI type 4). @@ -95,16 +228,16 @@ processor family value 0xBE (DMI type 4). * dmidecode.c: Handle DMI type 2 record of size 0x0E. -2010-11-11 Jean Delvare <khali@linux-fr.org> +2010-11-11 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Fix decoding of IPMI base address LSB. -2010-11-09 Jean Delvare <khali@linux-fr.org> +2010-11-09 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Drop redundant/obsolete references to CIM_Processor.Family. -2010-10-26 Jean Delvare <khali@linux-fr.org> +2010-10-26 Jean Delvare <jdelvare@suse.de> Update to support Intel AP-485 (CPUID) revision 36 (was 32). @@ -115,7 +248,7 @@ * dmidecode.c: Update the list of processors for which we decode the CPUID flags. -2010-10-11 Jean Delvare <khali@linux-fr.org> +2010-10-11 Jean Delvare <jdelvare@suse.de> * dmidecode.c: One more SMBIOS version fix-up case. * Makefile: Rework BSD make compatibility trick. The previous @@ -126,7 +259,7 @@ * util.c: makes dmidecode fall back to regular reads if the mmap fails. Patch from Olof Johansson. -2010-09-21 Jean Delvare <khali@linux-fr.org> +2010-09-21 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Fix Xeon 7xxx entries in CPU name lookup table (DMI type 4). Patch from Paul Flo Williams. @@ -150,30 +283,30 @@ "24-way Set-associative", "32-way Set-associative", "48-way Set-associative" and "64-way Set-associative" (DMI type 7). -2009-07-27 Jean Delvare <khali@linux-fr.org> +2009-07-27 Jean Delvare <jdelvare@suse.de> * dmioem.c: Recognize "Hewlett-Packard" as a possible DMI vendor string for HP. Orginal patch from Thomas Hiller (HP). * dmidecode.c: Add processor upgrade type "Socket LGA1366" (DMI type 4). -2009-06-19 Jean Delvare <khali@linux-fr.org> +2009-06-19 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Fix decoding of memory array capacity. A maximum capacity of 128 GB would erroneously be reported as Unknown, while a unknown capacity would be erroneously reported as 2048 GB. Bug reported by Lin Li (HP). -2009-04-30 Jean Delvare <khali@linux-fr.org> +2009-04-30 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Warn if decoding an SMBIOS implementation which is newer than what we support. -2009-04-04 Jean Delvare <khali@linux-fr.org> +2009-04-04 Jean Delvare <jdelvare@suse.de> * Makefile: Clarify license. -2008-11-23 Jean Delvare <khali@linux-fr.org> +2008-11-23 Jean Delvare <jdelvare@suse.de> * biosdecode.c: Stop using the inline keyword. It causes more portability issues than is worth given how little we care about @@ -181,18 +314,18 @@ to inline functions anyway. * version.h: Set version to 2.10. -2008-11-14 Jean Delvare <khali@linux-fr.org> +2008-11-14 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Handle chassis information records of size 19 (DMI type 3). -2008-11-10 Jean Delvare <khali@linux-fr.org> +2008-11-10 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Claim to support revision 32 of Intel AP-485 (CPUID). No relevant change since revision 31. * dmidecode.c: Update reference to AMD CPUID document. -2008-11-09 Jean Delvare <khali@linux-fr.org> +2008-11-09 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Decode the CPUID of more Intel, VIA and AMD processors (DMI type 4). @@ -204,14 +337,14 @@ * README: Simplify "IA-64" common problem entry, most of the issues are solved by now. -2008-11-08 Jean Delvare <khali@linux-fr.org> +2008-11-08 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Add many processor types taken from the CIM Schema. * dmidecode.c: Drop all references to the DMTF Master MIF document. This document hasn't been updated in years, so the additions it may contain are no longer relevant. -2008-11-07 Jean Delvare <khali@linux-fr.org> +2008-11-07 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Handle base board information records of size 9 (DMI type 2). @@ -219,7 +352,7 @@ device speed (DMI type 17). The access time didn't add much value, and rounding effects made it look bad at times. -2008-11-07 Jean Delvare <khali@linux-fr.org> +2008-11-07 Jean Delvare <jdelvare@suse.de> Update to support SMBIOS specification version 2.6, fourth round. @@ -231,7 +364,7 @@ * dmidecode.c, dmidecode.8: Update reference SMBIOS document. * dmiopt.c, dmidecode.8: Include entry type 41 in --type baseboard. -2008-11-05 Jean Delvare <khali@linux-fr.org> +2008-11-05 Jean Delvare <jdelvare@suse.de> Update to support SMBIOS specification version 2.6, third round. @@ -246,14 +379,14 @@ (DMI type 9). * dmidecode.c: Decode the memory device rank (DMI type 17). -2008-11-02 Jean Delvare <khali@linux-fr.org> +2008-11-02 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Use binary search for dmi_processor_family, it's faster than linear search (DMI type 4). * dmidecode.c: Decode boot integrity services entry point entries (DMI type 31). -2008-10-31 Jean Delvare <khali@linux-fr.org> +2008-10-31 Jean Delvare <jdelvare@suse.de> * dmidecode.c: The compiler knows how to reuse strings, it doesn't need our help, and actually it does a better job without it. So, @@ -262,7 +395,7 @@ dmi_cache_location(), dmi_system_reset_boot_option() and dmi_ipmi_register_spacing(). -2008-10-30 Jean Delvare <khali@linux-fr.org> +2008-10-30 Jean Delvare <jdelvare@suse.de> * dmidecode.c, dmiopt.c, dmidecode.8: Option --dump is only a modifier as --quiet is, so it's not actually mutually exclusive @@ -273,13 +406,13 @@ code duplication. * dmidecode.c: Fix up invalid SMBIOS version 2.51. -2008-10-29 Jean Delvare <khali@linux-fr.org> +2008-10-29 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Handle special case of processor family code 0xBE, which can be both Core 2 or K7. We use the processor manufacturer string as a hint (DMI type 4). -2008-10-28 Jean Delvare <khali@linux-fr.org> +2008-10-28 Jean Delvare <jdelvare@suse.de> * dmidecode.c, dmidecode.h, dmiopt.c, dmiopt.h: Don't use function pointers for special string cases. Each special case is itself @@ -292,7 +425,7 @@ * dmidecode.c: Support Processor Family 2 field also when queried with option --string. -2008-10-27 Jean Delvare <khali@linux-fr.org> +2008-10-27 Jean Delvare <jdelvare@suse.de> Update to support SMBIOS specification version 2.6, second round. @@ -305,7 +438,7 @@ * dmidecode.c: Add processor upgrade types "Socket S1", "Socket AM2" and "Socket F (1207)" (DMI type 4). -2008-10-26 Jean Delvare <khali@linux-fr.org> +2008-10-26 Jean Delvare <jdelvare@suse.de> Update to support SMBIOS specification version 2.6, first round. @@ -314,7 +447,7 @@ * dmidecode.c: Add chassis types "Blade" and "Blade Enclosure" (DMI type 3). -2008-10-26 Jean Delvare <khali@linux-fr.org> +2008-10-26 Jean Delvare <jdelvare@suse.de> * dmiopt.c, dmidecode.8: Simplify the handling and documentation of mutually exclusive output format options. @@ -331,7 +464,7 @@ * dmidecode.c: Handle base board information records of size 10 (DMI type 2). -2008-10-25 Jean Delvare <khali@linux-fr.org> +2008-10-25 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Limit indentation in smbios_decode and legacy_decode. @@ -342,12 +475,12 @@ * dmidecode.8: Update the option --dump-bin, document the new option --from-dump. -2008-08-28 Jean Delvare <khali@linux-fr.org> +2008-08-28 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Add missing colon to temperature probe label. Patch from Alex Iribarren. -2008-02-16 Jean Delvare <khali@linux-fr.org> +2008-02-16 Jean Delvare <jdelvare@suse.de> * util.c, util.h: New helper function write_dump. * dmidecode.c, dmiopt.c, dmiopt.h: New option --dump-bin, dump @@ -359,17 +492,17 @@ * dmidecode.c: Adjust the error message which is displayed when the table is unreachable. -2007-06-30 Jean Delvare <khali@linux-fr.org> +2007-06-30 Jean Delvare <jdelvare@suse.de> * config.h: Add support for Solaris (x86 only, of course). Based on a patch by Sun's Dan Mick, brought to my knowledge by Attila Nagy. -2007-06-27 Jean Delvare <khali@linux-fr.org> +2007-06-27 Jean Delvare <jdelvare@suse.de> * Makefile: Fix the uninstall-man target. -2007-06-07 Jean Delvare <khali@linux-fr.org> +2007-06-07 Jean Delvare <jdelvare@suse.de> * dmidecode.c: If the SMBIOS entry point decoding fails (for example due to a bad checksum), still try decoding the @@ -377,18 +510,18 @@ * dmidecode.c: Replace all occurrences of "KB" by the more correct "kB". -2007-03-16 Jean Delvare <khali@linux-fr.org> +2007-03-16 Jean Delvare <jdelvare@suse.de> * vpddecode.c: Stop asking the user to report bad checksums, unaligned records and the like. Such machines exist, too bad, we have to live with it. -2007-02-27 Jean Delvare <khali@linux-fr.org> +2007-02-27 Jean Delvare <jdelvare@suse.de> * biosdecode.c: Fix a compilation error with non-C99 compilers. Patch from Francois Revol. -2007-02-26 Jean Delvare <khali@linux-fr.org> +2007-02-26 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Fix an array overrun while decoding the system event log status (DMI type 15). @@ -398,7 +531,7 @@ * vpddecode.8: The product name is no longer displayed. * version.h: Set version to 2.9. -2007-02-16 Jean Delvare <khali@linux-fr.org> +2007-02-16 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Do not print the BIOS base address and runtime size if the base address is 0. This happens on IA-64 because there's @@ -408,7 +541,7 @@ quite tricky to keep both GNU make and BSD make happy, but it seems that I finally succeeded. -2007-02-13 Jean Delvare <khali@linux-fr.org> +2007-02-13 Jean Delvare <jdelvare@suse.de> Update to support SMBIOS specification version 2.5, second round. @@ -440,7 +573,7 @@ * dmidecode.c: Add memory device form factor "FB-DIMM" and memory device type "DDR2 FB-DIMM" (DMI type 17). -2007-02-12 Jean Delvare <khali@linux-fr.org> +2007-02-12 Jean Delvare <jdelvare@suse.de> * dmioem.c: Share the code between HP-specific types 209 and 221. Both types are really the same, only the title is different. @@ -461,7 +594,7 @@ * dmidecode.c: New CPUID flag IA64. * dmidecode.c: Fix the decoding of Intel extended family. -2007-02-11 Jean Delvare <khali@linux-fr.org> +2007-02-11 Jean Delvare <jdelvare@suse.de> * dmioem.c, dmioem.h: New. * Makefile, dmidecode.c, dmidecode.h, dmioem.c, dmioem.h: Move the @@ -479,27 +612,27 @@ locator (type 204), NIC MAC information (type 209) and NIC iSCSI MAC information (type 221). -2007-01-14 Jean Delvare <khali@linux-fr.org> +2007-01-14 Jean Delvare <jdelvare@suse.de> * vpddecode.c: Fix a rare warning. * biosdecode.c: Add support for the FJKEYINF entry point, which contains data related to the "application panel" on Fujitsu laptops. -2006-05-23 Jean Delvare <khali@linux-fr.org> +2006-05-23 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Fix a recently introduced compilation error with non-C99 compilers. * dmidecode.c: Check for short entries (less than 4 bytes), stop with an error when one is encountered. -2006-05-13 Jean Delvare <khali@linux-fr.org> +2006-05-13 Jean Delvare <jdelvare@suse.de> * vpddecode.c, README: Drop the product name lookup table. It was reported to be unreliable too many times, and was also difficult to maintain. -2006-05-10 Jean Delvare <khali@linux-fr.org> +2006-05-10 Jean Delvare <jdelvare@suse.de> * dmidecode.c: Don't cast from u8* to dmi_header*, else architectures which do not support unaligned memory accesses @@ -519,17 +652,17 @@ Macintosh systems with EFI. Also prevent a possible, though unlikely, NULL-pointer dereference in the EFI code. -2006-02-25 Jean Delvare <khali@linux-fr.org> +2006-02-25 Jean Delvare * dmidecode.c: Fix typo reported by David Wilson (DMI case 3). -2006-02-04 Jean Delvare <khali@linux-fr.org> +2006-02-04 Jean Delvare * vpddecode.c: Update lookup table from revision 2006-01-31 of IBM reference document (add product ID "7B"). * version.h: Set version to 2.8. -2006-01-21 Jean Delvare <khali@linux-fr.org> +2006-01-21 Jean Delvare * vpddecode.c: The mysterious last character of xSeries records may be a BIOS revision. Display it as such when present and @@ -541,34 +674,34 @@ tool description. * vpdopt.h: Add missing system header file include. -2006-01-20 Jean Delvare <khali@linux-fr.org> +2006-01-20 Jean Delvare * vpddecode.c: Assume a constant length of 12 characters for the "Default Flash Image File Name" entry. The 13th character never contained anything useful, so it probably has a different meaning (unknown for now). -2005-12-24 Jean Delvare <khali@linux-fr.org> +2005-12-24 Jean Delvare * vpddecode.c: Scan for VPD records on 4-byte boundaries instead of 16-byte boundaries. This is needed for some eServer xSeries 206. Still emit a warning if a VPD record is found not on a 16-byte boundary. -2005-10-26 Jean Delvare <khali@linux-fr.org> +2005-10-26 Jean Delvare * vpddecode.c: Add product ID "NR". Reported by Klaus Muth. * vpddecode.c: Update lookup table from revision 2005-10-06 of IBM reference document (add product IDs "77" and "78"). -2005-10-05 Jean Delvare <khali@linux-fr.org> +2005-10-05 Jean Delvare Update to support IPMI specification version 2.0 (was 1.5). * dmidecode.c: Support IPMI interface type SSIF. Original patch by Garry Belka. -2005-10-04 Jean Delvare <khali@linux-fr.org> +2005-10-04 Jean Delvare * vpdopt.c: Display the list of all valid string keywords when --string is used without an argument. @@ -577,7 +710,7 @@ * vpddecode.c: Keep quiet when --string is used, even when no VPD record is found. -2005-10-03 Jean Delvare <khali@linux-fr.org> +2005-10-03 Jean Delvare * biosdecode.c: Fix a potential (but highly improbable) buffer overrun in the VPD record decoding. @@ -592,13 +725,13 @@ * vpddecode.c, vpdopt.c, vpdopt.h: Add option -s, --string. It prints one selected VPD string instead of the regular output. -2005-09-24 Jean Delvare <khali@linux-fr.org> +2005-09-24 Jean Delvare * dmiopt.c: Fix incorrect header include. The strcasecmp function is defined in <strings.h>, not <string.h>. Reported by Petter Reinholdtsen. -2005-09-14 Jean Delvare <khali@linux-fr.org> +2005-09-14 Jean Delvare * dmidecode.h: New. * dmidecode.c, dmidecode.h, Makefile: Export four specific @@ -609,28 +742,28 @@ * dmidecode.c, dmiopt.c, dmiopt.h: Modify the opt structure to handle the string option more efficiently. -2005-09-13 Jean Delvare <khali@linux-fr.org> +2005-09-13 Jean Delvare * vpddecode.c: Slightly change the xSeries checksumming method to accommodate a strange xSeries 440 VPD record. Also tweak the decoding of the "Default Flash Image File Name" entry. Thanks to Torsten Seemann for providing a test VPD record. -2005-09-05 Jean Delvare <khali@linux-fr.org> +2005-09-05 Jean Delvare * Makefile: Use -Wundef. -2005-08-31 Jean Delvare <khali@linux-fr.org> +2005-08-31 Jean Delvare * dmidecode.c: Drop trailing dot from handle description line. -2005-08-29 Jean Delvare <khali@linux-fr.org> +2005-08-29 Jean Delvare * dmidecode.c: Reword a comment about CPUID. * dmidecode.c: Claim to support revision 28 of Intel AP-485 (CPUID). No relevant change since revision 27. -2005-08-25 Jean Delvare <khali@linux-fr.org> +2005-08-25 Jean Delvare * vpddecode.c: Add product ID "VI". Reported by Torsten Seemann. * vpddecode.c: Update lookup table from revision 2005-06-24 of IBM @@ -640,24 +773,24 @@ * biosdecode.c, ownership.c, vpddecode.c: getopt_long() will never return ':'. -2005-08-04 Jean Delvare <khali@linux-fr.org> +2005-08-04 Jean Delvare * README: Manual pages document the command line interface. A discussion list exists for developers. Mmap is used on most systems, not just Linux. * version.h: Set version to 2.7. -2005-08-02 Jean Delvare <khali@linux-fr.org> +2005-08-02 Jean Delvare * dmiopt.c, dmidecode.8: Options --dump and --quiet are mutually exclusive. -2005-06-23 Jean Delvare <khali@linux-fr.org> +2005-06-23 Jean Delvare * dmiopt.c, dmidecode.8: Options --dump and --string are mutually exclusive. -2005-06-22 Jean Delvare <khali@linux-fr.org> +2005-06-22 Jean Delvare * dmiopt.c: Display the list of all valid type or string keywords when --type or --string, respectively, is used without an @@ -669,12 +802,12 @@ * dmidecode.c, dmidecode.8: Fix typo ("Controler" becomes "Controller"). -2005-06-21 Jean Delvare <khali@linux-fr.org> +2005-06-21 Jean Delvare * dmidecode.c, dmiopt.c, dmiopt.h: Add option -s, --string. It prints one selected DMI string instead of the regular output. -2005-06-18 Jean Delvare <khali@linux-fr.org> +2005-06-18 Jean Delvare * dmidecode.c: Hide handle references and entries of unknown type when --quiet is used. @@ -683,7 +816,7 @@ is used. Also don't warn about incorrect table length or entries count when --quiet is used. -2005-06-17 Jean Delvare <khali@linux-fr.org> +2005-06-17 Jean Delvare * dmidecode.c, dmiopt.c, dmiopt.h: Add option -q, --quiet. It makes the output less verbose. @@ -692,11 +825,11 @@ the output easier to read. * dmidecode.c: Hide table address and size when --type is used. -2005-06-16 Jean Delvare <khali@linux-fr.org> +2005-06-16 Jean Delvare * dmidecode.8: Document the new -t, --type option. -2005-06-15 Jean Delvare <khali@linux-fr.org> +2005-06-15 Jean Delvare * dmiopt.c, dmiopt.h: New. * Makefile, dmidecode.c, dmiopt.c, dmiopt.h: Move the command line @@ -704,23 +837,23 @@ * dmiopt.c: Define keywords to be used with --type (instead of numeric values). -2005-06-14 Jean Delvare <khali@linux-fr.org> +2005-06-14 Jean Delvare * dmidecode.c: Centralize the main exit point. This allows fixing a minor, recently introduced memory leak which was happening on error conditions. -2005-06-13 Jean Delvare <khali@linux-fr.org> +2005-06-13 Jean Delvare * dmidecode.c: Add option -t, --type. It limits the output to the given type(s) of DMI entries. -2005-05-25 Jean Delvare <khali@linux-fr.org> +2005-05-25 Jean Delvare * vpddecode.c: Add product IDs "KE", "NT" and "ZR". Reported by Bernd Krumboeck. -2005-05-15 Jean Delvare <khali@linux-fr.org> +2005-05-15 Jean Delvare * dmidecode.8, vpddecode.8: Document the new -u, --dump option. @@ -731,19 +864,19 @@ * dmidecode.c: Update the "System Management BIOS Reference Specification" version. -2005-04-26 Jean Delvare <khali@linux-fr.org> +2005-04-26 Jean Delvare * vpddecode.c: Add product ID "M1". Reported by Myke Olson. * vpddecode.c: Add option -u, --dump. It disables decoding of the VPD records, a raw dump is displayed instead. This option is mainly intended for debugging. -2005-04-03 Jean Delvare <khali@linux-fr.org> +2005-04-03 Jean Delvare * Makefile: Use variables for install and rm commands, so that these can be overridden by the caller. -2005-03-25 Jean Delvare <khali@linux-fr.org> +2005-03-25 Jean Delvare * Makefile: Install some documentation files (README, CHANGELOG, AUTHORS). @@ -759,18 +892,18 @@ * dmidecode.c: Add system slot types and widths (DMI type 9). * dmidecode.c: Add memory device type "DDR2" (DMI type 17). -2005-03-20 Jean Delvare <khali@linux-fr.org> +2005-03-20 Jean Delvare * Makefile: Install manual pages under $(prefix)/share/man by default, instead of $(prefix)/man, so as to comply with the FHS. -2005-03-08 Jean Delvare <khali@linux-fr.org> +2005-03-08 Jean Delvare * vpddecode.c: Update lookup table from revision 2005-03-08 of IBM reference document (add product ID "1V", update product ID "1R"). Thanks to Ingo van Lil for reporting about product ID "1V". -2005-03-06 Jean Delvare <khali@linux-fr.org> +2005-03-06 Jean Delvare * dmidecode.c: Add option -u, --dump. It disables decoding of the entries, raw dumps are displayed instead. This option is mainly @@ -778,16 +911,16 @@ * Makefile: Use -Winline. * dmidecode.c: Make ASCII filtering of strings faster. -2005-02-28 Jean Delvare <khali@linux-fr.org> +2005-02-28 Jean Delvare * version.h: Set version to 2.6. * Makefile: ownership.o depends on version.h. -2005-02-24 Jean Delvare <khali@linux-fr.org> +2005-02-24 Jean Delvare * vpddecode.c: Add product ID "2C". Reported by Tomek Mateja. -2005-02-17 Jean Delvare <khali@linux-fr.org> +2005-02-17 Jean Delvare * vpddecode.c: Add product IDs "OP" and "PN". Reported by Scott Denham. @@ -797,13 +930,13 @@ on IBM's reference web page. Update reference. * config.h: Use mmap on all but BeOS, instead of only Linux. -2005-02-12 Jean Delvare <khali@linux-fr.org> +2005-02-12 Jean Delvare * util.c: Fix incorrect length in munmap call. * Makefile: Use -Wmissing-prototypes. * dmidecode.c: Fix maximum battery error value. -2005-02-11 Jean Delvare <khali@linux-fr.org> +2005-02-11 Jean Delvare * Makefile: Discard -pedantic, we don't really need this. * util.c: Display an error message on memory shortage. Suggested @@ -820,7 +953,7 @@ * dmidecode.c, util.c, util.h: Use size_t instead of off_t when handling memory addresses. -2005-02-10 Jean Delvare <khali@linux-fr.org> +2005-02-10 Jean Delvare * dmidecode.c: Add option -h, --help, display a usage summary. * biosdecode.c, ownership.c, vpddecode.c: Copy command-line handling @@ -828,23 +961,23 @@ * biosdecode.8, dmidecode.8, ownership.8, vpddecode.8: Document the new command-line interface. -2005-02-06 Jean Delvare <khali@linux-fr.org> +2005-02-06 Jean Delvare * Makefile: Everything depends on config.h. * dmidecode.c: Add basic command-line handling. This was suggested a long time ago by Erwan Velu. -2005-02-01 Jean Delvare <khali@linux-fr.org> +2005-02-01 Jean Delvare * vpddecode.c: Add product IDs "AP", "KP" and "RD". Reported by David Rosala. -2005-01-17 Jean Delvare <khali@linux-fr.org> +2005-01-17 Jean Delvare * README: Add a note about Cygwin. Thanks to Dominik Klein for reporting success. -2004-12-10 Jean Delvare <khali@linux-fr.org> +2004-12-10 Jean Delvare Increase portability and configurability to in order to support BeOS. @@ -855,7 +988,7 @@ * Makefile, config.h, util.c, README: Move USE_MMAP to config.h, use mmap on Linux only. -2004-11-22 Jean Delvare <khali@linux-fr.org> +2004-11-22 Jean Delvare * biosdecode.c: Avoid size_t in printf. Should remove a warning on ia64. Thanks to Petter Reinholdtsen for reporting. @@ -863,18 +996,18 @@ available. This may remove a warning on ia64 as a side effect. Thanks to Petter Reinholdtsen for reporting. -2004-11-21 Jean Delvare <khali@linux-fr.org> +2004-11-21 Jean Delvare * util.c, util.h: Function myread has no more user outside of util.c. * biosdecode.c: Speed improvements. -2004-11-20 Jean Delvare <khali@linux-fr.org> +2004-11-20 Jean Delvare * biosdecode.c, ownership.c, vpddecode.c: Make use of the mem_chunk function. * vpddecode.c: Simplify the memory loop code a bit. -2004-11-12 Jean Delvare <khali@linux-fr.org> +2004-11-12 Jean Delvare * dmidecode.c: Hide bank connection type for non-installed memory modules. @@ -884,7 +1017,7 @@ * README: Match case change for PREFIX (now prefix) in the Makefile file. Reported by Raul Nunez de Arenas Coronado. -2004-11-12 Jean Delvare <khali@linux-fr.org> +2004-11-12 Jean Delvare Update to support DMTF Master MIF version 040707 (was 030621). @@ -898,28 +1031,28 @@ * dmidecode.c: Rename SBF flag to PBE. -2004-11-11 Jean Delvare <khali@linux-fr.org> +2004-11-11 Jean Delvare * util.c: More helpful error messages. * util.c: Use MAP_SHARED instead of MAP_PRIVATE in mmap. * version.h: Set version to 2.5. -2004-11-10 Jean Delvare <khali@linux-fr.org> +2004-11-10 Jean Delvare * README: Update dmidecode presentation (copied from the web page). Move the list of supported systems from the documentation section to the installation section. -2004-11-09 Jean Delvare <khali@linux-fr.org> +2004-11-09 Jean Delvare * vpddecode.c: Update product ID "1R". Reported by Marco Wertejuk. -2004-10-24 Jean Delvare <khali@linux-fr.org> +2004-10-24 Jean Delvare * util.c: Workaround missing MAP_FAILED definition, needed on old systems. Original patch from Durval Menezes. -2004-10-14 Jean Delvare <khali@linux-fr.org> +2004-10-14 Jean Delvare * dmidecode.c: Search for EFI systab at /sys/firmware/efi/systab. Original patch from Alex Williamson. @@ -932,15 +1065,15 @@ * Makefile: Be LDFLAGS aware. -2004-07-24 Jean Delvare <khali@linux-fr.org> +2004-07-24 Jean Delvare * util.c: Add missing header include. -2004-06-11 Jean Delvare <khali@linux-fr.org> +2004-06-11 Jean Delvare * vpddecode.c: Add product IDs "GE" and "T2". Reported by Doug Brenner. -2004-05-02 Jean Delvare <khali@linux-fr.org> +2004-05-02 Jean Delvare * dmidecode.c: Move legacy DMI entry point decoding to a separate function. @@ -950,48 +1083,48 @@ containing a copy of a given chunk of the physical memory. * dmidecode.c: Make use of the new mem_chunk function. -2004-04-30 Jean Delvare <khali@linux-fr.org> +2004-04-30 Jean Delvare * vpddecode.c: Add product ID "JP". Reported by Bernd Krumboeck. -2004-04-22 Jean Delvare <khali@linux-fr.org> +2004-04-22 Jean Delvare * dmidecode.c, biosdecode.c, ownership.c, types.h: Move common WORD-like macros to types.h. -2004-04-21 Jean Delvare <khali@linux-fr.org> +2004-04-21 Jean Delvare * dmidecode.c, biosdecode.c: Fix my contact information. * dmidecode.c: Update copyright year. -2004-04-20 Jean Delvare <khali@linux-fr.org> +2004-04-20 Jean Delvare * README: Correct Chad Smith's name. Reported by Martin Pool. -2004-04-15 Jean Delvare <khali@linux-fr.org> +2004-04-15 Jean Delvare * vpddecode.c: Add product ID "PL". Reported by Mark Syms. -2004-04-14 Jean Delvare <khali@linux-fr.org> +2004-04-14 Jean Delvare * vpddecode.c: Add product ID "PD". Reported by Roger Koot. -2004-04-11 Jean Delvare <khali@linux-fr.org> +2004-04-11 Jean Delvare * dmidecode.c, Makefile, README: Drop TABLE_LITTLEENDIAN. * README: Update manual pages information. -2004-04-02 Jean Delvare <khali@linux-fr.org> +2004-04-02 Jean Delvare * vpddecode.c: Add product ID "NV". Reported by Shawn Starr. -2004-03-27 Jean Delvare <khali@linux-fr.org> +2004-03-27 Jean Delvare * vpddecode.c: Add product ID "24". Reported by Paul Sturm. * dmidecode.c: Fix two missing comas in string enumerations. Thanks to Joshua Goldenhar for reporting the first one. -2004-03-24 Jean Delvare <khali@linux-fr.org> +2004-03-24 Jean Delvare * vpddecode.c: Add product ID "PJ". Reported by Roger Koot. * vpddecode.c: Rename two Netvista systems to use their real name @@ -1003,45 +1136,45 @@ and manual pages, and to use different paths when building and installing. -2004-03-19 Jean Delvare <khali@linux-fr.org> +2004-03-19 Jean Delvare * vpddecode.c: Add product ID "2A". Reported by Rafael Avila de Espindola. * version.h: Set version to 2.4. -2004-03-07 Jean Delvare <khali@linux-fr.org> +2004-03-07 Jean Delvare * biosdecode.c, vpddecode.c: Add a third checksumming method for VPD records. * vpddecode.c: Add product ID "PI", update "20". Reported by Zing Zing Shishak. -2004-03-05 Jean Delvare <khali@linux-fr.org> +2004-03-05 Jean Delvare * README: Update. -2004-02-25 Jean Delvare <khali@linux-fr.org> +2004-02-25 Jean Delvare * dmidecode.c: Support CPUID document revision 25 (no change). * dmidecode.c: Shorten the EOF error message. -2004-02-23 Jean Delvare <khali@linux-fr.org> +2004-02-23 Jean Delvare * man/biosdecode.8, man/dmidecode.8, man/ownership.8, man/vpddecode.8: New. * Makefile: Handle new manual pages. -2003-12-28 Jean Delvare <khali@linux-fr.org> +2003-12-28 Jean Delvare * vpddecode.c: Add product ID "PT". Reported by Ramiro Barreiro. -2003-12-17 Jean Delvare <khali@linux-fr.org> +2003-12-17 Jean Delvare * vpddecode.c: Add product ID "RE". Reported by Josef Moellers. * vpddecode.c, biosdecode.c: Handle longer VPD records as seen on xSeries. These have a different checksumming method. -2003-12-03 Jean Delvare <khali@linux-fr.org> +2003-12-03 Jean Delvare * vpddecode.c: Add product ID "TT". Reported by Hugues Lepesant. * vpddecode.c, biosdecode.c: Fix typo ("Bios" becomes "BIOS"). @@ -1050,12 +1183,12 @@ * dmidecode.c: Number devices in multi-device on board device information structures (DMI case 10). -2003-11-13 Jean Delvare <khali@linux-fr.org> +2003-11-13 Jean Delvare * dmidecode.c: Automatically detect architectures on which to use EFI (ia64 for now). Suggested by Jeff Moyer. -2003-11-11 Jean Delvare <khali@linux-fr.org> +2003-11-11 Jean Delvare * vpddecode.c: Add product ID "KX". Reported by Klaus Ade Johnstad, confirmed by Pamela Huntley. @@ -1067,24 +1200,24 @@ * dmidecode.c: Modify CPU signature display for AMD processors. * vpddecode.c, biosdecode.c: Fix incorrect VPD checksumming. -2003-10-24 Jean Delvare <khali@linux-fr.org> +2003-10-24 Jean Delvare * dmidecode.c: Add another exception to the CPUID-supporting CPU list. -2003-10-19 Jean Delvare <khali@linux-fr.org> +2003-10-19 Jean Delvare * README: Clarify why mmap is used. Fix typo. * Makefile: Add deleting core to the clean target. * version.h: Set version to 2.3. -2003-10-17 Jean Delvare <khali@linux-fr.org> +2003-10-17 Jean Delvare * biosdecode.c: Use (void) instead of __attribute__ ((unused)) to declare that a function parameter isn't used. According to Alexandre Duret-Lutz, this is the portable way do to it. Fix typo in comment. * dmidecode.c: Fix typo. -2003-10-16 Jean Delvare <khali@linux-fr.org> +2003-10-16 Jean Delvare * dmidecode.c: Remove useless comparison in dmi_system_boot_status. Thanks to Alexandre Duret-Lutz for pointing this out. @@ -1092,13 +1225,13 @@ using Valgrind. * biosdecode.c: Fix buffer overrun in main. Found using Valgrind. -2003-10-14 Jean Delvare <khali@linux-fr.org> +2003-10-14 Jean Delvare * dmidecode.c: Update DMTF reference addresses. * dmidecode.c: List two more processors (Athlon64 and Pentium M) as x86-class (i.e. supporting CPUID). -2003-10-11 Jean Delvare <khali@linux-fr.org> +2003-10-11 Jean Delvare Update to support DMTF Master MIF version 030621 (was 021205). @@ -1115,21 +1248,21 @@ * README: Update to reflect the addition of the strip target and the vpddecode program. Some additional changes and fixes. -2003-10-10 Jean Delvare <khali@linux-fr.org> +2003-10-10 Jean Delvare * dmidecode.c: Change mmap options to prevent dmidecode from being killed by the Linux kernel in some rare cases. Reported by Mike Cooper. * dmidecode.c: Various code cleanups and optimizations. -2003-10-09 Jean Delvare <khali@linux-fr.org> +2003-10-09 Jean Delvare * dmidecode.c: Fix a bug that prevented dmidecode to reach DMI tables beyond the 2GB memory limit. Reported by Mike Cooper. * ownership.c: Add one reference. Code cleanups. * CHANGELOG: Fix typo. -2003-10-08 Jean Delvare <khali@linux-fr.org> +2003-10-08 Jean Delvare * biosdecode.c: Fix potentially wrong checksum on Sony-specific entry. * biosdecode.c: Unimportant changes (comment, typo...) in @@ -1137,54 +1270,54 @@ * biosdecode.c: Add support for VPD (vital product data, IBM-specific). * CHANGELOG: Various updates. -2003-10-07 Jean Delvare <khali@linux-fr.org> +2003-10-07 Jean Delvare * ownership.c: Fix a harmless warning on x86_64. Reported by Mike Cooper. -2003-09-19 Jean Delvare <khali@linux-fr.org> +2003-09-19 Jean Delvare * dmidecode.c: Explicitly say when no SMBIOS nor DMI entry point was found. Implicitly suggested by Sergey Leonovich. -2003-09-11 Jean Delvare <khali@linux-fr.org> +2003-09-11 Jean Delvare * Makefile: Don't use $^ since it isn't supported by BSD make. Reported by Hugues Lepesant. -2003-09-05 Jean Delvare <khali@linux-fr.org> +2003-09-05 Jean Delvare * Makefile: Fix missing ownership dependency for install target. Reported by Mario Lang. -2003-08-08 Jean Delvare <khali@linux-fr.org> +2003-08-08 Jean Delvare * dmidecode.c: Update the README file (mainly the now solved laptop and IA-64 issues, and add a section for biosdecode and ownership). * version.h: Set version to 2.2. -2003-07-18 Jean Delvare <khali@linux-fr.org> +2003-07-18 Jean Delvare * dmidecode.c: Display CPUID values as hexadecimal, not decimal. * dmidecode.c: Shift the I2C slave address by one bit to the right (DMI case 38). -2003-06-27 Jean Delvare <khali@linux-fr.org> +2003-06-27 Jean Delvare * biosdecode.c: Better display of Compaq-specific entries (thank to some documentation). -2003-06-25 Jean Delvare <khali@linux-fr.org> +2003-06-25 Jean Delvare * dmidecode.c: Remove fp_last (not useful anymore). Reworded the "table is unreachable" message to mention the -DUSE_MMAP solution. -2003-06-19 Jean Delvare <khali@linux-fr.org> +2003-06-19 Jean Delvare * dmidecode.c: Add support for IA-64. * Makefile: Add new option CFLAGS modifier lines for IA-64. -2003-06-17 Jean Delvare <khali@linux-fr.org> +2003-06-17 Jean Delvare * dmidecode.c, biosdecode.c: Move common "util" functions to util.c. * util.c, util.h: New. @@ -1195,21 +1328,21 @@ (only found in Compaq machines). Requested by Luc Van de Velde. * Makefile: Update again. -2003-06-10 Jean Delvare <khali@linux-fr.org> +2003-06-10 Jean Delvare * dmidecode.c: Fix typo in IPMI register spacing table. * version.h: Set version to 2.1. -2003-06-04 Jean Delvare <khali@linux-fr.org> +2003-06-04 Jean Delvare * Makefile: Restore optional CFLAGS modifier lines. * README: New. -2003-05-30 Jean Delvare <khali@linux-fr.org> +2003-05-30 Jean Delvare * dmidecode.c: Cleaner handling of unreachable table. -2003-05-27 Jean Delvare <khali@linux-fr.org> +2003-05-27 Jean Delvare Update to support Intel AP-485 specification (CPUID) revision 023 (was 021). @@ -1217,23 +1350,23 @@ * dmidecode.c: Add SBF flag to processor ID (DMI case 4). Add comment about new flags returned in ECX. -2003-05-26 Jean Delvare <khali@linux-fr.org> +2003-05-26 Jean Delvare Update to support SMBIOS specification version 2.3.4 (was 2.3.3). * dmidecode.c: Add processor and processor upgrade names (DMI case 4). * dmidecode.c: Add slot names (DMI case 9). -2003-05-22 Jean Delvare <khali@linux-fr.org> +2003-05-22 Jean Delvare * dmidecode.c: Fix typo reported by David Wilson (DMI case 6). -2003-03-08 Jean Delvare <khali@linux-fr.org> +2003-03-08 Jean Delvare * dmidecode.c: Decode more fields according to the IPMI specification (DMI case 38). -2003-03-07 Jean Delvare <khali@linux-fr.org> +2003-03-07 Jean Delvare Fixed IPMI device information (DMI case 38). Thanks to Richard Sharpe for pointing the bugs out. @@ -1248,7 +1381,7 @@ * dmidecode.c: Decode some extra fields according to the IPMI specification. -2003-03-06 Jean Delvare <khali@linux-fr.org> +2003-03-06 Jean Delvare * dmidecode.c, biosdecode.c: Move all changelog entries to CHANGELOG. * CHANGELOG: New. Format inspired by Heroes' ChangeLog file. @@ -1257,7 +1390,7 @@ version.h. Update dependencies accordingly. * version.h: New. -2002-10-21 Jean Delvare <khali@linux-fr.org> +2002-10-21 Jean Delvare * dmidecode.c: Change supported log type descriptors display. * dmidecode.c: Code optimization in event log status. @@ -1267,31 +1400,31 @@ * dmidecode.c: Add ASCII-filtering to dmi_string. * dmidecode.c: Convert all dates to ISO 8601. -2002-10-18 Jean Delvare <khali@linux-fr.org> +2002-10-18 Jean Delvare * dmidecode.c: Complete rewrite. * dmidecode.c: Now complies with SMBIOS specification 2.3.3. * dmidecode.c: Move all non-DMI stuff to biosdecode.c. * biosdecode.c: New. -2002-10-15 Jean Delvare <khali@linux-fr.org> +2002-10-15 Jean Delvare * dmidecode.c: Fix bad index in DMI case 27 (cooling device). -2002-10-14 Jean Delvare <khali@linux-fr.org> +2002-10-14 Jean Delvare * dmidecode.c: Fix typo in dmi_memory_array_location. * dmidecode.c: Replace Kbyte by kB in DMI case 16. * dmidecode.c: Add DDR entry in dmi_memory_device_type. * dmidecode.c: Fix extra s in SYSID. -2002-10-12 Jean Delvare <khali@linux-fr.org> +2002-10-12 Jean Delvare * dmidecode.c: Fix maximum cache size and installed size being inverted. * dmidecode.c: Fix typos in port types. -2002-10-10 Jean Delvare <khali@linux-fr.org> +2002-10-10 Jean Delvare * dmidecode.c: Remove extra semicolon at the end of dmi_memory_array_use. @@ -1299,7 +1432,7 @@ * dmidecode.c: Add missing backslash in DMI case 37. * dmidecode.c: Fix BIOS ROM size (DMI case 0). -2002-10-05 Jean Delvare <khali@linux-fr.org> +2002-10-05 Jean Delvare * dmidecode.c: More ACPI decoded. * dmidecode.c: More PNP decoded. @@ -1316,7 +1449,7 @@ * dmidecode.c: Fix an off-by-one error that caused the last address being scanned to be 0x100000, not 0xFFFF0 as it should. -2002-09-28 Jean Delvare <khali@linux-fr.org> +2002-09-28 Jean Delvare * dmidecode.c: Fix missing coma in dmi_bus_name. * dmidecode.c: Remove unwanted bitmaskings in dmi_mgmt_dev_type, @@ -1344,7 +1477,7 @@ * dmidecode.c: Correct main() prototype. * dmidecode.c: Check for compilers with wrong type sizes. -2002-08-09 Jean Delvare <khali@linux-fr.org> +2002-08-09 Jean Delvare * dmidecode.c: Better DMI struct count/size error display. * dmidecode.c: More careful memory access in dmi_table. @@ -1354,7 +1487,7 @@ * dmideocde.c: Fix return value of dmi_port_type and dmi_port_connector_type. -2002-08-06 Jean Delvare <khali@linux-fr.org> +2002-08-06 Jean Delvare * dmidecode.c: Reposition file pointer after DMI table display. * dmidecode.c: Disable first RSD PTR checksum (was not correct anyway). @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. @@ -4,7 +4,7 @@ # VPD Decode # # Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> -# Copyright (C) 2002-2007 Jean Delvare <khali@linux-fr.org> +# Copyright (C) 2002-2015 Jean Delvare <jdelvare@suse.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ CC = gcc CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef + +# Let lseek and mmap support 64-bit wide offsets +CFLAGS += -D_FILE_OFFSET_BITS=64 + #CFLAGS += -DBIGENDIAN #CFLAGS += -DALIGNMENT_WORKAROUND diff --git a/biosdecode.c b/biosdecode.c index 09acb43..3bbfe28 100644 --- a/biosdecode.c +++ b/biosdecode.c @@ -2,7 +2,7 @@ * BIOS Decode * * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> - * Copyright (C) 2002-2008 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2002-2015 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,10 +25,10 @@ * are deemed to be part of the source code. * * References: - * - DMTF "System Management BIOS Reference Specification" - * Version 2.3.4 + * - DMTF "System Management BIOS (SMBIOS) Reference Specification" + * Version 3.0.0 * http://www.dmtf.org/standards/smbios - * - Intel "Preboot Execution Environment (PXE) Specification" + * - Intel "Preboot Execution Environment (PXE) Specification" * Version 2.1 * http://www.intel.com/labs/manage/wfm/wfmspecs.htm * - ACPI "Advanced Configuration and Power Interface Specification" @@ -90,6 +90,26 @@ struct bios_entry { * SMBIOS */ +static size_t smbios3_length(const u8 *p) +{ + return p[0x06]; +} + +static int smbios3_decode(const u8 *p, size_t len) +{ + if (len < 0x18 || !checksum(p, p[0x06])) + return 0; + + printf("SMBIOS %u.%u.%u present.\n", + p[0x07], p[0x08], p[0x09]); + printf("\tStructure Table Maximum Length: %u bytes\n", + DWORD(p + 0x0C)); + printf("\tStructure Table 64-bit Address: 0x%08X%08X\n", + QWORD(p + 0x10).h, QWORD(p + 0x10).l); + + return 1; +} + static size_t smbios_length(const u8 *p) { return p[0x05] == 0x1E ? 0x1F : p[0x05]; @@ -105,7 +125,7 @@ static int smbios_decode(const u8 *p, size_t len) printf("SMBIOS %u.%u present.\n", p[0x06], p[0x07]); printf("\tStructure Table Length: %u bytes\n", - WORD(p+0x16)); + WORD(p + 0x16)); printf("\tStructure Table Address: 0x%08X\n", DWORD(p + 0x18)); printf("\tNumber Of Structures: %u\n", @@ -516,7 +536,7 @@ static int fjkeyinf_decode(const u8 *p, size_t len) return 1; printf("\tDevice %d: type %u, chip %u", i + 1, *(p + 8 + i * 4), *(p + 8 + i * 4 + 2)); - if (*(p+8+i*4+1)) /* Access method */ + if (*(p + 8 + i * 4 + 1)) /* Access method */ printf(", SMBus address 0x%x", *(p + 8 + i * 4 + 3) >> 1); printf("\n"); @@ -530,6 +550,7 @@ static int fjkeyinf_decode(const u8 *p, size_t len) */ static struct bios_entry bios_entries[] = { + { "_SM3_", 0, 0xF0000, 0xFFFFF, smbios3_length, smbios3_decode }, { "_SM_", 0, 0xF0000, 0xFFFFF, smbios_length, smbios_decode }, { "_DMI_", 0, 0xF0000, 0xFFFFF, dmi_length, dmi_decode }, { "_SYSID_", 0, 0xE0000, 0xFFFFF, sysid_length, sysid_decode }, @@ -565,7 +586,7 @@ static int parse_command_line(int argc, char * const argv[]) { "dev-mem", required_argument, NULL, 'd' }, { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'V' }, - { 0, 0, 0, 0 } + { NULL, 0, NULL, 0 } }; while ((option = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) diff --git a/dmidecode.c b/dmidecode.c index 0599759..f41c85b 100644 --- a/dmidecode.c +++ b/dmidecode.c @@ -2,7 +2,7 @@ * DMI Decode * * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> - * Copyright (C) 2002-2010 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2002-2015 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ * are deemed to be part of the source code. * * Unless specified otherwise, all references are aimed at the "System - * Management BIOS Reference Specification, Version 2.8.0" document, + * Management BIOS Reference Specification, Version 3.0.0" document, * available from http://www.dmtf.org/standards/smbios. * * Note to contributors: @@ -69,12 +69,30 @@ #define out_of_spec "<OUT OF SPEC>" static const char *bad_index = "<BAD INDEX>"; -#define SUPPORTED_SMBIOS_VER 0x0207 +#define SUPPORTED_SMBIOS_VER 0x0300 + +#define FLAG_NO_FILE_OFFSET (1 << 0) +#define FLAG_STOP_AT_EOT (1 << 1) + +#define SYS_ENTRY_FILE "/sys/firmware/dmi/tables/smbios_entry_point" +#define SYS_TABLE_FILE "/sys/firmware/dmi/tables/DMI" /* * Type-independant Stuff */ +/* Returns 1 if the buffer contains only printable ASCII characters */ +int is_printable(const u8 *data, int len) +{ + int i; + + for (i = 0; i < len; i++) + if (data[i] < 32 || data[i] >= 127) + return 0; + + return 1; +} + const char *dmi_string(const struct dmi_header *dm, u8 s) { char *bp = (char *)dm->data; @@ -529,12 +547,15 @@ static const char *dmi_chassis_type(u8 code) "CompactPCI", "AdvancedTCA", "Blade", - "Blade Enclosing" /* 0x1D */ + "Blade Enclosing", + "Tablet", + "Convertible", + "Detachable" /* 0x20 */ }; code &= 0x7F; /* bits 6:0 are chassis type, 7th bit is the lock bit */ - if (code >= 0x01 && code <= 0x1D) + if (code >= 0x01 && code <= 0x20) return type[code - 0x01]; return out_of_spec; } @@ -695,6 +716,7 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver) { 0x29, "Core Duo Mobile" }, { 0x2A, "Core Solo Mobile" }, { 0x2B, "Atom" }, + { 0x2C, "Core M" }, { 0x30, "Alpha" }, { 0x31, "Alpha 21064" }, @@ -712,7 +734,6 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver) { 0x3D, "Opteron 6200" }, { 0x3E, "Opteron 4200" }, { 0x3F, "FX" }, - { 0x40, "MIPS" }, { 0x41, "MIPS R4000" }, { 0x42, "MIPS R4200" }, @@ -729,7 +750,6 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver) { 0x4D, "Opteron 6300" }, { 0x4E, "Opteron 3300" }, { 0x4F, "FirePro" }, - { 0x50, "SPARC" }, { 0x51, "SuperSPARC" }, { 0x52, "MicroSPARC II" }, @@ -746,6 +766,9 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver) { 0x63, "68010" }, { 0x64, "68020" }, { 0x65, "68030" }, + { 0x66, "Athlon X4" }, + { 0x67, "Opteron X1000" }, + { 0x68, "Opteron X2000" }, { 0x70, "Hobbit" }, @@ -821,7 +844,7 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver) { 0xC9, "G4" }, { 0xCA, "G5" }, { 0xCB, "ESA/390 G6" }, - { 0xCC, "z/Architectur" }, + { 0xCC, "z/Architecture" }, { 0xCD, "Core i5" }, { 0xCE, "Core i3" }, @@ -1014,11 +1037,11 @@ static void dmi_processor_id(u8 type, const u8 *p, const char *version, const ch sig = 1; else if ((type >= 0x18 && type <= 0x1D) /* AMD */ || type == 0x1F /* AMD */ - || (type >= 0x38 && type <= 0x3E) /* AMD */ - || (type >= 0x46 && type <= 0x49) /* AMD */ + || (type >= 0x38 && type <= 0x3F) /* AMD */ + || (type >= 0x46 && type <= 0x4F) /* AMD */ || (type >= 0x83 && type <= 0x8F) /* AMD */ || (type >= 0xB6 && type <= 0xB7) /* AMD */ - || (type >= 0xE6 && type <= 0xEF)) /* AMD */ + || (type >= 0xE4 && type <= 0xEF)) /* AMD */ sig = 2; else if (type == 0x01 || type == 0x02) { @@ -1173,10 +1196,14 @@ static const char *dmi_processor_upgrade(u8 code) "Socket FM1", "Socket FM2", "Socket LGA2011-3", - "Socket LGA1356-3" /* 0x2C */ + "Socket LGA1356-3", + "Socket LGA1150", + "Socket BGA1168", + "Socket BGA1234", + "Socket BGA1364" /* 0x30 */ }; - if (code >= 0x01 && code <= 0x2A) + if (code >= 0x01 && code <= 0x30) return upgrade[code - 0x01]; return out_of_spec; } @@ -1672,7 +1699,20 @@ static const char *dmi_slot_type(u8 code) "AGP 2x", "AGP 4x", "PCI-X", - "AGP 8x" /* 0x13 */ + "AGP 8x", + "M.2 Socket 1-DP", + "M.2 Socket 1-SD", + "M.2 Socket 2", + "M.2 Socket 3", + "MXM Type I", + "MXM Type II", + "MXM Type III", + "MXM Type III-HE", + "MXM Type IV", + "MXM 3.0 Type A", + "MXM 3.0 Type B", + "PCI Express 2 SFF-8639", + "PCI Express 3 SFF-8639" /* 0x20 */ }; static const char *type_0xA0[] = { "PC-98/C20", /* 0xA0 */ @@ -1699,8 +1739,12 @@ static const char *dmi_slot_type(u8 code) "PCI Express 3 x8", "PCI Express 3 x16" /* 0xB6 */ }; + /* + * Note to developers: when adding entries to these lists, check if + * function dmi_slot_id below needs updating too. + */ - if (code >= 0x01 && code <= 0x13) + if (code >= 0x01 && code <= 0x20) return type[code - 0x01]; if (code >= 0xA0 && code <= 0xB6) return type_0xA0[code - 0xA0]; @@ -1780,6 +1824,8 @@ static void dmi_slot_id(u8 code1, u8 code2, u8 type, const char *prefix) case 0x11: /* AGP */ case 0x12: /* PCI-X */ case 0x13: /* AGP */ + case 0x1F: /* PCI Express 2 */ + case 0x20: /* PCI Express 3 */ case 0xA5: /* PCI Express */ case 0xA6: /* PCI Express */ case 0xA7: /* PCI Express */ @@ -1792,6 +1838,12 @@ static void dmi_slot_id(u8 code1, u8 code2, u8 type, const char *prefix) case 0xAE: /* PCI Express 2 */ case 0xAF: /* PCI Express 2 */ case 0xB0: /* PCI Express 2 */ + case 0xB1: /* PCI Express 3 */ + case 0xB2: /* PCI Express 3 */ + case 0xB3: /* PCI Express 3 */ + case 0xB4: /* PCI Express 3 */ + case 0xB5: /* PCI Express 3 */ + case 0xB6: /* PCI Express 3 */ printf("%sID: %u\n", prefix, code1); break; case 0x07: /* PCMCIA */ @@ -2236,7 +2288,7 @@ static void dmi_memory_voltage_value(u16 code) if (code == 0) printf(" Unknown"); else - printf(" %.3f V", (float)(i16)code / 1000); + printf(code % 100 ? " %g V" : " %.1f V", (float)code / 1000); } static const char *dmi_memory_device_form_factor(u8 code) @@ -2303,10 +2355,15 @@ static const char *dmi_memory_device_type(u8 code) "Reserved", "Reserved", "DDR3", - "FBD2", /* 0x19 */ + "FBD2", + "DDR4", + "LPDDR", + "LPDDR2", + "LPDDR3", + "LPDDR4" /* 0x1E */ }; - if (code >= 0x01 && code <= 0x19) + if (code >= 0x01 && code <= 0x1E) return type[code - 0x01]; return out_of_spec; } @@ -2338,7 +2395,7 @@ static void dmi_memory_device_type_detail(u16 code) { int i; - for (i = 1; i <= 14; i++) + for (i = 1; i <= 15; i++) if (code & (1 << i)) printf(" %s", detail[i - 1]); } @@ -2883,6 +2940,25 @@ static void dmi_64bit_memory_error_address(u64 code) * 7.35 Management Device (Type 34) */ +/* + * Several boards have a bug where some type 34 structures have their + * length incorrectly set to 0x10 instead of 0x0B. This causes the + * first 5 characters of the device name to be trimmed. It's easy to + * check and fix, so do it, but warn. + */ +static void dmi_fixup_type_34(struct dmi_header *h) +{ + u8 *p = h->data; + + /* Make sure the hidden data is ASCII only */ + if (h->length == 0x10 + && is_printable(p + 0x0B, 0x10 - 0x0B)) + { + printf("Invalid entry length (%u). Fixed up to %u.\n", 0x10, 0x0B); + h->length = 0x0B; + } +} + static const char *dmi_management_device_type(u8 code) { /* 7.35.1 */ @@ -3155,7 +3231,7 @@ static void dmi_decode(const struct dmi_header *h, u16 ver) const u8 *data = h->data; /* - * Note: DMI types 37, 39 and 40 are untested + * Note: DMI types 37 and 42 are untested */ switch (h->type) { @@ -3350,11 +3426,17 @@ static void dmi_decode(const struct dmi_header *h, u16 ver) dmi_string(h, data[0x22])); if (h->length < 0x28) break; if (data[0x23] != 0) - printf("\tCore Count: %u\n", data[0x23]); + printf("\tCore Count: %u\n", + h->length >= 0x2C && data[0x23] == 0xFF ? + WORD(data + 0x2A) : data[0x23]); if (data[0x24] != 0) - printf("\tCore Enabled: %u\n", data[0x24]); + printf("\tCore Enabled: %u\n", + h->length >= 0x2E && data[0x24] == 0xFF ? + WORD(data + 0x2C) : data[0x24]); if (data[0x25] != 0) - printf("\tThread Count: %u\n", data[0x25]); + printf("\tThread Count: %u\n", + h->length >= 0x30 && data[0x25] == 0xFF ? + WORD(data + 0x2E) : data[0x25]); printf("\tCharacteristics:"); dmi_processor_characteristics(WORD(data + 0x26), "\t\t"); break; @@ -3657,13 +3739,13 @@ static void dmi_decode(const struct dmi_header *h, u16 ver) dmi_memory_device_speed(WORD(data + 0x20)); printf("\n"); if (h->length < 0x28) break; - printf("\tMinimum voltage: "); + printf("\tMinimum Voltage:"); dmi_memory_voltage_value(WORD(data + 0x22)); printf("\n"); - printf("\tMaximum voltage: "); + printf("\tMaximum Voltage:"); dmi_memory_voltage_value(WORD(data + 0x24)); printf("\n"); - printf("\tConfigured voltage: "); + printf("\tConfigured Voltage:"); dmi_memory_voltage_value(WORD(data + 0x26)); printf("\n"); break; @@ -4212,8 +4294,9 @@ static void dmi_decode(const struct dmi_header *h, u16 ver) case 40: /* 7.41 Additional Information */ if (h->length < 0x0B) break; - if (!(opt.flags & FLAG_QUIET)) - dmi_additional_info(h, ""); + if (opt.flags & FLAG_QUIET) + return; + dmi_additional_info(h, ""); break; case 41: /* 7.42 Onboard Device Extended Information */ @@ -4306,65 +4389,21 @@ static void dmi_table_string(const struct dmi_header *h, const u8 *data, u16 ver } } -static void dmi_table_dump(u32 base, u16 len, const char *devmem) +static void dmi_table_dump(const u8 *buf, u32 len) { - u8 *buf; - - if ((buf = mem_chunk(base, len, devmem)) == NULL) - { - fprintf(stderr, "Failed to read table, sorry.\n"); - return; - } - if (!(opt.flags & FLAG_QUIET)) printf("# Writing %d bytes to %s.\n", len, opt.dumpfile); write_dump(32, len, buf, opt.dumpfile, 0); - free(buf); } -static void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem) +static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags) { - u8 *buf; u8 *data; int i = 0; - if (ver > SUPPORTED_SMBIOS_VER) - { - printf("# SMBIOS implementations newer than version %u.%u are not\n" - "# fully supported by this version of dmidecode.\n", - SUPPORTED_SMBIOS_VER >> 8, SUPPORTED_SMBIOS_VER & 0xFF); - } - - if (opt.flags & FLAG_DUMP_BIN) - { - dmi_table_dump(base, len, devmem); - return; - } - - if (!(opt.flags & FLAG_QUIET)) - { - if (opt.type == NULL) - { - printf("%u structures occupying %u bytes.\n", - num, len); - if (!(opt.flags & FLAG_FROM_DUMP)) - printf("Table at 0x%08X.\n", base); - } - printf("\n"); - } - - if ((buf = mem_chunk(base, len, devmem)) == NULL) - { - fprintf(stderr, "Table is unreachable, sorry." -#ifndef USE_MMAP - " Try compiling dmidecode with -DUSE_MMAP." -#endif - "\n"); - return; - } - data = buf; - while (i < num && data+4 <= buf + len) /* 4 is the length of an SMBIOS structure header */ + while ((i < num || !num) + && data + 4 <= buf + len) /* 4 is the length of an SMBIOS structure header */ { u8 *next; struct dmi_header h; @@ -4372,7 +4411,7 @@ static void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem) to_dmi_header(&h, data); display = ((opt.type == NULL || opt.type[h.type]) - && !((opt.flags & FLAG_QUIET) && (h.type > 39 && h.type <= 127)) + && !((opt.flags & FLAG_QUIET) && (h.type == 126 || h.type == 127)) && !opt.string); /* @@ -4399,17 +4438,22 @@ static void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem) h.handle, h.type, h.length); /* assign vendor for vendor-specific decodes later */ - if (h.type == 0 && h.length >= 5) + if (h.type == 1 && h.length >= 5) dmi_set_vendor(dmi_string(&h, data[0x04])); + /* Fixup a common mistake */ + if (h.type == 34) + dmi_fixup_type_34(&h); + /* look for the next handle */ next = data + h.length; - while (next - buf + 1 < len && (next[0] != 0 || next[1] != 0)) + while ((unsigned long)(next - buf + 1) < len + && (next[0] != 0 || next[1] != 0)) next++; next += 2; if (display) { - if (next - buf <= len) + if ((unsigned long)(next - buf) <= len) { if (opt.flags & FLAG_DUMP) { @@ -4428,19 +4472,79 @@ static void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem) data = next; i++; + + /* SMBIOS v3 requires stopping at this marker */ + if (h.type == 127 && (flags & FLAG_STOP_AT_EOT)) + break; } + /* + * SMBIOS v3 64-bit entry points do not announce a structures count, + * and only indicate a maximum size for the table. + */ if (!(opt.flags & FLAG_QUIET)) { - if (i != num) + if (num && i != num) printf("Wrong DMI structures count: %d announced, " "only %d decoded.\n", num, i); - if (data - buf != len) - printf("Wrong DMI structures length: %d bytes " - "announced, structures occupy %d bytes.\n", - len, (unsigned int)(data - buf)); + if ((unsigned long)(data - buf) > len + || (num && (unsigned long)(data - buf) < len)) + printf("Wrong DMI structures length: %u bytes " + "announced, structures occupy %lu bytes.\n", + len, (unsigned long)(data - buf)); + } +} + +static void dmi_table(off_t base, u32 len, u16 num, u16 ver, const char *devmem, + u32 flags) +{ + u8 *buf; + + if (ver > SUPPORTED_SMBIOS_VER && !(opt.flags & FLAG_QUIET)) + { + printf("# SMBIOS implementations newer than version %u.%u are not\n" + "# fully supported by this version of dmidecode.\n", + SUPPORTED_SMBIOS_VER >> 8, SUPPORTED_SMBIOS_VER & 0xFF); } + if (!(opt.flags & FLAG_QUIET)) + { + if (opt.type == NULL) + { + if (num) + printf("%u structures occupying %u bytes.\n", + num, len); + if (!(opt.flags & FLAG_FROM_DUMP)) + printf("Table at 0x%08llX.\n", + (unsigned long long)base); + } + printf("\n"); + } + + /* + * When we are reading the DMI table from sysfs, we want to print + * the address of the table (done above), but the offset of the + * data in the file is 0. When reading from /dev/mem, the offset + * in the file is the address. + */ + if (flags & FLAG_NO_FILE_OFFSET) + base = 0; + + if ((buf = mem_chunk(base, len, devmem)) == NULL) + { + fprintf(stderr, "Table is unreachable, sorry." +#ifndef USE_MMAP + " Try compiling dmidecode with -DUSE_MMAP." +#endif + "\n"); + return; + } + + if (opt.flags & FLAG_DUMP_BIN) + dmi_table_dump(buf, len); + else + dmi_table_decode(buf, len, num, ver, flags); + free(buf); } @@ -4459,7 +4563,61 @@ static void overwrite_dmi_address(u8 *buf) buf[0x0B] = 0; } -static int smbios_decode(u8 *buf, const char *devmem) +/* Same thing for SMBIOS3 entry points */ +static void overwrite_smbios3_address(u8 *buf) +{ + buf[0x05] += buf[0x10] + buf[0x11] + buf[0x12] + buf[0x13] + + buf[0x14] + buf[0x15] + buf[0x16] + buf[0x17] - 32; + buf[0x10] = 32; + buf[0x11] = 0; + buf[0x12] = 0; + buf[0x13] = 0; + buf[0x14] = 0; + buf[0x15] = 0; + buf[0x16] = 0; + buf[0x17] = 0; +} + +static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) +{ + u16 ver; + u64 offset; + + if (!checksum(buf, buf[0x06])) + return 0; + + ver = (buf[0x07] << 8) + buf[0x08]; + if (!(opt.flags & FLAG_QUIET)) + printf("SMBIOS %u.%u.%u present.\n", + buf[0x07], buf[0x08], buf[0x09]); + + offset = QWORD(buf + 0x10); + if (!(flags & FLAG_NO_FILE_OFFSET) && offset.h && sizeof(off_t) < 8) + { + fprintf(stderr, "64-bit addresses not supported, sorry.\n"); + return 0; + } + + dmi_table(((off_t)offset.h << 32) | offset.l, + WORD(buf + 0x0C), 0, ver, devmem, flags | FLAG_STOP_AT_EOT); + + if (opt.flags & FLAG_DUMP_BIN) + { + u8 crafted[32]; + + memcpy(crafted, buf, 32); + overwrite_smbios3_address(crafted); + + if (!(opt.flags & FLAG_QUIET)) + printf("# Writing %d bytes to %s.\n", crafted[0x06], + opt.dumpfile); + write_dump(0, crafted[0x06], crafted, opt.dumpfile, 1); + } + + return 1; +} + +static int smbios_decode(u8 *buf, const char *devmem, u32 flags) { u16 ver; @@ -4491,7 +4649,7 @@ static int smbios_decode(u8 *buf, const char *devmem) ver >> 8, ver & 0xFF); dmi_table(DWORD(buf + 0x18), WORD(buf + 0x16), WORD(buf + 0x1C), - ver, devmem); + ver, devmem, flags); if (opt.flags & FLAG_DUMP_BIN) { @@ -4509,7 +4667,7 @@ static int smbios_decode(u8 *buf, const char *devmem) return 1; } -static int legacy_decode(u8 *buf, const char *devmem) +static int legacy_decode(u8 *buf, const char *devmem, u32 flags) { if (!checksum(buf, 0x0F)) return 0; @@ -4519,7 +4677,7 @@ static int legacy_decode(u8 *buf, const char *devmem) buf[0x0E] >> 4, buf[0x0E] & 0x0F); dmi_table(DWORD(buf + 0x08), WORD(buf + 0x06), WORD(buf + 0x0C), - ((buf[0x0E] & 0xF0) << 4) + (buf[0x0E] & 0x0F), devmem); + ((buf[0x0E] & 0xF0) << 4) + (buf[0x0E] & 0x0F), devmem, flags); if (opt.flags & FLAG_DUMP_BIN) { @@ -4528,7 +4686,9 @@ static int legacy_decode(u8 *buf, const char *devmem) memcpy(crafted, buf, 16); overwrite_dmi_address(crafted); - printf("# Writing %d bytes to %s.\n", 0x0F, opt.dumpfile); + if (!(opt.flags & FLAG_QUIET)) + printf("# Writing %d bytes to %s.\n", 0x0F, + opt.dumpfile); write_dump(0, 0x0F, crafted, opt.dumpfile, 1); } @@ -4540,7 +4700,7 @@ static int legacy_decode(u8 *buf, const char *devmem) */ #define EFI_NOT_FOUND (-1) #define EFI_NO_SMBIOS (-2) -static int address_from_efi(size_t *address) +static int address_from_efi(off_t *address) { FILE *efi_systab; const char *filename; @@ -4564,12 +4724,13 @@ static int address_from_efi(size_t *address) { char *addrp = strchr(linebuf, '='); *(addrp++) = '\0'; - if (strcmp(linebuf, "SMBIOS") == 0) + if (strcmp(linebuf, "SMBIOS3") == 0 + || strcmp(linebuf, "SMBIOS") == 0) { - *address = strtoul(addrp, NULL, 0); + *address = strtoull(addrp, NULL, 0); if (!(opt.flags & FLAG_QUIET)) - printf("# SMBIOS entry point at 0x%08lx\n", - (unsigned long)*address); + printf("# %s entry point at 0x%08llx\n", + linebuf, (unsigned long long)*address); ret = 0; break; } @@ -4586,7 +4747,7 @@ int main(int argc, char * const argv[]) { int ret = 0; /* Returned value */ int found = 0; - size_t fp; + off_t fp; int efi; u8 *buf; @@ -4633,20 +4794,57 @@ int main(int argc, char * const argv[]) goto exit_free; } - if (memcmp(buf, "_SM_", 4) == 0) + if (memcmp(buf, "_SM3_", 5) == 0) { - if (smbios_decode(buf, opt.dumpfile)) + if (smbios3_decode(buf, opt.dumpfile, 0)) + found++; + } + else if (memcmp(buf, "_SM_", 4) == 0) + { + if (smbios_decode(buf, opt.dumpfile, 0)) found++; } else if (memcmp(buf, "_DMI_", 5) == 0) { - if (legacy_decode(buf, opt.dumpfile)) + if (legacy_decode(buf, opt.dumpfile, 0)) found++; } goto done; } - /* First try EFI (ia64, Intel-based Mac) */ + /* + * First try reading from sysfs tables. The entry point file could + * contain one of several types of entry points, so read enough for + * the largest one, then determine what type it contains. + */ + if (!(opt.flags & FLAG_NO_SYSFS) + && (buf = read_file(0x20, SYS_ENTRY_FILE)) != NULL) + { + if (!(opt.flags & FLAG_QUIET)) + printf("Getting SMBIOS data from sysfs.\n"); + if (memcmp(buf, "_SM3_", 5) == 0) + { + if (smbios3_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET)) + found++; + } + else if (memcmp(buf, "_SM_", 4) == 0) + { + if (smbios_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET)) + found++; + } + else if (memcmp(buf, "_DMI_", 5) == 0) + { + if (legacy_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET)) + found++; + } + + if (found) + goto done; + if (!(opt.flags & FLAG_QUIET)) + printf("Failed to get SMBIOS data from sysfs.\n"); + } + + /* Next try EFI (ia64, Intel-based Mac) */ efi = address_from_efi(&fp); switch (efi) { @@ -4657,17 +4855,22 @@ int main(int argc, char * const argv[]) goto exit_free; } + if (!(opt.flags & FLAG_QUIET)) + printf("Found SMBIOS entry point in EFI, reading table from %s.\n", + opt.devmem); if ((buf = mem_chunk(fp, 0x20, opt.devmem)) == NULL) { ret = 1; goto exit_free; } - if (smbios_decode(buf, opt.devmem)) + if (smbios_decode(buf, opt.devmem, 0)) found++; goto done; memory_scan: + if (!(opt.flags & FLAG_QUIET)) + printf("Scanning %s for entry point.\n", opt.devmem); /* Fallback to memory scan (x86, x86_64) */ if ((buf = mem_chunk(0xF0000, 0x10000, opt.devmem)) == NULL) { @@ -4677,9 +4880,17 @@ memory_scan: for (fp = 0; fp <= 0xFFF0; fp += 16) { - if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) + if (memcmp(buf + fp, "_SM3_", 5) == 0 && fp <= 0xFFE0) + { + if (smbios3_decode(buf + fp, opt.devmem, 0)) + { + found++; + fp += 16; + } + } + else if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) { - if (smbios_decode(buf+fp, opt.devmem)) + if (smbios_decode(buf + fp, opt.devmem, 0)) { found++; fp += 16; @@ -4687,7 +4898,7 @@ memory_scan: } else if (memcmp(buf + fp, "_DMI_", 5) == 0) { - if (legacy_decode(buf + fp, opt.devmem)) + if (legacy_decode(buf + fp, opt.devmem, 0)) found++; } } diff --git a/dmidecode.h b/dmidecode.h index cae627b..20e7e96 100644 --- a/dmidecode.h +++ b/dmidecode.h @@ -1,7 +1,7 @@ /* * This file is part of the dmidecode project. * - * Copyright (C) 2005-2008 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2005-2008 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "types.h" + struct dmi_header { u8 type; @@ -26,4 +28,5 @@ struct dmi_header u8 *data; }; +int is_printable(const u8 *data, int len); const char *dmi_string(const struct dmi_header *dm, u8 s); @@ -2,7 +2,7 @@ * Decoding of OEM-specific entries * This file is part of the dmidecode project. * - * Copyright (C) 2007-2008 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2007-2008 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,12 @@ * Globals for vendor-specific decodes */ -enum DMI_VENDORS { VENDOR_UNKNOWN, VENDOR_HP }; +enum DMI_VENDORS +{ + VENDOR_UNKNOWN, + VENDOR_HP, + VENDOR_ACER, +}; static enum DMI_VENDORS dmi_vendor = VENDOR_UNKNOWN; @@ -41,20 +46,58 @@ static enum DMI_VENDORS dmi_vendor = VENDOR_UNKNOWN; */ void dmi_set_vendor(const char *s) { - if (strcmp(s, "HP") == 0 || strcmp(s, "Hewlett-Packard") == 0) + int len; + + /* + * Often DMI strings have trailing spaces. Ignore these + * when checking for known vendor names. + */ + len = strlen(s); + while (len && s[len - 1] == ' ') + len--; + + if (strncmp(s, "HP", len) == 0 || strncmp(s, "Hewlett-Packard", len) == 0) dmi_vendor = VENDOR_HP; + else if (strncmp(s, "Acer", len) == 0) + dmi_vendor = VENDOR_ACER; } /* * HP-specific data structures are decoded here. * - * Code contributed by John Cagle. + * Code contributed by John Cagle and Tyler Bell. */ +static void dmi_print_hp_net_iface_rec(u8 id, u8 bus, u8 dev, const u8 *mac) +{ + /* Some systems do not provide an id. nic_ctr provides an artificial + * id, and assumes the records will be provided "in order". Also, + * using 0xFF marker is not future proof. 256 NICs is a lot, but + * 640K ought to be enough for anybody(said no one, ever). + * */ + static u8 nic_ctr; + + if (id == 0xFF) + id = ++nic_ctr; + + if (dev == 0x00 && bus == 0x00) + printf("\tNIC %d: Disabled\n", id); + else if (dev == 0xFF && bus == 0xFF) + printf("\tNIC %d: Not Installed\n", id); + else + { + printf("\tNIC %d: PCI device %02x:%02x.%x, " + "MAC address %02X:%02X:%02X:%02X:%02X:%02X\n", + id, bus, dev >> 3, dev & 7, + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + } +} + static int dmi_decode_hp(const struct dmi_header *h) { u8 *data = h->data; int nic, ptr; + u32 feat; switch (h->type) { @@ -80,6 +123,19 @@ static int dmi_decode_hp(const struct dmi_header *h) * * This prints the BIOS NIC number, * PCI bus/device/function, and MAC address + * + * Type 209: + * Offset | Name | Width | Description + * ------------------------------------- + * 0x00 | Type | BYTE | 0xD1, MAC Info + * 0x01 | Length | BYTE | Length of structure + * 0x02 | Handle | WORD | Unique handle + * 0x04 | Dev No | BYTE | PCI Device/Function No + * 0x05 | Bus No | BYTE | PCI Bus + * 0x06 | MAC | 6B | MAC addr + * 0x0C | NIC #2 | 8B | Repeat 0x04-0x0B + * + * Type 221: is deprecated in the latest docs */ printf(h->type == 221 ? "HP BIOS iSCSI NIC PCI and MAC Information\n" : @@ -88,25 +144,128 @@ static int dmi_decode_hp(const struct dmi_header *h) ptr = 4; while (h->length >= ptr + 8) { - if (data[ptr] == 0x00 && data[ptr + 1] == 0x00) - printf("\tNIC %d: Disabled\n", nic); - else if (data[ptr] == 0xFF && data[ptr + 1] == 0xFF) - printf("\tNIC %d: Not Installed\n", nic); - else - { - printf("\tNIC %d: PCI device %02x:%02x.%x, " - "MAC address %02X:%02X:%02X:%02X:%02X:%02X\n", - nic, data[ptr + 1], - data[ptr] >> 3, data[ptr] & 7, - data[ptr + 2], data[ptr + 3], - data[ptr + 4], data[ptr + 5], - data[ptr + 6], data[ptr + 7]); - } + dmi_print_hp_net_iface_rec(nic, + data[ptr + 0x01], + data[ptr], + &data[ptr + 0x02]); nic++; ptr += 8; } break; + case 233: + /* + * Vendor Specific: HP ProLiant NIC MAC Information + * + * This prints the BIOS NIC number, + * PCI bus/device/function, and MAC address + * + * Offset | Name | Width | Description + * ------------------------------------- + * 0x00 | Type | BYTE | 0xE9, NIC structure + * 0x01 | Length | BYTE | Length of structure + * 0x02 | Handle | WORD | Unique handle + * 0x04 | Grp No | WORD | 0 for single segment + * 0x06 | Bus No | BYTE | PCI Bus + * 0x07 | Dev No | BYTE | PCI Device/Function No + * 0x08 | MAC | 32B | MAC addr padded w/ 0s + * 0x28 | Port No| BYTE | Each NIC maps to a Port + */ + printf("HP BIOS PXE NIC PCI and MAC Information\n"); + if (h->length < 0x0E) break; + /* If the record isn't long enough, we don't have an ID + * use 0xFF to use the internal counter. + * */ + nic = h->length > 0x28 ? data[0x28] : 0xFF; + dmi_print_hp_net_iface_rec(nic, data[0x06], data[0x07], + &data[0x08]); + break; + + case 212: + /* + * Vendor Specific: HP 64-bit CRU Information + * + * Source: hpwdt kernel driver + */ + printf("HP 64-bit CRU Information\n"); + if (h->length < 0x18) break; + printf("\tSignature: 0x%08x", DWORD(data + 0x04)); + if (is_printable(data + 0x04, 4)) + printf(" (%c%c%c%c)", data[0x04], data[0x05], + data[0x06], data[0x07]); + printf("\n"); + if (DWORD(data + 0x04) == 0x55524324) + { + u64 paddr = QWORD(data + 0x08); + paddr.l += DWORD(data + 0x14); + if (paddr.l < DWORD(data + 0x14)) + paddr.h++; + printf("\tPhysical Address: 0x%08x%08x\n", + paddr.h, paddr.l); + printf("\tLength: 0x%08x\n", DWORD(data + 0x10)); + } + break; + + case 219: + /* + * Vendor Specific: HP ProLiant Information + * + * Source: hpwdt kernel driver + */ + printf("HP ProLiant Information\n"); + if (h->length < 0x08) break; + printf("\tPower Features: 0x%08x\n", DWORD(data + 0x04)); + if (h->length < 0x0C) break; + printf("\tOmega Features: 0x%08x\n", DWORD(data + 0x08)); + if (h->length < 0x14) break; + feat = DWORD(data + 0x10); + printf("\tMisc. Features: 0x%08x\n", feat); + printf("\t\tiCRU: %s\n", feat & 0x0001 ? "Yes" : "No"); + printf("\t\tUEFI: %s\n", feat & 0x0408 ? "Yes" : "No"); + break; + + default: + return 0; + } + return 1; +} + +/* + * Acer-specific data structures are decoded here. + */ + +static int dmi_decode_acer(const struct dmi_header *h) +{ + u8 *data = h->data; + u16 cap; + + switch (h->type) + { + case 170: + /* + * Vendor Specific: Acer Hotkey Function + * + * Source: acer-wmi kernel driver + * + * Probably applies to some laptop models of other + * brands, including Fujitsu-Siemens, Medion, Lenovo, + * and eMachines. + */ + printf("Acer Hotkey Function\n"); + if (h->length < 0x0F) break; + cap = WORD(data + 0x04); + printf("\tFunction bitmap for Communication Button: 0x%04hx\n", cap); + printf("\t\tWiFi: %s\n", cap & 0x0001 ? "Yes" : "No"); + printf("\t\t3G: %s\n", cap & 0x0040 ? "Yes" : "No"); + printf("\t\tWiMAX: %s\n", cap & 0x0080 ? "Yes" : "No"); + printf("\t\tBluetooth: %s\n", cap & 0x0800 ? "Yes" : "No"); + printf("\tFunction bitmap for Application Button: 0x%04hx\n", WORD(data + 0x06)); + printf("\tFunction bitmap for Media Button: 0x%04hx\n", WORD(data + 0x08)); + printf("\tFunction bitmap for Display Button: 0x%04hx\n", WORD(data + 0x0A)); + printf("\tFunction bitmap for Others Button: 0x%04hx\n", WORD(data + 0x0C)); + printf("\tCommunication Function Key Number: %d\n", data[0x0E]); + break; + default: return 0; } @@ -123,6 +282,8 @@ int dmi_decode_oem(const struct dmi_header *h) { case VENDOR_HP: return dmi_decode_hp(h); + case VENDOR_ACER: + return dmi_decode_acer(h); default: return 0; } @@ -2,7 +2,7 @@ * Decoding of OEM-specific entries * This file is part of the dmidecode project. * - * Copyright (C) 2007-2008 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2007-2008 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2,7 +2,7 @@ * Command line handling of dmidecode * This file is part of the dmidecode project. * - * Copyright (C) 2005-2008 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2005-2008 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -225,8 +225,9 @@ int parse_command_line(int argc, char * const argv[]) { "dump", no_argument, NULL, 'u' }, { "dump-bin", required_argument, NULL, 'B' }, { "from-dump", required_argument, NULL, 'F' }, + { "no-sysfs", no_argument, NULL, 'S' }, { "version", no_argument, NULL, 'V' }, - { 0, 0, 0, 0 } + { NULL, 0, NULL, 0 } }; while ((option = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) @@ -262,6 +263,9 @@ int parse_command_line(int argc, char * const argv[]) case 'u': opt.flags |= FLAG_DUMP; break; + case 'S': + opt.flags |= FLAG_NO_SYSFS; + break; case 'V': opt.flags |= FLAG_VERSION; break; @@ -2,7 +2,7 @@ * Command line handling of dmidecode * This file is part of the dmidecode project. * - * Copyright (C) 2005-2008 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2005-2008 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "types.h" + struct string_keyword { const char *keyword; @@ -42,6 +44,7 @@ extern struct opt opt; #define FLAG_QUIET (1 << 3) #define FLAG_DUMP_BIN (1 << 4) #define FLAG_FROM_DUMP (1 << 5) +#define FLAG_NO_SYSFS (1 << 6) int parse_command_line(int argc, char * const argv[]); void print_help(void); diff --git a/man/biosdecode.8 b/man/biosdecode.8 index 46bea95..c39d6a0 100644 --- a/man/biosdecode.8 +++ b/man/biosdecode.8 @@ -52,7 +52,7 @@ for a more detailed output. .B biosdecode started its life as a part of .B dmidecode -but as more entry point types were added, if was moved to a different +but as more entry point types were added, it was moved to a different program. .SH OPTIONS diff --git a/man/dmidecode.8 b/man/dmidecode.8 index 9ca2d82..a64cf5d 100644 --- a/man/dmidecode.8 +++ b/man/dmidecode.8 @@ -25,8 +25,12 @@ and developed by the \s-1DMTF\s0 (Desktop Management Task Force). As you run it, .B dmidecode -will try to locate the \s-1DMI\s0 table. If it succeeds, it will then parse -this table and display a list of records like this one: +will try to locate the \s-1DMI\s0 table. It will first try to read the DMI table +from sysfs, and next try reading directly from memory if sysfs access failed. +If +.B dmidecode +succeeds in locating a valid DMI table, it will then parse this table +and display a list of records like this one: Handle 0x0002, DMI type 2, 8 bytes. Base Board Information @@ -89,6 +93,13 @@ keywords is printed and .B dmidecode exits with an error. This option cannot be used more than once. + +Note: on Linux, most of these strings can alternatively be read directly +from +.BR sysfs , +typically from files under +.IR /sys/devices/virtual/dmi/id . +Most of these files are even readable by regular users. .TP .BR "-t" ", " "--type TYPE" Only display the entries of type \fBTYPE\fR. \fBTYPE\fR can be either a @@ -119,6 +130,10 @@ later. Read the DMI data from a binary file previously generated using \fB--dump-bin\fR. .TP +.BR " " " " "--no-sysfs" +Do not attempt to read DMI data from sysfs files. This is mainly useful for +debugging. +.TP .BR "-h" ", " "--help" Display usage information and exit .TP @@ -234,6 +249,8 @@ The DMI table is located at offset 0x20. .SH FILES .I /dev/mem +.I /sys/firmware/dmi/tables/smbios_entry_point (Linux only) +.I /sys/firmware/dmi/tables/DMI (Linux only) .SH BUGS More often than not, information contained in the \s-1DMI\s0 tables is inaccurate, incomplete or simply wrong. diff --git a/ownership.c b/ownership.c index d79af12..de44bf4 100644 --- a/ownership.c +++ b/ownership.c @@ -1,7 +1,7 @@ /* * Compaq Ownership Tag * - * Copyright (C) 2003-2005 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2003-2005 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -119,7 +119,7 @@ static int parse_command_line(int argc, char * const argv[]) { "dev-mem", required_argument, NULL, 'd' }, { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'V' }, - { 0, 0, 0, 0 } + { NULL, 0, NULL, 0 } }; while ((option = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) @@ -2,7 +2,7 @@ * Common "util" functions * This file is part of the dmidecode project. * - * Copyright (C) 2002-2010 Jean Delvare <khali@linux-fr> + * Copyright (C) 2002-2015 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -89,15 +89,70 @@ int checksum(const u8 *buf, size_t len) } /* + * Reads all of file, up to max_len bytes. + * A buffer of max_len bytes is allocated by this function, and + * needs to be freed by the caller. + * This provides a similar usage model to mem_chunk() + * + * Returns pointer to buffer of max_len bytes, or NULL on error + * + */ +void *read_file(size_t max_len, const char *filename) +{ + int fd; + size_t r2 = 0; + ssize_t r; + u8 *p; + + /* + * Don't print error message on missing file, as we will try to read + * files that may or may not be present. + */ + if ((fd = open(filename, O_RDONLY)) == -1) + { + if (errno != ENOENT) + perror(filename); + return(NULL); + } + + if ((p = malloc(max_len)) == NULL) + { + perror("malloc"); + return NULL; + } + + do + { + r = read(fd, p + r2, max_len - r2); + if (r == -1) + { + if (errno != EINTR) + { + close(fd); + perror(filename); + free(p); + return NULL; + } + } + else + r2 += r; + } + while (r != 0); + + close(fd); + return p; +} + +/* * Copy a physical memory chunk into a memory buffer. * This function allocates memory. */ -void *mem_chunk(size_t base, size_t len, const char *devmem) +void *mem_chunk(off_t base, size_t len, const char *devmem) { void *p; int fd; #ifdef USE_MMAP - size_t mmoffset; + off_t mmoffset; void *mmp; #endif @@ -124,7 +179,7 @@ void *mem_chunk(size_t base, size_t len, const char *devmem) * but to workaround problems many people encountered when trying * to read from /dev/mem using regular read() calls. */ - mmp = mmap(0, mmoffset + len, PROT_READ, MAP_SHARED, fd, base - mmoffset); + mmp = mmap(NULL, mmoffset + len, PROT_READ, MAP_SHARED, fd, base - mmoffset); if (mmp == MAP_FAILED) goto try_read; @@ -138,9 +193,8 @@ void *mem_chunk(size_t base, size_t len, const char *devmem) goto out; -#endif /* USE_MMAP */ - try_read: +#endif /* USE_MMAP */ if (lseek(fd, base, SEEK_SET) == -1) { fprintf(stderr, "%s: ", devmem); @@ -155,7 +209,9 @@ try_read: return NULL; } +#ifdef USE_MMAP out: +#endif if (close(fd) == -1) perror(devmem); @@ -1,7 +1,7 @@ /* * This file is part of the dmidecode project. * - * Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2003-2015 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) int checksum(const u8 *buf, size_t len); -void *mem_chunk(size_t base, size_t len, const char *devmem); +void *read_file(size_t len, const char *filename); +void *mem_chunk(off_t base, size_t len, const char *devmem); int write_dump(size_t base, size_t len, const void *data, const char *dumpfile, int add); u64 u64_range(u64 start, u64 end); @@ -1 +1 @@ -#define VERSION "2.12" +#define VERSION "3.0" diff --git a/vpddecode.c b/vpddecode.c index 2b0d27c..360524c 100644 --- a/vpddecode.c +++ b/vpddecode.c @@ -1,7 +1,7 @@ /* * IBM Vital Product Data decoder * - * Copyright (C) 2003-2007 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2003-2007 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2,7 +2,7 @@ * Command line handling of vpddecode * This file is part of the dmidecode project. * - * Copyright (C) 2005-2007 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2005-2007 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -99,7 +99,7 @@ int parse_command_line(int argc, char * const argv[]) { "string", required_argument, NULL, 's' }, { "dump", no_argument, NULL, 'u' }, { "version", no_argument, NULL, 'V' }, - { 0, 0, 0, 0 } + { NULL, 0, NULL, 0 } }; while ((option = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) @@ -2,7 +2,7 @@ * Command line handling of vpddecode * This file is part of the dmidecode project. * - * Copyright (C) 2005-2006 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2005-2006 Jean Delvare <jdelvare@suse.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |