From owner-p4-projects@FreeBSD.ORG Fri Nov 14 11:47:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C89116A4D0; Fri, 14 Nov 2003 11:47:48 -0800 (PST) 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 C62E716A4CE for ; Fri, 14 Nov 2003 11:47:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30A1343F85 for ; Fri, 14 Nov 2003 11:47:47 -0800 (PST) (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 hAEJllXJ062349 for ; Fri, 14 Nov 2003 11:47:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAEJlkHR062346 for perforce@freebsd.org; Fri, 14 Nov 2003 11:47:46 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 14 Nov 2003 11:47:46 -0800 (PST) Message-Id: <200311141947.hAEJlkHR062346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 42367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2003 19:47:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=42367 Change 42367 by peter@peter_daintree on 2003/11/14 11:47:22 integrate -I -b smp_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#21 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#8 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#22 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#7 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.93 2003/11/13 18:16:37 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.94 2003/11/14 19:10:12 jhb Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#21 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.2 2003/11/12 18:13:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.3 2003/11/14 19:10:12 jhb Exp $"); #include #include @@ -110,7 +110,7 @@ IDTVEC(apic_isr4), /* 128 - 159 */ IDTVEC(apic_isr5), /* 160 - 191 */ IDTVEC(apic_isr6), /* 192 - 223 */ - IDTVEC(apic_isr7) /* 224 - 255 */ + IDTVEC(apic_isr7), /* 224 - 255 */ }; volatile lapic_t *lapic; ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#14 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.3 2003/11/13 16:41:07 jhb Exp $ + * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.4 2003/11/14 19:10:13 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -94,10 +94,10 @@ #define IPI_INVLPG (APIC_IPI_INTS + 2) #define IPI_INVLRNG (APIC_IPI_INTS + 3) #define IPI_LAZYPMAP (APIC_IPI_INTS + 4) /* Lazy pmap release. */ -#define IPI_STOP (APIC_IPI_INTS + 5) /* Stop CPU until restarted. */ #define IPI_HARDCLOCK (APIC_IPI_INTS + 8) /* Inter-CPU clock handling. */ #define IPI_STATCLOCK (APIC_IPI_INTS + 9) #define IPI_RENDEZVOUS (APIC_IPI_INTS + 10) /* Inter-CPU rendezvous. */ +#define IPI_STOP (APIC_IPI_INTS + 11) /* Stop CPU until restarted. */ #define APIC_SPURIOUS_INT 255 ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.1 2003/11/03 21:25:52 jhb Exp $ + * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.2 2003/11/14 19:10:13 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#22 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.3 2003/11/12 18:13:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.4 2003/11/14 19:13:06 jhb Exp $"); #include "opt_isa.h" @@ -253,10 +253,9 @@ /* Reset is finished, default to IRR on read. */ outb(pic->at_ioaddr, OCW3_SEL | OCW3_RR); - /* Set priority order to 3-7, 0-2 (com2 first). */ + /* OCW2_L1 sets priority order to 3-7, 0-2 (com2 first). */ if (!slave) - outb(pic->at_ioaddr, ICU_SETPRI | 0x2); - + outb(pic->at_ioaddr, OCW2_R | OCW2_SL | OCW2_L1); mtx_unlock_spin(&icu_lock); }