From owner-svn-src-head@FreeBSD.ORG  Thu Sep 26 18:01:33 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 06A0A209;
 Thu, 26 Sep 2013 18:01:33 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E4AC02E43;
 Thu, 26 Sep 2013 18:01:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8QI1WGu078008;
 Thu, 26 Sep 2013 18:01:32 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8QI1Wk2078007;
 Thu, 26 Sep 2013 18:01:32 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201309261801.r8QI1Wk2078007@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 26 Sep 2013 18:01:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255895 - head/sys/powerpc/pseries
X-SVN-Group: head
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Sep 2013 18:01:33 -0000

Author: nwhitehorn
Date: Thu Sep 26 18:01:32 2013
New Revision: 255895
URL: http://svnweb.freebsd.org/changeset/base/255895

Log:
  Fix bug where UART unit number was not set properly, which prevented
  operation on systems with multiple serial ports. Also turn on
  interrupts for the UART device, which were disabled due to a
  now-fixed bug in QEMU.
  
  Approved by:	re (gjb)

Modified:
  head/sys/powerpc/pseries/phyp_console.c

Modified: head/sys/powerpc/pseries/phyp_console.c
==============================================================================
--- head/sys/powerpc/pseries/phyp_console.c	Thu Sep 26 18:00:45 2013	(r255894)
+++ head/sys/powerpc/pseries/phyp_console.c	Thu Sep 26 18:01:32 2013	(r255895)
@@ -150,6 +150,7 @@ uart_phyp_probe_node(struct uart_phyp_so
 	OF_getprop(node, "reg", &reg, sizeof(reg));
 	if (reg == -1)
 		return (ENXIO);
+	sc->vtermid = reg;
 	sc->node = node;
 
 	if (OF_getprop(node, "compatible", buf, sizeof(buf)) <= 0)
@@ -251,12 +252,8 @@ uart_phyp_attach(device_t dev)
 	}
 
 	sc->irqrid = 0;
-#ifdef NOTYET
 	sc->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqrid,
 	    RF_ACTIVE | RF_SHAREABLE);
-#else
-	sc->irqres = NULL;
-#endif
 	if (sc->irqres != NULL) {
 		bus_setup_intr(dev, sc->irqres, INTR_TYPE_TTY | INTR_MPSAFE,
 		    NULL, uart_phyp_intr, sc, &sc->sc_icookie);