X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fsuperiotool%2Fsmsc.c;h=820be0871f9b843007c67d7b7a4f6a5e038cee89;hb=c55bcdecf70586ba575af403f26f92dbbbc05190;hp=ae141ea815f7f69a49cb720339d57bc4a75d060a;hpb=b64aa60f1fd5e6c84ec8ff6ad0baa7afee0d810a;p=coreboot.git

diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index ae141ea81..820be0871 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}}},
@@ -43,7 +83,7 @@ static const struct superio_registers reg_table[] = {
 			 0xf5,EOT},
 			{0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,RSVD,0x00,
 			 0x00,EOT}},
-		{0x1, "Power Management (PM1)",
+		{0x1, "Power management (PM1)",
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x00,0x00,EOT}},
 		{0x3, "Parallel port",
@@ -63,7 +103,7 @@ static const struct superio_registers reg_table[] = {
 		{0x7, "Keyboard",
 			{0x30,0x60,0x61,0x70,0x72,0xf0,EOT},
 			{0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
-		{0x8, "Embedded Controller (EC)",
+		{0x8, "Embedded controller (EC)",
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x00,0x62,EOT}},
 		{0x9, "Mailbox",
@@ -81,7 +121,7 @@ static const struct superio_registers reg_table[] = {
 			 0xf5,EOT},
 			{0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,RSVD,0x00,
 			 0x00,EOT}},
-		{0x1, "Power Management (PM1)",
+		{0x1, "Power management (PM1)",
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x00,0x00,EOT}},
 		{0x3, "Parallel port",
@@ -101,7 +141,7 @@ static const struct superio_registers reg_table[] = {
 		{0x7, "Keyboard",
 			{0x30,0x60,0x61,0x70,0x72,0xf0,EOT},
 			{0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
-		{0x8, "Embedded Controller (EC)",
+		{0x8, "Embedded controller (EC)",
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x00,0x62,EOT}},
 		{0x9, "Mailbox",
@@ -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,
@@ -347,6 +458,37 @@ static const struct superio_registers reg_table[] = {
 	{0x52, "LPC47B37x", {
 		{EOT}}},
 	{0x54, "LPC47U33x", {
+		{NOLDN, NULL,
+			{0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x2a,0x2b,
+			 0x2c,0x2d,0x2e,0x2f,EOT},
+			{RSVD,0x54,NANA,0x00,0x00,0x04,MISC,MISC,NANA,NANA,
+			 NANA,NANA,NANA,NANA,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, "MIDI port (MPU-401)",
+			{0x30,0x60,0x61,0x70,EOT},
+			{0x00,0x03,0x30,0x05,EOT}},
+		{0x7, "Keyboard",
+			{0x30,0x70,0x72,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,EOT}},
+		{0x9, "Game port",
+			{0x30,0x60,0x61,EOT},
+			{0x00,0x00,0x00,EOT}},
+		{0xa, "Runtime registers",
+			{0x30,0x60,0x61,0xf0,0xf1,EOT},
+			{0x00,0x00,0x00,NANA,NANA,EOT}},
+		{0xb, "SMBus",
+			{0x30,0x60,0x61,0x70,EOT},
+			{0x00,0x00,0x00,0x00,EOT}},
 		{EOT}}},
 	{0x56, "LPC47B34x", {
 		{EOT}}},
@@ -380,7 +522,7 @@ static const struct superio_registers reg_table[] = {
 		{0x9, "Game port",
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x00,0x00,EOT}},
-		{0xa, "Power Management Events (PME)",
+		{0xa, "Power management events (PME)",
 			{0x30,0x60,0x61,0xf0,0xf1,EOT},
 			{0x00,0x00,0x00,NANA,RSVD,EOT}},
 		{0xb, "MPU-401",
@@ -417,7 +559,7 @@ static const struct superio_registers reg_table[] = {
 		{0x9, "Game port",
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x00,0x00,EOT}},
-		{0xa, "Power Management Events (PME)",
+		{0xa, "Power management events (PME)",
 			{0x30,0x60,0x61,0xf0,EOT},
 			{0x00,0x00,0x00,NANA,EOT}},
 		{0xb, "MPU-401",
@@ -437,7 +579,41 @@ static const struct superio_registers reg_table[] = {
 		{EOT}}},
 	{0x6f, "LPC47B397", {
 		{EOT}}},
-	{0x74, "LPC47M182", {
+	{0x74, "LPC47M182", { /* Only for LD_NUM = 0 */
+		{NOLDN, NULL,
+			{0x02,0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,
+			 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+			{0x00,RSVD,0x74,RSVD,0x00,RSVD,0x44,MISC,0x00,
+			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
+			 0xf8,EOT},
+			{0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00,
+			 0x24,EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf8,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x3c,0x00,0x08,EOT}},
+		{0x2, "COM2",
+			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x02,0x03,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x4, "Power control",
+			{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
+			{0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,EOT},
+			{0x00,0x00,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x70,0xf0,EOT},
+			{0x00,0x00,0x00,EOT}},
+		{0x7, "GPIO",
+			{0x30,0x60,0x61,0x70,0x72,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0xa, "Runtime registers",
+			{0x30,0x60,0x61,0x62,0x63,0xf0,0xf1,0xf2,EOT},
+			{0x00,0x00,0x00,0x00,0x00,NANA,RSVD,0x04,EOT}},
 		{EOT}}},
 	{0x76, "LPC47M584", {	/* From sensors-detect (no datasheet) */
 		{EOT}}},
@@ -497,10 +673,8 @@ static const struct superio_registers reg_table[] = {
 		{EOT}}},
 	{0x79, "SCH5504", {	/* From sensors-detect (no datasheet) */
 		{EOT}}},
-#if 0
-	{0x7a, "Unknown", {	/* Found in Toshiba Satellite A80-117. */
+	{0x7a, "LPC47N217", {	/* Found in Toshiba Satellite A80-117. */
 		{EOT}}},
-#endif
 	{0x7c, "SCH3112", {
 		{EOT}}},
 	{0x7d, "SCH3114", {
@@ -621,6 +795,7 @@ static void probe_idregs_smsc_helper(uint16_t port, uint8_t idreg,
 				     uint8_t revreg)
 {
 	uint8_t id, rev;
+	uint16_t runtime_base;
 	const char *info = (idreg == 0x20) ? "(idregs=0x20/0x21) "
 					   : "(idregs=0x0d/0x0e) ";
 
@@ -643,7 +818,22 @@ static void probe_idregs_smsc_helper(uint16_t port, uint8_t idreg,
 	       id, rev, port);
 	chip_found = 1;
 
-	dump_superio((id == 0x77 ? "ASUS" : "SMSC"), reg_table, port, id);
+	dump_superio((id == 0x77 ? "ASUS" : "SMSC"), reg_table, port, id,
+		     LDN_SEL);
+
+	if (extra_dump) {
+		switch (id) {
+		case 0x5a: /* LPC47N227 */
+			runtime_base = regval(port, 0x30) << 4;
+			if (runtime_base)
+				dump_io(runtime_base, 16);
+			else
+				printf("Runtime Register Block not mapped on this Super I/O.\n");
+			break;
+		default:
+			printf("No extra registers known for this chip.\n");
+		}
+	}
 
 	exit_conf_mode_smsc(port);
 }
@@ -657,4 +847,5 @@ void probe_idregs_smsc(uint16_t port)
 void print_smsc_chips(void)
 {
 	print_vendor_chips("SMSC", reg_table);
+	printf("SMSC LPC47N227 runtime register block\n\n");
 }