From owner-p4-projects@FreeBSD.ORG Wed Sep 17 21:30:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 552841065670; Wed, 17 Sep 2008 21:30:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00EA4106566B for ; Wed, 17 Sep 2008 21:30:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2FB48FC16 for ; Wed, 17 Sep 2008 21:30:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8HLUb9b041881 for ; Wed, 17 Sep 2008 21:30:37 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8HLUbR8041879 for perforce@freebsd.org; Wed, 17 Sep 2008 21:30:37 GMT (envelope-from jhb@freebsd.org) Date: Wed, 17 Sep 2008 21:30:37 GMT Message-Id: <200809172130.m8HLUbR8041879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 149976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Sep 2008 21:30:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=149976 Change 149976 by jhb@jhb_mutex on 2008/09/17 21:30:20 IFC @149975 Affected files ... .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#24 branch .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#14 branch .. //depot/projects/smpng/sys/dev/sbni/if_sbni_pci.c#11 branch .. //depot/projects/smpng/sys/dev/sbni/if_sbnireg.h#4 branch .. //depot/projects/smpng/sys/dev/sbni/if_sbnivar.h#7 branch .. //depot/projects/smpng/sys/i386/i386/identcpu.c#58 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#19 integrate .. //depot/projects/smpng/sys/modules/sbni/Makefile#3 branch .. //depot/projects/smpng/sys/sun4v/sun4v/clock.c#3 branch Differences ... ==== //depot/projects/smpng/sys/i386/i386/identcpu.c#58 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.185 2008/05/23 04:03:53 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.186 2008/09/17 20:45:18 jhb Exp $"); #include "opt_cpu.h" @@ -719,7 +719,7 @@ "\020" "\001SSE3" /* SSE3 */ "\002" - "\003RSVD2" /* "Reserved" bit 2 */ + "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ "\006VMX" /* Virtual Machine Extensions */ @@ -736,11 +736,11 @@ "\021" "\022" "\023DCA" /* Direct Cache Access */ - "\024" - "\025" - "\026" + "\024SSE4.1" + "\025SSE4.2" + "\026x2APIC" /* xAPIC Extensions */ "\027" - "\030" + "\030POPCNT" "\031" "\032" "\033" @@ -790,7 +790,7 @@ "\030" /* Same */ "\031" /* Same */ "\032FFXSR" /* Fast FXSAVE/FXRSTOR */ - "\033" /* Undefined */ + "\033Page1GB" /* 1-GB large page support */ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ ==== //depot/projects/smpng/sys/i386/include/specialreg.h#19 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.45 2008/08/08 16:26:53 stas Exp $ + * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.46 2008/09/17 20:45:18 jhb Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -110,6 +110,7 @@ #define CPUID_PBE 0x80000000 #define CPUID2_SSE3 0x00000001 +#define CPUID2_DTES64 0x00000004 #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 #define CPUID2_VMX 0x00000020 @@ -122,6 +123,10 @@ #define CPUID2_XTPR 0x00004000 #define CPUID2_PDCM 0x00008000 #define CPUID2_DCA 0x00040000 +#define CPUID2_SSE41 0x00080000 +#define CPUID2_SSE42 0x00100000 +#define CPUID2_X2APIC 0x00200000 +#define CPUID2_POPCNT 0x00800000 /* * Important bits in the AMD extended cpuid flags @@ -131,6 +136,7 @@ #define AMDID_NX 0x00100000 #define AMDID_EXT_MMX 0x00400000 #define AMDID_FFXSR 0x01000000 +#define AMDID_PAGE1GB 0x04000000 #define AMDID_RDTSCP 0x08000000 #define AMDID_LM 0x20000000 #define AMDID_EXT_3DNOW 0x40000000