diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2012-08-25 17:40:35 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2012-08-25 17:40:35 +0000 |
| commit | 65194e1f16521034e23b4c3f62caab6dd95e6592 (patch) | |
| tree | 8984cb6988c261a38643b149b479c8789c6e93e1 | |
| parent | 707d9594b94b06c184f62a075da3413fa7079180 (diff) | |
Turns out the v445 isn't happy at all if we touch the registers that deal
with sleep mode. So skip the wakeup code as well if we are a serial console.
The port on the v445 almost certainly isn't a real st16650 and probably
doesn't implement sleep mode (perhaps someone cut the soft core down a bit
too much?). But it is indistinguishable from it, so we have to deal with it.
ok deraadt@
| -rw-r--r-- | sys/dev/ic/com.c | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 63c863c63bd..f394c970007 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.150 2012/08/19 18:38:12 kettenis Exp $ */ +/* $OpenBSD: com.c,v 1.151 2012/08/25 17:40:34 kettenis Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -329,21 +329,23 @@ comopen(dev_t dev, int flag, int mode, struct proc *p) /* * Wake up the sleepy heads. */ - switch (sc->sc_uarttype) { - case COM_UART_ST16650: - case COM_UART_ST16650V2: - bus_space_write_1(iot, ioh, com_lcr, LCR_EFR); - bus_space_write_1(iot, ioh, com_efr, EFR_ECB); - bus_space_write_1(iot, ioh, com_ier, 0); - bus_space_write_1(iot, ioh, com_efr, 0); - bus_space_write_1(iot, ioh, com_lcr, 0); - break; - case COM_UART_TI16750: - bus_space_write_1(iot, ioh, com_ier, 0); - break; - case COM_UART_PXA2X0: - bus_space_write_1(iot, ioh, com_ier, IER_EUART); - break; + if (!ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) { + switch (sc->sc_uarttype) { + case COM_UART_ST16650: + case COM_UART_ST16650V2: + bus_space_write_1(iot, ioh, com_lcr, LCR_EFR); + bus_space_write_1(iot, ioh, com_efr, EFR_ECB); + bus_space_write_1(iot, ioh, com_ier, 0); + bus_space_write_1(iot, ioh, com_efr, 0); + bus_space_write_1(iot, ioh, com_lcr, 0); + break; + case COM_UART_TI16750: + bus_space_write_1(iot, ioh, com_ier, 0); + break; + case COM_UART_PXA2X0: + bus_space_write_1(iot, ioh, com_ier, IER_EUART); + break; + } } if (ISSET(sc->sc_hwflags, COM_HW_FIFO)) { @@ -584,21 +586,23 @@ com_resume(struct com_softc *sc) /* * Wake up the sleepy heads. */ - switch (sc->sc_uarttype) { - case COM_UART_ST16650: - case COM_UART_ST16650V2: - bus_space_write_1(iot, ioh, com_lcr, LCR_EFR); - bus_space_write_1(iot, ioh, com_efr, EFR_ECB); - bus_space_write_1(iot, ioh, com_ier, 0); - bus_space_write_1(iot, ioh, com_efr, 0); - bus_space_write_1(iot, ioh, com_lcr, 0); - break; - case COM_UART_TI16750: - bus_space_write_1(iot, ioh, com_ier, 0); - break; - case COM_UART_PXA2X0: - bus_space_write_1(iot, ioh, com_ier, IER_EUART); - break; + if (!ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) { + switch (sc->sc_uarttype) { + case COM_UART_ST16650: + case COM_UART_ST16650V2: + bus_space_write_1(iot, ioh, com_lcr, LCR_EFR); + bus_space_write_1(iot, ioh, com_efr, EFR_ECB); + bus_space_write_1(iot, ioh, com_ier, 0); + bus_space_write_1(iot, ioh, com_efr, 0); + bus_space_write_1(iot, ioh, com_lcr, 0); + break; + case COM_UART_TI16750: + bus_space_write_1(iot, ioh, com_ier, 0); + break; + case COM_UART_PXA2X0: + bus_space_write_1(iot, ioh, com_ier, IER_EUART); + break; + } } ospeed = comspeed(sc->sc_frequency, tp->t_ospeed); |