X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fsuperiotool%2Fwinbond.c;h=a3c6547d50d22b852e7a73d0ecc010ff02fced52;hb=c55bcdecf70586ba575af403f26f92dbbbc05190;hp=d5d9275247b8603f50984bc2ca4cbb36227e7983;hpb=7a51e50582b65bb6ac54e8923470807b5975c6e1;p=coreboot.git

diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index d5d927524..a3c6547d5 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -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,20 @@ 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}
 };
@@ -533,6 +678,8 @@ 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, hwmport;
@@ -553,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)) {
@@ -563,13 +710,14 @@ 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, LDN_SEL);
 
@@ -596,21 +744,31 @@ static void probe_idregs_winbond_helper(const char *init, uint16_t port)
 
 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)