superiotool: Cosmetics and coding style fixes.
[coreboot.git] / util / superiotool / winbond.c
index 91f06063eca96af46686765e63435a61de710938..a3c6547d50d22b852e7a73d0ecc010ff02fced52 100644 (file)
@@ -235,12 +235,115 @@ static const struct superio_registers reg_table[] = {
                {EOT}}},
        {0xa23, "W83627UHG", {/* TODO: Not yet in sensors-detect */
                {EOT}}},
+       {0xa51, "W83667HG", {
+               /* See also: http://lists.lm-sensors.org/pipermail/lm-sensors/2008-July/023683.html */
+               {EOT}}},
+       {0xb07, "W83627DHG-P/-PT", {
+               {NOLDN, NULL,
+                       {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
+                        0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+                       {0x00,0xb0,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}},
+               {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 peripheral interface",
+                       {0x30,0x62,0x63,EOT},
+                       {0x00,0x00,0x00,EOT}},
+               {0x7, "GPIO 6",
+                       {0x30,0xf4,0xf5,0xf6,0xf7,0xf8,EOT},
+                       {0x00,0xff,0x00,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",
+                       {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,
+                        0xe9,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
+                        0xf9,0xfa,0xfe,EOT},
+                       {0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,EOT}},
+               {0xa, "ACPI",
+                       {0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
+                        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,0xf2,EOT},
+                       {0x00,0x00,0x00,0x00,0x81,0x00,0x00,EOT}},
+               {0xc, "PECI, SST",
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe8,0xe9,0xea,0xec,
+                        0xee,0xef,0xf1,0xf2,0xf3,0xfe,0xff,EOT},
+                       {0x00,0x48,0x48,0x48,0x48,0x00,0x00,RSVD,0x00,0x00,
+                        0x01,0x5a,0x48,0x50,0x10,0x00,0x00,EOT}},
+               {EOT}}},
+       {0xb35, "Nuvoton NCT5571D", {
+               {NOLDN, NULL,
+                       {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
+                        0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+                       {RSVD,0xb3,NANA,0xff,0x00,0x40,0x00,MISC,0xff,0x20,0x00,
+                        0x00,0x7f,0x0a,0x08,0x00,MISC,EOT}},
+               {0x2, "COM1",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x01,0x03,0xf8,0x04,0x00,EOT}},
+               {0x5, "Keyboard",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
+                       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x83,EOT}},
+               {0x7, "GPIO 6, GPIO 8, GPIO 9",
+                       {0x30,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,
+                        0xee,0xf4,0xf5,0xf6,0xf7,0xf8,EOT},
+                       {0x18,0xef,MISC,0x00,0x00,0xff,MISC,0x00,0x00,RSVD,0x00,
+                        0x00,0xff,MISC,0x00,0x00,0x00,EOT}},
+               {0x9, "GPIO 2, GPIO 3, GPIO 5",
+                       {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe9,0xea,
+                        0xeb,0xf4,0xf5,0xf6,0xf7,0xfe,EOT},
+                       {0x05,0xff,MISC,0x00,0x00,0xff,MISC,0x00,0x00,0x00,0x00,
+                        0x00,0xff,MISC,0x00,0x00,0x00,EOT}},
+               {0xa, "ACPI",
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xf2,
+                        0xf3,0xf4,0xf6,0xf7,0xfe,0xff,EOT},
+                       {0x01,0x00,0xff,0x00,0x00,0x02,0x1c,0x00,RSVD,0x00,0x7c,
+                        0x00,0x00,0x00,0x00,0x00,0x30,EOT}},
+               {0xb, "Hardware monitor",
+                       {0x30,0x60,0x61,0x70,0xe0,0xe1,0xe2,0xe3,0xf0,0xf5,EOT},
+                       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc1,0x10,EOT}},
+               {0xc, "PECI",
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe8,0xe9,0xea,0xec,
+                        0xee,0xef,0xf1,0xf2,0xf3,0xfe,0xff,EOT},
+                       {0x00,0x48,0x48,0x48,0x48,0x00,0x00,0x00,RSVD,0x00,0x00,
+                        0x01,0x5a,0x48,0x50,0x10,0x80,0x01,EOT}},
+               {0xd, "SUSLED",
+                       {0xec,EOT},
+                       {0x01,EOT}},
+               {0xf, "GPIO Push-Pull/OD Select",
+                       {0xe0,0xe1,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xf0,0xf1,
+                        0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,
+                        0xfd,0xfe,0xff,EOT},
+                       {RSVD,0xfd,RSVD,0xf7,0xcb,RSVD,0xff,0xff,0x00,MISC,MISC,
+                        MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,
+                        MISC,MISC,MISC,EOT}},
+               {EOT}}},
 
        /* ID and rev */
        {0x9771, "W83977F-A/G-A/AF-A/AG-A", {
                {EOT}}},
        {0x9777, "W83977AF", {
-               /* W83977AF as found on the Advantech PCM-5820. We weren't able
+               /*
+                * W83977AF as found on the Advantech PCM-5820. We weren't able
                 * to find a datasheet (so far) which lists the 0x77 revision,
                 * but the hardware is there in the wild, so detect it...
                 */
@@ -285,7 +388,7 @@ static const struct superio_registers reg_table[] = {
                         0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,EOT}},
                {0xa, "ACPI",
                        {0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x70,0xe0,0xe1,
-                        0x02,0xe3,0xe4,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,
+                        0xe2,0xe3,0xe4,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,
                         0xf7,0xfe,0xff,EOT},
                        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
                         NANA,MISC,RSVD,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -294,6 +397,37 @@ static const struct superio_registers reg_table[] = {
        {0x9774, "W83977ATF", {
                {EOT}}},
 
+       {0xb07, "W83527HG", {   /* TODO: Not yet in sensors-detect */
+               {NOLDN, NULL,
+                       {0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
+                        0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+                       {0xB0,0x73,0xff,0x00,MISC,0x00,0x00,RSVD,0x50,0x00,
+                        0x00,RSVD,0xe2,0x21,0x00,0x00,EOT}},
+               {0x5, "Keyboard",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x83,EOT}},
+               {0x8, "WDTO#, PLED",
+                       {0x30,0xf5,0xf6,0xf7,EOT},
+                       {0x00,0x00,0x00,0x00,EOT}},
+               {0x9, "GPIO 2, GPIO3, GPIO5",
+                       {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe9,
+                        0xf0,0xf1,0xf2,0xf3,0xf8,0xf9,0xfa,0xfe,EOT},
+                       {0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,
+                        0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+               {0xa, "ACPI",
+                       {0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
+                        0xe8,0xe9,0xf2,0xf3,0xf4,0xf6,0xf7,0xfe,EOT},
+                       {0x00,0x00,0x01,0x00,0xff,0x08,0x00,0x00,0x1c,0x00,
+                        RSVD,RSVD,0x7c,0x00,0x00,0x00,0x00,0x00,EOT}},
+               {0xb, "Hardware monitor",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
+                       {0x00,0x00,0x00,0x00,0x81,RSVD,0x00,EOT}},
+               {0xc, "PECI",
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe8,0xe9,0xea,0xec,
+                        0xfe,0xff,EOT},
+                       {0x00,0x48,0x48,0x48,0x48,0x00,0x00,RSVD,0x00,0x00,
+                        0x00,0x00,EOT}},
+               {EOT}}},
        /* ID only */
        {0x52, "W83627HF/F/HG/G", {
                {NOLDN, NULL,
@@ -324,7 +458,7 @@ static const struct superio_registers reg_table[] = {
                {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",
+               {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",
@@ -461,9 +595,69 @@ static const struct superio_registers reg_table[] = {
        /* ID[3..0] */
        {0xa, "W83877F", {
                {EOT}}},
+       {0xb, "W83877AF", {
+               {NOLDN, NULL,
+                       {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,
+                        0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,
+                        0x14,0x15,0x16,0x17,0x1e,0x20,0x21,0x22,0x23,0x24,
+                        0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,EOT},
+                       {0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x0a,
+                        0x1f,0x0c,0x28,0xa3,RSVD,RSVD,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x0e,0x00,MISC,MISC,MISC,MISC,MISC,MISC,
+                        MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,EOT}},
+               {EOT}}},
        {0xc, "W83877TF", {
                {EOT}}},
-       {0xd, "W83877ATF", {
+       {0xd, "W83877ATF/ATG", {
+               {EOT}}},
+       {EOT}
+};
+
+static const struct superio_registers hwm_table[] = {
+       {0x828, "W83627THF/THG", {
+               {NOLDN, NULL,
+                       {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,
+                        0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,
+                        0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,
+                        0x1e,0x1f,
+                        0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
+                        0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0x34,
+                        0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,
+                        0x3f,
+                        0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,
+                        0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,EOT},
+                       {RSVD,0xff,RSVD,0xff,0x00,0x00,0x00,0x00,0x01,0x01,
+                        0x01,0x01,0x3c,0x3c,0x0a,0x0a,RSVD,0xff,0x00,0x00,
+                        0x00,0x01,0x01,0x3c,0x43,RSVD,0xff,0xff,RSVD,RSVD,
+                        NANA,NANA,
+                        NANA,NANA,NANA,NANA,NANA,RSVD,RSVD,NANA,NANA,NANA,
+                        NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,
+                        RSVD,RSVD,RSVD,RSVD,NANA,NANA,NANA,NANA,NANA,RSVD,
+                        RSVD,
+                        0x03,0x00,0x00,0xfe,0xff,RSVD,RSVD,0x5f,NANA,0x03,
+                        RSVD,0x44,0x18,0x15,0x80,0x5c,EOT}},
+               {0x0, "Bank 0",
+                       {0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,
+                        0x5d,0x5e,0x5f,EOT},
+                       {NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x80,0x90,0x70,
+                        0x00,RSVD,RSVD,EOT}},
+               {0x1, "Bank 1",
+                       {0x50,0x51,0x52,0x53,0x54,0x55,0x56,EOT},
+                       {NANA,NANA,0x00,0x4b,0x00,0x50,0x00,EOT}},
+               {0x2, "Bank 2",
+                       {0x50,0x51,0x52,0x53,0x54,0x55,0x56,EOT},
+                       {NANA,NANA,0x00,0x4b,0x00,0x50,0x00,EOT}},
+               {0x4, "Bank 4",
+                       {0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x59,0x5a,
+                        0x5b,EOT},
+                       {0x00,0xff,RSVD,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,EOT}},
+               {0x5, "Bank 5",
+                       {0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,EOT},
+                       {NANA,NANA,RSVD,RSVD,NANA,NANA,NANA,NANA,EOT}},
+               {0x6, "Bank 6",
+                       {0x50,EOT},
+                       {RSVD,EOT}},
                {EOT}}},
        {EOT}
 };
@@ -484,9 +678,11 @@ static void enter_conf_mode_winbond_86(uint16_t port)
        OUTB(0x86, port);
 }
 
+static int chip_found_at_port;
+
 static void probe_idregs_winbond_helper(const char *init, uint16_t port)
 {
-       uint16_t id;
+       uint16_t id, hwmport;
        uint8_t devid, rev, olddevid;
 
        probing_for("Winbond", init, port);
@@ -504,7 +700,7 @@ static void probe_idregs_winbond_helper(const char *init, uint16_t port)
        else
                id = (devid << 4) | ((rev & 0xf0) >> 4); /* ID and rev[7..4] */
 
-       if (olddevid == 0x0a || olddevid == 0x0c || olddevid == 0x0d)
+       if (olddevid >= 0x0a && olddevid <= 0x0d)
                id = olddevid & 0x0f;                    /* ID[3..0] */
 
        if (superio_unknown(reg_table, id)) {
@@ -514,37 +710,69 @@ static void probe_idregs_winbond_helper(const char *init, uint16_t port)
                return;
        }
 
-       if (olddevid == 0x0a || olddevid == 0x0c || olddevid == 0x0d)
+       if (olddevid >= 0x0a && 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;
+       chip_found_at_port = 1;
 
-       dump_superio("Winbond", reg_table, port, id);
+       dump_superio("Winbond", reg_table, port, id, LDN_SEL);
+
+       if (extra_dump) {
+               regwrite(port, LDN_SEL, 0x0b); /* Select LDN 0xb (HWM). */
+
+               if ((regval(port, 0x30) & (1 << 0)) != (1 << 0)) {
+                       printf("Hardware Monitor disabled or does not exist.\n");
+                       return;
+               }
+
+               /* Get HWM base address (stored in LDN 0xb, index 0x60/0x61). */
+               hwmport = regval(port, 0x60) << 8;
+               hwmport |= regval(port, 0x61);
+
+               /* HWM address register = HWM base address + 5. */
+               hwmport += 5;
+
+               printf("Hardware monitor (0x%04x)\n", hwmport);
+               dump_superio("Winbond-HWM", hwm_table, hwmport, id,
+                            WINBOND_HWM_SEL);
+       }
 }
 
 void probe_idregs_winbond(uint16_t port)
 {
+       chip_found_at_port = 0;
+
        enter_conf_mode_winbond_88(port);
        probe_idregs_winbond_helper("(init=0x88) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
+       if (chip_found_at_port)
+               return;
 
        enter_conf_mode_winbond_89(port);
        probe_idregs_winbond_helper("(init=0x89) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
+       if (chip_found_at_port)
+               return;
 
        enter_conf_mode_winbond_86(port);
        probe_idregs_winbond_helper("(init=0x86,0x86) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
+       if (chip_found_at_port)
+               return;
 
        enter_conf_mode_winbond_fintek_ite_8787(port);
        probe_idregs_winbond_helper("(init=0x87,0x87) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
+       if (chip_found_at_port)
+               return;
 }
 
 void print_winbond_chips(void)
 {
        print_vendor_chips("Winbond", reg_table);
+       print_vendor_chips("Winbond-HWM", hwm_table);
 }