From owner-svn-src-head@FreeBSD.ORG  Wed Nov 19 14:23:29 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DADF0569;
 Wed, 19 Nov 2014 14:23:29 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C796EDBD;
 Wed, 19 Nov 2014 14:23:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJENTpW017871;
 Wed, 19 Nov 2014 14:23:29 GMT (envelope-from zbb@FreeBSD.org)
Received: (from zbb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJENTJ0017870;
 Wed, 19 Nov 2014 14:23:29 GMT (envelope-from zbb@FreeBSD.org)
Message-Id: <201411191423.sAJENTJ0017870@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: zbb set sender to zbb@FreeBSD.org
 using -f
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Wed, 19 Nov 2014 14:23:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274711 - head/sys/kern
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.18-1
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: Wed, 19 Nov 2014 14:23:30 -0000

Author: zbb
Date: Wed Nov 19 14:23:29 2014
New Revision: 274711
URL: https://svnweb.freebsd.org/changeset/base/274711

Log:
  Stop using early_putc immediately after configuring console with cninit()
  
  Early UART should be released right after system console initialization is
  completed. Otherwise, after cninit() both early and system console coexist
  what may lead to various issues (i.a. writing to unmapped early
  UART address). This cannot be done in cninit_finish() since it can be
  called late at the end of MI configuration.
  
  Obtained from:   Semihalf
  Reviewed by:     andrew
  Sponsored by:    The FreeBSD Foundation

Modified:
  head/sys/kern/kern_cons.c

Modified: head/sys/kern/kern_cons.c
==============================================================================
--- head/sys/kern/kern_cons.c	Wed Nov 19 13:57:39 2014	(r274710)
+++ head/sys/kern/kern_cons.c	Wed Nov 19 14:23:29 2014	(r274711)
@@ -156,6 +156,13 @@ cninit(void)
 	 * Make the best console the preferred console.
 	 */
 	cnselect(best_cn);
+
+#ifdef EARLY_PRINTF
+	/*
+	 * Release early console.
+	 */
+	early_putc = NULL;
+#endif
 }
 
 void