Changeset 2899 for lm-sensors/trunk/prog/dump/isadump.c

Timestamp:

02/09/05 22:08:17 (8 years ago)

Author:

khali

Message:

Handle keys/passwords needed to access most Super-I/O chips.
This should let us dump Winbond Super-I/O chips past the few first
dozens registers.

Files:

• lm-sensors/trunk/prog/dump/isadump.c (modified) (8 diffs)

lm-sensors/trunk/prog/dump/isadump.c

@@ -34 +34 @@
 #include <string.h>
 
+#include "superio.h"
+
 
 /* To keep glibc2 happy */
@@ -60 +62 @@
         fprintf(stderr,
                 "Syntax for I2C-like access:\n"
-                "  isadump [-y] ADDRREG DATAREG [BANK [BANKREG]]\n"
+                "  isadump [-y] [-k V1,V2...] ADDRREG DATAREG [BANK [BANKREG]]\n"
                 "Syntax for flat address space:\n"
                 "  isadump [-y] -f ADDRESS [RANGE [BANK [BANKREG]]]\n");
@@ -108 +110 @@
         int flat = 0, yes = 0;
         char *end;
+        unsigned char enter_key[SUPERIO_MAX_KEY+1];
+
+        enter_key[0] = 0;
 
         /* handle (optional) flags first */
@@ -114 +119 @@
                 case 'f': flat = 1; break;
                 case 'y': yes = 1; break;
+                case 'k':
+                        if (2+flags >= argc
+                         || superio_parse_key(enter_key, argv[2+flags]) < 0) {
+                                fprintf(stderr, "Invalid or missing key\n");
+                                help();
+                                exit(1);
+                        }
+                        flags++;
+                        break;
                 default:
                         fprintf(stderr, "Warning: Unsupported flag "
@@ -121 +135 @@
                 }
                 flags++;
+        }
+
+        /* key is never needed in flat mode */
+        if (flat && enter_key[0]) {
+                fprintf(stderr, "Error: Cannot use key in flat mode\n");
+                exit(1);
         }
 
@@ -256 +276 @@
 #endif
 
+        /* Enter Super-I/O configuration mode */
+        if (enter_key[0])
+                superio_write_key(addrreg, enter_key);
+
         if (bank >= 0)
                 oldbank = set_bank(flat, addrreg, datareg, bank, bankreg);
@@ -262 +286 @@
         for (i = 0; i < range; i += 16) {
                 printf("%c0: ", hexchar(i/16));
+
+                /* It was noticed that Winbond Super-I/O chips
+                   would leave the configuration mode after
+                   an arbitrary number of register reads,
+                   causing any subsequent read attempt to
+                   silently fail. Repeating the key every 16 reads
+                   prevents that. */
+                if (enter_key[0])
+                        superio_write_key(addrreg, enter_key);
+
                 for (j = 0; j < 16; j++) {
                         if (flat) {
@@ -278 +312 @@
                 set_bank(flat, addrreg, datareg, oldbank, bankreg);
 
+        /* Exit Super-I/O configuration mode */
+        if (enter_key[0])
+                superio_reset(addrreg, datareg);
+
         exit(0);
 }