X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fsuperiotool%2Fsmsc.c;h=012ffbd7daf11a7f3e2aff6ad28a944106be9b1b;hb=522e9e9746f4d98c5e8a9b83058ca143e9347d0a;hp=d748a9296e4f92f63b41da1f4c8ab37011d085c9;hpb=db52fb802471e5bde26a338ec1afbf8164da87f9;p=coreboot.git

diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index d748a9296..012ffbd7d 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -29,6 +29,46 @@
 
 static const struct superio_registers reg_table[] = {
 	/* The following Super I/Os use the 0x20/0x21 ID registers. */
+	{0x02, "FDC37C932", {
+		{NOLDN, NULL,
+			{0x02,0x03,0x20,0x21,0x22,0x23,0x24,0x2d,0x2e,
+			 0x2f,EOT},
+			{0x00,0x03,0x02,0x01,0x00,0x00,0x04,NANA,NANA,
+			 0x00,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
+			 0xf5,EOT},
+			{0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00,
+			 0x00,EOT}},
+		{0x1, "IDE 1",
+			{0x30,0x60,0x61,0x62,0x63,0x70,EOT},
+			{0x00,0x01,0xf0,0x03,0xf6,0x0e,EOT}},
+		{0x2, "IDE 2",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x3, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x3c,EOT}},
+		{0x4, "COM1",
+			{0x30,0x60,0x61,0x70,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x5, "COM2",
+			{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x6, "Real-time clock (RTC)",
+			{0x30,0x70,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,EOT},
+			{0x00,0x00,0x00,0x00,0x00,NANA,MISC,NANA,NANA,EOT}},
+		{0x7, "Keyboard",
+			{0x30,0x70,0x72,EOT},
+			{0x00,0x00,0x00,EOT}},
+		{0x8, "Aux I/O",
+			{0x30,0x60,0x61,0x62,0x63,0xe0,0xe1,0xe2,0xe3,0xe4,
+			 0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xf0,
+			 0xf1,0xf2,0xf3,0xf4,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,
+			 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,
+			 0x00,0x00,0x00,MISC,EOT}},
+		{EOT}}},
 	{0x03, "FDC37C93xFR", {
 		/* FIXME: There's another 0x03 but found on port 0x0d/0x0e! */
 		{EOT}}},
@@ -109,6 +149,45 @@ static const struct superio_registers reg_table[] = {
 			{0x00,0x00,0x00,EOT}},
 		{EOT}}},
 	{0x0e, "LPC47N252", {	/* From sensors-detect */
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
+			 0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+			{0x0e,NANA,0x00,0x00,0x04,0x04,NANA,NANA,0x00,
+			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf3,0xf4,
+			 0xf5,EOT},
+			{0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,RSVD,0x00,
+			 0x00,EOT}},
+		{0x1, "Power management (PM1)",
+			{0x30,0x60,0x61,EOT},
+			{0x00,0x00,0x00,EOT}},
+		{0x3, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x3c,0x00,EOT}},
+		{0x4, "COM1",
+			{0x30,0x60,0x61,0x70,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x5, "COM2 / IRCC",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,0xf1,
+			 0xf2,0xf7,0xf8,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x02,
+			 0x03,0x00,0x00,EOT}},
+		{0x6, "Real-time clock (RTC)",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,EOT},
+			{0x00,0x00,0x70,0x00,0x74,0x00,0x00,NANA,EOT}},
+		{0x7, "Keyboard",
+			{0x30,0x60,0x61,0x70,0x72,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x8, "Embedded controller (EC)",
+			{0x30,0x60,0x61,EOT},
+			{0x00,0x00,0x62,EOT}},
+		{0x9, "Mailbox Interface",
+			{0x30,0x60,0x61,EOT},
+			{0x00,0x00,0x00,EOT}},
+		{0xa, "LPC/8051 addressable GPIO (LGPIO)",
+			{0x30,0x60,0x61,EOT},
+			{0x00,0x00,0x00,EOT}},
 		{EOT}}},
 	{0x14, "LPC47M172", {
 		{EOT}}},
@@ -237,6 +316,8 @@ static const struct superio_registers reg_table[] = {
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x00,0x00,NANA,NANA,EOT}},
 		{EOT}}},
