diff options
Diffstat (limited to 'util/superiotool')
| -rw-r--r-- | util/superiotool/README | 4 | ||||
| -rw-r--r-- | util/superiotool/ite.c | 11 | ||||
| -rw-r--r-- | util/superiotool/superiotool.8 | 4 | ||||
| -rw-r--r-- | util/superiotool/superiotool.c | 3 | ||||
| -rw-r--r-- | util/superiotool/superiotool.h | 4 |
5 files changed, 14 insertions, 12 deletions
diff --git a/util/superiotool/README b/util/superiotool/README index 24845b5185..cd7d566b21 100644 --- a/util/superiotool/README +++ b/util/superiotool/README @@ -30,10 +30,10 @@ Installation Usage ----- - $ superiotool [-d] [-l] [-V] [-v] [-h] + $ superiotool [-d] [-e] [-l] [-V] [-v] [-h] -d | --dump Dump Super I/O register contents - -e | --extra-dump Dump Secondary registers too (like EC registers etc.) + -e | --extra-dump Dump secondary registers too (e.g. EC registers) -l | --list-supported Show the list of supported Super I/O chips -V | --verbose Verbose mode -v | --version Show the superiotool version diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c index 9d3a263a57..784c4efcda 100644 --- a/util/superiotool/ite.c +++ b/util/superiotool/ite.c @@ -379,7 +379,7 @@ static void exit_conf_mode_ite(uint16_t port) static void probe_idregs_ite_helper(const char *init, uint16_t port) { - uint16_t id, chipver; + uint16_t id, chipver, ecport; probing_for("ITE", init, port); @@ -400,13 +400,16 @@ static void probe_idregs_ite_helper(const char *init, uint16_t port) dump_superio("ITE", reg_table, port, id); if (extra_dump) { - uint16_t ecport; - regwrite(port, 0x07, 0x04); /*EC LDN*/ + regwrite(port, 0x07, 0x04); /* Select LDN 4 (EC). */ + + /* Get EC base address (stored in LDN 4, index 0x60/0x61). */ ecport = regval(port, 0x60) << 8; ecport |= regval(port, 0x61); + + /* EC address register = EC base address + 5. */ ecport += 5; - printf("Environment Controller (0x%04x)\n",ecport); + printf("Environment controller (0x%04x)\n", ecport); dump_superio("ITE-EC", ec_table, ecport, id); } } diff --git a/util/superiotool/superiotool.8 b/util/superiotool/superiotool.8 index 65a302a1a6..35046d1809 100644 --- a/util/superiotool/superiotool.8 +++ b/util/superiotool/superiotool.8 @@ -77,8 +77,8 @@ detailed information about the Dump extra secondary register contents too, if available. Only in combination with the .B --dump -option. This option will, for instance, dump the Environmental Controller -configuration registers for the ITE IT8716f chip. The format is similar to +option. This option will, for instance, dump the environmental controller (EC) +configuration registers for the ITE IT8716F chip. The format is similar to the output of the .B --dump option. diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c index 1edaf30f86..637c0b089e 100644 --- a/util/superiotool/superiotool.c +++ b/util/superiotool/superiotool.c @@ -158,8 +158,7 @@ void probing_for(const char *vendor, const char *info, uint16_t port) return; /* Yes, there's no space between '%s' and 'at'! */ - printf("Probing for %s Super I/O %sat 0x%x...\n", - vendor, info, port); + printf("Probing for %s Super I/O %sat 0x%x...\n", vendor, info, port); } /** Print a list of all supported chips from the given vendor. */ diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h index 2ee9019b4c..6961325388 100644 --- a/util/superiotool/superiotool.h +++ b/util/superiotool/superiotool.h @@ -30,9 +30,9 @@ #include <getopt.h> #include <sys/io.h> -#define USAGE "Usage: superiotool [-d] [-l] [-V] [-v] [-h]\n\n\ +#define USAGE "Usage: superiotool [-d] [-e] [-l] [-V] [-v] [-h]\n\n\ -d | --dump Dump Super I/O register contents\n\ - -e | --extra-dump Dump Secondary registers too (like EC registers etc.)\n\ + -e | --extra-dump Dump secondary registers too (e.g. EC registers)\n\ -l | --list-supported Show the list of supported Super I/O chips\n\ -V | --verbose Verbose mode\n\ -v | --version Show the superiotool version\n\ |