Changeset 5157

Timestamp:

03/24/08 11:22:48 (8 months ago)

Author:

khali

Message:

Patch from Trent Piepho:

This adds a "-x" option to decode-dimms.pl, which lets one supply a list of
file names to read SPD data from. It can parse various hexdump formats, such
as the output from i2cdump, eeprog, and the util-linux and Busybox hexdump
progams run on a sysfs eeprom file.

Useful for decoding SPD data that you cut and pasted from a manufacturer's
website or from a DIMM installed on an embedded system that does not have
perl/etc, but does have a serial console with busybox.

Files:

• i2c-tools/trunk/CHANGES (modified) (1 diff)
• i2c-tools/trunk/eeprom/decode-dimms.pl (modified) (7 diffs)

i2c-tools/trunk/CHANGES

@@ -7 +7 @@
-                Don't print anything by default if checksum fails
-                Decode all DDR2 SDRAM timing information
+                Add support for reading SPD data from hexdumps
-  decode-vaio: Private data might not be readable by non-root users
-               Print the asset tag

i2c-tools/trunk/eeprom/decode-dimms.pl

@@ -47 +47 @@
-use POSIX;
-use Fcntl qw(:DEFAULT :seek);
-
-
+ $use_hexdump
+ @dimm_list
-
-$revision = '$Revision$ ($Date$)';
@@ -1101 +1101 @@
-}
-
+# Read various hex dump style formats: hexdump, hexdump -C, i2cdump, eeprog
+# note that normal 'hexdump' format on a little-endian system byte-swaps
+# words, using hexdump -C is better.
+sub read_hexdump ($)
+{
+        my $addr = 0;
+        my $repstart = 0;
+        my @bytes;
+        my $header = 1;
+        my $word = 0;
+
+        open F, '<', $_[0] or die "Unable to open: $_[0]";
+        while (<F>) {
+                chomp;
+                if (/^\*$/) {
+                        $repstart = $addr;
+                        next;
+                }
+                /^(?:0000 )?([a-f\d]{2,8}):?\s+((:?[a-f\d]{4}\s*){8}|(:?[a-f\d]{2}\s*){16})/i ||
+                /^(?:0000 )?([a-f\d]{2,8}):?\s*$/i;
+                next if (!defined $1 && $header);               # skip leading unparsed lines
+
+                defined $1 or die "Unable to parse input";
+                $header = 0;
+
+                $addr = hex $1;
+                if ($repstart) {
+                        @bytes[$repstart .. ($addr-1)] =
+                                (@bytes[($repstart-16)..($repstart-1)]) x (($addr-$repstart)/16);
+                        $repstart = 0;
+                }
+                last unless defined $2;
+                foreach (split(/\s+/, $2)) {
+                        if (/^(..)(..)$/) {
+                                $word |= 1;
+                                $bytes[$addr++] = hex($1);
+                                $bytes[$addr++] = hex($2);
+                        } else {
+                                $bytes[$addr++] = hex($_);
+                        }
+                }
+        }
+        close F;
+        $header and die "Unable to parse any data from hexdump '$_[0]'";
+        $word and printc "Warning: Assuming big-endian order 16-bit hex dump";
+        return @bytes;
+}
+
-sub readspd64 ($$) { # reads 64 bytes from SPD-EEPROM
-        my ($offset, $dimm_i) = @_;
-        my @bytes;
-
+
+
+
+
-                # Kernel 2.6 with sysfs
-                sysopen(HANDLE, "/sys/bus/i2c/drivers/eeprom/$dimm_i/eeprom", O_RDONLY)
@@ -1124 +1175 @@
-
-for (@ARGV) {
-
-
+^-?
+ [-x file [files..]]
-                        "       $0 -h\n\n",
-                        "  -f, --format            print nice html output\n",
@@ -1131 +1182 @@
-                        "                          (useful for postprocessing the output)\n",
-                        "  -c, --checksum          decode completely even if checksum fails\n",
+                        "  -x,                     Read data from hexdump files\n",
-                        "  -h, --help              display this usage summary\n";
+                print <<"EOF";
+
+Hexdumps can be the output from hexdump, hexdump -C, i2cdump, eeprog and
+likely many other progams producing hex dumps of one kind or another.  Note
+that the default output of "hexdump" will be byte-swapped on little-endian
+systems and will therefore not be parsed correctly.  It is better to use
+"hexdump -C", which is not ambiguous.
+EOF
-                exit;
-    }
-
-
-
+
+
+
+
+
-}
-$opt_body = $opt_html && ! $opt_bodyonly;
@@ -1156 +1218 @@
-
-my $dimm_count = 0;
-my @dimm_list;
-my $dir;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -1170 +1233 @@
-        $_ = $dimm_list[$i];
-        if (($use_sysfs && /^\d+-\d+$/)
-
+
+
-                my @bytes = readspd64(0, $dimm_list[$i]);
-                my $dimm_checksum = 0;
@@ -1180 +1244 @@
-
-                print "<b><u>" if $opt_html;
-
+
+
-                        "/sys/bus/i2c/drivers/eeprom/$dimm_list[$i]" :
-                        "/proc/sys/dev/sensors/$dimm_list[$i]");
-                print "</u></b>" if $opt_html;
-                print "<table border=1>\n" if $opt_html;
-
-
-
-
+
+
+
+
+
+
-                }
-