From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 13:38:09 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F26E71065670; Sun, 2 May 2010 13:38:08 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id E20438FC0C; Sun, 2 May 2010 13:38:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42Dc8hh073375; Sun, 2 May 2010 13:38:08 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42Dc8rt073373; Sun, 2 May 2010 13:38:08 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201005021338.o42Dc8rt073373@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 2 May 2010 13:38:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207509 - stable/7/bin/ln X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 13:38:09 -0000 Author: jilles Date: Sun May 2 13:38:08 2010 New Revision: 207509 URL: http://svn.freebsd.org/changeset/base/207509 Log: MFC r207188: symlink(7): The ownership of symlinks is used by the system, in at least three ways, so do not say it is ignored: * who may delete/rename a symlink in a sticky directory * who may do lchflags(2)/lchown(2)/lchmod(2) * whose inode quota is charged Modified: stable/7/bin/ln/symlink.7 Directory Properties: stable/7/bin/ln/ (props changed) Modified: stable/7/bin/ln/symlink.7 ============================================================================== --- stable/7/bin/ln/symlink.7 Sun May 2 13:36:23 2010 (r207508) +++ stable/7/bin/ln/symlink.7 Sun May 2 13:38:08 2010 (r207509) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd March 31, 1994 +.Dd April 25, 2010 .Dt SYMLINK 7 .Os .Sh NAME @@ -138,8 +138,8 @@ an existing symbolic link can be changed and .Xr lutimes 2 system calls, respectively. -Of these, only the flags are used by the system; -the access permissions and ownership are ignored. +Of these, only the flags and ownership are used by the system; +the access permissions are ignored. .Pp The .Bx 4.4 From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 13:53:09 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 03657106566B; Sun, 2 May 2010 13:53:09 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id E72138FC17; Sun, 2 May 2010 13:53:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42Dr8cK076635; Sun, 2 May 2010 13:53:08 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42Dr8Vr076633; Sun, 2 May 2010 13:53:08 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201005021353.o42Dr8Vr076633@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 2 May 2010 13:53:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207510 - stable/7/lib/libkvm X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 13:53:09 -0000 Author: jilles Date: Sun May 2 13:53:08 2010 New Revision: 207510 URL: http://svn.freebsd.org/changeset/base/207510 Log: MFC r207187: kvm(3): Mention that some of the functions use sysctl(3) instead of kmem. Additionally, because of sysctl(3) use (which is generally good), behaviour for crash dumps differs slightly from behaviour for live kernels and this will probably never be fixed entirely, so weaken that claim. Modified: stable/7/lib/libkvm/kvm.3 Directory Properties: stable/7/lib/libkvm/ (props changed) Modified: stable/7/lib/libkvm/kvm.3 ============================================================================== --- stable/7/lib/libkvm/kvm.3 Sun May 2 13:38:08 2010 (r207509) +++ stable/7/lib/libkvm/kvm.3 Sun May 2 13:53:08 2010 (r207510) @@ -32,7 +32,7 @@ .\" @(#)kvm.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd January 29, 2004 +.Dd April 25, 2010 .Dt KVM 3 .Os .Sh NAME @@ -46,12 +46,15 @@ The library provides a uniform interface for accessing kernel virtual memory images, including live systems and crash dumps. Access to live systems is via +.Xr sysctl 3 +for some functions, and .Xr mem 4 and .Xr kmem 4 +for other functions, while crash dumps can be examined via the core file generated by .Xr savecore 8 . -The interface behaves identically in both cases. +The interface behaves similarly in both cases. Memory can be read and written, kernel symbol addresses can be looked up efficiently, and information about user processes can be gathered. @@ -112,5 +115,6 @@ given descriptor. .Xr kvm_openfiles 3 , .Xr kvm_read 3 , .Xr kvm_write 3 , +.Xr sysctl 3 , .Xr kmem 4 , .Xr mem 4 From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 16:38:57 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 85D5F1065672; Sun, 2 May 2010 16:38:57 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 755A18FC1C; Sun, 2 May 2010 16:38:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42Gcvcn014111; Sun, 2 May 2010 16:38:57 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42GcvaQ014109; Sun, 2 May 2010 16:38:57 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201005021638.o42GcvaQ014109@svn.freebsd.org> From: Marius Strobl Date: Sun, 2 May 2010 16:38:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207516 - stable/7/sys/sparc64/sparc64 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 16:38:57 -0000 Author: marius Date: Sun May 2 16:38:57 2010 New Revision: 207516 URL: http://svn.freebsd.org/changeset/base/207516 Log: MFC: r206448 Do as the comment suggests and determine the bus space based on the last bus we actually mapped at rather than always based on the last bus we encountered while moving upward in the tree. Otherwise we might use the wrong bus space in case the bridge directly underneath the nexus doesn't require mapping, i.e. was skipped as it's the case for ssm(4) nodes. Modified: stable/7/sys/sparc64/sparc64/ofw_machdep.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/sparc64/ofw_machdep.c ============================================================================== --- stable/7/sys/sparc64/sparc64/ofw_machdep.c Sun May 2 16:36:15 2010 (r207515) +++ stable/7/sys/sparc64/sparc64/ofw_machdep.c Sun May 2 16:38:57 2010 (r207516) @@ -187,13 +187,10 @@ OF_decode_addr(phandle_t node, int bank, name[sizeof(name) - 1] = '\0'; goto skip; } - if (lbus != bus) { - if (OF_getprop(bus, "#size-cells", &szc, - sizeof(szc)) == -1) - szc = 1; - if (szc < 1 || szc > 2) - return (ENXIO); - } + if (OF_getprop(bus, "#size-cells", &szc, sizeof(szc)) == -1) + szc = 1; + if (szc < 1 || szc > 2) + return (ENXIO); nbank /= sizeof(banks[0]) * (addrc + paddrc + szc); bank = 0; for (i = 0; i < nbank; i++) { @@ -233,9 +230,9 @@ OF_decode_addr(phandle_t node, int bank, } if (i == nbank) return (ENXIO); + lbus = bus; skip: addrc = paddrc; - lbus = bus; bus = pbus; } From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 16:45:10 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 108891065672; Sun, 2 May 2010 16:45:10 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id F42058FC0C; Sun, 2 May 2010 16:45:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42Gj9sq015718; Sun, 2 May 2010 16:45:09 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42Gj9Lj015716; Sun, 2 May 2010 16:45:09 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201005021645.o42Gj9Lj015716@svn.freebsd.org> From: Marius Strobl Date: Sun, 2 May 2010 16:45:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207521 - stable/7/sys/sparc64/sparc64 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 16:45:10 -0000 Author: marius Date: Sun May 2 16:45:09 2010 New Revision: 207521 URL: http://svn.freebsd.org/changeset/base/207521 Log: MFC: r206449 Unlike the sun4v variant, the sun4u version of SUNW,set-trap-table actually only takes one argument. Modified: stable/7/sys/sparc64/sparc64/trap.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/sparc64/trap.c ============================================================================== --- stable/7/sys/sparc64/sparc64/trap.c Sun May 2 16:45:08 2010 (r207520) +++ stable/7/sys/sparc64/sparc64/trap.c Sun May 2 16:45:09 2010 (r207521) @@ -249,7 +249,8 @@ sun4u_set_traptable(void *tba_addr) cell_t tba_addr; } args = { (cell_t)"SUNW,set-trap-table", - 2, + 1, + 0, }; args.tba_addr = (cell_t)tba_addr; From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 16:46:22 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69DBE106567D; Sun, 2 May 2010 16:46:22 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 599CD8FC1C; Sun, 2 May 2010 16:46:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42GkMqP016084; Sun, 2 May 2010 16:46:22 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42GkMxK016082; Sun, 2 May 2010 16:46:22 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201005021646.o42GkMxK016082@svn.freebsd.org> From: Marius Strobl Date: Sun, 2 May 2010 16:46:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207523 - stable/7/sys/sparc64/include X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 16:46:22 -0000 Author: marius Date: Sun May 2 16:46:22 2010 New Revision: 207523 URL: http://svn.freebsd.org/changeset/base/207523 Log: MFC: r206450 Correct the DCR_IPE macro to refer to the right bit. Also improve the associated comment as besides US-IV+ these bits are only available with US-III++, i.e. the 1.2GHz version of the US-III+. Modified: stable/7/sys/sparc64/include/dcr.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/include/dcr.h ============================================================================== --- stable/7/sys/sparc64/include/dcr.h Sun May 2 16:46:20 2010 (r207522) +++ stable/7/sys/sparc64/include/dcr.h Sun May 2 16:46:22 2010 (r207523) @@ -43,8 +43,8 @@ #define DCR_OBSDATA_CT_MASK \ (((1UL << DCR_OBSDATA_CT_BITS) - 1) << DCR_OBSDATA_SHIFT) -/* The following bits are valid for the UltraSPARC-III+/IV+ only. */ -#define DCR_IPE (1UL << 5) +/* The following bits are valid for the UltraSPARC-III++/IV+ only. */ +#define DCR_IPE (1UL << 2) #define DCR_OBSDATA_CTP_BITS 6 #define DCR_OBSDATA_CTP_MASK \ From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 16:47:54 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EB39A106564A; Sun, 2 May 2010 16:47:54 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id DAF448FC13; Sun, 2 May 2010 16:47:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42GlsPu016540; Sun, 2 May 2010 16:47:54 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42GlsE9016538; Sun, 2 May 2010 16:47:54 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201005021647.o42GlsE9016538@svn.freebsd.org> From: Marius Strobl Date: Sun, 2 May 2010 16:47:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207525 - stable/7/sys/sparc64/include X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 16:47:55 -0000 Author: marius Date: Sun May 2 16:47:54 2010 New Revision: 207525 URL: http://svn.freebsd.org/changeset/base/207525 Log: MFC: r206480 Update for UltraSPARC-IV{,+} and SPARC64 V, VI, VII and VIIIfx CPUs. Modified: stable/7/sys/sparc64/include/lsu.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/include/lsu.h ============================================================================== --- stable/7/sys/sparc64/include/lsu.h Sun May 2 16:47:50 2010 (r207524) +++ stable/7/sys/sparc64/include/lsu.h Sun May 2 16:47:54 2010 (r207525) @@ -29,7 +29,7 @@ /* * Definitions for the Load-Store-Unit Control Register. This is called - * Data Cache Unit Control Register (DCUCR) for UltraSPARC-III. + * Data Cache Unit Control Register (DCUCR) for UltraSPARC-III and greater. */ #define LSU_IC (1UL << 0) #define LSU_DC (1UL << 1) @@ -41,7 +41,7 @@ #define LSU_FM_BITS 16 #define LSU_FM_MASK (((1UL << LSU_FM_BITS) - 1) << LSU_FM_SHIFT) -#define LSU_VM_SHIFT 25 +#define LSU_VM_SHIFT 25 #define LSU_VM_BITS 8 #define LSU_VM_MASK (((1UL << LSU_VM_BITS) - 1) << LSU_VM_SHIFT) @@ -65,4 +65,22 @@ #define LSU_CV (1UL << 48) #define LSU_CP (1UL << 49) +/* The following bit is valid for the UltraSPARC-IV only. */ +#define LSU_WIH (1UL << 4) + +/* The following bits are valid for the UltraSPARC-IV+ only. */ +#define LSU_PPS_SHIFT 50 +#define LSU_PPS_BITS 2 +#define LSU_PPS_MASK (((1UL << LSU_PPS_BITS) - 1) << LSU_PPS_SHIFT) + +#define LSU_IPS_SHIFT 52 +#define LSU_IPS_BITS 2 +#define LSU_IPS_MASK (((1UL << LSU_IPS_BITS) - 1) << LSU_IPS_SHIFT) + +#define LSU_PCM (1UL << 54) +#define LSU_WCE (1UL << 55) + +/* The following bit is valid for the SPARC64 V, VI, VII and VIIIfx only. */ +#define LSU_WEAK_SPCA (1UL << 41) + #endif /* _MACHINE_LSU_H_ */ From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 16:52:24 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9EF261065702; Sun, 2 May 2010 16:52:24 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 8EAD68FC20; Sun, 2 May 2010 16:52:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42GqOse017627; Sun, 2 May 2010 16:52:24 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42GqOeE017625; Sun, 2 May 2010 16:52:24 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201005021652.o42GqOeE017625@svn.freebsd.org> From: Marius Strobl Date: Sun, 2 May 2010 16:52:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207527 - stable/7/lib/libc/softfloat X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 16:52:24 -0000 Author: marius Date: Sun May 2 16:52:24 2010 New Revision: 207527 URL: http://svn.freebsd.org/changeset/base/207527 Log: MFC: r206490, r206492 While SPARC V9 allows tininess to be detected either before or after rounding (impl. dep. #55), the SPARC JPS1 responsible for SPARC64 and UltraSPARC processors defines that in all cases tininess is detected before rounding therefore rounding up to the smallest normalized number should set the underflow flag. This change is needed for using SoftFloat on sparc64 for reference purposes. PR: 144900 Submitted by: Peter Jeremy Modified: stable/7/lib/libc/softfloat/softfloat-specialize Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) Modified: stable/7/lib/libc/softfloat/softfloat-specialize ============================================================================== --- stable/7/lib/libc/softfloat/softfloat-specialize Sun May 2 16:52:23 2010 (r207526) +++ stable/7/lib/libc/softfloat/softfloat-specialize Sun May 2 16:52:24 2010 (r207527) @@ -44,7 +44,11 @@ Underflow tininess-detection mode, stati #ifdef SOFTFLOAT_FOR_GCC static #endif +#ifdef __sparc64__ +int8 float_detect_tininess = float_tininess_before_rounding; +#else int8 float_detect_tininess = float_tininess_after_rounding; +#endif /* ------------------------------------------------------------------------------- From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 16:55:13 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E78C106566C; Sun, 2 May 2010 16:55:13 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 5E33F8FC13; Sun, 2 May 2010 16:55:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42GtDgo018403; Sun, 2 May 2010 16:55:13 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42GtDsd018401; Sun, 2 May 2010 16:55:13 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201005021655.o42GtDsd018401@svn.freebsd.org> From: Marius Strobl Date: Sun, 2 May 2010 16:55:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207529 - in stable/7/tools/test: . testfloat X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 16:55:13 -0000 Author: marius Date: Sun May 2 16:55:13 2010 New Revision: 207529 URL: http://svn.freebsd.org/changeset/base/207529 Log: MFC: r207151 Add a TestFloat based test suite for floating-point implementations currently supporting sparc64. After a `make depend all` there are three programs; testsoftfloat for testing against the SoftFloat in src/lib/libc/softfloat for reference purposes, testemufloat for testing the emulator source in src/lib/libc/sparc64/fpu and testfloat for testing with the installed libc. Support for other architectures can be added as needed. PR: 144900 Submitted by: Peter Jeremy Added: stable/7/tools/test/testfloat/ - copied from r207151, head/tools/test/testfloat/ Modified: stable/7/tools/test/README Directory Properties: stable/7/tools/test/ (props changed) Modified: stable/7/tools/test/README ============================================================================== --- stable/7/tools/test/README Sun May 2 16:55:10 2010 (r207528) +++ stable/7/tools/test/README Sun May 2 16:55:13 2010 (r207529) @@ -10,3 +10,4 @@ Please make a subdir per program, and ad devrandom Programs to test /dev/*random. malloc A program to test and benchmark malloc(). posixshm A program to test POSIX shared memory. +testfloat Programs to test floating-point implementations From owner-svn-src-stable-7@FreeBSD.ORG Sun May 2 20:12:21 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F38FE1065673; Sun, 2 May 2010 20:12:20 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id E28468FC13; Sun, 2 May 2010 20:12:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42KCKxr061706; Sun, 2 May 2010 20:12:20 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42KCKq0061704; Sun, 2 May 2010 20:12:20 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201005022012.o42KCKq0061704@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 2 May 2010 20:12:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207538 - stable/7/lib/csu/i386-elf X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 20:12:21 -0000 Author: jilles Date: Sun May 2 20:12:20 2010 New Revision: 207538 URL: http://svn.freebsd.org/changeset/base/207538 Log: MFC r205398: Do not create *.gmon files for PIE executables on i386. Scrt1_c.o was accidentally compiled with -DGCRT (profiling), like gcrt1_c.o. This problem is i386-specific, the other architectures are OK. If you have problems with PIE executables such as samba and cups leaving behind gmon files, rebuild them after installing this change. PR: ports/143924 Modified: stable/7/lib/csu/i386-elf/Makefile Directory Properties: stable/7/lib/csu/ (props changed) Modified: stable/7/lib/csu/i386-elf/Makefile ============================================================================== --- stable/7/lib/csu/i386-elf/Makefile Sun May 2 19:38:17 2010 (r207537) +++ stable/7/lib/csu/i386-elf/Makefile Sun May 2 20:12:20 2010 (r207538) @@ -24,7 +24,7 @@ crt1.o: crt1_c.o crt1_s.o objcopy --localize-symbol _start1 crt1.o Scrt1_c.o: crt1_c.c - ${CC} ${CFLAGS} -DGCRT -fPIC -DPIC -c -o Scrt1_c.o ${.CURDIR}/crt1_c.c + ${CC} ${CFLAGS} -fPIC -DPIC -c -o Scrt1_c.o ${.CURDIR}/crt1_c.c Scrt1.o: Scrt1_c.o crt1_s.o ${LD} ${LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o From owner-svn-src-stable-7@FreeBSD.ORG Mon May 3 01:13:37 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E6C7E106566B; Mon, 3 May 2010 01:13:37 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id D58E98FC18; Mon, 3 May 2010 01:13:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o431DbkG028011; Mon, 3 May 2010 01:13:37 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o431DbYf028009; Mon, 3 May 2010 01:13:37 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005030113.o431DbYf028009@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 3 May 2010 01:13:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207547 - stable/7/sys/dev/ale X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2010 01:13:38 -0000 Author: yongari Date: Mon May 3 01:13:37 2010 New Revision: 207547 URL: http://svn.freebsd.org/changeset/base/207547 Log: MFC r207251: It seems ale(4) controllers do not like to see TCP payload in the first descriptor in TSO case. Otherwise controller can generate bad frames during TSO. To address it, make sure to pull up ethernet + IP + TCP header with options in first buffer. Also ensure the buffer length of the first descriptor for TSO covers entire ethernet + IP + TCP with options and setup additional Tx descriptor if the first buffer includes TCP payload. Tested by: Amar Takhar darkbeer dot org > Modified: stable/7/sys/dev/ale/if_ale.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/ale/if_ale.c ============================================================================== --- stable/7/sys/dev/ale/if_ale.c Mon May 3 01:04:44 2010 (r207546) +++ stable/7/sys/dev/ale/if_ale.c Mon May 3 01:13:37 2010 (r207547) @@ -1585,7 +1585,7 @@ ale_encap(struct ale_softc *sc, struct m struct tcphdr *tcp; bus_dma_segment_t txsegs[ALE_MAXTXSEGS]; bus_dmamap_t map; - uint32_t cflags, ip_off, poff, vtag; + uint32_t cflags, hdrlen, ip_off, poff, vtag; int error, i, nsegs, prod, si; ALE_LOCK_ASSERT(sc); @@ -1678,6 +1678,11 @@ ale_encap(struct ale_softc *sc, struct m return (ENOBUFS); } tcp = (struct tcphdr *)(mtod(m, char *) + poff); + m = m_pullup(m, poff + (tcp->th_off << 2)); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } /* * AR81xx requires IP/TCP header size and offset as * well as TCP pseudo checksum which complicates @@ -1730,7 +1735,7 @@ ale_encap(struct ale_softc *sc, struct m } /* Check descriptor overrun. */ - if (sc->ale_cdata.ale_tx_cnt + nsegs >= ALE_TX_RING_CNT - 2) { + if (sc->ale_cdata.ale_tx_cnt + nsegs >= ALE_TX_RING_CNT - 3) { bus_dmamap_unload(sc->ale_cdata.ale_tx_tag, map); return (ENOBUFS); } @@ -1782,8 +1787,32 @@ ale_encap(struct ale_softc *sc, struct m cflags |= ALE_TD_INSERT_VLAN_TAG; } - desc = NULL; - for (i = 0; i < nsegs; i++) { + i = 0; + if ((m->m_pkthdr.csum_flags & CSUM_TSO) != 0) { + /* + * Make sure the first fragment contains + * only ethernet and IP/TCP header with options. + */ + hdrlen = poff + (tcp->th_off << 2); + desc = &sc->ale_cdata.ale_tx_ring[prod]; + desc->addr = htole64(txsegs[i].ds_addr); + desc->len = htole32(ALE_TX_BYTES(hdrlen) | vtag); + desc->flags = htole32(cflags); + sc->ale_cdata.ale_tx_cnt++; + ALE_DESC_INC(prod, ALE_TX_RING_CNT); + if (m->m_len - hdrlen > 0) { + /* Handle remaining payload of the first fragment. */ + desc = &sc->ale_cdata.ale_tx_ring[prod]; + desc->addr = htole64(txsegs[i].ds_addr + hdrlen); + desc->len = htole32(ALE_TX_BYTES(m->m_len - hdrlen) | + vtag); + desc->flags = htole32(cflags); + sc->ale_cdata.ale_tx_cnt++; + ALE_DESC_INC(prod, ALE_TX_RING_CNT); + } + i = 1; + } + for (; i < nsegs; i++) { desc = &sc->ale_cdata.ale_tx_ring[prod]; desc->addr = htole64(txsegs[i].ds_addr); desc->len = htole32(ALE_TX_BYTES(txsegs[i].ds_len) | vtag); From owner-svn-src-stable-7@FreeBSD.ORG Mon May 3 12:06:41 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 55602106566B; Mon, 3 May 2010 12:06:41 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 44F548FC13; Mon, 3 May 2010 12:06:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o43C6feB073540; Mon, 3 May 2010 12:06:41 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o43C6fox073538; Mon, 3 May 2010 12:06:41 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201005031206.o43C6fox073538@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 3 May 2010 12:06:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207563 - stable/7/sys/fs/msdosfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2010 12:06:41 -0000 Author: kib Date: Mon May 3 12:06:40 2010 New Revision: 207563 URL: http://svn.freebsd.org/changeset/base/207563 Log: MFC r203822: Remove unused macros. Modified: stable/7/sys/fs/msdosfs/denode.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/fs/msdosfs/denode.h ============================================================================== --- stable/7/sys/fs/msdosfs/denode.h Mon May 3 10:07:06 2010 (r207562) +++ stable/7/sys/fs/msdosfs/denode.h Mon May 3 12:06:40 2010 (r207563) @@ -215,9 +215,6 @@ struct denode { ((dep)->de_Attributes & ATTR_DIRECTORY) ? 0 : (dep)->de_FileSize), \ putushort((dp)->deHighClust, (dep)->de_StartCluster >> 16)) -#define de_forw de_chain[0] -#define de_back de_chain[1] - #ifdef _KERNEL #define VTODE(vp) ((struct denode *)(vp)->v_data) From owner-svn-src-stable-7@FreeBSD.ORG Mon May 3 17:34:12 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7B52E106566B; Mon, 3 May 2010 17:34:12 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 6A9E08FC19; Mon, 3 May 2010 17:34:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o43HYCC0046218; Mon, 3 May 2010 17:34:12 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o43HYC0t046216; Mon, 3 May 2010 17:34:12 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201005031734.o43HYC0t046216@svn.freebsd.org> From: Xin LI Date: Mon, 3 May 2010 17:34:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207575 - stable/7/gnu/usr.bin/groff/tmac X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2010 17:34:12 -0000 Author: delphij Date: Mon May 3 17:34:12 2010 New Revision: 207575 URL: http://svn.freebsd.org/changeset/base/207575 Log: MFC r196432 (partial, kensmith@) and 207383: Add definition for FreeBSD 8.1 and 9.0. Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local (contents, props changed) Directory Properties: stable/7/gnu/usr.bin/groff/ (props changed) Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- stable/7/gnu/usr.bin/groff/tmac/mdoc.local Mon May 3 16:55:50 2010 (r207574) +++ stable/7/gnu/usr.bin/groff/tmac/mdoc.local Mon May 3 17:34:12 2010 (r207575) @@ -73,6 +73,8 @@ .ds doc-operating-system-FreeBSD-7.2 7.2 .ds doc-operating-system-FreeBSD-7.3 7.3 .ds doc-operating-system-FreeBSD-8.0 8.0 +.ds doc-operating-system-FreeBSD-8.1 8.1 +.ds doc-operating-system-FreeBSD-9.0 9.0 . .ec . From owner-svn-src-stable-7@FreeBSD.ORG Mon May 3 22:09:06 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 64572106566C; Mon, 3 May 2010 22:09:06 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 493ED8FC1C; Mon, 3 May 2010 22:09:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o43M96rB014903; Mon, 3 May 2010 22:09:06 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o43M96UF014900; Mon, 3 May 2010 22:09:06 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201005032209.o43M96UF014900@svn.freebsd.org> From: Xin LI Date: Mon, 3 May 2010 22:09:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207587 - stable/7/usr.sbin/newsyslog X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2010 22:09:06 -0000 Author: delphij Date: Mon May 3 22:09:06 2010 New Revision: 207587 URL: http://svn.freebsd.org/changeset/base/207587 Log: MFC r202668 and r200806 [1]: Add a new option, -P, which reverts newsyslog(8) to the old behavior, which stops to proceed further, as it is possible that processes which fails to create PID file get screwed by rotation. ---- Don't consider non-existence of a PID file an error, we should be able to proceed anyway as this most likely mean that the process has been terminated. PR: bin/140397 Submitted by: Dan Lukes Modified: stable/7/usr.sbin/newsyslog/newsyslog.8 stable/7/usr.sbin/newsyslog/newsyslog.c Directory Properties: stable/7/usr.sbin/newsyslog/ (props changed) stable/7/usr.sbin/newsyslog/newsyslog.conf.5 (props changed) Modified: stable/7/usr.sbin/newsyslog/newsyslog.8 ============================================================================== --- stable/7/usr.sbin/newsyslog/newsyslog.8 Mon May 3 20:59:27 2010 (r207586) +++ stable/7/usr.sbin/newsyslog/newsyslog.8 Mon May 3 22:09:06 2010 (r207587) @@ -17,7 +17,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd February 24, 2005 +.Dd January 19, 2010 .Dt NEWSYSLOG 8 .Os .Sh NAME @@ -25,7 +25,7 @@ .Nd maintain system log files to manageable sizes .Sh SYNOPSIS .Nm -.Op Fl CFNnrsv +.Op Fl CFNPnrsv .Op Fl R Ar tagname .Op Fl a Ar directory .Op Fl d Ar directory @@ -169,6 +169,10 @@ This option is intended to be used with or .Fl CC options when creating log files is the only objective. +.It Fl P +Prevent further action if we should send signal but the +.Dq pidfile +is empty or does not exist. .It Fl R Ar tagname Specify that .Nm Modified: stable/7/usr.sbin/newsyslog/newsyslog.c ============================================================================== --- stable/7/usr.sbin/newsyslog/newsyslog.c Mon May 3 20:59:27 2010 (r207586) +++ stable/7/usr.sbin/newsyslog/newsyslog.c Mon May 3 22:09:06 2010 (r207587) @@ -167,6 +167,7 @@ int needroot = 1; /* Root privs are nec int noaction = 0; /* Don't do anything, just show it */ int norotate = 0; /* Don't rotate */ int nosignal; /* Do not send any signals */ +int enforcepid = 0; /* If PID file does not exist or empty, do nothing */ int force = 0; /* Force the trim no matter what */ int rotatereq = 0; /* -R = Always rotate the file(s) as given */ /* on the command (this also requires */ @@ -580,7 +581,7 @@ parse_args(int argc, char **argv) *p = '\0'; /* Parse command line options. */ - while ((ch = getopt(argc, argv, "a:d:f:nrsvCD:FNR:")) != -1) + while ((ch = getopt(argc, argv, "a:d:f:nrsvCD:FNPR:")) != -1) switch (ch) { case 'a': archtodir++; @@ -624,6 +625,9 @@ parse_args(int argc, char **argv) case 'N': norotate++; break; + case 'P': + enforcepid++; + break; case 'R': rotatereq++; requestor = strdup(optarg); @@ -1779,7 +1783,18 @@ set_swpid(struct sigwork_entry *swork, c f = fopen(ent->pid_file, "r"); if (f == NULL) { - warn("can't open pid file: %s", ent->pid_file); + if (errno == ENOENT && enforcepid == 0) { + /* + * Warn if the PID file doesn't exist, but do + * not consider it an error. Most likely it + * means the process has been terminated, + * so it should be safe to rotate any log + * files that the process would have been using. + */ + swork->sw_pidok = 1; + warnx("pid file doesn't exist: %s", ent->pid_file); + } else + warn("can't open pid file: %s", ent->pid_file); return; } @@ -1790,7 +1805,7 @@ set_swpid(struct sigwork_entry *swork, c * has terminated, so it should be safe to rotate any * log files that the process would have been using. */ - if (feof(f)) { + if (feof(f) && enforcepid == 0) { swork->sw_pidok = 1; warnx("pid file is empty: %s", ent->pid_file); } else From owner-svn-src-stable-7@FreeBSD.ORG Tue May 4 04:02:43 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5A5A4106566C; Tue, 4 May 2010 04:02:43 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 488D58FC14; Tue, 4 May 2010 04:02:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4442hx9094477; Tue, 4 May 2010 04:02:43 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4442hZQ094475; Tue, 4 May 2010 04:02:43 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201005040402.o4442hZQ094475@svn.freebsd.org> From: Warner Losh Date: Tue, 4 May 2010 04:02:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207594 - stable/7/usr.sbin/config X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2010 04:02:43 -0000 Author: imp Date: Tue May 4 04:02:43 2010 New Revision: 207594 URL: http://svn.freebsd.org/changeset/base/207594 Log: MFC r188214 (by wkoszek): Make config -x only return non-zero characters, so that: config -x | grep just works. Reported by: Danny Braniss Modified: stable/7/usr.sbin/config/main.c Directory Properties: stable/7/usr.sbin/config/ (props changed) Modified: stable/7/usr.sbin/config/main.c ============================================================================== --- stable/7/usr.sbin/config/main.c Tue May 4 03:56:25 2010 (r207593) +++ stable/7/usr.sbin/config/main.c Tue May 4 04:02:43 2010 (r207594) @@ -667,7 +667,7 @@ kernconfdump(const char *file) struct stat st; FILE *fp, *pp; int error, len, osz, r; - unsigned int off, size; + unsigned int i, off, size; char *cmd, *o; r = open(file, O_RDONLY); @@ -705,7 +705,18 @@ kernconfdump(const char *file) r = fseek(fp, off, SEEK_CUR); if (r != 0) errx(EXIT_FAILURE, "fseek() failed"); - while ((r = fgetc(fp)) != EOF && size-- > 0) + for (i = 0; i < size - 1; i++) { + r = fgetc(fp); + if (r == EOF) + break; + /* + * If '\0' is present in the middle of the configuration + * string, this means something very weird is happening. + * Make such case very visible. + */ + assert(r != '\0' && ("Char present in the configuration " + "string mustn't be equal to 0")); fputc(r, stdout); + } fclose(fp); } From owner-svn-src-stable-7@FreeBSD.ORG Tue May 4 04:04:37 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C49E4106564A; Tue, 4 May 2010 04:04:37 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id B28498FC14; Tue, 4 May 2010 04:04:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4444bA2094949; Tue, 4 May 2010 04:04:37 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4444bRM094947; Tue, 4 May 2010 04:04:37 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201005040404.o4444bRM094947@svn.freebsd.org> From: Warner Losh Date: Tue, 4 May 2010 04:04:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207595 - stable/7/usr.sbin/config X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2010 04:04:37 -0000 Author: imp Date: Tue May 4 04:04:37 2010 New Revision: 207595 URL: http://svn.freebsd.org/changeset/base/207595 Log: MFC r207461: sparc64, and possibly other architectures, pads the length of the section holding the config file to sh_addralign bytes using NULs. This bogusly triggers an assert. Break out of the loop when we hit a NUL within that many bytes of the end. Modified: stable/7/usr.sbin/config/main.c Directory Properties: stable/7/usr.sbin/config/ (props changed) Modified: stable/7/usr.sbin/config/main.c ============================================================================== --- stable/7/usr.sbin/config/main.c Tue May 4 04:02:43 2010 (r207594) +++ stable/7/usr.sbin/config/main.c Tue May 4 04:04:37 2010 (r207595) @@ -667,7 +667,7 @@ kernconfdump(const char *file) struct stat st; FILE *fp, *pp; int error, len, osz, r; - unsigned int i, off, size; + unsigned int i, off, size, t1, t2, align; char *cmd, *o; r = open(file, O_RDONLY); @@ -686,8 +686,8 @@ kernconfdump(const char *file) if (o == NULL) errx(EXIT_FAILURE, "Couldn't allocate memory"); /* ELF note section header. */ - asprintf(&cmd, "/usr/bin/elfdump -c %s | grep -A 5 kern_conf" - "| tail -2 | cut -d ' ' -f 2 | paste - - -", file); + asprintf(&cmd, "/usr/bin/elfdump -c %s | grep -A 8 kern_conf" + "| tail -5 | cut -d ' ' -f 2 | paste - - - - -", file); if (cmd == NULL) errx(EXIT_FAILURE, "asprintf() failed"); pp = popen(cmd, "r"); @@ -696,24 +696,28 @@ kernconfdump(const char *file) free(cmd); len = fread(o, osz, 1, pp); pclose(pp); - r = sscanf(o, "%d\t%d", &off, &size); + r = sscanf(o, "%d%d%d%d%d", &off, &size, &t1, &t2, &align); free(o); - if (r != 2) + if (r != 5) errx(EXIT_FAILURE, "File %s doesn't contain configuration " "file. Either unsupported, or not compiled with " "INCLUDE_CONFIG_FILE", file); r = fseek(fp, off, SEEK_CUR); if (r != 0) errx(EXIT_FAILURE, "fseek() failed"); - for (i = 0; i < size - 1; i++) { + for (i = 0; i < size; i++) { r = fgetc(fp); if (r == EOF) break; /* * If '\0' is present in the middle of the configuration * string, this means something very weird is happening. - * Make such case very visible. + * Make such case very visible. However, some architectures + * pad the length of the section with NULs to a multiple of + * sh_addralign, allow a NUL in that part of the section. */ + if (r == '\0' && (size - i) < align) + break; assert(r != '\0' && ("Char present in the configuration " "string mustn't be equal to 0")); fputc(r, stdout); From owner-svn-src-stable-7@FreeBSD.ORG Tue May 4 15:52:17 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7A1BA1065674; Tue, 4 May 2010 15:52:17 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 67F768FC0C; Tue, 4 May 2010 15:52:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o44FqHmA063429; Tue, 4 May 2010 15:52:17 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o44FqHlj063427; Tue, 4 May 2010 15:52:17 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201005041552.o44FqHlj063427@svn.freebsd.org> From: Brooks Davis Date: Tue, 4 May 2010 15:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207616 - stable/7/share/misc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2010 15:52:17 -0000 Author: brooks Date: Tue May 4 15:52:17 2010 New Revision: 207616 URL: http://svn.freebsd.org/changeset/base/207616 Log: MFC r205073 Regen: * Hart: rev 671 of pcidevs.txt; 22-01-2008 (D-M-Y). * Boemler: vendors.txt (2010-03126) PR: kern/133733 Modified: stable/7/share/misc/pci_vendors (contents, props changed) Directory Properties: stable/7/share/misc/ (props changed) stable/7/share/misc/iso639 (props changed) Modified: stable/7/share/misc/pci_vendors ============================================================================== --- stable/7/share/misc/pci_vendors Tue May 4 15:29:07 2010 (r207615) +++ stable/7/share/misc/pci_vendors Tue May 4 15:52:17 2010 (r207616) @@ -18,7 +18,7 @@ 4001 WinTV PVR-250 (v1) 4009 WinTV PVR-250 4801 WinTV PVR-250 MCE - 6800 Hauppage Nova -TD-500 DVB-T Tuner Device + 6800 Hauppage Nova -TD-500 DVB-T Tuner Device ( PCIVEN_1131&DEV_7130&SUBSYS_40510000&REV_014&3B) 0071 Nebula Electronics Ltd 0100 Ncipher Corp Ltd 0123 General Dynamics @@ -44,6 +44,10 @@ 8519 OV519 series 05E3 CyberDoor 0701 CBD516 +064E SUYIN Corporation + A101 Acer Crystal Eye Webcam (suYin) + A103 WebCam (SuYin) + D101 Web Cam (SuYin) 066F Sigmatel Inc 3410 SMTP3410 3500 SMTP3500 @@ -54,6 +58,8 @@ 1704 ISDN Adapter (PCI Bus, D, C) 067B Prolific Technology Inc 2303 PL-2303 USB-to-Serial Converter + 2305 USB-to-Printer Bridge Controller (PL-2305) + 2393 prolific (prolific) 3507 PL-3507 Hi-Speed USB & IEEE 1394 Combo to IDE Bridge Controller 069D Hughes Network Systems (HNS) 0700 Stream Machine @@ -70,7 +76,7 @@ 09C1 Arris 0704 CM 200E Cable Modem 0A5C Broadcom Corporation - 0201 Broadcom USB iLine10(tm) Network Adapter + 0201 Broadcom USB iLine10(tm) Network Adapter (Broadcom NetXtreme BCM5782 Gigabie Ethernet Contro) 2000 Broadcom Bluetooth Firmware Upgrade Device 2009 Broadcom Bluetooth Controller 200A Broadcom Bluetooth Controller @@ -84,17 +90,17 @@ 2038 Broadcom Blutonium Device Firmware Downloader (BCM2038) 2039 BROADCOM Bluetooth Device 2045 Broadcom Bluetooth Controller - 2046 Broadcom USB Bluetooth Device + 2046 Broadcom USB Bluetooth Device ( 5738z) 2047 Broadcom USB Bluetooth Device 205E Broadcom Bluetooth Firmware Upgrade Device - 2100 Broadcom Bluetooth 2.0+eDR USB dongle - 2101 Broadcom Bluetooth 2.0+EDR USB dongle - 2102 ANYCOM Blue USB-200/250 + 2100 Broadcom Bluetooth 2.0+eDR USB dongle (BT 50) + 2101 Broadcom Bluetooth 2.0+EDR USB dongle ( 5&11BBCF3F&0&2) + 2102 ANYCOM Blue USB-200/250 ( USBVID_04B4&PID_21025&38CD4C16&0&6) 2110 Broadcom Bluetooth Controller 2111 ANYCOM Blue USB-UHE 200/250 2120 Broadcom 2045 Bluetooth 2.0 USB-UHE Device with trace filter ( 2045) 2121 Broadcom 2045 Bluetooth 2.0 USB Device with trace filter - 2122 Broadcom Bluetooth 2.0+EDR USB dongle + 2122 Broadcom Bluetooth 2.0+EDR USB dongle ( BCM92045B3) 2124 2045B3ROM Bluetooth Dongle 2130 Broadcom 2045 Bluetooth 2.0 USB-UHE Device with trace filter 2131 Broadcom 2045 Bluetooth 2.0 USB Device with trace filter @@ -104,7 +110,7 @@ 2143 2046 Flash non UHE Class 1 2144 2046 Flash non UHE module Class 2 2145 Broadcom BCM9204MD LENO Module - 2146 Broadcom 2046 Bluetooth 2.1 USB UHE Dongle + 2146 Broadcom 2045 Bluetooth 2.1 USB UHE Dongle 2147 Broadcom 2046 Bluetooth 2.1 USB Dongle 2148 Broadcom 2046 Bluetooth 2.1 USB UHE Dongle 2149 Broadcom 2046 Bluetooth 2.1 USB Dongle @@ -122,8 +128,9 @@ 2155 Broadcom Bluetooth USB Dongle 2157 BCM2046 B1 USB 500 2158 Broadcom 2046 Bluetooth 2.1 Device - 4502 USB Human Interface Device - 4503 USB Human Interface Device + 4500 Broadcom 2046 Bluetooth 2.1 USB Dongle (BCM2046B1) + 4502 Broadcom 2046 Bluetooth 2.1 USB Dongle (BCM2046B1) + 4503 Broadcom 2046 Bluetooth 2.1 USB Dongle ( BCM2046B1) 5800 Unified Security Hub 6300 Pirelli ISB Remote NDIS Device 0A89 BREA Technologies Inc @@ -144,17 +151,22 @@ 0A06 RCB672FXX 672-channel modular analog telphony card 0B49 ASCII Corporation 064F Trance Vibrator +0C45 Microdia Ltd. + 602D USB Webcam (7&2BE7B8E3&0&4) + 6130 USB CAMERA (5&3512B308&0&1) 0E11 Compaq Computer Corp (Now owned by Hewlett-Packard) 0001 PCI to EISA Bridge - 0002 PCI to ISA Bridge + 0002 PCI to ISA Bridge (ISA Bridge) 000F StorageWorks Library Adapter (HVD) (CPQB1A9) 0012 686P7 (686P7) - 0046 Smart Array 64xx/6i Controller + 0046 Smart Array 6400 Controller (N/A) 0049 Gigabit Upgrade Module (NC7132) 004A Gigabit Server Adapter (NC6136) + 005A HP Remote Insight Lights-Out II Board (PowerPC 405GP processor at 200MHz [3305103C]) 007C NC7770 1000BaseTX 007D NC6770 1000BaseTX 0085 NC7780 1000BaseTX + 00B1 HP Remote Insight Lights-Out II PCI Device (3305103C) 00BB NC7760 00C0 AIC-7899G 64-bit, 66MHz Dual Channel Wide Ultra3 SCSI Controller 00CA NC7771 @@ -201,8 +213,8 @@ AE29 PCI to ISA Bridge (MIS-L) AE2A CPU to PCI Bridge (MPC) AE2B PCI to ISA PnP Bridge (MIS-E) - AE31 System Management Controller (1002&DEV-4385&SUBSY) - AE32 Netelligent 10/100 TX PCI UTP TLAN 2.3 + AE31 System Management Controller (1002&DEV-5653&SUBSYS) + AE32 Netelligent 10/100 TX PCI UTP TLAN 2.3 (950) AE33 Dual EIDE Controller (Triflex) AE34 Netelligent 10 T PCI UTP TLAN 2.3 AE35 Integrated NetFlex-3/P TLAN 2.3 @@ -321,70 +333,70 @@ 0017 PROTO-3 PCI, digital I/O with chipselect (ispLSI1032E) 0020 Universal digital I/O PCI-Interface (ispLSI1032E) 1002 ATI Technologies Inc. / Advanced Micro Devices, Inc. - 0B12 ati 1900 (ati 1900) + 0B12 ATI Radeon X1900 (R580) 1002 0F2A1787 (0F2A1787) - 3150 Radeon Mobility X600 (M24 1P) - 3151 FIREMV 2400 - 3152 Mobility Radeon X300 - 3154 Mobility FireGL V3200 - 3171 FireMV 2400 Secondary - 3E50 Radeon X600/X650 Series - 3E54 FireGL V3200 (RV380) - 3E70 Radeon X600 Series Secondary - 3E74 FIREGL V3200 Secondary + 3150 ATI MOBILITY /ATI RADEON X600 (M24) + 3151 ATI FireMV 2400 (RV380) + 3152 ATI MOBILITY /ATI RADEON X300 (M24) + 3154 ATI MOBILITY FireGL V3200 (M24GL) + 3171 ATI FireMV 2400 Secondary (RV380) + 3E50 ATI RADEON X600/X550 Series (RV380) + 3E54 ATI FireGL V3200 (RV380GL) + 3E70 ATI RADEON X600/X550 Series Secondary (RV380) + 3E74 ATI FireGL V3200 Secondary (RV380GL) 4136 Radeon IGP 320 (A3) 4137 Radeon IGP 340 (RS200) 4144 Radeon 9500 Series (R300) 4145 Radeon 9200 (M+X) (R300) - 4146 Radeon 9700 (R300) + 4146 ATI RADEON 9600TX (R300) 4147 Fire GL Z1 AGP/Pro Video Accelerator (128 MB, 4P) - 4148 Radeon 9800 SE (R350) - 4149 Radeon 9500 Family + 4148 ATI RADEON 9800 SE (R350) + 4149 ATI RADEON 9500 (R350) 414A Radeon 9800 Family 414B Fire GL X2 - 4150 Radeon 9600 Series (V350) - 4151 Radeon 9600 (RV350) - 4152 Radeon 9600 XT (RV360) - 4153 Radeon 9550 (RV350) - 4154 Fire GL T2 - 4155 Fire GL T2 + 4150 ATI RADEON 9600 Series (RV350) + 4151 ATI RADEON 9600 Series (RV350) + 4152 ATI RADEON 9600 Series (RV360) + 4153 ATI RADEON 9550/X1050 Series (RV350) + 4154 ATI FireGL T2 (RV350GL) + 4155 ATI RADEON 9600 Series (RV350) 4156 Fire GL T2 4157 Fire GL T2 - 4158 vga video (4c59h) - 4164 R300 (128bit mem bus) (Radeon 9500 Series, secondary) + 4158 Mach32 (68800AX) + 4164 Radeon 9500 Series (R300) - Secondary 4165 Radeon 9700 Pro (R300 AE) - Secondary - 4166 Radeon 9600TX - Secondary + 4166 ATI RADEON 9600TX Secondary (R300) 4167 Fire GL Z1 AGP/Pro Secondary Video Accelerator (128 MB, 4P) - 4168 Radeon 9800 SE - Secondary (R350) - 4169 Radeon 9500 Family - Secondary - 4170 Radeon 9600 - Secondary (RV350) - 4171 Radeon 9600 (RV350) - Secondary - 4172 Radeon 9600 XT - Secondary (RV360) - 4173 Radeon 9550 - Secondary (RV350) - 4174 FireGL T2 - Seocndary - 4175 Radeon 9600 Series Secondary + 4168 ATI RADEON 9800 SE Secondary (R350) + 4169 ATI RADEON 9500 Secondary (R350) + 4170 ATI RADEON 9600 Series Secondary (RV350) + 4171 ATI RADEON 9600 Series Secondary (RV350) + 4172 ATI RADEON 9600 Series Secondary (RV360) + 4173 ATI RADEON 9550/X1050 Series Secondary (RV350) + 4174 ATI FireGL T2 Secondary (RV350GL) + 4175 ATI RADEON 9600 Series Secondary (RV350) 4237 Radeon 7000 IGP 4242 All-In-Wonder 8500DV (R200AIW) 4243 Radeon 8500 DV OHCI FireWire Controller 4336 Radeon IGP 320M (rs200) 4337 Mobility M6 (U2) (RS200M) - 4341 AC'97 Audio Controller (AD1981) - 4342 HUB Bridge (IXP 150) - 4345 EHCI USB Controller (IXP 150) - 4347 OHCI USB Controller *1 (IXP 150) - 4348 OHCI USB Controller *2 (IXP 150) - 4349 PATA 100 Controller (IXP 1xx/2xx) - 434C LPC Controller (IXP 150) - 434D Agere Systems AC'97 Modem device (a75-s226) + 4341 AC'97 Audio Controller (SB200) + 4342 PCI-PCI Bridge (SB200) + 4345 EHCI USB Controller (SB200) + 4347 OHCI USB Controller *1 + 4348 OHCI USB Controller *2 + 4349 PATA-100 IDE Controller (SB200) + 434C PCI-ISA Bridge (SB200) + 434D AC'97 Modem Controller (SB200) 4353 IXP SB200 SMBUS Controller - 4354 mach64 ct pci (215r2qzua21) - 4358 Mach64 CX (216l0sas25) + 4354 Mach64 CT (215CT222) + 4358 Mach64 CX (210888CX) 4361 AC'97 Audio Controller 4363 IXP SB300 SMBUS Controller 4369 PATA 133 Controller (IXP 3xx) 436D IXP SB300 AC'97 Modem Controller 436E IXP SB300 Serial ATA Controller - 4370 IXP AC'97 Audio Controller (IXP_AUDIO_400) + 4370 IXP SB400 AC'97 Audio Controller 4371 IXP SB400 PCI-PCI Bridge 4372 ATI SMBus (x200) 4373 IXP SB400 EHCI USB 2.0 Controller @@ -395,7 +407,7 @@ 4378 IXP SB400 AC'97 Modem Controller 4379 IXP SB400 Serial ATA Controller 437A IXP SB400 Serial ATA Controller - 437B IXP SB450 High Definition Audio Controller (Intel Corporation) + 437B IXP SB450 High Definition Audio Controller 4380 IXP SB600 Serial ATA Controller 4381 IXP SB600 Serial ATA RAID Controller 4382 IXP SB600 AC'97 Audio Controller @@ -409,9 +421,9 @@ 438A IXP SB600 USB Controller (OHCI3) 438B IXP SB600 USB Controller (OHCI4) 438C ATI RD600/RS600 IDE Controller (RD600/RS600) - 438D ATK0110 ACPI Utility (1043.4.0.0) + 438D IXP SB600 PCI to LPC Bridge 438E IXP SB600 AC'97 Modem Controller - 4390 SB700 SATA Controller [IDE mode] + 4390 Integrated SATA II Controller (SB700) 4391 SB700 SATA Controller [AHCI mode] 4392 SB700 SATA Controller [Non-RAID5 mode] 4393 SB700 SATA Controller [RAID5 mode] @@ -419,16 +431,16 @@ 4395 SB SATA Controller [AHCI mode with HyperFlash-PCIE] 4396 SB700 USB EHCI Controller 4397 SB700 USB OHCI0 Controller - 4398 SB700 USB OHCI1 Controller + 4398 Standard OpenHCD USB-Hostcontroller (SB700) 4399 SB700 USB OHCI2 Controller 439C PATA 133 Controller (SB7xx) 439D SB700 LPC host controller 4437 Radeon Mobility 7000 IGP 4554 Mach64 ET 4654 113--34004-104 (Mach64 VT) - 4742 ATI 3D Rage Pro AGP 2X 8mb (gt-c2u2) ((GT-C2U2)) + 4742 3D Rage Pro AGP 1X/2X ((GT-C2U2)) 4744 Rage 3D Pro AGP 2x (Rage 3D Pro AGP 2x) - 4747 GT-C2U2 (Rage 3D Pro) + 4747 Rage 3D Pro (GT-C2U2) 4749 ATI ALL IN WONDER PRO (8MB) (RAGE PRO TURBO AGP 2X) 474C k7 som+ (Rage XC PCI-66) 474D SLAT (Rage XL AGP 2x) @@ -442,7 +454,7 @@ 4755 3d rage 2 + dvd (Rage 3D II+pci) 4756 Rage 3D IIC PCI [Mach64 GT IIC] (PQFP Package) 4757 Rage 3D IIC AGP (BGA Package) - 4758 Mach 64 GT (210888GXControladores ATI 210888GX [Mach64 GX]) + 4758 Mach64 GX (210888GX) 4759 m3d agp card on agp slot (215r2qzua21) 475A Rage 3D IIC AGP (PQFP Package) 4964 Radeon 9000 Series (RV250 Id) @@ -451,33 +463,33 @@ 4967 Radeon 9000 (RV250) 496E Radeon 9000/9000 Pro - Secondary (RV250) 496F Radeon 9000 (RV250) - Secondary - 4A48 Radeon X800 Series (R420 JH) - 4A49 Radeon X800 gt (R423) - 4A4A Radeon X800 Series - 4A4B RADEON X800 XT (R420) - 4A4C Radeon X800 Series (R420 JL) - 4A4D FireGL X3 (R420 JM) - 4A4E Radeon Mobility 9800 (M18 JN) - 4A4F Radeon X800 SE - 4A50 Radeon X800 XT Platinum - 4A54 Radeon X800 VE (R420) - 4A68 Radeon X800 Series Secondary - 4A69 Radeon X800 Series - Secondary - 4A6A Radeon X800 Series - Secondary - 4A6B RADEON X800 XT Secondary (R420) - 4A6C Radeon X800 Series Secondary - 4A6D FIREGL X3-256 Secondary - 4A6F Radeon X800 SE Secondary - 4A70 Radeon X800 XT Platinum - Secondary - 4A74 Radeon X800 VE (R420) (Secondary) - 4B49 Radeon X850XT + 4A48 ATI RADEON X800 Series (R420) + 4A49 ATI RADEON X800 PRO (R420) + 4A4A ATI RADEON X800 Series (R420) + 4A4B ATI RADEON X800 XT (R420) + 4A4C ATI RADEON X800 Series (R420) + 4A4D ATI FireGL X3-256 (R420GL) + 4A4E ATI MOBILITY /ATI RADEON 9800 (M18) + 4A4F ATI RADEON X800 SE (R420) + 4A50 ATI RADEON X800 XT Platinum Edition (R420) + 4A54 ATI RADEON X800 VE (R420) + 4A68 ATI RADEON X800 Series Secondary (R420) + 4A69 ATI RADEON X800 PRO Secondary (R420) + 4A6A ATI RADEON X800 Series Secondary (R420) + 4A6B ATI RADEON X800 XT Secondary (R420) + 4A6C ATI RADEON X800 Series Secondary (R420) + 4A6D ATI FireGL X3-256 Secondary (R420GL) + 4A6F ATI RADEON X800 SE Secondary (R420) + 4A70 ATI RADEON X800 XT Platinum Edition Secondary (R420) + 4A74 ATI RADEON X800 VE Secondary (R420) + 4B49 ATI RADEON X850 XT (R481) 4B4A Radeon X850 SE - 4B4B Radeon X850 PRO - 4B4C Radeon X850XT-PE - 4B69 Radeon X850XT secondary - 4B6A Radeon X850 SE Secondary - 4B6B Radeon X850 PRO secondary - 4B6C Radeon X850XT-PE Secondary + 4B4B ATI RADEON X850 PRO (R481) + 4B4C ATI RADEON X850 XT Platinum Edition (R481) + 4B69 ATI RADEON X850 XT Secondary (R481) + 4B6A ATI RADEON X850 SE Secondary (R481) + 4B6B ATI RADEON X850 PRO Secondary (R481) + 4B6C ATI RADEON X850 XT Platinum Edition Secondary (R481) 4C42 Rage 3D LT Pro AGP 133MHz (BGA-312 Package) 4C44 Rage 3D LT Pro AGP 133 MHz (Rage 3D LT Pro AGP) 4C45 Rage Mobility M3 AGP @@ -486,18 +498,18 @@ 4C49 Rage 3D LT Pro PCI (BGA-312 Package) 4C4D Rage P/M Mobility AGP 2x (01541014) 4C4E Rage Mobility l (216lo sasa25) - 4C50 Rage 3D LT Pro PCI (VEN_1002&DEV_4C50&SUBSYS_4C501002&REV_DC) + 4C50 Rage 3D LT Pro PCI (BGA-256 Package) 4C51 Rage 3D LT Pro PCI (BGA-256 Package, Limited 3D) 4C52 Rage P/M Mobility PCI 4C53 Rage L Mobility PCI (216L0SASA25) 4C54 Mach64 LT (264LT) - 4C57 Mobility Radeon 7500 (fdds) + 4C57 Mobility Radeon 7500 (M7 [LW]) 4C58 FireGL Mobility 4C59 Radeon Mobility M6 Series (Mobility 6) 4C5A Radeon Mobility M6 LZ 4C64 Radeon Mobility M9-GL 4C65 Radeon Mobility 9000 (R250 Le) - 4C66 Radeon Mobility 9000 series (ATI MOBILITY RADEON 9000 (Microsoft Corporation -) + 4C66 MOBILITY RADEON 9000 (M9) (R250) 4C67 Radeon Mobility 9000 (R250 Lg) 4C6E Radeon Mobility 9000 - Secondary (R250 Ln) 4D46 Rage Mobility 128 AGP 4x (ATI mobility128) @@ -507,27 +519,27 @@ 4D52 ATI Theater 550 Pro (ATI Theater 550 Pro) 4D53 Unified AVStream Driver 4E44 Radeon 9700/Pro, 9500 Series (R300) - 4E45 Radeon 9700/9500 Series (R300) - 4E46 Radeon 9600TX (R300) + 4E45 ATI RADEON 9500 PRO / 9700 (R300) + 4E46 ATI RADEON 9600 TX (R300) 4E47 Fire GL X1/Z1 AGP/Pro Video Accelerator (R300-WS) - 4E48 Radeon 9800 Pro (R350) + 4E48 ATI RADEON 9800 PRO (R350) 4E49 Radeon 9800 (R350) (??) - 4E4A Radeon 9800 XT (R350) - 4E4B ATI FIREGL X2-256T (FGL9800XT) - 4E50 Mobility Radeon 9700 (M10 NP) (RV350) - 4E51 Mobility Radeon 9600 (M10 NQ) + 4E4A ATI RADEON 9800 XT (R360) + 4E4B ATI FireGL X2-256/X2-256t (R350GL) + 4E50 ATI MOBILITY /ATI RADEON 9600/9700 Series (M10) + 4E51 ATI RADEON 9600 Series (RV350) 4E52 Mobility Radeon 9500/9600 (M10) (RV350) 4E53 Radeon Mobility 9600 (M10 NS) - 4E54 Radeon Mobility M10 NT (RV350-WS) - 4E56 FireGL Mobility T2e (M11 NV) + 4E54 ATI MOBILITY FIRE GL T2/T2e (M10GL) + 4E56 ATI MOBILITY /ATI RADEON 9550 (M12) 4E64 Radeon 9700/Pro, 9500 (R300) Series - Secondary - 4E65 Radeon 9700/9500 Series (R300) - Secondary - 4E66 Radeon 9600TX (R300) - Secondary + 4E65 ATI RADEON 9500 PRO / 9700 Secondary (R300) + 4E66 ATI RADEON 9600 TX Secondary (R300) 4E67 Fire GL X1/Z1 AGP/Pro Secondary Video Accelerator - 4E68 Radeon 9800 Pro (R350) - Secondary - 4E69 Radeon 9800 (R350) - Secondary - 4E6A Radeon 9800 XT (R350) - Secondary - 4E6B ATI FIREGL X2-256T Secondary (FGL9800XT) + 4E68 ATI RADEON 9800 PRO Secondary (R350) + 4E69 ATI RADEON 9800 Secondary (R350) + 4E6A ATI RADEON 9800 XT Secondary (R360) + 4E6B ATI FireGL X2-256/X2-256t Secondary (R350GL) 4E71 Radeon Mobility 9600 (M10 NQ) (secondary) 4F72 Radeon 9000 Series (RV250) 4F73 Radeon 9000 Series (RV250) (Secondary) @@ -538,8 +550,8 @@ 5045 Rage 128 PE/Pro AGP 2x (TMDS) 5046 Rage 128 PF/Pro AGP 4x (TMDS) 5047 3d Rage pro agp 2x (215R3BUA22) - 5048 Rage 128 Pro PH AGP 2x (Rage 128 Pro PH AGP) - 5049 Rage 128 Pro PI AGP 4x (bk2.0.2.vr001.001.002.002.004.025.prt3.ty.t) + 5048 Rage 128 Pro PH AGP 2x (8212104D) + 5049 Rage 128 Pro PI AGP 4x (R128) 504A Rage 128 Pro PJ PCI (TMDS) (Rage 128 Pro PJ PCI) 504B Rage 128 Pro PK AGP 2x (TMDS) (Rage 128 Pro PK AGP) 504C 4x (TMDS) (Rage 128 Pro PL AGP) @@ -583,7 +595,7 @@ 516D Radeon 9100 Series (R200) - Secondary 5245 Rage 128 GL PCI (215R46ASA22) 5246 Rage 32MB (Rage 128 PRO) - 5247 Rage 128 RG + 5247 Rage 128 RG (Rage 32MB) 524B Rage 128 VR RK PCI (g01080-108) 524C Rage 128 RL/VR AGP 2x 5345 Rage 128 SE/4x PCI @@ -595,68 +607,68 @@ 534D Rage 128 4x SM AGP 4x (Rage 128 SM AGP 4x) 534E Rage 128 4x 5354 Mach 64 ST - 5446 Video Controller (VGA Compatible) (ewmewm) + 5446 Rage 128 Pro Ultra TF (unknown) 544C Rage 128 Pro TL 5452 Rage 128 Pro TR 5453 Rage 128 Pro Ultra TS 5454 Rage 128 Pro Ultra TT 5455 Rade 128 Pro Ultra TU - 5460 Radeon X300 Mobility (M22) (RV370) - 5461 Mobility Radeon X300 - 5462 Mobility Radeon X600 SE - 5464 FireGL GL (M22) - 5548 Radeon X800 (R423 UH) - 5549 Radeon X800 Pro - 554A Radeon X800 XT Platinum - 554B Primary (X800GT) + 5460 ATI MOBILITY /ATI RADEON X300 (M22) + 5461 ATI MOBILITY /ATI RADEON X300 (M22) + 5462 ATI MOBILITY /ATI RADEON X600 SE (M24C) + 5464 ATI MOBILITY FireGL V3100 (M22GL) + 5548 ATI RADEON X800 Series (R423) + 5549 ATI RADEON X800 GTO (R423) + 554A ATI RADEON X800 XT Platinum Edition (R423) + 554B ATI RADEON X800 GT (R423) 554C R430 XTP - 554D Radeon X800 XL (R430) - 554E Radeon X800 Series - 554F Radeon X800 Series - 5550 FireGL V7100 (R423) - 5551 ATI FIREGL V5100 PCI-EX Primary (R423GL-SE) + 554D ATI RADEON X800 CrossFire Edition (R430) + 554E ATI RADEON X800 GT (R430) + 554F ATI RADEON X800 GTO (R430) + 5550 ATI FireGL V7100 (R423GL) + 5551 ATI FireGL V5100 (R423GL) 5552 FireGL V5100 (R423 UR) 5554 FireGL V7100 (R423 UT) - 5568 Radeon X800 Series Secondary - 5569 Radeon X800 Pro - Secondary - 556A Radeon X800 XT Platinum - Secondary - 556B Radeon X800 SE - Secondary + 5568 ATI RADEON X800 Series Secondary (R423) + 5569 ATI RADEON X800 GTO Secondary (R423) + 556A ATI RADEON X800 XT Platinum Edition Secondary (R423) + 556B ATI RADEON X800 GT Secondary (R423) 556C R430 XTP Secondary - 556D Radeon X800 XL - Secondary (R430) - 556E Radeon X800 Series - Secondary - 556F Radeon X800 Series - Secondary - 5570 FIREGL V7100 Secondary - 5571 ATI FIREGL V5100 PCI-EX Secondary (R423GL-SE) - 564A Mobility FIREGL V5000 (M26) - 564B Mobility FIREGL V5000 - 564F Mobility Radeon X700 XL PCIe (M26) - 5652 Mobility Radeon X700 - 5653 Mobility Radeon X700 - 5654 Mach 64 VT VIDEO XPRESSION (215VT2CA42) + 556D ATI RADEON X800 CrossFire Edition Secondary (R430) + 556E ATI RADEON X800 GT Secondary (R430) + 556F ATI RADEON X800 GTO Secondary (R430) + 5570 ATI FireGL V7100 Secondary (R423GL) + 5571 FireGL V5100 PCIe (R423GL-SE) - Secondary + 564A ATI MOBILITY FireGL V5000 (M26GL) + 564B ATI MOBILITY FireGL V5000 (M26GL) + 564F ATI MOBILITY /ATI RADEON X700 XL (M26) + 5652 ATI MOBILITY /ATI RADEON X700 (M26) + 5653 ATI MOBILITY/ATI RADEON X700 (RV410) + 5654 Mach64 VT (215VT22200) 5655 Mach 64 VT3 5656 Mach 64 VT4 PCI (Mach 64 VT4 PCI) - 5657 Radeon X550/X700 Series + 5657 ATI RADEON X550/X700 Series (RV410) 566F RADEON X700 SERIES SECONDARY - 5673 Mobility Radeon X700 Secondary - 5677 Radeon X550/X700 Series Secondary + 5673 ATI MOBILITY /ATI RADEON X700 Secondary (M26) + 5677 ATI RADEON X550/X700 Series Secondary (RV410) 5830 RS300/100 Host Bridge 5831 RS300/133 Host Bridge 5832 RS300/166 Host Bridge - 5833 Radeon IGP9100 RS300/200 Host Bridge + 5833 ATI Radeon 9000/9100 IGP Chipset - Host-PCI Bridge (RS300M) 5834 Radeon 9100 IGP (RS300) - 5835 Mobility Radeon 9100 IGP (RS300M AGP) - 5838 AGP Bridge (Radeon 9100 IGP) + 5835 Mobilitiy Radeon 9100 IGP AGP (RS300M) + 5838 ATI Radeon 9000/9100 IGP Chipset - AGP Controller (RS300M) 5854 Radeon XPRESS 200 Series Secondary 5874 Radeon XPRESS 200 Series Secondary - 5940 www.ati.comRadeon 9200 Pro - Secondary (RV280) + 5940 Radeon 9200 Pro Secondary (RV280) 5941 ATI Radeon 9200 - Secondary (RV280) 5942 Radeon 9000U Family - Secondary 5944 Radeon 9200SE PCI (RV280) 5950 RS480 Host Bridge 5951 Radeon Xpress 200 (RS480/RS482/RX480/RX482) Host bridge 5952 CrossFire Xpress 3200 (RD580) Chipset Host Bridge - 5954 ATI Radeon Xpress 200 Series - RS480 (na) - 5955 Mobility Radeon XPRESS 200 + 5954 ATI RADEON Xpress Series (RS480) + 5955 ATI RADEON Xpress Series (RS480M) 5956 RD790 GFX Dual Slot 5957 RX790 GFX Single Slot 5958 RD780 GFX Dual Slot @@ -664,10 +676,10 @@ 5961 ATI RADEON 9200 se agp (RV280) 5962 Radeon 9000U Family 5964 Radeon 9200 SE Series (Radeon 9200) - 5965 FireMV 2200 (Nvidia) + 5965 FireMV 2200 (unknown) 5969 ES1000 - 5974 Radeon XPRESS 200 Series - 5975 ATI Radeon X1100 (Radeon Xpress 1100) + 5974 ATI RADEON Xpress Series (RS482) + 5975 ATI RADEON Xpress Series (RS482M) 5978 RD790 PCI to PCI bridge (external gfx0 port A) 5979 RD790 PCI to PCI bridge (external gfx0 port B) 597A RD790 PCI to PCI bridge (PCIe gpp port A) @@ -696,7 +708,7 @@ 5A1E RD890 PCI to PCI bridge (external gfx1 port B) 5A1F RD890 PCI to PCI bridge (NB-SB link) 5A30 RS400/100 Host Bridge - 5A31 RS400/133 Host Bridge + 5A31 Host Bridge (RS400/133) 5A32 RS400/166 Host Bridge 5A33 Northbridge: Radeon Xpress 200 (RC410) 5A34 RS480 PCI-X Root Port @@ -705,211 +717,220 @@ 5A38 RS480 PCI Bridge 5A39 RS480 PCI Bridge 5A3F RS480 PCI Bridge - 5A41 Radeon XPRESS 200 - 5A42 SUBSYS_11821043&REV_004&1CF2FBB4&0&2808 (X200M) + 5A41 ATI RADEON Xpress Series (RS400) + 5A42 ATI RADEON Xpress Series (RS400M) 5A43 Radeon XPRESS 200 Series Secondary - 5A61 Radeon Xpress 200 (RC410) VGA card (Radeon XPress 200 (RC410)) - 5A62 ATI RADEON XPRESS 1100 (RC410M) + 5A61 ATI RADEON Xpress Series (RC410) + 5A62 ATI RADEON Xpress Series (RC410M) 5A63 Radeon XPRESS 200 Series Secondary - 5B60 ATI Technologies Inc RV370 5B60 [Radeon X300 (PCIE)] (Radeon X300) + 5B60 ATI RADEON X300/X550/X1050 Series (RV370) 5B61 RV371 - 5B62 RADEON X600 Series 265MB (RV380) - 5B63 ATI Radoen X1050 (Unknown) - 5B64 FireGL V3100 (RV370 5B64) + 5B62 ATI RADEON X600 Series (RV380x) + 5B63 ATI RADEON X300/X550/X1050 Series (RV370) + 5B64 ATI FireGL V3100 (RV370GL) 5B65 FireGL D1100 (RV370 5B65) 5B66 RV370X - 5B70 Radeon X300/X550/X1050 Series - Secondary + 5B70 ATI RADEON X300/X550/X1050 Series Secondary (RV370) 5B71 RV371 Secondary - 5B72 Radeon X600 Series - Secondary - 5B73 Radeon X550 Series - Secondary - 5B74 ATI 128MB PCI Express x16 ATI FireGL V3100 (FireGL V3100) - 5B75 FIREMV 2200 Secondary + 5B72 ATI RADEON X600 Series Secondary (RV380x) + 5B73 ATI RADEON X300/X550/X1050 Series Secondary (RV370) + 5B74 ATI FireGL V3100 Secondary (RV370GL) + 5B75 ATI FireMV 2200 Secondary (RV370) 5B76 RV370X Secondary 5C61 Mobility Radeon 9200 (bk-ati ver008.016m.085.006) 5C63 Mobility Radeon 9200 (RV280 (M9+)) 5D44 Radeon 9200 SE Series - Secondary (RV280) 5D45 ATI FireMV 2200 PCI Secondary (RV280) - 5D48 Mobility Radeon X800 XT - 5D49 Mobility FireGL V5100 - 5D4A PCI-E Graphics adapter from Clevo D900T notebook (Mobility Radeon X800) + 5D48 ATI MOBILITY/ATI RADEON X800 XT (M28) + 5D49 ATI MOBILITY FireGL V5100 (M28GL) + 5D4A ATI MOBILITY /ATI RADEON X800 (M28) 5D4C R480 CONSUMER 4P - 5D4D Radeon XT850 (Radeon XT850) + 5D4D ATI RADEON X850 XT Platinum Edition (R480) 5D4E Radeon X800 GT - 5D4F x800gto 256 pci-e (r480) - 5D50 FIREGL V7200 - 5D52 Radeon X850XT (PCIE) Primary (R480) - 5D57 Radeon X800 XT + 5D4F ATI RADEON X800 GTO (R480) + 5D50 ATI FireGL V7200 (R480GL) + 5D52 ATI RADEON X850 XT (R480) + 5D57 ATI RADEON X800 XT (R423) 5D6C R480 CONSUMER 4P Secondary - 5D6D Radeon X850 Series - Secondary + 5D6D ATI RADEON X850 XT Platinum Edition Secondary (R480) 5D6E Radeon X800 GT Secondary - 5D6F Radeon X850 Pro 256M (01131002) - 5D70 FIREGL V7200 Secondary - 5D72 Radeon X850 Series - Secondary - 5D77 Radeon X800 XT - Secondary - 5E48 FireGL V5000 (RV410) + 5D6F ATI RADEON X800 GTO Secondary (R480) + 5D70 ATI FireGL V7200 Secondary (R480GL) + 5D72 ATI RADEON X850 XT Secondary (R480) + 5D77 ATI RADEON X800 XT Secondary (R423) + 5E48 ATI FireGL V5000 (RV410GL) 5E49 FireGL V3300 (RV410) - 5E4A Radeon X700 Series - 5E4B Radeon X700 Series - 5E4C Radeon X700 Series - 5E4D Radeon X700 Series - 5E4F Radeon X700 SE - 5E68 FIREGL V5000 Secondary - 5E6A Radeon X700 Series - Secondary - 5E6B Radeon X700 Series - Secondary - 5E6C Radeon X700 Series - Secondary - 5E6D Radeon X700 Series - Secondary - 5E6F Radeon X700 SE - Secondary + 5E4A ATI RADEON X700 XT (RV410) + 5E4B ATI RADEON X700 PRO (RV410) + 5E4C ATI RADEON X700 SE (RV410) + 5E4D ATI RADEON X700 (RV410) + 5E4F ATI RADEON X700/X550 Series (RV410) + 5E68 ATI FireGL V5000 Secondary (RV410GL) + 5E6A ATI RADEON X700 XT Secondary (RV410) + 5E6B ATI RADEON X700 PRO Secondary (RV410) + 5E6C ATI RADEON X700 SE Secondary (RV410) + 5E6D ATI RADEON X700 Secondary (RV410) + 5E6F ATI RADEON X700/X550 Series Secondary (RV410) 5F57 Radeon X800XT PCIe (R423) + 6898 ATI Radeon HD 5800 Series (EG CYPRESS XT) + 6899 ATI Radeon HD 5800 Series (EG CYPRESS PRO) + 68A0 ATI Mobility Radeon HD 5800 Series (EG BROADWAY XT) + 68A1 ATI Mobility Radeon HD 5800 Series (EG BROADWAY PRO/LP) + 68B0 ATI Mobility Radeon HD 5800 Series (EG BROADWAY XT) + 68B8 ATI Radeon HD 5700 Series (EG JUNIPER XT) + 68BE ATI Radeon HD 5700 Series (EG JUNIPER LE) 700F PCI to AGP Bridge (A3/U1) 7010 PCI to AGP Bridge (RS200) - 7100 Radeon X1800 Series - 7101 Mobility Radeon X1800 XT - 7102 Radeon Mobility X1800 - 7103 Mobility FireGL V7200 - 7104 ATI FireGL 7200 or 3200 - 7105 R520 [FireGL] - 7106 Mobility FireGL V7100 - 7108 Radeon Mobility X1800 + 7100 ATI RADEON X1800 Series (R520) + 7101 ATI MOBILITY /ATI RADEON X1800 XT (M58) + 7102 ATI MOBILITY /ATI RADEON X1800 (M58) + 7103 ATI MOBILITY FireGL V7200 (M58GL) + 7104 ATI FireGL V7200 (R520GL) + 7105 ATI FireGL V5300 (R520GL) + 7106 ATI MOBILITY FireGL V7100 (M58GL) + 7108 ATI RADEON X1800 Series (R520) 7109 Radeon X1800 Series - Secondary - 710A Radeon X1800 GTO - 710B Radeon X1800 - 710C Radeon X1800 - 710E FIREGL V7300 - 710F ATI FireGL (V7350) - 7120 Radeon X1800 Series Secondary - 7124 FireGL V7200 (R520 GL) - Secondary - 7125 Radeon X1800 Series Secondary - 7128 Radeon X1800 Series Secondary - 7129 Radeon X1800 Series - Secondary - 712A Radeon X1800 GTO - Secondary - 712B Radeon X1800 Series Secondary - 712C Radeon X1800 Series Secondary - 712E FIREGL V7300 Secondary - 712F ATI FireGL (V 7350 Secondary) - 7140 Radeon X1300 Series + 710A ATI RADEON X1800 Series (R520) + 710B ATI RADEON X1800 Series (R520) + 710C ATI RADEON X1800 Series (R520) + 710E ATI FireGL V7300 (R520GL) + 710F ATI FireGL V7350 (R520GL) + 7120 ATI RADEON X1800 Series Secondary (R520) + 7124 ATI FireGL V7200 Secondary (R520GL) + 7125 ATI FireGL V5300 Secondary (R520GL) + 7128 ATI RADEON X1800 Series Secondary (R520) + 7129 ATI RADEON X1800 Series Secondary (R520) + 712A ATI RADEON X1800 Series Secondary (R520) + 712B ATI RADEON X1800 Series Secondary (R520) + 712C ATI RADEON X1800 Series Secondary (R520) + 712E ATI FireGL V7300 Secondary (R520GL) + 712F ATI FireGL V7350 Secondary (R520GL) + 7140 ATI RADEON X1600 Series (RV515) 7141 RV505 - 7142 Radeon X1300 Pro or X1550 (rv515) - 7143 Radeon X1550 Series (RV505) - 7145 PCIVEN_104C&DEV_803B&SUBSYS_FF101179&REV_00 (x1400) - 7146 Radeon X1300 XGE (N/A) - 7147 Radeon X1550 64-bit (RV505) - 7149 ATI Mobility Radeon X1300, M52-64 (216CZJAKA12FAG) - 714A Mobility Radeon X1300 - 714B Mobility Radeon X1300 - 714C Mobility Radeon X1300 - 714D Radeon X1300 (RV515) - 714E Radeon X1300 (RV515) + 7142 ATI RADEON X1300/X1550 Series (RV515) + 7143 ATI RADEON X1550 Series (RV515) + 7145 ATI MOBILITY /ATI RADEON X1400 (M54) + 7146 ATI RADEON X1300 / X1550 Series (RV515) + 7147 ATI RADEON X1550 64-bit (RV515) + 7149 ATI MOBILITY /ATI RADEON X1300 (M52) + 714A ATI MOBILITY /ATI RADEON X1300 (M52) + 714B ATI MOBILITY /ATI RADEON X1300 (M52) + 714C ATI MOBILITY /ATI RADEON X1300 (M52) + 714D ATI RADEON X1300 Series (RV515) + 714E ATI RADEON X1300 Series (RV515PCI) 714F RV505 7151 RV505 - 7152 HP Fire GL v3300 (Fire GL v3300) - 7153 FireGL V3350 (RV515GL) - 715E Radeon X1300 Series - 715F Radeon X1300 Series - 7160 Radeon X1300 Series - Secondary + 7152 ATI FireGL V3300 (RV515GL) + 7153 ATI FireGL V3350 (RV515GL) + 715E ATI RADEON X1300 Series (RV515) + 715F ATI RADEON X1550 64-bit (RV515) + 7160 ATI RADEON X1600 Series Secondary (RV515) 7161 RV505 Secondary - 7162 Radeon X1300 Series - Secondary - 7163 Radeon X1300 PRO Secondary - 7166 Radeon X1300 Series - Secondary - 7167 Radeon X1300 Series Secondary + 7162 ATI RADEON X1300/X1550 Series Secondary (RV515) + 7163 ATI RADEON X1550 Series Secondary (RV515) + 7166 ATI RADEON X1300 / X1550 Series Secondary (RV515) + 7167 ATI RADEON X1550 64-bit Secondary (RV515) 7169 M52 Secondary - 716D Radeon X1300 Series Secondary - 716E Radeon X1300 Series Secondary + 716D ATI RADEON X1300 Series Secondary (RV515) + 716E ATI RADEON X1300 Series Secondary (RV515PCI) 716F RV505 Secondary 7171 RV505 Secondary - 7172 FireGL V3300 (RV515GL) Secondary - 7173 FireGL V3350 (RV515GL) Secondary - 717E Radeon X1300 Series Secondary - 717F Radeon X1300 Series Secondary - 7180 Radeon X1300 Series - 7181 Radeon X1600 Series (RV516XT) - 7183 Radeon X1300/X1550 Series (RV505) - 7186 PCIVEN_1002&DEV_7186&SUBSYS_12311043&REV_004&2D404BB6&0&0008 (Mobility Radeon X1450) - 7187 Radeon 1300 (Radeon 1300) - 7188 ATI Mobility Radeon X2300 (Mobility X2300) - 718A Mobility Radeon X2300 Series - 718B Mobility Radeon X1350 - 718C Mobility Radeon X1350 - 718D Mobility Radeon X1450 - 718F Radeon X1300 Series - 7193 Radeon X1550 Series - 7196 Mobility Radeon X1350 - 719B FireMV 2250 - 719F Radeon X1550 Series - 71A0 Radeon X1300 Series Secondary - 71A1 Radeon X1600 Series (RV516XT) Secondary - 71A3 Radeon X1300 Series Secondary - 71A7 Radeon 1300 Secondary (Radeon 1300) - 71B3 Radeon X1550 Series Secondary - 71BB FireMV 2250 Secondary - 71C0 Radeon X1600 Series - 71C1 Radeon X1650 Pro (RV535) - 71C2 ATI X1600 Pro PCI-E (ATI X1600 Pro PCI-E) - 71C3 Radeon X1600 Series - 71C4 Mobility FIREGL V5200 - 71C5 Radeon X1600 Mobility (RV530?) - 71C6 Radeon X1650 Series (RV530 LE) - 71C7 RADEON X1650 SERIES - 71CD Radeon X1600 Series - 71CE Radeon X1600 PRO / X1300XT (RV530 VE) - 71D2 FireGL V3400 (RV530GL) - 71D4 Mobility FireGL V5250 (M56GL) - 71D5 Mobility Radeon X1700 (M66-P) - 71D6 Mobility Radeon X1700 (M66-XT) - 71DA FIREGL V5200 - 71DE Ati Radeon X2500 (Uknown) - 71E0 Radeon X1600 Series Secondary - 71E1 Radeon X1650 Series Secondary - 71E2 Radeon X1600 Series Secondary - 71E3 Radeon X1600 Series Secondary + 7172 ATI FireGL V3300 Secondary (RV515GL) + 7173 ATI FireGL V3350 Secondary (RV515GL) + 717E ATI RADEON X1300 Series Secondary (RV515) + 717F ATI RADEON X1550 64-bit Secondary (RV515) + 7180 ATI RADEON X1300/X1550 Series (RV515) + 7181 ATI RADEON X1600 Series (RV515) + 7183 ATI RADEON X1300/X1550 Series (RV515) + 7186 ATI MOBILITY /ATI RADEON X1450 (M54) + 7187 ATI RADEON X1300/X1550 Series (RV515) + 7188 ATI MOBILITY /ATI RADEON X2300 (M54) + 718A ATI MOBILITY /ATI RADEON X2300 (M54) + 718B ATI MOBILITY /ATI RADEON X1350 (M52) + 718C ATI MOBILITY /ATI RADEON X1350 (M52) + 718D ATI MOBILITY /ATI RADEON X1450 (M54) + 718F ATI RADEON X1300 Series (RV515PCI) + 7193 ATI RADEON X1550 Series (RV515) + 7196 ATI MOBILITY /ATI RADEON X1350 (M52) + 719B ATI FireMV 2250 (RV515) + 719F ATI RADEON X1550 64-bit (RV515) + 71A0 ATI RADEON X1300/X1550 Series Secondary (RV515) + 71A1 ATI RADEON X1600 Series Secondary (RV515) + 71A3 ATI RADEON X1300/X1550 Series Secondary (RV515) + 71A7 ATI RADEON X1300/X1550 Series Secondary (RV515) + 71AF ATI RADEON X1300 Series Secondary (RV515PCI) + 71B3 ATI RADEON X1550 Series Secondary (RV515) + 71BB ATI FireMV 2250 Secondary (RV515) + 71C0 ATI RADEON X1600 Series (RV530) + 71C1 ATI RADEON X1650 Series (RV535) + 71C2 ATI RADEON X1600 Series (RV530) + 71C3 ATI RADEON X1300 Series (RV535) + 71C4 ATI MOBILITY FireGL V5200 (M56GL) + 71C5 ATI MOBILITY /ATI RADEON X1600 (M56) + 71C6 ATI RADEON X1650 Series (RV530) + 71C7 ATI RADEON X1650 Series (RV535) + 71CD ATI RADEON X1600 Series (RV530) + 71CE ATI RADEON X1600 Pro / ATI RADEON X1300 XT (RV530) + 71D2 ATI FireGL V3400 (RV530GL) + 71D4 ATI MOBILITY FireGL V5250 (M56GL) + 71D5 ATI MOBILITY /ATI RADEON X1700 (M56) + 71D6 ATI MOBILITY /ATI RADEON X1700 XT (M56) + 71DA ATI FireGL V5200 (RV530GL) + 71DE ATI MOBILITY /ATI RADEON X1700 (M56) + 71E0 ATI RADEON X1600 Series Secondary (RV530) + 71E1 ATI RADEON X1650 Series Secondary (RV535) + 71E2 ATI RADEON X1600 Series Secondary (RV530) + 71E3 ATI RADEON X1300 Series Secondary (RV535) 71E5 M56 Secondary - 71E6 Radeon X1650 Series Secondary (RV530 LE) - 71E7 RADEON X1650 SERIES SECONDARY - 71ED Radeon X1600 Series Secondary - 71EE Radeon X1600 PRO / X1300XT Secondary (RV530 VE) + 71E6 ATI RADEON X1600 Series Secondary (RV530) + 71E7 ATI RADEON X1650 Series Secondary (RV535) + 71ED ATI RADEON X1600 Series Secondary (RV530) + 71EE ATI RADEON X1600 Pro / ATI RADEON X1300 XT Secondary (RV530) 71F2 ATI FireGL V3400 Secondary (RV530GL) - 71FA FIREGL V5200 Secondary + 71FA ATI FireGL V5200 Secondary (RV530GL) 71FE RV530 SE Secondary 7205 S3G Unichrome IGP KM400/KN400 (1106) - 7210 Mobility Radeon X2100 - 7211 Mobility Radeon X2100 Secondary - 7240 Radeon X1900 (R580) + 7210 ATI MOBILITY /ATI RADEON HD 2300 (M71) + 7211 ATI MOBILITY /ATI RADEON HD 2300 (M71) + 7240 ATI RADEON X1950 Series (R580) 7241 Radeon X1900 (R580) 7242 Radeon X1900 (R580) - 7243 Radeon X1900 (R580) - 7244 Radeon X1950XT Series - 7245 Radeon X1900 (R580) - 7246 Radeon X1900 (R580) - 7247 Radeon X1900 (R580) - 7248 Radeon X1900 (R580) - 7249 Radeon X1900 Series - 724A Radeon X1900 (R580) - 724B R580LE (180636911721) - 724C Radeon X1900 (R580) - 724D Radeon X1900 (R580) + 7243 ATI RADEON X1900 Series (R580) + 7244 ATI RADEON X1950 Series (R580) + 7245 ATI RADEON X1900 Series (R580) + 7246 ATI RADEON X1900 Series (R580) + 7247 ATI RADEON X1900 Series (R580) + 7248 ATI RADEON X1900 Series (R580) + 7249 ATI RADEON X1900 Series (R580) + 724A ATI RADEON X1900 Series (R580) + 724B ATI RADEON X1900 Series (R580) + 724C ATI RADEON X1900 Series (R580) + 724D ATI RADEON X1900 Series (R580) 724E FireGL V7300/V7350 PCIe (R580) - 724F Radeon X1900 Series - 7260 Radeon X1950 Series Secondary - 7263 Radeon X1900 Series Secondary - 7264 Radeon X1950XT Series Secondary - 7265 Radeon X1900 Series Secondary - 7266 Radeon X1900 Series Secondary - 7267 Radeon X1900 Series Secondary - 7268 Radeon X1950 Series Secondary - 7269 Radeon X1900 Series Secondary - 726A Radeon X1900 Series Secondary - 726B Radeon X1900 Secondary - 726C Radeon X1900 Series Secondary - 726D Radeon X1900 Series Secondary + 724F ATI RADEON X1900 Series (R580) + 7260 ATI RADEON X1950 Series Secondary (R580) + 7263 ATI RADEON X1900 Series Secondary (R580) + 7264 ATI RADEON X1950 Series Secondary (R580) + 7265 ATI RADEON X1900 Series Secondary (R580) + 7266 ATI RADEON X1900 Series Secondary (R580) + 7267 ATI RADEON X1900 Series Secondary (R580) + 7268 ATI RADEON X1900 Series Secondary (R580) + 7269 ATI RADEON X1900 Series Secondary (R580) + 726A ATI RADEON X1900 Series Secondary (R580) + 726B ATI RADEON X1900 Series Secondary (R580) + 726C ATI RADEON X1900 Series Secondary (R580) + 726D ATI RADEON X1900 Series Secondary (R580) 726E FireGL V7300/V7350 PCIe (R580) - Secondary - 726F Radeon X1900 Series Secondary - 7280 Radeon X1950 Pro Series AGP (0x7280) (Radeon X1950 Pro) - 7288 Radeon X1950 GT - 7291 Radeon X1650 XT (PCIe) - 7293 Radeon X1650 Series - 72A0 Radeon X1950 Pro Series AGP (0x72A0) (Radeon X1950 Pro Secondary) - 72A8 Radeon X1950 GT (Secondary) - 72B1 Radeon X1650 XT (Secondary) (PCIe) - 72B3 Radeon X1650 Series (Secondary) + 726F ATI RADEON X1900 Series Secondary (R580) + 7280 ATI RADEON X1950 Series (R580) + 7284 ATI MOBILITY /ATI RADEON X1900 (M58) + 7288 ATI RADEON X1950 GT (R580) + 7291 ATI RADEON X1650 Series (R580) + 7293 ATI RADEON X1650 Series (R580) + 72A0 ATI RADEON X1950 Series Secondary (R580) + 72A8 ATI RADEON X1950 GT Secondary (R580) + 72B1 ATI RADEON X1650 Series Secondary (R580) + 72B3 ATI RADEON X1650 Series Secondary (R580) 7800 ? 7830 RS350/100 Host Bridge 7831 RS350/133 Host Bridge @@ -923,60 +944,136 @@ 7916 RS690 PCI to PCI Bridge (PCI Express Port 2) 7917 RS690 PCI to PCI Bridge (PCI Express Port 3) 7919 Radeon X1200 Series Audio Controller - 791E ATI xpress 1250 (303017AA) - 791F ATI Mobility Radeon x1250 (RS690) + 791A HDMI Audio (791A) + 791E ATI RADEON X1200 Series (RS690) + 791F ATI Mobility Radeon x1100 (RS690M) 7930 RS600(M) Chipset - Host Bridge 7933 RS600(M) Chipset - PCI Express Graphics Port 0 7935 RS600(M) Chipset - PCI Express Port 1 7937 ATI Technoligies Inc (Samsung R25P) - 793F Radeon X1200 Series (Secondary) - 7941 Radeon XPRESS 1300 - 7942 ATI XPress 1250M (1002) - 796E ATI RADEON 2100 (RS740) + 793F ATI RADEON Xpress 1200 Series (RS600) + 7941 ATI RADEON Xpress 1200 Series (RS600) + 7942 ATI RADEON Xpress 1200 Series (RS600M) + 796E ATI RADEON 2100 (RS690) 7C37 Radeon 9600 SE (RV350 AQ) 9400 ATI Radeon HD 2900 XT (R600) - 9401 Radeon HD 2900 XT - 9402 Radeon HD 2900 XT - 9403 Radeon HD 2900 PRO - 9405 Radeon HD 2900 GT - 940A FireGL V8650 - 940B FireGL V8600 - 940F FireGL V7600 - 9440 Graphics adapter (Radeon 4870) - 94C1 ATI Radeon HD 2400 PRO (REV_00) - 94C3 ATI Radeon HD 2400 PRO (RV610) - 94C4 ATI Radeon HD 3470 PRO AGP (RV610) - 94C5 RADEON HD 2400 LE - 94C7 RADEON HD 2350 - 94C8 Mobility Radeon HD 2400 XT - 94C9 Mobility Radeon HD 2400 - 94CB Radeon E2400 - 94CC ATI Radeon HD 2400 Series (ATI Radeon HD 4670 Series) - 9501 ATI Radeon HD 3870 (RV670) - 9505 Radeon HD 3850 - 9515 ATI Radeon HD3850 AGP - 9581 ATI Mobility Radeon HD2600 (600458) - 9583 Mobility Radeon HD 2600 XT - 9586 Radeon HD 2600 XT AGP - 9587 Radeon hd 2600 pro (agp) ( Radeon hd 2600 pro (agp)) - 9588 ATI Radeon HD 2600 XT (RV530) - 9589 ATI Radeon HD 2600 PRO (RV630) + 9401 ATI RADEON HD 2900 XT (R600) + 9402 ATI RADEON HD 2900 XT (R600) + 9403 ATI RADEON HD 2900 PRO (R600) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-7@FreeBSD.ORG Tue May 4 21:21:05 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A73A8106566B; Tue, 4 May 2010 21:21:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 8CB318FC15; Tue, 4 May 2010 21:21:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o44LL57W036586; Tue, 4 May 2010 21:21:05 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o44LL5g6036581; Tue, 4 May 2010 21:21:05 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201005042121.o44LL5g6036581@svn.freebsd.org> From: John Baldwin Date: Tue, 4 May 2010 21:21:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207634 - stable/7/sys/nfsclient X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2010 21:21:05 -0000 Author: jhb Date: Tue May 4 21:21:05 2010 New Revision: 207634 URL: http://svn.freebsd.org/changeset/base/207634 Log: MFC: 202767,202774 Add a timeout for the negative name cache entries in the NFS client. This avoids a bogus negative name cache entry from persisting forever when another client creates an entry with the same name within the same NFS server time of day clock tick. Unlike 8.x and later, the timeout is only adjustable via a system-wide sysctl (vfs.nfs.negative_name_timeout) rather than a mount option. Setting the timeout to 0 disables negative name caching. I also fixed one obvious typo where args.timeo should be args.maxgrouplist. Modified: stable/7/sys/nfsclient/nfs_vfsops.c stable/7/sys/nfsclient/nfs_vnops.c stable/7/sys/nfsclient/nfsmount.h stable/7/sys/nfsclient/nfsnode.h Modified: stable/7/sys/nfsclient/nfs_vfsops.c ============================================================================== --- stable/7/sys/nfsclient/nfs_vfsops.c Tue May 4 21:16:01 2010 (r207633) +++ stable/7/sys/nfsclient/nfs_vfsops.c Tue May 4 21:21:05 2010 (r207634) @@ -951,7 +951,7 @@ nfs_mount(struct mount *mp, struct threa } if (vfs_getopt(mp->mnt_optnew, "maxgroups", (void **)&opt, NULL) == 0) { ret = sscanf(opt, "%d", &args.maxgrouplist); - if (ret != 1 || args.timeo <= 0) { + if (ret != 1 || args.maxgrouplist <= 0) { vfs_mount_error(mp, "illegal maxgroups: %s", opt); error = EINVAL; Modified: stable/7/sys/nfsclient/nfs_vnops.c ============================================================================== --- stable/7/sys/nfsclient/nfs_vnops.c Tue May 4 21:16:01 2010 (r207633) +++ stable/7/sys/nfsclient/nfs_vnops.c Tue May 4 21:21:05 2010 (r207634) @@ -225,6 +225,10 @@ int nfs_directio_enable = 0; SYSCTL_INT(_vfs_nfs, OID_AUTO, nfs_directio_enable, CTLFLAG_RW, &nfs_directio_enable, 0, "Enable NFS directio"); +static u_int negnametimeo = NFS_DEFAULT_NEGNAMETIMEO; +SYSCTL_UINT(_vfs_nfs, OID_AUTO, negative_name_timeout, CTLFLAG_RW, + &negnametimeo, 0, "Negative name cache entry timeout"); + /* * This sysctl allows other processes to mmap a file that has been opened * O_DIRECT by a process. In general, having processes mmap the file while @@ -918,9 +922,12 @@ nfs_lookup(struct vop_lookup_args *ap) * We only accept a negative hit in the cache if the * modification time of the parent directory matches * our cached copy. Otherwise, we discard all of the - * negative cache entries for this directory. + * negative cache entries for this directory. We also + * only trust -ve cache entries for less than + * negnametimeo seconds. */ - if (VOP_GETATTR(dvp, &vattr, cnp->cn_cred, td) == 0 && + if ((u_int)(ticks - np->n_dmtime_ticks) < (negnametimeo * hz) && + VOP_GETATTR(dvp, &vattr, cnp->cn_cred, td) == 0 && vattr.va_mtime.tv_sec == np->n_dmtime) { nfsstats.lookupcache_hits++; return (ENOENT); @@ -1063,8 +1070,10 @@ nfsmout: */ mtx_lock(&np->n_mtx); if (np->n_dmtime <= dmtime) { - if (np->n_dmtime == 0) + if (np->n_dmtime == 0) { np->n_dmtime = dmtime; + np->n_dmtime_ticks = ticks; + } mtx_unlock(&np->n_mtx); cache_enter(dvp, NULL, cnp); } else Modified: stable/7/sys/nfsclient/nfsmount.h ============================================================================== --- stable/7/sys/nfsclient/nfsmount.h Tue May 4 21:16:01 2010 (r207633) +++ stable/7/sys/nfsclient/nfsmount.h Tue May 4 21:21:05 2010 (r207634) @@ -114,6 +114,10 @@ struct nfsmount { #define NFS_TPRINTF_DELAY 30 #endif +#ifndef NFS_DEFAULT_NEGNAMETIMEO +#define NFS_DEFAULT_NEGNAMETIMEO 60 +#endif + #endif #endif Modified: stable/7/sys/nfsclient/nfsnode.h ============================================================================== --- stable/7/sys/nfsclient/nfsnode.h Tue May 4 21:16:01 2010 (r207633) +++ stable/7/sys/nfsclient/nfsnode.h Tue May 4 21:21:05 2010 (r207634) @@ -110,6 +110,7 @@ struct nfsnode { struct timespec n_mtime; /* Prev modify time. */ time_t n_ctime; /* Prev create time. */ time_t n_dmtime; /* Prev dir modify time. */ + int n_dmtime_ticks; /* Tick of -ve cache entry */ time_t n_expiry; /* Lease expiry time */ nfsfh_t *n_fhp; /* NFS File Handle */ struct vnode *n_vnode; /* associated vnode */ From owner-svn-src-stable-7@FreeBSD.ORG Tue May 4 21:56:16 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 671BD1065672; Tue, 4 May 2010 21:56:16 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 566558FC08; Tue, 4 May 2010 21:56:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o44LuGc4049832; Tue, 4 May 2010 21:56:16 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o44LuGq5049829; Tue, 4 May 2010 21:56:16 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201005042156.o44LuGq5049829@svn.freebsd.org> From: Jilles Tjoelker Date: Tue, 4 May 2010 21:56:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207636 - stable/7/usr.bin/stat X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2010 21:56:16 -0000 Author: jilles Date: Tue May 4 21:56:16 2010 New Revision: 207636 URL: http://svn.freebsd.org/changeset/base/207636 Log: MFC r207153: stat: Allow -f %Sf to display the file flags symbolically. PR: 124349 Modified: stable/7/usr.bin/stat/stat.1 stable/7/usr.bin/stat/stat.c Directory Properties: stable/7/usr.bin/stat/ (props changed) Modified: stable/7/usr.bin/stat/stat.1 ============================================================================== --- stable/7/usr.bin/stat/stat.1 Tue May 4 21:23:59 2010 (r207635) +++ stable/7/usr.bin/stat/stat.1 Tue May 4 21:56:16 2010 (r207636) @@ -36,7 +36,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 27, 2007 +.Dd April 24, 2010 .Dt STAT 1 .Os .Sh NAME @@ -239,6 +239,11 @@ Display date in format. .It Cm dr Display actual device name. +.It Cm f +Display the flags of +.Ar file +as in +.Nm ls Fl lTdo . .It Cm gu Display group or user name. .It Cm p Modified: stable/7/usr.bin/stat/stat.c ============================================================================== --- stable/7/usr.bin/stat/stat.c Tue May 4 21:23:59 2010 (r207635) +++ stable/7/usr.bin/stat/stat.c Tue May 4 21:56:16 2010 (r207636) @@ -187,6 +187,9 @@ int format1(const struct stat *, /* stat char *, size_t, /* a place to put the output */ int, int, int, int, /* the parsed format */ int, int); +#if HAVE_STRUCT_STAT_ST_FLAGS +char *xfflagstostr(unsigned long); +#endif char *timefmt; int linkfail; @@ -329,6 +332,25 @@ main(int argc, char *argv[]) return (am_readlink ? linkfail : errs); } +#if HAVE_STRUCT_STAT_ST_FLAGS +/* + * fflagstostr() wrapper that leaks only once + */ +char * +xfflagstostr(unsigned long fflags) +{ + static char *str = NULL; + + if (str != NULL) + free(str); + + str = fflagstostr(fflags); + if (str == NULL) + err(1, "fflagstostr"); + return (str); +} +#endif /* HAVE_STRUCT_STAT_ST_FLAGS */ + void usage(const char *synopsis) { @@ -721,8 +743,11 @@ format1(const struct stat *st, case SHOW_st_flags: small = (sizeof(st->st_flags) == 4); data = st->st_flags; - sdata = NULL; - formats = FMTF_DECIMAL | FMTF_OCTAL | FMTF_UNSIGNED | FMTF_HEX; + sdata = xfflagstostr(st->st_flags); + if (*sdata == '\0') + sdata = "-"; + formats = FMTF_DECIMAL | FMTF_OCTAL | FMTF_UNSIGNED | FMTF_HEX | + FMTF_STRING; if (ofmt == 0) ofmt = FMTF_UNSIGNED; break; From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 00:39:06 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D529D1065673; Wed, 5 May 2010 00:39:06 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id C428D8FC17; Wed, 5 May 2010 00:39:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o450d6LO089940; Wed, 5 May 2010 00:39:06 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o450d63N089938; Wed, 5 May 2010 00:39:06 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201005050039.o450d63N089938@svn.freebsd.org> From: Xin LI Date: Wed, 5 May 2010 00:39:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207641 - stable/7/share/mk X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 00:39:06 -0000 Author: delphij Date: Wed May 5 00:39:06 2010 New Revision: 207641 URL: http://svn.freebsd.org/changeset/base/207641 Log: MFC r206973: When CPUTYPE is defined to any value, on amd64 platform "mmx" is available through MACHINE_CPU, indicating the CPU supports that feature, as done by revision 138685. This changeset adds "mmx" into the default amd64 MACHINE_CPU list when no CPUTYPE is specified to provide consistent behavior. PR: amd64/145593 Submitted by: mm Modified: stable/7/share/mk/bsd.cpu.mk Directory Properties: stable/7/share/mk/ (props changed) Modified: stable/7/share/mk/bsd.cpu.mk ============================================================================== --- stable/7/share/mk/bsd.cpu.mk Wed May 5 00:38:20 2010 (r207640) +++ stable/7/share/mk/bsd.cpu.mk Wed May 5 00:39:06 2010 (r207641) @@ -9,7 +9,7 @@ _CPUCFLAGS = . if ${MACHINE_ARCH} == "i386" MACHINE_CPU = i486 . elif ${MACHINE_ARCH} == "amd64" -MACHINE_CPU = amd64 sse2 sse +MACHINE_CPU = amd64 sse2 sse mmx . elif ${MACHINE_ARCH} == "ia64" MACHINE_CPU = itanium . elif ${MACHINE_ARCH} == "sparc64" From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 09:01:16 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52092106564A; Wed, 5 May 2010 09:01:16 +0000 (UTC) (envelope-from marck@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 403308FC15; Wed, 5 May 2010 09:01:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4591G8t001191; Wed, 5 May 2010 09:01:16 GMT (envelope-from marck@svn.freebsd.org) Received: (from marck@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4591Ghe001189; Wed, 5 May 2010 09:01:16 GMT (envelope-from marck@svn.freebsd.org) Message-Id: <201005050901.o4591Ghe001189@svn.freebsd.org> From: Dmitry Morozovsky Date: Wed, 5 May 2010 09:01:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207653 - stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 09:01:16 -0000 Author: marck (doc committer) Date: Wed May 5 09:01:15 2010 New Revision: 207653 URL: http://svn.freebsd.org/changeset/base/207653 Log: MFC r207068: Allow to modify directory's content even if the ZFS_NOUNLINK (SF_NOUNLINK, sunlnk) flag is set. We only deny dirctory's removal or rename. PR: kern/143343 Approved by: pjd Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c ============================================================================== --- stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Wed May 5 08:58:58 2010 (r207652) +++ stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Wed May 5 09:01:15 2010 (r207653) @@ -2227,11 +2227,24 @@ zfs_zaccess_common(znode_t *zp, uint32_t return (EPERM); } +#ifdef sun if ((v4_mode & (ACE_DELETE | ACE_DELETE_CHILD)) && (zp->z_phys->zp_flags & ZFS_NOUNLINK)) { *check_privs = B_FALSE; return (EPERM); } +#else + /* + * In FreeBSD we allow to modify directory's content is ZFS_NOUNLINK + * (sunlnk) is set. We just don't allow directory removal, which is + * handled in zfs_zaccess_delete(). + */ + if ((v4_mode & ACE_DELETE) && + (zp->z_phys->zp_flags & ZFS_NOUNLINK)) { + *check_privs = B_FALSE; + return (EPERM); + } +#endif if (((v4_mode & (ACE_READ_DATA|ACE_EXECUTE)) && (zp->z_phys->zp_flags & ZFS_AV_QUARANTINED))) { From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 12:48:31 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4A755106566B; Wed, 5 May 2010 12:48:31 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 38E798FC1C; Wed, 5 May 2010 12:48:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o45CmVQd052981; Wed, 5 May 2010 12:48:31 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o45CmVUV052978; Wed, 5 May 2010 12:48:31 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201005051248.o45CmVUV052978@svn.freebsd.org> From: Gavin Atkinson Date: Wed, 5 May 2010 12:48:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207658 - stable/7/sbin/sysctl X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 12:48:31 -0000 Author: gavin Date: Wed May 5 12:48:30 2010 New Revision: 207658 URL: http://svn.freebsd.org/changeset/base/207658 Log: Merge r203310,203547,203717 from head: Implement the "-i" option to sysctl(8), to ignore failures while retrieving individual OIDs. This allows the same list of OIDs to be passed to sysctl(8) across different systems where particular OIDs may not exist, and still get as much information as possible from them. PR: bin/123644 Submitted by: dhw Modified: stable/7/sbin/sysctl/sysctl.8 stable/7/sbin/sysctl/sysctl.c Directory Properties: stable/7/sbin/sysctl/ (props changed) Modified: stable/7/sbin/sysctl/sysctl.8 ============================================================================== --- stable/7/sbin/sysctl/sysctl.8 Wed May 5 12:39:44 2010 (r207657) +++ stable/7/sbin/sysctl/sysctl.8 Wed May 5 12:48:30 2010 (r207658) @@ -28,7 +28,7 @@ .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd November 28, 2007 +.Dd February 6, 2010 .Dt SYSCTL 8 .Os .Sh NAME @@ -36,7 +36,7 @@ .Nd get or set kernel state .Sh SYNOPSIS .Nm -.Op Fl bdehNnoqx +.Op Fl bdehiNnoqx .Ar name Ns Op = Ns Ar value .Ar ... .Nm @@ -82,6 +82,12 @@ or is specified, or a variable is being set. .It Fl h Format output for human, rather than machine, readability. +.It Fl i +Ignore unknown OIDs. +The purpose is to make use of +.Nm +for collecting data from a variety of machines (not all of which +are necessarily running exactly the same software) easier. .It Fl N Show only variable names, not their values. This is particularly useful with shells that offer programmable Modified: stable/7/sbin/sysctl/sysctl.c ============================================================================== --- stable/7/sbin/sysctl/sysctl.c Wed May 5 12:39:44 2010 (r207657) +++ stable/7/sbin/sysctl/sysctl.c Wed May 5 12:48:30 2010 (r207658) @@ -58,8 +58,8 @@ static const char rcsid[] = #include #include -static int aflag, bflag, dflag, eflag, hflag, Nflag, nflag, oflag; -static int qflag, xflag; +static int aflag, bflag, dflag, eflag, hflag, iflag, +static int Nflag, nflag, oflag, qflag, xflag; static int oidfmt(int *, int, char *, u_int *); static void parse(char *); @@ -75,7 +75,7 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: sysctl [-bdehNnoqx] name[=value] ...", + "usage: sysctl [-bdehiNnoqx] name[=value] ...", " sysctl [-bdehNnoqx] -a"); exit(1); } @@ -89,7 +89,7 @@ main(int argc, char **argv) setbuf(stdout,0); setbuf(stderr,0); - while ((ch = getopt(argc, argv, "AabdehNnoqwxX")) != -1) { + while ((ch = getopt(argc, argv, "AabdehiNnoqwxX")) != -1) { switch (ch) { case 'A': /* compatibility */ @@ -110,6 +110,9 @@ main(int argc, char **argv) case 'h': hflag = 1; break; + case 'i': + iflag = 1; + break; case 'N': Nflag = 1; break; @@ -185,6 +188,8 @@ parse(char *string) len = name2oid(bufp, mib); if (len < 0) { + if (iflag) + return; if (qflag) exit(1); else From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 16:41:15 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 286A5106567B; Wed, 5 May 2010 16:41:15 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 183D18FC14; Wed, 5 May 2010 16:41:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o45GfEal004436; Wed, 5 May 2010 16:41:14 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o45GfEFo004434; Wed, 5 May 2010 16:41:14 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201005051641.o45GfEFo004434@svn.freebsd.org> From: Ken Smith Date: Wed, 5 May 2010 16:41:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207661 - stable/7/release X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 16:41:15 -0000 Author: kensmith Date: Wed May 5 16:41:14 2010 New Revision: 207661 URL: http://svn.freebsd.org/changeset/base/207661 Log: Merge r206422: > Pass the HTTP_PROXY and FTP_PROXY environment variables through in addition > to FTP_PASSIVE_MODE so release building works for a machine that needs > to use a proxy. PR: misc/137688 Submitted by: Michael Leun Modified: stable/7/release/Makefile Directory Properties: stable/7/release/ (props changed) stable/7/release/doc/ (props changed) stable/7/release/doc/en_US.ISO8859-1/hardware/ (props changed) Modified: stable/7/release/Makefile ============================================================================== --- stable/7/release/Makefile Wed May 5 16:25:57 2010 (r207660) +++ stable/7/release/Makefile Wed May 5 16:41:14 2010 (r207661) @@ -576,7 +576,7 @@ release rerelease: echo " for i in ${MAKEINDEXPORTS}" >> ${_MK} echo " do" >> ${_MK} echo " cd /usr/ports/\$${i}" >> ${_MK} - echo " env -i FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK} + echo " env -i HTTP_PROXY=$${HTTP_PROXY} FTP_PROXY=$${FTP_PROXY} FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK} echo " make all install clean BATCH=yes FORCE_PKG_REGISTER=yes" >> ${_MK} echo " done" >> ${_MK} echo " cd /usr/ports" >> ${_MK} From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 17:01:04 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 02C94106564A; Wed, 5 May 2010 17:01:04 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id E6DBD8FC14; Wed, 5 May 2010 17:01:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o45H13Eb009111; Wed, 5 May 2010 17:01:03 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o45H13sU009108; Wed, 5 May 2010 17:01:03 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201005051701.o45H13sU009108@svn.freebsd.org> From: Ken Smith Date: Wed, 5 May 2010 17:01:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207666 - stable/7/release X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 17:01:04 -0000 Author: kensmith Date: Wed May 5 17:01:03 2010 New Revision: 207666 URL: http://svn.freebsd.org/changeset/base/207666 Log: Merge r206423: > Shift the version of perl used by the release build process over to > perl-5.10. This aligns the release build process with the current > default version of perl in the ports tree. Modified: stable/7/release/Makefile stable/7/release/Makefile.inc.docports Directory Properties: stable/7/release/ (props changed) stable/7/release/doc/ (props changed) stable/7/release/doc/en_US.ISO8859-1/hardware/ (props changed) Modified: stable/7/release/Makefile ============================================================================== --- stable/7/release/Makefile Wed May 5 16:58:29 2010 (r207665) +++ stable/7/release/Makefile Wed May 5 17:01:03 2010 (r207666) @@ -169,7 +169,7 @@ NOPORTSATALL= YES # # Doing 'make index' in /usr/ports requires Perl. -MAKEINDEXPORTS= lang/perl5.8 +MAKEINDEXPORTS= lang/perl5.10 # By default, documentation (Handbook, FAQ, etc.) is built for all # the languages. To speed up building, set the DOC_LANG to just # the languages you need. (The language for the release notes is Modified: stable/7/release/Makefile.inc.docports ============================================================================== --- stable/7/release/Makefile.inc.docports Wed May 5 16:58:29 2010 (r207665) +++ stable/7/release/Makefile.inc.docports Wed May 5 17:01:03 2010 (r207666) @@ -81,5 +81,5 @@ MINIMALDOCPORTS+= \ ports/textproc/p5-PodParser .else MINIMALDOCPORTS+= \ - ports/lang/perl5.8 + ports/lang/perl5.10 .endif From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 17:17:19 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C1EDC1065679; Wed, 5 May 2010 17:17:19 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id B0F228FC25; Wed, 5 May 2010 17:17:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o45HHJWM012751; Wed, 5 May 2010 17:17:19 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o45HHJlr012749; Wed, 5 May 2010 17:17:19 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201005051717.o45HHJlr012749@svn.freebsd.org> From: Gavin Atkinson Date: Wed, 5 May 2010 17:17:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207668 - stable/7/usr.sbin/arlcontrol X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 17:17:19 -0000 Author: gavin Date: Wed May 5 17:17:19 2010 New Revision: 207668 URL: http://svn.freebsd.org/changeset/base/207668 Log: Spell "Hz" correctly in arlcontrol. Direct commit to stable/7 as this code no longer exists in head. PR: bin/142566 Submitted by: N.J. Mann Modified: stable/7/usr.sbin/arlcontrol/arlcontrol.c Modified: stable/7/usr.sbin/arlcontrol/arlcontrol.c ============================================================================== --- stable/7/usr.sbin/arlcontrol/arlcontrol.c Wed May 5 17:13:53 2010 (r207667) +++ stable/7/usr.sbin/arlcontrol/arlcontrol.c Wed May 5 17:17:19 2010 (r207668) @@ -148,21 +148,21 @@ static struct ch_list { int max_freq; } CHSET[] = { { 0, 0, 0, 0, 0, 0 }, - { 1, "900 Mhz", "Canada, U.S.A., Mexico", 0, freq_list_1, MAXFREQ(freq_list_1) }, + { 1, "900 MHz", "Canada, U.S.A., Mexico", 0, freq_list_1, MAXFREQ(freq_list_1) }, { 2, 0, 0, 0, 0, 0 }, { 3, 0, 0, 0, 0, 0 }, { 4, 0, 0, 0, 0, 0 }, { 5, 0, 0, 0, 0, 0 }, - { 6, "900 Mhz", "Australia", 0, freq_list_6, MAXFREQ(freq_list_6) }, + { 6, "900 MHz", "Australia", 0, freq_list_6, MAXFREQ(freq_list_6) }, { 7, 0, 0, 0, 0, 0 }, { 8, 0, 0, 0, 0, 0 }, - { 9, "2400 Mhz", "North America", rate_list_2400, freq_list_9, MAXFREQ(freq_list_9) }, - { 10, "2400 Mhz", "E.T.S.I", rate_list_2400, freq_list_10, MAXFREQ(freq_list_10) }, - { 11, "2400 Mhz", "Japan", rate_list_2400, freq_list_11, MAXFREQ(freq_list_11) }, - { 12, "2400 Mhz", "France", rate_list_2400, freq_list_12, MAXFREQ(freq_list_12) }, - { 13, "2400 Mhz", "Australia", rate_list_2400, freq_list_13, MAXFREQ(freq_list_13) }, - { 14, "2400 Mhz", "Germany", rate_list_2400, freq_list_14, MAXFREQ(freq_list_14) }, - { 15, "2400 Mhz", "U.K.(MPT1349),Spain", rate_list_2400, freq_list_15, MAXFREQ(freq_list_15) } + { 9, "2400 MHz", "North America", rate_list_2400, freq_list_9, MAXFREQ(freq_list_9) }, + { 10, "2400 MHz", "E.T.S.I", rate_list_2400, freq_list_10, MAXFREQ(freq_list_10) }, + { 11, "2400 MHz", "Japan", rate_list_2400, freq_list_11, MAXFREQ(freq_list_11) }, + { 12, "2400 MHz", "France", rate_list_2400, freq_list_12, MAXFREQ(freq_list_12) }, + { 13, "2400 MHz", "Australia", rate_list_2400, freq_list_13, MAXFREQ(freq_list_13) }, + { 14, "2400 MHz", "Germany", rate_list_2400, freq_list_14, MAXFREQ(freq_list_14) }, + { 15, "2400 MHz", "U.K.(MPT1349),Spain", rate_list_2400, freq_list_15, MAXFREQ(freq_list_15) } }; char* registrationMode[] = { @@ -221,7 +221,7 @@ print_al(struct arl_cfg_param *arl_io) arl_io->channelSet, CHSET[arl_io->channelSet].fr, CHSET[arl_io->channelSet].country); - printf("\tfrequency %s Mhz, bitrate %s kb/s, priority %s, receive mode %d\n", + printf("\tfrequency %s MHz, bitrate %s kb/s, priority %s, receive mode %d\n", (CHSET[arl_io->channelSet].freq && CHSET[arl_io->channelSet].max_freq > arl_io->channelNumber) ? CHSET[arl_io->channelSet].freq[arl_io->channelNumber].name : From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 20:54:17 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 168421065678; Wed, 5 May 2010 20:54:17 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 0596F8FC25; Wed, 5 May 2010 20:54:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o45KsG75061198; Wed, 5 May 2010 20:54:16 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o45KsGbO061196; Wed, 5 May 2010 20:54:16 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201005052054.o45KsGbO061196@svn.freebsd.org> From: Gavin Atkinson Date: Wed, 5 May 2010 20:54:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207675 - stable/7/sbin/sysctl X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 20:54:17 -0000 Author: gavin Date: Wed May 5 20:54:16 2010 New Revision: 207675 URL: http://svn.freebsd.org/changeset/base/207675 Log: Fix merge botch. Submitted by: Sofian Brabez Pointy hat: Earned and deserved. Modified: stable/7/sbin/sysctl/sysctl.c Modified: stable/7/sbin/sysctl/sysctl.c ============================================================================== --- stable/7/sbin/sysctl/sysctl.c Wed May 5 20:43:40 2010 (r207674) +++ stable/7/sbin/sysctl/sysctl.c Wed May 5 20:54:16 2010 (r207675) @@ -58,7 +58,7 @@ static const char rcsid[] = #include #include -static int aflag, bflag, dflag, eflag, hflag, iflag, +static int aflag, bflag, dflag, eflag, hflag, iflag; static int Nflag, nflag, oflag, qflag, xflag; static int oidfmt(int *, int, char *, u_int *); From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 22:07:28 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F18411065674; Wed, 5 May 2010 22:07:28 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id E000B8FC1A; Wed, 5 May 2010 22:07:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o45M7Sa5077730; Wed, 5 May 2010 22:07:28 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o45M7Seg077728; Wed, 5 May 2010 22:07:28 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201005052207.o45M7Seg077728@svn.freebsd.org> From: Jilles Tjoelker Date: Wed, 5 May 2010 22:07:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207681 - stable/7/lib/libc/gen X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 22:07:29 -0000 Author: jilles Date: Wed May 5 22:07:28 2010 New Revision: 207681 URL: http://svn.freebsd.org/changeset/base/207681 Log: MFC r207186: sysctl(3): Update description of various kern.* variables. Also add xrefs for confstr(3) (as sysconf(3) but for strings) and kvm(3) (which is a more convenient way to access some of the variables). PR: 116480 Modified: stable/7/lib/libc/gen/sysctl.3 Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) Modified: stable/7/lib/libc/gen/sysctl.3 ============================================================================== --- stable/7/lib/libc/gen/sysctl.3 Wed May 5 22:06:05 2010 (r207680) +++ stable/7/lib/libc/gen/sysctl.3 Wed May 5 22:07:28 2010 (r207681) @@ -28,7 +28,7 @@ .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" $FreeBSD$ .\" -.Dd April 10, 2007 +.Dd April 25, 2010 .Dt SYSCTL 3 .Os .Sh NAME @@ -323,7 +323,7 @@ information. .It "KERN_BOOTFILE string yes" .It "KERN_BOOTTIME struct timeval no" .It "KERN_CLOCKRATE struct clockinfo no" -.It "KERN_FILE struct file no" +.It "KERN_FILE struct xfile no" .It "KERN_HOSTID integer yes" .It "KERN_HOSTUUID string yes" .It "KERN_HOSTNAME string yes" @@ -340,14 +340,14 @@ information. .It "KERN_OSREV integer no" .It "KERN_OSTYPE string no" .It "KERN_POSIX1 integer no" -.It "KERN_PROC struct proc no" +.It "KERN_PROC node not applicable" .It "KERN_PROF node not applicable" .It "KERN_QUANTUM integer yes" .It "KERN_SAVED_IDS integer no" .It "KERN_SECURELVL integer raise only" .It "KERN_UPDATEINTERVAL integer no" .It "KERN_VERSION string no" -.It "KERN_VNODE struct vnode no" +.It "KERN_VNODE struct xvnode no" .El .Pp .Bl -tag -width 6n @@ -369,10 +369,8 @@ This structure contains the clock, stati frequencies, the number of micro-seconds per hz tick and the skew rate. .It Li KERN_FILE Return the entire file table. -The returned data consists of a single -.Va struct filehead -followed by an array of -.Va struct file , +The returned data consists of an array of +.Va struct xfile , whose size depends on the current number of such objects in the system. .It Li KERN_HOSTID Get or set the host ID. @@ -526,10 +524,8 @@ Note, the vnode table is not necessarily the system. The returned data consists of an array whose size depends on the current number of such objects in the system. -Each element of the array contains the kernel address of a vnode -.Va struct vnode * -followed by the vnode itself -.Va struct vnode . +Each element of the array consists of a +.Va struct xvnode . .El .Ss CTL_MACHDEP The set of variables defined is architecture dependent. @@ -869,6 +865,8 @@ An attempt is made to set a read-only va A process without appropriate privilege attempts to set a value. .El .Sh SEE ALSO +.Xr confstr 3 , +.Xr kvm 3 , .Xr sysconf 3 , .Xr sysctl 8 .Sh HISTORY From owner-svn-src-stable-7@FreeBSD.ORG Wed May 5 22:19:53 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 002A9106566C; Wed, 5 May 2010 22:19:52 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id E2C068FC17; Wed, 5 May 2010 22:19:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o45MJqhY080669; Wed, 5 May 2010 22:19:52 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o45MJqqX080667; Wed, 5 May 2010 22:19:52 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201005052219.o45MJqqX080667@svn.freebsd.org> From: Jilles Tjoelker Date: Wed, 5 May 2010 22:19:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207685 - stable/7/lib/libc/gen X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 22:19:53 -0000 Author: jilles Date: Wed May 5 22:19:52 2010 New Revision: 207685 URL: http://svn.freebsd.org/changeset/base/207685 Log: MFC r206760: getcwd(3): Clarify that EACCES may or may not be checked. POSIX permits but does not require checking access on the current and parent directories. Because various programs do not like it if getcwd(3) fails, it seems best to avoid checking access as much as possible. There are various reports in GNATS about this (search for getcwd). Our getcwd(3) implementation first queries the kernel for the pathname directly, which does not check any permissions but sometimes fails, and then falls back to reading all parent directories for the names. PR: standards/44425 Modified: stable/7/lib/libc/gen/getcwd.3 Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) Modified: stable/7/lib/libc/gen/getcwd.3 ============================================================================== --- stable/7/lib/libc/gen/getcwd.3 Wed May 5 22:17:17 2010 (r207684) +++ stable/7/lib/libc/gen/getcwd.3 Wed May 5 22:19:52 2010 (r207685) @@ -28,7 +28,7 @@ .\" @(#)getcwd.3 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd November 24, 1997 +.Dd April 17, 2010 .Dt GETCWD 3 .Os .Sh NAME @@ -108,8 +108,6 @@ The function will fail if: .Bl -tag -width Er -.It Bq Er EACCES -Read or search permission was denied for a component of the pathname. .It Bq Er EINVAL The .Fa size @@ -124,6 +122,16 @@ The argument is greater than zero but smaller than the length of the pathname plus 1. .El +.Pp +The +.Fn getcwd +function +may fail if: +.Bl -tag -width Er +.It Bq Er EACCES +Read or search permission was denied for a component of the pathname. +This is only checked in limited cases, depending on implementation details. +.El .Sh SEE ALSO .Xr chdir 2 , .Xr fchdir 2 , From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 12:37:01 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A0C111065672; Thu, 6 May 2010 12:37:01 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 8CA838FC0A; Thu, 6 May 2010 12:37:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46Cb1T0076451; Thu, 6 May 2010 12:37:01 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46Cb1se076439; Thu, 6 May 2010 12:37:01 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201005061237.o46Cb1se076439@svn.freebsd.org> From: Gavin Atkinson Date: Thu, 6 May 2010 12:37:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207699 - in stable/7: sbin/ifconfig share/man/man4 sys/amd64/amd64 sys/dev/aic7xxx sys/dev/ath sys/dev/ath/ath_hal/ar5210 sys/dev/ct sys/dev/mly sys/i386/i386 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 12:37:01 -0000 Author: gavin Date: Thu May 6 12:37:01 2010 New Revision: 207699 URL: http://svn.freebsd.org/changeset/base/207699 Log: Merge r202161 from head: Spell "Hz" correctly wherever it is user-visible. PR: bin/142566 Submitted by: N.J. Mann njm njm.me.uk Modified: stable/7/sbin/ifconfig/ifieee80211.c stable/7/share/man/man4/ath.4 stable/7/share/man/man4/cpufreq.4 stable/7/share/man/man4/vge.4 stable/7/sys/amd64/amd64/local_apic.c stable/7/sys/dev/aic7xxx/aic79xx_pci.c stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c stable/7/sys/dev/ath/if_ath.c stable/7/sys/dev/ct/ct_isa.c stable/7/sys/dev/mly/mly.c stable/7/sys/i386/i386/local_apic.c Directory Properties: stable/7/sbin/ifconfig/ (props changed) stable/7/share/man/man4/ (props changed) stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sbin/ifconfig/ifieee80211.c ============================================================================== --- stable/7/sbin/ifconfig/ifieee80211.c Thu May 6 09:54:01 2010 (r207698) +++ stable/7/sbin/ifconfig/ifieee80211.c Thu May 6 12:37:01 2010 (r207699) @@ -2259,7 +2259,7 @@ print_chaninfo(const struct ieee80211_ch { char buf[14]; - printf("Channel %3u : %u%c Mhz%-14.14s", + printf("Channel %3u : %u%c MHz%-14.14s", ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq, IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ', get_chaninfo(c, verb, buf, sizeof(buf))); @@ -2338,7 +2338,7 @@ list_channels(int s, int allchans) static void print_txpow(const struct ieee80211_channel *c) { - printf("Channel %3u : %u Mhz %3.1f reg %2d ", + printf("Channel %3u : %u MHz %3.1f reg %2d ", c->ic_ieee, c->ic_freq, c->ic_maxpower/2., c->ic_maxregpower); } @@ -2800,7 +2800,7 @@ ieee80211_status(int s) c = getcurchan(s); if (c->ic_freq != IEEE80211_CHAN_ANY) { char buf[14]; - printf(" channel %d (%u Mhz%s)", c->ic_ieee, c->ic_freq, + printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq, get_chaninfo(c, 1, buf, sizeof(buf))); } else if (verbose) printf(" channel UNDEF"); Modified: stable/7/share/man/man4/ath.4 ============================================================================== --- stable/7/share/man/man4/ath.4 Thu May 6 09:54:01 2010 (r207698) +++ stable/7/share/man/man4/ath.4 Thu May 6 12:37:01 2010 (r207699) @@ -224,7 +224,7 @@ This should not happen. An invalid transmit rate was specified for an outgoing frame. The frame is discarded. This should not happen. -.It "ath%d: ath_chan_set: unable to reset channel %u (%u Mhz)" +.It "ath%d: ath_chan_set: unable to reset channel %u (%u MHz)" The Atheros Hardware Access Layer was unable to reset the hardware when switching channels during scanning. This should not happen. Modified: stable/7/share/man/man4/cpufreq.4 ============================================================================== --- stable/7/share/man/man4/cpufreq.4 Thu May 6 09:54:01 2010 (r207698) +++ stable/7/share/man/man4/cpufreq.4 Thu May 6 12:37:01 2010 (r207699) @@ -234,7 +234,7 @@ The driver should set unknown or irrelev All the following elements for each setting should be returned: .Bd -literal struct cf_setting { - int freq; /* CPU clock in Mhz or 100ths of a percent. */ + int freq; /* CPU clock in MHz or 100ths of a percent. */ int volts; /* Voltage in mV. */ int power; /* Power consumed in mW. */ int lat; /* Transition latency in us. */ Modified: stable/7/share/man/man4/vge.4 ============================================================================== --- stable/7/share/man/man4/vge.4 Thu May 6 09:54:01 2010 (r207698) +++ stable/7/share/man/man4/vge.4 Thu May 6 12:37:01 2010 (r207699) @@ -58,7 +58,7 @@ driver provides support for various NICs based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity Family Gigabit Ethernet controller chips. .Pp -The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed +The VT6120/VT6122 is a 33/66MHz 64-bit PCI device which combines a tri-speed MAC with an integrated 10/100/1000 copper PHY. (Some older cards use an external PHY.) The VT6130/VT6132 is the PCI express version of Velocity family. Modified: stable/7/sys/amd64/amd64/local_apic.c ============================================================================== --- stable/7/sys/amd64/amd64/local_apic.c Thu May 6 09:54:01 2010 (r207698) +++ stable/7/sys/amd64/amd64/local_apic.c Thu May 6 12:37:01 2010 (r207699) @@ -467,7 +467,7 @@ lapic_setup_clock(void) panic("lapic: Divisor too big"); value /= 2; if (bootverbose) - printf("lapic: Divisor %lu, Frequency %lu hz\n", + printf("lapic: Divisor %lu, Frequency %lu Hz\n", lapic_timer_divisor, value); /* Modified: stable/7/sys/dev/aic7xxx/aic79xx_pci.c ============================================================================== --- stable/7/sys/dev/aic7xxx/aic79xx_pci.c Thu May 6 09:54:01 2010 (r207698) +++ stable/7/sys/dev/aic7xxx/aic79xx_pci.c Thu May 6 12:37:01 2010 (r207699) @@ -248,10 +248,10 @@ static const char *pci_bus_modes[] = "PCI bus mode unknown", "PCI bus mode unknown", "PCI bus mode unknown", - "PCI-X 101-133Mhz", - "PCI-X 67-100Mhz", - "PCI-X 50-66Mhz", - "PCI 33 or 66Mhz" + "PCI-X 101-133MHz", + "PCI-X 67-100MHz", + "PCI-X 50-66MHz", + "PCI 33 or 66MHz" }; #define TESTMODE 0x00000800ul Modified: stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c ============================================================================== --- stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Thu May 6 09:54:01 2010 (r207698) +++ stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Thu May 6 12:37:01 2010 (r207699) @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * $Id: ar5210_reset.c,v 1.8 2008/11/11 17:25:16 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -86,7 +87,7 @@ ar5210Reset(struct ath_hal *ah, HAL_OPMO if ((chan->channelFlags & CHANNEL_5GHZ) == 0) { /* Only 11a mode */ - HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5Ghz\n", __func__); + HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5GHz\n", __func__); FAIL(HAL_EINVAL); } /* Modified: stable/7/sys/dev/ath/if_ath.c ============================================================================== --- stable/7/sys/dev/ath/if_ath.c Thu May 6 09:54:01 2010 (r207698) +++ stable/7/sys/dev/ath/if_ath.c Thu May 6 12:37:01 2010 (r207699) @@ -4934,7 +4934,7 @@ ath_chan_set(struct ath_softc *sc, struc ath_stoprecv(sc); /* turn off frame recv */ if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)) { if_printf(ic->ic_ifp, "%s: unable to reset " - "channel %u (%u Mhz, flags 0x%x hal flags 0x%x), " + "channel %u (%u MHz, flags 0x%x hal flags 0x%x), " "hal status %u\n", __func__, ieee80211_chan2ieee(ic, chan), chan->ic_freq, chan->ic_flags, hchan.channelFlags, status); Modified: stable/7/sys/dev/ct/ct_isa.c ============================================================================== --- stable/7/sys/dev/ct/ct_isa.c Thu May 6 09:54:01 2010 (r207698) +++ stable/7/sys/dev/ct/ct_isa.c Thu May 6 12:37:01 2010 (r207699) @@ -316,7 +316,7 @@ ct_isa_attach(device_t dev) break; } #if 0 - printf("%s: chiprev %s chipclk %d Mhz\n", + printf("%s: chiprev %s chipclk %d MHz\n", slp->sl_dev.dv_xname, s, ct->sc_chipclk); #endif Modified: stable/7/sys/dev/mly/mly.c ============================================================================== --- stable/7/sys/dev/mly/mly.c Thu May 6 09:54:01 2010 (r207698) +++ stable/7/sys/dev/mly/mly.c Thu May 6 12:37:01 2010 (r207699) @@ -2528,7 +2528,7 @@ mly_describe_controller(struct mly_softc mly_describe_code(mly_table_memorytype, mi->memory_type), mi->memory_parity ? "+parity": "",mi->memory_ecc ? "+ECC": "", mi->cache_size); - mly_printf(sc, "CPU: %s @ %dMHZ\n", + mly_printf(sc, "CPU: %s @ %dMHz\n", mly_describe_code(mly_table_cputype, mi->cpu[0].type), mi->cpu[0].speed); if (mi->l2cache_size != 0) mly_printf(sc, "%dKB L2 cache\n", mi->l2cache_size); Modified: stable/7/sys/i386/i386/local_apic.c ============================================================================== --- stable/7/sys/i386/i386/local_apic.c Thu May 6 09:54:01 2010 (r207698) +++ stable/7/sys/i386/i386/local_apic.c Thu May 6 12:37:01 2010 (r207699) @@ -470,7 +470,7 @@ lapic_setup_clock(void) panic("lapic: Divisor too big"); value /= 2; if (bootverbose) - printf("lapic: Divisor %lu, Frequency %lu hz\n", + printf("lapic: Divisor %lu, Frequency %lu Hz\n", lapic_timer_divisor, value); /* From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 18:26:43 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB94D106566B; Thu, 6 May 2010 18:26:43 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id A0CF38FC0C; Thu, 6 May 2010 18:26:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46IQh8P053939; Thu, 6 May 2010 18:26:43 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46IQhEA053936; Thu, 6 May 2010 18:26:43 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005061826.o46IQhEA053936@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 6 May 2010 18:26:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207711 - stable/7/sys/dev/sge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 18:26:43 -0000 Author: yongari Date: Thu May 6 18:26:43 2010 New Revision: 207711 URL: http://svn.freebsd.org/changeset/base/207711 Log: MFC r207375-207377. r207375: Preserve unknown bits of RX MAC control register when driver programs RX filter configuration. It seems RX MAC control register is one of key registers to get various offloading features as well as performance. Blindly clearing unrelated bits can result in unexpected results. Tested by: xclin cs dot nctu dot edu dot tw > r207376: Remove wrong link state chage. r207377: Explicitly marks SiS190 to differentiate it from SiS191. Modified: stable/7/sys/dev/sge/if_sge.c stable/7/sys/dev/sge/if_sgereg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/sge/if_sge.c ============================================================================== --- stable/7/sys/dev/sge/if_sge.c Thu May 6 18:17:36 2010 (r207710) +++ stable/7/sys/dev/sge/if_sge.c Thu May 6 18:26:43 2010 (r207711) @@ -453,8 +453,9 @@ sge_rxfilter(struct sge_softc *sc) SGE_LOCK_ASSERT(sc); ifp = sc->sge_ifp; - hashes[0] = hashes[1] = 0; - rxfilt = AcceptMyPhys; + rxfilt = CSR_READ_2(sc, RxMacControl); + rxfilt &= ~(AcceptBroadcast | AcceptAllPhys | AcceptMulticast); + rxfilt |= AcceptMyPhys; if ((ifp->if_flags & IFF_BROADCAST) != 0) rxfilt |= AcceptBroadcast; if ((ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0) { @@ -463,20 +464,20 @@ sge_rxfilter(struct sge_softc *sc) rxfilt |= AcceptMulticast; hashes[0] = 0xFFFFFFFF; hashes[1] = 0xFFFFFFFF; - goto done; - } - rxfilt |= AcceptMulticast; - /* Now program new ones. */ - IF_ADDR_LOCK(ifp); - TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { - if (ifma->ifma_addr->sa_family != AF_LINK) - continue; - crc = ether_crc32_be(LLADDR((struct sockaddr_dl *) - ifma->ifma_addr), ETHER_ADDR_LEN); - hashes[crc >> 31] |= 1 << ((crc >> 26) & 0x1f); + } else { + rxfilt |= AcceptMulticast; + hashes[0] = hashes[1] = 0; + /* Now program new ones. */ + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { + if (ifma->ifma_addr->sa_family != AF_LINK) + continue; + crc = ether_crc32_be(LLADDR((struct sockaddr_dl *) + ifma->ifma_addr), ETHER_ADDR_LEN); + hashes[crc >> 31] |= 1 << ((crc >> 26) & 0x1f); + } + IF_ADDR_UNLOCK(ifp); } - IF_ADDR_UNLOCK(ifp); -done: CSR_WRITE_2(sc, RxMacControl, rxfilt | 0x02); CSR_WRITE_4(sc, RxHashTable, hashes[0]); CSR_WRITE_4(sc, RxHashTable2, hashes[1]); @@ -571,7 +572,7 @@ sge_attach(device_t dev) } sc->sge_rev = pci_get_revid(dev); if (pci_get_device(dev) == SIS_DEVICEID_190) - sc->sge_flags |= SGE_FLAG_FASTETHER; + sc->sge_flags |= SGE_FLAG_FASTETHER | SGE_FLAG_SIS190; /* Reset the adapter. */ sge_reset(sc); @@ -1590,7 +1591,6 @@ sge_ifmedia_upd(struct ifnet *ifp) sc = ifp->if_softc; SGE_LOCK(sc); mii = device_get_softc(sc->sge_miibus); - sc->sge_flags &= ~SGE_FLAG_LINK; if (mii->mii_instance) { struct mii_softc *miisc; LIST_FOREACH(miisc, &mii->mii_phys, mii_list) Modified: stable/7/sys/dev/sge/if_sgereg.h ============================================================================== --- stable/7/sys/dev/sge/if_sgereg.h Thu May 6 18:17:36 2010 (r207710) +++ stable/7/sys/dev/sge/if_sgereg.h Thu May 6 18:26:43 2010 (r207711) @@ -331,6 +331,7 @@ struct sge_softc { int sge_timer; int sge_flags; #define SGE_FLAG_FASTETHER 0x0001 +#define SGE_FLAG_SIS190 0x0002 #define SGE_FLAG_RGMII 0x0010 #define SGE_FLAG_SPEED_1000 0x2000 #define SGE_FLAG_FDX 0x4000 From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 18:32:02 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 880191065670; Thu, 6 May 2010 18:32:02 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 770958FC16; Thu, 6 May 2010 18:32:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46IW2q2055194; Thu, 6 May 2010 18:32:02 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46IW2Fp055191; Thu, 6 May 2010 18:32:02 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005061832.o46IW2Fp055191@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 6 May 2010 18:32:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207713 - stable/7/sys/dev/sge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 18:32:02 -0000 Author: yongari Date: Thu May 6 18:32:02 2010 New Revision: 207713 URL: http://svn.freebsd.org/changeset/base/207713 Log: MFC r207379: Enable FCS stripping and padding 10 bytes bit of RX MAC control register. Due to lack of SiS190 controller, I'm not sure whether this is also applicable to SiS190 so this feature is only activated on SiS191 controller. The controller can pad 10 bytes before DMAing a received frame to RX buffer and received bytes include the padded bytes. This padding is very useful on strict-alignment architectures because driver does not have to copy received frame to align IP header on 4 bytes boundary. It also gives better RX performance on non-strict alignment architectures. Special thanks to xclin to give me valuable register information. Without his enthusiastic trial and errors this wouldn't be even possible. While I'm here tighten validity check of received frame. Controller clears RDS_CRCOK bit when it received bad CRC frames. xclin found that using loop back testing. Tested by: xclin cs dot nctu dot edu dot tw > Modified: stable/7/sys/dev/sge/if_sge.c stable/7/sys/dev/sge/if_sgereg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/sge/if_sge.c ============================================================================== --- stable/7/sys/dev/sge/if_sge.c Thu May 6 18:30:46 2010 (r207712) +++ stable/7/sys/dev/sge/if_sge.c Thu May 6 18:32:02 2010 (r207713) @@ -1144,7 +1144,8 @@ sge_rxeof(struct sge_softc *sc) if ((rxinfo & RDC_OWN) != 0) break; rxstat = le32toh(cur_rx->sge_sts_size); - if (SGE_RX_ERROR(rxstat) != 0 || SGE_RX_NSEGS(rxstat) != 1) { + if ((rxstat & RDS_CRCOK) == 0 || SGE_RX_ERROR(rxstat) != 0 || + SGE_RX_NSEGS(rxstat) != 1) { /* XXX We don't support multi-segment frames yet. */ #ifdef SGE_SHOW_ERRORS device_printf(sc->sge_dev, "Rx error : 0x%b\n", rxstat, @@ -1177,11 +1178,23 @@ sge_rxeof(struct sge_softc *sc) /* * TODO : VLAN hardware tag stripping. */ - m->m_pkthdr.len = m->m_len = - SGE_RX_BYTES(rxstat) - ETHER_CRC_LEN; + if ((sc->sge_flags & SGE_FLAG_SIS190) == 0) { + /* + * Account for 10bytes auto padding which is used + * to align IP header on 32bit boundary. Also note, + * CRC bytes is automatically removed by the + * hardware. + */ + m->m_data += SGE_RX_PAD_BYTES; + m->m_pkthdr.len = m->m_len = SGE_RX_BYTES(rxstat) - + SGE_RX_PAD_BYTES; + } else { + m->m_pkthdr.len = m->m_len = SGE_RX_BYTES(rxstat) - + ETHER_CRC_LEN; #ifndef __NO_STRICT_ALIGNMENT - sge_fixup_rx(m); + sge_fixup_rx(m); #endif + } m->m_pkthdr.rcvif = ifp; ifp->if_ipackets++; SGE_UNLOCK(sc); @@ -1503,6 +1516,7 @@ sge_init_locked(struct sge_softc *sc) { struct ifnet *ifp; struct mii_data *mii; + uint16_t rxfilt; int i; SGE_LOCK_ASSERT(sc); @@ -1535,10 +1549,19 @@ sge_init_locked(struct sge_softc *sc) CSR_WRITE_4(sc, RxWakeOnLan, 0); CSR_WRITE_4(sc, RxWakeOnLanData, 0); /* Allow receiving VLAN frames. */ - CSR_WRITE_2(sc, RxMPSControl, ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN); + if ((sc->sge_flags & SGE_FLAG_SIS190) == 0) + CSR_WRITE_2(sc, RxMPSControl, + ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN + SGE_RX_PAD_BYTES); + else + CSR_WRITE_2(sc, RxMPSControl, ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN); for (i = 0; i < ETHER_ADDR_LEN; i++) CSR_WRITE_1(sc, RxMacAddr + i, IF_LLADDR(ifp)[i]); + /* Configure RX MAC. */ + rxfilt = 0; + if ((sc->sge_flags & SGE_FLAG_SIS190) == 0) + rxfilt |= RXMAC_STRIP_FCS | RXMAC_PAD_ENB; + CSR_WRITE_2(sc, RxMacControl, rxfilt); sge_rxfilter(sc); /* Initialize default speed/duplex information. */ Modified: stable/7/sys/dev/sge/if_sgereg.h ============================================================================== --- stable/7/sys/dev/sge/if_sgereg.h Thu May 6 18:30:46 2010 (r207712) +++ stable/7/sys/dev/sge/if_sgereg.h Thu May 6 18:32:02 2010 (r207713) @@ -137,6 +137,10 @@ #define AcceptAllPhys 0x0100 #define AcceptErr 0x0020 #define AcceptRunt 0x0010 +#define RXMAC_STRIP_FCS 0x0010 +#define RXMAC_PAD_ENB 0x0004 + +#define SGE_RX_PAD_BYTES 10 /* Station control register. */ #define SC_LOOPBACK 0x80000000 From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 18:35:53 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 72D361065672; Thu, 6 May 2010 18:35:53 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 618928FC1A; Thu, 6 May 2010 18:35:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46IZr52056217; Thu, 6 May 2010 18:35:53 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46IZrOI056214; Thu, 6 May 2010 18:35:53 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005061835.o46IZrOI056214@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 6 May 2010 18:35:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207715 - stable/7/sys/dev/sge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 18:35:53 -0000 Author: yongari Date: Thu May 6 18:35:53 2010 New Revision: 207715 URL: http://svn.freebsd.org/changeset/base/207715 Log: MFC r207380: Enable VLAN hardware tag insertion/stripping. Due to lack of SiS190 controller, I'm not sure whether this is also applicable to SiS190 so this feature is only activated on SiS191 controller. In theory, controller reinitialization is not needed when VLAN tag configuration is changed, but xclin said controller was not stable whenever toggling VLAN tag bit. To address that, sge(4) reinitialize controller for VLAN configuration which seems to work as expected. VLAN tag information for TX/RX descriptor and configure bit of RxMacControl register was found by xclin. Submitted by: xclin cs dot nctu dot edu dot tw > (initial version) Tested by: xclin cs dot nctu dot edu dot tw > Modified: stable/7/sys/dev/sge/if_sge.c stable/7/sys/dev/sge/if_sgereg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/sge/if_sge.c ============================================================================== --- stable/7/sys/dev/sge/if_sge.c Thu May 6 18:34:15 2010 (r207714) +++ stable/7/sys/dev/sge/if_sge.c Thu May 6 18:35:53 2010 (r207715) @@ -137,6 +137,7 @@ static int sge_get_mac_addr_eeprom(struc static uint16_t sge_read_eeprom(struct sge_softc *, int); static void sge_rxfilter(struct sge_softc *); +static void sge_setvlan(struct sge_softc *); static void sge_reset(struct sge_softc *); static int sge_list_rx_init(struct sge_softc *); static int sge_list_rx_free(struct sge_softc *); @@ -484,6 +485,25 @@ sge_rxfilter(struct sge_softc *sc) } static void +sge_setvlan(struct sge_softc *sc) +{ + struct ifnet *ifp; + uint16_t rxfilt; + + SGE_LOCK_ASSERT(sc); + + ifp = sc->sge_ifp; + if ((ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) == 0) + return; + rxfilt = CSR_READ_2(sc, RxMacControl); + if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) + rxfilt |= RXMAC_STRIP_VLAN; + else + rxfilt &= ~RXMAC_STRIP_VLAN; + CSR_WRITE_2(sc, RxMacControl, rxfilt); +} + +static void sge_reset(struct sge_softc *sc) { @@ -619,6 +639,9 @@ sge_attach(device_t dev) ether_ifattach(ifp, eaddr); /* VLAN setup. */ + if ((sc->sge_flags & SGE_FLAG_SIS190) == 0) + ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | + IFCAP_VLAN_HWCSUM; ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capenable = ifp->if_capabilities; /* Tell the upper layer(s) we support long frames. */ @@ -1175,9 +1198,12 @@ sge_rxeof(struct sge_softc *sc) m->m_pkthdr.csum_data = 0xffff; } } - /* - * TODO : VLAN hardware tag stripping. - */ + /* Check for VLAN tagged frame. */ + if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0 && + (rxstat & RDS_VLAN) != 0) { + m->m_pkthdr.ether_vtag = rxinfo & RDC_VLAN_MASK; + m->m_flags |= M_VLANTAG; + } if ((sc->sge_flags & SGE_FLAG_SIS190) == 0) { /* * Account for 10bytes auto padding which is used @@ -1422,6 +1448,11 @@ sge_encap(struct sge_softc *sc, struct m desc->sge_flags = htole32(txsegs[0].ds_len); if (prod == SGE_TX_RING_CNT - 1) desc->sge_flags |= htole32(RING_END); + /* Configure VLAN. */ + if(((*m_head)->m_flags & M_VLANTAG) != 0) { + cflags |= (*m_head)->m_pkthdr.ether_vtag; + desc->sge_sts_size |= htole32(TDS_INS_VLAN); + } desc->sge_cmdsts = htole32(TDC_DEF | TDC_CRC | TDC_PAD | cflags); #if 1 if ((sc->sge_flags & SGE_FLAG_SPEED_1000) != 0) @@ -1563,6 +1594,7 @@ sge_init_locked(struct sge_softc *sc) rxfilt |= RXMAC_STRIP_FCS | RXMAC_PAD_ENB; CSR_WRITE_2(sc, RxMacControl, rxfilt); sge_rxfilter(sc); + sge_setvlan(sc); /* Initialize default speed/duplex information. */ if ((sc->sge_flags & SGE_FLAG_FASTETHER) == 0) @@ -1653,7 +1685,7 @@ sge_ioctl(struct ifnet *ifp, u_long comm struct sge_softc *sc; struct ifreq *ifr; struct mii_data *mii; - int error = 0, mask; + int error = 0, mask, reinit; sc = ifp->if_softc; ifr = (struct ifreq *)data; @@ -1675,6 +1707,7 @@ sge_ioctl(struct ifnet *ifp, u_long comm break; case SIOCSIFCAP: SGE_LOCK(sc); + reinit = 0; mask = ifr->ifr_reqcap ^ ifp->if_capenable; if ((mask & IFCAP_TXCSUM) != 0 && (ifp->if_capabilities & IFCAP_TXCSUM) != 0) { @@ -1687,7 +1720,24 @@ sge_ioctl(struct ifnet *ifp, u_long comm if ((mask & IFCAP_RXCSUM) != 0 && (ifp->if_capabilities & IFCAP_RXCSUM) != 0) ifp->if_capenable ^= IFCAP_RXCSUM; + if ((mask & IFCAP_VLAN_HWCSUM) != 0 && + (ifp->if_capabilities & IFCAP_VLAN_HWCSUM) != 0) + ifp->if_capenable ^= IFCAP_VLAN_HWCSUM; + if ((mask & IFCAP_VLAN_HWTAGGING) != 0 && + (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) != 0) { + /* + * Due to unknown reason, toggling VLAN hardware + * tagging require interface reinitialization. + */ + ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING; + reinit = 1; + } + if (reinit > 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + sge_init_locked(sc); + } SGE_UNLOCK(sc); + VLAN_CAPABILITIES(ifp); break; case SIOCADDMULTI: case SIOCDELMULTI: Modified: stable/7/sys/dev/sge/if_sgereg.h ============================================================================== --- stable/7/sys/dev/sge/if_sgereg.h Thu May 6 18:34:15 2010 (r207714) +++ stable/7/sys/dev/sge/if_sgereg.h Thu May 6 18:35:53 2010 (r207715) @@ -137,6 +137,7 @@ #define AcceptAllPhys 0x0100 #define AcceptErr 0x0020 #define AcceptRunt 0x0010 +#define RXMAC_STRIP_VLAN 0x0020 #define RXMAC_STRIP_FCS 0x0010 #define RXMAC_PAD_ENB 0x0004 @@ -187,12 +188,14 @@ #define TDC_COL 0x00040000 #define TDC_CRC 0x00020000 #define TDC_PAD 0x00010000 +#define TDC_VLAN_MASK 0x0000FFFF #define SGE_TX_INTR_FRAMES 32 /* * TX descriptor status bits. */ +#define TDS_INS_VLAN 0x80000000 #define TDS_OWC 0x00080000 #define TDS_ABT 0x00040000 #define TDS_FIFO 0x00020000 @@ -219,11 +222,12 @@ #define RDC_UCAST 0x00040000 #define RDC_CRCOFF 0x00020000 #define RDC_PREADD 0x00010000 +#define RDC_VLAN_MASK 0x0000FFFF /* * RX descriptor status bits */ -#define RDS_TAGON 0x80000000 +#define RDS_VLAN 0x80000000 #define RDS_DESCS 0x3f000000 #define RDS_ABORT 0x00800000 #define RDS_SHORT 0x00400000 @@ -240,7 +244,7 @@ #define RX_ERR_BITS "\20" \ "\21CRCOK\22COLON\23NIBON\24OVRUN" \ "\25MIIER\26LIMIT\27SHORT\30ABORT" \ - "\40TAGON" + "\40VLAN" #define RING_END 0x80000000 #define SGE_RX_BYTES(x) ((x) & 0xFFFF) From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 18:38:19 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E52331065672; Thu, 6 May 2010 18:38:19 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id D482D8FC1B; Thu, 6 May 2010 18:38:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46IcJWX056835; Thu, 6 May 2010 18:38:19 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46IcJHe056832; Thu, 6 May 2010 18:38:19 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005061838.o46IcJHe056832@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 6 May 2010 18:38:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207717 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 18:38:20 -0000 Author: yongari Date: Thu May 6 18:38:19 2010 New Revision: 207717 URL: http://svn.freebsd.org/changeset/base/207717 Log: MFC r207381: Now sge(4) supports hardware VLAN tag insertion/stripping. Modified: stable/7/share/man/man4/sge.4 stable/7/share/man/man4/vlan.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/sge.4 ============================================================================== --- stable/7/share/man/man4/sge.4 Thu May 6 18:37:39 2010 (r207716) +++ stable/7/share/man/man4/sge.4 Thu May 6 18:38:19 2010 (r207717) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 14, 2010 +.Dd April 29, 2010 .Dt SGE 4 .Os .Sh NAME @@ -53,11 +53,11 @@ controllers and SiS191 Fast/Gigabit Ethe .Pp All LOMs supported by the .Nm -driver have TCP/UDP/IP checksum offload for transmit and receive. +driver have TCP/UDP/IP checksum offload for transmit and receive, +hardware VLAN tag stripping/insertion features. Due to lack of documentation more offloading features like TCP -segmentation offload (TSO), hardware VLAN tag stripping/insertion -features, Wake On Lan (WOL), Jumbo frame and an interrupt moderation -mechanism are not supported yet. +segmentation offload (TSO), Wake On Lan (WOL), Jumbo frame and an +interrupt moderation mechanism are not supported yet. .Pp The .Nm Modified: stable/7/share/man/man4/vlan.4 ============================================================================== --- stable/7/share/man/man4/vlan.4 Thu May 6 18:37:39 2010 (r207716) +++ stable/7/share/man/man4/vlan.4 Thu May 6 18:38:19 2010 (r207717) @@ -134,6 +134,7 @@ in the hardware is limited to the follow .Xr msk 4 , .Xr nge 4 , .Xr re 4 , +.Xr sge 4 , .Xr stge 4 , .Xr ti 4 , .Xr txp 4 , @@ -172,7 +173,6 @@ natively: .Xr nve 4 , .Xr rl 4 , .Xr sf 4 , -.Xr sge 4 , .Xr sis 4 , .Xr sk 4 , .Xr ste 4 , From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 18:44:50 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 11F9B1065675; Thu, 6 May 2010 18:44:50 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 00F968FC14; Thu, 6 May 2010 18:44:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46Iinoa058410; Thu, 6 May 2010 18:44:49 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46Iin09058407; Thu, 6 May 2010 18:44:49 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005061844.o46Iin09058407@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 6 May 2010 18:44:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207720 - stable/7/sys/dev/msk X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 18:44:50 -0000 Author: yongari Date: Thu May 6 18:44:49 2010 New Revision: 207720 URL: http://svn.freebsd.org/changeset/base/207720 Log: MFC r207409,207442: r207409: Both RX_GMF_LP_THR and RX_GMF_UP_THR must be 16 bits register. If it is 8bits register then RX FIFO size can't exceed 2KB which is not true for almost all Yukon II controller. r207442: Disable non-ASF packet flushing on Yukon Extreme as vendor's driver does. Without this change, Yukon Extreme seems to generate lots of RX FIFO overruns even though controller has available RX buffers. These excessive RX FIFO overruns generated lots of pause frames which in turn killed devices plugged into switch. It seems there is still occasional RX frame corruption on Yukon Extreme but this change seems to fix the pause frame storm. Reported by: jhb Tested by: jhb Modified: stable/7/sys/dev/msk/if_msk.c stable/7/sys/dev/msk/if_mskreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/msk/if_msk.c ============================================================================== --- stable/7/sys/dev/msk/if_msk.c Thu May 6 18:43:19 2010 (r207719) +++ stable/7/sys/dev/msk/if_msk.c Thu May 6 18:44:49 2010 (r207720) @@ -3673,9 +3673,9 @@ msk_init_locked(struct msk_if_softc *sc_ if ((sc_if->msk_flags & MSK_FLAG_RAMBUF) == 0) { /* Set Rx Pause threshould. */ - CSR_WRITE_1(sc, MR_ADDR(sc_if->msk_port, RX_GMF_LP_THR), + CSR_WRITE_2(sc, MR_ADDR(sc_if->msk_port, RX_GMF_LP_THR), MSK_ECU_LLPP); - CSR_WRITE_1(sc, MR_ADDR(sc_if->msk_port, RX_GMF_UP_THR), + CSR_WRITE_2(sc, MR_ADDR(sc_if->msk_port, RX_GMF_UP_THR), MSK_ECU_ULPP); /* Configure store-and-forward for Tx. */ msk_set_tx_stfwd(sc_if); @@ -3763,6 +3763,11 @@ msk_init_locked(struct msk_if_softc *sc_ msk_stop(sc_if); return; } + if (sc->msk_hw_id == CHIP_ID_YUKON_EX) { + /* Disable flushing of non-ASF packets. */ + CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_CTRL_T), + GMF_RX_MACSEC_FLUSH_OFF); + } /* Configure interrupt handling. */ if (sc_if->msk_port == MSK_PORT_A) { Modified: stable/7/sys/dev/msk/if_mskreg.h ============================================================================== --- stable/7/sys/dev/msk/if_mskreg.h Thu May 6 18:43:19 2010 (r207719) +++ stable/7/sys/dev/msk/if_mskreg.h Thu May 6 18:44:49 2010 (r207720) @@ -621,8 +621,8 @@ #define RX_GMF_FL_MSK 0x0c4c /* 32 bit Rx GMAC FIFO Flush Mask */ #define RX_GMF_FL_THR 0x0c50 /* 32 bit Rx GMAC FIFO Flush Threshold */ #define RX_GMF_TR_THR 0x0c54 /* 32 bit Rx Truncation Threshold (Yukon-2) */ -#define RX_GMF_UP_THR 0x0c58 /* 8 bit Rx Upper Pause Thr (Yukon-EC_U) */ -#define RX_GMF_LP_THR 0x0c5a /* 8 bit Rx Lower Pause Thr (Yukon-EC_U) */ +#define RX_GMF_UP_THR 0x0c58 /* 16 bit Rx Upper Pause Thr (Yukon-EC_U) */ +#define RX_GMF_LP_THR 0x0c5a /* 16 bit Rx Lower Pause Thr (Yukon-EC_U) */ #define RX_GMF_VLAN 0x0c5c /* 32 bit Rx VLAN Type Register (Yukon-2) */ #define RX_GMF_WP 0x0c60 /* 32 bit Rx GMAC FIFO Write Pointer */ #define RX_GMF_WLEV 0x0c68 /* 32 bit Rx GMAC FIFO Write Level */ @@ -1941,6 +1941,8 @@ #define RX_TRUNC_OFF BIT_26 /* disable packet truncation */ #define RX_VLAN_STRIP_ON BIT_25 /* enable VLAN stripping */ #define RX_VLAN_STRIP_OFF BIT_24 /* disable VLAN stripping */ +#define GMF_RX_MACSEC_FLUSH_ON BIT_23 +#define GMF_RX_MACSEC_FLUSH_OFF BIT_22 #define GMF_RX_OVER_ON BIT_19 /* enable flushing on receive overrun */ #define GMF_RX_OVER_OFF BIT_18 /* disable flushing on receive overrun */ #define GMF_ASF_RX_OVER_ON BIT_17 /* enable flushing of ASF when overrun */ From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 18:48:45 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 169B6106566C; Thu, 6 May 2010 18:48:45 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id EFD158FC15; Thu, 6 May 2010 18:48:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46Imi6s059365; Thu, 6 May 2010 18:48:44 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46Imiil059362; Thu, 6 May 2010 18:48:44 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005061848.o46Imiil059362@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 6 May 2010 18:48:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207722 - stable/7/sys/dev/msk X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 18:48:45 -0000 Author: yongari Date: Thu May 6 18:48:44 2010 New Revision: 207722 URL: http://svn.freebsd.org/changeset/base/207722 Log: MFC r207445: Add basic support for Marvell 88E8059 Yukon Optima. Tested by: James LaLagna < jameslalagna <> gmail dot com > Modified: stable/7/sys/dev/msk/if_msk.c stable/7/sys/dev/msk/if_mskreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/msk/if_msk.c ============================================================================== --- stable/7/sys/dev/msk/if_msk.c Thu May 6 18:47:16 2010 (r207721) +++ stable/7/sys/dev/msk/if_msk.c Thu May 6 18:48:44 2010 (r207722) @@ -223,6 +223,8 @@ static struct msk_product { "Marvell Yukon 88E8072 Gigabit Ethernet" }, { VENDORID_MARVELL, DEVICEID_MRVL_4380, "Marvell Yukon 88E8057 Gigabit Ethernet" }, + { VENDORID_MARVELL, DEVICEID_MRVL_4381, + "Marvell Yukon 88E8059 Gigabit Ethernet" }, { VENDORID_DLINK, DEVICEID_DLINK_DGE550SX, "D-Link 550SX Gigabit Ethernet" }, { VENDORID_DLINK, DEVICEID_DLINK_DGE560SX, @@ -239,7 +241,9 @@ static const char *model_name[] = { "Yukon FE", "Yukon FE+", "Yukon Supreme", - "Yukon Ultra 2" + "Yukon Ultra 2", + "Yukon Unknown", + "Yukon Optima", }; static int mskc_probe(device_t); @@ -1142,6 +1146,7 @@ msk_phy_power(struct msk_softc *sc, int case CHIP_ID_YUKON_EX: case CHIP_ID_YUKON_FE_P: case CHIP_ID_YUKON_UL_2: + case CHIP_ID_YUKON_OPT: CSR_WRITE_2(sc, B0_CTST, Y2_HW_WOL_OFF); /* Enable all clocks. */ @@ -1285,6 +1290,10 @@ mskc_reset(struct msk_softc *sc) GMC_BYP_MACSECRX_ON | GMC_BYP_MACSECTX_ON | GMC_BYP_RETR_ON); } + if (sc->msk_hw_id == CHIP_ID_YUKON_OPT && sc->msk_hw_rev == 0) { + /* Disable PCIe PHY powerdown(reg 0x80, bit7). */ + CSR_WRITE_4(sc, Y2_PEX_PHY_DATA, (0x0080 << 16) | 0x0080); + } CSR_WRITE_1(sc, B2_TST_CTRL1, TST_CFG_WRITE_OFF); /* LED On. */ @@ -1629,8 +1638,9 @@ mskc_attach(device_t dev) sc->msk_hw_rev = (CSR_READ_1(sc, B2_MAC_CFG) >> 4) & 0x0f; /* Bail out if chip is not recognized. */ if (sc->msk_hw_id < CHIP_ID_YUKON_XL || - sc->msk_hw_id > CHIP_ID_YUKON_UL_2 || - sc->msk_hw_id == CHIP_ID_YUKON_SUPR) { + sc->msk_hw_id > CHIP_ID_YUKON_OPT || + sc->msk_hw_id == CHIP_ID_YUKON_SUPR || + sc->msk_hw_id == CHIP_ID_YUKON_UNKNOWN) { device_printf(dev, "unknown device: id=0x%02x, rev=0x%02x\n", sc->msk_hw_id, sc->msk_hw_rev); mtx_destroy(&sc->msk_mtx); @@ -1743,6 +1753,10 @@ mskc_attach(device_t dev) sc->msk_clock = 125; /* 125 MHz */ sc->msk_pflags |= MSK_FLAG_JUMBO; break; + case CHIP_ID_YUKON_OPT: + sc->msk_clock = 125; /* 125 MHz */ + sc->msk_pflags |= MSK_FLAG_JUMBO | MSK_FLAG_DESCV2; + break; default: sc->msk_clock = 156; /* 156 MHz */ break; Modified: stable/7/sys/dev/msk/if_mskreg.h ============================================================================== --- stable/7/sys/dev/msk/if_mskreg.h Thu May 6 18:47:16 2010 (r207721) +++ stable/7/sys/dev/msk/if_mskreg.h Thu May 6 18:48:44 2010 (r207722) @@ -145,6 +145,7 @@ #define DEVICEID_MRVL_436B 0x436B #define DEVICEID_MRVL_436C 0x436C #define DEVICEID_MRVL_4380 0x4380 +#define DEVICEID_MRVL_4381 0x4381 /* * D-Link gigabit ethernet device ID @@ -828,6 +829,9 @@ #define Y2_IS_CHK_RX2 BIT_10 /* Descriptor error Rx 2 */ #define Y2_IS_CHK_TXS2 BIT_9 /* Descriptor error TXS 2 */ #define Y2_IS_CHK_TXA2 BIT_8 /* Descriptor error TXA 2 */ +#define Y2_IS_PSM_ACK BIT_7 /* PSM Ack (Yukon Optima) */ +#define Y2_IS_PTP_TIST BIT_6 /* PTP TIme Stamp (Yukon Optima) */ +#define Y2_IS_PHY_QLNK BIT_5 /* PHY Quick Link (Yukon Optima) */ #define Y2_IS_IRQ_PHY1 BIT_4 /* Interrupt from PHY 1 */ #define Y2_IS_IRQ_MAC1 BIT_3 /* Interrupt from MAC 1 */ #define Y2_IS_CHK_RX1 BIT_2 /* Descriptor error Rx 1 */ @@ -894,6 +898,8 @@ #define CHIP_ID_YUKON_FE_P 0xb8 /* Chip ID for YUKON-2 FE+ */ #define CHIP_ID_YUKON_SUPR 0xb9 /* Chip ID for YUKON-2 Supreme */ #define CHIP_ID_YUKON_UL_2 0xba /* Chip ID for YUKON-2 Ultra 2 */ +#define CHIP_ID_YUKON_UNKNOWN 0xbb +#define CHIP_ID_YUKON_OPT 0xbc /* Chip ID for YUKON-2 Optima */ #define CHIP_REV_YU_XL_A0 0 /* Chip Rev. for Yukon-2 A0 */ #define CHIP_REV_YU_XL_A1 1 /* Chip Rev. for Yukon-2 A1 */ From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 18:51:48 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5981E106564A; Thu, 6 May 2010 18:51:48 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 473F08FC15; Thu, 6 May 2010 18:51:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46IpmQe060146; Thu, 6 May 2010 18:51:48 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46IpmLD060143; Thu, 6 May 2010 18:51:48 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005061851.o46IpmLD060143@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 6 May 2010 18:51:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207724 - stable/7/sys/dev/mii X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 18:51:48 -0000 Author: yongari Date: Thu May 6 18:51:47 2010 New Revision: 207724 URL: http://svn.freebsd.org/changeset/base/207724 Log: MFC r207446: Add Marvell PHYG65G Gigabit PHY which is found on 88E8059 Yukon Optima. Tested by: James LaLagna < jameslalagna <> gmail dot com > Modified: stable/7/sys/dev/mii/e1000phy.c stable/7/sys/dev/mii/miidevs Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/mii/e1000phy.c ============================================================================== --- stable/7/sys/dev/mii/e1000phy.c Thu May 6 18:50:23 2010 (r207723) +++ stable/7/sys/dev/mii/e1000phy.c Thu May 6 18:51:47 2010 (r207724) @@ -111,6 +111,7 @@ static const struct mii_phydesc e1000phy MII_PHY_DESC(MARVELL, E1116), MII_PHY_DESC(MARVELL, E1118), MII_PHY_DESC(MARVELL, E3016), + MII_PHY_DESC(MARVELL, PHYG65G), MII_PHY_DESC(xxMARVELL, E1000), MII_PHY_DESC(xxMARVELL, E1011), MII_PHY_DESC(xxMARVELL, E1000_3), @@ -229,6 +230,7 @@ e1000phy_reset(struct mii_softc *sc) case MII_MODEL_MARVELL_E1116: case MII_MODEL_MARVELL_E1118: case MII_MODEL_MARVELL_E1149: + case MII_MODEL_MARVELL_PHYG65G: /* Disable energy detect mode. */ reg &= ~E1000_SCR_EN_DETECT_MASK; reg |= E1000_SCR_AUTO_X_MODE; Modified: stable/7/sys/dev/mii/miidevs ============================================================================== --- stable/7/sys/dev/mii/miidevs Thu May 6 18:50:23 2010 (r207723) +++ stable/7/sys/dev/mii/miidevs Thu May 6 18:51:47 2010 (r207724) @@ -243,6 +243,7 @@ model MARVELL E1111 0x000c Marvell 88E1 model MARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY model MARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY model MARVELL E3016 0x0026 Marvell 88E3016 10/100 Fast Ethernet PHY +model MARVELL PHYG65G 0x0027 Marvell PHYG65G Gigabit PHY model xxMARVELL E1000 0x0005 Marvell 88E1000 Gigabit PHY model xxMARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY From owner-svn-src-stable-7@FreeBSD.ORG Thu May 6 18:53:44 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 72B34106564A; Thu, 6 May 2010 18:53:44 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 6186D8FC1E; Thu, 6 May 2010 18:53:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46IrhtJ060683; Thu, 6 May 2010 18:53:43 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46IrhGj060681; Thu, 6 May 2010 18:53:43 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201005061853.o46IrhGj060681@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 6 May 2010 18:53:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207727 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 18:53:44 -0000 Author: yongari Date: Thu May 6 18:53:43 2010 New Revision: 207727 URL: http://svn.freebsd.org/changeset/base/207727 Log: MFC r207447: Marvell 88E8059(Yukon Optima) is now supported. Modified: stable/7/share/man/man4/msk.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/msk.4 ============================================================================== --- stable/7/share/man/man4/msk.4 Thu May 6 18:52:59 2010 (r207726) +++ stable/7/share/man/man4/msk.4 Thu May 6 18:53:43 2010 (r207727) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 1, 2010 +.Dd April 30, 2010 .Dt MSK 4 .Os .Sh NAME @@ -208,6 +208,8 @@ Marvell Yukon 88E8057 Gigabit Ethernet .It Marvell Yukon 88E8058 Gigabit Ethernet .It +Marvell Yukon 88E8059 Gigabit Ethernet +.It Marvell Yukon 88E8070 Gigabit Ethernet .It Marvell Yukon 88E8071 Gigabit Ethernet From owner-svn-src-stable-7@FreeBSD.ORG Fri May 7 11:17:20 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B42651065674; Fri, 7 May 2010 11:17:20 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id A32018FC1E; Fri, 7 May 2010 11:17:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o47BHKe2080019; Fri, 7 May 2010 11:17:20 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o47BHK4E080017; Fri, 7 May 2010 11:17:20 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201005071117.o47BHK4E080017@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 7 May 2010 11:17:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207744 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 May 2010 11:17:20 -0000 Author: kib Date: Fri May 7 11:17:20 2010 New Revision: 207744 URL: http://svn.freebsd.org/changeset/base/207744 Log: MFC r207606: Fix typo in comment. Modified: stable/7/sys/kern/kern_thread.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/kern_thread.c ============================================================================== --- stable/7/sys/kern/kern_thread.c Fri May 7 11:11:58 2010 (r207743) +++ stable/7/sys/kern/kern_thread.c Fri May 7 11:17:20 2010 (r207744) @@ -469,7 +469,7 @@ thread_exit(void) /* * The test below is NOT true if we are the - * sole exiting thread. P_STOPPED_SNGL is unset + * sole exiting thread. P_STOPPED_SINGLE is unset * in exit1() after it is the only survivor. */ if (P_SHOULDSTOP(p) == P_STOPPED_SINGLE) { From owner-svn-src-stable-7@FreeBSD.ORG Sat May 8 13:23:57 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C7F04106566C; Sat, 8 May 2010 13:23:57 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id B631D8FC15; Sat, 8 May 2010 13:23:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o48DNvUm026526; Sat, 8 May 2010 13:23:57 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o48DNvpt026521; Sat, 8 May 2010 13:23:57 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201005081323.o48DNvpt026521@svn.freebsd.org> From: Warner Losh Date: Sat, 8 May 2010 13:23:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207777 - in stable/7/gnu/usr.bin/gdb: . gdbserver X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 May 2010 13:23:57 -0000 Author: imp Date: Sat May 8 13:23:57 2010 New Revision: 207777 URL: http://svn.freebsd.org/changeset/base/207777 Log: MFC 185023 (by raj): Initial gdbserver support for ARM. Obtained from: Juniper Networks, Semihalf Added: stable/7/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c - copied unchanged from r185023, head/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c stable/7/gnu/usr.bin/gdb/gdbserver/reg-arm.c - copied unchanged from r185023, head/gnu/usr.bin/gdb/gdbserver/reg-arm.c Modified: stable/7/gnu/usr.bin/gdb/Makefile stable/7/gnu/usr.bin/gdb/gdbserver/Makefile Directory Properties: stable/7/gnu/usr.bin/gdb/ (props changed) stable/7/gnu/usr.bin/gdb/kgdb/ (props changed) Modified: stable/7/gnu/usr.bin/gdb/Makefile ============================================================================== --- stable/7/gnu/usr.bin/gdb/Makefile Sat May 8 13:21:22 2010 (r207776) +++ stable/7/gnu/usr.bin/gdb/Makefile Sat May 8 13:23:57 2010 (r207777) @@ -2,7 +2,7 @@ SUBDIR= doc libgdb gdb gdbtui kgdb -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "arm" SUBDIR+=gdbserver .endif Modified: stable/7/gnu/usr.bin/gdb/gdbserver/Makefile ============================================================================== --- stable/7/gnu/usr.bin/gdb/gdbserver/Makefile Sat May 8 13:21:22 2010 (r207776) +++ stable/7/gnu/usr.bin/gdb/gdbserver/Makefile Sat May 8 13:23:57 2010 (r207777) @@ -10,9 +10,17 @@ GDBDIR= ${.CURDIR}/../../../../contrib/g PROG= gdbserver -SRCS= i387-fp.c inferiors.c mem-break.c regcache.c remote-utils.c \ - server.c signals.c target.c reg-i386.c utils.c -SRCS+= fbsd-low.c fbsd-i386-low.c +SRCS= inferiors.c mem-break.c regcache.c remote-utils.c \ + server.c signals.c target.c utils.c +SRCS+= fbsd-low.c + +.if ${MACHINE_ARCH} == "i386" +SRCS+= fbsd-i386-low.c i387-fp.c reg-i386.c +.endif + +.if ${MACHINE_ARCH} == "arm" +SRCS+= fbsd-arm-low.c reg-arm.c +.endif #CFLAGS+= -I${.CURDIR}/../arch/${MACHINE_ARCH} CFLAGS+= -I${GDBDIR}/gdb/gdbserver Copied: stable/7/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c (from r185023, head/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c Sat May 8 13:23:57 2010 (r207777, copy of r185023, head/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c) @@ -0,0 +1,146 @@ +/* FreeBSD/ARM specific low level interface, for the remote server for GDB. + Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +__FBSDID("$FreeBSD$"); + +#include "server.h" +#include "fbsd-low.h" + +#ifdef HAVE_SYS_REG_H +#include +#endif + +#include +#include + +#define arm_num_regs 26 + +static int arm_regmap[] = { + 0, 4, 8, 12, 16, 20, 24, 28, + 32, 36, 40, 44, 48, 52, 56, 60, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + 64 +}; + +static int +arm_cannot_store_register (int regno) +{ + return (regno >= arm_num_regs); +} + +static int +arm_cannot_fetch_register (int regno) +{ + return (regno >= arm_num_regs); +} + +extern int debug_threads; + +static CORE_ADDR +arm_get_pc () +{ + unsigned long pc; + collect_register_by_name ("pc", &pc); + if (debug_threads) + fprintf (stderr, "stop pc is %08lx\n", pc); + return pc; +} + +static void +arm_set_pc (CORE_ADDR pc) +{ + unsigned long newpc = pc; + supply_register_by_name ("pc", &newpc); +} + +/* Correct in either endianness. We do not support Thumb yet. */ +static const unsigned long arm_breakpoint = 0xef9f0001; +#define arm_breakpoint_len 4 + +static int +arm_breakpoint_at (CORE_ADDR where) +{ + unsigned long insn; + + (*the_target->read_memory) (where, (char *) &insn, 4); + if (insn == arm_breakpoint) + return 1; + + /* If necessary, recognize more trap instructions here. GDB only uses the + one. */ + return 0; +} + +/* We only place breakpoints in empty marker functions, and thread locking + is outside of the function. So rather than importing software single-step, + we can just run until exit. */ +static CORE_ADDR +arm_reinsert_addr () +{ + unsigned long pc; + collect_register_by_name ("lr", &pc); + return pc; +} + +static void +arm_fill_gregset (void *buf) +{ + int i; + + for (i = 0; i < arm_num_regs; i++) + if (arm_regmap[i] != -1) + collect_register (i, ((char *) buf) + arm_regmap[i]); + +} + +static void +arm_store_gregset (const void *buf) +{ + int i; + + for (i = 0; i < arm_num_regs; i++) + if (arm_regmap[i] != -1) + supply_register (i, ((char *) buf) + arm_regmap[i]); + +} + + +struct regset_info target_regsets[] = { + {PT_GETREGS, PT_SETREGS, sizeof (struct reg), + GENERAL_REGS, + arm_fill_gregset, arm_store_gregset }, + { 0, 0, -1, -1, NULL, NULL } +}; + +struct fbsd_target_ops the_low_target = { + arm_num_regs, + arm_regmap, + arm_cannot_fetch_register, + arm_cannot_store_register, + arm_get_pc, + arm_set_pc, + (const char *) &arm_breakpoint, + arm_breakpoint_len, + arm_reinsert_addr, + 0, + arm_breakpoint_at, +}; Copied: stable/7/gnu/usr.bin/gdb/gdbserver/reg-arm.c (from r185023, head/gnu/usr.bin/gdb/gdbserver/reg-arm.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/gnu/usr.bin/gdb/gdbserver/reg-arm.c Sat May 8 13:23:57 2010 (r207777, copy of r185023, head/gnu/usr.bin/gdb/gdbserver/reg-arm.c) @@ -0,0 +1,68 @@ +/* *INDENT-OFF* */ /* THIS FILE IS GENERATED */ + +/* A register protocol for GDB, the GNU debugger. + Copyright 2001, 2002 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* This file was created with the aid of ``regdat.sh'' and ``reg-arm.dat''. */ + +#include +__FBSDID("$FreeBSD$"); + +#include "regdef.h" +#include "regcache.h" + +struct reg regs_arm[] = { + { "r0", 0, 32 }, + { "r1", 32, 32 }, + { "r2", 64, 32 }, + { "r3", 96, 32 }, + { "r4", 128, 32 }, + { "r5", 160, 32 }, + { "r6", 192, 32 }, + { "r7", 224, 32 }, + { "r8", 256, 32 }, + { "r9", 288, 32 }, + { "r10", 320, 32 }, + { "r11", 352, 32 }, + { "r12", 384, 32 }, + { "sp", 416, 32 }, + { "lr", 448, 32 }, + { "pc", 480, 32 }, + { "f0", 512, 96 }, + { "f1", 608, 96 }, + { "f2", 704, 96 }, + { "f3", 800, 96 }, + { "f4", 896, 96 }, + { "f5", 992, 96 }, + { "f6", 1088, 96 }, + { "f7", 1184, 96 }, + { "fps", 1280, 32 }, + { "cpsr", 1312, 32 }, +}; + +const char *expedite_regs_arm[] = { "r11", "sp", "pc", 0 }; + +void +init_registers () +{ + set_register_cache (regs_arm, + sizeof (regs_arm) / sizeof (regs_arm[0])); + gdbserver_expedite_regs = expedite_regs_arm; +} From owner-svn-src-stable-7@FreeBSD.ORG Sat May 8 20:02:40 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 36C301065672; Sat, 8 May 2010 20:02:40 +0000 (UTC) (envelope-from keramida@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 24F238FC16; Sat, 8 May 2010 20:02:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o48K2exe014680; Sat, 8 May 2010 20:02:40 GMT (envelope-from keramida@svn.freebsd.org) Received: (from keramida@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o48K2eXj014678; Sat, 8 May 2010 20:02:40 GMT (envelope-from keramida@svn.freebsd.org) Message-Id: <201005082002.o48K2eXj014678@svn.freebsd.org> From: Giorgos Keramidas Date: Sat, 8 May 2010 20:02:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207794 - stable/7/usr.sbin/iostat X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 May 2010 20:02:40 -0000 Author: keramida (doc committer) Date: Sat May 8 20:02:39 2010 New Revision: 207794 URL: http://svn.freebsd.org/changeset/base/207794 Log: MFC r196254 iostat: add a bit of space between tty in/out columns The columns for tty input and output may bump against each other if the tty output needs more than 5 columns. Add a bit of space that pushes everything 1 column to the right, but also avoids the problem. Approved by: rwatson Modified: stable/7/usr.sbin/iostat/iostat.c Directory Properties: stable/7/usr.sbin/iostat/ (props changed) Modified: stable/7/usr.sbin/iostat/iostat.c ============================================================================== --- stable/7/usr.sbin/iostat/iostat.c Sat May 8 18:54:47 2010 (r207793) +++ stable/7/usr.sbin/iostat/iostat.c Sat May 8 20:02:39 2010 (r207794) @@ -589,7 +589,7 @@ main(int argc, char **argv) } if (xflag == 0 && Tflag > 0) - printf("%4.0Lf%5.0Lf", cur.tk_nin / etime, + printf("%4.0Lf %5.0Lf", cur.tk_nin / etime, cur.tk_nout / etime); devstats(hflag, etime, havelast); @@ -676,7 +676,7 @@ phdr(void) return; if (Tflag > 0) - (void)printf(" tty"); + (void)printf(" tty"); for (i = 0, printed=0;(i < num_devices) && (printed < maxshowdevs);i++){ int di; if ((dev_select[i].selected != 0) @@ -699,7 +699,7 @@ phdr(void) (void)printf("\n"); if (Tflag > 0) - (void)printf(" tin tout"); + (void)printf(" tin tout"); for (i=0, printed = 0;(i < num_devices) && (printed < maxshowdevs);i++){ if ((dev_select[i].selected != 0) @@ -744,7 +744,7 @@ devstats(int perf_select, long double et if (xflag > 0) { printf(" extended device statistics "); if (Tflag > 0) - printf(" tty "); + printf(" tty "); if (Cflag > 0) printf(" cpu "); printf("\n"); @@ -757,7 +757,7 @@ devstats(int perf_select, long double et "device r/i w/i kr/i kw/i wait svc_t %%b " ); if (Tflag > 0) - printf("tin tout "); + printf("tin tout "); if (Cflag > 0) printf("us ni sy in id "); printf("\n"); @@ -898,7 +898,7 @@ devstats(int perf_select, long double et */ printf("%52s",""); if (Tflag > 0) - printf("%4.0Lf%5.0Lf", cur.tk_nin / etime, + printf("%4.0Lf %5.0Lf", cur.tk_nin / etime, cur.tk_nout / etime); if (Cflag > 0) cpustats(); From owner-svn-src-stable-7@FreeBSD.ORG Sat May 8 22:13:49 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 131E91065673; Sat, 8 May 2010 22:13:49 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 0276C8FC14; Sat, 8 May 2010 22:13:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o48MDmY1043786; Sat, 8 May 2010 22:13:48 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o48MDmKv043785; Sat, 8 May 2010 22:13:48 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005082213.o48MDmKv043785@svn.freebsd.org> From: Doug Barton Date: Sat, 8 May 2010 22:13:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207800 - stable/7/etc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 May 2010 22:13:49 -0000 Author: dougb Date: Sat May 8 22:13:48 2010 New Revision: 207800 URL: http://svn.freebsd.org/changeset/base/207800 Log: MFC r179870: Move the check for enabled knobs further down in run_rc_command() so that bogus commands cause usage information to be printed instead of diagnostics about enabling the knob. This is a prerequisite for merging r206686. Modified: stable/7/etc/rc.subr Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.subr ============================================================================== --- stable/7/etc/rc.subr Sat May 8 21:42:28 2010 (r207799) +++ stable/7/etc/rc.subr Sat May 8 22:13:48 2010 (r207800) @@ -603,23 +603,26 @@ run_rc_command() fi fi + eval $_pidcmd # determine the pid if necessary + + for _elem in $_keywords; do + if [ "$_elem" != "$rc_arg" ]; then + continue + fi # if ${rcvar} is set, and $1 is not # "rcvar", then run # checkyesno ${rcvar} # and return if that failed # - if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then - if ! checkyesno ${rcvar}; then - return 0 + if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then + if ! checkyesno ${rcvar}; then + echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " + echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " + echo "instead of '${rc_arg}'." + return 0 + fi fi - fi - - eval $_pidcmd # determine the pid if necessary - for _elem in $_keywords; do - if [ "$_elem" != "$rc_arg" ]; then - continue - fi # if there's a custom ${XXX_cmd}, # run that instead of the default # From owner-svn-src-stable-7@FreeBSD.ORG Sat May 8 22:15:05 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC26D1065670; Sat, 8 May 2010 22:15:05 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id ABF788FC0C; Sat, 8 May 2010 22:15:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o48MF5bf044104; Sat, 8 May 2010 22:15:05 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o48MF5eo044102; Sat, 8 May 2010 22:15:05 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005082215.o48MF5eo044102@svn.freebsd.org> From: Doug Barton Date: Sat, 8 May 2010 22:15:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207801 - stable/7/etc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 May 2010 22:15:05 -0000 Author: dougb Date: Sat May 8 22:15:05 2010 New Revision: 207801 URL: http://svn.freebsd.org/changeset/base/207801 Log: MFC r206686: Make 'stop' work even if ${name}_enable is not set. Modified: stable/7/etc/rc.subr Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.subr ============================================================================== --- stable/7/etc/rc.subr Sat May 8 22:13:48 2010 (r207800) +++ stable/7/etc/rc.subr Sat May 8 22:15:05 2010 (r207801) @@ -609,12 +609,12 @@ run_rc_command() if [ "$_elem" != "$rc_arg" ]; then continue fi - # if ${rcvar} is set, and $1 is not - # "rcvar", then run + # if ${rcvar} is set, $1 is not "rcvar" + # and ${rc_pid} is not set, then run # checkyesno ${rcvar} # and return if that failed # - if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then + if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " From owner-svn-src-stable-7@FreeBSD.ORG Sat May 8 22:24:31 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D5181065672; Sat, 8 May 2010 22:24:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 5CCD68FC1A; Sat, 8 May 2010 22:24:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o48MOVk8046259; Sat, 8 May 2010 22:24:31 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o48MOVa5046257; Sat, 8 May 2010 22:24:31 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005082224.o48MOVa5046257@svn.freebsd.org> From: Doug Barton Date: Sat, 8 May 2010 22:24:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207803 - stable/7/etc/rc.d X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 May 2010 22:24:31 -0000 Author: dougb Date: Sat May 8 22:24:31 2010 New Revision: 207803 URL: http://svn.freebsd.org/changeset/base/207803 Log: MFC 207346: Fix named-checkconf in the situation where named_chroot_autoupdate is NOT set, but named_chrootdir IS set. Remove required_files for named.conf, named-checkconf is enough. Modified: stable/7/etc/rc.d/named Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.d/named ============================================================================== --- stable/7/etc/rc.d/named Sat May 8 22:24:01 2010 (r207802) +++ stable/7/etc/rc.d/named Sat May 8 22:24:31 2010 (r207803) @@ -192,6 +192,13 @@ named_prestart() $confgen_command fi + local checkconf + + checkconf="${command%/named}/named-checkconf" + if ! checkyesno named_chroot_autoupdate && [ -n "$named_chrootdir" ]; then + checkconf="$checkconf -t $named_chrootdir" + fi + # Create a forwarder configuration based on /etc/resolv.conf if checkyesno named_auto_forward; then if [ ! -s /etc/resolv.conf ]; then @@ -201,7 +208,7 @@ named_prestart() [ -s "${named_confdir}/auto_forward.conf" ] && create_file ${named_confdir}/auto_forward.conf - ${command%/named}/named-checkconf $named_conf || + $checkconf $named_conf || err 3 'named-checkconf for $named_conf failed' return fi @@ -263,8 +270,7 @@ named_prestart() create_file ${named_confdir}/auto_forward.conf fi - ${command%/named}/named-checkconf $named_conf || - err 3 'named-checkconf for $named_conf failed' + $checkconf $named_conf || err 3 'named-checkconf for $named_conf failed' } load_rc_config $name @@ -272,7 +278,7 @@ load_rc_config $name # Updating the following variables requires that rc.conf be loaded first # required_dirs="$named_chrootdir" # if it is set, it must exist -required_files="${named_conf:=/etc/namedb/named.conf}" + pidfile="${named_pidfile:-/var/run/named/pid}" named_confdir="${named_chrootdir}${named_conf%/*}"