From owner-p4-projects@FreeBSD.ORG  Tue Sep 30 17:07:56 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D942916A4C1; Tue, 30 Sep 2003 17:07:55 -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 B56F516A4BF
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 17:07:55 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3E52B43FA3
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 17:07:55 -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 h9107tXJ040213
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 17:07:55 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9107sqR040210
	for perforce@freebsd.org; Tue, 30 Sep 2003 17:07:54 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Tue, 30 Sep 2003 17:07:54 -0700 (PDT)
Message-Id: <200310010007.h9107sqR040210@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 38932 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, 01 Oct 2003 00:07:56 -0000

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

Change 38932 by peter@peter_hammer on 2003/09/30 17:07:34

	add lapic_disable() rather than having mpboot.s do it in asm.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#10 edit
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#5 edit

Differences ...

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

@@ -280,6 +280,24 @@
 	intr_restore(eflags);
 }
 
+void
+lapic_disable(void)
+{
+	struct lapic *la;
+	u_int32_t value;
+	register_t eflags;
+
+	la = &lapics[lapic_id()];
+	KASSERT(la->la_present, ("missing APIC structure"));
+	eflags = intr_disable();
+
+	/* Disable local APIC to be safe during boot */
+	value = lapic->svr;
+	value &= ~APIC_SVR_SWEN;
+	lapic->svr = value;
+	intr_restore(eflags);
+}
+
 int
 lapic_id(void)
 {

==== //depot/projects/hammer/sys/amd64/include/apicvar.h#5 (text+ko) ====

@@ -159,6 +159,7 @@
 int	lapic_set_lvt_polarity(u_int apic_id, u_int lvt, u_char activehi);
 int	lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, u_char edgetrigger);
 void	lapic_setup(void);
+void	lapic_disable(void);
 
 #endif /* !LOCORE */
 #endif /* _MACHINE_APICVAR_H_ */