commit b14bf88697950c63fa786cbd70dab3070e464807
author Edward O'Callaghan <eocallaghan@alterapraxis.com> Sat Nov 01 09:14:58 2014 +1100
committer Edward O'Callaghan <eocallaghan@alterapraxis.com> Sat Nov 01 21:27:50 2014 +0100
tree 9eafeeb9e620e430a2f7e3a465e349ac404198f8
parent d2040737a9c3e07fee5392079dea88988ad8c56c

superio/common/conf_mode.c: Introduce 'new' enter/exit keys for SIO's

Super I/O manufactures have found new and innovative ways to enter
and exit out of LDN config in PNP config space.

Change-Id: Id3f5882664f1b2b18b49f32373430cf4b037ad22
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/7308
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Bruce Griffith <Bruce.Griffith@se-eng.com>

src/include/superio/conf_mode.h

diff --git a/src/include/superio/conf_mode.h b/src/include/superio/conf_mode.h
index 9f7e3e6..2aca8c1 100644
--- a/src/include/superio/conf_mode.h
+++ b/src/include/superio/conf_mode.h
@@ -25,13 +25,19 @@
 
 /* Common enter/exit implementations */
 void pnp_enter_conf_mode_55(struct device *dev);
+void pnp_enter_conf_mode_6767(struct device *dev);
+void pnp_enter_conf_mode_7777(struct device *dev);
 void pnp_enter_conf_mode_8787(struct device *dev);
+void pnp_enter_conf_mode_a0a0(struct device *dev);
 void pnp_exit_conf_mode_aa(struct device *dev);
 void pnp_enter_conf_mode_870155aa(struct device *dev);
 void pnp_exit_conf_mode_0202(struct device *dev);
 
 extern const struct pnp_mode_ops pnp_conf_mode_55_aa;
+extern const struct pnp_mode_ops pnp_conf_mode_6767_aa;
+extern const struct pnp_mode_ops pnp_conf_mode_7777_aa;
 extern const struct pnp_mode_ops pnp_conf_mode_8787_aa;
+extern const struct pnp_mode_ops pnp_conf_mode_a0a0_aa;
 extern const struct pnp_mode_ops pnp_conf_mode_870155_aa;
 
 #endif /* DEVICE_PNP_CONF_MODE_H */

src/superio/common/conf_mode.c

diff --git a/src/superio/common/conf_mode.c b/src/superio/common/conf_mode.c
index 271d4ef..92bd7a3 100644
--- a/src/superio/common/conf_mode.c
+++ b/src/superio/common/conf_mode.c
@@ -28,12 +28,30 @@
 	outb(0x55, dev->path.pnp.port);
 }
 
+void pnp_enter_conf_mode_6767(struct device *dev)
+{
+	outb(0x67, dev->path.pnp.port);
+	outb(0x67, dev->path.pnp.port);
+}
+
+void pnp_enter_conf_mode_7777(struct device *dev)
+{
+	outb(0x77, dev->path.pnp.port);
+	outb(0x77, dev->path.pnp.port);
+}
+
 void pnp_enter_conf_mode_8787(struct device *dev)
 {
 	outb(0x87, dev->path.pnp.port);
 	outb(0x87, dev->path.pnp.port);
 }
 
+void pnp_enter_conf_mode_a0a0(struct device *dev)
+{
+	outb(0xa0, dev->path.pnp.port);
+	outb(0xa0, dev->path.pnp.port);
+}
+
 void pnp_exit_conf_mode_aa(struct device *dev)
 {
 	outb(0xaa, dev->path.pnp.port);
@@ -63,11 +81,26 @@
 	.exit_conf_mode  = pnp_exit_conf_mode_aa,
 };
 
+const struct pnp_mode_ops pnp_conf_mode_6767_aa = {
+	.enter_conf_mode = pnp_enter_conf_mode_6767,
+	.exit_conf_mode  = pnp_exit_conf_mode_aa,
+};
+
+const struct pnp_mode_ops pnp_conf_mode_7777_aa = {
+	.enter_conf_mode = pnp_enter_conf_mode_7777,
+	.exit_conf_mode  = pnp_exit_conf_mode_aa,
+};
+
 const struct pnp_mode_ops pnp_conf_mode_8787_aa = {
 	.enter_conf_mode = pnp_enter_conf_mode_8787,
 	.exit_conf_mode  = pnp_exit_conf_mode_aa,
 };
 
+const struct pnp_mode_ops pnp_conf_mode_a0a0_aa = {
+	.enter_conf_mode = pnp_enter_conf_mode_a0a0,
+	.exit_conf_mode  = pnp_exit_conf_mode_aa,
+};
+
 const struct pnp_mode_ops pnp_conf_mode_870155_aa = {
 	.enter_conf_mode = pnp_enter_conf_mode_870155aa,
 	.exit_conf_mode  = pnp_exit_conf_mode_0202,