+	{0x46, "FDC37M602", {	/* Found in Biostar M6TLD. */
+		{EOT}}},
 	{0x47, "FDC37M60x", {	/* TODO: Not yet in sensors-detect */
 		{EOT}}},
 	{0x4c, "FDC37B72x", {
@@ -277,6 +358,8 @@ static const struct superio_registers reg_table[] = {
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x00,0x00,NANA,NANA,EOT}},
 		{EOT}}},
+#if 0
+	/* FIXME: FDC37M81x and MEC1308 have conflicting device IDs */
 	{0x4d, "FDC37M81x", {
 		{NOLDN, NULL,
 			{0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x2b,0x2c,
@@ -309,6 +392,34 @@ static const struct superio_registers reg_table[] = {
 			 NANA,NANA,NANA,NANA,0x00,0x00,0x00,0x00,RSVD,RSVD,
 			 RSVD,RSVD,RSVD,RSVD,EOT}},
 		{EOT}}},
+#endif
+	{0x4d, "MEC1308", {
+		{NOLDN, NULL,
+			{0x02,0x03,0x07,0x17,0x20,0x21,0x22,0x23,0x24,0x25,
+			 0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+			 EOT},
+			{0x00,RSVD,0x00,RSVD,0x4d,0x00,0x00,0x00,0x04,0x04,
+			 MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,
+			 EOT}},
+		{0x1, "PM1",
+			{0x30,0x60,0x61,EOT},
+			{0x00,0x00,0x00,EOT}},
+		{0x4, "COM1",
+			{0x30,0x60,0x61,0x70,EOT},
+			{0x00,0x00,0x00,0x00,EOT}},
+		{0x7, "KBD",
+			{0x30,0x70,0x72,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,EOT}},
+		{0x8, "EC/ACPI",
+			{0x30,0x60,0x61,EOT},
+			{0x00,0x00,0x62,EOT}},
+		{0x9, "Mailbox",
+			{0x30,0x60,0x61,EOT},
+			{0x00,0x00,0x00,EOT}},
+		{0x10, "CIRV",
+			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf3,0xf4,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{EOT}}},
 	{0x51, "LPC47B27x", {
 		{NOLDN, NULL,
 			{0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,
@@ -567,6 +678,37 @@ static const struct superio_registers reg_table[] = {
 	{0x7c, "SCH3112", {
 		{EOT}}},
 	{0x7d, "SCH3114", {
+		{NOLDN, NULL,
+			{0x02,0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,
+			 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+			{0x00,RSVD,0x7D,RSVD,0x00,RSVD,0x44,MISC,0x00,
+			 RSVD,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
+			 0xf5,EOT},
+			{0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00,
+			 0x00,EOT}},
+		{0x3, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x3c,0x00,EOT}},
+		{0x4, "COM1",
+			{0x30,0x60,0x61,0x70,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x5, "COM2",
+			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x02,0x03,EOT}},
+		{0x7, "Keyboard",
+			{0x30,0x70,0x72,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,EOT}},
+		{0xa, "Runtime registers",
+			{0x30,0x60,0x61,0x62,0x63,0xf0,0xf1,0xf2,EOT},
+			{0x00,0x00,0x00,0x00,0x00,NANA,0x00,0x04,EOT}},
+		{0xb, "COM3",
+			{0x30,0x60,0x61,0x70,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0xc, "COM4",
+			{0x30,0x60,0x61,0x70,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,EOT}},
 		{EOT}}},
 	{0x7f, "SCH3116", {
 		{EOT}}},
@@ -702,6 +844,19 @@ static void probe_idregs_smsc_helper(uint16_t port, uint8_t idreg,
 		return;
 	}
 
+	/* Infineon TPM causes false match of FDC37N972 */
+	if (idreg == DEVICE_ID_REG && revreg == DEVICE_REV_REG &&
+	    id == 0x0b && rev == 0x00) {
+		/* Infineon sets config port in 0x27:0x26, but SMSC does not */
+		if (((regval(port, 0x27)<<8)|regval(port, 0x26)) == port) {
+			if (verbose)
+				printf(NOTFOUND "id=0x%02x, rev=0x%02x\n",
+					id, rev);
+			exit_conf_mode_smsc(port);
+			return;
+		}
+	}
+
 	printf("Found %s %s (id=0x%02x, rev=0x%02x) at 0x%x\n",
 	       (id == 0x77 ? "ASUS" : "SMSC"), get_superio_name(reg_table, id),
 	       id, rev, port);