From 85b2ab2f9de4eaeb971e79499a457b056b06c505 Mon Sep 17 00:00:00 2001 From: cognet Date: Thu, 29 May 2014 21:00:06 +0000 Subject: [PATCH] In uart_bus_grab(), use the ier_mask instead of a custom hack for XScale. Suggested by: jmg --- sys/dev/uart/uart_dev_ns8250.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index 106f89f0fe7c..773cb442c897 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -930,6 +930,7 @@ ns8250_bus_grab(struct uart_softc *sc) { struct uart_bas *bas = &sc->sc_bas; struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; + u_char ier; /* * turn off all interrupts to enter polling mode. Leave the @@ -937,11 +938,8 @@ ns8250_bus_grab(struct uart_softc *sc) * All pending interupt signals are reset when IER is set to 0. */ uart_lock(sc->sc_hwmtx); - /* - * 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); + ier = uart_getreg(bas, REG_IER); + uart_setreg(bas, REG_IER, ier & ns8250->ier_mask); uart_barrier(bas); uart_unlock(sc->sc_hwmtx); }