projects / coreboot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add dump support for Winbond (NSC) PC87427. Dumps available from real hardware.
[coreboot.git] / util / superiotool / winbond.c
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 671a82568417d5fe3865cbd091f0b0a9fbb2f2c6..1b67e9c1a48e607e1fe8015964aa4bff7e097f70 100644 (file)
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -2,7 +2,6 @@
  * 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
@@ -144,18 +143,16 @@ static const struct superio_registers reg_table[] = {
                {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,
+                       {0x02,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}},
+                       {0x00,0xa0,NANA,0xff,0x00,MISC,0x00,MISC,RSVD,0x50,
+                        0x00,0x00,RSVD,0xe2,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}},
+                       {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}},
@@ -168,30 +165,35 @@ static const struct superio_registers reg_table[] = {
                {0x5, "Keyboard",
                        {0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
                        {0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x83,EOT}},
-               {0x6, "Serial flash interface",
+               {0x6, "Serial peripheral 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}},
+               {0x7, "GPIO 6",
+                       {0x30,0xf4,0xf5,0xf6,0xf7,EOT},
+                       {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}},
+               {0x9, "GPIO 2, GPIO 3, GPIO 4, GPIO 5",
+                       {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,
+                        0xe9,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xfe,
+                        EOT},
+                       {0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0xff,0x00,0x00,0x00,0xff,0x00,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}},
+                        0xe8,0xe9,0xf2,0xf3,0xf4,0xf6,0xf7,0xfe,EOT},
+                       {0x00,0x00,0x01,0x00,0xff,0x08,0x00,RSVD,0x1c,0x00,
+                        RSVD,RSVD,0x7c,0x00,0x00,0x00,0x00,0x00,EOT}},
                {0xb, "Hardware monitor",
-                       {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
-                       {0x00,0x00,0x00,0x00,0xc1,0x00,EOT}},
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
+                       {0x00,0x00,0x00,0x00,0x81,0x00,0x00,EOT}},
+               {0xc, "PECI, SST",
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe8,0xf1,0xfe,0xff,
+                        EOT},
+                       {0x00,0x48,0x48,0x48,0x48,0x00,0x00,0x48,0x00,0x00,
+                        EOT}},
                {EOT}}},
        {0xa23, "W83627UHG", {/* TODO: Not yet in sensors-detect */
                {EOT}}},
@@ -362,6 +364,61 @@ static const struct superio_registers reg_table[] = {
                        {0x30,0x60,0x61,0xf0,0xf1,0xf2,EOT},
                        {0x00,0x00,0x00,0xff,0x00,0x00,EOT}},
                {EOT}}},
+       {0x88, "W83627EHF/EF/EHG/EG", {
+               /*
+                * As per datasheet the ID should be 0x886? here.
+                * Not mentioned in the datasheet, but sensors-detect says
+                * 0x8853 is also possible. Also, the ASUS A8V-E Deluxe
+                * (W83627EHF) has an ID of 0x8854 (verified on hardware).
+                * So we now assume all 0x88?? IDs to mean W83627EHF/EF/EHG/EG.
+                */
+               {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}}},
 
        /* ID[3..0] */
        {0xa, "W83877F", {
@@ -389,7 +446,7 @@ static void enter_conf_mode_winbond_86(uint16_t port)
        outb(0x86, port);
 }
 
-void probe_idregs_winbond_helper(const char *init, uint16_t port)
+static void probe_idregs_winbond_helper(const char *init, uint16_t port)
 {
        uint16_t id;
        uint8_t devid, rev, olddevid;
@@ -400,7 +457,7 @@ void probe_idregs_winbond_helper(const char *init, uint16_t port)
        rev = regval(port, DEVICE_REV_REG);
        olddevid = regval(port, DEVICE_ID_REG_OLD) & 0x0f;
 
-       if (devid == 0x52 || devid == 0x68)
+       if (devid == 0x52 || devid == 0x68 || devid == 0x88)
                id = devid;                              /* ID only */
        else if ((devid == 0x97) && ((rev & 0xf0) == 0x70))
                id = (devid << 8) | rev;                 /* ID and rev */
@@ -414,7 +471,6 @@ void probe_idregs_winbond_helper(const char *init, uint16_t port)
                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;
        }
 
@@ -426,14 +482,11 @@ void probe_idregs_winbond_helper(const char *init, uint16_t port)
                       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);
 }
 
 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);
@@ -451,3 +504,7 @@ void probe_idregs_winbond(uint16_t port)
        exit_conf_mode_winbond_fintek_ite_8787(port);
 }
 
+void print_winbond_chips(void)
+{
+       print_vendor_chips("Winbond", reg_table);
+}
my coreboot WIP stuff (asus m5a99x-evo board)