From owner-p4-projects@FreeBSD.ORG  Wed Sep 24 14:45:16 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7695D16A4C0; Wed, 24 Sep 2003 14:45:16 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4BA3616A4B3
	for <perforce@freebsd.org>; Wed, 24 Sep 2003 14:45:16 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C745243FBF
	for <perforce@freebsd.org>; Wed, 24 Sep 2003 14:45:15 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8OLjFXJ017996
	for <perforce@freebsd.org>; Wed, 24 Sep 2003 14:45:15 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8OLjFGn017993
	for perforce@freebsd.org; Wed, 24 Sep 2003 14:45:15 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Wed, 24 Sep 2003 14:45:15 -0700 (PDT)
Message-Id: <200309242145.h8OLjFGn017993@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38539 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Sep 2003 21:45:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=38539

Change 38539 by peter@peter_daintree on 2003/09/24 14:44:28

	Integrate -I from jhb_acpipci

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#3 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#5 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#3 (text+ko) ====

@@ -187,6 +187,9 @@
 	value |= (APIC_SVR_FEN | APIC_SVR_SWEN | APIC_SPURIOUS_INT);
 	lapic->svr = value;
 
+	/* Set BSP's per-CPU local APIC ID. */
+	PCPU_SET(apic_id, lapic_id());
+
 	/* XXX: timer/error/thermal interrupts */
 }
 

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#5 (text+ko) ====

@@ -279,8 +279,8 @@
 
 	mtx_init(&smp_tlb_mtx, "tlb", NULL, MTX_SPIN);
 
-	/* Setup BSP apic ID */
-	PCPU_SET(apic_id, lapic_id());
+	/* Set boot_cpu_id if needed. */
+	KASSERT(PCPU_GET(apic_id) == lapic_id(), ("APIC ID mismatch"));	/* XXXTEST */
 	if (boot_cpu_id == -1) {
 		boot_cpu_id = PCPU_GET(apic_id);
 		cpu_info[boot_cpu_id].cpu_bsp = 1;