Changeset 5961

Timestamp:

04/15/11 10:26:49 (13 months ago)

Author:

khali

Message:

isadump: Add support for word (16-bit) and long (32-bit) reads

Sometimes the hardware expects 16-bit or 32-bit reads rather than byte
reads. Add support to isadump so that the user can ask for such reads.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/dump/isadump.8 (modified) (4 diffs)
• prog/dump/isadump.c (modified) (7 diffs)
• prog/dump/util.c (modified) (2 diffs)
• prog/dump/util.h (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -3 +3 @@
 
 SVN HEAD
+  isadump: Add support for word (16-bit) and long (32-bit) reads
   sensors-detect: Add AMD family 15h CPU detection
                   Add detection of ADT7461A / NCT1008

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

@@ -1 @@
-.TH ISADUMP 8 "August 2004"
+.TH ISADUMP 8 "April 2011"
 .SH NAME
 isadump \- examine ISA registers
@@ -6 +6 @@
 .B isadump
 .RB [ -y ]
+.RB [ -W | -L ]
 .RB [ "-k V1,V2..." ]
 .I addrreg
@@ -13 +14 @@
 .br
 .B isadump
+.B -f
 .RB [ -y ]
-.BI "-f " address
+.RB [ -W | -L ]
+.I address
 .RI [ "range " [ "bank " [ bankreg ]]]
 #for flat address space
@@ -40 +43 @@
 Known key sequences are: 0x87,0x01,0x55,0x55 for ITE, 0x55 for SMSC, 0x87,0x87
 for Winbond and VIA, none needed for National Semiconductor.
+.TP
+.B -W
+Perform 16-bit reads.
+.TP
+.B -L
+Perform 32-bit reads.
 
 .SH OPTIONS (I2C-like access mode)

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

@@ -3 +3 @@
     Copyright (C) 2000  Frodo Looijaard <frodol@dds.nl>, and
                         Mark D. Studebaker <mdsxyz123@yahoo.com>
-    Copyright (C) 2004,2007  Jean Delvare <khali@linux-fr.org>
+    Copyright (C) 2004-2011  Jean Delvare <khali@linux-fr.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -53 +53 @@
         fprintf(stderr,
                 "Syntax for I2C-like access:\n"
-                "  isadump [-y] [-k V1,V2...] ADDRREG DATAREG [BANK [BANKREG]]\n"
+                "  isadump [OPTIONS] [-k V1,V2...] ADDRREG DATAREG [BANK [BANKREG]]\n"
                 "Syntax for flat address space:\n"
-                "  isadump [-y] -f ADDRESS [RANGE [BANK [BANKREG]]]\n");
+                "  isadump -f [OPTIONS] ADDRESS [RANGE [BANK [BANKREG]]]\n"
+                "Options:\n"
+                "  -k   Super-I/O configuration access key\n"
+                "  -f   Enable flat address space mode\n"
+                "  -y   Assume affirmative answer to all questions\n"
+                "  -W   Read and display word (16-bit) values\n"
+                "  -L   Read and display long (32-bit) values\n");
 }
 
@@ -97 +103 @@
         int bankreg;
         int oldbank = 0;
-        int i, j, res;
+        int i, j;
+        unsigned long res;
         int flags = 0;
-        int flat = 0, yes = 0;
+        int flat = 0, yes = 0, width = 1;
         char *end;
         unsigned char enter_key[SUPERIO_MAX_KEY+1];
@@ -119 +126 @@
                         flags++;
                         break;
+                case 'W': width = 2; break;
+                case 'L': width = 4; break;
                 default:
                         fprintf(stderr, "Warning: Unsupported flag "
@@ -271 +280 @@
                 oldbank = set_bank(flat, addrreg, datareg, bank, bankreg);
 
-        if (flat)
-                printf("  ");
-        printf("     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f\n");
+        /* print column headers */
+        printf("%*s", flat ? 5 : 3, "");
+        for (j = 0; j < 16; j += width)
+                printf(" %*x", width * 2, j);
+        printf("\n");
+
         for (i = 0; i < range; i += 16) {
                 if (flat)
@@ -289 +301 @@
                         superio_write_key(addrreg, enter_key);
 
-                for (j = 0; j < 16; j++) {
+                for (j = 0; j < 16; j += width) {
                         fflush(stdout);
                         if (flat) {
-                                res = inb(addrreg + i + j);
+                                res = inx(addrreg + i + j, width);
                         } else {        
                                 outb(i+j, addrreg);
@@ -299 +311 @@
                                         range = 128;
                                 }
-                                res = inb(datareg);
-                        }
-                        printf("%02x ", res);
+                                res = inx(datareg, width);
+                        }
+                        printf("%0*lx ", width * 2, res);
                 }
                 printf("\n");

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

@@ -11 +11 @@
 #include <stdio.h>
 #include "util.h"
+
+/* To keep glibc2 happy */
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+#include <sys/io.h>
+#else
+#include <asm/io.h>
+#endif
 
 /* Return 1 if we should continue, 0 if we should abort */
@@ -47 +54 @@
 }
 
+/* I/O read of specified size */
+unsigned long inx(int addr, int width)
+{
+        switch (width) {
+        case 2:
+                return inw(addr);
+                break;
+        case 4:
+                return inl(addr);
+                break;
+        default:
+                return inb(addr);
+        }
+}

lm-sensors/trunk/prog/dump/util.h

@@ -13 +13 @@
 
 extern int user_ack(int def);
+extern unsigned long inx(int addr, int width);
 
 #endif /* _UTIL_H */