Changeset 5548

Timestamp:

12/10/08 16:34:55 (4 years ago)

Author:

khali

Message:

Read the remainder of the EEPROM data if more than 128 bytes are used.
Patch from Paul Goyette.

Files:

• i2c-tools/trunk/eeprom/decode-dimms (modified) (5 diffs)

i2c-tools/trunk/eeprom/decode-dimms

@@ -1269 +1269 @@
 }
 
-sub readspd($$) # reads bytes from SPD-EEPROM
-{
-        my ($size, $dimm_i) = @_;
+# Read bytes from SPD-EEPROM
+# Note: offset must be a multiple of 16!
+sub readspd($$$)
+{
+        my ($offset, $size, $dimm_i) = @_;
         my @bytes;
         if ($use_hexdump) {
                 @bytes = read_hexdump($dimm_i);
-                return @bytes[0..($size-1)];
+                return @bytes[$offset..($offset + $size - 1)];
         } elsif ($use_sysfs) {
                 # Kernel 2.6 with sysfs
@@ -1281 +1283 @@
                         or die "Cannot open /sys/bus/i2c/drivers/eeprom/$dimm_i/eeprom";
                 binmode HANDLE;
-                sysseek(HANDLE, 0, SEEK_SET);
+                sysseek(HANDLE, $offset, SEEK_SET);
                 sysread(HANDLE, my $eeprom, $size);
                 close HANDLE;
@@ -1288 +1290 @@
                 # Kernel 2.4 with procfs
                 for my $i (0 .. ($size-1)/16) {
-                        my $hexoff = sprintf('%02x', $i * 16);
+                        my $hexoff = sprintf('%02x', $offset + $i * 16);
                         push @bytes, split(" ", `cat /proc/sys/dev/sensors/$dimm_i/$hexoff`);
                 }
@@ -1425 +1427 @@
          || (!$use_sysfs && /^eeprom-/)
          || $use_hexdump) {
-                my @bytes = readspd(128, $dimm_list[$i]);
+                my @bytes = readspd(0, 128, $dimm_list[$i]);
                 my $is_rambus = $bytes[0] < 4;          # Simple heuristic
                 my ($l, $chk_valid, $chk_spd, $chk_calc);
@@ -1473 +1475 @@
                         printl "# of bytes written to SDRAM EEPROM", $spd_used;
                         printl "Total number of bytes in EEPROM", $spd_size;
+
+                        # If there's more data than what we've read, let's
+                        # read it now.  DDR3 will need this data.
+                        if ($spd_used > @bytes) {
+                                push (@bytes,
+                                      readspd(@bytes, $spd_used - @bytes,
+                                              $dimm_list[$i]));
+                        }
                 }