[PATCH] Superiotool: Add VT82C686

[Carl-Daniel Hailfinger]

Add VIA VT82C686A/VT82C686B support to superiotool.
The patch as-is will likely not detect the Super I/O due to missing PCI
functionality in superiotool, but you might get lucky.

This adds an additional requirement to superiotool: libpci. I have made
the PCI code conditional on PCI_SUPPORT for now.

Signed-off-by: Carl-Daniel Hailfinger

Index: superiotool-vt82c686/via.c
===================================================================
--- superiotool-vt82c686/via.c	(Revision 0)
+++ superiotool-vt82c686/via.c	(Revision 0)
@@ -0,0 +1,112 @@
+/*
+ * This file is part of the superiotool project.
+ *
+ * Copyright (C) 2009 Carl-Daniel Hailfinger
+ *
+ * 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"
+#ifdef PCI_SUPPORT
+#include <pci/pci.h>
+#endif
+
+#define DEVICE_ID_VT82C686_REG	0xe0
+
+#define DEVICE_REV_VT82C686_REG	0xe1
+
+static const struct superio_registers reg_table[] = {
+	{0x3c, "VT82C686A/VT82C686B", {
+		{EOT}}},
+	{EOT}
+};
+
+#ifdef PCI_SUPPORT
+static uint8_t vt82c686_conf = 0;
+#endif
+
+static int enter_conf_mode_via_vt82c686(void)
+{
+#ifdef PCI_SUPPORT
+	struct pci_dev *dev;
+
+	dev = pci_dev_find(0x1106, 0x0686);
+	if (!dev) {
+		if (verbose)
+			printf("Associated PCI device not found.\n");
+		return 1;
+	}
+	vt82c686_conf = pci_read_byte(dev, 0x85);
+	if (verbose)
+		printf("Super I/O %sabled, Super I/O configuration %sabled",
+		       (vt82c686_conf & (1 << 0)) ? "en" : "dis",
+		       (vt82c686_conf & (1 << 1)) ? "en" : "dis");
+	/* If Super I/O is not enabled, skip it. */
+	if (!(vt82c686_conf & (1 << 0)))
+		return 1;
+	/* Enable Super I/O configuration mode. */
+	pci_write_byte(dev, 0x85, vt82c686_conf | (1 << 1));
+#endif
+	return 0;
+}
+
+static void exit_conf_mode_via_vt82c686(void)
+{
+#ifdef PCI_SUPPORT
+	struct pci_dev *dev;
+
+	dev = pci_dev_find(0x1106, 0x0686);
+	if (!dev) {
+		printf("Bug: PCI device 0x%04x:0x%04x not found during "
+		       "shutdown. Please report to [e-mail]\n");
+		return;
+	}
+	/* Restore (disable?) Super I/O configuration mode setting. */
+	pci_write_byte(dev, 0x85, vt82c686_conf);
+#endif
+}
+
+void probe_idregs_via(uint16_t port)
+{
+	uint16_t id;
+	uint8_t rev;
+
+	probing_for("VIA", "", port);
+
+	if (enter_conf_mode_via_vt82c686())
+		return;
+
+	id = regval(port, DEVICE_ID_VT82C686_REG);
+
+	rev = regval(port, DEVICE_REV_VT82C686_REG);
+
+	if (superio_unknown(reg_table, id)) {
+		if (verbose)
+			printf(NOTFOUND "id=0x%04x, rev=0x%02x\n", id, rev);
+		exit_conf_mode_via_vt82c686();
+		return;
+	}
+
+	printf("Found VIA %s (id=0x%04x, rev=0x%02x) at 0x%x\n",
+	       get_superio_name(reg_table, id), id, rev, port);
+	chip_found = 1;
+
+	exit_conf_mode_via_vt82c686();
+}
+
+void print_via_chips(void)
+{
+	print_vendor_chips("VIA", reg_table);
+}
Index: superiotool-vt82c686/superiotool.h
===================================================================
--- superiotool-vt82c686/superiotool.h	(Revision 4988)
+++ superiotool-vt82c686/superiotool.h	(Arbeitskopie)
@@ -141,6 +141,10 @@
 void probe_idregs_winbond(uint16_t port);
 void print_winbond_chips(void);

+/* via.c */
+void probe_idregs_via(uint16_t port);
+void print_via_chips(void);
+
 /** Table of which config ports to probe for each Super I/O family. */
 static const struct {
    void (*probe_idregs) (uint16_t port);
@@ -153,6 +157,7 @@
    {probe_idregs_nsc,	{0x2e, 0x4e, 0x15c, EOT}},
    {probe_idregs_smsc,	{0x2e, 0x4e, 0x162e, 0x164e, 0x3f0, 0x370, EOT}},
    {probe_idregs_winbond,	{0x2e, 0x4e, 0x3f0, 0x370, 0x250, EOT}},
+	{probe_idregs_via,	{0x3f0, EOT}},
 };

/** Table of functions to print out supported Super I/O chips. */
@@ -165,6 +170,7 @@
    {print_nsc_chips},
    {print_smsc_chips},
    {print_winbond_chips},
+	{print_via_chips},
 };

#endif
Index: superiotool-vt82c686/Makefile
===================================================================
--- superiotool-vt82c686/Makefile	(Revision 4988)
+++ superiotool-vt82c686/Makefile	(Arbeitskopie)
@@ -32,7 +32,7 @@
 CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
          -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)

-OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
+OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o via.o

OS_ARCH = $(shell uname)
 ifeq ($(OS_ARCH), Darwin)