From owner-svn-src-stable@FreeBSD.ORG Mon May 18 22:45:10 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4548A106564A; Mon, 18 May 2009 22:45:10 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 17E818FC14; Mon, 18 May 2009 22:45:10 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4IMj90p077355; Mon, 18 May 2009 22:45:09 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4IMj9WM077354; Mon, 18 May 2009 22:45:09 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <200905182245.n4IMj9WM077354@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 18 May 2009 22:45:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192352 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/uart X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2009 22:45:10 -0000 Author: marcel Date: Mon May 18 22:45:09 2009 New Revision: 192352 URL: http://svn.freebsd.org/changeset/base/192352 Log: MFC r190834: Fix hangs caused by hardware that signals receive errors (framing, parity, etc), but does not indicate characters being received. Since no chracters have been received, ignore the line errors. PR: 131006 Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/dev/uart/uart_dev_ns8250.c Modified: stable/7/sys/dev/uart/uart_dev_ns8250.c ============================================================================== --- stable/7/sys/dev/uart/uart_dev_ns8250.c Mon May 18 22:34:44 2009 (r192351) +++ stable/7/sys/dev/uart/uart_dev_ns8250.c Mon May 18 22:45:09 2009 (r192352) @@ -50,14 +50,16 @@ __FBSDID("$FreeBSD$"); static void ns8250_clrint(struct uart_bas *bas) { - uint8_t iir; + uint8_t iir, lsr; iir = uart_getreg(bas, REG_IIR); while ((iir & IIR_NOPEND) == 0) { iir &= IIR_IMASK; - if (iir == IIR_RLS) - (void)uart_getreg(bas, REG_LSR); - else if (iir == IIR_RXRDY || iir == IIR_RXTOUT) + if (iir == IIR_RLS) { + lsr = uart_getreg(bas, REG_LSR); + if (lsr & (LSR_BI|LSR_FE|LSR_PE)) + (void)uart_getreg(bas, REG_DATA); + } else if (iir == IIR_RXRDY || iir == IIR_RXTOUT) (void)uart_getreg(bas, REG_DATA); else if (iir == IIR_MLSC) (void)uart_getreg(bas, REG_MSR); @@ -563,7 +565,6 @@ ns8250_bus_ipend(struct uart_softc *sc) ipend = 0; if (iir & IIR_RXRDY) { lsr = uart_getreg(bas, REG_LSR); - uart_unlock(sc->sc_hwmtx); if (lsr & LSR_OE) ipend |= SER_INT_OVERRUN; if (lsr & LSR_BI) @@ -571,12 +572,14 @@ ns8250_bus_ipend(struct uart_softc *sc) if (lsr & LSR_RXRDY) ipend |= SER_INT_RXREADY; } else { - uart_unlock(sc->sc_hwmtx); if (iir & IIR_TXRDY) ipend |= SER_INT_TXIDLE; else ipend |= SER_INT_SIGCHG; } + if (ipend == 0) + ns8250_clrint(bas); + uart_unlock(sc->sc_hwmtx); return ((sc->sc_leaving) ? 0 : ipend); }