summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2010-01-24 01:47:58 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2010-01-24 01:47:58 +0000
commit622fb793e543eeb1f66bb60b56d43b6ba1cb3f4c (patch)
tree39d2e173b1889253896b7d8435b831d1338bab9f
parentbb38f3213b6889db9fcdab79086bb860f3a32547 (diff)
downloadcoreboot-622fb793e543eeb1f66bb60b56d43b6ba1cb3f4c.tar.gz
coreboot-622fb793e543eeb1f66bb60b56d43b6ba1cb3f4c.tar.bz2
coreboot-622fb793e543eeb1f66bb60b56d43b6ba1cb3f4c.zip
Add missing files from the last commit (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@5048 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--util/superiotool/pci.c39
-rw-r--r--util/superiotool/via.c106
2 files changed, 145 insertions, 0 deletions
diff --git a/util/superiotool/pci.c b/util/superiotool/pci.c
new file mode 100644
index 000000000000..0548bc7ce072
--- /dev/null
+++ b/util/superiotool/pci.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the superiotool project.
+ *
+ * Copyright (C) 2010 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"
+
+struct pci_access *pacc;
+
+struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device)
+{
+ struct pci_dev *temp;
+ struct pci_filter filter;
+
+ pci_filter_init(NULL, &filter);
+ filter.vendor = vendor;
+ filter.device = device;
+
+ for (temp = pacc->devices; temp; temp = temp->next)
+ if (pci_filter_match(&filter, temp))
+ return temp;
+
+ return NULL;
+}
diff --git a/util/superiotool/via.c b/util/superiotool/via.c
new file mode 100644
index 000000000000..604c41a14b69
--- /dev/null
+++ b/util/superiotool/via.c
@@ -0,0 +1,106 @@
+/*
+ * 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"
+
+#define DEVICE_ID_VT82C686_REG 0xe0
+#define DEVICE_REV_VT82C686_REG 0xe1
+
+static const struct superio_registers reg_table[] = {
+ {0x3c, "VT82C686A/VT82C686B", {
+ {EOT}}},
+ {EOT}
+};
+
+static uint8_t vt82c686_conf = 0;
+
+static int enter_conf_mode_via_vt82c686(void)
+{
+ struct pci_dev *dev;
+
+ dev = pci_dev_find(0x1106, 0x0686);
+ if (!dev) {
+ if (verbose)
+ printf(" PCI device 1106:0686 not found.\n");
+ return 1;
+ }
+
+ vt82c686_conf = pci_read_byte(dev, 0x85);
+ if (verbose)
+ printf(" Super I/O %sabled, Super I/O configuration %sabled\n",
+ (vt82c686_conf & (1 << 0)) ? "en" : "dis",
+ (vt82c686_conf & (1 << 1)) ? "en" : "dis");
+
+ /* If the 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));
+
+ return 0;
+}
+
+static void exit_conf_mode_via_vt82c686(void)
+{
+ struct pci_dev *dev;
+
+ dev = pci_dev_find(0x1106, 0x0686);
+ if (!dev) {
+ printf("Bug: PCI device 1106:0686 not found during shutdown.\n"
+ "Please report to coreboot@coreboot.org.\n");
+ return;
+ }
+
+ /* Restore (disable?) Super I/O configuration mode setting. */
+ pci_write_byte(dev, 0x85, vt82c686_conf);
+}
+
+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);
+}