From owner-svn-src-head@FreeBSD.ORG  Sat Feb  2 12:04: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])
 by hub.freebsd.org (Postfix) with ESMTP id AAD4CE1A;
 Sat,  2 Feb 2013 12:04:33 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9244EDBD;
 Sat,  2 Feb 2013 12:04:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12C4X0b034137;
 Sat, 2 Feb 2013 12:04:33 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12C4XP5034135;
 Sat, 2 Feb 2013 12:04:33 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201302021204.r12C4XP5034135@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 2 Feb 2013 12:04:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246248 - in head/sys: amd64/amd64 i386/i386
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: Sat, 02 Feb 2013 12:04:33 -0000

Author: avg
Date: Sat Feb  2 12:04:32 2013
New Revision: 246248
URL: http://svnweb.freebsd.org/changeset/base/246248

Log:
  cpususpend_handler: mark AP as resumed only after fully setting up lapic
  
  Reviewed by:	jhb
  Tested by:	Sergey V. Dyatko <sergey.dyatko@gmail.com>,
  		KAHO Toshikazu <kaho@elam.kais.kyoto-u.ac.jp>
  MFC after:	12 days

Modified:
  head/sys/amd64/amd64/mp_machdep.c
  head/sys/i386/i386/mp_machdep.c

Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c	Sat Feb  2 12:02:42 2013	(r246247)
+++ head/sys/amd64/amd64/mp_machdep.c	Sat Feb  2 12:04:32 2013	(r246248)
@@ -1431,11 +1431,11 @@ cpususpend_handler(void)
 	while (!CPU_ISSET(cpu, &started_cpus))
 		ia32_pause();
 
-	CPU_CLR_ATOMIC(cpu, &started_cpus);
-
 	/* Resume MCA and local APIC */
 	mca_resume();
 	lapic_setup(0);
+
+	CPU_CLR_ATOMIC(cpu, &started_cpus);
 }
 
 /*

Modified: head/sys/i386/i386/mp_machdep.c
==============================================================================
--- head/sys/i386/i386/mp_machdep.c	Sat Feb  2 12:02:42 2013	(r246247)
+++ head/sys/i386/i386/mp_machdep.c	Sat Feb  2 12:04:32 2013	(r246248)
@@ -1528,11 +1528,11 @@ cpususpend_handler(void)
 	while (!CPU_ISSET(cpu, &started_cpus))
 		ia32_pause();
 
-	CPU_CLR_ATOMIC(cpu, &started_cpus);
-
 	/* Resume MCA and local APIC */
 	mca_resume();
 	lapic_setup(0);
+
+	CPU_CLR_ATOMIC(cpu, &started_cpus);
 }
 /*
  * This is called once the rest of the system is up and running and we're