From b14bf88697950c63fa786cbd70dab3070e464807 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sat, 1 Nov 2014 09:14:58 +1100 Subject: 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 Reviewed-on: http://review.coreboot.org/7308 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Bruce Griffith --- src/include/superio/conf_mode.h | 6 ++++++ src/superio/common/conf_mode.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/include/superio/conf_mode.h b/src/include/superio/conf_mode.h index 9f7e3e619a..2aca8c1472 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 */ diff --git a/src/superio/common/conf_mode.c b/src/superio/common/conf_mode.c index 271d4ef613..92bd7a3691 100644 --- a/src/superio/common/conf_mode.c +++ b/src/superio/common/conf_mode.c @@ -28,12 +28,30 @@ void pnp_enter_conf_mode_55(struct device *dev) 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 @@ const struct pnp_mode_ops pnp_conf_mode_55_aa = { .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, -- cgit v1.2.3