GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
coreboot-kgpe-d16/util/superiotool/winbond.c
Uwe Hermann 72c0584d37 Fix stupid thinko in the Winbond detection code which prevented some 
of the Winbond chips from being detected (trivial fix).

This is verified on real hardware and works fine now.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2855 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2007-10-15 15:46:59 +00:00

343 lines
11 KiB
C
Raw Blame History

/*
* This file is part of the superiotool project.
*
* Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
* Copyright (C) 2007 Rasmus Wiman <rasmus@wiman.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "superiotool.h"
#define DEVICE_ID_REG_OLD 0x09
#define DEVICE_ID_REG 0x20
#define DEVICE_REV_REG 0x21
/**
* The ID entries must be in 0xYYZ format, where YY is the device ID,
* and Z is bits 7..4 of the device revision register. We do not match
* bits 3..0 of the device revision here (at least for newer Super I/Os).
*
* But some of the older versions use both bytes (0x20 and 0x21), where
* register 0x21 holds the ID and the full 8 bits of 0x21 hold the revision.
*
* Some other Super I/Os only use bits 3..0 of 0x09 as ID.
*/
const static struct superio_registers reg_table[] = {
/* ID and rev[3..0] */
{0x527, "W83977CTF", { /* TODO: Not yet in sensors-detect */
{EOT}}},
{0x52f, "W83977EF/EG", {/* TODO: Not yet in sensors-detect */
{EOT}}},
{0x595, "W83627SF", { /* TODO: Not yet in sensors-detect */
{EOT}}},
{0x601, "W83697HF/F/HG", { /* No G version? */
{NOLDN, NULL,
{0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,0x29,
0x2a,EOT},
{NANA,0x60,NANA,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
MISC,EOT}},
/* Some register defaults depend on the value of PNPCSV. */
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},
{0x01,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00,
0x00,EOT}},
{0x1, "Parallel port",
{0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
{0x01,0x03,0x78,0x07,0x04,0x3f,EOT}},
{0x2, "COM1",
{0x30,0x60,0x61,0x70,0xf0,EOT},
{0x01,0x03,0xf8,0x04,0x00,EOT}},
{0x3, "COM2",
{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
{0x01,0x02,0xf8,0x03,0x00,0x00,EOT}},
{0x6, "Consumer IR",
{0x30,0x60,0x61,0x70,EOT},
{0x00,0x00,0x00,0x00,EOT}},
{0x7, "Game port, GPIO 1",
{0x30,0x60,0x61,0x62,0x63,0xf0,0xf1,0xf2,EOT},
{0x00,0x02,0x01,0x00,0x00,0xff,0x00,0x00,EOT}},
{0x8, "MIDI port, GPIO 5",
{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
0xf4,0xf5,EOT},
{0x00,0x03,0x30,0x00,0x00,0x09,0xff,0x00,0x00,0x00,
0x00,0x00,EOT}},
{0x9, "GPIO 2, GPIO 3, GPIO 4",
{0x30,0x60,0x61,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,
0xf7,0xf8,0xf5,EOT},
{0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x00,0xff,
0x00,0x00,0x00,EOT}},
{0xa, "ACPI",
{0x30,0x70,0xe0,0xe1,0xe2,0xe5,0xe6,0xe7,
0xf0,0xf1,0xf3,0xf4,0xf6,0xf7,0xf9,EOT},
{0x00,0x00,0x00,0x00,NANA,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
{0xb, "Hardware monitor",
{0x30,0x60,0x61,0x70,EOT},
{0x00,0x00,0x00,0x00,EOT}},
{EOT}}},
{0x610, "W83L517D/D-F", {
{EOT}}},
{0x681, "W83697SF/UF/UG", {
{EOT}}},
{0x708, "W83637HF/HG", {
{EOT}}},
{0x828, "W83627THF/THG", { /* We assume rev is bits 3..0 of 0x21. */
{NOLDN, NULL,
{0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,0x29,0x2a,
0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
{0x82,NANA,0xff,0x00,MISC,0x00,MISC,0x00,0x00,0x00,
MISC,MISC,MISC,0x00,0x00,EOT}},
/* Some register defaults depend on the value of PNPCSV. */
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},
{0x01,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00,
0x00,EOT}},
{0x1, "Parallel port",
{0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
{0x01,0x03,0x78,0x07,0x04,0x3f,EOT}},
{0x2, "COM1",
{0x30,0x60,0x61,0x70,0xf0,EOT},
{0x01,0x03,0xf8,0x04,0x00,EOT}},
{0x3, "COM2",
{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
{0x01,0x02,0xf8,0x03,0x00,0x00,EOT}},
{0x5, "Keyboard",
{0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
{0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x80,EOT}},
{0x7, "GPIO 1, GPIO 5, game port, MIDI port",
{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
0xf4,0xf5,EOT},
{0x00,0x02,0x01,0x03,0x30,0x09,0xff,0x00,0x00,0xff,
0x00,0x00,EOT}},
{0x8, "GPIO 2",
{0x30,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,EOT},
{0x00,0xff,0x00,0x00,0x00,RSVD,0x00,0x00,0x00,EOT}},
{0x9, "GPIO 3, GPIO 4",
{0x30,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,EOT},
{0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,EOT}},
{0xa, "ACPI",
/* Note: Datasheet says 0xe2 can't be read/written. */
{0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
0xf0,0xf1,0xf3,0xf4,0xf6,0xf7,0xf9,0xfe,0xff,EOT},
{0x00,0x00,0x00,0x00,MISC,MISC,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,RSVD,RSVD,EOT}},
{0xb, "Hardware monitor",
{0x30,0x60,0x61,0x70,EOT},
{0x00,0x00,0x00,0x00,EOT}},
{EOT}}},
#if 0
{0x85x, "W83687THF", { /* TODO: sensors-detect: 0x85 */
{EOT}}},
#endif
{0xa02, "W83627DHG", {
{EOT}}},
{0x886, "W83627EHF/EF/EHG/EG", { /* sensors-detect: 0x8853 possible */
{NOLDN, NULL,
{0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
{0x88,MISC,0xff,0x00,MISC,0x00,MISC,RSVD,0x50,
0x04,0x00,RSVD,0x00,0x21,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},
{0x01,0x03,0xf0,0x06,0x02,0x8e,0x00,0xff,0x00,
0x00,EOT}},
{0x1, "Parallel port",
{0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
{0x01,0x03,0x78,0x07,0x04,0x3f,EOT}},
{0x2, "COM1",
{0x30,0x60,0x61,0x70,0xf0,EOT},
{0x01,0x03,0xf8,0x04,0x00,EOT}},
{0x3, "COM2",
{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
{0x01,0x02,0xf8,0x03,0x00,0x00,EOT}},
{0x5, "Keyboard",
{0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
{0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x83,EOT}},
{0x6, "Serial flash interface",
{0x30,0x62,0x63,EOT},
{0x00,0x00,0x00,EOT}},
{0x7, "GPIO 1, GPIO 6, game port, MIDI port",
{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
0xf4,0xf5,0xf6,0xf7,EOT},
{0x00,0x02,0x01,0x03,0x30,0x09,0xff,0x00,0x00,0x00,
0xff,0x00,0x00,0x00,EOT}},
{0x8, "WDTO#, PLED",
{0x30,0xf5,0xf6,0xf7,EOT},
{0x00,0x00,0x00,0x00,EOT}},
{0x9, "GPIO 2, GPIO 3, GPIO 4, GPIO 5, SUSLED",
{0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xf0,0xf1,0xf2,
0xf3,0xf4,0xf5,0xf6,0xf7,EOT},
{0x00,0xff,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x00,
0x00,0xff,0x00,0x00,0x00,EOT}},
{0xa, "ACPI",
{0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
0xe8,0xf2,0xf3,0xf4,0xf6,0xf7,EOT},
{0x00,0x00,0x01,0x00,0xff,0x08,0x00,RSVD,0x00,0x00,
RSVD,0x7c,0x00,0x00,0x00,0x00,EOT}},
{0xb, "Hardware monitor",
{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
{0x00,0x00,0x00,0x00,0xc1,0x00,EOT}},
{EOT}}},
{0xa23, "W83627UHG", {/* TODO: Not yet in sensors-detect */
{EOT}}},
/* ID and rev */
{0x9771, "W83977F-A/G-A/AF-A/AG-A", {
{EOT}}},
{0x9773, "W83977TF", {
{EOT}}},
{0x9774, "W83977ATF", {
{EOT}}},
/* ID only */
{0x52, "W83627HF/F/HG/G", {
{NOLDN, NULL,
{0x02,0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,
0x29,0x2a,0x2b,0x2c,0x2e,0x2f,EOT},
{0x00,NANA,0x52,NANA,0xff,0x00,MISC,0x00,0x00,0x00,
0x00,0x7c,0xc0,0x00,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},
{0x01,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00,
0x00,EOT}},
{0x1, "Parallel port",
{0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
{0x01,0x03,0x78,0x07,0x04,0x3f,EOT}},
{0x2, "COM1",
{0x30,0x60,0x61,0x70,0xf0,EOT},
{0x01,0x03,0xf8,0x04,0x00,EOT}},
{0x3, "COM2",
{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
{0x01,0x02,0xf8,0x03,0x00,0x00,EOT}},
{0x5, "Keyboard",
{0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
{0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x80,EOT}},
{0x6, "Consumer IR",
{0x30,0x60,0x61,0x70,EOT},
{0x00,0x00,0x00,0x00,EOT}},
{0x7, "Game port, MIDI port, GPIO 1",
{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,EOT},
{0x00,0x02,0x01,0x03,0x30,0x09,0xff,0x00,0x00,EOT}},
{0x8, "GPIO 2, Watchdog timer",
{0x30,0xf0,0xf1,0xf2,0xf3,0xf5,0xf6,0xf6,0xf7,EOT},
{0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
{0x9, "GPIO 3",
{0x30,0xf0,0xf1,0xf2,0xf3,EOT},
{0x00,0xff,0x00,0x00,0x00,EOT}},
{0xa, "ACPI",
{0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
0xf0,0xf1,0xf3,0xf4,0xf6,0xf7,0xf9,0xfe,0xff,EOT},
{0x00,0x00,0x00,0x00,NANA,NANA,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
{0xb, "Hardware monitor",
{0x30,0x60,0x61,0x70,0xf0,EOT},
{0x00,0x00,0x00,0x00,0x00,EOT}},
{EOT}}},
/* ID[3..0] */
{0xa, "W83877F", {
{EOT}}},
{0xc, "W83877TF", {
{EOT}}},
{0xd, "W83877ATF", {
{EOT}}},
{EOT}
};
static void enter_conf_mode_winbond_88(uint16_t port)
{
outb(0x88, port);
}
static void enter_conf_mode_winbond_89(uint16_t port)
{
outb(0x89, port);
}
static void enter_conf_mode_winbond_86(uint16_t port)
{
outb(0x86, port);
outb(0x86, port);
}
void probe_idregs_winbond_helper(const char *init, uint16_t port)
{
uint16_t id;
uint8_t devid, rev, olddevid;
probing_for("Winbond", init, port);
devid = regval(port, DEVICE_ID_REG);
rev = regval(port, DEVICE_REV_REG);
olddevid = regval(port, DEVICE_ID_REG_OLD) & 0x0f;
if (devid == 0x52)
id = devid; /* ID only */
else if ((devid == 0x97) && ((rev & 0xf0) == 0x70))
id = (devid << 8) | rev; /* ID and rev */
else
id = (devid << 4) | ((rev & 0xf0) >> 4); /* ID and rev[3..0] */
if (olddevid == 0x0a || olddevid == 0x0c || olddevid == 0x0d)
id = olddevid & 0x0f; /* ID[3..0] */
if (superio_unknown(reg_table, id)) {
if (verbose)
printf(NOTFOUND "id/oldid=0x%02x/0x%02x, rev=0x%02x\n",
devid, olddevid, rev);
exit_conf_mode_winbond_fintek_ite_8787(port);
return;
}
if (olddevid == 0x0a || olddevid == 0x0c || olddevid == 0x0d)
printf("Found Winbond %s (id=0x%02x) at 0x%x\n",
get_superio_name(reg_table, id), olddevid, port);
else
printf("Found Winbond %s (id=0x%02x, rev=0x%02x) at 0x%x\n",
get_superio_name(reg_table, id), devid, rev, port);
chip_found = 1;
/* TODO: Special notes in dump output for the MISC entries. */
dump_superio("Winbond", reg_table, port, id);
dump_superio_readable(port); /* TODO */
}
void probe_idregs_winbond(uint16_t port)
{
/* TODO: Not all init sequences are valid for all ports. */
enter_conf_mode_winbond_88(port);
probe_idregs_winbond_helper("(init=0x88) ", port);
exit_conf_mode_winbond_fintek_ite_8787(port);
enter_conf_mode_winbond_89(port);
probe_idregs_winbond_helper("(init=0x89) ", port);
exit_conf_mode_winbond_fintek_ite_8787(port);
enter_conf_mode_winbond_86(port);
probe_idregs_winbond_helper("(init=0x86,0x86) ", port);
exit_conf_mode_winbond_fintek_ite_8787(port);
enter_conf_mode_winbond_fintek_ite_8787(port);
probe_idregs_winbond_helper("(init=0x87,0x87) ", port);
exit_conf_mode_winbond_fintek_ite_8787(port);
}
Reference in a new issue View git blame Copy permalink