projects / coreboot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Small superiotool fix to detect more Winbond W83627EHF chips. The
[coreboot.git] / util / superiotool / ite.c
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 1a65e2cff28ad432ba5cf447ce5b51ae7c1a4579..dcb61787bcd66d9c7445a7ac9847f12de0dd803a 100644 (file)
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2007 Carl-Daniel Hailfinger
  * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
@@ -23,13 +23,96 @@
 
 #define CHIP_ID_BYTE1_REG      0x20
 #define CHIP_ID_BYTE2_REG      0x21
+
 #define CHIP_VERSION_REG       0x22
 
-/* Note: IT8726F has ID 0x8726 (datasheet wrongly says 0x8716). */
-const static struct superio_registers reg_table[] = {
+static const struct superio_registers reg_table[] = {
+       {0x8661, "IT8661F", {
+               /* TODO: Needs different init sequence. */
+               {NOLDN, NULL,
+                       {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x20,0x21,
+                        0x22,0x23,0x24,EOT},
+                       {NANA,NANA,NANA,NANA,NANA,NANA,0x00,NANA,0x86,0x61,
+                        0x00,0x00,0x00,EOT}},
+               {0x0, "Floppy",
+                       {0x30,0x31,0x60,0x61,0x70,0x71,0x74,0xf0,EOT},
+                       {0x00,0x00,0x03,0xf0,0x06,0x02,0x02,0x00,EOT}},
+               {0x1, "COM1",
+                       {0x30,0x31,0x60,0x61,0x70,0x71,0xf0,EOT},
+                       {0x00,0x00,0x03,0xf8,0x04,0x02,0x00,EOT}},
+               {0x2, "COM2",
+                       {0x30,0x31,0x60,0x61,0x70,0x71,0xf0,EOT},
+                       {0x00,0x00,0x02,0xf8,0x03,0x02,0x00,EOT}},
+               {0x3, "Parallel port",
+                       {0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x74,
+                        0xf0,EOT},
+                       {0x00,0x00,0x03,0x78,0x07,0x78,0x07,0x02,0x03,
+                        0x03,EOT}},
+               {0x4, "IR",
+                       {0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x72,0x73,
+                        0x74,0x75,0xf0,EOT},
+                       {0x00,0x00,0x02,0xe8,0x03,0x00,0x0a,0x02,0x0b,0x02,
+                        0x01,0x00,0x00,EOT}},
+               {0x5, "GPIO",
+                       {0x25,0x26,0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
+                        0x70,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
+                        0xf9,0xfa,0xfb,0xfc,EOT},
+                       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,EOT}},
+               {EOT}}},
        {0x8702, "IT8702F", {
                {EOT}}},
-       {0x8705, "IT8705F or IT8700F", {
+       {0x8705, "IT8705F/AF / IT8700F", {
+               {NOLDN, NULL,
+                       {0x07,0x20,0x21,0x22,0x23,0x24,EOT},
+                       {NANA,0x87,0x05,0x00,0x00,NANA,EOT}},
+               {0x0, "Floppy",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
+                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
+               {0x1, "COM1",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0xf8,0x04,0x00,EOT}},
+               {0x2, "COM2",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
+               {0x3, "Parallel port",
+                       {0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x70,0x74,
+                        0xf0,EOT},
+                       {0x00,0x03,0x78,0x07,0x78,0x00,0x80,0x07,0x03,
+                        0x03,EOT}},
+               {0x4, "Environment controller",
+                       {0x2b,0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,
+                        0xf3,0xf4,0xf5,0xf6,EOT},
+                       {0x00,0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,
+                        0x00,0x00,NANA,NANA,EOT}},
+               {0x5, "GPIO",
+                       {0x25,0x26,0x27,0x28,0x29,0x2a,0x60,0x61,0x62,0x63,
+                        0x64,0x65,0x70,0x71,0x72,0xb0,0xb1,0xb2,0xb3,0xb4,
+                        0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xc0,0xc1,0xc2,
+                        0xc3,0xc4,0xc5,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xd0,
+                        0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd8,0xd9,0xda,0xf0,
+                        0xf1,0xf2,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,
+                        0xfd,0xfe,0xff,EOT},
+                       {0x00,0x00,0x00,0xff,0xe0,0xff,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,NANA,0x00,EOT}},
+               {0x6, "Game port",
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x02,0x01,EOT}},
+               {0x7, "Consumer IR",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
+               {0x8, "MIDI port",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x00,0x0a,0x00,EOT}},
+               {EOT}}},
+       {0x8706, "IT8706R", {   /* TODO: Not yet in sensors-detect */
+               /* This is a "Special General Purpose I/O chip". */
                {EOT}}},
        {0x8708, "IT8708F", {
                {NOLDN, NULL,
@@ -86,7 +169,7 @@ const static struct superio_registers reg_table[] = {
                        {0x30,0x60,0x61,0x70,0xf0,EOT},
                        {0x00,0x03,0x00,0x0a,0x00,EOT}},
                {EOT}}},
-       {0x8710, "IT8710F", {
+       {0x8710, "IT8710F", {   /* TODO: Not yet in sensors-detect */
                {EOT}}},
        {0x8712, "IT8712F", {
                {NOLDN, NULL,
@@ -143,30 +226,30 @@ const static struct superio_registers reg_table[] = {
                {NOLDN, NULL,
                        {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
                        {NANA,0x87,0x16,0x01,0x00,0x00,0x00,EOT}},
-               {0x0, NULL,
+               {0x0, "Floppy",
                        {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
                        {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
-               {0x1, NULL,
+               {0x1, "COM1",
                        {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
                        {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
-               {0x2, NULL,
+               {0x2, "COM2",
                        {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
                        {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
-               {0x3, NULL,
+               {0x3, "Parallel port",
                        {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
                        {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
-               {0x4, NULL,
+               {0x4, "Environment controller",
                        {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
                         0xf4,0xf5,0xf6,EOT},
                        {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
                         0x00,NANA,NANA,EOT}},
-               {0x5, NULL,
+               {0x5, "Keyboard",
                        {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
                        {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
-               {0x6, NULL,
+               {0x6, "Mouse",
                        {0x30,0x70,0x71,0xf0,EOT},
                        {0x00,0x0c,0x02,0x00,EOT}},
-               {0x7, NULL,
+               {0x7, "GPIO",
                        {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
                         0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
                         0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
@@ -179,32 +262,70 @@ const static struct superio_registers reg_table[] = {
                         0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
                         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
                         0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
-               {0x8, NULL,
+               {0x8, "MIDI port",
                        {0x30,0x60,0x61,0x70,0xf0,EOT},
                        {0x00,0x03,0x00,0x0a,0x00,EOT}},
-               {0x9, NULL,
+               {0x9, "Game port",
                        {0x30,0x60,0x61,EOT},
                        {0x00,0x02,0x01,EOT}},
-               {0xa, NULL,
+               {0xa, "Consumer IR",
                        {0x30,0x60,0x61,0x70,0xf0,EOT},
                        {0x00,0x03,0x10,0x0b,0x00,EOT}},
                {EOT}}},
        {0x8718, "IT8718F", {
+               {NOLDN, NULL,
+                       {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+                       {NANA,0x87,0x18,0x01,0x00,0x00,0x00,EOT}},
+               {0x0, "Floppy",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
+                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
+               {0x1, "COM1",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
+               {0x2, "COM2",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
+               {0x3, "Parallel port",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
+                       {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
+               {0x4, "Environment controller",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
+                        0xf4,0xf5,0xf6,EOT},
+                       {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
+                        0x00,NANA,NANA,EOT}},
+               {0x5, "Keyboard",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
+               {0x6, "Mouse",
+                       {0x30,0x70,0x71,0xf0,EOT},
+                       {0x00,0x0c,0x02,0x00,EOT}},
+               {0x7, "GPIO",
+                       {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
+                        0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
+                        0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
+                        0xc0,0xc1,0xc2,0xc3,0xc4,0xc8,0xc9,0xca,0xcb,0xcc,
+                        0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xf0,0xf1,
+                        0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,
+                        0xfc,0xfd,0xfe,0xff,EOT},
+                       {0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x20,0x38,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        NANA,0x00,0x00,0x00,EOT}},
+               {0xa, "Consumer IR",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
+               {EOT}}},
+       {0x8726, "IT8726F", {
+               /* Datasheet wrongly says that the ID is 0x8716. */
                {EOT}}},
        {EOT}
 };
 
-/* TODO: Drop this function later. */
-void dump_ite(uint16_t port, uint16_t id)
-{
-       dump_superio("ITE", reg_table, port, id);
-}
-
 /**
- * Enable configuration sequence (ITE uses this for newer IT87[012]xF).
- *
- * IT871[01]F uses 0x87, 0x87 -> Fintek detection should handle it
- * IT8708F uses 0x87, 0x87 -> Fintek detection should handle it
+ * IT871[01]F and IT8708F use 0x87, 0x87
  * IT8761F uses 0x87, 0x61, 0x55, 0x55/0xaa
  * IT86xxF series uses different ports
  * IT8661F uses 0x86, 0x61, 0x55/0xaa, 0x55/0xaa and 32 more writes
@@ -226,22 +347,25 @@ static void exit_conf_mode_ite(uint16_t port)
        regwrite(port, 0x02, 0x02);
 }
 
-static void probe_idregs_ite_helper(uint16_t port)
+static void probe_idregs_ite_helper(const char *init, uint16_t port)
 {
        uint16_t id, chipver;
 
+       probing_for("ITE", init, port);
+
        id = regval(port, CHIP_ID_BYTE1_REG) << 8;
        id |= regval(port, CHIP_ID_BYTE2_REG);
        chipver = regval(port, CHIP_VERSION_REG) & 0x0f; /* Only bits 3..0 */
 
        if (superio_unknown(reg_table, id)) {
-               no_superio_found(port);
-               exit_conf_mode_ite(port);
+               if (verbose)
+                       printf(NOTFOUND "id=0x%04x, rev=0x%01x\n", id, chipver);
                return;
        }
 
-       printf("Found ITE %s (id=0x%04x, rev=0x%01x) at port=0x%x\n",
+       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;
 
        dump_superio("ITE", reg_table, port, id);
 }
@@ -249,11 +373,15 @@ static void probe_idregs_ite_helper(uint16_t port)
 void probe_idregs_ite(uint16_t port)
 {
        enter_conf_mode_ite(port);
-       probe_idregs_ite_helper(port);
+       probe_idregs_ite_helper("(init=0x87,0x01,0x55,0x55/0xaa) ", port);
        exit_conf_mode_ite(port);
 
        enter_conf_mode_winbond_fintek_ite_8787(port);
-       probe_idregs_ite_helper(port);
+       probe_idregs_ite_helper("(init=0x87,0x87) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
 }
 
+void print_ite_chips(void)
+{
+       print_vendor_chips("ITE", reg_table);
+}
my coreboot WIP stuff (asus m5a99x-evo board)