Add support for the Winbond W83697HF/F and W83627EHF/EF/EHG/EG.

Various minor fixes and improvements (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2789 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 153 insertions, 12 deletions

diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index 44d0316e5a..58cbee9cf1 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -28,7 +28,7 @@ PREFIX  = /usr/local
 CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
          -Werror-implicit-function-declaration -ansi
 
-OBJS = superiotool.o fintek.o ite.o nsc.o smsc.o
+OBJS = superiotool.o fintek.o ite.o nsc.o smsc.o winbond.o
 
 all: $(PROGRAM)
 
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index e042fb7862..f02f846c7f 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -259,8 +259,7 @@ void probe_idregs_ite(uint16_t port)
 	printf("Super I/O found at 0x%02x: id=0x%04x, chipver=0x%01x\n",
 	       port, id, chipver);
 
-	if (dump)
-		dump_ite(port, id);
+	dump_ite(port, id);
 
 	exit_conf_mode_ite(port);
 }
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index acbb4773b0..4d64a9632b 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -52,25 +52,22 @@ static void exit_conf_mode_smsc(uint16_t port)
 
 void probe_idregs_smsc(uint16_t port)
 {
-	uint16_t id, rev;
+	uint8_t id, rev;
 
 	enter_conf_mode_smsc(port);
 
-	/* Read device ID. */
 	id = regval(port, DEVICE_ID_REG);
-	if (id != 0x28) {	/* TODO: Support for other SMSC chips. */
+	rev = regval(port, DEVICE_REV_REG);
+
+	if (superio_unknown(reg_table, id)) {
 		no_superio_found(port);
 		return;
 	}
 
-	/* Read chip revision. */
-	rev = regval(port, DEVICE_REV_REG);
-
-	printf("Found SMSC %s Super I/O (id=0x%02x, rev=0x%02x) at port=0x%04x\n",
+	printf("Found SMSC %s (id=0x%02x, rev=0x%02x) at port=0x%x\n",
 	       get_superio_name(reg_table, id), id, rev, port);
 
-	if (dump)
-		dump_superio("SMSC", reg_table, port, id);
+	dump_superio("SMSC", reg_table, port, id);
 
 	exit_conf_mode_smsc(port);
 }
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index de512486e6..2ff56fb5c0 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -37,6 +37,11 @@ void regwrite(uint16_t port, uint8_t reg, uint8_t val)
 	outb(val, port + 1);
 }
 
+int superio_unknown(const struct superio_registers reg_table[], uint16_t id)
+{
+	return !strncmp(get_superio_name(reg_table, id), "<unknown>", 9);
+}
+
 const char *get_superio_name(const struct superio_registers reg_table[],
 			     uint16_t id)
 {
@@ -61,6 +66,9 @@ void dump_superio(const char *vendor, const struct superio_registers reg_table[]
 	int i, j, k, nodump;
 	int *idx;
 
+	if (!dump)
+		return;
+
 	for (i = 0; /* Nothing */; i++) {
 		if (reg_table[i].superio_id == EOT)
 			break;
@@ -107,6 +115,8 @@ void dump_superio(const char *vendor, const struct superio_registers reg_table[]
 					printf("NA ");
 				else if (idx[k] == RSVD)
 					printf("RR ");
+				else if (idx[k] == MISC)	/* TODO */
+					printf("MM ");
 				else
 					printf("%02x ", idx[k]);
 			}
@@ -166,6 +176,7 @@ int main(int argc, char *argv[])
 
 	if (iopl(3) < 0) {
 		perror("iopl");
+		printf("Superiotool must be run as root.\n");
 		exit(1);
 	}
 
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index bcd8d5c2ff..03592bbca2 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
 #include <getopt.h>
 #include <sys/io.h>
 
@@ -36,6 +37,7 @@
 #define NOLDN		-2		/* NO LDN needed */
 #define NANA		-3		/* Not Available */
 #define RSVD		-4		/* Reserved */
+#define MISC		-5		/* Needs special comment in output */
 #define MAXNAMELEN	20		/* Maximum Name Length */
 #define MAXLDN		0xa		/* Biggest LDN */
 #define LDNSIZE		(MAXLDN + 3)	/* Biggest LDN + 0 + NOLDN + EOT */
@@ -59,6 +61,7 @@ struct superio_registers {
 /* superiotool.c */
 uint8_t regval(uint16_t port, uint8_t reg);
 void regwrite(uint16_t port, uint8_t reg, uint8_t val);
+int superio_unknown(const struct superio_registers reg_table[], uint16_t id);
 const char *get_superio_name(const struct superio_registers reg_table[],
 			     uint16_t id);
 void dump_superio(const char *name, const struct superio_registers reg_table[],
@@ -80,6 +83,9 @@ void probe_idregs_simple(uint16_t port);
 /* smsc.c */
 void probe_idregs_smsc(uint16_t port);
 
+/* winbond.c */
+void probe_idregs_winbond(uint16_t port);
+
 /** Table of which config ports to probe on each Super I/O. */
 const static struct {
 	void (*probe_idregs) (uint16_t port);
@@ -89,6 +95,7 @@ const static struct {
 	{probe_idregs_fintek,	{0x2e,	0x4e,	EOT}},
 	{probe_idregs_ite,	{0x2e,	0x4e,	EOT}},
 	{probe_idregs_smsc,	{0x3f0,	0x370,	EOT}},
+	{probe_idregs_winbond,	{0x2e,	0x4e,	EOT}},
 };
 
 #endif
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
new file mode 100644
index 0000000000..0058c33ee9
--- /dev/null
+++ b/util/superiotool/winbond.c
@@ -0,0 +1,127 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "superiotool.h"
+
+#define DEVICE_ID_REG	0x20
+#define DEVICE_REV_REG	0x21
+
+/**
+ * The ID entries must be in 0xYYZ format, where YY is the device ID,
+ * and Z is bits 7..4 of the device revision register. We do not match
+ * bits 3..0 of the device revision here.
+ */
+const static struct superio_registers reg_table[] = {
+	{0x601, "W83697HF/F", {
+		/*
+		{NOLDN,
+			{0x20,0x21,EOT},
+			{0x60,NANA,EOT}},
+		*/
+		{EOT}}},
+	{0x886, "W83627EHF/EF/EHG/EG", {
+		{NOLDN,
+			{0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
+			 0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+			{0x88,NANA,0xff,0x00,MISC,0x00,MISC,RSVD,0x50,
+			 0x04,0x00,RSVD,0x00,0x21,0x00,0x00,EOT}},
+		{0x0,
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
+			 0xf5,EOT},
+			{0x01,0x03,0xf0,0x06,0x02,0x8e,0x00,0xff,0x00,
+			 0x00,EOT}},
+		{0x1,
+			{0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
+			{0x01,0x03,0x78,0x07,0x04,0x3f,EOT}},
+		{0x2,
+			{0x30,0x60,0x61,0x70,0xf0,EOT},
+			{0x01,0x03,0xf8,0x04,0x00,EOT}},
+		{0x3,
+			{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
+			{0x01,0x02,0xf8,0x03,0x00,0x00,EOT}},
+		{0x5,
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
+			{0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x83,EOT}},
+		{0x6,
+			{0x30,0x62,0x63,EOT},
+			{0x00,0x00,0x00,EOT}},
+		{0x7,
+			{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,
+			{0x30,0xf5,0xf6,0xf7,EOT},
+			{0x00,0x00,0x00,0x00,EOT}},
+		{0x9,
+			{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,
+			{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,
+			{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
+			{0x00,0x00,0x00,0x00,0xc1,0x00,EOT}},
+		{EOT}}},
+	{EOT}
+};
+
+static void enter_conf_mode_winbond(uint16_t port)
+{
+	outb(0x87, port);
+	outb(0x87, port);
+}
+
+static void exit_conf_mode_winbond(uint16_t port)
+{
+	outb(0xaa, port);
+}
+
+void probe_idregs_winbond(uint16_t port)
+{
+	uint16_t id;
+	uint8_t devid, rev;
+
+	enter_conf_mode_winbond(port);
+
+	devid = regval(port, DEVICE_ID_REG);
+	rev = regval(port, DEVICE_REV_REG);
+
+	/* Bits 3..0 of 'rev' form the IC version, we don't match that. */
+	id = (devid << 4) | ((rev & 0xf0) >> 4);
+
+	if (superio_unknown(reg_table, id)) {
+		no_superio_found(port);
+		return;
+	}
+
+	printf("Found Winbond %s (id=0x%02x, rev=0x%02x) at 0x%x\n",
+	       get_superio_name(reg_table, id), devid, rev, port);
+
+	/* TODO: Special notes in dump output for the MISC entries. */
+	dump_superio("Winbond", reg_table, port, id);
+
+	exit_conf_mode_winbond(port);
+}
+