From 0a372281edd2d6ac49eb2b883e35bc4c903d4117 Mon Sep 17 00:00:00 2001 From: cognet Date: Thu, 29 May 2014 19:57:51 +0000 Subject: In the grab function, keep the bit 6 on in the IER, on XScale, using 0 turns the UART off, which is unfortunate if one want to use it as a console. --- sys/dev/uart/uart_dev_ns8250.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sys/dev/uart') diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index 47a61bf..106f89f 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -929,6 +929,7 @@ void ns8250_bus_grab(struct uart_softc *sc) { struct uart_bas *bas = &sc->sc_bas; + struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; /* * turn off all interrupts to enter polling mode. Leave the @@ -936,7 +937,11 @@ ns8250_bus_grab(struct uart_softc *sc) * All pending interupt signals are reset when IER is set to 0. */ uart_lock(sc->sc_hwmtx); - uart_setreg(bas, REG_IER, 0); + /* + * On XScale, bit 6 (0x40) is the UART Unit Enable, removing it + * turns the UART completely off, so make sure it is stays there. + */ + uart_setreg(bas, REG_IER, ns8250->ier & 0x40); uart_barrier(bas); uart_unlock(sc->sc_hwmtx); } -- cgit v1.1