From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 18:18:10 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADDA116A4C0; Mon, 29 Sep 2003 18:18:10 -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 6631716A4B3
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:18:10 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DD61743FE3
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:18:09 -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 h8U1I9XJ026802
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:18:09 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1I9AR026799
	for perforce@freebsd.org; Mon, 29 Sep 2003 18:18:09 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Mon, 29 Sep 2003 18:18:09 -0700 (PDT)
Message-Id: <200309300118.h8U1I9AR026799@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 38823 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: Tue, 30 Sep 2003 01:18:11 -0000

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

Change 38823 by peter@peter_hammer on 2003/09/29 18:17:31

	remove 686 B0 workaround
	fix setidt call

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#6 edit

Differences ...

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

@@ -242,7 +242,7 @@
 	KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry"));
 	KASSERT(ioint_handlers[vector / 32] != NULL,
 	    ("No ISR handler for IRQ %d", IDT_TO_IRQ(vector)));
-	setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, 0);
+	setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL,SEL_KPL,  0);
 }
 
 void
@@ -517,17 +517,6 @@
 
 	if (best_enum == NULL)
 		return;
-	/*
-	 * To work around an errata, we disable the local APIC on some
-	 * CPUs during early startup.  We need to turn the local APIC back
-	 * on on such CPUs now.
-	 */
-	if (cpu == CPU_686 && strcmp(cpu_vendor, "GenuineIntel") == 0 &&
-	    (cpu_id & 0xff0) == 0x610) {
-		apic_base = rdmsr(MSR_APICBASE);
-		apic_base |= APICBASE_ENABLED;
-		wrmsr(MSR_APICBASE, apic_base);
-	}
 	retval = best_enum->apic_setup_local();
 	if (retval != 0)
 		printf("%s: Failed to setup the local APIC: returned %d\n",