 @@ -1,14 +1,14 @@
-/* $NetBSD: com.c,v 1.335 2015/05/04 20:25:48 macallan Exp $ */
+/* $NetBSD: com.c,v 1.336 2015/05/04 22:59:36 jmcneill Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -56,27 +56,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)com.c	7.5 (Berkeley) 5/16/91
  */
 /*
  * COM driver, uses National Semiconductor NS16450/NS16550AF UART
  * Supports automatic hardware flow control on StarTech ST16C650A UART
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.335 2015/05/04 20:25:48 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.336 2015/05/04 22:59:36 jmcneill Exp $");
 #include "opt_com.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_ntp.h"
 /* The COM16650 option was renamed to COM_16650. */
 #ifdef COM16650
 #error Obsolete COM16650 option; use COM_16650 instead.
 #endif
 @@ -370,27 +370,28 @@ comprobe1(bus_space_tag_t iot, bus_space
 /*
  * No locking in this routine; it is only called during attach,
  * or with the port already locked.
  */
 static void
 com_enable_debugport(struct com_softc *sc)
+{
 	/* Turn on line break interrupt, set carrier. */
 	sc->sc_ier = IER_ERXRDY;
 	if (sc->sc_type == COM_TYPE_PXA2x0)
 		sc->sc_ier |= IER_EUART | IER_ERXTOUT;
-	if (sc->sc_type == COM_TYPE_INGENIC)
+	if (sc->sc_type == COM_TYPE_INGENIC ||
 	    sc->sc_type == COM_TYPE_TEGRA)
 		sc->sc_ier |= IER_ERXTOUT;
 	CSR_WRITE_1(&sc->sc_regs, COM_REG_IER, sc->sc_ier);
 	SET(sc->sc_mcr, MCR_DTR | MCR_RTS);
 	CSR_WRITE_1(&sc->sc_regs, COM_REG_MCR, sc->sc_mcr);
+}
 void
 com_attach_subr(struct com_softc *sc)
+{
 	struct com_regs *regsp = &sc->sc_regs;
 	struct tty *tp;
 #if defined(COM_16650) || defined(COM_16750)
 	u_int8_t lcr;
 @@ -456,31 +457,26 @@ com_attach_subr(struct com_softc *sc)
 	case COM_TYPE_OMAP:
 		sc->sc_fifolen = 64;
 		fifo_msg = "OMAP UART, working fifo";
 		SET(sc->sc_hwflags, COM_HW_FIFO);
 		goto fifodelay;
 	case COM_TYPE_INGENIC:
 		sc->sc_fifolen = 16;
 		fifo_msg = "Ingenic UART, working fifo";
 		SET(sc->sc_hwflags, COM_HW_FIFO);
 		SET(sc->sc_hwflags, COM_HW_NOIEN);
 		goto fifodelay;
 	case COM_TYPE_TEGRA:
 		sc->sc_fifolen = 1;
 		fifo_msg = "Tegra UART, broken fifo";
 		goto fifodelay;
+	}
 	sc->sc_fifolen = 1;
 	/* look for a NS 16550AF UART with FIFOs */
 	if (sc->sc_type == COM_TYPE_INGENIC) {
 		CSR_WRITE_1(regsp, COM_REG_FIFO,
 		    FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST |
 		    FIFO_TRIGGER_14 | FIFO_UART_ON);
 	} else
 		CSR_WRITE_1(regsp, COM_REG_FIFO,
 		    FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_14);
 	delay(100);
 	if (ISSET(CSR_READ_1(regsp, COM_REG_IIR), IIR_FIFO_MASK)
 @@ -808,27 +804,28 @@ com_shutdown(struct com_softc *sc)
 	 */
 	if (ISSET(tp->t_cflag, HUPCL)) {
 		com_modem(sc, 0);
 		mutex_spin_exit(&sc->sc_lock);
 		/* XXX will only timeout */
 		(void) kpause(ttclos, false, hz, NULL);
 		mutex_spin_enter(&sc->sc_lock);
+	}
 	/* Turn off interrupts. */
 	if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
 		sc->sc_ier = IER_ERXRDY; /* interrupt on break */
 		if ((sc->sc_type == COM_TYPE_PXA2x0) ||
-		    (sc->sc_type == COM_TYPE_INGENIC))
+		    (sc->sc_type == COM_TYPE_INGENIC) ||
 		    (sc->sc_type == COM_TYPE_TEGRA))
 			sc->sc_ier |= IER_ERXTOUT;
 	} else
 		sc->sc_ier = 0;
 	if (sc->sc_type == COM_TYPE_PXA2x0)
 		sc->sc_ier |= IER_EUART;
 	CSR_WRITE_1(&sc->sc_regs, COM_REG_IER, sc->sc_ier);
 	mutex_spin_exit(&sc->sc_lock);
 	if (sc->disable) {
 #ifdef DIAGNOSTIC
 @@ -890,27 +887,28 @@ comopen(dev_t dev, int flag, int mode, s
 			sc->enabled = 1;
 			com_config(sc);
 		} else {
 			mutex_spin_enter(&sc->sc_lock);
+		}
 		/* Turn on interrupts. */
 		sc->sc_ier = IER_ERXRDY | IER_ERLS;
 		if (!ISSET(tp->t_cflag, CLOCAL))
 			sc->sc_ier |= IER_EMSC;
 		if (sc->sc_type == COM_TYPE_PXA2x0)
 			sc->sc_ier |= IER_EUART | IER_ERXTOUT;
-		else if (sc->sc_type == COM_TYPE_INGENIC)
+		else if (sc->sc_type == COM_TYPE_INGENIC ||
 			 sc->sc_type == COM_TYPE_TEGRA)
 			sc->sc_ier |= IER_ERXTOUT;
 		CSR_WRITE_1(&sc->sc_regs, COM_REG_IER, sc->sc_ier);
 		/* Fetch the current modem control status, needed later. */
 		sc->sc_msr = CSR_READ_1(&sc->sc_regs, COM_REG_MSR);
 		/* Clear PPS capture state on first open. */
 		mutex_spin_enter(&timecounter_lock);
 		memset(&sc->sc_pps_state, 0, sizeof(sc->sc_pps_state));
 		sc->sc_pps_state.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR;
 		pps_init(&sc->sc_pps_state);
 		mutex_spin_exit(&timecounter_lock);
 @@ -1899,27 +1897,28 @@ com_rxsoft(struct com_softc *sc, struct
 		sc->sc_rbget = get;
 		mutex_spin_enter(&sc->sc_lock);
 		cc = sc->sc_rbavail += scc - cc;
 		/* Buffers should be ok again, release possible block. */
 		if (cc >= sc->sc_r_lowat) {
 			if (ISSET(sc->sc_rx_flags, RX_IBUF_OVERFLOWED)) {
 				CLR(sc->sc_rx_flags, RX_IBUF_OVERFLOWED);
 				SET(sc->sc_ier, IER_ERXRDY);
 #ifdef COM_PXA2X0
 				if (sc->sc_type == COM_TYPE_PXA2x0)
 					SET(sc->sc_ier, IER_ERXTOUT);
 #endif
-				if (sc->sc_type == COM_TYPE_INGENIC)
+				if (sc->sc_type == COM_TYPE_INGENIC ||
 				    sc->sc_type == COM_TYPE_TEGRA)
 					SET(sc->sc_ier, IER_ERXTOUT);
 				CSR_WRITE_1(&sc->sc_regs, COM_REG_IER,
 				    sc->sc_ier);
+			}
 			if (ISSET(sc->sc_rx_flags, RX_IBUF_BLOCKED)) {
 				CLR(sc->sc_rx_flags, RX_IBUF_BLOCKED);
 				com_hwiflow(sc);
+			}
+		}
 		mutex_spin_exit(&sc->sc_lock);
+	}
+}
 @@ -2105,27 +2104,28 @@ again:	do {
+			}
 			/*
 			 * If we're out of space, disable receive interrupts
 			 * until the queue has drained a bit.
 			 */
 			if (!cc) {
 				SET(sc->sc_rx_flags, RX_IBUF_OVERFLOWED);
 #ifdef COM_PXA2X0
 				if (sc->sc_type == COM_TYPE_PXA2x0)
 					CLR(sc->sc_ier, IER_ERXRDY|IER_ERXTOUT);
 				else
 #endif
-				if (sc->sc_type == COM_TYPE_INGENIC)
+				if (sc->sc_type == COM_TYPE_INGENIC ||
 				    sc->sc_type == COM_TYPE_TEGRA)
 					CLR(sc->sc_ier,
 					    IER_ERXRDY | IER_ERXTOUT);
 				else
 					CLR(sc->sc_ier, IER_ERXRDY);
 				CSR_WRITE_1(regsp, COM_REG_IER, sc->sc_ier);
+			}
 		} else {
 			if ((iir & (IIR_RXRDY|IIR_TXRDY)) == IIR_RXRDY) {
 				(void) CSR_READ_1(regsp, COM_REG_RXDATA);
 				continue;
+			}
+		}