From owner-svn-src-head@freebsd.org  Tue Oct 10 20:08:32 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1E4FE3B8EC;
 Tue, 10 Oct 2017 20:08:31 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B7C506AB53;
 Tue, 10 Oct 2017 20:08:31 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9AK8Uws061416;
 Tue, 10 Oct 2017 20:08:30 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9AK8U6V061415;
 Tue, 10 Oct 2017 20:08:30 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201710102008.v9AK8U6V061415@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 10 Oct 2017 20:08:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324503 - head/sys/dev/uart
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/sys/dev/uart
X-SVN-Commit-Revision: 324503
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Oct 2017 20:08:32 -0000

Author: emaste
Date: Tue Oct 10 20:08:30 2017
New Revision: 324503
URL: https://svnweb.freebsd.org/changeset/base/324503

Log:
  uart: detect 256-byte FIFOs
  
  Submitted by:	Zakary Nafziger <worldofzak@gmail.com>
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/uart/uart_dev_ns8250.c

Modified: head/sys/dev/uart/uart_dev_ns8250.c
==============================================================================
--- head/sys/dev/uart/uart_dev_ns8250.c	Tue Oct 10 19:33:24 2017	(r324502)
+++ head/sys/dev/uart/uart_dev_ns8250.c	Tue Oct 10 20:08:30 2017	(r324503)
@@ -873,7 +873,7 @@ ns8250_bus_probe(struct uart_softc *sc)
 			count = 0;
 			goto describe;
 		}
-	} while ((lsr & LSR_OE) == 0 && count < 130);
+	} while ((lsr & LSR_OE) == 0 && count < 260);
 	count--;
 
 	uart_setreg(bas, REG_MCR, mcr);
@@ -894,6 +894,9 @@ ns8250_bus_probe(struct uart_softc *sc)
 	} else if (count >= 112 && count <= 128) {
 		sc->sc_rxfifosz = 128;
 		device_set_desc(sc->sc_dev, "16950 or compatible");
+	} else if (count >= 224 && count <= 256) {
+		sc->sc_rxfifosz = 256;
+		device_set_desc(sc->sc_dev, "16x50 with 256 byte FIFO");
 	} else {
 		sc->sc_rxfifosz = 16;
 		device_set_desc(sc->sc_dev,