diff options
| author | Stefan Reinauer <stepan@coreboot.org> | 2010-12-30 16:57:58 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-12-30 16:57:58 +0000 |
| commit | d7ce71d58f7dc2bdc9c0dd8eb7b804f0194071fa (patch) | |
| tree | 12b726c7828555886e5f3b2e6b9d174e9e485361 /util/superiotool/ite.c | |
| parent | 84be0f59b7158d5d60e1d7d61786d0a6e449d682 (diff) | |
| download | coreboot-d7ce71d58f7dc2bdc9c0dd8eb7b804f0194071fa.tar.xz | |
superiotool: Don't skip probing on a port if a a chip was detected on another port.
Only skip probing if chip was found on the same port already to avoid
duplicates.
Signed-off-by: Stefan Reinauer <stepan@coreboot.org>
Acked-by: Stefan Reinauer <stepan@coreboot.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6222 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/superiotool/ite.c')
| -rw-r--r-- | util/superiotool/ite.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c index b79d5e816f..6827300b4d 100644 --- a/util/superiotool/ite.c +++ b/util/superiotool/ite.c @@ -798,6 +798,8 @@ static void exit_conf_mode_ite(uint16_t port) regwrite(port, 0x02, 0x02); } +static int chip_found_at_port; + static void probe_idregs_ite_helper(const char *init, uint16_t port) { uint16_t id, chipver, ecport; @@ -817,6 +819,7 @@ static void probe_idregs_ite_helper(const char *init, uint16_t port) printf("Found ITE %s (id=0x%04x, rev=0x%01x) at 0x%x\n", get_superio_name(reg_table, id), id, chipver, port); chip_found = 1; + chip_found_at_port = 1; dump_superio("ITE", reg_table, port, id, LDN_SEL); @@ -837,41 +840,43 @@ static void probe_idregs_ite_helper(const char *init, uint16_t port) void probe_idregs_ite(uint16_t port) { + chip_found_at_port = 0; + if (port == 0x3f0 || port == 0x3bd || port == 0x370) { enter_conf_mode_ite_legacy(port, initkey_it8661f); probe_idregs_ite_helper("(init=legacy/it8661f) ", port); exit_conf_mode_ite(port); - if (chip_found) return; + if (chip_found_at_port) return; enter_conf_mode_ite_legacy(port, initkey_it8671f); probe_idregs_ite_helper("(init=legacy/it8671f) ", port); exit_conf_mode_ite(port); - if (chip_found) return; + if (chip_found_at_port) return; } else { enter_conf_mode_ite(port); probe_idregs_ite_helper("(init=standard) ", port); exit_conf_mode_ite(port); - if (chip_found) return; + if (chip_found_at_port) return; enter_conf_mode_ite_it8502e(port); probe_idregs_ite_helper("(init=it8502e) ", port); exit_conf_mode_ite(port); - if (chip_found) return; + if (chip_found_at_port) return; enter_conf_mode_ite_it8761e(port); probe_idregs_ite_helper("(init=it8761e) ", port); exit_conf_mode_ite(port); - if (chip_found) return; + if (chip_found_at_port) return; enter_conf_mode_ite_it8228e(port); probe_idregs_ite_helper("(init=it8228e) ", port); exit_conf_mode_ite(port); - if (chip_found) return; + if (chip_found_at_port) return; enter_conf_mode_winbond_fintek_ite_8787(port); probe_idregs_ite_helper("(init=0x87,0x87) ", port); exit_conf_mode_winbond_fintek_ite_8787(port); - if (chip_found) return; + if (chip_found_at_port) return; } } |