d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the grab function, keep the bit 6 on in the IER, on XScale, using 0

Browse Source 
turns the UART off, which is unfortunate if one want to use it as a console.
This commit is contained in:
Olivier Houchard 2014-05-29 19:57:51 +00:00
parent 583d27945d
commit caf6d6b491
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/uart/uart_dev_ns8250.c
View File

@ -929,6 +929,7 @@ void
ns8250_bus_grab(struct uart_softc *sc) ns8250_bus_grab(struct uart_softc *sc)
{ {
struct uart_bas *bas = &sc->sc_bas; 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 * 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. * All pending interupt signals are reset when IER is set to 0.
*/ */
uart_lock(sc->sc_hwmtx); 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_barrier(bas);
uart_unlock(sc->sc_hwmtx); uart_unlock(sc->sc_hwmtx);
} }