30 Oct
2008
30 Oct
'08
7:53 a.m.
Add support for W83977EF Super-IO chip. This is based on w83977tf code and on earlier support for this chip in superiotool.
Signed-off-by: Andriy Gapon avg@icyb.net.ua
---
As trivial change as it was I still managed to make a couple of mistakes (not all files renamed, one old resource line not removed). Now this is compile tested with slightly modified msi/ms6147.
on 28/10/2008 23:16 Andriy Gapon said the following:
Add (basic) support for W83977EF Super-IO chip. This is based on w83977tf code and on earlier support for this chip in superiotool.
Signed-off-by: Andriy Gapon avg@icyb.net.ua
This was done by copy'n'paste of w83977tf, substitution of w83977tf with w83977ef, and then some chip-specific changes in the list of logical devices in w83977tf.h and their resources in superio.c:pnp_dev_info.
The code was not tested yet on real hardware (and there is no mobo in the src to use it yet), but I believe that it should work - based on triviality of the changes and hardware specs.
As my changes were fairly minimal I left all copyrights as they were in w83977tf code.
--
Andriy Gapon
Index: src/superio/winbond/w83977ef/w83977ef_early_serial.c
===================================================================
--- src/superio/winbond/w83977ef/w83977ef_early_serial.c (revision 0)
+++ src/superio/winbond/w83977ef/w83977ef_early_serial.c (revision 0)
@@ -0,0 +1,25 @@
+#include <arch/romcc_io.h>
+#include "w83977ef.h"
+
+static inline void pnp_enter_ext_func_mode(device_t dev)
+{
+ unsigned int port = dev >> 8;
+ outb(0x87, port);
+ outb(0x87, port);
+}
+
+static void pnp_exit_ext_func_mode(device_t dev)
+{
+ unsigned int port = dev >> 8;
+ outb(0xaa, port);
+}
+
+static void w83977ef_enable_serial(device_t dev, unsigned int iobase)
+{
+ pnp_enter_ext_func_mode(dev);
+ pnp_set_logical_device(dev);
+ pnp_set_enable(dev, 0);
+ pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
+ pnp_set_enable(dev, 1);
+ pnp_exit_ext_func_mode(dev);
+}
Index: src/superio/winbond/w83977ef/Config.lb
===================================================================
--- src/superio/winbond/w83977ef/Config.lb (revision 0)
+++ src/superio/winbond/w83977ef/Config.lb (revision 0)
@@ -0,0 +1,2 @@
+config chip.h
+object superio.o
Index: src/superio/winbond/w83977ef/superio.c
===================================================================
--- src/superio/winbond/w83977ef/superio.c (revision 0)
+++ src/superio/winbond/w83977ef/superio.c (revision 0)
@@ -0,0 +1,117 @@
+/* Copyright 2000 AG Electronics Ltd. */
+/* Copyright 2003-2004 Linux Networx */
+/* Copyright 2004 Tyan
+ By LYH change from PC87360 */
+/* This code is distributed without warranty under the GPL v2 (see COPYING) */
+
+/* 2006-4-24
+ * Adapted for the w83977 by rsmith smithbone@gmail.com
+ * This is mostly just a search and replace on the part type
+ * TODO: Actually see if all the sub functionis exist and are
+ * setup correctly.
+ */
+
+#include <arch/io.h>
+#include <device/device.h>
+#include <device/pnp.h>
+#include <console/console.h>
+#include <string.h>
+#include <bitops.h>
+#include <uart8250.h>
+#include <pc80/keyboard.h>
+#include <stdlib.h>
+#include "chip.h"
+#include "w83977ef.h"
+
+static void w83977ef_enter_ext_func_mode(device_t dev)
+{
+ outb(0x87, dev->path.u.pnp.port);
+ outb(0x87, dev->path.u.pnp.port);
+}
+static void w83977ef_exit_ext_func_mode(device_t dev)
+{
+ outb(0xaa, dev->path.u.pnp.port);
+}
+
+static void w83977ef_init(device_t dev)
+{
+ struct superio_winbond_w83977ef_config *conf;
+ struct resource *res0, *res1;
+ /* Wishlist handle well known programming interfaces more
+ * generically.
+ */
+ if (!dev->enabled) {
+ return;
+ }
+ conf = dev->chip_info;
+ switch(dev->path.u.pnp.device) {
+ case W83977EF_SP1:
+ res0 = find_resource(dev, PNP_IDX_IO0);
+ init_uart8250(res0->base, &conf->com1);
+ break;
+ case W83977EF_SP2:
+ res0 = find_resource(dev, PNP_IDX_IO0);
+ init_uart8250(res0->base, &conf->com2);
+ break;
+ case W83977EF_KBC:
+ res0 = find_resource(dev, PNP_IDX_IO0);
+ res1 = find_resource(dev, PNP_IDX_IO1);
+ init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
+ break;
+ }
+}
+
+static void w83977ef_set_resources(device_t dev)
+{
+ w83977ef_enter_ext_func_mode(dev);
+ pnp_set_resources(dev);
+ w83977ef_exit_ext_func_mode(dev);
+}
+
+static void w83977ef_enable_resources(device_t dev)
+{
+ w83977ef_enter_ext_func_mode(dev);
+ pnp_enable_resources(dev);
+ w83977ef_exit_ext_func_mode(dev);
+}
+
+static void w83977ef_enable(device_t dev)
+{
+ w83977ef_enter_ext_func_mode(dev);
+ pnp_enable(dev);
+ w83977ef_exit_ext_func_mode(dev);
+}
+
+
+static struct device_operations ops = {
+ .read_resources = pnp_read_resources,
+ .set_resources = w83977ef_set_resources,
+ .enable_resources = w83977ef_enable_resources,
+ .enable = w83977ef_enable,
+ .init = w83977ef_init,
+};
+
+static struct pnp_info pnp_dev_info[] = {
+ { &ops, W83977EF_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
+ { &ops, W83977EF_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
+ { &ops, W83977EF_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+ { &ops, W83977EF_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+ // No 4 { 0,},
+ { &ops, W83977EF_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0}, },
+ // No 6 { 0,},
+ { &ops, W83977EF_GPIO1,PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, {0x7ff, 0}, { 0x7ff, 0 }, },
+ { &ops, W83977EF_GPIO2,PNP_IO0 | PNP_IRQ0 | PNP_IRQ1, { 0x7fe, 0 }, },
+ // No 9 { 0,},
+ { &ops, W83977EF_ACPI, PNP_IRQ0, },
+};
+
+static void enable_dev(device_t dev)
+{
+ pnp_enable_devices(dev, &ops,
+ ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+}
+
+struct chip_operations superio_winbond_w83977ef_ops = {
+ CHIP_NAME("Winbond W83977EF Super I/O")
+ .enable_dev = enable_dev,
+};
Index: src/superio/winbond/w83977ef/chip.h
===================================================================
--- src/superio/winbond/w83977ef/chip.h (revision 0)
+++ src/superio/winbond/w83977ef/chip.h (revision 0)
@@ -0,0 +1,9 @@
+#include <pc80/keyboard.h>
+#include <uart8250.h>
+
+extern struct chip_operations superio_winbond_w83977ef_ops;
+
+struct superio_winbond_w83977ef_config {
+ struct uart8250 com1, com2;
+ struct pc_keyboard keyboard;
+};
Index: src/superio/winbond/w83977ef/w83977ef.h
===================================================================
--- src/superio/winbond/w83977ef/w83977ef.h (revision 0)
+++ src/superio/winbond/w83977ef/w83977ef.h (revision 0)
@@ -0,0 +1,9 @@
+#define W83977EF_FDC 0 /* Floppy */
+#define W83977EF_PP 1 /* Parallel Port */
+#define W83977EF_SP1 2 /* Com1 */
+#define W83977EF_SP2 3 /* Com2 */
+#define W83977EF_KBC 5 /* Keyboard & Mouse */
+#define W83977EF_GPIO1 7
+#define W83977EF_GPIO2 8
+#define W83977EF_ACPI 10
+