From owner-p4-projects@FreeBSD.ORG Sun Apr 18 21:16:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D52C106566B; Sun, 18 Apr 2010 21:16:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 181A81065674 for ; Sun, 18 Apr 2010 21:16:48 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 046FD8FC14 for ; Sun, 18 Apr 2010 21:16:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3ILGlga091155 for ; Sun, 18 Apr 2010 21:16:47 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3ILGlM7091153 for perforce@freebsd.org; Sun, 18 Apr 2010 21:16:47 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 18 Apr 2010 21:16:47 GMT Message-Id: <201004182116.o3ILGlM7091153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Apr 2010 21:16:48 -0000 http://p4web.freebsd.org/@@177063?ac=10 Change 177063 by rene@rene_self on 2010/04/18 21:16:01 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#55 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#42 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#76 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#34 integrate .. //depot/projects/docproj_nl/share/pgpkeys/dougb.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#34 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#31 integrate .. //depot/projects/docproj_nl/share/pgpkeys/sahil.key#1 branch .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#16 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2010-01-2010-03.xml#1 branch .. //depot/projects/docproj_nl/www/en/snapshots/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/nl/administration.sgml#19 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#14 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#22 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#76 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#12 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#55 (text+ko) ==== @@ -1,4 +1,4 @@ - + + an article on practical aspects of rc.d scripting. - One or more rc scripts can be installed: + One or more rc.d scripts can be installed: USE_RC_SUBR= doormand Scripts must be placed in the files subdirectory and a .in suffix must be added to their - filename. The only difference from a base system rc.d script is that the - . /etc/rc.subr line must be replaced with the - . %%RC_SUBR%%, because older versions of &os; - do not have an /etc/rc.subr file. Standard - SUB_LIST expansions are used too. + filename. Standard SUB_LIST expansions will be used + for this file. Use of the %%PREFIX%% and %%LOCALBASE%% expansions is strongly encouraged as well. More on @@ -8438,7 +8435,10 @@ Prior to &os; 6.1-RELEASE, integration with &man.rcorder.8; is available by using USE_RCORDER instead of USE_RC_SUBR. - However, use of this method is deprecated. + However, use of this method is not necessary unless the port has an + option to install itself in the base, or the service needs to run + prior to the FILESYSTEMS rc.d + script in the base. As of &os; 6.1-RELEASE, local rc.d scripts (including those installed by ports) are included in @@ -8501,12 +8501,6 @@ substitution using ":=" would inappropriately override the user's intention. - The suffix of the rc script is provided in - RC_SUBR_SUFFIX for further use in the port's - Makefile. Current versions of &os; do not add - any suffix to the script name, but older versions used to add - .sh suffix. - No new scripts should be added with the .sh suffix. At some point there will be a mass repocopy of all the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#34 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.501 2010/04/05 17:09:49 jacula Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.502 2010/04/11 17:13:08 sahil Exp $ --> aaron@FreeBSD.org"> @@ -974,6 +974,8 @@ sah@FreeBSD.org"> +sahil@FreeBSD.org"> + sam@FreeBSD.org"> sanpei@FreeBSD.org"> ==== //depot/projects/docproj_nl/share/pgpkeys/dougb.key#2 (text+ko) ==== @@ -1,305 +1,246 @@ - + - uid Doug Barton - uid Doug Barton - sub 4096g/2DBB3F89 2003-01-16 +pub 2048R/1A1ABC84 2010-03-23 + Key fingerprint = E352 0E14 9D05 3533 C33A 67DB 5CC6 86F1 1A1A BC84 +uid Douglas Barton +uid Douglas Barton +uid [jpeg image of size 6140] +sub 3072R/498795B4 2010-03-23 + Key fingerprint = C0BE C1E3 8DC8 D7F4 8E6C 732B 0C14 D9CF 4987 95B4 ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#34 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1371,6 +1371,11 @@ &pgpkey.nyan; + + &a.sahil; + &pgpkey.sahil; + + &a.tota; &pgpkey.tota; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#31 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -265,6 +265,7 @@ + ==== //depot/projects/docproj_nl/share/sgml/mirrors.xml#16 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.107 2010/04/08 21:00:28 pgj Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.108 2010/04/11 18:23:02 jkois Exp $ @@ -1295,21 +1295,6 @@ Poland - - www.pl.FreeBSD.org - http://www.pl.FreeBSD.org/ - - - - www2.pl.FreeBSD.org - http://www2.pl.FreeBSD.org/ - http://www2.pl.FreeBSD.org/ - ftp://www2.pl.FreeBSD.org/pub/FreeBSD/ - ftp://www2.pl.FreeBSD.org/pub/FreeBSD/ - - - - ftp.pl.FreeBSD.org ftp://ftp.pl.FreeBSD.org/pub/FreeBSD/ @@ -1324,17 +1309,12 @@ - + cvsup.pl.FreeBSD.org ==== //depot/projects/docproj_nl/www/en/snapshots/index.sgml#2 (text+ko) ==== @@ -1,13 +1,13 @@ - + %developers; ]> - + &header; @@ -32,7 +32,8 @@ sites.

Currently the snapshots of - 8-CURRENT, + 9-CURRENT, + 8-STABLE, 7-STABLE, and 6-STABLE @@ -89,6 +90,7 @@ and it turns out that you never even tried the snapshots, well, it cuts both ways!

+ &footer; ==== //depot/projects/docproj_nl/www/nl/administration.sgml#19 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -7,7 +7,7 @@ &header; @@ -429,6 +429,7 @@

    +
  • &a.brd; <brd@FreeBSD.org>
  • &a.billf; <billf@FreeBSD.org>
  • &a.simon; <simon@FreeBSD.org>
  • &a.ps; <ps@FreeBSD.org>
    • ==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#14 (text+ko) ==== @@ -1,7 +1,7 @@ - ==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#22 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.113 2010/03/28 12:02:35 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.114 2010/04/11 17:52:09 jkois Exp $ @@ -92,6 +92,21 @@ + + Adminia Sistemas + http://www.adminia.es/ + + Adminia offers technological consulting and professional system + administration services, specializing in free software and virtualized + high-availability environments. We have over 15 years experience in + using and customizing FreeBSD systems in data processing centres, + small and medium-sized businesses and universities. We are located in + Madrid, Spain. Contact us for reliable and expert partnership via + email or visit our + website. + + + AnonBSD Inc. https://sites.google.com/site/anonbsd/ ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#76 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.309 2010/04/11 17:19:14 sahil Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.310 2010/04/11 19:38:00 rene Exp $ ==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#12 (text+ko) ==== @@ -5,7 +5,7 @@ - $FreeBSD: www/share/sgml/usergroups.xml,v 1.88 2010/03/30 17:36:27 jkois Exp $ + $FreeBSD: www/share/sgml/usergroups.xml,v 1.91 2010/04/14 19:50:30 jkois Exp $ @@ -181,16 +181,6 @@ - - The Cosmo-Project - http://www.cosmo-project.de/ - The Cosmo-Project is a User Group with a difference. - Instead of just meeting, they actively develop project such as - robots. Most users use FreeBSD, but it is not a specifically - FreeBSD-related group. Located in Germany, Duisburg. - - - BSD User Group Hamburg (BSDHH) http://www.bsdhh.org/bsdhh-de-index.html @@ -380,21 +370,6 @@ - - - The Dutch FreeBSD User Group (NLFUG) - http://www.nlfug.nl - - The Dutch FreeBSD User Group (NLFUG) has had our - first meeting on oct 2, 1999. On this day 30 years before - that, the second IMP was installed in Doug Englebart's lab at - SRI. This, as you all know, was the start of something that - grew to be the Internet (thanks to Edwin Kremer for bringing - this to our attention). Located in the Netherlands. - - - - The Norwegian BSD User Group (NOBUG) @@ -450,19 +425,6 @@ - - - The Hungarian BSD Group - http://www.bsd.hu - - The Hungarian BSD Group is a group of NetBSD, - FreeBSD and OpenBSD users located in Hungary. Their meetings - occur on the second Friday of the month. The website of the - group is http://www.bsd.hu. - - - - BSD Users Sweden (BUS) From owner-p4-projects@FreeBSD.ORG Wed Apr 21 02:35:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE0F91065676; Wed, 21 Apr 2010 02:35:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92547106566C for ; Wed, 21 Apr 2010 02:35:30 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 807C78FC1A for ; Wed, 21 Apr 2010 02:35:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3L2ZU1N027544 for ; Wed, 21 Apr 2010 02:35:30 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3L2ZUmk027542 for perforce@freebsd.org; Wed, 21 Apr 2010 02:35:30 GMT (envelope-from jona@FreeBSD.org) Date: Wed, 21 Apr 2010 02:35:30 GMT Message-Id: <201004210235.o3L2ZUmk027542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 02:35:31 -0000 http://p4web.freebsd.org/@@177159?ac=10 Change 177159 by jona@jona-belle-freebsd8 on 2010/04/21 02:34:57 More locks (for synchronizing FD lists like library directories and preload libraries Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld_lock.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld_lock.h#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld_lock.c#5 (text+ko) ==== @@ -173,7 +173,7 @@ lockinfo.thread_clr_flag(mask); } -#define RTLD_LOCK_CNT 3 +#define RTLD_LOCK_CNT 5 struct rtld_lock { void *handle; int mask; @@ -182,6 +182,8 @@ rtld_lock_t rtld_bind_lock = &rtld_locks[0]; rtld_lock_t rtld_libc_lock = &rtld_locks[1]; rtld_lock_t rtld_phdr_lock = &rtld_locks[2]; +rtld_lock_t rtld_dirs_lock = &rtld_locks[3]; +rtld_lock_t rtld_preloads_lock = &rtld_locks[4]; int rlock_acquire(rtld_lock_t lock) ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld_lock.h#4 (text+ko) ==== @@ -56,6 +56,8 @@ extern rtld_lock_t rtld_bind_lock; extern rtld_lock_t rtld_libc_lock; extern rtld_lock_t rtld_phdr_lock; +extern rtld_lock_t rtld_dirs_lock; +extern rtld_lock_t rtld_preloads_lock; int rlock_acquire(rtld_lock_t); int wlock_acquire(rtld_lock_t); From owner-p4-projects@FreeBSD.ORG Wed Apr 21 02:37:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 273431065673; Wed, 21 Apr 2010 02:37:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC7E2106564A for ; Wed, 21 Apr 2010 02:37:32 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AAAA38FC13 for ; Wed, 21 Apr 2010 02:37:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3L2bWOu027677 for ; Wed, 21 Apr 2010 02:37:32 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3L2bWpu027675 for perforce@freebsd.org; Wed, 21 Apr 2010 02:37:32 GMT (envelope-from jona@FreeBSD.org) Date: Wed, 21 Apr 2010 02:37:32 GMT Message-Id: <201004210237.o3L2bWpu027675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 02:37:33 -0000 http://p4web.freebsd.org/@@177160?ac=10 Change 177160 by jona@jona-belle-freebsd8 on 2010/04/21 02:37:13 Created FDArray structure and methods Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#7 (text+ko) ==== @@ -255,6 +255,11 @@ const Obj_Entry *obj; /* Shared object which defines it */ } SymCache; +/* + * Storage for arrays of file descriptors. + */ +struct Struct_FDArray; + extern void _rtld_error(const char *, ...) __printflike(1, 2); extern Obj_Entry *map_object(int, const char *, const struct stat *); extern void *xcalloc(size_t); @@ -287,6 +292,11 @@ bool allocate_tls_offset(Obj_Entry *obj); void free_tls_offset(Obj_Entry *obj); const Ver_Entry *fetch_ventry(const Obj_Entry *obj, unsigned long); +bool fdarray_init(struct Struct_FDArray*); +bool fdarray_append(struct Struct_FDArray*, int); +int* fdarray_get(struct Struct_FDArray*); +int fdarray_lock(struct Struct_FDArray*); +void fdarray_unlock(struct Struct_FDArray*, int); /* * MD function declarations. From owner-p4-projects@FreeBSD.ORG Wed Apr 21 02:41:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5024D1065670; Wed, 21 Apr 2010 02:41:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 148E8106566B for ; Wed, 21 Apr 2010 02:41:37 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01C648FC18 for ; Wed, 21 Apr 2010 02:41:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3L2faC7027997 for ; Wed, 21 Apr 2010 02:41:36 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3L2faIK027995 for perforce@freebsd.org; Wed, 21 Apr 2010 02:41:36 GMT (envelope-from jona@FreeBSD.org) Date: Wed, 21 Apr 2010 02:41:36 GMT Message-Id: <201004210241.o3L2faIK027995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 02:41:37 -0000 http://p4web.freebsd.org/@@177161?ac=10 Change 177161 by jona@jona-belle-freebsd8 on 2010/04/21 02:41:12 Implement and use FDArray, plus remove some #ifdef IN_RTLD_CAP lines Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#41 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#41 (text+ko) ==== @@ -93,6 +93,13 @@ unsigned int num_used; /* Number of array slots used */ } DoneList; +typedef struct Struct_FDArray { + rtld_lock_t lock; /* Mutual exclusion */ + int *content; /* The file descriptors */ + int count; /* Number of descriptors in array */ + int capacity; /* Space available for descriptors */ +} FDArray; + /* * Function declarations. */ @@ -106,8 +113,10 @@ static bool donelist_check(DoneList *, const Obj_Entry *); static void errmsg_restore(char *); static char *errmsg_save(void); -#ifndef IN_RTLD_CAP static void *fill_search_info(const char *, size_t, void *); +#ifdef IN_RTLD_CAP +static int find_library_fd(const char *name); +#else static char *find_library(const char *, const Obj_Entry *); static const char *gethints(void); #endif @@ -121,9 +130,7 @@ static void linkmap_add(Obj_Entry *); static void linkmap_delete(Obj_Entry *); static int load_needed_objects(Obj_Entry *, int); -#ifndef IN_RTLD_CAP static int load_preload_objects(void); -#endif static Obj_Entry *load_object(const char *, const Obj_Entry *, int); static Obj_Entry *obj_from_addr(const void *); static void objlist_call_fini(Objlist *, bool, int *); @@ -134,9 +141,7 @@ static void objlist_push_head(Objlist *, Obj_Entry *); static void objlist_push_tail(Objlist *, Obj_Entry *); static void objlist_remove(Objlist *, Obj_Entry *); -#ifndef IN_RTLD_CAP static void *path_enumerate(const char *, path_enum_proc, void *); -#endif static int relocate_objects(Obj_Entry *, bool, Obj_Entry *); static int rtld_dirname(const char *, char *); static int rtld_dirname_abs(const char *, char *); @@ -176,25 +181,20 @@ */ static char *error_message; /* Message for dlerror(), or NULL */ struct r_debug r_debug; /* for GDB; */ -#ifndef IN_RTLD_CAP static bool libmap_disable; /* Disable libmap */ static char *libmap_override; /* Maps to use in addition to libmap.conf */ -#endif static bool trust; /* False for setuid and setgid programs */ static bool dangerous_ld_env; /* True if environment variables have been used to affect the libraries loaded */ static char *ld_bind_now; /* Environment variable for immediate binding */ static char *ld_debug; /* Environment variable for debugging */ -static int *ld_library_dirs = NULL; /* File descriptors of lib path (end: -1) */ -static int ld_library_dirs_done; /* ld_library_dirs has been initialized */ -static int ld_library_dirlen; /* Capacity of ld_library_dirs */ -static int ld_library_dircount; /* Number of entries in ld_library_dirs */ -#ifndef IN_RTLD_CAP +static FDArray library_dirs; /* File descriptors of library path */ +static FDArray preload_fds; /* File descriptors of preloaded libraries */ +static bool locks_initialized; /* FDArray locks have been initialized */ static char *ld_library_path; /* Environment variable for search path */ static char *ld_preload; /* Environment variable for libraries to load first */ static char *ld_elf_hints_path; /* Environment variable for alternative hints path */ -#endif static char *ld_tracing; /* Called from ldd to print libs */ static char *ld_utrace; /* Use utrace() to log events. */ static Obj_Entry *obj_list; /* Head of linked list of shared objects */ @@ -451,28 +451,20 @@ } } ld_debug = getenv(LD_ "DEBUG"); -#ifndef IN_RTLD_CAP libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL; libmap_override = getenv(LD_ "LIBMAP"); ld_library_path = getenv(LD_ "LIBRARY_PATH"); ld_preload = getenv(LD_ "PRELOAD"); ld_elf_hints_path = getenv(LD_ "ELF_HINTS_PATH"); -#endif dangerous_ld_env = -#ifdef IN_RTLD_CAP - 1; -#else libmap_disable || (libmap_override != NULL) || (ld_library_path != NULL) || (ld_preload != NULL) || (ld_elf_hints_path != NULL); -#endif ld_tracing = getenv(LD_ "TRACE_LOADED_OBJECTS"); ld_utrace = getenv(LD_ "UTRACE"); -#ifndef IN_RTLD_CAP if ((ld_elf_hints_path == NULL) || strlen(ld_elf_hints_path) == 0) ld_elf_hints_path = _PATH_ELF_HINTS; -#endif if (ld_debug != NULL && *ld_debug != '\0') debug = 1; @@ -567,11 +559,16 @@ #ifndef IN_RTLD_CAP if (!libmap_disable) libmap_disable = (bool)lm_init(libmap_override); +#endif + + /* Initialize FD arrays */ + library_dirs.content = NULL; + preload_fds.content = NULL; + dbg("loading LD_PRELOAD libraries"); if (load_preload_objects() == -1) die(); -#endif preload_tail = obj_tail; dbg("loading needed objects"); @@ -628,6 +625,9 @@ dbg("initializing thread locks"); lockdflt_init(); + locks_initialized = true; + library_dirs.lock = rtld_dirs_lock; + preload_fds.lock = rtld_preloads_lock; /* Make a list of init functions to call. */ objlist_init(&initlist); @@ -1196,6 +1196,83 @@ return h; } + + +bool fdarray_init(struct Struct_FDArray *fds) { + if (fds == NULL) return false; + + int lockstate = fdarray_lock(fds); + + fds->count = 0; + fds->capacity = 8; + fds->content = xmalloc(fds->capacity * sizeof(int)); + + fdarray_unlock(fds, lockstate); + + return true; +} + +int fdarray_lock(struct Struct_FDArray *fds) { + if (!locks_initialized) return 0; + else return wlock_acquire(fds->lock); +} + +int fdarray_rlock(struct Struct_FDArray *fds) { + if (!locks_initialized) return 0; + else return rlock_acquire(fds->lock); +} + +void fdarray_unlock(struct Struct_FDArray *fds, int state) { + if (!locks_initialized) return; + else wlock_release(fds->lock, state); +} + +void fdarray_runlock(struct Struct_FDArray *fds, int state) { + if (!locks_initialized) return; + else rlock_release(fds->lock, state); +} +bool fdarray_append(struct Struct_FDArray *fds, int fd) +{ + + int lockstate = fdarray_lock(fds); + + /* Do we need to grow? */ + if (fds->count == fds->capacity) { + fds->capacity *= 2; + fds->content = realloc(fds->content, fds->capacity * sizeof(int)); + if (fds->content == NULL) { + _rtld_error("add_libdir_fd: realloc failed"); + fdarray_unlock(fds, lockstate); + return false; + } + } + + /* Add the new fd to the end. */ + fds->content[fds->count++] = fd; + + fdarray_unlock(fds, lockstate); + return true; +} + +int* fdarray_get(struct Struct_FDArray *fds) +{ + int bytes, *copy; + + int lockstate = fdarray_rlock(fds); + + bytes = fds->count * sizeof(int); + + copy = xmalloc(bytes); + if (copy != NULL) + bcopy(fds->content, copy, bytes); + + fdarray_runlock(fds, lockstate); + + return copy; +} + + + #ifdef IN_RTLD_CAP /* * Find the library with the given name, and return an open file descriptor @@ -1206,13 +1283,26 @@ { int fd, i; - if (!ld_library_dirs_done) + int lockstate = fdarray_lock(&library_dirs); + + if (library_dirs.content == NULL) { + fdarray_init(&library_dirs); init_libdirs(); - for (i = 0; i < ld_library_dircount; i++) { - fd = openat(ld_library_dirs[i], name, O_RDONLY); - if (fd >= 0) + } + + fdarray_unlock(&library_dirs, lockstate); + + + lockstate = fdarray_rlock(&library_dirs); + for (i = 0; i < library_dirs.count; i++) { + fd = openat(library_dirs.content[i], name, O_RDONLY); + if (fd >= 0) { + fdarray_runlock(&library_dirs, lockstate); return (fd); + } } + + fdarray_runlock(&library_dirs, lockstate); return (-1); } @@ -1573,7 +1663,6 @@ return 0; } -#ifndef IN_RTLD_CAP static int load_preload_objects(void) { @@ -1599,7 +1688,6 @@ LD_UTRACE(UTRACE_PRELOAD_FINISHED, NULL, NULL, 0, 0, NULL); return 0; } -#endif /* * Load a shared object into memory, if it is not already loaded. @@ -1621,7 +1709,7 @@ #ifdef IN_RTLD_CAP if (strchr(name, '/') != NULL) { - _rtld_error("Paths to shared objects not supported \"%s\"", name); + _rtld_error("Absolute paths to shared objects not supported \"%s\"", name); return NULL; } path = xstrdup(name); @@ -1714,6 +1802,7 @@ return NULL; object_add_name(obj, name); + obj->fd = fd; obj->path = path; digest_dynamic(obj, 0); if (obj->z_noopen && (flags & (RTLD_LO_DLOPEN | RTLD_LO_TRACE)) == @@ -1983,7 +2072,6 @@ wlock_release(rtld_bind_lock, lockstate); } -#ifndef IN_RTLD_CAP static void * path_enumerate(const char *path, path_enum_proc callback, void *arg) { @@ -2016,7 +2104,6 @@ return (NULL); } -#endif struct try_library_args { const char *name; @@ -2076,52 +2163,15 @@ #endif /* - * Add a file descriptor to ld_library_dirs. - * - * XXX: This may be called from either the rtld startup code, or from - * ld_libdirs. We have no way to distinguish them on error, so die() - * unconditionally. Perhaps the latter case should allow graceful failure. - * - * XXX: Synchronization? - */ -static void -add_libdir_fd(int fd) -{ - - /* Initialize the FD list. */ - if (!ld_library_dirs_done) { - ld_library_dirlen = INITIAL_FDLEN; - ld_library_dircount = 0; - ld_library_dirs = xmalloc(ld_library_dirlen * sizeof(int)); - ld_library_dirs_done = 1; - } - - /* Do we need to grow? */ - if (ld_library_dirlen == ld_library_dircount) { - ld_library_dirlen *= 2; - ld_library_dirs = realloc(ld_library_dirs, - ld_library_dirlen * sizeof(int)); - if (ld_library_dirs == NULL) { - _rtld_error("add_libdir_fd: realloc failed"); - die(); - } - } - - /* Add the new library directory fd to the end. */ - ld_library_dirs[ld_library_dircount] = fd; - ld_library_dircount++; -} - -/* * Add file descriptors for a path list (e.g. '/lib:/usr/lib') to * ld_library_dirs. */ -static void +static bool add_libdir_paths(const char *path) { if (path == NULL) - return; + return false; char *pathcopy, *dirname, *tokcontext; int pathlen = strnlen(path, PATH_MAX); @@ -2129,6 +2179,7 @@ pathcopy = malloc(pathlen + 1); strncpy(pathcopy, path, pathlen + 1); + bool success = true; for (dirname = strtok_r(pathcopy, ":", &tokcontext); dirname; dirname = strtok_r(NULL, ":", &tokcontext)) { struct try_library_args arg; @@ -2149,10 +2200,14 @@ } if (fd >= 0) - add_libdir_fd(fd); + if (!fdarray_append(&library_dirs, fd)) { + success = false; + break; + } } free(pathcopy); + return success; } /* @@ -2178,27 +2233,33 @@ /* * Return an array of file descriptors for the library search paths. - * - * XXX: synchronization of ld_library_dirs? */ int ld_libdirs(int *fds, int *fdcount) { - if (fdcount == NULL) return (-1); else if (fds == NULL) { *fdcount = -1; return (-1); } - if (!ld_library_dirs_done) + + int lockstate = rlock_acquire(library_dirs.lock); + + if (library_dirs.content == NULL) init_libdirs(); - if (*fdcount < ld_library_dircount) { - *fdcount = ld_library_dircount; + + if (*fdcount < library_dirs.count) { + *fdcount = library_dirs.count; + rlock_release(library_dirs.lock, lockstate); return (-1); } - *fdcount = ld_library_dircount; - memcpy(fds, ld_library_dirs, ld_library_dircount * sizeof(int)); + + *fdcount = library_dirs.count; + memcpy(fds, library_dirs.content, *fdcount * sizeof(int)); + + rlock_release(library_dirs.lock, lockstate); + return (0); } @@ -2645,7 +2706,6 @@ char *strspace; }; -#ifndef IN_RTLD_CAP static void * fill_search_info(const char *dir, size_t dirlen, void *param) { @@ -2672,24 +2732,21 @@ return (NULL); } -#endif static int do_search_info(const Obj_Entry *obj, int request, struct dl_serinfo *info) { struct dl_serinfo _info; -#ifndef IN_RTLD_CAP struct fill_search_info_args args; args.request = RTLD_DI_SERINFOSIZE; args.serinfo = &_info; -#endif _info.dls_size = __offsetof(struct dl_serinfo, dls_serpath); _info.dls_cnt = 0; + path_enumerate(ld_library_path, fill_search_info, &args); #ifndef IN_RTLD_CAP - path_enumerate(ld_library_path, fill_search_info, &args); path_enumerate(obj->rpath, fill_search_info, &args); path_enumerate(gethints(), fill_search_info, &args); path_enumerate(STANDARD_LIBRARY_PATH, fill_search_info, &args); From owner-p4-projects@FreeBSD.ORG Wed Apr 21 03:22:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98D1B1065675; Wed, 21 Apr 2010 03:22:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41993106566C for ; Wed, 21 Apr 2010 03:22:18 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2FD818FC1E for ; Wed, 21 Apr 2010 03:22:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3L3MI86032069 for ; Wed, 21 Apr 2010 03:22:18 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3L3MIPD032067 for perforce@freebsd.org; Wed, 21 Apr 2010 03:22:18 GMT (envelope-from jona@FreeBSD.org) Date: Wed, 21 Apr 2010 03:22:18 GMT Message-Id: <201004210322.o3L3MIPD032067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 03:22:18 -0000 http://p4web.freebsd.org/@@177162?ac=10 Change 177162 by jona@jona-belle-freebsd8 on 2010/04/21 03:21:33 Allow libraries to be named by file descriptor number when in capability mode. Also, moved the initialization of the library_dirs FDArray. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#42 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#42 (text+ko) ==== @@ -1284,12 +1284,7 @@ int fd, i; int lockstate = fdarray_lock(&library_dirs); - - if (library_dirs.content == NULL) { - fdarray_init(&library_dirs); - init_libdirs(); - } - + if (library_dirs.content == NULL) init_libdirs(); fdarray_unlock(&library_dirs, lockstate); @@ -1712,11 +1707,18 @@ _rtld_error("Absolute paths to shared objects not supported \"%s\"", name); return NULL; } - path = xstrdup(name); - if ((fd = find_library_fd(path)) < 0) { - _rtld_error("Unable to find \"%s\" in LD_LIBRARY_DIRS", path); - free(path); - return NULL; + + /* is the name actually a file descriptor? */ + long long long_fd = strtonum(name, 0, 10000, NULL); + fd = (int) long_fd; + if (fstat(fd, &sb) == -1) { + /* if not, search the library path */ + path = xstrdup(name); + if ((fd = find_library_fd(path)) < 0) { + _rtld_error("Unable to find \"%s\" in LD_LIBRARY_DIRS", path); + free(path); + return NULL; + } } #else path = find_library(name, refobj); @@ -2216,6 +2218,8 @@ static void init_libdirs(void) { + fdarray_init(&library_dirs); + #ifdef IN_RTLD_CAP char *envvar = getenv(LD_ "LIBRARY_DIRS"); From owner-p4-projects@FreeBSD.ORG Wed Apr 21 12:08:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37EF41065672; Wed, 21 Apr 2010 12:08:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F05561065670 for ; Wed, 21 Apr 2010 12:08:05 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC8508FC25 for ; Wed, 21 Apr 2010 12:08:05 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LC85PZ001862 for ; Wed, 21 Apr 2010 12:08:05 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LC85jH001860 for perforce@freebsd.org; Wed, 21 Apr 2010 12:08:05 GMT (envelope-from mav@freebsd.org) Date: Wed, 21 Apr 2010 12:08:05 GMT Message-Id: <201004211208.o3LC85jH001860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 12:08:06 -0000 http://p4web.freebsd.org/@@177174?ac=10 Change 177174 by mav@mav_mavtest on 2010/04/21 12:07:13 Implement error handling. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#4 (text+ko) ==== @@ -87,6 +87,7 @@ static void mvs_legacy_execute_transaction(struct mvs_slot *slot); static void mvs_timeout(struct mvs_slot *slot); static void mvs_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error); +static void mvs_requeue_frozen(device_t dev); static void mvs_execute_transaction(struct mvs_slot *slot); static void mvs_end_transaction(struct mvs_slot *slot, enum mvs_err_type et); @@ -843,6 +844,7 @@ ch->curr_mode = mode; ch->fbs_enabled = 0; ch->fake_busy = 0; + device_printf(dev, "EDMA mode: %d\n", mode); if (mode == MVS_EDMA_OFF) return; /* Configure new mode. */ @@ -865,10 +867,10 @@ ATA_OUTL(ch->r_mem, EDMA_CFG, reg); mvs_setup_edma_queues(dev); /* Configure FBS */ - device_printf(dev, "fisc %08x\n",ATA_INL(ch->r_mem, SATA_FISC)); - device_printf(dev, "ltmode %08x\n",ATA_INL(ch->r_mem, SATA_LTM)); - device_printf(dev, "edmacfg %08x\n",ATA_INL(ch->r_mem, EDMA_CFG)); - device_printf(dev, "haltcond %08x\n",ATA_INL(ch->r_mem, EDMA_HC)); +// device_printf(dev, "fisc %08x\n",ATA_INL(ch->r_mem, SATA_FISC)); +// device_printf(dev, "ltmode %08x\n",ATA_INL(ch->r_mem, SATA_LTM)); +// device_printf(dev, "edmacfg %08x\n",ATA_INL(ch->r_mem, EDMA_CFG)); +// device_printf(dev, "haltcond %08x\n",ATA_INL(ch->r_mem, EDMA_HC)); /* Run EDMA. */ ATA_OUTL(ch->r_mem, EDMA_CMD, EDMA_CMD_EENEDMA); } @@ -977,10 +979,13 @@ device_t dev = (device_t)arg->arg; struct mvs_channel *ch = device_get_softc(dev); uint32_t iec, serr = 0, fisic = 0; + enum mvs_err_type et; + int i, ccs, port = -1; + int edma = (ch->numtslots != 0 || ch->numdslots != 0); -//device_printf(dev, "irq cause %02x IEC %08x\n", -// arg->cause, ATA_INL(ch->r_mem, EDMA_IEC)); - if ((ch->numtslots != 0 || ch->numdslots != 0) && (arg->cause & 2)) +//device_printf(dev, "irq cause %02x EDMA %d IEC %08x\n", +// arg->cause, edma, ATA_INL(ch->r_mem, EDMA_IEC)); + if ((arg->cause & 2) && edma) mvs_crbq_intr(dev); if (arg->cause & 1) { iec = ATA_INL(ch->r_mem, EDMA_IEC); @@ -991,12 +996,82 @@ } if (iec & EDMA_IE_ETRANSINT) { fisic = ATA_INL(ch->r_mem, SATA_FISIC); - ATA_OUTL(ch->r_mem, SATA_FISIC, ~fisic); device_printf(dev, "FISC %08x\n", ATA_INL(ch->r_mem, SATA_FISC)); device_printf(dev, "FISIC %08x\n", fisic); device_printf(dev, "FISIM %08x\n", ATA_INL(ch->r_mem, SATA_FISIM)); } ATA_OUTL(ch->r_mem, EDMA_IEC, ~iec); + /* Interface errors or Device error. */ + if (iec & (0xfffff000 | EDMA_IE_EDEVERR)) { + port = -1; + if (ch->numpslots != 0) { + ccs = 0; + } else { + if (ch->quirks & MVS_Q_GENIIE) + ccs = EDMA_S_EIOID(ATA_INL(ch->r_mem, EDMA_S)); + else + ccs = EDMA_S_EDEVQUETAG(ATA_INL(ch->r_mem, EDMA_S)); + /* Check if error is one-PMP-port-specific, */ + if (ch->fbs_enabled) { + /* Which ports were active. */ + for (i = 0; i < 16; i++) { + if (ch->numrslotspd[i] == 0) + continue; + if (port == -1) + port = i; + else if (port != i) { + port = -2; + break; + } + } + /* If several ports were active and EDMA still enabled - + * other ports are probably unaffected and may continue. + */ + if (port == -2 && (iec & EDMA_IE_ESELFDIS) == 0) { + uint16_t p = ATA_INL(ch->r_mem, SATA_SATAITC) >> 16; + port = ffs(p) - 1; + if (port != (fls(p) - 1)) + port = -2; + } + } + } +device_printf(dev, "err slot %d port %d\n", ccs, port); + mvs_requeue_frozen(dev); + for (i = 0; i < MVS_MAX_SLOTS; i++) { + /* XXX: reqests in loading state. */ + if (((ch->rslots >> i) & 1) == 0) + continue; + if (port >= 0 && + ch->slot[i].ccb->ccb_h.target_id != port) + continue; + if (iec & EDMA_IE_EDEVERR) { /* Device error. */ + if (port != -2) { + if (ch->numtslots == 0) { + /* Untagged operation. */ + if (i == ccs) + et = MVS_ERR_TFE; + else + et = MVS_ERR_INNOCENT; + } else { + /* Tagged operation. */ + et = MVS_ERR_NCQ; + } + } else { + et = MVS_ERR_TFE; + ch->fatalerr = 1; + } + } else if (iec & 0xfffff000) { + if (ch->numtslots == 0 && i != ccs && port != -2) + et = MVS_ERR_INNOCENT; + else + et = MVS_ERR_SATA; + } else + et = MVS_ERR_INVALID; + mvs_end_transaction(&ch->slot[i], et); + } + } + if (fisic) + ATA_OUTL(ch->r_mem, SATA_FISIC, ~fisic); if (iec & EDMA_IE_ESELFDIS) ch->curr_mode = MVS_EDMA_OFF; if ((iec & (EDMA_IE_EDEVDIS | EDMA_IE_EDEVCON)) || @@ -1005,146 +1080,8 @@ if (fisic & SATA_FISC_FISWAIT4HOSTRDYEN_B1) mvs_notify_events(dev, ch->pm_present ? 0x8000 : 0x0001); } - if ((ch->numpslots != 0) && (arg->cause & 2)) + if ((arg->cause & 2) && !edma) mvs_legacy_intr(dev); -#if 0 - uint32_t istatus, sstatus, cstatus, serr = 0, sntf = 0, ok, err; - enum mvs_err_type et; - int i, ccs, port; - - /* Read and clear interrupt statuses. */ - istatus = ATA_INL(ch->r_mem, MVS_P_IS); - if (istatus == 0) - return; - ATA_OUTL(ch->r_mem, MVS_P_IS, istatus); - /* Read command statuses. */ - sstatus = ATA_INL(ch->r_mem, MVS_P_SACT); - cstatus = ATA_INL(ch->r_mem, MVS_P_CI); - if (istatus & MVS_P_IX_SDB) { - if (ch->caps & MVS_CAP_SSNTF) - sntf = ATA_INL(ch->r_mem, MVS_P_SNTF); - else if (ch->fbs_enabled) { - u_int8_t *fis = ch->dma.rfis + 0x58; - - for (i = 0; i < 16; i++) { - if (fis[1] & 0x80) { - fis[1] &= 0x7f; - sntf |= 1 << i; - } - fis += 256; - } - } else { - u_int8_t *fis = ch->dma.rfis + 0x58; - - if (fis[1] & 0x80) - sntf = (1 << (fis[1] & 0x0f)); - } - } - /* Process PHY events */ - if (istatus & (MVS_P_IX_PC | MVS_P_IX_PRC | MVS_P_IX_OF | - MVS_P_IX_IF | MVS_P_IX_HBD | MVS_P_IX_HBF | MVS_P_IX_TFE)) { - serr = ATA_INL(ch->r_mem, SATA_SE); - if (serr) { - ATA_OUTL(ch->r_mem, SATA_SE, 0xffffffff); - mvs_phy_check_events(dev, serr); - } - } - /* Process command errors */ - if (istatus & (MVS_P_IX_OF | MVS_P_IX_IF | - MVS_P_IX_HBD | MVS_P_IX_HBF | MVS_P_IX_TFE)) { - ccs = (ATA_INL(ch->r_mem, MVS_P_CMD) & MVS_P_CMD_CCS_MASK) - >> MVS_P_CMD_CCS_SHIFT; -//device_printf(dev, "%s ERROR is %08x cs %08x ss %08x rs %08x tfd %02x serr %08x fbs %08x ccs %d\n", -// __func__, istatus, cstatus, sstatus, ch->rslots, ATA_INL(ch->r_mem, MVS_P_TFD), -// serr, ATA_INL(ch->r_mem, MVS_P_FBS), ccs); - port = -1; - if (ch->fbs_enabled) { - uint32_t fbs = ATA_INL(ch->r_mem, MVS_P_FBS); - if (fbs & MVS_P_FBS_SDE) { - port = (fbs & MVS_P_FBS_DWE) - >> MVS_P_FBS_DWE_SHIFT; - } else { - for (i = 0; i < 16; i++) { - if (ch->numrslotspd[i] == 0) - continue; - if (port == -1) - port = i; - else if (port != i) { - port = -2; - break; - } - } - } - } - err = ch->rslots & (cstatus | sstatus); - } else { - ccs = 0; - err = 0; - port = -1; - } - /* Complete all successfull commands. */ - ok = ch->rslots & ~(cstatus | sstatus); - for (i = 0; i < MVS_MAX_SLOTS; i++) { - if ((ok >> i) & 1) - mvs_end_transaction(&ch->slot[i], MVS_ERR_NONE); - } - /* On error, complete the rest of commands with error statuses. */ - if (err) { - if (ch->frozen) { - union ccb *fccb = ch->frozen; - ch->frozen = NULL; - fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ; - if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) { - xpt_freeze_devq(fccb->ccb_h.path, 1); - fccb->ccb_h.status |= CAM_DEV_QFRZN; - } - xpt_done(fccb); - } - for (i = 0; i < MVS_MAX_SLOTS; i++) { - /* XXX: reqests in loading state. */ - if (((err >> i) & 1) == 0) - continue; - if (port >= 0 && - ch->slot[i].ccb->ccb_h.target_id != port) - continue; - if (istatus & MVS_P_IX_TFE) { - if (port != -2) { - /* Task File Error */ - if (ch->numtslotspd[ - ch->slot[i].ccb->ccb_h.target_id] == 0) { - /* Untagged operation. */ - if (i == ccs) - et = MVS_ERR_TFE; - else - et = MVS_ERR_INNOCENT; - } else { - /* Tagged operation. */ - et = MVS_ERR_NCQ; - } - } else { - et = MVS_ERR_TFE; - ch->fatalerr = 1; - } - } else if (istatus & MVS_P_IX_IF) { - if (ch->numtslots == 0 && i != ccs && port != -2) - et = MVS_ERR_INNOCENT; - else - et = MVS_ERR_SATA; - } else - et = MVS_ERR_INVALID; - mvs_end_transaction(&ch->slot[i], et); - } - /* - * We can't reinit port if there are some other - * commands active, use resume to complete them. - */ - if (ch->rslots != 0) - ATA_OUTL(ch->r_mem, MVS_P_FBS, MVS_P_FBS_EN | MVS_P_FBS_DEC); - } - /* Process NOTIFY events */ - if (sntf) - mvs_notify_events(dev, sntf); -#endif } static uint8_t @@ -1166,7 +1103,8 @@ mvs_legacy_intr(device_t dev) { struct mvs_channel *ch = device_get_softc(dev); - union ccb *ccb = ch->slot[0].ccb; + struct mvs_slot *slot = &ch->slot[0]; /* PIO is always in slot 0. */ + union ccb *ccb = slot->ccb; enum mvs_err_type et = MVS_ERR_NONE; int port = ccb->ccb_h.target_id & 0x0f; u_int length; @@ -1176,7 +1114,7 @@ status = mvs_getstatus(dev, 1); // device_printf(dev, "Legacy intr status %02x\n", // status); - if (ch->slot[0].state < MVS_SLOT_RUNNING) { + if (slot->state < MVS_SLOT_RUNNING) { // device_printf(dev, "Stray irq\n"); return; } @@ -1343,7 +1281,7 @@ mvs_tfd_read(dev, ccb); // device_printf(dev, "After complete status %02x\n", // ATA_INB(ch->r_mem, ATA_ALTSTAT)); - mvs_end_transaction(&ch->slot[0], et); + mvs_end_transaction(slot, et); } static void @@ -1363,15 +1301,24 @@ crpb = (struct mvs_crpb *) (ch->dma.workrp + MVS_CRPB_OFFSET + (MVS_CRPB_SIZE * ch->in_idx)); slot = le16toh(crpb->id) & MVS_CRPB_TAG_MASK; - if (ch->slot[slot].state >= MVS_SLOT_RUNNING) { -//device_printf(dev, "CRPB %d %d %04x\n", ch->in_idx, slot, le16toh(crpb->rspflg)); - flags = le16toh(crpb->rspflg); - ccb = ch->slot[slot].ccb; - ccb->ataio.res.status = (flags & MVS_CRPB_ATASTS_MASK) >> - MVS_CRPB_ATASTS_SHIFT; - mvs_end_transaction(&ch->slot[slot], MVS_ERR_NONE); - } else -device_printf(dev, "EMPTY CRPB %d %d %04x\n", ch->in_idx, slot, le16toh(crpb->rspflg)); + flags = le16toh(crpb->rspflg); +//device_printf(dev, "CRPB %d %d %04x\n", ch->in_idx, slot, flags); + /* + * Handle only successfull completions. + * Errors will be handled by main intr handler. + */ + if (ch->numtslots != 0 || (flags & EDMA_IE_EDEVERR) == 0) { +if ((flags >> 8) & ATA_S_ERROR) +device_printf(dev, "ERROR STATUS CRPB %d %d %04x\n", ch->in_idx, slot, flags); + if (ch->slot[slot].state >= MVS_SLOT_RUNNING) { + ccb = ch->slot[slot].ccb; + ccb->ataio.res.status = (flags & MVS_CRPB_ATASTS_MASK) >> + MVS_CRPB_ATASTS_SHIFT; + mvs_end_transaction(&ch->slot[slot], MVS_ERR_NONE); + } else +device_printf(dev, "EMPTY CRPB %d %d %04x\n", ch->in_idx, slot, flags); + } else +device_printf(dev, "ERROR FLAGS CRPB %d %d %04x\n", ch->in_idx, slot, flags); ch->in_idx = (ch->in_idx + 1) & (MVS_MAX_SLOTS - 1); } @@ -1682,8 +1629,8 @@ int port = ccb->ccb_h.target_id & 0x0f; int i; -// device_printf(dev, "%d EDMA command %02x size %d (%p) slot %d tag %d\n", -// port, ccb->ataio.cmd.command, ccb->ataio.dxfer_len, ccb->ataio.data_ptr, slot->slot, slot->tag); + device_printf(dev, "%d EDMA command %02x size %d (%p) slot %d tag %d\n", + port, ccb->ataio.cmd.command, ccb->ataio.dxfer_len, ccb->ataio.data_ptr, slot->slot, slot->tag); /* Get address of the prepared EPRD */ eprd = ch->dma.workrq_bus + MVS_EPRD_OFFSET + (MVS_EPRD_SIZE * slot->slot); /* Prepare CRQB. Gen IIe uses different CRQB format. */ @@ -1776,7 +1723,7 @@ ATA_OUTL(ch->r_mem, EDMA_REQQIP, ch->dma.workrq_bus + MVS_CRQB_OFFSET + (MVS_CRQB_SIZE * ch->out_idx)); /* Start command execution timeout */ - callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 2000, + callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 1000, (timeout_t*)mvs_timeout, slot); return; } @@ -1826,70 +1773,26 @@ { device_t dev = slot->dev; struct mvs_channel *ch = device_get_softc(dev); -// uint32_t sstatus; -// int ccs; - int i; /* Check for stale timeout. */ if (slot->state < MVS_SLOT_RUNNING) return; -#if 0 - /* Check if slot was not being executed last time we checked. */ - if (slot->state < MVS_SLOT_EXECUTING) { - /* Check if slot started executing. */ - sstatus = ATA_INL(ch->r_mem, MVS_P_SACT); - ccs = (ATA_INL(ch->r_mem, MVS_P_CMD) & MVS_P_CMD_CCS_MASK) - >> MVS_P_CMD_CCS_SHIFT; - if ((sstatus & (1 << slot->slot)) != 0 || ccs == slot->slot || - ch->fbs_enabled) - slot->state = MVS_SLOT_EXECUTING; - - callout_reset(&slot->timeout, - (int)slot->ccb->ccb_h.timeout * hz / 2000, - (timeout_t*)mvs_timeout, slot); - return; - } -#endif device_printf(dev, "Timeout on slot %d\n", slot->slot); device_printf(dev, "ic %08x iec %08x edma_s %08x dma_c %08x dma_s %08x rs %08x tfd %02x serr %08x\n", ATA_INL(ch->r_mem, HC_IC), ATA_INL(ch->r_mem, EDMA_IEC), ATA_INL(ch->r_mem, EDMA_S), ATA_INL(ch->r_mem, DMA_C), ATA_INL(ch->r_mem, DMA_S), ch->rslots, ATA_INB(ch->r_mem, ATA_ALTSTAT), ATA_INL(ch->r_mem, SATA_SE)); - /* Handle frozen command. */ - if (ch->frozen) { - union ccb *fccb = ch->frozen; - ch->frozen = NULL; - fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ; - if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) { - xpt_freeze_devq(fccb->ccb_h.path, 1); - fccb->ccb_h.status |= CAM_DEV_QFRZN; - } - xpt_done(fccb); - } - if (ch->fbs_enabled == 0 || ch->pm_present == 0) { - /* Without FBS we know real timeout source. */ - ch->fatalerr = 1; - /* Handle command with timeout. */ - mvs_end_transaction(&ch->slot[slot->slot], MVS_ERR_TIMEOUT); - /* Handle the rest of commands. */ - for (i = 0; i < MVS_MAX_SLOTS; i++) { - /* Do we have a running request on slot? */ - if (ch->slot[i].state < MVS_SLOT_RUNNING) - continue; - mvs_end_transaction(&ch->slot[i], MVS_ERR_INNOCENT); - } - } else { - /* With FBS we wait for other commands timeout and pray. */ - if (ch->toslots == 0) - xpt_freeze_simq(ch->sim, 1); - ch->toslots |= (1 << slot->slot); - if ((ch->rslots & ~ch->toslots) == 0) - mvs_process_timeout(dev); - else - device_printf(dev, " ... waiting for slots %08x\n", - ch->rslots & ~ch->toslots); - } + mvs_requeue_frozen(dev); + /* We wait for other commands timeout and pray. */ + if (ch->toslots == 0) + xpt_freeze_simq(ch->sim, 1); + ch->toslots |= (1 << slot->slot); + if ((ch->rslots & ~ch->toslots) == 0) + mvs_process_timeout(dev); + else + device_printf(dev, " ... waiting for slots %08x\n", + ch->rslots & ~ch->toslots); } /* Must be called with channel locked. */ @@ -1900,6 +1803,7 @@ struct mvs_channel *ch = device_get_softc(dev); union ccb *ccb = slot->ccb; +device_printf(dev, "cmd done status %d\n", et); bus_dmamap_sync(ch->dma.workrq_tag, ch->dma.workrq_map, BUS_DMASYNC_POSTWRITE); /* Read result registers to the result struct @@ -2008,6 +1912,7 @@ /* If it was NCQ command error, put result on hold. */ } else if (et == MVS_ERR_NCQ) { ch->hold[slot->slot] = ccb; + ch->holdtag[slot->slot] = slot->tag; ch->numhslots++; } else xpt_done(ccb); @@ -2026,8 +1931,8 @@ } else { /* if we have slots in error, we can reinit port. */ if (ch->eslots != 0) { -// mvs_stop(dev); -// mvs_start(dev, 1); + mvs_set_edma_mode(dev, MVS_EDMA_OFF); + ch->eslots = 0; } /* if there commands on hold, we can do READ LOG. */ if (!ch->readlog && ch->numhslots) @@ -2103,7 +2008,9 @@ for (i = 0; i < MVS_MAX_SLOTS; i++) { if (!ch->hold[i]) continue; - if ((data[0] & 0x1F) == i) { + if (ch->hold[i]->ccb_h.target_id != ccb->ccb_h.target_id) + continue; + if ((data[0] & 0x1F) == ch->holdtag[i]) { res = &ch->hold[i]->ataio.res; res->status = data[2]; res->error = data[3]; @@ -2133,6 +2040,8 @@ for (i = 0; i < MVS_MAX_SLOTS; i++) { if (!ch->hold[i]) continue; + if (ch->hold[i]->ccb_h.target_id != ccb->ccb_h.target_id) + continue; xpt_done(ch->hold[i]); ch->hold[i] = NULL; ch->numhslots--; @@ -2161,18 +2070,12 @@ } static void -mvs_reset(device_t dev) +mvs_requeue_frozen(device_t dev) { struct mvs_channel *ch = device_get_softc(dev); -// struct mvs_controller *ctlr = device_get_softc(device_get_parent(dev)); - int i; + union ccb *fccb = ch->frozen; - xpt_freeze_simq(ch->sim, 1); - if (bootverbose) - device_printf(dev, "MVS reset...\n"); - /* Requeue freezed command. */ - if (ch->frozen) { - union ccb *fccb = ch->frozen; + if (fccb) { ch->frozen = NULL; fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ; if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) { @@ -2181,6 +2084,19 @@ } xpt_done(fccb); } +} + +static void +mvs_reset(device_t dev) +{ + struct mvs_channel *ch = device_get_softc(dev); + int i; + + xpt_freeze_simq(ch->sim, 1); + if (bootverbose) + device_printf(dev, "MVS reset...\n"); + /* Requeue freezed command. */ + mvs_requeue_frozen(dev); /* Kill the engine and requeue all running commands. */ mvs_set_edma_mode(dev, MVS_EDMA_OFF); for (i = 0; i < MVS_MAX_SLOTS; i++) { ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#4 (text+ko) ==== @@ -510,6 +510,7 @@ struct mvs_slot slot[MVS_MAX_SLOTS]; union ccb *hold[MVS_MAX_SLOTS]; + int holdtag[MVS_MAX_SLOTS]; /* Tags used for holden commands. */ struct mtx mtx; /* state lock */ int devices; /* What is present */ int pm_present; /* PM presence reported */ From owner-p4-projects@FreeBSD.ORG Wed Apr 21 13:49:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E4AD1065670; Wed, 21 Apr 2010 13:49:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22E53106566B for ; Wed, 21 Apr 2010 13:49:48 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 115088FC16 for ; Wed, 21 Apr 2010 13:49:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LDnlc4021520 for ; Wed, 21 Apr 2010 13:49:47 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LDnl1k021518 for perforce@freebsd.org; Wed, 21 Apr 2010 13:49:47 GMT (envelope-from mav@freebsd.org) Date: Wed, 21 Apr 2010 13:49:47 GMT Message-Id: <201004211349.o3LDnl1k021518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 13:49:48 -0000 http://p4web.freebsd.org/@@177177?ac=10 Change 177177 by mav@mav_mavtest on 2010/04/21 13:49:12 Arm timeout for PIO commands. Fix crash on stray interrupt. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#5 (text+ko) ==== @@ -306,7 +306,7 @@ mvs_setup_interrupt(device_t dev) { struct mvs_controller *ctlr = device_get_softc(dev); - int msi = 0; + int msi = 1; /* Process hints. */ resource_int_value(device_get_name(dev), @@ -352,7 +352,7 @@ u_int32_t ic, aic; ic = ATA_INL(ctlr->r_mem, CHIP_MIC); -//device_printf(ctlr->dev, "irq MIC:%08x\n", ic); +device_printf(ctlr->dev, "irq MIC:%08x\n", ic); if (ic & IC_ALL_PORTS_COAL_DONE) ATA_OUTL(ctlr->r_mem, CHIP_MIC, ~IC_ALL_PORTS_COAL_DONE); for (p = 0; p < ctlr->channels; p++) { @@ -1106,7 +1106,7 @@ struct mvs_slot *slot = &ch->slot[0]; /* PIO is always in slot 0. */ union ccb *ccb = slot->ccb; enum mvs_err_type et = MVS_ERR_NONE; - int port = ccb->ccb_h.target_id & 0x0f; + int port; u_int length; uint8_t status, ireason; @@ -1115,9 +1115,10 @@ // device_printf(dev, "Legacy intr status %02x\n", // status); if (slot->state < MVS_SLOT_RUNNING) { -// device_printf(dev, "Stray irq\n"); + device_printf(dev, "Stray irq\n"); return; } + port = ccb->ccb_h.target_id & 0x0f; /* Wait a bit for late !BUSY status update. */ if (status & ATA_S_BUSY) { DELAY(100); @@ -1582,6 +1583,9 @@ ch->fake_busy = 1; DELAY(10); } + /* Start command execution timeout */ + callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 1000, + (timeout_t*)mvs_timeout, slot); } /* Locked by busdma engine. */ From owner-p4-projects@FreeBSD.ORG Wed Apr 21 16:52:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 696A41065672; Wed, 21 Apr 2010 16:52:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D12C106566B for ; Wed, 21 Apr 2010 16:52:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1ADED8FC19 for ; Wed, 21 Apr 2010 16:52:51 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LGqo0d048838 for ; Wed, 21 Apr 2010 16:52:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LGqoXn048836 for perforce@freebsd.org; Wed, 21 Apr 2010 16:52:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 21 Apr 2010 16:52:50 GMT Message-Id: <201004211652.o3LGqoXn048836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177179 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 16:52:51 -0000 http://p4web.freebsd.org/@@177179?ac=10 Change 177179 by hselasky@hselasky_laptop001 on 2010/04/21 16:52:09 USB CORE: - add missing "static" keyword. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#42 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#42 (text+ko) ==== @@ -199,7 +199,7 @@ * 0: Success, refcount incremented on the given USB device. * Else: Failure. *------------------------------------------------------------------------*/ -usb_error_t +static usb_error_t usb_ref_device(struct usb_cdev_privdata *cpd, struct usb_cdev_refdata *crd, int need_uref) { @@ -344,7 +344,7 @@ * This function will release the reference count by one unit for the * given USB device. *------------------------------------------------------------------------*/ -void +static void usb_unref_device(struct usb_cdev_privdata *cpd, struct usb_cdev_refdata *crd) { From owner-p4-projects@FreeBSD.ORG Wed Apr 21 17:34:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B72C1065677; Wed, 21 Apr 2010 17:34:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F209A106566B for ; Wed, 21 Apr 2010 17:34:47 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEE748FC28 for ; Wed, 21 Apr 2010 17:34:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LHYlnF053047 for ; Wed, 21 Apr 2010 17:34:47 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LHYlQd053045 for perforce@freebsd.org; Wed, 21 Apr 2010 17:34:47 GMT (envelope-from mav@freebsd.org) Date: Wed, 21 Apr 2010 17:34:47 GMT Message-Id: <201004211734.o3LHYlQd053045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 17:34:48 -0000 http://p4web.freebsd.org/@@177181?ac=10 Change 177181 by mav@mav_mavtest on 2010/04/21 17:34:41 Some nits to make NCQ really working. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#6 (text+ko) ==== @@ -306,7 +306,7 @@ mvs_setup_interrupt(device_t dev) { struct mvs_controller *ctlr = device_get_softc(dev); - int msi = 1; + int msi = 0; /* Process hints. */ resource_int_value(device_get_name(dev), @@ -352,7 +352,7 @@ u_int32_t ic, aic; ic = ATA_INL(ctlr->r_mem, CHIP_MIC); -device_printf(ctlr->dev, "irq MIC:%08x\n", ic); +//device_printf(ctlr->dev, "irq MIC:%08x\n", ic); if (ic & IC_ALL_PORTS_COAL_DONE) ATA_OUTL(ctlr->r_mem, CHIP_MIC, ~IC_ALL_PORTS_COAL_DONE); for (p = 0; p < ctlr->channels; p++) { @@ -656,7 +656,7 @@ /* Clear any outstanding error interrupts. */ ATA_OUTL(ch->r_mem, EDMA_IEC, 0); /* Unmask all error interrupts */ - ATA_OUTL(ch->r_mem, EDMA_IEM, 0xffffffff); + ATA_OUTL(ch->r_mem, EDMA_IEM, ~EDMA_IE_TRANSIENT); return (0); } @@ -825,7 +825,7 @@ { struct mvs_channel *ch = device_get_softc(dev); int timeout; - uint32_t reg; + uint32_t ecfg, fcfg, hc, ltm; if (mode == ch->curr_mode) return; @@ -848,29 +848,53 @@ if (mode == MVS_EDMA_OFF) return; /* Configure new mode. */ - reg = EDMA_CFG_RESERVED | EDMA_CFG_RESERVED2 | EDMA_CFG_EHOSTQUEUECACHEEN; + ecfg = EDMA_CFG_RESERVED | EDMA_CFG_RESERVED2 | EDMA_CFG_EHOSTQUEUECACHEEN; if (ch->pm_present) { - reg |= EDMA_CFG_EMASKRXPM; + ecfg |= EDMA_CFG_EMASKRXPM; if (ch->quirks & MVS_Q_GENIIE) { - reg |= EDMA_CFG_EEDMAFBS | EDMA_CFG_EDMAFBS; + ecfg |= EDMA_CFG_EEDMAFBS;// | EDMA_CFG_EDMAFBS; ch->fbs_enabled = 1; } } - reg |= 1 << 24; -// reg |= 1 << 22; - reg &= ~(EDMA_CFG_ESATANATVCMDQUE | EDMA_CFG_EQUE); + ecfg |= 1 << 24; +// ecfg |= 1 << 22; + ecfg &= ~(EDMA_CFG_ESATANATVCMDQUE | EDMA_CFG_EQUE); if (mode == MVS_EDMA_QUEUED) { - reg |= EDMA_CFG_EQUE; + ecfg |= EDMA_CFG_EQUE; } else if (mode == MVS_EDMA_NCQ) { - reg |= EDMA_CFG_ESATANATVCMDQUE; + ecfg |= EDMA_CFG_ESATANATVCMDQUE; } - ATA_OUTL(ch->r_mem, EDMA_CFG, reg); + ATA_OUTL(ch->r_mem, EDMA_CFG, ecfg); mvs_setup_edma_queues(dev); /* Configure FBS */ -// device_printf(dev, "fisc %08x\n",ATA_INL(ch->r_mem, SATA_FISC)); -// device_printf(dev, "ltmode %08x\n",ATA_INL(ch->r_mem, SATA_LTM)); -// device_printf(dev, "edmacfg %08x\n",ATA_INL(ch->r_mem, EDMA_CFG)); -// device_printf(dev, "haltcond %08x\n",ATA_INL(ch->r_mem, EDMA_HC)); + if (ch->quirks & MVS_Q_GENIIE) { + fcfg = ATA_INL(ch->r_mem, SATA_FISC); + ltm = ATA_INL(ch->r_mem, SATA_LTM); + hc = ATA_INL(ch->r_mem, EDMA_HC); + if (ch->fbs_enabled) { + fcfg |= SATA_FISC_FISDMAACTIVATESYNCRESP; + if (mode == MVS_EDMA_NCQ) { + fcfg &= ~SATA_FISC_FISWAIT4HOSTRDYEN_B0; + hc &= ~EDMA_IE_EDEVERR; + } else { + fcfg |= SATA_FISC_FISWAIT4HOSTRDYEN_B0; + hc |= EDMA_IE_EDEVERR; + } + ltm |= (1 << 8); + } else { + fcfg &= ~SATA_FISC_FISDMAACTIVATESYNCRESP; + fcfg &= ~SATA_FISC_FISWAIT4HOSTRDYEN_B0; + hc |= EDMA_IE_EDEVERR; + ltm &= ~(1 << 8); + } + ATA_OUTL(ch->r_mem, SATA_FISC, fcfg); + ATA_OUTL(ch->r_mem, SATA_LTM, ltm); + ATA_OUTL(ch->r_mem, EDMA_HC, hc); + } + device_printf(dev, "fisc %08x\n",ATA_INL(ch->r_mem, SATA_FISC)); + device_printf(dev, "ltmode %08x\n",ATA_INL(ch->r_mem, SATA_LTM)); + device_printf(dev, "edmacfg %08x\n",ATA_INL(ch->r_mem, EDMA_CFG)); + device_printf(dev, "haltcond %08x\n",ATA_INL(ch->r_mem, EDMA_HC)); /* Run EDMA. */ ATA_OUTL(ch->r_mem, EDMA_CMD, EDMA_CMD_EENEDMA); } @@ -989,6 +1013,8 @@ mvs_crbq_intr(dev); if (arg->cause & 1) { iec = ATA_INL(ch->r_mem, EDMA_IEC); +device_printf(dev, "irq cause %02x EDMA %d IEC %08x\n", + arg->cause, edma, iec); if (iec & EDMA_IE_SERRINT) { serr = ATA_INL(ch->r_mem, SATA_SE); ATA_OUTL(ch->r_mem, SATA_SE, serr); @@ -1002,7 +1028,7 @@ } ATA_OUTL(ch->r_mem, EDMA_IEC, ~iec); /* Interface errors or Device error. */ - if (iec & (0xfffff000 | EDMA_IE_EDEVERR)) { + if (iec & (0xfc1e9000 | EDMA_IE_EDEVERR)) { port = -1; if (ch->numpslots != 0) { ccs = 0; @@ -1060,7 +1086,7 @@ et = MVS_ERR_TFE; ch->fatalerr = 1; } - } else if (iec & 0xfffff000) { + } else if (iec & 0xfc1e9000) { if (ch->numtslots == 0 && i != ccs && port != -2) et = MVS_ERR_INNOCENT; else @@ -1115,7 +1141,7 @@ // device_printf(dev, "Legacy intr status %02x\n", // status); if (slot->state < MVS_SLOT_RUNNING) { - device_printf(dev, "Stray irq\n"); +// device_printf(dev, "Stray irq\n"); return; } port = ccb->ccb_h.target_id & 0x0f; @@ -1291,42 +1317,46 @@ struct mvs_channel *ch = device_get_softc(dev); struct mvs_crpb *crpb; union ccb *ccb; - int in_idx, slot; + int in_idx, cin_idx, slot; uint16_t flags; in_idx = (ATA_INL(ch->r_mem, EDMA_RESQIP) & EDMA_RESQP_ERPQP_MASK) >> EDMA_RESQP_ERPQP_SHIFT; bus_dmamap_sync(ch->dma.workrp_tag, ch->dma.workrp_map, BUS_DMASYNC_POSTREAD); - while (in_idx != ch->in_idx) { + cin_idx = ch->in_idx; + ch->in_idx = in_idx; + while (in_idx != cin_idx) { crpb = (struct mvs_crpb *) - (ch->dma.workrp + MVS_CRPB_OFFSET + (MVS_CRPB_SIZE * ch->in_idx)); + (ch->dma.workrp + MVS_CRPB_OFFSET + (MVS_CRPB_SIZE * cin_idx)); slot = le16toh(crpb->id) & MVS_CRPB_TAG_MASK; flags = le16toh(crpb->rspflg); -//device_printf(dev, "CRPB %d %d %04x\n", ch->in_idx, slot, flags); +//device_printf(dev, "CRPB %d %d %04x\n", cin_idx, slot, flags); /* * Handle only successfull completions. * Errors will be handled by main intr handler. */ if (ch->numtslots != 0 || (flags & EDMA_IE_EDEVERR) == 0) { if ((flags >> 8) & ATA_S_ERROR) -device_printf(dev, "ERROR STATUS CRPB %d %d %04x\n", ch->in_idx, slot, flags); +device_printf(dev, "ERROR STATUS CRPB %d %d %04x\n", cin_idx, slot, flags); if (ch->slot[slot].state >= MVS_SLOT_RUNNING) { ccb = ch->slot[slot].ccb; ccb->ataio.res.status = (flags & MVS_CRPB_ATASTS_MASK) >> MVS_CRPB_ATASTS_SHIFT; mvs_end_transaction(&ch->slot[slot], MVS_ERR_NONE); } else -device_printf(dev, "EMPTY CRPB %d %d %04x\n", ch->in_idx, slot, flags); +device_printf(dev, "EMPTY CRPB %d (->%d) %d %04x\n", cin_idx, in_idx, slot, flags); } else -device_printf(dev, "ERROR FLAGS CRPB %d %d %04x\n", ch->in_idx, slot, flags); +device_printf(dev, "ERROR FLAGS CRPB %d %d %04x\n", cin_idx, slot, flags); - ch->in_idx = (ch->in_idx + 1) & (MVS_MAX_SLOTS - 1); + cin_idx = (cin_idx + 1) & (MVS_MAX_SLOTS - 1); } bus_dmamap_sync(ch->dma.workrp_tag, ch->dma.workrp_map, BUS_DMASYNC_PREREAD); - ATA_OUTL(ch->r_mem, EDMA_RESQOP, - ch->dma.workrp_bus | (ch->in_idx << EDMA_RESQP_ERPQP_SHIFT)); + if (cin_idx == in_idx) { + ATA_OUTL(ch->r_mem, EDMA_RESQOP, + ch->dma.workrp_bus | (cin_idx << EDMA_RESQP_ERPQP_SHIFT)); + } } /* Must be called with channel locked. */ @@ -1633,8 +1663,8 @@ int port = ccb->ccb_h.target_id & 0x0f; int i; - device_printf(dev, "%d EDMA command %02x size %d (%p) slot %d tag %d\n", - port, ccb->ataio.cmd.command, ccb->ataio.dxfer_len, ccb->ataio.data_ptr, slot->slot, slot->tag); +// device_printf(dev, "%d EDMA command %02x size %d slot %d tag %d\n", +// port, ccb->ataio.cmd.command, ccb->ataio.dxfer_len, slot->slot, slot->tag); /* Get address of the prepared EPRD */ eprd = ch->dma.workrq_bus + MVS_EPRD_OFFSET + (MVS_EPRD_SIZE * slot->slot); /* Prepare CRQB. Gen IIe uses different CRQB format. */ @@ -1807,7 +1837,7 @@ struct mvs_channel *ch = device_get_softc(dev); union ccb *ccb = slot->ccb; -device_printf(dev, "cmd done status %d\n", et); +//device_printf(dev, "cmd done status %d\n", et); bus_dmamap_sync(ch->dma.workrq_tag, ch->dma.workrq_map, BUS_DMASYNC_POSTWRITE); /* Read result registers to the result struct @@ -2136,7 +2166,7 @@ ch->devices = 0; ATA_OUTL(ch->r_mem, SATA_SE, 0xffffffff); ATA_OUTL(ch->r_mem, EDMA_IEC, 0); - ATA_OUTL(ch->r_mem, EDMA_IEM, 0xffffffff); + ATA_OUTL(ch->r_mem, EDMA_IEM, ~EDMA_IE_TRANSIENT); xpt_release_simq(ch->sim, TRUE); return; } @@ -2148,7 +2178,7 @@ ch->devices = 1; ATA_OUTL(ch->r_mem, SATA_SE, 0xffffffff); ATA_OUTL(ch->r_mem, EDMA_IEC, 0); - ATA_OUTL(ch->r_mem, EDMA_IEM, 0xffffffff); + ATA_OUTL(ch->r_mem, EDMA_IEM, ~EDMA_IE_TRANSIENT); if (bootverbose) device_printf(dev, "MVS reset done: device found\n"); xpt_release_simq(ch->sim, TRUE); ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#5 (text+ko) ==== @@ -127,6 +127,8 @@ #define EDMA_IE_LINKCTLTXERR(x) ((x) << 21) /* Link Ctrl Tx Error */ #define EDMA_IE_LINKDATATXERR(x) ((x) << 26) /* Link Data Tx Error */ #define EDMA_IE_TRANSPROTERR (1 << 31) /* Transport Proto E */ +#define EDMA_IE_TRANSIENT (EDMA_IE_LINKCTLRXERR(0x0b) | \ + EDMA_IE_LINKCTLTXERR(0x1f)) /* Non-fatal Errors */ #define EDMA_REQQBAH 0x10 /* Request Queue Base Address High */ #define EDMA_REQQIP 0x14 /* Request Queue In-Pointer */ #define EDMA_REQQOP 0x18 /* Request Queue Out-Pointer */ From owner-p4-projects@FreeBSD.ORG Wed Apr 21 19:04:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 303211065674; Wed, 21 Apr 2010 19:04:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0A0F106567B for ; Wed, 21 Apr 2010 19:04:17 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE3178FC0A for ; Wed, 21 Apr 2010 19:04:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LJ4HhI061635 for ; Wed, 21 Apr 2010 19:04:17 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LJ4HV8061633 for perforce@freebsd.org; Wed, 21 Apr 2010 19:04:17 GMT (envelope-from mav@freebsd.org) Date: Wed, 21 Apr 2010 19:04:17 GMT Message-Id: <201004211904.o3LJ4HV8061633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 19:04:18 -0000 http://p4web.freebsd.org/@@177184?ac=10 Change 177184 by mav@mav_mavtest on 2010/04/21 19:03:52 Do not allow NCQ for Gen-II chips when PMP attached. It works, but extremely slow. Move PI_TAG_ABLE check from ada driver to ATA XPT, as it should be. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#51 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#84 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#7 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#51 (text+ko) ==== @@ -686,14 +686,10 @@ else softc->quirks = ADA_Q_NONE; - /* Check if the SIM does not want queued commands */ bzero(&cpi, sizeof(cpi)); xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NONE); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); - if (cpi.ccb_h.status != CAM_REQ_CMP || - (cpi.hba_inquiry & PI_TAG_ABLE) == 0) - softc->flags &= ~ADA_FLAG_CAN_NCQ; TASK_INIT(&softc->sysctl_task, 0, adasysctlinit, periph); ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#84 (text+ko) ==== @@ -766,6 +766,7 @@ } case PROBE_IDENTIFY: { + struct ccb_pathinq cpi; int16_t *ptr; ident_buf = &softc->ident_data; @@ -840,16 +841,24 @@ ata_find_quirk(path->device); if (path->device->mintags != 0 && path->bus->sim->max_tagged_dev_openings != 0) { - /* Report SIM which tags are allowed. */ - bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); - cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; - cts.type = CTS_TYPE_CURRENT_SETTINGS; - cts.xport_specific.sata.tags = path->device->maxtags; - cts.xport_specific.sata.valid = CTS_SATA_VALID_TAGS; - xpt_action((union ccb *)&cts); - /* Reconfigure queues for tagged queueing. */ - xpt_start_tags(path); + /* Check if the SIM does not want queued commands. */ + bzero(&cpi, sizeof(cpi)); + xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE); + cpi.ccb_h.func_code = XPT_PATH_INQ; + xpt_action((union ccb *)&cpi); + if (cpi.ccb_h.status == CAM_REQ_CMP && + (cpi.hba_inquiry & PI_TAG_ABLE)) { + /* Report SIM which tags are allowed. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + cts.xport_specific.sata.tags = path->device->maxtags; + cts.xport_specific.sata.valid = CTS_SATA_VALID_TAGS; + xpt_action((union ccb *)&cts); + /* Reconfigure queues for tagged queueing. */ + xpt_start_tags(path); + } } ata_device_transport(path); PROBE_SET_ACTION(softc, PROBE_SETMODE); ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#7 (text+ko) ==== @@ -566,7 +566,7 @@ /* Construct SIM entry */ ch->sim = cam_sim_alloc(mvsaction, mvspoll, "mvsch", ch, device_get_unit(dev), &ch->mtx, - MVS_MAX_SLOTS - 1, (ch->quirks & MVS_Q_GENI) ? 0 : MVS_MAX_SLOTS - 1, + 2, (ch->quirks & MVS_Q_GENI) ? 0 : MVS_MAX_SLOTS - 1, devq); if (ch->sim == NULL) { device_printf(dev, "unable to allocate sim\n"); @@ -1353,7 +1353,7 @@ } bus_dmamap_sync(ch->dma.workrp_tag, ch->dma.workrp_map, BUS_DMASYNC_PREREAD); - if (cin_idx == in_idx) { + if (cin_idx == ch->in_idx) { ATA_OUTL(ch->r_mem, EDMA_RESQOP, ch->dma.workrp_bus | (cin_idx << EDMA_RESQP_ERPQP_SHIFT)); } @@ -2435,8 +2435,12 @@ cpi->version_num = 1; /* XXX??? */ cpi->hba_inquiry = PI_SDTR_ABLE; - if (!(ch->quirks & MVS_Q_GENI)) - cpi->hba_inquiry |= PI_TAG_ABLE | PI_SATAPM; + if (!(ch->quirks & MVS_Q_GENI)) { + cpi->hba_inquiry |= PI_SATAPM; + /* Gen-II is extremely slow with NCQ on PMP. */ + if ((ch->quirks & MVS_Q_GENIIE) || ch->pm_present == 0) + cpi->hba_inquiry |= PI_TAG_ABLE; + } cpi->target_sprt = 0; cpi->hba_misc = PIM_SEQSCAN; cpi->hba_eng_cnt = 0; From owner-p4-projects@FreeBSD.ORG Wed Apr 21 19:56:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 841161065672; Wed, 21 Apr 2010 19:56:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48400106566C for ; Wed, 21 Apr 2010 19:56:10 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34C268FC08 for ; Wed, 21 Apr 2010 19:56:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LJuAGo065762 for ; Wed, 21 Apr 2010 19:56:10 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LJuA89065760 for perforce@freebsd.org; Wed, 21 Apr 2010 19:56:10 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 21 Apr 2010 19:56:10 GMT Message-Id: <201004211956.o3LJuA89065760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 19:56:10 -0000 http://p4web.freebsd.org/@@177188?ac=10 Change 177188 by pgj@Binturong on 2010/04/21 19:55:58 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#49 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/anchie.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#41 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#39 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/rstone.key#1 branch .. //depot/projects/docproj_hu/www/en/developers.sgml#45 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2010-01-2010-03.xml#1 branch .. //depot/projects/docproj_hu/www/en/snapshots/index.sgml#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#94 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#49 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.502 2010/04/11 17:13:08 sahil Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.505 2010/04/21 07:19:51 randi Exp $ --> aaron@FreeBSD.org"> @@ -58,6 +58,8 @@ amurai@FreeBSD.org"> +anchie@FreeBSD.org"> + anders@FreeBSD.org"> andre@FreeBSD.org"> @@ -910,6 +912,8 @@ raj@FreeBSD.org"> +randi@FreeBSD.org"> + rdivacky@FreeBSD.org"> rees@FreeBSD.org"> @@ -958,6 +962,8 @@ rsm@FreeBSD.org"> +rstone@FreeBSD.org"> + ru@FreeBSD.org"> rushani@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#41 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -656,6 +656,11 @@ &pgpkey.gabor; + + &a.anchie; + &pgpkey.anchie; + + &a.rik; &pgpkey.rik; @@ -1331,6 +1336,11 @@ &pgpkey.vs; + + &a.rstone; + &pgpkey.rstone; + + &a.xride; &pgpkey.xride; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#39 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + @@ -262,6 +263,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#45 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.246 2010/04/11 17:19:14 sahil Exp $ +$FreeBSD: www/en/developers.sgml,v 1.249 2010/04/21 08:12:38 randi Exp $ --> @@ -32,6 +32,7 @@ + @@ -455,6 +456,7 @@ + @@ -479,6 +481,7 @@ + ==== //depot/projects/docproj_hu/www/en/snapshots/index.sgml#2 (text+ko) ==== @@ -1,13 +1,13 @@ - + %developers; ]> - + &header; @@ -32,7 +32,8 @@ sites.

    Currently the snapshots of - 8-CURRENT, + 9-CURRENT, + 8-STABLE, 7-STABLE, and 6-STABLE @@ -89,6 +90,7 @@ and it turns out that you never even tried the snapshots, well, it cuts both ways!

    + &footer; ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#94 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.310 2010/04/11 19:38:00 rene Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.313 2010/04/21 08:14:56 randi Exp $ @@ -36,6 +36,33 @@ 4 + 20 + + +

    New committer: Randi Harper (src)

    +     + +     + + + 19 + + +

    New committer: Ryan Stone (src)

    +     + +     + + + 14 + + +

    New committer: Ana Kukec (src)

    +     + +     + + 11 From owner-p4-projects@FreeBSD.ORG Wed Apr 21 20:10:25 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06E7E106566C; Wed, 21 Apr 2010 20:10:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF39B1065672 for ; Wed, 21 Apr 2010 20:10:24 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AD28E8FC1B for ; Wed, 21 Apr 2010 20:10:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LKAO76067903 for ; Wed, 21 Apr 2010 20:10:24 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LKAOuO067901 for perforce@freebsd.org; Wed, 21 Apr 2010 20:10:24 GMT (envelope-from jona@FreeBSD.org) Date: Wed, 21 Apr 2010 20:10:24 GMT Message-Id: <201004212010.o3LKAOuO067901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 20:10:25 -0000 http://p4web.freebsd.org/@@177190?ac=10 Change 177190 by jona@jona-belle-freebsd8 on 2010/04/21 20:10:09 No, we don't really need this Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#10 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#11 $ */ #include @@ -467,12 +467,6 @@ LOCK(lfp); lfsp = lfp->lf_storage; - /* Do we really need to do this? */ - if (lfsp->count == 0) { - UNLOCK(lfp); - return (0); - } - /* * Identify the highest source file descriptor we care about so that * when we play the dup2() rearranging game, we don't overwrite any From owner-p4-projects@FreeBSD.ORG Wed Apr 21 20:11:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D4CA1065680; Wed, 21 Apr 2010 20:11:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5F42106566B for ; Wed, 21 Apr 2010 20:11:25 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D3B0F8FC20 for ; Wed, 21 Apr 2010 20:11:25 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LKBPam067989 for ; Wed, 21 Apr 2010 20:11:25 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LKBPCP067987 for perforce@freebsd.org; Wed, 21 Apr 2010 20:11:25 GMT (envelope-from jona@FreeBSD.org) Date: Wed, 21 Apr 2010 20:11:25 GMT Message-Id: <201004212011.o3LKBPCP067987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 20:11:26 -0000 http://p4web.freebsd.org/@@177191?ac=10 Change 177191 by jona@jona-belle-freebsd8 on 2010/04/21 20:10:35 Let's talk about the 'executable' rather than the 'binary' in the FD list Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#18 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#17 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#18 $ */ #include @@ -143,7 +143,7 @@ fd_rtld, LIBCAPSICUM_CAPMASK_LDSO) < 0) err(-1, "Error in lc_fdlist_addcap(fd_rtld)"); - if (lc_fdlist_addcap(fds, RTLD_CAP_FQNAME, "binary", "", + if (lc_fdlist_addcap(fds, RTLD_CAP_FQNAME, "Executable", binname, fd_binary, LIBCAPSICUM_CAPMASK_SANDBOX) < 0) err(-1, "Error in lc_fdlist_addcap(fd_binary)"); @@ -219,9 +219,9 @@ /* * Find the binary for RTLD. */ - if (lc_fdlist_lookup(fds, RTLD_CAP_FQNAME, "binary", NULL, + if (lc_fdlist_lookup(fds, RTLD_CAP_FQNAME, "Executable", NULL, &fd_binary, NULL) < 0) - err(-1, "Error in lc_fdlist_lookup(RTLD binary)"); + err(-1, "Error in lc_fdlist_lookup(Executable)"); sprintf(tmp, "%d", fd_binary); if (setenv("LD_BINARY", tmp, 1) != 0) From owner-p4-projects@FreeBSD.ORG Wed Apr 21 20:37:53 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 160701065679; Wed, 21 Apr 2010 20:37:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDBF31065672 for ; Wed, 21 Apr 2010 20:37:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA40D8FC21 for ; Wed, 21 Apr 2010 20:37:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LKbq5i069982 for ; Wed, 21 Apr 2010 20:37:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LKbqVh069980 for perforce@freebsd.org; Wed, 21 Apr 2010 20:37:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 21 Apr 2010 20:37:52 GMT Message-Id: <201004212037.o3LKbqVh069980@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 20:37:53 -0000 http://p4web.freebsd.org/@@177195?ac=10 Change 177195 by hselasky@hselasky_laptop001 on 2010/04/21 20:37:28 USB CORE: - fix a non-critical deadlock issue related to USB power save. If a USB device is suspended and a USB set config request is issued when the USB enumeration lock is locked, then the USB stack fails to resume the device because locking the USB enumeration lock is part of the resume procedure. To solve this issue a new lock is introduced which only protects the suspend and resume callbacks, which can be dropped inside the usbd_do_request_flags() function, to allow suspend and resume during so-called enumeration operations. (Attach/detach/set-config/set-alternate-index and more) - improve suspend and resume IOCTL's so that these are handled by the USB power daemon and do not directly write to the USB port registers. - if the power-save refcount is going down, we should not wake up or set any USB power bits in the bus structure. Found and patched by: HPS @ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#65 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#34 edit .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#29 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#65 (text+ko) ==== @@ -1379,7 +1379,7 @@ } DPRINTFN(4, "udev=%p do_suspend=%d\n", udev, do_suspend); - sx_assert(udev->default_sx + 1, SA_LOCKED); + sx_assert(udev->default_sx + 2, SA_LOCKED); USB_BUS_LOCK(udev->bus); /* filter the suspend events */ @@ -1494,6 +1494,7 @@ /* initialise our SX-lock */ sx_init(udev->default_sx + 1, "0123456789ABCDEF - USB config SX lock" + depth); + sx_init(udev->default_sx + 2, "0123456789ABCDEF - USB suspend and resume SX lock" + depth); cv_init(udev->default_cv, "WCTRL"); cv_init(udev->default_cv + 1, "UGONE"); @@ -2037,6 +2038,7 @@ sx_destroy(udev->default_sx); sx_destroy(udev->default_sx + 1); + sx_destroy(udev->default_sx + 2); cv_destroy(udev->default_cv); cv_destroy(udev->default_cv + 1); @@ -2497,6 +2499,7 @@ usbd_enum_lock(struct usb_device *udev) { sx_xlock(udev->default_sx + 1); + sx_xlock(udev->default_sx + 2); /* * NEWBUS LOCK NOTE: We should check if any parent SX locks * are locked before locking Giant. Else the lock can be @@ -2511,9 +2514,33 @@ usbd_enum_unlock(struct usb_device *udev) { mtx_unlock(&Giant); + sx_xunlock(udev->default_sx + 2); sx_xunlock(udev->default_sx + 1); } +/* The following function locks suspend and resume. */ + +void +usbd_sr_lock(struct usb_device *udev) +{ + sx_xlock(udev->default_sx + 2); + /* + * NEWBUS LOCK NOTE: We should check if any parent SX locks + * are locked before locking Giant. Else the lock can be + * locked multiple times. + */ + mtx_lock(&Giant); +} + +/* The following function unlocks suspend and resume. */ + +void +usbd_sr_unlock(struct usb_device *udev) +{ + mtx_unlock(&Giant); + sx_xunlock(udev->default_sx + 2); +} + /* * The following function checks the enumerating lock for the given * USB device. ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#34 (text+ko) ==== @@ -113,7 +113,7 @@ struct usb_device { struct usb_clear_stall_msg cs_msg[2]; /* generic clear stall * messages */ - struct sx default_sx[2]; + struct sx default_sx[3]; struct mtx default_mtx[1]; struct cv default_cv[2]; struct usb_interface *ifaces; @@ -213,6 +213,8 @@ enum usb_dev_state state); void usbd_enum_lock(struct usb_device *); void usbd_enum_unlock(struct usb_device *); +void usbd_sr_lock(struct usb_device *); +void usbd_sr_unlock(struct usb_device *); uint8_t usbd_enum_is_locked(struct usb_device *); #endif /* _USB_DEVICE_H_ */ ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#27 (text+ko) ==== @@ -1735,14 +1735,34 @@ break; case USB_POWER_MODE_RESUME: - err = usbd_req_clear_port_feature(udev->parent_hub, - NULL, udev->port_no, UHF_PORT_SUSPEND); +#if USB_HAVE_POWERD + /* let USB-powerd handle resume */ + USB_BUS_LOCK(udev->bus); + udev->pwr_save.write_refs++; + udev->pwr_save.last_xfer_time = ticks; + USB_BUS_UNLOCK(udev->bus); + + /* set new power mode */ + usbd_set_power_mode(udev, USB_POWER_MODE_SAVE); + + /* wait for resume to complete */ + usb_pause_mtx(NULL, hz / 4); + + /* clear write reference */ + USB_BUS_LOCK(udev->bus); + udev->pwr_save.write_refs--; + USB_BUS_UNLOCK(udev->bus); +#endif mode = USB_POWER_MODE_SAVE; break; case USB_POWER_MODE_SUSPEND: - err = usbd_req_set_port_feature(udev->parent_hub, - NULL, udev->port_no, UHF_PORT_SUSPEND); +#if USB_HAVE_POWERD + /* let USB-powerd handle suspend */ + USB_BUS_LOCK(udev->bus); + udev->pwr_save.last_xfer_time = ticks - (256 * hz); + USB_BUS_UNLOCK(udev->bus); +#endif mode = USB_POWER_MODE_SAVE; break; ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#40 (text+ko) ==== @@ -126,6 +126,7 @@ static void usb_dev_resume_peer(struct usb_device *udev); static void usb_dev_suspend_peer(struct usb_device *udev); +static uint8_t usb_peer_should_wakeup(struct usb_device *udev); static const struct usb_config uhub_config[UHUB_N_TRANSFER] = { @@ -1706,8 +1707,8 @@ udev->pwr_save.read_refs += val; if (xfer->flags_int.usb_mode == USB_MODE_HOST) { /* - * it is not allowed to suspend during a control - * transfer + * It is not allowed to suspend during a + * control transfer: */ udev->pwr_save.write_refs += val; } @@ -1717,19 +1718,21 @@ udev->pwr_save.write_refs += val; } - if (udev->flags.self_suspended) - needs_explore = - (udev->pwr_save.write_refs != 0) || - ((udev->pwr_save.read_refs != 0) && - (usb_peer_can_wakeup(udev) == 0)); - else - needs_explore = 0; + if (val > 0) { + if (udev->flags.self_suspended) + needs_explore = usb_peer_should_wakeup(udev); + else + needs_explore = 0; - if (!(udev->bus->hw_power_state & power_mask[xfer_type])) { - DPRINTF("Adding type %u to power state\n", xfer_type); - udev->bus->hw_power_state |= power_mask[xfer_type]; - needs_hw_power = 1; + if (!(udev->bus->hw_power_state & power_mask[xfer_type])) { + DPRINTF("Adding type %u to power state\n", xfer_type); + udev->bus->hw_power_state |= power_mask[xfer_type]; + needs_hw_power = 1; + } else { + needs_hw_power = 0; + } } else { + needs_explore = 0; needs_hw_power = 0; } @@ -1748,6 +1751,22 @@ #endif /*------------------------------------------------------------------------* + * usb_peer_should_wakeup + * + * This function returns non-zero if the current device should wake up. + *------------------------------------------------------------------------*/ +static uint8_t +usb_peer_should_wakeup(struct usb_device *udev) +{ + return ((udev->power_mode == USB_POWER_MODE_ON) || + (udev->pwr_save.type_refs[UE_ISOCHRONOUS] != 0) || + (udev->pwr_save.write_refs != 0) || + ((udev->pwr_save.read_refs != 0) && + (udev->flags.usb_mode == USB_MODE_HOST) && + (usb_peer_can_wakeup(udev) == 0))); +} + +/*------------------------------------------------------------------------* * usb_bus_powerd * * This function implements the USB power daemon and is called @@ -1763,7 +1782,6 @@ usb_ticks_t mintime; usb_size_t type_refs[5]; uint8_t x; - uint8_t rem_wakeup; limit = usb_power_timeout; if (limit == 0) @@ -1788,30 +1806,23 @@ if (udev == NULL) continue; - rem_wakeup = usb_peer_can_wakeup(udev); - temp = ticks - udev->pwr_save.last_xfer_time; - if ((udev->power_mode == USB_POWER_MODE_ON) || - (udev->pwr_save.type_refs[UE_ISOCHRONOUS] != 0) || - (udev->pwr_save.write_refs != 0) || - ((udev->pwr_save.read_refs != 0) && - (rem_wakeup == 0))) { - + if (usb_peer_should_wakeup(udev)) { /* check if we are suspended */ if (udev->flags.self_suspended != 0) { USB_BUS_UNLOCK(bus); usb_dev_resume_peer(udev); USB_BUS_LOCK(bus); } - } else if (temp >= limit) { + } else if ((temp >= limit) && + (udev->flags.usb_mode == USB_MODE_HOST) && + (udev->flags.self_suspended == 0)) { + /* try to do suspend */ - /* check if we are not suspended */ - if (udev->flags.self_suspended == 0) { - USB_BUS_UNLOCK(bus); - usb_dev_suspend_peer(udev); - USB_BUS_LOCK(bus); - } + USB_BUS_UNLOCK(bus); + usb_dev_suspend_peer(udev); + USB_BUS_LOCK(bus); } } @@ -1920,6 +1931,9 @@ /* resume parent hub first */ usb_dev_resume_peer(udev->parent_hub); + /* reduce chance of instant resume failure by waiting a little bit */ + usb_pause_mtx(NULL, USB_MS_TO_TICKS(20)); + /* resume current port (Valid in Host and Device Mode) */ err = usbd_req_clear_port_feature(udev->parent_hub, NULL, udev->port_no, UHF_PORT_SUSPEND); @@ -1958,12 +1972,12 @@ (bus->methods->set_hw_power) (bus); } - usbd_enum_lock(udev); + usbd_sr_lock(udev); /* notify all sub-devices about resume */ err = usb_suspend_resume(udev, 0); - usbd_enum_unlock(udev); + usbd_sr_unlock(udev); /* check if peer has wakeup capability */ if (usb_peer_can_wakeup(udev)) { @@ -2029,12 +2043,47 @@ } } - usbd_enum_lock(udev); + USB_BUS_LOCK(udev->bus); + /* + * Checking for suspend condition and setting suspended bit + * must be atomic! + */ + err = usb_peer_should_wakeup(udev); + if (err == 0) { + /* + * Set that this device is suspended. This variable + * must be set before calling USB controller suspend + * callbacks. + */ + udev->flags.self_suspended = 1; + } + USB_BUS_UNLOCK(udev->bus); + + if (err != 0) { + if (udev->flags.usb_mode == USB_MODE_DEVICE) { + /* resume parent HUB first */ + usb_dev_resume_peer(udev->parent_hub); + + /* reduce chance of instant resume failure by waiting a little bit */ + usb_pause_mtx(NULL, USB_MS_TO_TICKS(20)); + + /* resume current port (Valid in Host and Device Mode) */ + err = usbd_req_clear_port_feature(udev->parent_hub, + NULL, udev->port_no, UHF_PORT_SUSPEND); + + /* resume settle time */ + usb_pause_mtx(NULL, USB_MS_TO_TICKS(USB_PORT_RESUME_DELAY)); + } + DPRINTF("Suspend was cancelled!\n"); + return; + } + + usbd_sr_lock(udev); /* notify all sub-devices about suspend */ err = usb_suspend_resume(udev, 1); - usbd_enum_unlock(udev); + usbd_sr_unlock(udev); if (usb_peer_can_wakeup(udev)) { /* allow device to do remote wakeup */ @@ -2045,13 +2094,6 @@ "remote wakeup failed\n"); } } - USB_BUS_LOCK(udev->bus); - /* - * Set that this device is suspended. This variable must be set - * before calling USB controller suspend callbacks. - */ - udev->flags.self_suspended = 1; - USB_BUS_UNLOCK(udev->bus); if (udev->bus->methods->device_suspend != NULL) { usb_timeout_t temp; ==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#29 (text+ko) ==== @@ -386,6 +386,7 @@ uint16_t length; uint16_t temp; uint16_t acttemp; + uint8_t enum_locked; if (timeout < 50) { /* timeout is too small */ @@ -397,6 +398,8 @@ } length = UGETW(req->wLength); + enum_locked = usbd_enum_is_locked(udev); + DPRINTFN(5, "udev=%p bmRequestType=0x%02x bRequest=0x%02x " "wValue=0x%02x%02x wIndex=0x%02x%02x wLength=0x%02x%02x\n", udev, req->bmRequestType, req->bRequest, @@ -421,17 +424,22 @@ if (flags & USB_USER_DATA_PTR) return (USB_ERR_INVAL); #endif - if (mtx) { + if ((mtx != NULL) && (mtx != &Giant)) { mtx_unlock(mtx); - if (mtx != &Giant) { - mtx_assert(mtx, MA_NOTOWNED); - } + mtx_assert(mtx, MA_NOTOWNED); } + /* + * We need to allow suspend and resume at this point, else the + * control transfer will timeout if the device is suspended! + */ + if (enum_locked) + usbd_sr_unlock(udev); + + /* * Grab the default sx-lock so that serialisation * is achieved when multiple threads are involved: */ - sx_xlock(udev->default_sx); hr_func = usbd_get_hr_func(udev); @@ -678,9 +686,12 @@ done: sx_xunlock(udev->default_sx); - if (mtx) { + if (enum_locked) + usbd_sr_lock(udev); + + if ((mtx != NULL) && (mtx != &Giant)) mtx_lock(mtx); - } + return ((usb_error_t)err); } From owner-p4-projects@FreeBSD.ORG Thu Apr 22 06:24:40 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67948106567A; Thu, 22 Apr 2010 06:24:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FA941065676 for ; Thu, 22 Apr 2010 06:24:40 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B0EE8FC2D for ; Thu, 22 Apr 2010 06:24:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3M6Oeow056091 for ; Thu, 22 Apr 2010 06:24:40 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3M6OeSD056089 for perforce@freebsd.org; Thu, 22 Apr 2010 06:24:40 GMT (envelope-from mav@freebsd.org) Date: Thu, 22 Apr 2010 06:24:40 GMT Message-Id: <201004220624.o3M6OeSD056089@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 06:24:40 -0000 http://p4web.freebsd.org/@@177202?ac=10 Change 177202 by mav@mav_mavtest on 2010/04/22 06:24:08 Split PCI part. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_pci.c#1 add Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#8 (text+ko) ==== @@ -37,15 +37,11 @@ #include #include #include -#include -#include #include #include #include #include #include -#include -#include #include "mvs.h" #include @@ -55,12 +51,6 @@ #include /* local prototypes */ -static int mvs_setup_interrupt(device_t dev); -static void mvs_intr(void *data); -static int mvs_suspend(device_t dev); -static int mvs_resume(device_t dev); -static int mvs_ctlr_setup(device_t dev); - static int mvs_ch_suspend(device_t dev); static int mvs_ch_resume(device_t dev); static void mvs_dmainit(device_t dev); @@ -99,410 +89,7 @@ MALLOC_DEFINE(M_MVS, "MVS driver", "MVS driver data buffers"); -static struct { - uint32_t id; - uint8_t rev; - const char *name; - int ports; - int quirks; -#define MVS_Q_GENI 1 -#define MVS_Q_GENII 2 -#define MVS_Q_GENIIE 4 -} mvs_ids[] = { - {0x504011ab, 0x00, "Marvell 88SX5040", 4, MVS_Q_GENI}, - {0x504111ab, 0x00, "Marvell 88SX5041", 4, MVS_Q_GENI}, - {0x508011ab, 0x00, "Marvell 88SX5080", 8, MVS_Q_GENI}, - {0x508111ab, 0x00, "Marvell 88SX5081", 8, MVS_Q_GENI}, - {0x604011ab, 0x00, "Marvell 88SX6040", 4, MVS_Q_GENII}, - {0x604111ab, 0x00, "Marvell 88SX6041", 4, MVS_Q_GENII}, - {0x604211ab, 0x00, "Marvell 88SX6042", 4, MVS_Q_GENIIE}, - {0x608011ab, 0x00, "Marvell 88SX6080", 8, MVS_Q_GENII}, - {0x608111ab, 0x00, "Marvell 88SX6081", 8, MVS_Q_GENII}, - {0x704211ab, 0x00, "Marvell 88SX7042", 4, MVS_Q_GENIIE}, - {0x02419005, 0x00, "Adaptec 1420SA", 4, MVS_Q_GENII}, - {0x02439005, 0x00, "Adaptec 1430SA", 4, MVS_Q_GENIIE}, - {0x00000000, 0x00, NULL, 0, 0} -}; - -static int -mvs_probe(device_t dev) -{ - char buf[64]; - int i; - uint32_t devid = pci_get_devid(dev); - uint8_t revid = pci_get_revid(dev); - - for (i = 0; mvs_ids[i].id != 0; i++) { - if (mvs_ids[i].id == devid && - mvs_ids[i].rev <= revid) { - snprintf(buf, sizeof(buf), "%s SATA controller", - mvs_ids[i].name); - device_set_desc_copy(dev, buf); - return (BUS_PROBE_VENDOR); - } - } - return (ENXIO); -} - -static int -mvs_attach(device_t dev) -{ - struct mvs_controller *ctlr = device_get_softc(dev); - device_t child; - int error, unit, i; - uint32_t devid = pci_get_devid(dev); - uint8_t revid = pci_get_revid(dev); - - ctlr->dev = dev; - i = 0; - while (mvs_ids[i].id != 0 && - (mvs_ids[i].id != devid || - mvs_ids[i].rev > revid)) - i++; - ctlr->channels = mvs_ids[i].ports; - ctlr->quirks = mvs_ids[i].quirks; - resource_int_value(device_get_name(dev), - device_get_unit(dev), "ccc", &ctlr->ccc); - ctlr->cccc = 8; - resource_int_value(device_get_name(dev), - device_get_unit(dev), "cccc", &ctlr->cccc); - if (ctlr->ccc == 0 || ctlr->cccc == 0) { - ctlr->ccc = 0; - ctlr->cccc = 0; - } - if (ctlr->ccc > 100) - ctlr->ccc = 100; - /* We should have a memory BAR(0). */ - ctlr->r_rid = PCIR_BAR(0); - if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &ctlr->r_rid, RF_ACTIVE))) - return ENXIO; - /* Setup our own memory management for channels. */ - ctlr->sc_iomem.rm_type = RMAN_ARRAY; - ctlr->sc_iomem.rm_descr = "I/O memory addresses"; - if ((error = rman_init(&ctlr->sc_iomem)) != 0) { - bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); - return (error); - } - if ((error = rman_manage_region(&ctlr->sc_iomem, - rman_get_start(ctlr->r_mem), rman_get_end(ctlr->r_mem))) != 0) { - bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); - rman_fini(&ctlr->sc_iomem); - return (error); - } - mvs_ctlr_setup(dev); - /* Setup interrupts. */ - if (mvs_setup_interrupt(dev)) { - bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); - rman_fini(&ctlr->sc_iomem); - return ENXIO; - } - device_printf(dev, - "Gen-%s, %d %sGbps ports, Port Multiplier %s%s\n", - ((ctlr->quirks & MVS_Q_GENI) ? "I" : - ((ctlr->quirks & MVS_Q_GENII) ? "II" : "IIe")), - ctlr->channels, - ((ctlr->quirks & MVS_Q_GENI) ? "1.5" : "3"), - ((ctlr->quirks & MVS_Q_GENI) ? - "not supported" : "supported"), - ((ctlr->quirks & MVS_Q_GENIIE) ? - " with FBS" : "")); - /* Attach all channels on this controller */ - for (unit = 0; unit < ctlr->channels; unit++) { - child = device_add_child(dev, "mvsch", -1); - if (child == NULL) - device_printf(dev, "failed to add channel device\n"); - else - device_set_ivars(child, (void *)(intptr_t)unit); - } - bus_generic_attach(dev); - return 0; -} - -static int -mvs_detach(device_t dev) -{ - struct mvs_controller *ctlr = device_get_softc(dev); - device_t *children; - int nchildren, i; - - /* Detach & delete all children */ - if (!device_get_children(dev, &children, &nchildren)) { - for (i = 0; i < nchildren; i++) - device_delete_child(dev, children[i]); - free(children, M_TEMP); - } - /* Free interrupt. */ - if (ctlr->irq.r_irq) { - bus_teardown_intr(dev, ctlr->irq.r_irq, - ctlr->irq.handle); - bus_release_resource(dev, SYS_RES_IRQ, - ctlr->irq.r_irq_rid, ctlr->irq.r_irq); - } - pci_release_msi(dev); - /* Free memory. */ - rman_fini(&ctlr->sc_iomem); - if (ctlr->r_mem) - bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); - return (0); -} - -static int -mvs_ctlr_setup(device_t dev) -{ - struct mvs_controller *ctlr = device_get_softc(dev); - int i; - - /* Mask chip interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_MIM, 0x00000000); - /* Mask PCI interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_PCIIM, 0x00000000); - /* Clear PCI interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_PCIIC, 0x00000000); - /* Clear HC interrupts */ - for (i = 0; i < ctlr->channels / 4; i++) - ATA_OUTL(ctlr->r_mem, HC_BASE(i) + HC_IC, 0x00000000); - /* Configure CCC */ -#if 0 - if (ctlr->ccc) { - ATA_OUTL(ctlr->r_mem, HC_ICT, ctlr->cccc & HC_ICT_SAICOALT_MASK); - ATA_OUTL(ctlr->r_mem, HC_ITT, (ctlr->ccc * 150000) & HC_ITT_SAITMTH_MASK); - if (bootverbose) { - device_printf(dev, - "CCC with %dms/%dcmd enabled\n", - ctlr->ccc, ctlr->cccc); - } - } -#endif - /* Enable chip interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_MIM, IC_HC0 | IC_HC1 /*| IC_ALL_PORTS_COAL_DONE*/); - /* Enable PCI interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_PCIIM, 0x007fffff); - return (0); -} - -static int -mvs_suspend(device_t dev) -{ - struct mvs_controller *ctlr = device_get_softc(dev); - - bus_generic_suspend(dev); - /* Mask chip interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_MIM, 0x00000000); - /* Mask PCI interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_PCIIM, 0x00000000); - return 0; -} - -static int -mvs_resume(device_t dev) -{ - - mvs_ctlr_setup(dev); - return (bus_generic_resume(dev)); -} - -static int -mvs_setup_interrupt(device_t dev) -{ - struct mvs_controller *ctlr = device_get_softc(dev); - int msi = 0; - - /* Process hints. */ - resource_int_value(device_get_name(dev), - device_get_unit(dev), "msi", &msi); - if (msi < 0) - msi = 0; - else if (msi > 0) - msi = min(1, pci_msi_count(dev)); - /* Allocate MSI if needed/present. */ - if (msi && pci_alloc_msi(dev, &msi) != 0) - msi = 0; - /* Allocate all IRQs. */ - ctlr->irq.r_irq_rid = msi ? 1 : 0; - if (!(ctlr->irq.r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &ctlr->irq.r_irq_rid, RF_SHAREABLE | RF_ACTIVE))) { - device_printf(dev, "unable to map interrupt\n"); - return ENXIO; - } - if ((bus_setup_intr(dev, ctlr->irq.r_irq, ATA_INTR_FLAGS, NULL, - mvs_intr, ctlr, &ctlr->irq.handle))) { - /* SOS XXX release r_irq */ - device_printf(dev, "unable to setup interrupt\n"); - return ENXIO; - } - return (0); -} - -/* - * Common case interrupt handler. - */ -struct intr_arg { - void *arg; - u_int cause; -}; - -static void -mvs_intr(void *data) -{ - struct mvs_controller *ctlr = data; - struct intr_arg arg; - void (*function)(void *); - int p; - u_int32_t ic, aic; - - ic = ATA_INL(ctlr->r_mem, CHIP_MIC); -//device_printf(ctlr->dev, "irq MIC:%08x\n", ic); - if (ic & IC_ALL_PORTS_COAL_DONE) - ATA_OUTL(ctlr->r_mem, CHIP_MIC, ~IC_ALL_PORTS_COAL_DONE); - for (p = 0; p < ctlr->channels; p++) { - if ((p & 3) == 0) { - if (p == 4) - ic >>= 1; - if ((ic & IC_HC0) == 0) { - p += 3; - ic >>= 8; - continue; - } - aic = 0; - if (ic & (IC_DONE_IRQ << 0)) - aic |= HC_IC_DONE(0) | HC_IC_DEV(0); - if (ic & (IC_DONE_IRQ << 2)) - aic |= HC_IC_DONE(1) | HC_IC_DEV(1); - if (ic & (IC_DONE_IRQ << 4)) - aic |= HC_IC_DONE(2) | HC_IC_DEV(2); - if (ic & (IC_DONE_IRQ << 6)) - aic |= HC_IC_DONE(3) | HC_IC_DEV(3); - if (ic & IC_HC0_COAL_DONE) - aic |= HC_IC_COAL; - ATA_OUTL(ctlr->r_mem, HC_BASE(p == 4) + HC_IC, ~aic); - } - arg.cause = ic & (IC_ERR_IRQ|IC_DONE_IRQ); - if ((arg.cause != 0) && - (function = ctlr->interrupt[p].function)) { - arg.arg = ctlr->interrupt[p].argument; - function(&arg); - } - ic >>= 2; - } -} - -static struct resource * -mvs_alloc_resource(device_t dev, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) -{ - struct mvs_controller *ctlr = device_get_softc(dev); - int unit = ((struct mvs_channel *)device_get_softc(child))->unit; - struct resource *res = NULL; - int offset = HC_BASE(unit >> 2) + PORT_BASE(unit & 0x03); - long st; - - switch (type) { - case SYS_RES_MEMORY: - st = rman_get_start(ctlr->r_mem); - res = rman_reserve_resource(&ctlr->sc_iomem, st + offset, - st + offset + PORT_SIZE - 1, PORT_SIZE, RF_ACTIVE, child); - if (res) { - bus_space_handle_t bsh; - bus_space_tag_t bst; - bsh = rman_get_bushandle(ctlr->r_mem); - bst = rman_get_bustag(ctlr->r_mem); - bus_space_subregion(bst, bsh, offset, PORT_SIZE, &bsh); - rman_set_bushandle(res, bsh); - rman_set_bustag(res, bst); - } - break; - case SYS_RES_IRQ: - if (*rid == ATA_IRQ_RID) - res = ctlr->irq.r_irq; - break; - } - return (res); -} - static int -mvs_release_resource(device_t dev, device_t child, int type, int rid, - struct resource *r) -{ - - switch (type) { - case SYS_RES_MEMORY: - rman_release_resource(r); - return (0); - case SYS_RES_IRQ: - if (rid != ATA_IRQ_RID) - return ENOENT; - return (0); - } - return (EINVAL); -} - -static int -mvs_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter, driver_intr_t *function, - void *argument, void **cookiep) -{ - struct mvs_controller *ctlr = device_get_softc(dev); - int unit = (intptr_t)device_get_ivars(child); - - if (filter != NULL) { - printf("mvs.c: we cannot use a filter here\n"); - return (EINVAL); - } - ctlr->interrupt[unit].function = function; - ctlr->interrupt[unit].argument = argument; - return (0); -} - -static int -mvs_teardown_intr(device_t dev, device_t child, struct resource *irq, - void *cookie) -{ - struct mvs_controller *ctlr = device_get_softc(dev); - int unit = (intptr_t)device_get_ivars(child); - - ctlr->interrupt[unit].function = NULL; - ctlr->interrupt[unit].argument = NULL; - return (0); -} - -static int -mvs_print_child(device_t dev, device_t child) -{ - int retval; - - retval = bus_print_child_header(dev, child); - retval += printf(" at channel %d", - (int)(intptr_t)device_get_ivars(child)); - retval += bus_print_child_footer(dev, child); - - return (retval); -} - -devclass_t mvs_devclass; -static device_method_t mvs_methods[] = { - DEVMETHOD(device_probe, mvs_probe), - DEVMETHOD(device_attach, mvs_attach), - DEVMETHOD(device_detach, mvs_detach), - DEVMETHOD(device_suspend, mvs_suspend), - DEVMETHOD(device_resume, mvs_resume), - DEVMETHOD(bus_print_child, mvs_print_child), - DEVMETHOD(bus_alloc_resource, mvs_alloc_resource), - DEVMETHOD(bus_release_resource, mvs_release_resource), - DEVMETHOD(bus_setup_intr, mvs_setup_intr), - DEVMETHOD(bus_teardown_intr,mvs_teardown_intr), - { 0, 0 } -}; -static driver_t mvs_driver = { - "mvs", - mvs_methods, - sizeof(struct mvs_controller) -}; -DRIVER_MODULE(mvs, pci, mvs_driver, mvs_devclass, 0, 0); -MODULE_VERSION(mvs, 1); -MODULE_DEPEND(mvs, cam, 1, 1, 1); - -static int mvs_ch_probe(device_t dev) { @@ -914,6 +501,7 @@ sizeof(struct mvs_channel) }; DRIVER_MODULE(mvsch, mvs, mvsch_driver, mvsch_devclass, 0, 0); +DRIVER_MODULE(mvsch, sata, mvsch_driver, mvsch_devclass, 0, 0); static void mvs_phy_check_events(device_t dev, u_int32_t serr) @@ -968,7 +556,7 @@ static void mvs_ch_intr_locked(void *data) { - struct intr_arg *arg = (struct intr_arg *)data; + struct mvs_intr_arg *arg = (struct mvs_intr_arg *)data; device_t dev = (device_t)arg->arg; struct mvs_channel *ch = device_get_softc(dev); @@ -999,7 +587,7 @@ static void mvs_ch_intr(void *data) { - struct intr_arg *arg = (struct intr_arg *)data; + struct mvs_intr_arg *arg = (struct mvs_intr_arg *)data; device_t dev = (device_t)arg->arg; struct mvs_channel *ch = device_get_softc(dev); uint32_t iec, serr = 0, fisic = 0; @@ -2476,7 +2064,7 @@ mvspoll(struct cam_sim *sim) { struct mvs_channel *ch = (struct mvs_channel *)cam_sim_softc(sim); - struct intr_arg arg; + struct mvs_intr_arg arg; arg.arg = ch->dev; arg.cause = 2; /* XXX */ ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#6 (text+ko) ==== @@ -508,6 +508,9 @@ struct cam_sim *sim; struct cam_path *path; int quirks; +#define MVS_Q_GENI 1 +#define MVS_Q_GENII 2 +#define MVS_Q_GENIIE 4 int pm_level; /* power management level */ struct mvs_slot slot[MVS_MAX_SLOTS]; @@ -579,6 +582,11 @@ * until READ LOG executed to reveal error. */ }; +struct mvs_intr_arg { + void *arg; + u_int cause; +}; + /* macros to hide busspace uglyness */ #define ATA_INB(res, offset) \ bus_read_1((res), (offset)) From owner-p4-projects@FreeBSD.ORG Thu Apr 22 06:52:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD16B1065670; Thu, 22 Apr 2010 06:52:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DB07106564A for ; Thu, 22 Apr 2010 06:52:10 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 883328FC1C for ; Thu, 22 Apr 2010 06:52:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3M6qAJM058089 for ; Thu, 22 Apr 2010 06:52:10 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3M6q8ri058087 for perforce@freebsd.org; Thu, 22 Apr 2010 06:52:08 GMT (envelope-from mav@freebsd.org) Date: Thu, 22 Apr 2010 06:52:08 GMT Message-Id: <201004220652.o3M6q8ri058087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 06:52:11 -0000 http://p4web.freebsd.org/@@177203?ac=10 Change 177203 by mav@mav_mavtest on 2010/04/22 06:51:33 IFC Affected files ... .. //depot/projects/scottl-camlock/src/MAINTAINERS#11 integrate .. //depot/projects/scottl-camlock/src/Makefile.inc1#18 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#27 integrate .. //depot/projects/scottl-camlock/src/bin/ln/ln.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/ps/ps.1#5 integrate .. //depot/projects/scottl-camlock/src/bin/pwait/pwait.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/cd.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/cd.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/main.c#7 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mksyntax.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#14 integrate .. //depot/projects/scottl-camlock/src/contrib/binutils/bfd/config.bfd#3 integrate .. //depot/projects/scottl-camlock/src/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#8 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#7 integrate .. //depot/projects/scottl-camlock/src/contrib/top/utils.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/tzdata/africa#2 integrate .. //depot/projects/scottl-camlock/src/contrib/tzdata/asia#4 integrate .. //depot/projects/scottl-camlock/src/contrib/tzdata/southamerica#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd.c#7 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#19 integrate .. //depot/projects/scottl-camlock/src/etc/devd.conf#4 integrate .. //depot/projects/scottl-camlock/src/etc/devd/uath.conf#2 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.include.dist#8 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#11 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#12 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#12 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#6 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netif#9 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#7 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ubthidhci#1 branch .. //depot/projects/scottl-camlock/src/etc/rc.firewall#9 integrate .. //depot/projects/scottl-camlock/src/etc/rc.subr#12 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c#1 branch .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/reg-amd64.c#1 branch .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c#1 branch .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/reg-ppc.c#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/scottl-camlock/src/include/stdlib.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/check_utility_compat.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/dladdr.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/dllockinit.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/dlopen.3#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/fmtcheck.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/ftok.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getutxent.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/setproctitle.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/stringlist.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctl.3#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/isalnum.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/isalpha.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/getservent.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/mac_prepare.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/softfloat/softfloat-specialize#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/hcreate.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/ptsname.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/realpath.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libcam/cam.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libcam/cam_cdbparse.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libcompat/4.1/cftime.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libcompat/4.4/cuserid.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libedit/editline.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libedit/editrc.5#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_begin.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_cntl.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_end.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_errmsg.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_fill.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_flagdata.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getarhdr.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getarsym.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getbase.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getdata.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getident.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getphnum.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getscn.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getshnum.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_getshstrndx.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_hash.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_kind.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_memory.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_next.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_rand.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_rawfile.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_strptr.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_update.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf_version.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_checksum.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_fsize.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getcap.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getclass.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getdyn.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getehdr.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getmove.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getphdr.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getrel.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getrela.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getshdr.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getsym.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getsyminfo.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getsymshndx.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_newehdr.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_newphdr.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_update_ehdr.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/gelf_xlatetof.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_accept_sec_context.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_acquire_cred.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_cred.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_oid_set_member.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_canonicalize_name.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_compare_name.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_context_time.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_create_empty_oid_set.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_delete_sec_context.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_name.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_status.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_duplicate_name.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_name.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_sec_context.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_get_mic.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_name.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_sec_context.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_indicate_mechs.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_init_sec_context.3#5 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_context.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred_by_mech.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_mechs_for_name.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_names_for_mech.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_process_context_token.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_buffer.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_cred.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_name.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_oid_set.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_test_oid_set_member.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_unwrap.3#5 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_verify_mic.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_wrap.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_wrap_size_limit.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libmemstat/libmemstat.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.3#5 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.atom.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.core.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.core2.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.corei7.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.corei7uc.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.iaf.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.k7.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.k8.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p4.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p5.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p6.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.tsc.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.ucf.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.westmere.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.westmereuc.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_allocate.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_attach.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_capabilities.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_configure_logfile.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_disable.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_event_names_of_class.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_get_driver_stats.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_get_msr.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_init.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_name_of_capability.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_read.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_set.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_start.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmclog.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/libthr.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libugidfw/bsde_get_rule_count.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libugidfw/bsde_parse_rule.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libugidfw/bsde_rule_to_string.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/utempter_add_record.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/_secure_path.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/auth.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/hexdump.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/kinfo_getfile.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/kinfo_getvmmap.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/kld.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/login_auth.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/login_cap.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/login_class.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/login_ok.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/login_times.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/login_tty.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/property.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/pty.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/realhostname.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/realhostname_sa.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/trimdomain.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/uucplock.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libz/ChangeLog#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/README#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/Symbol.map#2 integrate .. //depot/projects/scottl-camlock/src/lib/libz/crc32.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/deflate.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/deflate.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libz/gzguts.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libz/gzlib.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libz/inffast.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libz/inffast.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libz/inftrees.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/inftrees.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libz/minigzip.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/trees.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libz/trees.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libz/zconf.h#5 integrate .. //depot/projects/scottl-camlock/src/lib/libz/zlib.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/zlib.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/zutil.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libz/zutil.h#4 integrate .. //depot/projects/scottl-camlock/src/release/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/release/Makefile.inc.docports#4 integrate .. //depot/projects/scottl-camlock/src/release/powerpc/boot_crunch.conf#5 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/sched/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sbin/geom/class/sched/geom_sched.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/geom/class/sched/gsched.8#1 branch .. //depot/projects/scottl-camlock/src/sbin/geom/misc/subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/hastd.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/pjdlog.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/primary.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/dummynet.c#7 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.h#5 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/main.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mca/mca.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ping6/ping6.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ping6/ping6.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/spppcontrol/spppcontrol.8#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/sysexits.3#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/tgmath.3#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#24 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/altq.4#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/audit.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/auditpipe.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/coda.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/gbde.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/geom.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/geom_fox.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/geom_linux_lvm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/geom_uzip.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ipw.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iscsi_initiator.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iwi.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/kbdmux.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ktr.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/lp.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_bsdextended.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_lomac.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_none.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_stub.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac_test.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/miibus.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/netintro.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ng_netflow.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/orm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ral.4#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/rp.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/rum.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/run.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sched_4bsd.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sched_ule.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sge.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/si.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/splash.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/tap.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/uhso.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/upgt.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ural.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/vkbd.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/vlan.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/wpi.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/ar.5#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/clocks.7#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/maclabel.7#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man8/picobsd.8#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man8/rescue.8#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/CTASSERT.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/DELAY.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/KASSERT.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_CHECKEXP.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_FHTOVP.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_MOUNT.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_QUOTACTL.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_ROOT.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_STATFS.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_SYNC.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_UNMOUNT.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_VGET.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ACCESS.9#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ACLCHECK.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ADVLOCK.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_BWRITE.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_CREATE.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_FSYNC.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_GETACL.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_GETEXTATTR.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_GETPAGES.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_GETVOBJECT.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_INACTIVE.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_IOCTL.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_LINK.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_LISTEXTATTR.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_LOCK.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_LOOKUP.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_OPENCLOSE.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_PATHCONF.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_PRINT.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_RDWR.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_READDIR.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_READLINK.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_REALLOCBLKS.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_REMOVE.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_RENAME.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_REVOKE.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_SETACL.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_SETEXTATTR.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_STRATEGY.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_VPTOCNP.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_VPTOFH.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/accept_filter.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/accf_data.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/accf_dns.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/accf_http.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/acl.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/atomic.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/cr_cansee.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/cr_seeothergids.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/cr_seeotheruids.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/devfs_set_cdevpriv.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/devtoname.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/extattr.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/firmware.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/hexdump.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ifnet.9#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/make_dev.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/namei.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/p_candebug.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/p_cansee.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/pfind.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/pgfind.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/prison_check.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/random.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/rijndael.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/rtalloc.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/rtentry.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/sleep.9#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/spl.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/stack.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/uio.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/usbdi.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vaccess.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vaccess_acl_nfs4.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vaccess_acl_posix1e.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vcount.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vget.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vm_map_entry_resize_free.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vnode.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vput.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vref.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vrefcnt.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vrele.9#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#11 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#13 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.cpu.mk#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#36 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#35 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/bus.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#25 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/autoload.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/bootinfo.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/devicename.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/efimd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/elf32_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/exec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/i386_copy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/ldscript.amd64#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/ldscript.i386#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/reloc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/start.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/version#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#40 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 delete .. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_util.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#55 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#71 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.mips#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#19 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/LICENSE#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_compat.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_sym.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_debug.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_disk.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_tables.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/age/if_age.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#107 integrate .. //depot/projects/scottl-camlock/src/sys/dev/alc/if_alc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ale/if_ale.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#36 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwivar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwn.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwnvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_core.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/pmc_events.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipwvar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sge.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sgereg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#45 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sis/if_sis.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/logo/beastie.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/syscons/logo/logo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/logo/logo_saver.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_sparc64.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#47 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rumvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_run.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_runvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uralvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zydreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_devs.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_int.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsclstate.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_io.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_ioctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_mount.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_node.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_node.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_subr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vfsops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_io.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_node.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_smb.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_subr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vfsops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_subr.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/geom/sched/README#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/sched/g_sched.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/sched/g_sched.h#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/sched/gs_rr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/sched/gs_scheduler.h#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/sched/subr_disk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mpboot.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/bootinfo.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mca.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/mca.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ktr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#41 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/iconv.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/iconv_converter_if.m#4 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/iconv_xlat.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/strcasecmp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/if_arge.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/asm_octeon.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#3 delete .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/files.octeon1#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_mp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/_inttypes.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/_limits.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/archtype.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/asm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/bus.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpufunc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpuregs.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/db_machdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/defs.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pcb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/proc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/profile.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/psl.h#3 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/pte.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/queue.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/regnum.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/rm7000.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/segments.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/sf_buf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/trap.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/vmparam.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/gt_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/autoconf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/busdma_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/copystr.S#3 delete .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#9 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/fp.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/genassym.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/locore.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mp_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mpboot.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/nexus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/psraccess.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/support.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/swtch.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/tlb.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/uio_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/clock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#49 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cyclic/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/dummynet/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/geom/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_sched/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_sched/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_sched/gs_sched/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_sched/gsched_rr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn6000/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/sge/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/syscons/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/syscons/beastie/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/uart/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/sys/modules/wlan/Makefile#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#45 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_clone.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_amrr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_amrr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_ccmp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_tkip.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ratectl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ratectl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_rssadapt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_rssadapt.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_sta.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pipe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pipe.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched_rr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched_wf2q.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dn_glue.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dn_io.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dn_private.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_conn.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_conn.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_file.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_lib.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_login.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_ncp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_ncp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_nls.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_nls.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_rcfile.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_rq.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_rq.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_sock.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_sock.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_subr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_subr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_user.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/netbios.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_conn.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_conn.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_dev.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_dev.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_iod.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_rq.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_rq.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_smb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_subr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_subr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_tran.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_trantcp.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_trantcp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_usr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#32 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/NOTES#14 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/dcr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/lsu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/sbbc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ofw_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/dtrace_bsd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/iconv.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mchain.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#32 integrate .. //depot/projects/scottl-camlock/src/sys/sys/thr.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/vm/memguard.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/vm/memguard.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_kern.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/x86/isa/clock.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/plus-minus3.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parameters/pwd1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parameters/pwd2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/gen/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/gen/test-fnmatch.c#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/ath/common/dumpregs_5416.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#7 integrate .. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/tcpp_client.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/tcpp_server.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/ar.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/c89/c89.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/c99/c99.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.dutch#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/column/column.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/comm/comm.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/csup/cpasswd.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/csup/csup.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/enigma/enigma.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.1#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gzip/unbzip2.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/hexdump/od.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/indent/lexi.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.1#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lockf/lockf.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/matching.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/subst.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/tree.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/write.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wtmpcvt/wtmpcvt.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xlint/lint1/decl.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xlint/lint1/lint1.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xlint/lint1/mem1.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/asf/asf.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/burncd/burncd.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/config/config.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/config/configvers.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/config/mkoptions.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm/ctm.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm/ctm.5#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/devinfo/devinfo.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fdformat/fdformat.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fdread/fdread.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fdwrite/fdwrite.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/flowctl/flowctl.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mtest/mtest.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/periodic/periodic.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcannotate/pmcannotate.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmccontrol/pmccontrol.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_callgraph.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_calltree.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_gprof.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat.8#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.c#8 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pppctl/pppctl.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sade/disks.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sade/menus.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/setfmac/setfsmac.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/setpmac/setpmac.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/devices.c#8 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/disks.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/menus.c#8 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/tcpip.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/uhsoctl/uhsoctl.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/MAINTAINERS#11 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.160 2010/03/26 12:59:15 des Exp $ +$FreeBSD: src/MAINTAINERS,v 1.162 2010/04/10 12:29:09 bms Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -123,6 +123,9 @@ maintained by a third party source. lib/libc/stdtime edwin Heads-up appreciated, since parts of this code is maintained by a third party source. +sysinstall randi Please contact about any major changes so that + they can be co-ordinated. +sbin/routed bms Pre-commit review; notify vendor at rhyolite.com Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/scottl-camlock/src/Makefile.inc1#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.642 2010/03/24 18:40:57 delphij Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.643 2010/04/14 18:56:07 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -15,6 +15,7 @@ # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # TARGET="machine" to crossbuild world for a different machine type +# TARGET_ARCH= may be required when a TARGET supports multiple endians # # The intended user-driven targets are: ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#27 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.232 2010/03/27 03:17:39 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.234 2010/04/17 01:17:31 jmallett Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,18 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100416: [mips] removed +.if ${TARGET_ARCH} == "mips" +OLD_FILES+=usr/include/machine/psl.h +.endif +# 20100415: [mips] removed unused headers +.if ${TARGET_ARCH} == "mips" +OLD_FILES+=usr/include/machine/archtype.h +OLD_FILES+=usr/include/machine/segments.h +OLD_FILES+=usr/include/machine/rm7000.h +OLD_FILES+=usr/include/machine/defs.h +OLD_FILES+=usr/include/machine/queue.h +.endif # 20100326: [ia64] removed .if ${TARGET_ARCH} == "ia64" OLD_FILES+=usr/include/machine/nexusvar.h ==== //depot/projects/scottl-camlock/src/bin/ln/ln.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.39 2009/07/19 17:35:23 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.41 2010/04/21 21:57:03 jilles Exp $"); #include #include @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -172,6 +173,52 @@ exit(exitval); } +/* + * Two pathnames refer to the same directory entry if the directories match + * and the final components' names match. + */ +static int +samedirent(const char *path1, const char *path2) +{ + const char *file1, *file2; + char pathbuf[PATH_MAX]; + struct stat sb1, sb2; + + if (strcmp(path1, path2) == 0) + return 1; + file1 = strrchr(path1, '/'); + if (file1 != NULL) + file1++; + else + file1 = path1; + file2 = strrchr(path2, '/'); + if (file2 != NULL) + file2++; + else + file2 = path2; + if (strcmp(file1, file2) != 0) + return 0; + if (file1 - path1 >= PATH_MAX || file2 - path2 >= PATH_MAX) + return 0; + if (file1 == path1) + memcpy(pathbuf, ".", 2); + else { + memcpy(pathbuf, path1, file1 - path1); + pathbuf[file1 - path1] = '\0'; + } + if (stat(pathbuf, &sb1) != 0) + return 0; + if (file2 == path2) + memcpy(pathbuf, ".", 2); + else { + memcpy(pathbuf, path2, file2 - path2); + pathbuf[file2 - path2] = '\0'; + } + if (stat(pathbuf, &sb2) != 0) + return 0; + return sb1.st_dev == sb2.st_dev && sb1.st_ino == sb2.st_ino; +} + int linkit(const char *source, const char *target, int isdir) { @@ -180,6 +227,7 @@ int ch, exists, first; char path[PATH_MAX]; char wbuf[PATH_MAX]; + char bbuf[PATH_MAX]; if (!sflag) { /* If source doesn't exist, quit now. */ @@ -202,11 +250,9 @@ if (isdir || (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) || (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) { - if ((p = strrchr(source, '/')) == NULL) - p = source; - else - ++p; - if (snprintf(path, sizeof(path), "%s/%s", target, p) >= + if (strlcpy(bbuf, source, sizeof(bbuf)) >= sizeof(bbuf) || + (p = basename(bbuf)) == NULL || + snprintf(path, sizeof(path), "%s/%s", target, p) >= (ssize_t)sizeof(path)) { errno = ENAMETOOLONG; warn("%s", source); @@ -215,7 +261,6 @@ target = path; } - exists = !lstat(target, &sb); /* * If the link source doesn't exist, and a symbolic link was >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 22 09:51:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4FB91065670; Thu, 22 Apr 2010 09:51:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79CA8106566B for ; Thu, 22 Apr 2010 09:51:10 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6808E8FC1E for ; Thu, 22 Apr 2010 09:51:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3M9pAVK084742 for ; Thu, 22 Apr 2010 09:51:10 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3M9pA3E084740 for perforce@freebsd.org; Thu, 22 Apr 2010 09:51:10 GMT (envelope-from mav@freebsd.org) Date: Thu, 22 Apr 2010 09:51:10 GMT Message-Id: <201004220951.o3M9pA3E084740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 09:51:10 -0000 http://p4web.freebsd.org/@@177208?ac=10 Change 177208 by mav@mav_mavbook on 2010/04/22 09:50:48 Add Marvell ARM SoC integrated SATA support. They support NCQ, PMP and other features of Gen-IIe chips. Affected files ... .. //depot/projects/scottl-camlock/src/sys/arm/mv/files.mv#3 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_soc.c#1 add Differences ... ==== //depot/projects/scottl-camlock/src/sys/arm/mv/files.mv#3 (text+ko) ==== @@ -30,6 +30,7 @@ arm/mv/twsi.c optional iicbus dev/mge/if_mge.c optional mge +dev/mvs/mvs_soc.c optional mvs dev/uart/uart_bus_mbus.c optional uart dev/uart/uart_cpu_mv.c optional uart dev/uart/uart_dev_ns8250.c optional uart From owner-p4-projects@FreeBSD.ORG Thu Apr 22 11:56:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 665E81065674; Thu, 22 Apr 2010 11:56:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B20E106566B for ; Thu, 22 Apr 2010 11:56:16 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19F618FC12 for ; Thu, 22 Apr 2010 11:56:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3MBuFA4095952 for ; Thu, 22 Apr 2010 11:56:15 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3MBuFkl095950 for perforce@freebsd.org; Thu, 22 Apr 2010 11:56:15 GMT (envelope-from mav@freebsd.org) Date: Thu, 22 Apr 2010 11:56:15 GMT Message-Id: <201004221156.o3MBuFkl095950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 11:56:16 -0000 http://p4web.freebsd.org/@@177209?ac=10 Change 177209 by mav@mav_mavtest on 2010/04/22 11:55:52 Add mvs_pci.c. Affected files ... .. //depot/projects/scottl-camlock/src/sys/conf/files#72 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/conf/files#72 (text+ko) ==== @@ -1291,7 +1291,8 @@ dev/mpt/mpt_raid.c optional mpt dev/mpt/mpt_user.c optional mpt dev/msk/if_msk.c optional msk inet -dev/mvs/mvs.c optional mvs pci +dev/mvs/mvs.c optional mvs +dev/mvs/mvs_pci.c optional mvs pci dev/mwl/if_mwl.c optional mwl dev/mwl/if_mwl_pci.c optional mwl pci dev/mwl/mwlhal.c optional mwl From owner-p4-projects@FreeBSD.ORG Thu Apr 22 13:18:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 108A81065703; Thu, 22 Apr 2010 13:18:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B14571065701 for ; Thu, 22 Apr 2010 13:18:38 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FA968FC16 for ; Thu, 22 Apr 2010 13:18:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3MDIcB4014627 for ; Thu, 22 Apr 2010 13:18:38 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3MDIc72014625 for perforce@freebsd.org; Thu, 22 Apr 2010 13:18:38 GMT (envelope-from mav@freebsd.org) Date: Thu, 22 Apr 2010 13:18:38 GMT Message-Id: <201004221318.o3MDIc72014625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 13:18:39 -0000 http://p4web.freebsd.org/@@177212?ac=10 Change 177212 by mav@mav_mavtest on 2010/04/22 13:18:08 Improve Asynchronous Notifications support. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#9 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#9 (text+ko) ==== @@ -232,12 +232,21 @@ mvs_ch_resume(device_t dev) { struct mvs_channel *ch = device_get_softc(dev); + uint32_t reg; /* Disable port interrupts */ ATA_OUTL(ch->r_mem, EDMA_IEM, 0); /* Stop EDMA */ ch->curr_mode = MVS_EDMA_UNKNOWN; mvs_set_edma_mode(dev, MVS_EDMA_OFF); + /* Clear and configure FIS interrupts. */ + ATA_OUTL(ch->r_mem, SATA_FISIC, 0); + reg = ATA_INL(ch->r_mem, SATA_FISC); + reg |= SATA_FISC_FISWAIT4HOSTRDYEN_B1; + ATA_OUTL(ch->r_mem, SATA_FISC, reg); + reg = ATA_INL(ch->r_mem, SATA_FISIM); + reg |= SATA_FISC_FISWAIT4HOSTRDYEN_B1; + ATA_OUTL(ch->r_mem, SATA_FISC, reg); /* Clear SATA error register. */ ATA_OUTL(ch->r_mem, SATA_SE, 0xffffffff); /* Clear any outstanding error interrupts. */ @@ -534,22 +543,24 @@ } static void -mvs_notify_events(device_t dev, u_int32_t status) +mvs_notify_events(device_t dev) { struct mvs_channel *ch = device_get_softc(dev); struct cam_path *dpath; - int i; + uint32_t fis; + int d; + fis = ATA_INL(ch->r_mem, SATA_FISDW0); + if ((fis & 0x80ff) == 0x80a1) + d = (fis & 0x0f00) >> 8; + else + d = ch->pm_present ? 15 : 0; if (bootverbose) - device_printf(dev, "SNTF 0x%04x\n", status); - for (i = 0; i < 16; i++) { - if ((status & (1 << i)) == 0) - continue; - if (xpt_create_path(&dpath, NULL, - xpt_path_path_id(ch->path), i, 0) == CAM_REQ_CMP) { - xpt_async(AC_SCSI_AEN, dpath, NULL); - xpt_free_path(dpath); - } + device_printf(dev, "SNTF %d\n", d); + if (xpt_create_path(&dpath, NULL, + xpt_path_path_id(ch->path), d, 0) == CAM_REQ_CMP) { + xpt_async(AC_SCSI_AEN, dpath, NULL); + xpt_free_path(dpath); } } @@ -592,7 +603,7 @@ struct mvs_channel *ch = device_get_softc(dev); uint32_t iec, serr = 0, fisic = 0; enum mvs_err_type et; - int i, ccs, port = -1; + int i, ccs, port = -1, selfdis = 0; int edma = (ch->numtslots != 0 || ch->numdslots != 0); //device_printf(dev, "irq cause %02x EDMA %d IEC %08x\n", @@ -608,12 +619,19 @@ ATA_OUTL(ch->r_mem, SATA_SE, serr); device_printf(dev, "SERR %08x\n", serr); } + if (iec & EDMA_IE_ESELFDIS) + selfdis = 1; if (iec & EDMA_IE_ETRANSINT) { - fisic = ATA_INL(ch->r_mem, SATA_FISIC); -device_printf(dev, "FISC %08x\n", ATA_INL(ch->r_mem, SATA_FISC)); + if (ch->quirks & MVS_Q_GENI) + selfdis = 1; + else if (ch->quirks & MVS_Q_GENII) + fisic = SATA_FISC_FISWAIT4HOSTRDYEN_B1; + else + fisic = ATA_INL(ch->r_mem, SATA_FISIC); device_printf(dev, "FISIC %08x\n", fisic); -device_printf(dev, "FISIM %08x\n", ATA_INL(ch->r_mem, SATA_FISIM)); } + if (selfdis) + ch->curr_mode = MVS_EDMA_OFF; ATA_OUTL(ch->r_mem, EDMA_IEC, ~iec); /* Interface errors or Device error. */ if (iec & (0xfc1e9000 | EDMA_IE_EDEVERR)) { @@ -641,7 +659,7 @@ /* If several ports were active and EDMA still enabled - * other ports are probably unaffected and may continue. */ - if (port == -2 && (iec & EDMA_IE_ESELFDIS) == 0) { + if (port == -2 && !selfdis) { uint16_t p = ATA_INL(ch->r_mem, SATA_SATAITC) >> 16; port = ffs(p) - 1; if (port != (fls(p) - 1)) @@ -684,15 +702,13 @@ mvs_end_transaction(&ch->slot[i], et); } } + if (fisic & SATA_FISC_FISWAIT4HOSTRDYEN_B1) + mvs_notify_events(dev); if (fisic) ATA_OUTL(ch->r_mem, SATA_FISIC, ~fisic); - if (iec & EDMA_IE_ESELFDIS) - ch->curr_mode = MVS_EDMA_OFF; if ((iec & (EDMA_IE_EDEVDIS | EDMA_IE_EDEVCON)) || (serr & ATA_SE_PHY_CHANGED)) mvs_phy_check_events(dev, serr); - if (fisic & SATA_FISC_FISWAIT4HOSTRDYEN_B1) - mvs_notify_events(dev, ch->pm_present ? 0x8000 : 0x0001); } if ((arg->cause & 2) && !edma) mvs_legacy_intr(dev); From owner-p4-projects@FreeBSD.ORG Thu Apr 22 23:37:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C07D81065680; Thu, 22 Apr 2010 23:37:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 830DF106567B for ; Thu, 22 Apr 2010 23:37:07 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E2498FC08 for ; Thu, 22 Apr 2010 23:37:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3MNb7cp092130 for ; Thu, 22 Apr 2010 23:37:07 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3MNb4mM092128 for perforce@freebsd.org; Thu, 22 Apr 2010 23:37:04 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 22 Apr 2010 23:37:04 GMT Message-Id: <201004222337.o3MNb4mM092128@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177236 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 23:37:08 -0000 http://p4web.freebsd.org/@@177236?ac=10 Change 177236 by thompsa@thompsa_pea on 2010/04/22 23:36:13 IFC @177234 Affected files ... .. //depot/projects/usb/src/lib/libusbhid/data.c#4 integrate .. //depot/projects/usb/src/lib/libusbhid/descr.c#9 integrate .. //depot/projects/usb/src/lib/libusbhid/parse.c#4 integrate .. //depot/projects/usb/src/lib/libusbhid/usage.c#4 integrate .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#6 integrate .. //depot/projects/usb/src/lib/libusbhid/usbvar.h#5 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_machdep.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_trace.c#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#13 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#21 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#23 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#31 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mca.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#37 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#22 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#17 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#37 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#26 integrate .. //depot/projects/usb/src/sys/amd64/conf/XENHVM#6 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#11 integrate .. //depot/projects/usb/src/sys/amd64/include/apicvar.h#12 integrate .. //depot/projects/usb/src/sys/amd64/include/elf.h#6 integrate .. //depot/projects/usb/src/sys/amd64/include/mca.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/md_var.h#11 integrate .. //depot/projects/usb/src/sys/amd64/include/pmc_mdep.h#8 integrate .. //depot/projects/usb/src/sys/amd64/include/reg.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#17 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#15 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#24 integrate .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#21 integrate .. //depot/projects/usb/src/sys/arm/arm/identcpu.c#10 integrate .. //depot/projects/usb/src/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#24 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#13 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT.hints#3 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-78XXX#7 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#7 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#7 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#12 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#23 integrate .. //depot/projects/usb/src/sys/arm/conf/LN2410SBC#1 branch .. //depot/projects/usb/src/sys/arm/conf/SHEEVAPLUG#2 integrate .. //depot/projects/usb/src/sys/arm/include/bus.h#4 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_sata.c#4 integrate .. //depot/projects/usb/src/sys/arm/s3c2xx0/board_ln2410sbc.c#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/files.s3c2xx0#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2410reg.h#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2410var.h#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2440reg.h#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0.c#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0_clk.c#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0reg.h#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0var.h#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2xx0_space.c#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2xx0board.h#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2xx0reg.h#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2xx0var.h#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/std.ln2410sbc#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/std.s3c2410#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#1 branch .. //depot/projects/usb/src/sys/arm/s3c2xx0/uart_dev_s3c2410.h#1 branch .. //depot/projects/usb/src/sys/arm/xscale/ixp425/cambria_fled.c#3 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/boot2/bwct_board.c#3 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#5 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#25 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/boot2.c#7 integrate .. //depot/projects/usb/src/sys/boot/i386/efi/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/autoload.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/bootinfo.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/conf.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/devicename.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/efimd.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/elf32_freebsd.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/exec.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/i386_copy.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/ldscript.amd64#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/ldscript.i386#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/main.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/reloc.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/start.S#1 branch .. //depot/projects/usb/src/sys/boot/i386/efi/version#1 branch .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptboot.c#6 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#8 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#29 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.h#6 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#17 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#19 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#10 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#11 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#12 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#18 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 integrate .. //depot/projects/usb/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 delete .. //depot/projects/usb/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32.h#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ipc.h#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#23 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#24 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#23 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#23 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#24 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_util.h#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#24 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_reg.h#2 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_signal.h#4 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#14 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#25 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_file.c#15 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#22 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#14 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#10 integrate .. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#4 integrate .. //depot/projects/usb/src/sys/conf/NOTES#55 integrate .. //depot/projects/usb/src/sys/conf/files#94 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#29 integrate .. //depot/projects/usb/src/sys/conf/files.i386#34 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#18 integrate .. //depot/projects/usb/src/sys/conf/files.mips#9 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#23 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#17 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#13 integrate .. //depot/projects/usb/src/sys/conf/kern.post.mk#10 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#17 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#15 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#15 integrate .. //depot/projects/usb/src/sys/conf/options#47 integrate .. //depot/projects/usb/src/sys/conf/options.amd64#11 integrate .. //depot/projects/usb/src/sys/conf/options.i386#12 integrate .. //depot/projects/usb/src/sys/conf/options.ia64#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmextern.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslstubs.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbdisply.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpe.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeblk.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxface.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfevnt.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exdebug.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exmutex.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exoparg2.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exregion.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwsleep.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acevents.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acexcep.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acglobal.h#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actables.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actypes.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psxface.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbutils.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbxface.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/iwn/LICENSE#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#2 delete .. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#1 branch .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_sym.c#5 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#15 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_cam.c#11 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_debug.c#5 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aacreg.h#6 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#9 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#9 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_video.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#15 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#13 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#11 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#13 integrate .. //depot/projects/usb/src/sys/dev/alc/if_alc.c#7 integrate .. //depot/projects/usb/src/sys/dev/ale/if_ale.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#19 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#9 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#37 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#26 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#8 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#16 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#29 integrate .. //depot/projects/usb/src/sys/dev/bktr/ioctl_bt848.h#2 integrate .. //depot/projects/usb/src/sys/dev/bktr/ioctl_meteor.h#2 integrate .. //depot/projects/usb/src/sys/dev/bwi/if_bwi.c#6 integrate .. //depot/projects/usb/src/sys/dev/bwi/if_bwivar.h#4 integrate .. //depot/projects/usb/src/sys/dev/bwn/if_bwn.c#2 integrate .. //depot/projects/usb/src/sys/dev/bwn/if_bwnvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#13 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#14 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#16 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#16 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#28 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#23 integrate .. //depot/projects/usb/src/sys/dev/drm/ati_pcigart.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#17 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_bufs.c#9 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_context.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#16 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_memory.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#13 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_scatter.c#8 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_sysctl.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_vm.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#14 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.h#12 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_reg.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_dma.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_dma.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_warp.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/r600_blit.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/r600_cp.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#13 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_cs.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_state.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/via_dma.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/via_map.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/via_mm.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#18 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#19 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_lem.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_lem.h#1 branch .. //depot/projects/usb/src/sys/dev/fb/vesa.c#10 integrate .. //depot/projects/usb/src/sys/dev/fb/vga.c#5 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp.c#10 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.c#7 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.h#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_intel.c#6 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_logging.c#10 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#17 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_uncore.c#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_uncore.h#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/pmc_events.h#10 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#15 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipwvar.h#8 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#14 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#15 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.h#11 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_library.c#9 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_pci.c#9 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/usb/src/sys/dev/isp/ispvar.h#8 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#17 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwnreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwnvar.h#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/LICENSE#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#18 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#10 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#9 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82599.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#9 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#9 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#9 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#9 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#9 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#9 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo.c#8 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphy.c#14 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphyreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/mii/mii.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/miidevs#18 integrate .. //depot/projects/usb/src/sys/dev/mii/truephy.c#3 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#14 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#21 integrate .. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#14 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#23 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#17 integrate .. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#13 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_standard.c#5 integrate .. //depot/projects/usb/src/sys/dev/pci/vga_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560.c#15 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560var.h#8 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2661.c#14 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2661var.h#7 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#27 integrate .. //depot/projects/usb/src/sys/dev/sge/if_sge.c#1 branch .. //depot/projects/usb/src/sys/dev/sge/if_sgereg.h#1 branch .. //depot/projects/usb/src/sys/dev/siba/siba.c#3 integrate .. //depot/projects/usb/src/sys/dev/siba/siba_bwn.c#2 integrate .. //depot/projects/usb/src/sys/dev/siba/siba_cc.c#3 integrate .. //depot/projects/usb/src/sys/dev/siba/siba_core.c#2 integrate .. //depot/projects/usb/src/sys/dev/siba/siba_pcib.c#3 integrate .. //depot/projects/usb/src/sys/dev/siba/sibavar.h#3 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.c#12 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#10 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#9 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/es137x.c#8 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/es137x.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#42 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/spicds.c#6 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/spicds.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/dsp.c#12 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#68 integrate .. //depot/projects/usb/src/sys/dev/syscons/logo/beastie.c#1 branch .. //depot/projects/usb/src/sys/dev/syscons/logo/logo.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/logo/logo_saver.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/scvgarndr.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/scvidctl.c#8 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#21 integrate .. //depot/projects/usb/src/sys/dev/uart/uart.h#5 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_cpu_sparc64.c#4 integrate .. //depot/projects/usb/src/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#50 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_s3c24x0.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#31 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#39 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#49 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#29 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#50 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template_mtp.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#55 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_debug.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#43 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#66 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#35 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_freebsd.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#41 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#176 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#14 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#118 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralvar.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydreg.h#8 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#17 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpivar.h#6 integrate .. //depot/projects/usb/src/sys/dev/xen/netback/netback.c#5 integrate .. //depot/projects/usb/src/sys/fs/coda/cnode.h#4 integrate .. //depot/projects/usb/src/sys/fs/coda/coda.h#2 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_subr.c#4 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_subr.h#3 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_venus.c#5 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_venus.h#4 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vfsops.h#3 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/deadfs/dead_vnops.c#4 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#14 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_int.h#6 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vnops.c#9 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonport.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonsubs.c#4 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#8 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsclstate.h#2 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#10 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsrvstate.h#2 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#6 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#7 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#10 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#10 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdserv.c#6 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#10 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs.h#2 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_mount.h#2 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_node.c#6 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_node.h#2 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_subr.c#5 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_subr.h#2 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_dbregs.c#5 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_fpregs.c#4 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_map.c#10 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_regs.c#4 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#19 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs.h#3 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#11 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_node.c#10 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_node.h#3 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_smb.c#5 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_subr.c#3 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_subr.h#2 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#10 integrate .. //depot/projects/usb/src/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/usb/src/sys/geom/geom_dump.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_io.c#13 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#16 integrate .. //depot/projects/usb/src/sys/geom/geom_vfs.c#8 integrate .. //depot/projects/usb/src/sys/geom/multipath/g_multipath.c#5 integrate .. //depot/projects/usb/src/sys/geom/sched/README#1 branch .. //depot/projects/usb/src/sys/geom/sched/g_sched.c#1 branch .. //depot/projects/usb/src/sys/geom/sched/g_sched.h#1 branch .. //depot/projects/usb/src/sys/geom/sched/gs_rr.c#1 branch .. //depot/projects/usb/src/sys/geom/sched/gs_scheduler.h#1 branch .. //depot/projects/usb/src/sys/geom/sched/subr_disk.c#1 branch .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#9 integrate .. //depot/projects/usb/src/sys/i386/acpica/acpi_machdep.c#14 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#36 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#31 integrate .. //depot/projects/usb/src/sys/i386/conf/XBOX#9 integrate .. //depot/projects/usb/src/sys/i386/conf/XEN#8 integrate .. //depot/projects/usb/src/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#23 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#27 integrate .. //depot/projects/usb/src/sys/i386/i386/mca.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#21 integrate .. //depot/projects/usb/src/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#33 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#19 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_stat.c#2 integrate .. //depot/projects/usb/src/sys/i386/include/apicvar.h#14 integrate .. //depot/projects/usb/src/sys/i386/include/bootinfo.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/mca.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/md_var.h#6 integrate .. //depot/projects/usb/src/sys/i386/include/pmc_mdep.h#8 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#17 integrate .. //depot/projects/usb/src/sys/i386/linux/linux.h#14 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#18 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#14 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#18 integrate .. //depot/projects/usb/src/sys/ia64/conf/NOTES#6 integrate .. //depot/projects/usb/src/sys/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/usb/src/sys/ia64/ia64/autoconf.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/clock.c#8 integrate .. //depot/projects/usb/src/sys/ia64/ia64/db_machdep.c#7 integrate .. //depot/projects/usb/src/sys/ia64/ia64/exception.S#8 integrate .. //depot/projects/usb/src/sys/ia64/ia64/genassym.c#5 integrate .. //depot/projects/usb/src/sys/ia64/ia64/highfp.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/interrupt.c#14 integrate .. //depot/projects/usb/src/sys/ia64/ia64/locore.S#5 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#20 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mca.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#15 integrate .. //depot/projects/usb/src/sys/ia64/ia64/nexus.c#9 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#19 integrate .. //depot/projects/usb/src/sys/ia64/ia64/sal.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/sapic.c#5 integrate .. //depot/projects/usb/src/sys/ia64/ia64/trap.c#11 integrate .. //depot/projects/usb/src/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/usb/src/sys/ia64/include/acpica_machdep.h#3 integrate .. //depot/projects/usb/src/sys/ia64/include/clock.h#5 integrate .. //depot/projects/usb/src/sys/ia64/include/cpufunc.h#5 integrate .. //depot/projects/usb/src/sys/ia64/include/elf.h#6 integrate .. //depot/projects/usb/src/sys/ia64/include/frame.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/intr.h#5 integrate .. //depot/projects/usb/src/sys/ia64/include/intrcnt.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/mca.h#4 integrate .. //depot/projects/usb/src/sys/ia64/include/nexusvar.h#2 delete .. //depot/projects/usb/src/sys/ia64/include/pal.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/pcb.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/pcpu.h#8 integrate .. //depot/projects/usb/src/sys/ia64/include/reg.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/smp.h#4 integrate .. //depot/projects/usb/src/sys/ia64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#18 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_alq.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_clock.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_event.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#24 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#37 integrate .. //depot/projects/usb/src/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_module.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#27 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#25 integrate .. //depot/projects/usb/src/sys/kern/kern_syscalls.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#16 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#38 integrate .. //depot/projects/usb/src/sys/kern/subr_eventhandler.c#4 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#20 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#15 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#19 integrate .. //depot/projects/usb/src/sys/kern/sysv_ipc.c#6 integrate .. //depot/projects/usb/src/sys/kern/sysv_msg.c#11 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#13 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#14 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#23 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#13 integrate .. //depot/projects/usb/src/sys/kern/uipc_sem.c#12 integrate .. //depot/projects/usb/src/sys/kern/uipc_shm.c#8 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#31 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#26 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#27 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#18 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#23 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#31 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#33 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#26 integrate .. //depot/projects/usb/src/sys/libkern/iconv.c#4 integrate .. //depot/projects/usb/src/sys/libkern/iconv_converter_if.m#3 integrate .. //depot/projects/usb/src/sys/libkern/iconv_xlat.c#2 integrate .. //depot/projects/usb/src/sys/libkern/strcasecmp.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/if_arge.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/asm_octeon.S#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#3 delete .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/files.octeon1#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_mp.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_pcmap_regs.h#4 integrate .. //depot/projects/usb/src/sys/mips/conf/AR71XX#4 integrate .. //depot/projects/usb/src/sys/mips/conf/OCTEON1#4 integrate .. //depot/projects/usb/src/sys/mips/conf/OCTEON1-32#4 integrate .. //depot/projects/usb/src/sys/mips/conf/SENTRY5#9 integrate .. //depot/projects/usb/src/sys/mips/conf/SWARM#4 integrate .. //depot/projects/usb/src/sys/mips/conf/XLR#4 integrate .. //depot/projects/usb/src/sys/mips/include/_inttypes.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/_limits.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/archtype.h#2 delete .. //depot/projects/usb/src/sys/mips/include/asm.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/bus.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/clock.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cpu.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/cpufunc.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/cpuregs.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/db_machdep.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/defs.h#2 delete .. //depot/projects/usb/src/sys/mips/include/kdb.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/param.h#7 integrate .. //depot/projects/usb/src/sys/mips/include/pcb.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/pmap.h#8 integrate .. //depot/projects/usb/src/sys/mips/include/proc.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/profile.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/psl.h#3 delete .. //depot/projects/usb/src/sys/mips/include/pte.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/queue.h#2 delete .. //depot/projects/usb/src/sys/mips/include/regnum.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/rm7000.h#2 delete .. //depot/projects/usb/src/sys/mips/include/segments.h#2 delete .. //depot/projects/usb/src/sys/mips/include/sf_buf.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/smp.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/trap.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/vmparam.h#2 integrate .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#7 integrate .. //depot/projects/usb/src/sys/mips/mips/autoconf.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/busdma_machdep.c#9 integrate .. //depot/projects/usb/src/sys/mips/mips/copystr.S#3 delete .. //depot/projects/usb/src/sys/mips/mips/db_trace.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/exception.S#5 integrate .. //depot/projects/usb/src/sys/mips/mips/fp.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/genassym.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/locore.S#5 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#12 integrate .. //depot/projects/usb/src/sys/mips/mips/mem.c#5 integrate .. //depot/projects/usb/src/sys/mips/mips/mp_machdep.c#7 integrate .. //depot/projects/usb/src/sys/mips/mips/mpboot.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/nexus.c#5 integrate .. //depot/projects/usb/src/sys/mips/mips/pm_machdep.c#5 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#18 integrate .. //depot/projects/usb/src/sys/mips/mips/psraccess.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/support.S#5 integrate .. //depot/projects/usb/src/sys/mips/mips/swtch.S#5 integrate .. //depot/projects/usb/src/sys/mips/mips/tick.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/tlb.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/trap.c#8 integrate .. //depot/projects/usb/src/sys/mips/mips/uio_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/vm_machdep.c#5 integrate .. //depot/projects/usb/src/sys/mips/rmi/clock.c#3 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_asm.S#3 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_scd.c#3 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_scd.h#3 integrate .. //depot/projects/usb/src/sys/modules/Makefile#50 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#12 integrate .. //depot/projects/usb/src/sys/modules/alq/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/cyclic/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/em/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/geom/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_sched/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/geom/geom_sched/Makefile.inc#1 branch .. //depot/projects/usb/src/sys/modules/geom/geom_sched/gs_sched/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/geom/geom_sched/gsched_rr/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/hwpmc/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/iwnfw/iwn6000/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ixgbe/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/linux/Makefile#11 integrate .. //depot/projects/usb/src/sys/modules/procfs/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/sge/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/syscons/beastie/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/uart/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/wlan/Makefile#13 integrate .. //depot/projects/usb/src/sys/modules/zfs/Makefile#12 integrate .. //depot/projects/usb/src/sys/net/bpf.c#27 integrate .. //depot/projects/usb/src/sys/net/flowtable.c#16 integrate .. //depot/projects/usb/src/sys/net/flowtable.h#9 integrate .. //depot/projects/usb/src/sys/net/if.c#47 integrate .. //depot/projects/usb/src/sys/net/if.h#17 integrate .. //depot/projects/usb/src/sys/net/if_clone.c#10 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#17 integrate .. //depot/projects/usb/src/sys/net/if_llatbl.c#10 integrate .. //depot/projects/usb/src/sys/net/if_llatbl.h#6 integrate .. //depot/projects/usb/src/sys/net/if_media.h#12 integrate .. //depot/projects/usb/src/sys/net/if_tap.c#13 integrate .. //depot/projects/usb/src/sys/net/if_tun.c#18 integrate .. //depot/projects/usb/src/sys/net/if_var.h#36 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#24 integrate .. //depot/projects/usb/src/sys/net/radix.c#6 integrate .. //depot/projects/usb/src/sys/net/radix_mpath.c#6 integrate .. //depot/projects/usb/src/sys/net/route.c#29 integrate .. //depot/projects/usb/src/sys/net/route.h#14 integrate .. //depot/projects/usb/src/sys/net/vnet.c#7 integrate .. //depot/projects/usb/src/sys/net/vnet.h#20 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#32 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_amrr.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_amrr.h#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_ccmp.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_tkip.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#19 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#18 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#15 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#21 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#26 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_mesh.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#28 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#19 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#22 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ratectl.c#1 branch .. //depot/projects/usb/src/sys/net80211/ieee80211_ratectl.h#1 branch .. //depot/projects/usb/src/sys/net80211/ieee80211_rssadapt.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_rssadapt.h#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#17 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#16 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#28 integrate .. //depot/projects/usb/src/sys/netgraph/netflow/ng_netflow.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_deflate.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ksocket.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_l2tp.c#9 integrate .. //depot/projects/usb/src/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pipe.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pipe.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ppp.c#9 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pptpgre.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/usb/src/sys/netgraph/ng_socketvar.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_tcpmss.c#4 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#34 integrate .. //depot/projects/usb/src/sys/netinet/in.c#43 integrate .. //depot/projects/usb/src/sys/netinet/in.h#17 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#21 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#34 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#26 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#29 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#22 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#35 integrate .. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#19 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#32 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/dn_sched.h#2 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/dn_sched_prio.c#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/dn_sched_rr.c#2 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/dn_sched_wf2q.c#2 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dn_glue.c#2 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dn_io.c#2 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dn_private.h#2 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#10 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#18 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_dynamic.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_private.h#6 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_sockopt.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_table.c#5 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/test/Makefile#2 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#34 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#18 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.h#6 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#25 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.h#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#24 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#29 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.h#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#24 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#18 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#21 integrate .. //depot/projects/usb/src/sys/netinet/sctp_var.h#14 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#30 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.h#14 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#31 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#22 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#31 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#21 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#28 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#37 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#22 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#24 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#31 integrate .. //depot/projects/usb/src/sys/netinet6/sctp6_usrreq.c#13 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.c#24 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#28 integrate .. //depot/projects/usb/src/sys/netncp/ncp_conn.c#6 integrate .. //depot/projects/usb/src/sys/netncp/ncp_conn.h#3 integrate .. //depot/projects/usb/src/sys/netncp/ncp_file.h#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_lib.h#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_login.c#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_ncp.c#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_ncp.h#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_nls.c#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_nls.h#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_rcfile.h#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_rq.c#4 integrate .. //depot/projects/usb/src/sys/netncp/ncp_rq.h#2 integrate .. //depot/projects/usb/src/sys/netncp/ncp_sock.c#7 integrate .. //depot/projects/usb/src/sys/netncp/ncp_sock.h#3 integrate .. //depot/projects/usb/src/sys/netncp/ncp_subr.c#3 integrate .. //depot/projects/usb/src/sys/netncp/ncp_subr.h#3 integrate .. //depot/projects/usb/src/sys/netncp/ncp_user.h#2 integrate .. //depot/projects/usb/src/sys/netsmb/netbios.h#2 integrate .. //depot/projects/usb/src/sys/netsmb/smb.h#2 integrate .. //depot/projects/usb/src/sys/netsmb/smb_conn.c#6 integrate .. //depot/projects/usb/src/sys/netsmb/smb_conn.h#4 integrate .. //depot/projects/usb/src/sys/netsmb/smb_dev.c#6 integrate .. //depot/projects/usb/src/sys/netsmb/smb_dev.h#2 integrate .. //depot/projects/usb/src/sys/netsmb/smb_iod.c#5 integrate .. //depot/projects/usb/src/sys/netsmb/smb_rq.c#5 integrate .. //depot/projects/usb/src/sys/netsmb/smb_rq.h#3 integrate .. //depot/projects/usb/src/sys/netsmb/smb_smb.c#3 integrate .. //depot/projects/usb/src/sys/netsmb/smb_subr.c#3 integrate .. //depot/projects/usb/src/sys/netsmb/smb_subr.h#3 integrate .. //depot/projects/usb/src/sys/netsmb/smb_tran.h#2 integrate .. //depot/projects/usb/src/sys/netsmb/smb_trantcp.c#7 integrate .. //depot/projects/usb/src/sys/netsmb/smb_trantcp.h#2 integrate .. //depot/projects/usb/src/sys/netsmb/smb_usr.c#2 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#19 integrate .. //depot/projects/usb/src/sys/pc98/cbus/clock.c#12 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#27 integrate .. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#17 integrate .. //depot/projects/usb/src/sys/pci/if_rlreg.h#19 integrate .. //depot/projects/usb/src/sys/powerpc/aim/interrupt.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#17 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#11 integrate .. //depot/projects/usb/src/sys/powerpc/aim/nexus.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/ofw_machdep.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/booke/interrupt.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#16 integrate .. //depot/projects/usb/src/sys/powerpc/booke/trap_subr.S#6 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#29 integrate .. //depot/projects/usb/src/sys/powerpc/conf/MPC85XX#11 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/ocpbus.c#9 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/ocpbus.h#5 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/pci_ocp.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_real.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_syscons.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/cuda.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/cudavar.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/pmu.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/smu.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/uninorth.c#9 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#15 integrate .. //depot/projects/usb/src/sys/rpc/svc.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#29 integrate .. //depot/projects/usb/src/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/usb/src/sys/sparc64/fhc/fhc.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/include/dcr.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/include/lsu.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/include/tlb.h#5 integrate .. //depot/projects/usb/src/sys/sparc64/include/tte.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/include/ver.h#5 integrate .. //depot/projects/usb/src/sys/sparc64/include/wstate.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/pci/apb.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#15 integrate .. //depot/projects/usb/src/sys/sparc64/pci/sbbc.c#1 branch .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizovar.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/cheetah.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/genassym.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#21 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/ofw_machdep.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/pmap.c#16 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/support.S#7 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/swtch.S#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#15 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#20 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/machdep.c#11 integrate .. //depot/projects/usb/src/sys/sys/_timespec.h#2 integrate .. //depot/projects/usb/src/sys/sys/dtrace_bsd.h#3 integrate .. //depot/projects/usb/src/sys/sys/eventhandler.h#10 integrate .. //depot/projects/usb/src/sys/sys/iconv.h#3 integrate .. //depot/projects/usb/src/sys/sys/imgact.h#7 integrate .. //depot/projects/usb/src/sys/sys/ioccom.h#4 integrate .. //depot/projects/usb/src/sys/sys/mchain.h#2 integrate .. //depot/projects/usb/src/sys/sys/param.h#51 integrate .. //depot/projects/usb/src/sys/sys/pcpu.h#15 integrate .. //depot/projects/usb/src/sys/sys/pioctl.h#3 integrate .. //depot/projects/usb/src/sys/sys/pmc.h#11 integrate .. //depot/projects/usb/src/sys/sys/proc.h#27 integrate .. //depot/projects/usb/src/sys/sys/ptrace.h#3 integrate .. //depot/projects/usb/src/sys/sys/stat.h#7 integrate .. //depot/projects/usb/src/sys/sys/sysent.h#13 integrate .. //depot/projects/usb/src/sys/sys/thr.h#6 integrate .. //depot/projects/usb/src/sys/sys/timeb.h#3 integrate .. //depot/projects/usb/src/sys/sys/timespec.h#2 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#29 integrate .. //depot/projects/usb/src/sys/sys/vtoc.h#3 integrate .. //depot/projects/usb/src/sys/teken/teken.c#5 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#23 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#16 integrate .. //depot/projects/usb/src/sys/vm/memguard.c#3 integrate .. //depot/projects/usb/src/sys/vm/memguard.h#2 integrate .. //depot/projects/usb/src/sys/vm/pmap.h#8 integrate .. //depot/projects/usb/src/sys/vm/swap_pager.c#19 integrate .. //depot/projects/usb/src/sys/vm/uma_int.h#5 integrate .. //depot/projects/usb/src/sys/vm/vm_contig.c#15 integrate .. //depot/projects/usb/src/sys/vm/vm_extern.h#13 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#21 integrate .. //depot/projects/usb/src/sys/vm/vm_glue.c#12 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.c#13 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#25 integrate .. //depot/projects/usb/src/sys/vm/vm_map.h#12 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#23 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#23 integrate .. //depot/projects/usb/src/sys/vm/vm_page.c#22 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#20 integrate .. //depot/projects/usb/src/sys/x86/isa/clock.c#2 integrate Differences ... ==== //depot/projects/usb/src/lib/libusbhid/data.c#4 (text+ko) ==== @@ -27,8 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6 2003/04/09 01:52:48 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.7 2010/03/27 08:00:16 kaiw Exp $"); +#include #include #include #include "usbhid.h" @@ -36,18 +37,27 @@ int hid_get_data(const void *p, const hid_item_t *h) { - const unsigned char *buf; - unsigned int hpos; - unsigned int hsize; - int data; + const uint8_t *buf; + uint32_t hpos; + uint32_t hsize; + uint32_t data; int i, end, offs; buf = p; + + /* Skip report ID byte. */ + if (h->report_ID > 0) + buf++; + hpos = h->pos; /* bit position of data */ hsize = h->report_size; /* bit length of data */ + /* Range check and limit */ if (hsize == 0) return (0); + if (hsize > 32) + hsize = 32; + offs = hpos / 8; end = (hpos + hsize) / 8 - offs; data = 0; @@ -66,12 +76,17 @@ void hid_set_data(void *p, const hid_item_t *h, int data) { - unsigned char *buf; - unsigned int hpos; - unsigned int hsize; + uint8_t *buf; + uint32_t hpos; + uint32_t hsize; int i, end, offs, mask; buf = p; + + /* Set report ID byte. */ + if (h->report_ID > 0) + *buf++ = h->report_ID & 0xff; + hpos = h->pos; /* bit position of data */ hsize = h->report_size; /* bit length of data */ @@ -90,5 +105,5 @@ for (i = 0; i <= end; i++) buf[offs + i] = (buf[offs + i] & (mask >> (i*8))) | - ((data >> (i*8)) & 0xff); + ((data >> (i*8)) & 0xff); } ==== //depot/projects/usb/src/lib/libusbhid/descr.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.12 2009/05/28 20:21:01 thompsa Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.13 2010/03/27 08:00:16 kaiw Exp $"); #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 23 05:12:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C12C1065672; Fri, 23 Apr 2010 05:12:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06E11106564A for ; Fri, 23 Apr 2010 05:12:21 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E84738FC08 for ; Fri, 23 Apr 2010 05:12:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3N5CKYW044793 for ; Fri, 23 Apr 2010 05:12:20 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3N5CKs8044791 for perforce@freebsd.org; Fri, 23 Apr 2010 05:12:20 GMT (envelope-from mav@freebsd.org) Date: Fri, 23 Apr 2010 05:12:20 GMT Message-Id: <201004230512.o3N5CKs8044791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 05:12:21 -0000 http://p4web.freebsd.org/@@177249?ac=10 Change 177249 by mav@mav_mavtest on 2010/04/23 05:12:15 Implement Command Completion Coalescing support. Affected files ... .. //depot/projects/scottl-camlock/src/sys/conf/files#73 edit .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#22 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#10 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_if.m#1 add .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_pci.c#2 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_soc.c#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/conf/files#73 (text+ko) ==== @@ -1292,6 +1292,7 @@ dev/mpt/mpt_user.c optional mpt dev/msk/if_msk.c optional msk inet dev/mvs/mvs.c optional mvs +dev/mvs/mvs_if.m standard dev/mvs/mvs_pci.c optional mvs pci dev/mwl/if_mwl.c optional mwl dev/mwl/if_mwl_pci.c optional mwl pci ==== //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#22 (text+ko) ==== @@ -337,7 +337,7 @@ dev/agp/agp_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \ dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \ - dev/mii/miibus_if.m dev/ofw/ofw_bus_if.m \ + dev/mii/miibus_if.m dev/mvs/mvs_if.m dev/ofw/ofw_bus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#10 (text+ko) ==== @@ -440,6 +440,7 @@ ch->curr_mode = mode; ch->fbs_enabled = 0; ch->fake_busy = 0; + MVS_EDMA(device_get_parent(dev), dev, mode); device_printf(dev, "EDMA mode: %d\n", mode); if (mode == MVS_EDMA_OFF) return; @@ -631,7 +632,7 @@ device_printf(dev, "FISIC %08x\n", fisic); } if (selfdis) - ch->curr_mode = MVS_EDMA_OFF; + ch->curr_mode = MVS_EDMA_UNKNOWN; ATA_OUTL(ch->r_mem, EDMA_IEC, ~iec); /* Interface errors or Device error. */ if (iec & (0xfc1e9000 | EDMA_IE_EDEVERR)) { @@ -1117,7 +1118,6 @@ void *buf; bus_size_t size; - slot->dma.nsegs = 0; slot->state = MVS_SLOT_LOADING; if (ccb->ccb_h.func_code == XPT_ATA_IO) { buf = ccb->ataio.data_ptr; @@ -1247,7 +1247,11 @@ eprd[i].prdbah = htole32((segs[i].ds_addr >> 16) >> 16); } eprd[i - 1].bytecount |= htole32(MVS_EPRD_EOF); - slot->dma.nsegs = nsegs; + if (nsegs == 1) { + slot->dma.addr = segs[0].ds_addr; + slot->dma.len = segs[0].ds_len; + } else + slot->dma.addr = 0; bus_dmamap_sync(ch->dma.data_tag, slot->dma.data_map, ((slot->ccb->ccb_h.flags & CAM_DIR_IN) ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE)); @@ -1275,14 +1279,19 @@ if (ch->quirks & MVS_Q_GENIIE) { crqb2e = (struct mvs_crqb_gen2e *) (ch->dma.workrq + MVS_CRQB_OFFSET + (MVS_CRQB_SIZE * ch->out_idx)); - crqb2e->cprdbl = htole32(eprd); - crqb2e->cprdbh = htole32((eprd >> 16) >> 16); crqb2e->ctrlflg = htole32( ((ccb->ccb_h.flags & CAM_DIR_IN) ? MVS_CRQB2E_READ : 0) | (slot->tag << MVS_CRQB2E_DTAG_SHIFT) | (port << MVS_CRQB2E_PMP_SHIFT) | (slot->slot << MVS_CRQB2E_HTAG_SHIFT)); - crqb2e->drbc = 0; + /* If there is only one segment - no need to use S/G table. */ + if (slot->dma.addr != 0) { + eprd = slot->dma.addr; + crqb2e->ctrlflg |= htole32(MVS_CRQB2E_CPRD); + crqb2e->drbc = slot->dma.len; + } + crqb2e->cprdbl = htole32(eprd); + crqb2e->cprdbh = htole32((eprd >> 16) >> 16); crqb2e->cmd[0] = 0; crqb2e->cmd[1] = 0; crqb2e->cmd[2] = ccb->ataio.cmd.command; ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#7 (text+ko) ==== @@ -26,6 +26,8 @@ * $FreeBSD: src/sys/dev/mvs/mvs.h,v 1.11 2010/02/14 12:30:35 mav Exp $ */ +#include "mvs_if.h" + /* Chip registers */ #define CHIP_PCIEIC 0x1900 /* PCIe Interrupt Cause */ #define CHIP_PCIEIM 0x1910 /* PCIe Interrupt Mask */ @@ -40,7 +42,9 @@ #define IC_HC0 0x000001ff /* bits 0-8 = HC0 */ #define IC_HC_SHIFT 9 /* HC1 shift */ #define IC_HC1 (IC_HC0 << IC_HC_SHIFT) /* 9-17 = HC1 */ +#define IC_ERR_HC0 0x00000055 /* HC0 ERR_IRQ */ #define IC_DONE_HC0 0x000000aa /* HC0 DONE_IRQ */ +#define IC_ERR_HC1 (IC_ERR_HC0 << IC_HC_SHIFT) /* HC1 ERR_IRQ */ #define IC_DONE_HC1 (IC_DONE_HC0 << IC_HC_SHIFT) /* HC1 DONE_IRQ */ #define IC_HC0_COAL_DONE (1 << 8) /* HC0 IRQ coalescing */ #define IC_HC1_COAL_DONE (1 << 17) /* HC1 IRQ coalescing */ @@ -57,6 +61,13 @@ #define CHIP_SOC_LED 0x2C /* SoC LED Configuration */ +#define CHIP_ICC 0x18008 +#define CHIP_ICC_ALL_PORTS (1 << 4) /* all ports irq event */ +#define CHIP_ICT 0x180cc +#define CHIP_ITT 0x180d0 +#define CHIP_TRAN_COAL_CAUSE_LO 0x18088 +#define CHIP_TRAN_COAL_CAUSE_HI 0x1808c + /* Host Controller registers */ #define HC_SIZE 0x10000 #define HC_OFFSET 0x20000 @@ -448,7 +459,8 @@ struct ata_dmaslot { bus_dmamap_t data_map; /* Data DMA map */ - int nsegs; /* Number of segs loaded */ + bus_addr_t addr; /* Data address */ + uint16_t len; /* Data size */ }; /* structure holding DMA related information */ @@ -561,10 +573,13 @@ void *handle; int r_irq_rid; } irq; + struct mtx mtx; /* MIM access lock */ int quirks; int channels; int ccc; /* CCC timeout */ int cccc; /* CCC commands */ + int gmim; + int pmim; struct { void (*function)(void *); void *argument; ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_pci.c#2 (text+ko) ==== @@ -120,8 +120,19 @@ ctlr->ccc = 0; ctlr->cccc = 0; } - if (ctlr->ccc > 100) - ctlr->ccc = 100; + if (ctlr->ccc > 100000) + ctlr->ccc = 100000; + device_printf(dev, + "Gen-%s, %d %sGbps ports, Port Multiplier %s%s\n", + ((ctlr->quirks & MVS_Q_GENI) ? "I" : + ((ctlr->quirks & MVS_Q_GENII) ? "II" : "IIe")), + ctlr->channels, + ((ctlr->quirks & MVS_Q_GENI) ? "1.5" : "3"), + ((ctlr->quirks & MVS_Q_GENI) ? + "not supported" : "supported"), + ((ctlr->quirks & MVS_Q_GENIIE) ? + " with FBS" : "")); + mtx_init(&ctlr->mtx, "MVS controller lock", NULL, MTX_DEF); /* We should have a memory BAR(0). */ ctlr->r_rid = PCIR_BAR(0); if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, @@ -147,16 +158,6 @@ rman_fini(&ctlr->sc_iomem); return ENXIO; } - device_printf(dev, - "Gen-%s, %d %sGbps ports, Port Multiplier %s%s\n", - ((ctlr->quirks & MVS_Q_GENI) ? "I" : - ((ctlr->quirks & MVS_Q_GENII) ? "II" : "IIe")), - ctlr->channels, - ((ctlr->quirks & MVS_Q_GENI) ? "1.5" : "3"), - ((ctlr->quirks & MVS_Q_GENI) ? - "not supported" : "supported"), - ((ctlr->quirks & MVS_Q_GENIIE) ? - " with FBS" : "")); /* Attach all channels on this controller */ for (unit = 0; unit < ctlr->channels; unit++) { child = device_add_child(dev, "mvsch", -1); @@ -194,6 +195,7 @@ rman_fini(&ctlr->sc_iomem); if (ctlr->r_mem) bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); + mtx_destroy(&ctlr->mtx); return (0); } @@ -201,7 +203,7 @@ mvs_ctlr_setup(device_t dev) { struct mvs_controller *ctlr = device_get_softc(dev); - int i; + int i, ccc = ctlr->ccc, cccc = ctlr->cccc, ccim = 0; /* Mask chip interrupts */ ATA_OUTL(ctlr->r_mem, CHIP_MIM, 0x00000000); @@ -209,28 +211,58 @@ ATA_OUTL(ctlr->r_mem, CHIP_PCIIM, 0x00000000); /* Clear PCI interrupts */ ATA_OUTL(ctlr->r_mem, CHIP_PCIIC, 0x00000000); - /* Clear HC interrupts */ - for (i = 0; i < ctlr->channels / 4; i++) + if (ccc && bootverbose) { + device_printf(dev, + "CCC with %dus/%dcmd enabled\n", + ctlr->ccc, ctlr->cccc); + } + ccc *= 150; + /* Configure chip-global CCC */ + if (ctlr->channels > 4 && (ctlr->quirks & MVS_Q_GENI) == 0) { + ATA_OUTL(ctlr->r_mem, CHIP_ICT, cccc); + ATA_OUTL(ctlr->r_mem, CHIP_ITT, ccc); + ATA_OUTL(ctlr->r_mem, CHIP_ICC, ~CHIP_ICC_ALL_PORTS); + if (ccc) + ccim |= IC_ALL_PORTS_COAL_DONE; + ccc = 0; + cccc = 0; + } + for (i = 0; i < ctlr->channels / 4; i++) { + /* Configure per-HC CCC */ + ATA_OUTL(ctlr->r_mem, HC_BASE(i) + HC_ICT, cccc); + ATA_OUTL(ctlr->r_mem, HC_BASE(i) + HC_ITT, ccc); + if (ccc) + ccim |= (IC_HC0_COAL_DONE << (i * IC_HC_SHIFT)); + /* Clear HC interrupts */ ATA_OUTL(ctlr->r_mem, HC_BASE(i) + HC_IC, 0x00000000); - /* Configure CCC */ -#if 0 - if (ctlr->ccc) { - ATA_OUTL(ctlr->r_mem, HC_ICT, ctlr->cccc & HC_ICT_SAICOALT_MASK); - ATA_OUTL(ctlr->r_mem, HC_ITT, (ctlr->ccc * 150000) & HC_ITT_SAITMTH_MASK); - if (bootverbose) { - device_printf(dev, - "CCC with %dms/%dcmd enabled\n", - ctlr->ccc, ctlr->cccc); - } } -#endif /* Enable chip interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_MIM, IC_HC0 | IC_HC1 /*| IC_ALL_PORTS_COAL_DONE*/); + ctlr->gmim = (ccim ? ccim : (IC_DONE_HC0 | IC_DONE_HC1)) | + IC_ERR_HC0 | IC_ERR_HC1; + ATA_OUTL(ctlr->r_mem, CHIP_MIM, ctlr->gmim | ctlr->pmim); /* Enable PCI interrupts */ ATA_OUTL(ctlr->r_mem, CHIP_PCIIM, 0x007fffff); return (0); } +static void +mvs_edma(device_t dev, device_t child, int mode) +{ + struct mvs_controller *ctlr = device_get_softc(dev); + int unit = ((struct mvs_channel *)device_get_softc(child))->unit; + int bit = IC_DONE_IRQ << (unit * 2 + unit / 4) ; + + if (ctlr->ccc == 0) + return; + mtx_lock(&ctlr->mtx); + if (mode == MVS_EDMA_OFF) + ctlr->pmim |= bit; + else + ctlr->pmim &= ~bit; + ATA_OUTL(ctlr->r_mem, CHIP_MIM, ctlr->gmim | ctlr->pmim); + mtx_unlock(&ctlr->mtx); +} + static int mvs_suspend(device_t dev) { @@ -301,10 +333,10 @@ ic = ATA_INL(ctlr->r_mem, CHIP_MIC); //device_printf(ctlr->dev, "irq MIC:%08x\n", ic); if (ic & IC_ALL_PORTS_COAL_DONE) - ATA_OUTL(ctlr->r_mem, CHIP_MIC, ~IC_ALL_PORTS_COAL_DONE); + ATA_OUTL(ctlr->r_mem, CHIP_ICC, ~CHIP_ICC_ALL_PORTS); for (p = 0; p < ctlr->channels; p++) { if ((p & 3) == 0) { - if (p == 4) + if (p != 0) ic >>= 1; if ((ic & IC_HC0) == 0) { p += 3; @@ -438,6 +470,7 @@ DEVMETHOD(bus_release_resource, mvs_release_resource), DEVMETHOD(bus_setup_intr, mvs_setup_intr), DEVMETHOD(bus_teardown_intr,mvs_teardown_intr), + DEVMETHOD(mvs_edma, mvs_edma), { 0, 0 } }; static driver_t mvs_driver = { ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_soc.c#2 (text+ko) ==== @@ -112,8 +112,19 @@ ctlr->ccc = 0; ctlr->cccc = 0; } - if (ctlr->ccc > 100) - ctlr->ccc = 100; + if (ctlr->ccc > 100000) + ctlr->ccc = 100000; + device_printf(dev, + "Gen-%s, %d %sGbps ports, Port Multiplier %s%s\n", + ((ctlr->quirks & MVS_Q_GENI) ? "I" : + ((ctlr->quirks & MVS_Q_GENII) ? "II" : "IIe")), + ctlr->channels, + ((ctlr->quirks & MVS_Q_GENI) ? "1.5" : "3"), + ((ctlr->quirks & MVS_Q_GENI) ? + "not supported" : "supported"), + ((ctlr->quirks & MVS_Q_GENIIE) ? + " with FBS" : "")); + mtx_init(&ctlr->mtx, "MVS controller lock", NULL, MTX_DEF); /* We should have a memory BAR(0). */ ctlr->r_rid = 0; if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, @@ -139,16 +150,6 @@ rman_fini(&ctlr->sc_iomem); return ENXIO; } - device_printf(dev, - "Gen-%s, %d %sGbps ports, Port Multiplier %s%s\n", - ((ctlr->quirks & MVS_Q_GENI) ? "I" : - ((ctlr->quirks & MVS_Q_GENII) ? "II" : "IIe")), - ctlr->channels, - ((ctlr->quirks & MVS_Q_GENI) ? "1.5" : "3"), - ((ctlr->quirks & MVS_Q_GENI) ? - "not supported" : "supported"), - ((ctlr->quirks & MVS_Q_GENIIE) ? - " with FBS" : "")); /* Attach all channels on this controller */ for (unit = 0; unit < ctlr->channels; unit++) { child = device_add_child(dev, "mvsch", -1); @@ -185,6 +186,7 @@ rman_fini(&ctlr->sc_iomem); if (ctlr->r_mem) bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); + mtx_destroy(&ctlr->mtx); return (0); } @@ -192,6 +194,7 @@ mvs_ctlr_setup(device_t dev) { struct mvs_controller *ctlr = device_get_softc(dev); + int ccc = ctlr->ccc, cccc = ctlr->cccc, ccim = 0; /* Mask chip interrupts */ ATA_OUTL(ctlr->r_mem, CHIP_SOC_MIM, 0x00000000); @@ -199,23 +202,41 @@ ATA_OUTL(ctlr->r_mem, HC_IC, 0x00000000); /* Clear chip interrupts */ ATA_OUTL(ctlr->r_mem, CHIP_SOC_MIC, 0); - /* Configure CCC */ -#if 0 - if (ctlr->ccc) { - ATA_OUTL(ctlr->r_mem, HC_ICT, ctlr->cccc & HC_ICT_SAICOALT_MASK); - ATA_OUTL(ctlr->r_mem, HC_ITT, (ctlr->ccc * 150000) & HC_ITT_SAITMTH_MASK); - if (bootverbose) { - device_printf(dev, - "CCC with %dms/%dcmd enabled\n", - ctlr->ccc, ctlr->cccc); - } + /* Configure per-HC CCC */ + if (ccc && bootverbose) { + device_printf(dev, + "CCC with %dus/%dcmd enabled\n", + ctlr->ccc, ctlr->cccc); } -#endif + ccc *= 150; + ATA_OUTL(ctlr->r_mem, HC_ICT, cccc); + ATA_OUTL(ctlr->r_mem, HC_ITT, ccc); + if (ccc) + ccim |= IC_HC0_COAL_DONE; /* Enable chip interrupts */ - ATA_OUTL(ctlr->r_mem, CHIP_SOC_MIM, IC_HC0 | IC_HC1 /*| IC_ALL_PORTS_COAL_DONE*/); + ctlr->gmim = (ccc ? IC_HC0_COAL_DONE : IC_DONE_HC0) | IC_ERR_HC0; + ATA_OUTL(ctlr->r_mem, CHIP_SOC_MIM, ctlr->gmim | ctlr->pmim); return (0); } +static void +mvs_edma(device_t dev, device_t child, int mode) +{ + struct mvs_controller *ctlr = device_get_softc(dev); + int unit = ((struct mvs_channel *)device_get_softc(child))->unit; + int bit = IC_DONE_IRQ << (unit * 2); + + if (ctlr->ccc == 0) + return; + mtx_lock(&ctlr->mtx); + if (mode == MVS_EDMA_OFF) + ctlr->pmim |= bit; + else + ctlr->pmim &= ~bit; + ATA_OUTL(ctlr->r_mem, CHIP_SOC_MIM, ctlr->gmim | ctlr->pmim); + mtx_unlock(&ctlr->mtx); +} + static int mvs_suspend(device_t dev) { @@ -272,30 +293,21 @@ ic = ATA_INL(ctlr->r_mem, CHIP_SOC_MIC); //device_printf(ctlr->dev, "irq MIC:%08x\n", ic); - if (ic & IC_ALL_PORTS_COAL_DONE) - ATA_OUTL(ctlr->r_mem, CHIP_SOC_MIC, ~IC_ALL_PORTS_COAL_DONE); + if ((ic & IC_HC0) == 0) + return; + aic = 0; + if (ic & (IC_DONE_IRQ << 0)) + aic |= HC_IC_DONE(0) | HC_IC_DEV(0); + if (ic & (IC_DONE_IRQ << 2)) + aic |= HC_IC_DONE(1) | HC_IC_DEV(1); + if (ic & (IC_DONE_IRQ << 4)) + aic |= HC_IC_DONE(2) | HC_IC_DEV(2); + if (ic & (IC_DONE_IRQ << 6)) + aic |= HC_IC_DONE(3) | HC_IC_DEV(3); + if (ic & IC_HC0_COAL_DONE) + aic |= HC_IC_COAL; + ATA_OUTL(ctlr->r_mem, HC_IC, ~aic); for (p = 0; p < ctlr->channels; p++) { - if ((p & 3) == 0) { - if (p == 4) - ic >>= 1; - if ((ic & IC_HC0) == 0) { - p += 3; - ic >>= 8; - continue; - } - aic = 0; - if (ic & (IC_DONE_IRQ << 0)) - aic |= HC_IC_DONE(0) | HC_IC_DEV(0); - if (ic & (IC_DONE_IRQ << 2)) - aic |= HC_IC_DONE(1) | HC_IC_DEV(1); - if (ic & (IC_DONE_IRQ << 4)) - aic |= HC_IC_DONE(2) | HC_IC_DEV(2); - if (ic & (IC_DONE_IRQ << 6)) - aic |= HC_IC_DONE(3) | HC_IC_DEV(3); - if (ic & IC_HC0_COAL_DONE) - aic |= HC_IC_COAL; - ATA_OUTL(ctlr->r_mem, HC_IC, ~aic); - } arg.cause = ic & (IC_ERR_IRQ|IC_DONE_IRQ); if ((arg.cause != 0) && (function = ctlr->interrupt[p].function)) { @@ -410,6 +422,7 @@ DEVMETHOD(bus_release_resource, mvs_release_resource), DEVMETHOD(bus_setup_intr, mvs_setup_intr), DEVMETHOD(bus_teardown_intr,mvs_teardown_intr), + DEVMETHOD(mvs_edma, mvs_edma), { 0, 0 } }; static driver_t mvs_driver = { From owner-p4-projects@FreeBSD.ORG Fri Apr 23 12:04:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E8EE1065670; Fri, 23 Apr 2010 12:04:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 622EA1065677 for ; Fri, 23 Apr 2010 12:04:23 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4EC4C8FC13 for ; Fri, 23 Apr 2010 12:04:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3NC4NbP092784 for ; Fri, 23 Apr 2010 12:04:23 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3NC4NSF092782 for perforce@freebsd.org; Fri, 23 Apr 2010 12:04:23 GMT (envelope-from anchie@FreeBSD.org) Date: Fri, 23 Apr 2010 12:04:23 GMT Message-Id: <201004231204.o3NC4NSF092782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 12:04:23 -0000 http://p4web.freebsd.org/@@177258?ac=10 Change 177258 by anchie@anchie_malimis on 2010/04/23 12:03:46 Cleanup: code related to "SEND through rtsock", whitespaces, debug printfs, copyright. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/net/route.h#10 edit .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#24 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_input.c#6 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#27 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#15 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#42 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#20 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/net/route.h#10 (text+ko) ==== @@ -381,7 +381,6 @@ struct ifmultiaddr; void rt_ieee80211msg(struct ifnet *, int, void *, size_t); -void rt_securendmsg(struct ifnet *, int, void *, size_t); void rt_ifannouncemsg(struct ifnet *, int); void rt_ifmsg(struct ifnet *); void rt_missmsg(int, struct rt_addrinfo *, int, int); ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#24 (text+ko) ==== @@ -64,8 +64,6 @@ #ifdef INET6 #include #endif -#include -#include #if defined(INET) || defined(INET6) #ifdef SCTP @@ -1234,7 +1232,6 @@ sizeof(ifan->ifan_name)); ifan->ifan_what = what; } - return m; } ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_input.c#6 (text+ko) ==== @@ -104,7 +104,6 @@ #include #include #include -#include #ifdef IPSEC #include ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#27 (text+ko) ==== @@ -296,8 +296,6 @@ nd6_option_init(void *opt, int icmp6len, union nd_opts *ndopts) { -printf("XXX-AK: nd6.c: nd6_option_init(), icmp6len = %d\n", icmp6len); - bzero(ndopts, sizeof(*ndopts)); ndopts->nd_opts_search = (struct nd_opt_hdr *)opt; ndopts->nd_opts_last @@ -330,9 +328,7 @@ nd_opt = ndopts->nd_opts_search; /* make sure nd_opt_len is inside the buffer */ -printf("nd6.c: nd6_option(), nd_opt->nd_opt_len: %d\n", nd_opt->nd_opt_len); if ((caddr_t)&nd_opt->nd_opt_len >= (caddr_t)ndopts->nd_opts_last) { -printf("nd_opt->nd_opt_len >= ndopts->nd_opts_last\n"); bzero(ndopts, sizeof(*ndopts)); return NULL; } @@ -1995,10 +1991,8 @@ skip = 1; nd_type = (unsigned short *)(mtag + 1); /* Use the SEND socket */ - printf("send_sendso_input_hook\n"); - error = send_sendso_input_hook(V_send_so, m, SND_OUT, ip6len); - - return error; + return (send_sendso_input_hook(V_send_so, + m, SND_OUT, ip6len); } } ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#15 (text+ko) ==== @@ -400,8 +400,6 @@ caddr_t mac; struct route_in6 ro; -printf("nd6_ns_output \n"); - bzero(&ro, sizeof(ro)); if (IN6_IS_ADDR_MULTICAST(taddr6)) ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#42 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Ana Kukec + * Copyright (c) 2009-2010 Ana Kukec * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,146 +58,137 @@ static int send_output(struct mbuf *m, struct ifnet *ifp, int direction) { - struct ip6_hdr *ip6; - struct sockaddr_in6 dst; - struct icmp6_hdr *icmp6; - int icmp6len; + struct ip6_hdr *ip6; + struct sockaddr_in6 dst; + struct icmp6_hdr *icmp6; + int icmp6len; - /* - * Receive incoming (SEND-protected) or outgoing traffic - * (SEND-validated) from the SEND user space application. - * Outgoing packets are sent out using if_output(). - */ + /* + * Receive incoming (SEND-protected) or outgoing traffic + * (SEND-validated) from the SEND user space application. + * Outgoing packets are sent out using if_output(). + */ - switch (direction) { - case SND_IN: - /* XXX-BZ can there be extension headers? */ - if (m->m_len < (sizeof(struct ip6_hdr) + - sizeof(struct icmp6_hdr))) { - m = m_pullup(m, sizeof(struct ip6_hdr) + - sizeof(struct icmp6_hdr)); - if (!m) - return (ENOBUFS); - } + switch (direction) { + case SND_IN: + if (m->m_len < (sizeof(struct ip6_hdr) + + sizeof(struct icmp6_hdr))) { + m = m_pullup(m, sizeof(struct ip6_hdr) + + sizeof(struct icmp6_hdr)); + if (!m) + return (ENOBUFS); + } - /* Before passing off the mbuf record the proper interface. */ - m->m_pkthdr.rcvif = ifp; + /* Before passing off the mbuf record the proper interface. */ + m->m_pkthdr.rcvif = ifp; - if (m->m_flags & M_PKTHDR) - icmp6len = m->m_pkthdr.len - sizeof(struct ip6_hdr); - else - panic("Doh! not the first mbuf."); + if (m->m_flags & M_PKTHDR) + icmp6len = m->m_pkthdr.len - sizeof(struct ip6_hdr); + else + panic("Doh! not the first mbuf."); - ip6 = mtod(m, struct ip6_hdr *); - icmp6 = (struct icmp6_hdr *)(ip6 + 1); + ip6 = mtod(m, struct ip6_hdr *); + icmp6 = (struct icmp6_hdr *)(ip6 + 1); - /* - * Output the packet as icmp6.c:incpm6_input() would do. - * The mbuf is always consumed, so we do not have to - * care about that. - */ - switch (icmp6->icmp6_type) { - case ND_NEIGHBOR_SOLICIT: - nd6_ns_input(m, sizeof(struct ip6_hdr), icmp6len); - break; - case ND_NEIGHBOR_ADVERT: - nd6_na_input(m, sizeof(struct ip6_hdr), icmp6len); - break; - case ND_REDIRECT: - icmp6_redirect_input(m, sizeof(struct ip6_hdr)); - break; - case ND_ROUTER_SOLICIT: - nd6_rs_input(m, sizeof(struct ip6_hdr), icmp6len); - break; - case ND_ROUTER_ADVERT: - nd6_ra_input(m, sizeof(struct ip6_hdr), icmp6len); - break; - default: - printf("%s:%d: icmp6_code=%u\n", - __func__, __LINE__, icmp6->icmp6_code); - m_print(m, m->m_pkthdr.len); - return (ENOSYS); - } + /* + * Output the packet as icmp6.c:incpm6_input() would do. + * The mbuf is always consumed, so we do not have to + * care about that. + */ + switch (icmp6->icmp6_type) { + case ND_NEIGHBOR_SOLICIT: + nd6_ns_input(m, sizeof(struct ip6_hdr), icmp6len); + break; + case ND_NEIGHBOR_ADVERT: + nd6_na_input(m, sizeof(struct ip6_hdr), icmp6len); + break; + case ND_REDIRECT: + icmp6_redirect_input(m, sizeof(struct ip6_hdr)); + break; + case ND_ROUTER_SOLICIT: + nd6_rs_input(m, sizeof(struct ip6_hdr), icmp6len); + break; + case ND_ROUTER_ADVERT: + nd6_ra_input(m, sizeof(struct ip6_hdr), icmp6len); + break; + default: + return (ENOSYS); + } - /* - * No error returned from nd6_??_input() so the only thing - * we can do is to pretend that it worked. - */ - return (0); + /* + * No error returned from nd6_??_input() so the only thing + * we can do is to pretend that it worked. + */ + return (0); - case SND_OUT: - if (m->m_len < sizeof(struct ip6_hdr)) { - m = m_pullup(m, sizeof(struct ip6_hdr)); - if (!m) - return (ENOBUFS); - } - ip6 = mtod(m, struct ip6_hdr *); - if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) - m->m_flags |= M_MCAST; + case SND_OUT: + if (m->m_len < sizeof(struct ip6_hdr)) { + m = m_pullup(m, sizeof(struct ip6_hdr)); + if (!m) + return (ENOBUFS); + } + ip6 = mtod(m, struct ip6_hdr *); + if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) + m->m_flags |= M_MCAST; - bzero(&dst, sizeof(dst)); - dst.sin6_family = AF_INET6; - dst.sin6_len = sizeof(dst); - dst.sin6_addr = ip6->ip6_dst; + zero(&dst, sizeof(dst)); + dst.sin6_family = AF_INET6; + dst.sin6_len = sizeof(dst); + dst.sin6_addr = ip6->ip6_dst; - /* - * Output the packet as nd6.c:nd6_output_lle() would do. - * The mbuf is always consumed, so we do not have to care - * about that. - */ - return ((*ifp->if_output)(ifp, m, (struct sockaddr *)&dst, - NULL)); + /* + * Output the packet as nd6.c:nd6_output_lle() would do. + * The mbuf is always consumed, so we do not have to care + * about that. + */ + return ((*ifp->if_output)(ifp, m, (struct sockaddr *)&dst, + NULL)); - default: - panic("%s: direction must be either SND_IN or SND_OUT.", __func__); - } + default: + panic("%s: direction must be either SND_IN or SND_OUT.", __func__); + } } static int send_uattach(struct socket *so, int proto, struct thread *td) { - printf("send_uattach: proto = %d\n", proto); - if (V_send_so != NULL) - return (EEXIST); + if (V_send_so != NULL) + return (EEXIST); - /* XXX: Revisit this, hardocoded! This was a hack for PR_ATOMIC. */ - /* so->so_snd.sb_hiwat = 8192; */ + V_send_so = so; - V_send_so = so; - - return (0); + return (0); } static int sosend_rcv(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, - struct mbuf *control, struct thread *td) + struct mbuf *control, struct thread *td) { - struct ifnet *ifp; - struct snd_hdr *snd_hdr; + struct ifnet *ifp; + struct snd_hdr *snd_hdr; -printf("sosend_rcv, mbuf len: %d \n", m->m_len); + snd_hdr = mtod(m, struct snd_hdr *); - snd_hdr = mtod(m, struct snd_hdr *); + struct mbuf *m0; + m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); + if (m0 == NULL) { + m_freem(m); + return (ENOBUFS); + } + m_move_pkthdr(m, m0); - struct mbuf *m0; - m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); - if (m0 == NULL) { - m_freem(m); - return (ENOBUFS); - } - m_move_pkthdr(m, m0); + ifp = ifnet_byindex_ref(snd_hdr->ifidx); + m_adj(m, SEND_HDR_LEN); + m_fixhdr(m); + if (ifp) { + if (send_output(m, ifp, snd_hdr->direction)) + return (ENOENT); + if_rele(ifp); + } else + return (ENETUNREACH); - ifp = ifnet_byindex_ref(snd_hdr->ifidx); - m_adj(m, SEND_HDR_LEN); - m_fixhdr(m); - if (ifp) { - int error = send_output(m, ifp, snd_hdr->direction); - printf("error: %d\n", error); - if_rele(ifp); - return (0); - } else - return (ENETUNREACH); + return (0); } /* @@ -210,44 +201,38 @@ struct ip6_hdr *ip6; struct snd_hdr *snd_hdr = NULL; -printf("send_sendso_input \n"); - - /* - * Make sure to clear any possible internally embedded scope before - * passing the packet to userspace for SeND cryptographic signature - * validation to succeed. - */ - ip6 = mtod(m, struct ip6_hdr *); - in6_clearscope(&ip6->ip6_src); - in6_clearscope(&ip6->ip6_dst); - - len = m_length(m, NULL); - if (len != msglen) - printf("XXX-BZ %s: (m)len=%u (ip6)msglen=%d", __func__, len, msglen); + /* + * Make sure to clear any possible internally embedded scope before + * passing the packet to userspace for SeND cryptographic signature + * validation to succeed. + */ + ip6 = mtod(m, struct ip6_hdr *); + in6_clearscope(&ip6->ip6_src); + in6_clearscope(&ip6->ip6_dst); + + len = m_length(m, NULL); - m = m_prepend(m, SEND_HDR_LEN, M_PKTHDR|M_DONTWAIT); - if (m == NULL) { - printf("m_prepend() failed!\n"); - return (ENOBUFS); - } - snd_hdr = mtod(m, struct snd_hdr *); - snd_hdr->direction = direction; - snd_hdr->ifidx = -1; + m = m_prepend(m, SEND_HDR_LEN, M_PKTHDR|M_DONTWAIT); + if (m == NULL) { + return (ENOBUFS); + } + snd_hdr = mtod(m, struct snd_hdr *); + snd_hdr->direction = direction; + snd_hdr->ifidx = -1; - /* - * Send incoming or outgoing traffic to the user space either to be - * protected (outgoing) or validated (incoming) according to rfc3971. */ + /* + * Send incoming or outgoing traffic to the user space either to be + * protected (outgoing) or validated (incoming) according to rfc3971. + */ - if (s) { - SOCKBUF_LOCK(&s->so_rcv); - sbappendrecord_locked(&s->so_rcv, m); - sorwakeup_locked(s); - return 0; - } else { - m_freem(m); - return 0; - } + if (s) { + SOCKBUF_LOCK(&s->so_rcv); + sbappendrecord_locked(&s->so_rcv, m); + sorwakeup_locked(s); + return (0); + } + m_freem(m); return -1; } @@ -255,55 +240,56 @@ send_close(struct socket *so) { - if (V_send_so) - V_send_so = NULL; + if (V_send_so) + V_send_so = NULL; } struct pr_usrreqs send_usrreqs = { - .pru_attach = send_uattach, - .pru_send = sosend_rcv, - .pru_detach = send_close + .pru_attach = send_uattach, + .pru_send = sosend_rcv, + .pru_detach = send_close }; - struct protosw send_protosw = { - .pr_type = SOCK_RAW, - .pr_protocol = IPPROTO_SEND, - .pr_usrreqs = &send_usrreqs + .pr_type = SOCK_RAW, + .pr_protocol = IPPROTO_SEND, + .pr_usrreqs = &send_usrreqs }; static int send_modevent(module_t mod, int type, void *unused) { - int error = 0; + int error = 0; - /* Add locking? icmp6.c and nd6.c are maybe using hooks.. */ + /* Add locking? icmp6.c and nd6.c are maybe using hooks.. */ - switch (type) { - case MOD_LOAD: - error = pf_proto_register(PF_INET, &send_protosw); - if (error != 0) - break; - send_sendso_input_hook = send_sendso_input; - break; - case MOD_UNLOAD: - if (V_send_so != NULL) - return (EINVAL); - error = pf_proto_unregister(PF_INET, IPPROTO_SEND, SOCK_RAW); - send_sendso_input_hook = NULL; - break; + switch (type) { + case MOD_LOAD: + error = pf_proto_register(PF_INET, &send_protosw); + if (error != 0) + break; + send_sendso_input_hook = send_sendso_input; + break; + case MOD_UNLOAD: + if (V_send_so != NULL) + return (EINVAL); + error = pf_proto_unregister(PF_INET, IPPROTO_SEND, SOCK_RAW); + send_sendso_input_hook = NULL; + break; + default: + break; + } - default: - break; - } - return (error); + return (error); } static moduledata_t sendmod = { - "send", - send_modevent, - 0 + "send", + send_modevent, + 0 }; DECLARE_MODULE(send, sendmod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); + + ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#20 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Ana Kukec + * Copyright (c) 2009-2010 Ana Kukec * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,8 +30,8 @@ #define SEND_HDR_LEN sizeof(struct snd_hdr) struct snd_hdr { - int direction; - int ifidx; + int direction; + int ifidx; }; extern int (*send_sendso_input_hook)(struct socket *, struct mbuf *, int, int); From owner-p4-projects@FreeBSD.ORG Fri Apr 23 12:07:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0855D1065674; Fri, 23 Apr 2010 12:07:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7F6F106566C for ; Fri, 23 Apr 2010 12:07:26 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95B488FC13 for ; Fri, 23 Apr 2010 12:07:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3NC7Qeo093134 for ; Fri, 23 Apr 2010 12:07:26 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3NC7QrM093132 for perforce@freebsd.org; Fri, 23 Apr 2010 12:07:26 GMT (envelope-from mav@freebsd.org) Date: Fri, 23 Apr 2010 12:07:26 GMT Message-Id: <201004231207.o3NC7QrM093132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 12:07:27 -0000 http://p4web.freebsd.org/@@177259?ac=10 Change 177259 by mav@mav_mavbook on 2010/04/23 12:06:27 Fix build on ARM and do some cleanup. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#11 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_pci.c#3 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_soc.c#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#11 (text+ko) ==== @@ -449,7 +449,7 @@ if (ch->pm_present) { ecfg |= EDMA_CFG_EMASKRXPM; if (ch->quirks & MVS_Q_GENIIE) { - ecfg |= EDMA_CFG_EEDMAFBS;// | EDMA_CFG_EDMAFBS; + ecfg |= EDMA_CFG_EEDMAFBS; ch->fbs_enabled = 1; } } @@ -496,6 +496,7 @@ ATA_OUTL(ch->r_mem, EDMA_CMD, EDMA_CMD_EENEDMA); } +devclass_t mvs_devclass; devclass_t mvsch_devclass; static device_method_t mvsch_methods[] = { DEVMETHOD(device_probe, mvs_ch_probe), @@ -753,13 +754,8 @@ /* Wait a bit for late !BUSY status update. */ if (status & ATA_S_BUSY) { DELAY(100); - if ((status = mvs_getstatus(dev, 1)) & ATA_S_BUSY) { - DELAY(200); - if ((status = mvs_getstatus(dev, 1)) & ATA_S_BUSY) { -device_printf(dev, "device busy on intr, Status %02x\n", status); - return; - } - } + if ((status = mvs_getstatus(dev, 1)) & ATA_S_BUSY) + return; } /* if we got an error we are done with the HW */ if (status & ATA_S_ERROR) { @@ -823,18 +819,6 @@ case ATAPI_P_CMDOUT: device_printf(dev, "ATAPI CMDOUT\n"); - /* this seems to be needed for some (slow) devices */ - DELAY(10); - - if (!(status & ATA_S_DRQ)) { - device_printf(dev, "command interrupt without DRQ\n"); - et = MVS_ERR_TFE; - goto end_finished; - } - ATA_OUTSW_STRM(ch->r_mem, ATA_DATA, - (uint16_t *)((ccb->ccb_h.flags & CAM_CDB_POINTER) ? - ccb->csio.cdb_io.cdb_ptr : ccb->csio.cdb_io.cdb_bytes), - ch->curr[port].atapi / 2); /* return wait for interrupt */ return; @@ -1208,7 +1192,6 @@ mvs_end_transaction(slot, MVS_ERR_TIMEOUT); return; } - DELAY(20); ATA_OUTSW_STRM(ch->r_mem, ATA_DATA, (uint16_t *)((ccb->ccb_h.flags & CAM_CDB_POINTER) ? ccb->csio.cdb_io.cdb_ptr : ccb->csio.cdb_io.cdb_bytes), ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#8 (text+ko) ==== @@ -602,6 +602,8 @@ u_int cause; }; +extern devclass_t mvs_devclass; + /* macros to hide busspace uglyness */ #define ATA_INB(res, offset) \ bus_read_1((res), (offset)) ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_pci.c#3 (text+ko) ==== @@ -458,7 +458,6 @@ return (retval); } -devclass_t mvs_devclass; static device_method_t mvs_methods[] = { DEVMETHOD(device_probe, mvs_probe), DEVMETHOD(device_attach, mvs_attach), ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_soc.c#3 (text+ko) ==== @@ -410,7 +410,6 @@ return (retval); } -devclass_t mvs_devclass; static device_method_t mvs_methods[] = { DEVMETHOD(device_probe, mvs_probe), DEVMETHOD(device_attach, mvs_attach), From owner-p4-projects@FreeBSD.ORG Fri Apr 23 12:36:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D66C41065673; Fri, 23 Apr 2010 12:36:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 999CD1065670 for ; Fri, 23 Apr 2010 12:36:57 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 858E28FC08 for ; Fri, 23 Apr 2010 12:36:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3NCavkX095318 for ; Fri, 23 Apr 2010 12:36:57 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3NCauBs095311 for perforce@freebsd.org; Fri, 23 Apr 2010 12:36:56 GMT (envelope-from anchie@FreeBSD.org) Date: Fri, 23 Apr 2010 12:36:56 GMT Message-Id: <201004231236.o3NCauBs095311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 12:36:58 -0000 http://p4web.freebsd.org/@@177260?ac=10 Change 177260 by anchie@anchie_malimis on 2010/04/23 12:36:04 IFC @177259 Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DB-78XXX#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DB-88F5XXX#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DB-88F6XXX#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/HL200#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/KB920X#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/LN2410SBC#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/SHEEVAPLUG#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/bus.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/autoload.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/bootinfo.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/conf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/devicename.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/efimd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/elf32_freebsd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/exec.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/i386_copy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/ldscript.amd64#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/ldscript.i386#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/reloc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/start.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/efi/version#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_util.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/NOTES#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.mips#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/changes.txt#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/common/dmextern.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslstubs.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/asltypes.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evgpe.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evxface.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evxfevnt.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exdebug.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exmutex.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exoparg2.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exregion.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acevents.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acexcep.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acglobal.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acpixf.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/actables.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/parser/psxface.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbutils.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbxface.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/iwn/LICENSE#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ddb/db_sym.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_lid.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/age/if_age.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ahci/ahci.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/alc/if_alc.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ale/if_ale.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/chipsets/ata-acerlabs.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwi/if_bwi.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwi/if_bwivar.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwn.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwnvar.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/r600_blit.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/r600_cp.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/radeon_cs.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/via_dma.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/via_map.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/via_mm.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_lem.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/fb/vesa.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/pmc_events.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/iwn/if_iwnreg.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/re/if_re.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sge/if_sge.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/sge/if_sgereg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/siis/siis.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sis/if_sis.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/logo/beastie.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/logo/logo.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/uart/uart_cpu_sparc64.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/uss820dci.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/atp.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/uhid.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/ukbd.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/ums.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_aue.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_cue.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_kue.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_rue.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/ubsa.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uftdi.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/ulpt.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/umoscom.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/usb_serial.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uvisor.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uvscom.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_compat_linux.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_debug.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_dev.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_freebsd.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_generic.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_hub.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_run.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_runvar.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_urtw.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/coda.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_commonport.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_var.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfsclstate.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clbio.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clstate.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clvnops.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdport.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_ioctl.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_mount.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_node.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_subr.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_smb.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_subr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_subr.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_io.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_subr.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_vfs.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_if.m#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/sched/README#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/geom/sched/g_sched.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/geom/sched/g_sched.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/geom/sched/gs_rr.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/geom/sched/gs_scheduler.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/geom/sched/subr_disk.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/mca.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/pal.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/init_main.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_proc.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_bus.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/tty_pts.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/libkern/iconv.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/libkern/iconv_converter_if.m#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/libkern/iconv_xlat.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/libkern/strcasecmp.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/atheros/if_arge.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/asm_octeon.S#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/files.octeon1#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_machdep.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_mp.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_pcmap_regs.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/SWARM#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/XLR#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/_inttypes.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/_limits.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/archtype.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/asm.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/bus.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpu.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpufunc.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpuregs.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/db_machdep.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/defs.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/param.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/pcb.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/pmap.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/proc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/profile.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/psl.h#3 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/pte.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/queue.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/regnum.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/rm7000.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/segments.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/sf_buf.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/trap.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/vmparam.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/malta/gt_pci.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/autoconf.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/busdma_machdep.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/copystr.S#3 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/exception.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/fp.S#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/genassym.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/locore.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mem.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mp_machdep.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mpboot.S#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/nexus.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/psraccess.S#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/support.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/swtch.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/tick.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/tlb.S#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/trap.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/uio_machdep.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/clock.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#12 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/cyclic/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/geom/Makefile#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/geom/geom_sched/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/modules/geom/geom_sched/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/modules/geom/geom_sched/gs_sched/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/modules/geom/geom_sched/gsched_rr/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/modules/iwnfw/iwn6000/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/sge/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/syscons/beastie/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/wlan/Makefile#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_clone.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_llatbl.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/vnet.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/vnet.h#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_amrr.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_crypto_tkip.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_ratectl.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_ratectl.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_rssadapt.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_rssadapt.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_pipe.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_pipe.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/in.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched_rr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched_wf2q.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_dn_glue.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_dn_io.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_dn_private.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_dummynet.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_pfil.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_private.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_sockopt.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctputil.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctputil.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/mld6.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#28 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/key.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_file.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_lib.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_login.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_ncp.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_ncp.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_nls.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_nls.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_rcfile.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_rq.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_subr.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netncp/ncp_user.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/netbios.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_dev.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_tran.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_trantcp.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netsmb/smb_usr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/conf/MPC85XX#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/ofw/ofw_real.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/dcr.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/lsu.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/sbbc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/dtrace_bsd.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/iconv.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/mchain.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/proc.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/thr.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/teken/teken.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/memguard.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/memguard.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/pmap.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/swap_pager.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_contig.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_extern.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_fault.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_glue.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_kern.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_map.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_map.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_object.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/clock.c#2 integrate Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.21 2009/11/23 22:23:19 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.22 2010/04/22 23:47:19 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -419,62 +419,77 @@ break; case BPF_JMP|BPF_JA: - JMP(stream.refs[stream.bpf_pc + ins->k] - - stream.refs[stream.bpf_pc]); + JUMP(ins->k); break; case BPF_JMP|BPF_JGT|BPF_K: - if (ins->jt == 0 && ins->jf == 0) + if (ins->jt == ins->jf) { + JUMP(ins->jt); break; + } CMPid(ins->k, EAX); JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: - if (ins->jt == 0 && ins->jf == 0) + if (ins->jt == ins->jf) { + JUMP(ins->jt); break; + } CMPid(ins->k, EAX); JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: - if (ins->jt == 0 && ins->jf == 0) + if (ins->jt == ins->jf) { + JUMP(ins->jt); break; + } CMPid(ins->k, EAX); JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - if (ins->jt == 0 && ins->jf == 0) + if (ins->jt == ins->jf) { + JUMP(ins->jt); break; + } TESTid(ins->k, EAX); JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: - if (ins->jt == 0 && ins->jf == 0) + if (ins->jt == ins->jf) { + JUMP(ins->jt); break; + } CMPrd(EDX, EAX); JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: - if (ins->jt == 0 && ins->jf == 0) + if (ins->jt == ins->jf) { + JUMP(ins->jt); break; + } CMPrd(EDX, EAX); JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_X: - if (ins->jt == 0 && ins->jf == 0) + if (ins->jt == ins->jf) { + JUMP(ins->jt); break; + } CMPrd(EDX, EAX); JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_X: - if (ins->jt == 0 && ins->jf == 0) + if (ins->jt == ins->jf) { + JUMP(ins->jt); break; + } TESTrd(EDX, EAX); JCC(JNE, JE); break; ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/bpf_jit_machdep.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.14 2009/11/23 22:23:19 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.15 2010/04/22 23:47:19 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -473,4 +473,10 @@ } \ } while (0) +#define JUMP(off) do { \ + if ((off) != 0) \ + JMP(stream.refs[stream.bpf_pc + (off)] - \ + stream.refs[stream.bpf_pc]); \ +} while (0) + #endif /* _BPF_JIT_MACHDEP_H_ */ ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/exception.S#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.142 2010/03/11 14:49:06 nwhitehorn Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.144 2010/04/14 20:04:55 kib Exp $ */ #include "opt_atpic.h" @@ -668,7 +668,8 @@ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx - wrmsr + .globl ld_fsbase +ld_fsbase: wrmsr 1: /* Restore %gs and gsbase */ movw TF_GS(%rsp),%si @@ -685,7 +686,8 @@ movl $MSR_KGSBASE,%ecx movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx - wrmsr + .globl ld_gsbase +ld_gsbase: wrmsr 1: .globl ld_es ld_es: movw TF_ES(%rsp),%es .globl ld_ds @@ -798,6 +800,29 @@ call trap movw $KUG32SEL,TF_GS(%rsp) jmp doreti + + ALIGN_TEXT + .globl fsbase_load_fault +fsbase_load_fault: + movl $T_PROTFLT,TF_TRAPNO(%rsp) + movq %rsp, %rdi + call trap + movq PCPU(CURTHREAD),%r8 + movq TD_PCB(%r8),%r8 + movq $0,PCB_FSBASE(%r8) + jmp doreti + + ALIGN_TEXT + .globl gsbase_load_fault +gsbase_load_fault: + movl $T_PROTFLT,TF_TRAPNO(%rsp) + movq %rsp, %rdi + call trap + movq PCPU(CURTHREAD),%r8 + movq TD_PCB(%r8),%r8 + movq $0,PCB_GSBASE(%r8) + jmp doreti + #ifdef HWPMC_HOOKS ENTRY(end_exceptions) #endif ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/local_apic.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.65 2010/03/29 19:13:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.66 2010/04/20 17:03:30 rpaulo Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -70,7 +70,7 @@ #ifdef KDTRACE_HOOKS #include -cyclic_clock_func_t lapic_cyclic_clock_func[MAXCPU]; +cyclic_clock_func_t cyclic_clock_func[MAXCPU]; #endif /* Sanity checks on IDT vectors. */ @@ -778,8 +778,8 @@ * timers. */ int cpu = PCPU_GET(cpuid); - if (lapic_cyclic_clock_func[cpu] != NULL) - (*lapic_cyclic_clock_func[cpu])(frame); + if (cyclic_clock_func[cpu] != NULL) + (*cyclic_clock_func[cpu])(frame); #endif /* Fire hardclock at hz. */ ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.715 2010/03/25 14:24:00 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.716 2010/04/13 10:12:58 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -424,13 +424,14 @@ error = copyin(uap->sigcntxp, &uc, sizeof(uc)); if (error != 0) { - printf("sigreturn (pid %d): copyin failed\n", p->p_pid); + uprintf("pid %d (%s): sigreturn copyin failed\n", + p->p_pid, td->td_name); return (error); } ucp = &uc; if ((ucp->uc_mcontext.mc_flags & ~_MC_FLAG_MASK) != 0) { - printf("sigreturn (pid %d): mc_flags %x\n", p->p_pid, - ucp->uc_mcontext.mc_flags); + uprintf("pid %d (%s): sigreturn mc_flags %x\n", p->p_pid, + td->td_name, ucp->uc_mcontext.mc_flags); return (EINVAL); } regs = td->td_frame; @@ -449,8 +450,8 @@ * one less debugger trap, so allowing it is fairly harmless. */ if (!EFL_SECURE(rflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) { - printf("sigreturn (pid %d): rflags = 0x%lx\n", p->p_pid, - rflags); + uprintf("pid %d (%s): sigreturn rflags = 0x%lx\n", p->p_pid, + td->td_name, rflags); return (EINVAL); } @@ -461,7 +462,8 @@ */ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { - printf("sigreturn (pid %d): cs = 0x%x\n", p->p_pid, cs); + uprintf("pid %d (%s): sigreturn cs = 0x%x\n", p->p_pid, + td->td_name, cs); ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGBUS; ksi.ksi_code = BUS_OBJERR; @@ -473,7 +475,8 @@ ret = set_fpcontext(td, &ucp->uc_mcontext); if (ret != 0) { - printf("sigreturn (pid %d): set_fpcontext\n", p->p_pid); + uprintf("pid %d (%s): sigreturn set_fpcontext err %d\n", + p->p_pid, td->td_name, ret); return (ret); } bcopy(&ucp->uc_mcontext.mc_rdi, regs, sizeof(*regs)); ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.339 2010/01/23 11:45:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.341 2010/04/13 10:12:58 kib Exp $"); /* * AMD64 Trap and System call handling @@ -303,7 +303,7 @@ * enabled later. */ if (ISPL(frame->tf_cs) == SEL_UPL) - printf( + uprintf( "pid %ld (%s): trap %d with interrupts disabled\n", (long)curproc->p_pid, curthread->td_name, type); else if (type != T_NMI && type != T_BPTFLT && @@ -566,6 +566,14 @@ frame->tf_gs = _ugssel; goto out; } + if (frame->tf_rip == (long)ld_gsbase) { + frame->tf_rip = (long)gsbase_load_fault; + goto out; + } + if (frame->tf_rip == (long)ld_fsbase) { + frame->tf_rip = (long)fsbase_load_fault; + goto out; + } if (PCPU_GET(curpcb)->pcb_onfault != NULL) { frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.541 2010/03/13 09:21:00 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.543 2010/04/22 21:31:34 thompsa Exp $ cpu HAMMER ident GENERIC @@ -224,6 +224,7 @@ device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') +device sge # Silicon Integrated Systems SiS190/191 device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) @@ -280,6 +281,7 @@ device bpf # Berkeley packet filter # USB support +#options USB_DEBUG # enable debug msgs device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface device ehci # EHCI PCI->USB interface (USB 2.0) ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_signal.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.25 2010/03/25 14:24:00 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.27 2010/04/21 11:17:16 kib Exp $"); #include "opt_compat.h" @@ -141,9 +141,11 @@ mcp->mc_esi = tp->tf_rsi; mcp->mc_ebp = tp->tf_rbp; mcp->mc_isp = tp->tf_rsp; + mcp->mc_eflags = tp->tf_rflags; if (flags & GET_MC_CLEAR_RET) { mcp->mc_eax = 0; mcp->mc_edx = 0; + mcp->mc_eflags &= ~PSL_C; } else { mcp->mc_eax = tp->tf_rax; mcp->mc_edx = tp->tf_rdx; @@ -152,7 +154,6 @@ mcp->mc_ecx = tp->tf_rcx; mcp->mc_eip = tp->tf_rip; mcp->mc_cs = tp->tf_cs; - mcp->mc_eflags = tp->tf_rflags; mcp->mc_esp = tp->tf_rsp; mcp->mc_ss = tp->tf_ss; mcp->mc_len = sizeof(*mcp); @@ -565,7 +566,8 @@ * one less debugger trap, so allowing it is fairly harmless. */ if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) { - printf("freebsd4_freebsd32_sigreturn: eflags = 0x%x\n", eflags); + uprintf("pid %d (%s): freebsd4_freebsd32_sigreturn eflags = 0x%x\n", + td->td_proc->p_pid, td->td_name, eflags); return (EINVAL); } @@ -576,7 +578,8 @@ */ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { - printf("freebsd4_sigreturn: cs = 0x%x\n", cs); + uprintf("pid %d (%s): freebsd4_sigreturn cs = 0x%x\n", + td->td_proc->p_pid, td->td_name, cs); ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGBUS; ksi.ksi_code = BUS_OBJERR; @@ -647,7 +650,8 @@ * one less debugger trap, so allowing it is fairly harmless. */ if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) { - printf("freebsd32_sigreturn: eflags = 0x%x\n", eflags); + uprintf("pid %d (%s): freebsd32_sigreturn eflags = 0x%x\n", + td->td_proc->p_pid, td->td_name, eflags); return (EINVAL); } @@ -658,7 +662,8 @@ */ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { - printf("sigreturn: cs = 0x%x\n", cs); + uprintf("pid %d (%s): sigreturn cs = 0x%x\n", + td->td_proc->p_pid, td->td_name, cs); ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGBUS; ksi.ksi_code = BUS_OBJERR; ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/md_var.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.88 2010/03/09 03:30:31 alc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.89 2010/04/10 18:38:11 kib Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -83,10 +83,14 @@ void ld_es(void) __asm(__STRING(ld_es)); void ld_fs(void) __asm(__STRING(ld_fs)); void ld_gs(void) __asm(__STRING(ld_gs)); +void ld_fsbase(void) __asm(__STRING(ld_fsbase)); +void ld_gsbase(void) __asm(__STRING(ld_gsbase)); void ds_load_fault(void) __asm(__STRING(ds_load_fault)); void es_load_fault(void) __asm(__STRING(es_load_fault)); void fs_load_fault(void) __asm(__STRING(fs_load_fault)); void gs_load_fault(void) __asm(__STRING(gs_load_fault)); +void fsbase_load_fault(void) __asm(__STRING(fsbase_load_fault)); +void gsbase_load_fault(void) __asm(__STRING(gsbase_load_fault)); void dump_add_page(vm_paddr_t); void dump_drop_page(vm_paddr_t); void initializecpu(void); ==== //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DB-78XXX#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for Marvell DB-78xx boards. # -# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.7 2010/02/10 16:30:04 attilio Exp $ +# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.8 2010/04/22 21:31:34 thompsa Exp $ # ident DB-88F78XX @@ -67,6 +67,7 @@ device bpf # USB +options USB_DEBUG # enable debug msgs device usb device ehci device umass ==== //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DB-88F5XXX#4 (text+ko) ==== @@ -1,7 +1,7 @@ # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 23 16:55:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60C0E1065672; Fri, 23 Apr 2010 16:55:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 246A3106566C for ; Fri, 23 Apr 2010 16:55:18 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 104838FC0C for ; Fri, 23 Apr 2010 16:55:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3NGtHbf043435 for ; Fri, 23 Apr 2010 16:55:17 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3NGtGJg043429 for perforce@freebsd.org; Fri, 23 Apr 2010 16:55:16 GMT (envelope-from zec@fer.hr) Date: Fri, 23 Apr 2010 16:55:16 GMT Message-Id: <201004231655.o3NGtGJg043429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 16:55:18 -0000 http://p4web.freebsd.org/@@177268?ac=10 Change 177268 by zec@zec_tpx32 on 2010/04/23 16:55:09 IFC @ 177267 Affected files ... .. //depot/projects/vimage/src/share/man/man3/sysexits.3#3 integrate .. //depot/projects/vimage/src/share/man/man3/tgmath.3#2 integrate .. //depot/projects/vimage/src/share/man/man4/Makefile#19 integrate .. //depot/projects/vimage/src/share/man/man4/altq.4#10 integrate .. //depot/projects/vimage/src/share/man/man4/audit.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/auditpipe.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/coda.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/gbde.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/geom.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/geom_fox.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/geom_linux_lvm.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/geom_uzip.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ipw.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/iscsi_initiator.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/iwi.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/iwn.4#5 integrate .. //depot/projects/vimage/src/share/man/man4/kbdmux.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ktr.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/lp.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac_bsdextended.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac_lomac.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/mac_none.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac_stub.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mac_test.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/miibus.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/netintro.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/orm.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ral.4#5 integrate .. //depot/projects/vimage/src/share/man/man4/rp.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/rum.4#5 integrate .. //depot/projects/vimage/src/share/man/man4/run.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/sge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/si.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/tap.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/uhso.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/upgt.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ural.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/vkbd.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/vlan.4#5 integrate .. //depot/projects/vimage/src/share/man/man4/wpi.4#3 integrate .. //depot/projects/vimage/src/share/man/man5/ar.5#3 integrate .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/vimage/src/share/man/man7/clocks.7#2 integrate .. //depot/projects/vimage/src/share/man/man7/maclabel.7#2 integrate .. //depot/projects/vimage/src/share/man/man8/picobsd.8#3 integrate .. //depot/projects/vimage/src/share/man/man8/rescue.8#2 integrate .. //depot/projects/vimage/src/share/man/man9/CTASSERT.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/DELAY.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/KASSERT.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VFS.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_CHECKEXP.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_FHTOVP.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_MOUNT.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_QUOTACTL.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_ROOT.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_STATFS.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_SYNC.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_UNMOUNT.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_VGET.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_ACCESS.9#6 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_ACLCHECK.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_ADVLOCK.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_BWRITE.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_CREATE.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_FSYNC.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_GETACL.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_GETEXTATTR.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_GETPAGES.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_GETVOBJECT.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_INACTIVE.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_IOCTL.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_LINK.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_LISTEXTATTR.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_LOCK.9#4 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_LOOKUP.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_OPENCLOSE.9#4 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_PATHCONF.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_PRINT.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_RDWR.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_READDIR.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_READLINK.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_REALLOCBLKS.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_REMOVE.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_RENAME.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_REVOKE.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_SETACL.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_SETEXTATTR.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_STRATEGY.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#4 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_VPTOFH.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/accept_filter.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/accf_data.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/accf_dns.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/accf_http.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/acl.9#5 integrate .. //depot/projects/vimage/src/share/man/man9/atomic.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/cr_cansee.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/cr_seeothergids.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/cr_seeotheruids.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/devfs_set_cdevpriv.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/devtoname.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/extattr.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/firmware.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/hexdump.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/ifnet.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/make_dev.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/namei.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/p_candebug.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/p_cansee.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/pfind.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/pgfind.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/prison_check.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/random.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/rijndael.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/rtentry.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/sleep.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/spl.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/uio.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/usbdi.9#4 integrate .. //depot/projects/vimage/src/share/man/man9/vaccess.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/vaccess_acl_nfs4.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/vaccess_acl_posix1e.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/vcount.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/vget.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/vm_map_entry_resize_free.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/vnode.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/vput.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/vref.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/vrefcnt.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/vrele.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#14 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#26 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#26 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#19 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#38 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#11 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-78XXX#8 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F5XXX#8 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F6XXX#8 integrate .. //depot/projects/vimage/src/sys/arm/conf/HL200#10 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#15 integrate .. //depot/projects/vimage/src/sys/arm/conf/LN2410SBC#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/SHEEVAPLUG#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#25 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_cd.c#11 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#10 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#18 integrate .. //depot/projects/vimage/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 delete .. //depot/projects/vimage/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32.h#6 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#28 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_util.h#4 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#43 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#65 integrate .. //depot/projects/vimage/src/sys/conf/files#82 integrate .. //depot/projects/vimage/src/sys/conf/files.mips#8 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#18 integrate .. //depot/projects/vimage/src/sys/conf/kmod.mk#14 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_compat.h#8 integrate .. //depot/projects/vimage/src/sys/ddb/db_sym.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac.c#16 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_cam.c#9 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_debug.c#5 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#12 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aac/aacreg.h#6 integrate .. //depot/projects/vimage/src/sys/dev/aac/aacvar.h#8 integrate .. //depot/projects/vimage/src/sys/dev/age/if_age.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ahci/ahci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/alc/if_alc.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ale/if_ale.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/ati_pcigart.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#14 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#11 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_context.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#19 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_hashtab.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_memory.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_mm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_sman.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_sysctl.c#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_vm.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#14 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_dma.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_dma.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_warp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_blit.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_cp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#14 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_cs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_state.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/via_dma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/via_map.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/via_mm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#20 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#17 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#21 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_core.c#9 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/pmc_events.h#12 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#19 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipwvar.h#7 integrate .. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#15 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#15 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#23 integrate .. //depot/projects/vimage/src/sys/dev/mii/truephy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#24 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#22 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#15 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#15 integrate .. //depot/projects/vimage/src/sys/dev/sge/if_sge.c#1 branch .. //depot/projects/vimage/src/sys/dev/sge/if_sgereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/siis/siis.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sis/if_sis.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#21 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#16 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/atp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#13 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#13 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#14 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#14 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#14 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#17 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#20 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#17 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_freebsd.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#19 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#18 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#57 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#14 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_run.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#14 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#18 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#10 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_int.h#5 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonport.c#6 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_var.h#7 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfsclstate.h#2 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs.h#4 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clbio.c#9 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clnode.c#5 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clport.c#6 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clrpcops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clstate.c#9 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvnops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#17 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#10 integrate .. //depot/projects/vimage/src/sys/geom/geom_io.c#12 integrate .. //depot/projects/vimage/src/sys/geom/geom_subr.c#14 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#22 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#11 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#13 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#14 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_if.m#8 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_mbr.c#8 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#10 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_vtoc8.c#7 integrate .. //depot/projects/vimage/src/sys/geom/sched/README#1 branch .. //depot/projects/vimage/src/sys/geom/sched/g_sched.c#1 branch .. //depot/projects/vimage/src/sys/geom/sched/g_sched.h#1 branch .. //depot/projects/vimage/src/sys/geom/sched/gs_rr.c#1 branch .. //depot/projects/vimage/src/sys/geom/sched/gs_scheduler.h#1 branch .. //depot/projects/vimage/src/sys/geom/sched/subr_disk.c#1 branch .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#41 integrate .. //depot/projects/vimage/src/sys/i386/conf/XBOX#11 integrate .. //depot/projects/vimage/src/sys/i386/i386/bpf_jit_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/i386/i386/bpf_jit_machdep.h#7 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#26 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#20 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#18 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/mca.c#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/mp_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/ia64/include/mca.h#4 integrate .. //depot/projects/vimage/src/sys/ia64/include/pal.h#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_clock.c#24 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#32 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#31 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#18 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#26 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#31 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#36 integrate .. //depot/projects/vimage/src/sys/mips/cavium/asm_octeon.S#2 integrate .. //depot/projects/vimage/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 delete .. //depot/projects/vimage/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#2 integrate .. //depot/projects/vimage/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#3 integrate .. //depot/projects/vimage/src/sys/mips/cavium/files.octeon1#2 integrate .. //depot/projects/vimage/src/sys/mips/cavium/octeon_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/mips/cavium/octeon_mp.c#1 branch .. //depot/projects/vimage/src/sys/mips/cavium/octeon_pcmap_regs.h#3 integrate .. //depot/projects/vimage/src/sys/mips/conf/SENTRY5#8 integrate .. //depot/projects/vimage/src/sys/mips/conf/SWARM#2 integrate .. //depot/projects/vimage/src/sys/mips/conf/XLR#2 integrate .. //depot/projects/vimage/src/sys/mips/include/_inttypes.h#3 integrate .. //depot/projects/vimage/src/sys/mips/include/_limits.h#2 integrate .. //depot/projects/vimage/src/sys/mips/include/archtype.h#2 delete .. //depot/projects/vimage/src/sys/mips/include/asm.h#3 integrate .. //depot/projects/vimage/src/sys/mips/include/cpu.h#4 integrate .. //depot/projects/vimage/src/sys/mips/include/cpufunc.h#4 integrate .. //depot/projects/vimage/src/sys/mips/include/cpuregs.h#4 integrate .. //depot/projects/vimage/src/sys/mips/include/db_machdep.h#4 integrate .. //depot/projects/vimage/src/sys/mips/include/defs.h#2 delete .. //depot/projects/vimage/src/sys/mips/include/param.h#8 integrate .. //depot/projects/vimage/src/sys/mips/include/pcb.h#3 integrate .. //depot/projects/vimage/src/sys/mips/include/pmap.h#8 integrate .. //depot/projects/vimage/src/sys/mips/include/proc.h#3 integrate .. //depot/projects/vimage/src/sys/mips/include/profile.h#3 integrate .. //depot/projects/vimage/src/sys/mips/include/psl.h#3 delete .. //depot/projects/vimage/src/sys/mips/include/pte.h#4 integrate .. //depot/projects/vimage/src/sys/mips/include/queue.h#2 delete .. //depot/projects/vimage/src/sys/mips/include/regnum.h#3 integrate .. //depot/projects/vimage/src/sys/mips/include/rm7000.h#2 delete .. //depot/projects/vimage/src/sys/mips/include/segments.h#2 delete .. //depot/projects/vimage/src/sys/mips/include/sf_buf.h#2 integrate .. //depot/projects/vimage/src/sys/mips/include/trap.h#4 integrate .. //depot/projects/vimage/src/sys/mips/include/vmparam.h#2 integrate .. //depot/projects/vimage/src/sys/mips/malta/gt_pci.c#8 integrate .. //depot/projects/vimage/src/sys/mips/mips/autoconf.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/copystr.S#3 delete .. //depot/projects/vimage/src/sys/mips/mips/exception.S#4 integrate .. //depot/projects/vimage/src/sys/mips/mips/fp.S#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/genassym.c#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/locore.S#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/machdep.c#8 integrate .. //depot/projects/vimage/src/sys/mips/mips/mem.c#4 integrate .. //depot/projects/vimage/src/sys/mips/mips/mp_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/mips/mips/mpboot.S#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/nexus.c#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/pmap.c#18 integrate .. //depot/projects/vimage/src/sys/mips/mips/psraccess.S#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/support.S#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/swtch.S#4 integrate .. //depot/projects/vimage/src/sys/mips/mips/tick.c#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/tlb.S#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/trap.c#6 integrate .. //depot/projects/vimage/src/sys/mips/mips/uio_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/mips/rmi/clock.c#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#58 integrate .. //depot/projects/vimage/src/sys/modules/cyclic/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/geom/Makefile#7 integrate .. //depot/projects/vimage/src/sys/modules/geom/geom_sched/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/geom/geom_sched/Makefile.inc#1 branch .. //depot/projects/vimage/src/sys/modules/geom/geom_sched/gs_sched/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/geom/geom_sched/gsched_rr/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/sge/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/vimage/src/sys/net/if.c#96 integrate .. //depot/projects/vimage/src/sys/net/vnet.c#8 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#35 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#22 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#67 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/dn_sched.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/dn_sched_rr.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/dn_sched_wf2q.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/ip_dn_private.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/ip_dummynet.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_pfil.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_private.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#40 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#44 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#35 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#51 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/clock.c#12 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#26 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#30 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/MPC85XX#11 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#29 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#23 integrate .. //depot/projects/vimage/src/sys/sys/dtrace_bsd.h#3 integrate .. //depot/projects/vimage/src/sys/sys/thr.h#4 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#16 integrate .. //depot/projects/vimage/src/sys/vm/pmap.h#8 integrate .. //depot/projects/vimage/src/sys/vm/swap_pager.c#23 integrate .. //depot/projects/vimage/src/sys/vm/vm_extern.h#12 integrate .. //depot/projects/vimage/src/sys/vm/vm_glue.c#15 integrate .. //depot/projects/vimage/src/sys/vm/vm_kern.c#14 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.c#24 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.h#12 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#28 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/vimage/src/sys/x86/isa/clock.c#3 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man3/sysexits.3#3 (text+ko) ==== @@ -23,12 +23,12 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/sysexits.3,v 1.17 2010/01/21 17:25:12 ed Exp $ +.\" $FreeBSD: src/share/man/man3/sysexits.3,v 1.18 2010/04/14 19:08:06 uqs Exp $ .\" .\" " .Dd March 31, 1996 +.Dt SYSEXITS 3 .Os -.Dt SYSEXITS 3 .Sh NAME .Nm sysexits .Nd preferable exit codes for programs ==== //depot/projects/vimage/src/share/man/man3/tgmath.3#2 (text+ko) ==== @@ -22,11 +22,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/tgmath.3,v 1.3 2007/12/15 02:40:10 das Exp $ +.\" $FreeBSD: src/share/man/man3/tgmath.3,v 1.4 2010/04/14 19:08:06 uqs Exp $ .\" .Dd August 14, 2004 +.Dt TGMATH 3 .Os -.Dt TGMATH 3 .Sh NAME .Nm tgmath .Nd "type-generic macros" ==== //depot/projects/vimage/src/share/man/man4/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.476 2010/02/25 19:43:22 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.477 2010/04/14 21:27:48 yongari Exp $ MAN= aac.4 \ acpi.4 \ @@ -350,6 +350,7 @@ sem.4 \ ses.4 \ sf.4 \ + sge.4 \ si.4 \ siba.4 \ sio.4 \ ==== //depot/projects/vimage/src/share/man/man4/altq.4#10 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.43 2010/03/12 10:01:06 uqs Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.44 2010/04/14 21:27:48 yongari Exp $ .\" -.Dd July 26, 2009 +.Dd April 14, 2010 .Dt ALTQ 4 .Os .Sh NAME @@ -151,6 +151,7 @@ .Xr rl 4 , .Xr rum 4 , .Xr sf 4 , +.Xr sge 4 , .Xr sis 4 , .Xr sk 4 , .Xr ste 4 , ==== //depot/projects/vimage/src/share/man/man4/audit.4#3 (text+ko) ==== @@ -22,11 +22,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/audit.4,v 1.11 2009/05/31 09:03:14 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/audit.4,v 1.12 2010/04/14 19:08:06 uqs Exp $ .\" .Dd May 31, 2009 +.Dt AUDIT 4 .Os -.Dt AUDIT 4 .Sh NAME .Nm audit .Nd Security Event Audit ==== //depot/projects/vimage/src/share/man/man4/auditpipe.4#2 (text+ko) ==== @@ -22,11 +22,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.6 2008/05/02 17:36:22 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.7 2010/04/14 19:08:06 uqs Exp $ .\" .Dd May 5, 2006 +.Dt AUDITPIPE 4 .Os -.Dt AUDITPIPE 4 .Sh NAME .Nm auditpipe .Nd "pseudo-device for live audit event tracking" ==== //depot/projects/vimage/src/share/man/man4/coda.4#2 (text+ko) ==== @@ -22,11 +22,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/coda.4,v 1.2 2008/01/22 07:40:21 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/coda.4,v 1.3 2010/04/14 19:08:06 uqs Exp $ .\" .Dd January 21, 2008 +.Dt CODA 4 .Os -.Dt CODA 4 .Sh NAME .Nm coda .Nd Coda Distributed File System ==== //depot/projects/vimage/src/share/man/man4/gbde.4#2 (text+ko) ==== @@ -29,11 +29,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/gbde.4,v 1.11 2006/01/10 18:55:24 schweikh Exp $ +.\" $FreeBSD: src/share/man/man4/gbde.4,v 1.12 2010/04/14 19:08:06 uqs Exp $ .\" .Dd October 19, 2002 +.Dt GBDE 4 .Os -.Dt GBDE 4 .Sh NAME .Nm gbde .Nd Geom Based Disk Encryption ==== //depot/projects/vimage/src/share/man/man4/geom.4#4 (text+ko) ==== @@ -32,11 +32,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/geom.4,v 1.18 2009/05/19 12:10:48 trasz Exp $ +.\" $FreeBSD: src/share/man/man4/geom.4,v 1.19 2010/04/14 19:08:06 uqs Exp $ .\" .Dd May 25, 2006 +.Dt GEOM 4 .Os -.Dt GEOM 4 .Sh NAME .Nm GEOM .Nd "modular disk I/O request transformation framework" ==== //depot/projects/vimage/src/share/man/man4/geom_fox.4#3 (text+ko) ==== @@ -23,11 +23,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/geom_fox.4,v 1.4 2009/05/05 13:48:53 trasz Exp $ +.\" $FreeBSD: src/share/man/man4/geom_fox.4,v 1.5 2010/04/14 19:08:06 uqs Exp $ .\" .Dd January 2, 2005 +.Dt GEOM_FOX 4 .Os -.Dt GEOM_FOX 4 .Sh NAME .Nm geom_fox .Nd "GEOM based basic disk multipathing" ==== //depot/projects/vimage/src/share/man/man4/geom_linux_lvm.4#2 (text+ko) ==== @@ -23,11 +23,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/geom_linux_lvm.4,v 1.1 2008/02/20 07:45:36 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/geom_linux_lvm.4,v 1.2 2010/04/14 19:08:06 uqs Exp $ .\" .Dd February 20, 2008 +.Dt GEOM_LINUX_LVM 4 .Os -.Dt GEOM_LINUX_LVM 4 .Sh NAME .Nm geom_linux_lvm .Nd "GEOM based Linux LVM logical volume mapping" ==== //depot/projects/vimage/src/share/man/man4/geom_uzip.4#2 (text+ko) ==== @@ -23,11 +23,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/geom_uzip.4,v 1.2 2006/10/09 12:50:16 ceri Exp $ +.\" $FreeBSD: src/share/man/man4/geom_uzip.4,v 1.3 2010/04/14 19:08:06 uqs Exp $ .\" .Dd October 9, 2006 +.Dt GEOM_UZIP 4 .Os -.Dt GEOM_UZIP 4 .Sh NAME .Nm geom_uzip .Nd "GEOM based compressed disk images" ==== //depot/projects/vimage/src/share/man/man4/ipw.4#2 (text+ko) ==== @@ -23,11 +23,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.18 2008/04/20 20:35:45 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.19 2010/04/14 19:08:06 uqs Exp $ .\" .Dd April 13, 2008 +.Dt IPW 4 .Os -.Dt IPW 4 .Sh NAME .Nm ipw .Nd "Intel PRO/Wireless 2100 IEEE 802.11 driver" ==== //depot/projects/vimage/src/share/man/man4/iscsi_initiator.4#3 (text+ko) ==== @@ -22,11 +22,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.3 2010/03/12 10:01:06 uqs Exp $ +.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.4 2010/04/14 19:08:06 uqs Exp $ .\" .Dd February 23, 2007 +.Dt ISCSI_INITIATOR 4 .Os -.Dt ISCSI_INITIATOR 4 .Sh NAME .Nm iscsi_initiator .Nd kernel driver for the iSCSI protocol ==== //depot/projects/vimage/src/share/man/man4/iwi.4#3 (text+ko) ==== @@ -23,11 +23,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.21 2009/02/22 12:40:58 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.22 2010/04/14 19:08:06 uqs Exp $ .\" .Dd April 13, 2008 +.Dt IWI 4 .Os -.Dt IWI 4 .Sh NAME .Nm iwi .Nd "Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 driver" ==== //depot/projects/vimage/src/share/man/man4/iwn.4#5 (text+ko) ==== @@ -23,11 +23,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.8 2010/02/08 21:38:42 brucec Exp $ +.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.9 2010/04/14 19:08:06 uqs Exp $ .\" .Dd February 8, 2010 +.Dt IWN 4 .Os -.Dt IWN 4 .Sh NAME .Nm iwn .Nd Intel Wireless WiFi Link 4965/1000/5000/5150/5300/6000/6050 ==== //depot/projects/vimage/src/share/man/man4/kbdmux.4#2 (text+ko) ==== @@ -1,9 +1,9 @@ .\" $Id: kbdmux.4,v 1.1 2005/07/14 20:32:10 max Exp $ -.\" $FreeBSD: src/share/man/man4/kbdmux.4,v 1.5 2006/05/17 09:33:06 phk Exp $ +.\" $FreeBSD: src/share/man/man4/kbdmux.4,v 1.6 2010/04/14 19:08:06 uqs Exp $ .\" .Dd July 12, 2005 +.Dt KBDMUX 4 .Os -.Dt KBDMUX 4 .Sh NAME .Nm kbdmux .Nd "keyboard multiplexer" ==== //depot/projects/vimage/src/share/man/man4/ktr.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ktr.4,v 1.12 2006/06/03 23:20:45 kris Exp $ +.\" $FreeBSD: src/share/man/man4/ktr.4,v 1.13 2010/04/14 21:44:14 julian Exp $ .\" .Dd January 25, 2005 .Dt KTR 4 @@ -122,7 +122,7 @@ The KTR buffer can be examined from within .Xr ddb 4 via the -.Ic show ktr Op Cm /v +.Ic show ktr Op Cm /vV command. This command displays the contents of the trace buffer one page at a time. At the @@ -136,6 +136,10 @@ .Cm /v modifier is specified, then they are displayed in addition to the normal output. +If the +.Cm /V +modifier is specified, then just the timestamp is displayed in +addition to the normal output. Note that the events are displayed in reverse chronological order. That is, the most recent events are displayed first. .Ss Logging ktr to Disk @@ -167,7 +171,9 @@ enables logging of .Nm entries to disk if it is set to one. -Setting this to 0 will terminate logging. +Setting this to 0 will terminate logging to disk and revert to +logging to the normal ktr ring buffer. +Data is not sent to the ring buffer while logging to disk. .It Va debug.ktr.alq_max is the maximum number of entries that will be recorded to disk, or 0 for infinite. ==== //depot/projects/vimage/src/share/man/man4/lp.4#2 (text+ko) ==== @@ -32,11 +32,11 @@ .\" SUCH DAMAGE. .\" .\" Id: man4.i386/lp.4,v 1.9 1999/02/14 12:06:16 nsouch Exp -.\" $FreeBSD: src/share/man/man4/lp.4,v 1.14 2006/02/13 20:47:43 ceri Exp $ +.\" $FreeBSD: src/share/man/man4/lp.4,v 1.15 2010/04/14 19:08:06 uqs Exp $ .\" .Dd March 4, 1996 +.Dt LP 4 .Os -.Dt LP 4 .Sh NAME .Nm lp .Nd printer port Internet Protocol driver ==== //depot/projects/vimage/src/share/man/man4/mac.4#3 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac.4,v 1.15 2010/01/15 16:01:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac.4,v 1.16 2010/04/14 19:08:06 uqs Exp $ .\" .Dd October 30, 2007 +.Dt MAC 4 .Os -.Dt MAC 4 .Sh NAME .Nm mac .Nd Mandatory Access Control ==== //depot/projects/vimage/src/share/man/man4/mac_biba.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_biba.4,v 1.19 2005/02/05 13:52:21 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/mac_biba.4,v 1.20 2010/04/14 19:08:06 uqs Exp $ .\" .Dd November 18, 2002 +.Dt MAC_BIBA 4 .Os -.Dt MAC_BIBA 4 .Sh NAME .Nm mac_biba .Nd "Biba data integrity policy" ==== //depot/projects/vimage/src/share/man/man4/mac_bsdextended.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_bsdextended.4,v 1.16 2005/05/21 17:22:12 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/mac_bsdextended.4,v 1.17 2010/04/14 19:08:06 uqs Exp $ .\" .Dd May 21, 2005 +.Dt MAC_BSDEXTENDED 4 .Os -.Dt MAC_BSDEXTENDED 4 .Sh NAME .Nm mac_bsdextended .Nd "file system firewall policy" ==== //depot/projects/vimage/src/share/man/man4/mac_ifoff.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_ifoff.4,v 1.9 2005/02/05 13:52:21 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/mac_ifoff.4,v 1.10 2010/04/14 19:08:06 uqs Exp $ .\" .Dd December 10, 2002 +.Dt MAC_IFOFF 4 .Os -.Dt MAC_IFOFF 4 .Sh NAME .Nm mac_ifoff .Nd "interface silencing policy" ==== //depot/projects/vimage/src/share/man/man4/mac_lomac.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_lomac.4,v 1.9 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_lomac.4,v 1.10 2010/04/14 19:08:06 uqs Exp $ .\" .Dd December 11, 2002 +.Dt MAC_LOMAC 4 .Os -.Dt MAC_LOMAC 4 .Sh NAME .Nm mac_lomac .Nd "Low-watermark Mandatory Access Control data integrity policy" ==== //depot/projects/vimage/src/share/man/man4/mac_mls.4#3 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.20 2009/10/22 08:38:27 pjd Exp $ +.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.21 2010/04/14 19:08:06 uqs Exp $ .\" .Dd December 1, 2002 +.Dt MAC_MLS 4 .Os -.Dt MAC_MLS 4 .Sh NAME .Nm mac_mls .Nd "Multi-Level Security confidentiality policy" ==== //depot/projects/vimage/src/share/man/man4/mac_none.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_none.4,v 1.12 2005/01/21 20:50:39 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_none.4,v 1.13 2010/04/14 19:08:06 uqs Exp $ .\" .Dd December 1, 2002 +.Dt MAC_NONE 4 .Os -.Dt MAC_NONE 4 .Sh NAME .Nm mac_none .Nd "null MAC policy module" ==== //depot/projects/vimage/src/share/man/man4/mac_partition.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_partition.4,v 1.11 2005/02/05 13:52:21 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/mac_partition.4,v 1.12 2010/04/14 19:08:06 uqs Exp $ .\" .Dd December 9, 2002 +.Dt MAC_PARTITION 4 .Os -.Dt MAC_PARTITION 4 .Sh NAME .Nm mac_partition .Nd "process partition policy" ==== //depot/projects/vimage/src/share/man/man4/mac_seeotheruids.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_seeotheruids.4,v 1.12 2005/11/18 10:52:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_seeotheruids.4,v 1.13 2010/04/14 19:08:06 uqs Exp $ .\" .Dd October 6, 2005 +.Dt MAC_SEEOTHERUIDS 4 .Os -.Dt MAC_SEEOTHERUIDS 4 .Sh NAME .Nm mac_seeotheruids .Nd "simple policy controlling whether users see other users" ==== //depot/projects/vimage/src/share/man/man4/mac_stub.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_stub.4,v 1.13 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_stub.4,v 1.14 2010/04/14 19:08:06 uqs Exp $ .\" .Dd December 1, 2002 +.Dt MAC_STUB 4 .Os -.Dt MAC_STUB 4 .Sh NAME .Nm mac_stub .Nd "MAC policy stub module" ==== //depot/projects/vimage/src/share/man/man4/mac_test.4#2 (text+ko) ==== @@ -28,11 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_test.4,v 1.10 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_test.4,v 1.11 2010/04/14 19:08:06 uqs Exp $ .\" .Dd December 1, 2002 +.Dt MAC_TEST 4 .Os -.Dt MAC_TEST 4 .Sh NAME .Nm mac_test .Nd MAC framework testing policy ==== //depot/projects/vimage/src/share/man/man4/miibus.4#4 (text+ko) ==== @@ -6,9 +6,9 @@ .\" Originally this file looked much like the NetBSD mii(4) manual page, but .\" I doubt you would ever notice due to large differences. .\" -.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.28 2009/06/15 18:24:04 marius Exp $ +.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.29 2010/04/14 21:27:48 yongari Exp $ .\" -.Dd June 14, 2009 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 23 17:00:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEC5B1065670; Fri, 23 Apr 2010 17:00:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72FD4106566B for ; Fri, 23 Apr 2010 17:00:23 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F05F8FC0A for ; Fri, 23 Apr 2010 17:00:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3NH0NiH043789 for ; Fri, 23 Apr 2010 17:00:23 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3NH0N6C043787 for perforce@freebsd.org; Fri, 23 Apr 2010 17:00:23 GMT (envelope-from mav@freebsd.org) Date: Fri, 23 Apr 2010 17:00:23 GMT Message-Id: <201004231700.o3NH0N6C043787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 17:00:23 -0000 http://p4web.freebsd.org/@@177269?ac=10 Change 177269 by mav@mav_mavtest on 2010/04/23 16:59:30 Set some minor configuration bits. Disable/enable interrupts to acknowledge MSIs. Do some cleanup. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_pci.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_soc.c#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#12 (text+ko) ==== @@ -441,9 +441,7 @@ ch->fbs_enabled = 0; ch->fake_busy = 0; MVS_EDMA(device_get_parent(dev), dev, mode); - device_printf(dev, "EDMA mode: %d\n", mode); - if (mode == MVS_EDMA_OFF) - return; +// device_printf(dev, "EDMA mode: %d\n", mode); /* Configure new mode. */ ecfg = EDMA_CFG_RESERVED | EDMA_CFG_RESERVED2 | EDMA_CFG_EHOSTQUEUECACHEEN; if (ch->pm_present) { @@ -453,14 +451,18 @@ ch->fbs_enabled = 1; } } - ecfg |= 1 << 24; -// ecfg |= 1 << 22; - ecfg &= ~(EDMA_CFG_ESATANATVCMDQUE | EDMA_CFG_EQUE); - if (mode == MVS_EDMA_QUEUED) { + if (ch->quirks & MVS_Q_GENI) + ecfg |= EDMA_CFG_ERDBSZ; + else if (ch->quirks & MVS_Q_GENII) + ecfg |= EDMA_CFG_ERDBSZEXT | EDMA_CFG_EWRBUFFERLEN; + if (ch->quirks & MVS_Q_CT) + ecfg |= EDMA_CFG_ECUTTHROUGHEN; + if (mode != MVS_EDMA_OFF) + ecfg |= EDMA_CFG_EEARLYCOMPLETIONEN; + if (mode == MVS_EDMA_QUEUED) ecfg |= EDMA_CFG_EQUE; - } else if (mode == MVS_EDMA_NCQ) { + else if (mode == MVS_EDMA_NCQ) ecfg |= EDMA_CFG_ESATANATVCMDQUE; - } ATA_OUTL(ch->r_mem, EDMA_CFG, ecfg); mvs_setup_edma_queues(dev); /* Configure FBS */ @@ -488,12 +490,13 @@ ATA_OUTL(ch->r_mem, SATA_LTM, ltm); ATA_OUTL(ch->r_mem, EDMA_HC, hc); } - device_printf(dev, "fisc %08x\n",ATA_INL(ch->r_mem, SATA_FISC)); - device_printf(dev, "ltmode %08x\n",ATA_INL(ch->r_mem, SATA_LTM)); - device_printf(dev, "edmacfg %08x\n",ATA_INL(ch->r_mem, EDMA_CFG)); - device_printf(dev, "haltcond %08x\n",ATA_INL(ch->r_mem, EDMA_HC)); +// device_printf(dev, "fisc %08x\n",ATA_INL(ch->r_mem, SATA_FISC)); +// device_printf(dev, "ltmode %08x\n",ATA_INL(ch->r_mem, SATA_LTM)); +// device_printf(dev, "edmacfg %08x\n",ATA_INL(ch->r_mem, EDMA_CFG)); +// device_printf(dev, "haltcond %08x\n",ATA_INL(ch->r_mem, EDMA_HC)); /* Run EDMA. */ - ATA_OUTL(ch->r_mem, EDMA_CMD, EDMA_CMD_EENEDMA); + if (mode != MVS_EDMA_OFF) + ATA_OUTL(ch->r_mem, EDMA_CMD, EDMA_CMD_EENEDMA); } devclass_t mvs_devclass; @@ -746,10 +749,8 @@ status = mvs_getstatus(dev, 1); // device_printf(dev, "Legacy intr status %02x\n", // status); - if (slot->state < MVS_SLOT_RUNNING) { -// device_printf(dev, "Stray irq\n"); + if (slot->state < MVS_SLOT_RUNNING) return; - } port = ccb->ccb_h.target_id & 0x0f; /* Wait a bit for late !BUSY status update. */ if (status & ATA_S_BUSY) { @@ -776,20 +777,14 @@ ATA_INSW_STRM(ch->r_mem, ATA_DATA, (uint16_t *)(ccb->ataio.data_ptr + ch->donecount), ch->transfersize / 2); -// device_printf(dev, "After read %d status %02x\n", -// ch->transfersize, ATA_INB(ch->r_mem, ATA_ALTSTAT)); } - /* update how far we've gotten */ ch->donecount += ch->transfersize; - /* do we need a scoop more ? */ if (ccb->ataio.dxfer_len > ch->donecount) { - /* set this transfer size according to HW capabilities */ ch->transfersize = min(ccb->ataio.dxfer_len - ch->donecount, ch->curr[ccb->ccb_h.target_id].bytecount); - /* if data write command, output the data */ if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) { if (mvs_wait(dev, ATA_S_DRQ, ATA_S_BUSY, 1000) < 0) { @@ -800,11 +795,8 @@ ATA_OUTSW_STRM(ch->r_mem, ATA_DATA, (uint16_t *)(ccb->ataio.data_ptr + ch->donecount), ch->transfersize / 2); -// device_printf(dev, "After write %d status %02x\n", -// ch->transfersize, ATA_INB(ch->r_mem, ATA_ALTSTAT)); return; } - /* if data read command, return & wait for interrupt */ if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) return; @@ -834,7 +826,6 @@ (uint16_t *)(ccb->csio.data_ptr + ch->donecount), length / 2); ch->donecount += length; - /* set next transfer size according to HW capabilities */ ch->transfersize = min(ccb->csio.dxfer_len - ch->donecount, ch->curr[ccb->ccb_h.target_id].bytecount); @@ -852,7 +843,6 @@ (uint16_t *)(ccb->csio.data_ptr + ch->donecount), length / 2); ch->donecount += length; - /* set next transfer size according to HW capabilities */ ch->transfersize = min(ccb->csio.dxfer_len - ch->donecount, ch->curr[ccb->ccb_h.target_id].bytecount); @@ -894,9 +884,6 @@ } end_finished: - mvs_tfd_read(dev, ccb); -// device_printf(dev, "After complete status %02x\n", -// ATA_INB(ch->r_mem, ATA_ALTSTAT)); mvs_end_transaction(slot, et); } @@ -1131,8 +1118,8 @@ ch->rslots |= (1 << slot->slot); ATA_OUTB(ch->r_mem, SATA_SATAICTL, port << SATA_SATAICTL_PMPTX_SHIFT); if (ccb->ccb_h.func_code == XPT_ATA_IO) { - device_printf(dev, "%d Legacy command %02x size %d\n", - port, ccb->ataio.cmd.command, ccb->ataio.dxfer_len); +// device_printf(dev, "%d Legacy command %02x size %d\n", +// port, ccb->ataio.cmd.command, ccb->ataio.dxfer_len); mvs_tfd_write(dev, ccb); /* device reset doesn't interrupt */ if (ccb->ataio.cmd.command == ATA_DEVICE_RESET) { @@ -1161,8 +1148,8 @@ ch->transfersize / 2); } } else { - device_printf(dev, "%d ATAPI command %02x size %d\n", - port, ccb->csio.cdb_io.cdb_bytes[0], ccb->csio.dxfer_len); +// device_printf(dev, "%d ATAPI command %02x size %d\n", +// port, ccb->csio.cdb_io.cdb_bytes[0], ccb->csio.dxfer_len); ch->donecount = 0; ch->transfersize = min(ccb->csio.dxfer_len, ch->curr[port].bytecount); @@ -1220,21 +1207,23 @@ return; } KASSERT(nsegs <= MVS_SG_ENTRIES, ("too many DMA segment entries\n")); - /* Get a piece of the workspace for this EPRD */ - eprd = (struct mvs_eprd *) - (ch->dma.workrq + MVS_EPRD_OFFSET + (MVS_EPRD_SIZE * slot->slot)); - /* Fill S/G table */ - for (i = 0; i < nsegs; i++) { - eprd[i].prdbal = htole32(segs[i].ds_addr); - eprd[i].bytecount = htole32(segs[i].ds_len & MVS_EPRD_MASK); - eprd[i].prdbah = htole32((segs[i].ds_addr >> 16) >> 16); - } - eprd[i - 1].bytecount |= htole32(MVS_EPRD_EOF); - if (nsegs == 1) { + /* If there is only one segment - no need to use S/G table on Gen-IIe. */ + if (nsegs == 1 && (ch->quirks & MVS_Q_GENIIE)) { slot->dma.addr = segs[0].ds_addr; slot->dma.len = segs[0].ds_len; - } else + } else { slot->dma.addr = 0; + /* Get a piece of the workspace for this EPRD */ + eprd = (struct mvs_eprd *) + (ch->dma.workrq + MVS_EPRD_OFFSET + (MVS_EPRD_SIZE * slot->slot)); + /* Fill S/G table */ + for (i = 0; i < nsegs; i++) { + eprd[i].prdbal = htole32(segs[i].ds_addr); + eprd[i].bytecount = htole32(segs[i].ds_len & MVS_EPRD_MASK); + eprd[i].prdbah = htole32((segs[i].ds_addr >> 16) >> 16); + } + eprd[i - 1].bytecount |= htole32(MVS_EPRD_EOF); + } bus_dmamap_sync(ch->dma.data_tag, slot->dma.data_map, ((slot->ccb->ccb_h.flags & CAM_DIR_IN) ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE)); @@ -1787,7 +1776,6 @@ int port = ccb->ccb_h.target_id & 0x0f; int i; - device_printf(dev, "Softreset command port%d\n", port); mvs_set_edma_mode(dev, MVS_EDMA_OFF); ATA_OUTB(ch->r_mem, SATA_SATAICTL, port << SATA_SATAICTL_PMPTX_SHIFT); ATA_OUTB(ch->r_mem, ATA_CONTROL, ATA_A_RESET); @@ -1985,35 +1973,6 @@ xpt_done(ccb); break; } -#if 0 - case XPT_CALC_GEOMETRY: - { - struct ccb_calc_geometry *ccg; - uint32_t size_mb; - uint32_t secs_per_cylinder; - - ccg = &ccb->ccg; - size_mb = ccg->volume_size - / ((1024L * 1024L) / ccg->block_size); - if (size_mb >= 1024 && (aha->extended_trans != 0)) { - if (size_mb >= 2048) { - ccg->heads = 255; - ccg->secs_per_track = 63; - } else { - ccg->heads = 128; - ccg->secs_per_track = 32; - } - } else { - ccg->heads = 64; - ccg->secs_per_track = 32; - } - secs_per_cylinder = ccg->heads * ccg->secs_per_track; - ccg->cylinders = ccg->volume_size / secs_per_cylinder; - ccb->ccb_h.status = CAM_REQ_CMP; - xpt_done(ccb); - break; - } -#endif case XPT_RESET_BUS: /* Reset the specified SCSI bus */ case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */ mvs_reset(dev); ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#9 (text+ko) ==== @@ -523,6 +523,8 @@ #define MVS_Q_GENI 1 #define MVS_Q_GENII 2 #define MVS_Q_GENIIE 4 +#define MVS_Q_SOC 8 +#define MVS_Q_CT 16 int pm_level; /* power management level */ struct mvs_slot slot[MVS_MAX_SLOTS]; @@ -573,13 +575,16 @@ void *handle; int r_irq_rid; } irq; - struct mtx mtx; /* MIM access lock */ int quirks; int channels; int ccc; /* CCC timeout */ int cccc; /* CCC commands */ - int gmim; - int pmim; + struct mtx mtx; /* MIM access lock */ + int gmim; /* Globally wanted MIM bits */ + int pmim; /* Port wanted MIM bits */ + int mim; /* Current MIM bits */ + int msi; /* MSI enabled */ + int msia; /* MSI active */ struct { void (*function)(void *); void *argument; ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_pci.c#4 (text+ko) ==== @@ -68,9 +68,9 @@ {0x604211ab, 0x00, "Marvell 88SX6042", 4, MVS_Q_GENIIE}, {0x608011ab, 0x00, "Marvell 88SX6080", 8, MVS_Q_GENII}, {0x608111ab, 0x00, "Marvell 88SX6081", 8, MVS_Q_GENII}, - {0x704211ab, 0x00, "Marvell 88SX7042", 4, MVS_Q_GENIIE}, + {0x704211ab, 0x00, "Marvell 88SX7042", 4, MVS_Q_GENIIE|MVS_Q_CT}, {0x02419005, 0x00, "Adaptec 1420SA", 4, MVS_Q_GENII}, - {0x02439005, 0x00, "Adaptec 1430SA", 4, MVS_Q_GENIIE}, + {0x02439005, 0x00, "Adaptec 1430SA", 4, MVS_Q_GENIIE|MVS_Q_CT}, {0x00000000, 0x00, NULL, 0, 0} }; @@ -151,6 +151,7 @@ rman_fini(&ctlr->sc_iomem); return (error); } + pci_enable_busmaster(dev); mvs_ctlr_setup(dev); /* Setup interrupts. */ if (mvs_setup_interrupt(dev)) { @@ -239,7 +240,8 @@ /* Enable chip interrupts */ ctlr->gmim = (ccim ? ccim : (IC_DONE_HC0 | IC_DONE_HC1)) | IC_ERR_HC0 | IC_ERR_HC1; - ATA_OUTL(ctlr->r_mem, CHIP_MIM, ctlr->gmim | ctlr->pmim); + ctlr->mim = ctlr->gmim | ctlr->pmim; + ATA_OUTL(ctlr->r_mem, CHIP_MIM, ctlr->mim); /* Enable PCI interrupts */ ATA_OUTL(ctlr->r_mem, CHIP_PCIIM, 0x007fffff); return (0); @@ -259,7 +261,9 @@ ctlr->pmim |= bit; else ctlr->pmim &= ~bit; - ATA_OUTL(ctlr->r_mem, CHIP_MIM, ctlr->gmim | ctlr->pmim); + ctlr->mim = ctlr->gmim | ctlr->pmim; + if (!ctlr->msia) + ATA_OUTL(ctlr->r_mem, CHIP_MIM, ctlr->mim); mtx_unlock(&ctlr->mtx); } @@ -300,6 +304,7 @@ /* Allocate MSI if needed/present. */ if (msi && pci_alloc_msi(dev, &msi) != 0) msi = 0; + ctlr->msi = msi; /* Allocate all IRQs. */ ctlr->irq.r_irq_rid = msi ? 1 : 0; if (!(ctlr->irq.r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, @@ -332,6 +337,13 @@ ic = ATA_INL(ctlr->r_mem, CHIP_MIC); //device_printf(ctlr->dev, "irq MIC:%08x\n", ic); + if (ctlr->msi) { + mtx_lock(&ctlr->mtx); + ATA_OUTL(ctlr->r_mem, CHIP_MIM, 0); + ctlr->msia = 1; + mtx_unlock(&ctlr->mtx); + } else if (ic == 0) + return; if (ic & IC_ALL_PORTS_COAL_DONE) ATA_OUTL(ctlr->r_mem, CHIP_ICC, ~CHIP_ICC_ALL_PORTS); for (p = 0; p < ctlr->channels; p++) { @@ -364,6 +376,12 @@ } ic >>= 2; } + if (ctlr->msi) { + mtx_lock(&ctlr->mtx); + ctlr->msia = 0; + ATA_OUTL(ctlr->r_mem, CHIP_MIM, ctlr->mim); + mtx_unlock(&ctlr->mtx); + } } static struct resource * ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_soc.c#4 (text+ko) ==== @@ -59,10 +59,10 @@ int ports; int quirks; } mvs_ids[] = { - {MV_DEV_88F5182, 0x00, "Marvell 88F5182", 2, MVS_Q_GENIIE}, - {MV_DEV_88F6281, 0x00, "Marvell 88F6281", 2, MVS_Q_GENIIE}, - {MV_DEV_MV78100, 0x00, "Marvell MV78100", 2, MVS_Q_GENIIE}, - {MV_DEV_MV78100_Z0, 0x00,"Marvell MV78100", 2, MVS_Q_GENIIE}, + {MV_DEV_88F5182, 0x00, "Marvell 88F5182", 2, MVS_Q_GENIIE|MVS_Q_SOC}, + {MV_DEV_88F6281, 0x00, "Marvell 88F6281", 2, MVS_Q_GENIIE|MVS_Q_SOC}, + {MV_DEV_MV78100, 0x00, "Marvell MV78100", 2, MVS_Q_GENIIE|MVS_Q_SOC}, + {MV_DEV_MV78100_Z0, 0x00,"Marvell MV78100", 2, MVS_Q_GENIIE|MVS_Q_SOC}, {0, 0x00, NULL, 0, 0} }; From owner-p4-projects@FreeBSD.ORG Fri Apr 23 19:32:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97D57106566C; Fri, 23 Apr 2010 19:32:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C4EC106564A for ; Fri, 23 Apr 2010 19:32:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A29F8FC1A for ; Fri, 23 Apr 2010 19:32:58 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3NJWw4N058550 for ; Fri, 23 Apr 2010 19:32:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3NJWwVZ058548 for perforce@freebsd.org; Fri, 23 Apr 2010 19:32:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 23 Apr 2010 19:32:58 GMT Message-Id: <201004231932.o3NJWwVZ058548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 19:32:58 -0000 http://p4web.freebsd.org/@@177279?ac=10 Change 177279 by hselasky@hselasky_laptop001 on 2010/04/23 19:32:37 USB input: - patch from "Henry Hu" to enable support for mouse panning wheels. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#28 (text+ko) ==== @@ -286,6 +286,12 @@ DPRINTFN(6, "x:%d y:%d z:%d t:%d w:%d buttons:0x%08x\n", dx, dy, dz, dt, dw, buttons); + /* translate T-axis into button presses until further */ + if (dt > 0) + buttons |= 1UL << 3; + else if (dt < 0) + buttons |= 1UL << 4; + sc->sc_status.button = buttons; sc->sc_status.dx += dx; sc->sc_status.dy += dy; @@ -454,6 +460,12 @@ if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { info->sc_flags |= UMS_FLAG_T_AXIS; } + } else if (hid_locate(buf, len, HID_USAGE2(HUP_CONSUMER, + HUC_AC_PAN), hid_input, index, &info->sc_loc_t, + &flags, &info->sc_iid_t)) { + + if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) + info->sc_flags |= UMS_FLAG_T_AXIS; } /* figure out the number of buttons */ ==== //depot/projects/usb/src/sys/dev/usb/usbhid.h#12 (text+ko) ==== @@ -156,6 +156,9 @@ #define HUD_ERASER 0x0045 #define HUD_TABLET_PICK 0x0046 +/* Usages, Consumer */ +#define HUC_AC_PAN 0x0238 + #define HID_USAGE2(p,u) (((p) << 16) | (u)) #define UHID_INPUT_REPORT 0x01 From owner-p4-projects@FreeBSD.ORG Sat Apr 24 07:38:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76B33106567D; Sat, 24 Apr 2010 07:38:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B45E106567B for ; Sat, 24 Apr 2010 07:38:06 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A0AD8FC12 for ; Sat, 24 Apr 2010 07:38:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3O7c64k062627 for ; Sat, 24 Apr 2010 07:38:06 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3O7c6FU062625 for perforce@freebsd.org; Sat, 24 Apr 2010 07:38:06 GMT (envelope-from mav@freebsd.org) Date: Sat, 24 Apr 2010 07:38:06 GMT Message-Id: <201004240738.o3O7c6FU062625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 07:38:06 -0000 http://p4web.freebsd.org/@@177292?ac=10 Change 177292 by mav@mav_mavbook on 2010/04/24 07:37:34 Add man page and build module. Affected files ... .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#25 edit .. //depot/projects/scottl-camlock/src/share/man/man4/mvs.4#1 add .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#50 edit Differences ... ==== //depot/projects/scottl-camlock/src/share/man/man4/Makefile#25 (text+ko) ==== @@ -220,6 +220,7 @@ msk.4 \ mtio.4 \ multicast.4 \ + mvs.4 \ mwl.4 \ mwlfw.4 \ mxge.4 \ ==== //depot/projects/scottl-camlock/src/sys/modules/Makefile#50 (text+ko) ==== @@ -188,6 +188,7 @@ msdosfs_iconv \ ${_mse} \ msk \ + mvs \ mwl \ mxge \ my \ From owner-p4-projects@FreeBSD.ORG Sat Apr 24 20:49:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2C0D1065670; Sat, 24 Apr 2010 20:49:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 770C21065679 for ; Sat, 24 Apr 2010 20:49:24 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 646538FC16 for ; Sat, 24 Apr 2010 20:49:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3OKnO2S078082 for ; Sat, 24 Apr 2010 20:49:24 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3OKnOrC078080 for perforce@freebsd.org; Sat, 24 Apr 2010 20:49:24 GMT (envelope-from anchie@FreeBSD.org) Date: Sat, 24 Apr 2010 20:49:24 GMT Message-Id: <201004242049.o3OKnOrC078080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177304 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 20:49:24 -0000 http://p4web.freebsd.org/@@177304?ac=10 Change 177304 by anchie@anchie_malimis on 2010/04/24 20:49:11 There was noise left in net/route.h and net/rtsock.c related to SEND through rtsock. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_hashtab.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_mm.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_sman.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/route.h#11 edit .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#25 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drmP.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.44 2010/04/22 18:44:23 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.45 2010/04/23 14:48:30 rnoland Exp $"); #ifndef _DRM_P_H_ #define _DRM_P_H_ @@ -228,7 +228,7 @@ #define DRM_MTRR_WC MDF_WRITECOMBINE #define jiffies ticks -typedef unsigned long dma_addr_t; +typedef vm_paddr_t dma_addr_t; typedef u_int64_t u64; typedef u_int32_t u32; typedef u_int16_t u16; ==== //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_hashtab.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ **************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_hashtab.c,v 1.1 2010/01/31 14:25:29 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_hashtab.c,v 1.2 2010/04/23 14:48:30 rnoland Exp $"); /* * Simple open hash tab implementation. @@ -46,7 +46,8 @@ ht->size = 1 << order; ht->order = order; ht->table = NULL; - ht->table = hashinit(ht->size, DRM_MEM_HASHTAB, &ht->mask); + ht->table = hashinit_flags(ht->size, DRM_MEM_HASHTAB, &ht->mask, + HASH_NOWAIT); if (!ht->table) { DRM_ERROR("Out of memory for hash table\n"); return -ENOMEM; ==== //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_mm.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ **************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_mm.c,v 1.1 2010/01/31 14:25:29 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_mm.c,v 1.2 2010/04/23 14:48:30 rnoland Exp $"); /* * Generic simple memory manager implementation. Intended to be used as a base @@ -333,7 +333,8 @@ mm->num_unused = 0; mtx_init(&mm->unused_lock, "drm_unused", NULL, MTX_DEF); - return drm_mm_create_tail_node(mm, start, size, 0); + /* XXX This could be non-atomic but gets called from a locked path */ + return drm_mm_create_tail_node(mm, start, size, 1); } void drm_mm_takedown(struct drm_mm * mm) ==== //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_sman.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ **************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_sman.c,v 1.1 2010/01/31 14:25:29 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_sman.c,v 1.2 2010/04/23 14:48:30 rnoland Exp $"); /* * Simple memory manager interface that keeps track on allocate regions on a @@ -96,7 +96,8 @@ if (!tmp) { return NULL; } - tmp = drm_mm_get_block(tmp, size, alignment); + /* This could be non-atomic, but we are called from a locked path */ + tmp = drm_mm_get_block_atomic(tmp, size, alignment); return tmp; } @@ -131,7 +132,7 @@ KASSERT(manager < sman->num_managers, ("Invalid manager")); sman_mm = &sman->mm[manager]; - mm = malloc(sizeof(*mm), DRM_MEM_MM, M_WAITOK | M_ZERO); + mm = malloc(sizeof(*mm), DRM_MEM_MM, M_NOWAIT | M_ZERO); if (!mm) { return -ENOMEM; } @@ -174,7 +175,7 @@ owner_hash); } - owner_item = malloc(sizeof(*owner_item), DRM_MEM_MM, M_WAITOK | M_ZERO); + owner_item = malloc(sizeof(*owner_item), DRM_MEM_MM, M_NOWAIT | M_ZERO); if (!owner_item) goto out; @@ -206,12 +207,11 @@ sman_mm = &sman->mm[manager]; tmp = sman_mm->allocate(sman_mm->private, size, alignment); - if (!tmp) { return NULL; } - memblock = malloc(sizeof(*memblock), DRM_MEM_MM, M_WAITOK | M_ZERO); + memblock = malloc(sizeof(*memblock), DRM_MEM_MM, M_NOWAIT | M_ZERO); DRM_DEBUG("allocated mem_block %p\n", memblock); if (!memblock) goto out; ==== //depot/projects/soc2009/anchie_send/src/sys/kern/kern_descrip.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.359 2009/11/20 22:22:53 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.360 2010/04/23 14:32:58 bz Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -2896,7 +2896,7 @@ free(sa, M_SONAME); } if (so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa) - == 00 && sa->sa_len <= sizeof(kif->kf_sa_peer)) { + == 0 && sa->sa_len <= sizeof(kif->kf_sa_peer)) { bcopy(sa, &kif->kf_sa_peer, sa->sa_len); free(sa, M_SONAME); } @@ -3149,7 +3149,7 @@ free(sa, M_SONAME); } if (so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa) - == 00 && sa->sa_len <= sizeof(kif->kf_sa_peer)) { + == 0 && sa->sa_len <= sizeof(kif->kf_sa_peer)) { bcopy(sa, &kif->kf_sa_peer, sa->sa_len); free(sa, M_SONAME); } ==== //depot/projects/soc2009/anchie_send/src/sys/net/route.h#11 (text+ko) ==== @@ -257,7 +257,6 @@ #define RTM_DELMADDR 0x10 /* mcast group membership being deleted */ #define RTM_IFANNOUNCE 0x11 /* iface arrival/departure */ #define RTM_IEEE80211 0x12 /* IEEE80211 wireless event */ -#define RTM_SND 0x13 /* SeND event */ /* * Bitmask values for rtm_inits and rmx_locks. ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#25 (text+ko) ==== @@ -499,12 +499,12 @@ senderr(EINVAL); } info.rti_flags = rtm->rtm_flags; - if (info.rti_info[RTAX_DST] == NULL || - info.rti_info[RTAX_DST]->sa_family >= AF_MAX || - (info.rti_info[RTAX_GATEWAY] != NULL && - info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) { - senderr(EINVAL); - } + if (info.rti_info[RTAX_DST] == NULL || + info.rti_info[RTAX_DST]->sa_family >= AF_MAX || + (info.rti_info[RTAX_GATEWAY] != NULL && + info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) { + senderr(EINVAL); + } /* * Verify that the caller has the appropriate privilege; RTM_GET * is the only operation the non-superuser is allowed. From owner-p4-projects@FreeBSD.ORG Sat Apr 24 21:35:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4A3D1065674; Sat, 24 Apr 2010 21:35:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69465106564A for ; Sat, 24 Apr 2010 21:35:10 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5788F8FC15 for ; Sat, 24 Apr 2010 21:35:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3OLZAOP082630 for ; Sat, 24 Apr 2010 21:35:10 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3OLZAlL082628 for perforce@freebsd.org; Sat, 24 Apr 2010 21:35:10 GMT (envelope-from anchie@FreeBSD.org) Date: Sat, 24 Apr 2010 21:35:10 GMT Message-Id: <201004242135.o3OLZAlL082628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 21:35:10 -0000 http://p4web.freebsd.org/@@177306?ac=10 Change 177306 by anchie@anchie_malimis on 2010/04/24 21:34:09 Trying to get rid of all possible noise in net/rtsock.c. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#26 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/*- +/*- * Copyright (c) 1988, 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -500,11 +500,11 @@ } info.rti_flags = rtm->rtm_flags; if (info.rti_info[RTAX_DST] == NULL || - info.rti_info[RTAX_DST]->sa_family >= AF_MAX || - (info.rti_info[RTAX_GATEWAY] != NULL && - info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) { + info.rti_info[RTAX_DST]->sa_family >= AF_MAX || + (info.rti_info[RTAX_GATEWAY] != NULL && + info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) senderr(EINVAL); - } + /* * Verify that the caller has the appropriate privilege; RTM_GET * is the only operation the non-superuser is allowed. From owner-p4-projects@FreeBSD.ORG Sat Apr 24 22:10:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDC131065670; Sat, 24 Apr 2010 22:10:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1B6B106566B for ; Sat, 24 Apr 2010 22:10:50 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E85E8FC15 for ; Sat, 24 Apr 2010 22:10:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3OMAoZB086196 for ; Sat, 24 Apr 2010 22:10:50 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3OMAnLv086194 for perforce@freebsd.org; Sat, 24 Apr 2010 22:10:49 GMT (envelope-from anchie@FreeBSD.org) Date: Sat, 24 Apr 2010 22:10:49 GMT Message-Id: <201004242210.o3OMAnLv086194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 22:10:51 -0000 http://p4web.freebsd.org/@@177308?ac=10 Change 177308 by anchie@anchie_malimis on 2010/04/24 22:09:49 IFC @177307> Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/proc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/proc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/pmap.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/proc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_proc.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/SWARM#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/proc.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/vmparam.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/exception.S#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/sibyte/sb_machdep.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea64.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/proc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/proc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/proc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/buf.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/mount.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/user.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_subr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/fs.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/softdep.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/dinode.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufs_dirhash.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufs_lookup.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/pmap.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_mmap.c#6 integrate Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.688 2010/03/27 23:53:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.690 2010/04/24 21:17:07 kmacy Exp $"); /* * Manages physical address maps. @@ -236,6 +236,7 @@ static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); static void pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); static boolean_t pmap_is_modified_pvh(struct md_page *pvh); +static boolean_t pmap_is_referenced_pvh(struct md_page *pvh); static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va); static void pmap_pde_attr(pd_entry_t *pde, int cache_bits); @@ -283,7 +284,7 @@ vm_offset_t newaddr = addr; newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); - return newaddr; + return (newaddr); } /********************/ @@ -294,7 +295,7 @@ static __inline vm_pindex_t pmap_pde_pindex(vm_offset_t va) { - return va >> PDRSHIFT; + return (va >> PDRSHIFT); } @@ -353,7 +354,7 @@ pml4e = pmap_pml4e(pmap, va); if ((*pml4e & PG_V) == 0) - return NULL; + return (NULL); return (pmap_pml4e_to_pdpe(pml4e, va)); } @@ -375,7 +376,7 @@ pdpe = pmap_pdpe(pmap, va); if (pdpe == NULL || (*pdpe & PG_V) == 0) - return NULL; + return (NULL); return (pmap_pdpe_to_pde(pdpe, va)); } @@ -397,7 +398,7 @@ pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) - return NULL; + return (NULL); if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); return (pmap_pde_to_pte(pde, va)); @@ -1236,7 +1237,7 @@ pa = (pa & PG_FRAME) | (va & PAGE_MASK); } } - return pa; + return (pa); } /*************************************************** @@ -1466,9 +1467,9 @@ --m->wire_count; if (m->wire_count == 0) - return _pmap_unwire_pte_hold(pmap, va, m, free); + return (_pmap_unwire_pte_hold(pmap, va, m, free)); else - return 0; + return (0); } static int @@ -1524,7 +1525,7 @@ */ pmap_add_delayed_free_list(m, free, TRUE); - return 1; + return (1); } /* @@ -1537,10 +1538,10 @@ vm_page_t mpte; if (va >= VM_MAXUSER_ADDRESS) - return 0; + return (0); KASSERT(ptepde != 0, ("pmap_unuse_pt: ptepde != 0")); mpte = PHYS_TO_VM_PAGE(ptepde & PG_FRAME); - return pmap_unwire_pte_hold(pmap, va, mpte, free); + return (pmap_unwire_pte_hold(pmap, va, mpte, free)); } void @@ -1731,7 +1732,7 @@ pmap->pm_stats.resident_count++; - return m; + return (m); } static vm_page_t @@ -3509,7 +3510,7 @@ pte_store(pte, pa | PG_V | PG_U); else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); - return mpte; + return (mpte); } /* @@ -3886,12 +3887,12 @@ int loops = 0; if (m->flags & PG_FICTITIOUS) - return FALSE; + return (FALSE); mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (PV_PMAP(pv) == pmap) { - return TRUE; + return (TRUE); } loops++; if (loops >= 16) @@ -4178,6 +4179,49 @@ } /* + * pmap_is_referenced: + * + * Return whether or not the specified physical page was referenced + * in any physical maps. + */ +boolean_t +pmap_is_referenced(vm_page_t m) +{ + + if (m->flags & PG_FICTITIOUS) + return (FALSE); + if (pmap_is_referenced_pvh(&m->md)) + return (TRUE); + return (pmap_is_referenced_pvh(pa_to_pvh(VM_PAGE_TO_PHYS(m)))); +} + +/* + * Returns TRUE if any of the given mappings were referenced and FALSE + * otherwise. Both page and 2mpage mappings are supported. + */ +static boolean_t +pmap_is_referenced_pvh(struct md_page *pvh) +{ + pv_entry_t pv; + pt_entry_t *pte; + pmap_t pmap; + boolean_t rv; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + rv = FALSE; + TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); + rv = (*pte & (PG_A | PG_V)) == (PG_A | PG_V); + PMAP_UNLOCK(pmap); + if (rv) + break; + } + return (rv); +} + +/* * Clear the write and modified bits in each of the given page's mappings. */ void @@ -4864,7 +4908,7 @@ if (pte != 0) { val |= MINCORE_INCORE; if ((pte & PG_MANAGED) == 0) - return val; + return (val); m = PHYS_TO_VM_PAGE(pa); @@ -4893,14 +4937,12 @@ */ vm_page_lock_queues(); if ((m->flags & PG_REFERENCED) || - pmap_ts_referenced(m)) { + pmap_is_referenced(m)) val |= MINCORE_REFERENCED_OTHER; - vm_page_flag_set(m, PG_REFERENCED); - } vm_page_unlock_queues(); } } - return val; + return (val); } void ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/proc.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/amd64/include/proc.h,v 1.26 2009/04/01 13:09:26 kib Exp $ + * $FreeBSD: src/sys/amd64/include/proc.h,v 1.27 2010/04/24 12:49:52 kib Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -53,6 +53,9 @@ struct system_segment_descriptor md_ldt_sd; }; +#define KINFO_PROC_SIZE 1088 +#define KINFO_PROC32_SIZE 768 + #ifdef _KERNEL /* Get the current kernel thread stack usage. */ ==== //depot/projects/soc2009/anchie_send/src/sys/arm/arm/pmap.c#8 (text+ko) ==== @@ -140,7 +140,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.119 2010/03/21 21:03:35 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.120 2010/04/24 17:32:52 alc Exp $"); #include #include #include @@ -4493,6 +4493,20 @@ /* + * pmap_is_referenced: + * + * Return whether or not the specified physical page was referenced + * in any physical maps. + */ +boolean_t +pmap_is_referenced(vm_page_t m) +{ + + return ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0 && + (m->md.pvh_attrs & PVF_REF) != 0); +} + +/* * pmap_clear_reference: * * Clear the reference bit on the specified physical page. ==== //depot/projects/soc2009/anchie_send/src/sys/arm/include/proc.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 * from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29 - * $FreeBSD: src/sys/arm/include/proc.h,v 1.6 2009/02/12 23:23:30 cognet Exp $ + * $FreeBSD: src/sys/arm/include/proc.h,v 1.7 2010/04/24 12:49:52 kib Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -60,4 +60,6 @@ void *md_sigtramp; }; +#define KINFO_PROC_SIZE 792 + #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.sparc64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.112 2010/04/10 11:52:12 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.113 2010/04/24 16:27:43 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -22,7 +22,7 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc @@ -42,11 +42,11 @@ dev/le/if_le_lebuffer.c optional le sbus dev/le/if_le_ledma.c optional le sbus dev/le/lebuffer_sbus.c optional le sbus -dev/ofw/ofw_if.m standard dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_bus_subr.c standard +dev/ofw/ofw_console.c optional ofw_console +dev/ofw/ofw_if.m standard dev/ofw/ofw_standard.c standard -dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard dev/ofw/openpromio.c standard @@ -79,7 +79,7 @@ sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci sparc64/pci/psycho.c optional pci -sparc64/pci/sbbc.c optional uart sbbc +sparc64/pci/sbbc.c optional sbbc uart sparc64/pci/schizo.c optional pci sparc64/sbus/dma_sbus.c optional sbus sparc64/sbus/sbus.c optional sbus ==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.sun4v#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sun4v,v 1.20 2009/12/23 21:04:31 marius Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.21 2010/04/24 16:27:43 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -18,12 +18,12 @@ clean "ukbdmap.h" # # -crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/ofw/ofw_bus_if.m standard -dev/ofw/ofw_if.m standard dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console +dev/ofw/ofw_if.m standard dev/ofw/ofw_standard.c standard dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard ==== //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drmP.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.45 2010/04/23 14:48:30 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.46 2010/04/24 18:13:12 rnoland Exp $"); #ifndef _DRM_P_H_ #define _DRM_P_H_ @@ -481,7 +481,6 @@ vm_offset_t vaddr; vm_paddr_t *busaddr; vm_pindex_t pages; - vm_object_t obj; } drm_sg_mem_t; #define DRM_MAP_HANDLE_BITS (sizeof(void *) == 4 ? 4 : 24) ==== //depot/projects/soc2009/anchie_send/src/sys/i386/i386/pmap.c#7 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.670 2010/03/27 23:53:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.672 2010/04/24 21:36:52 kmacy Exp $"); /* * Manages physical address maps. @@ -296,6 +296,7 @@ static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte); static boolean_t pmap_is_modified_pvh(struct md_page *pvh); +static boolean_t pmap_is_referenced_pvh(struct md_page *pvh); static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static void pmap_kenter_pde(vm_offset_t va, pd_entry_t newpde); static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va); @@ -1606,9 +1607,9 @@ --m->wire_count; if (m->wire_count == 0) - return _pmap_unwire_pte_hold(pmap, m, free); + return (_pmap_unwire_pte_hold(pmap, m, free)); else - return 0; + return (0); } static int @@ -1642,7 +1643,7 @@ */ pmap_add_delayed_free_list(m, free, TRUE); - return 1; + return (1); } /* @@ -1656,10 +1657,10 @@ vm_page_t mpte; if (va >= VM_MAXUSER_ADDRESS) - return 0; + return (0); ptepde = *pmap_pde(pmap, va); mpte = PHYS_TO_VM_PAGE(ptepde & PG_FRAME); - return pmap_unwire_pte_hold(pmap, mpte, free); + return (pmap_unwire_pte_hold(pmap, mpte, free)); } void @@ -1810,7 +1811,7 @@ pmap->pm_pdir[ptepindex] = (pd_entry_t) (ptepa | PG_U | PG_RW | PG_V | PG_A | PG_M); - return m; + return (m); } static vm_page_t @@ -2008,7 +2009,7 @@ { unsigned long ksize = VM_MAX_KERNEL_ADDRESS - KERNBASE; - return sysctl_handle_long(oidp, &ksize, 0, req); + return (sysctl_handle_long(oidp, &ksize, 0, req)); } SYSCTL_PROC(_vm, OID_AUTO, kvm_size, CTLTYPE_LONG|CTLFLAG_RD, 0, 0, kvm_size, "IU", "Size of KVM"); @@ -2018,7 +2019,7 @@ { unsigned long kfree = VM_MAX_KERNEL_ADDRESS - kernel_vm_end; - return sysctl_handle_long(oidp, &kfree, 0, req); + return (sysctl_handle_long(oidp, &kfree, 0, req)); } SYSCTL_PROC(_vm, OID_AUTO, kvm_free, CTLTYPE_LONG|CTLFLAG_RD, 0, 0, kvm_free, "IU", "Amount of KVM free"); @@ -2082,7 +2083,7 @@ pv_to_chunk(pv_entry_t pv) { - return (struct pv_chunk *)((uintptr_t)pv & ~(uintptr_t)PAGE_MASK); + return ((struct pv_chunk *)((uintptr_t)pv & ~(uintptr_t)PAGE_MASK)); } #define PV_PMAP(pv) (pv_to_chunk(pv)->pc_pmap) @@ -3661,7 +3662,7 @@ pte_store(pte, pa | PG_V | PG_U); else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); - return mpte; + return (mpte); } /* @@ -4058,12 +4059,12 @@ int loops = 0; if (m->flags & PG_FICTITIOUS) - return FALSE; + return (FALSE); mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (PV_PMAP(pv) == pmap) { - return TRUE; + return (TRUE); } loops++; if (loops >= 16) @@ -4356,6 +4357,51 @@ } /* + * pmap_is_referenced: + * + * Return whether or not the specified physical page was referenced + * in any physical maps. + */ +boolean_t +pmap_is_referenced(vm_page_t m) +{ + + if (m->flags & PG_FICTITIOUS) + return (FALSE); + if (pmap_is_referenced_pvh(&m->md)) + return (TRUE); + return (pmap_is_referenced_pvh(pa_to_pvh(VM_PAGE_TO_PHYS(m)))); +} + +/* + * Returns TRUE if any of the given mappings were referenced and FALSE + * otherwise. Both page and 4mpage mappings are supported. + */ +static boolean_t +pmap_is_referenced_pvh(struct md_page *pvh) +{ + pv_entry_t pv; + pt_entry_t *pte; + pmap_t pmap; + boolean_t rv; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + rv = FALSE; + sched_pin(); + TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte_quick(pmap, pv->pv_va); + rv = (*pte & (PG_A | PG_V)) == (PG_A | PG_V); + PMAP_UNLOCK(pmap); + if (rv) + break; + } + sched_unpin(); + return (rv); +} + +/* * Clear the write and modified bits in each of the given page's mappings. */ void @@ -4932,7 +4978,7 @@ if (pte != 0) { val |= MINCORE_INCORE; if ((pte & PG_MANAGED) == 0) - return val; + return (val); m = PHYS_TO_VM_PAGE(pa); @@ -4961,14 +5007,12 @@ */ vm_page_lock_queues(); if ((m->flags & PG_REFERENCED) || - pmap_ts_referenced(m)) { + pmap_is_referenced(m)) val |= MINCORE_REFERENCED_OTHER; - vm_page_flag_set(m, PG_REFERENCED); - } vm_page_unlock_queues(); } } - return val; + return (val); } void @@ -5063,7 +5107,7 @@ printf("\n"); } sx_sunlock(&allproc_lock); - return npte; + return (npte); } pte = pmap_pte(pmap, va); if (pte && pmap_pte_v(pte)) { @@ -5088,7 +5132,7 @@ } } sx_sunlock(&allproc_lock); - return npte; + return (npte); } #endif ==== //depot/projects/soc2009/anchie_send/src/sys/i386/include/proc.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/i386/include/proc.h,v 1.28 2008/09/12 09:53:29 kib Exp $ + * $FreeBSD: src/sys/i386/include/proc.h,v 1.29 2010/04/24 12:49:52 kib Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -57,6 +57,8 @@ struct proc_ldt *md_ldt; /* (t) per-process ldt */ }; +#define KINFO_PROC_SIZE 768 + #ifdef _KERNEL /* Get the current kernel thread stack usage. */ ==== //depot/projects/soc2009/anchie_send/src/sys/i386/xen/pmap.c#7 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/xen/pmap.c,v 1.33 2010/02/21 01:13:34 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/xen/pmap.c,v 1.34 2010/04/24 17:32:52 alc Exp $"); /* * Manages physical address maps. @@ -3718,6 +3718,34 @@ return (rv); } +boolean_t +pmap_is_referenced(vm_page_t m) +{ + pv_entry_t pv; + pt_entry_t *pte; + pmap_t pmap; + boolean_t rv; + + rv = FALSE; + if (m->flags & PG_FICTITIOUS) + return (rv); + sched_pin(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte_quick(pmap, pv->pv_va); + rv = (*pte & (PG_A | PG_V)) == (PG_A | PG_V); + PMAP_UNLOCK(pmap); + if (rv) + break; + } + if (*PMAP1) + PT_SET_MA(PADDR1, 0); + sched_unpin(); + return (rv); +} + void pmap_map_readonly(pmap_t pmap, vm_offset_t va, int len) { @@ -4145,10 +4173,8 @@ */ vm_page_lock_queues(); if ((m->flags & PG_REFERENCED) || - pmap_ts_referenced(m)) { + pmap_is_referenced(m)) val |= MINCORE_REFERENCED_OTHER; - vm_page_flag_set(m, PG_REFERENCED); - } vm_page_unlock_queues(); } } ==== //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/pmap.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.213 2010/03/22 18:24:42 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.214 2010/04/24 17:32:52 alc Exp $"); #include #include @@ -2023,6 +2023,37 @@ } /* + * pmap_is_referenced: + * + * Return whether or not the specified physical page was referenced + * in any physical maps. + */ +boolean_t +pmap_is_referenced(vm_page_t m) +{ + struct ia64_lpte *pte; + pmap_t oldpmap; + pv_entry_t pv; + boolean_t rv; + + rv = FALSE; + if (m->flags & PG_FICTITIOUS) + return (rv); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + PMAP_LOCK(pv->pv_pmap); + oldpmap = pmap_switch(pv->pv_pmap); + pte = pmap_find_vhpt(pv->pv_va); + pmap_switch(oldpmap); + KASSERT(pte != NULL, ("pte")); + rv = pmap_accessed(pte) ? TRUE : FALSE; + PMAP_UNLOCK(pv->pv_pmap); + if (rv) + break; + } + return (rv); +} + +/* * Clear the modify bits on the specified physical page. */ void @@ -2197,10 +2228,8 @@ * Referenced by someone */ vm_page_lock_queues(); - if (pmap_ts_referenced(m)) { + if (pmap_is_referenced(m)) val |= MINCORE_REFERENCED_OTHER; - vm_page_flag_set(m, PG_REFERENCED); - } vm_page_unlock_queues(); } } ==== //depot/projects/soc2009/anchie_send/src/sys/ia64/include/proc.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/proc.h,v 1.16 2009/10/31 22:27:31 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/proc.h,v 1.17 2010/04/24 12:49:52 kib Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -38,4 +38,7 @@ int __dummy; /* Avoid having an empty struct. */ }; +#define KINFO_PROC_SIZE 1088 +#define KINFO_PROC32_SIZE 768 + #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/soc2009/anchie_send/src/sys/kern/kern_proc.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.295 2010/04/21 20:04:42 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.296 2010/04/24 12:49:52 kib Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -151,6 +151,9 @@ SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0, ""); CTASSERT(sizeof(struct kinfo_proc) == KINFO_PROC_SIZE); +#ifdef COMPAT_FREEBSD32 +CTASSERT(sizeof(struct kinfo_proc32) == KINFO_PROC32_SIZE); +#endif /* * Initialize global process hashing structures. ==== //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_bio.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.569 2010/04/02 15:12:31 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.570 2010/04/24 07:05:35 jeff Exp $"); #include #include @@ -216,6 +216,14 @@ static int bd_request; /* + * Request for the buf daemon to write more buffers than is indicated by + * lodirtybuf. This may be necessary to push out excess dependencies or + * defragment the address space where a simple count of the number of dirty + * buffers is insufficient to characterize the demand for flushing them. + */ +static int bd_speedupreq; + +/* * This lock synchronizes access to bd_request. */ static struct mtx bdlock; @@ -467,12 +475,20 @@ * bd_speedup - speedup the buffer cache flushing code */ -static __inline void bd_speedup(void) { + int needwake; - bd_wakeup(1); + mtx_lock(&bdlock); + needwake = 0; + if (bd_speedupreq == 0 || bd_request == 0) + needwake = 1; + bd_speedupreq = 1; + bd_request = 1; + if (needwake) + wakeup(&bd_request); + mtx_unlock(&bdlock); } /* @@ -2120,6 +2136,7 @@ static void buf_daemon() { + int lodirtysave; /* * This process needs to be suspended prior to shutdown sync. @@ -2137,7 +2154,11 @@ mtx_unlock(&bdlock); kproc_suspend_check(bufdaemonproc); - + lodirtysave = lodirtybuffers; + if (bd_speedupreq) { + lodirtybuffers = numdirtybuffers / 2; + bd_speedupreq = 0; + } /* * Do the flush. Limit the amount of in-transit I/O we * allow to build up, otherwise we would completely saturate @@ -2149,6 +2170,7 @@ break; uio_yield(); } + lodirtybuffers = lodirtysave; /* * Only clear bd_request if we have reached our low water ==== //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_subr.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.779 2010/04/04 14:48:43 jh Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.780 2010/04/24 07:05:35 jeff Exp $"); #include "opt_ddb.h" @@ -2815,6 +2815,7 @@ MNT_FLAG(MNT_FORCE); MNT_FLAG(MNT_SNAPSHOT); MNT_FLAG(MNT_BYFSID); + MNT_FLAG(MNT_SOFTDEP); #undef MNT_FLAG if (flags != 0) { if (buf[0] != '\0') ==== //depot/projects/soc2009/anchie_send/src/sys/mips/conf/SWARM#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/sys/mips/conf/SWARM,v 1.9 2010/04/17 01:49:50 jmallett Exp $ +# $FreeBSD: src/sys/mips/conf/SWARM,v 1.10 2010/04/23 19:20:56 jmallett Exp $ # ident SWARM @@ -8,12 +8,6 @@ files "../sibyte/files.sibyte" hints "SWARM.hints" -# -# 32-bit kernel cannot deal with physical memory beyond 4GB -# XXX pmap assumes that all the memory can be mapped using KSEG0 -# -options MAXMEM=512*1024 - options CFE options CFE_CONSOLE options CFE_ENV ==== //depot/projects/soc2009/anchie_send/src/sys/mips/include/proc.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)proc.h 8.1 (Berkeley) 6/10/93 * JNPR: proc.h,v 1.7.2.1 2007/09/10 06:25:24 girish - * $FreeBSD: src/sys/mips/include/proc.h,v 1.4 2010/04/18 22:32:07 jmallett Exp $ + * $FreeBSD: src/sys/mips/include/proc.h,v 1.5 2010/04/24 12:49:52 kib Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -68,4 +68,10 @@ void mips_cpu_switch(struct thread *, struct thread *, struct mtx *); void mips_cpu_throw(struct thread *, struct thread *); +#ifdef __mips_n64 +#define KINFO_PROC_SIZE 1088 +#else +#define KINFO_PROC_SIZE 816 +#endif + #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/soc2009/anchie_send/src/sys/mips/include/vmparam.h#3 (text+ko) ==== @@ -37,7 +37,7 @@ * from: Utah Hdr: vmparam.h 1.16 91/01/18 * @(#)vmparam.h 8.2 (Berkeley) 4/22/94 * JNPR: vmparam.h,v 1.3.2.1 2007/09/10 06:01:28 girish - * $FreeBSD: src/sys/mips/include/vmparam.h,v 1.3 2010/04/17 07:20:01 jmallett Exp $ + * $FreeBSD: src/sys/mips/include/vmparam.h,v 1.4 2010/04/24 03:11:35 jmallett Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -152,9 +152,9 @@ #define VM_PHYSSEG_MAX 32 /* - * The physical address space is densely populated. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 24 22:39:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9238B1065674; Sat, 24 Apr 2010 22:39:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 567711065673 for ; Sat, 24 Apr 2010 22:39:19 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 44B738FC18 for ; Sat, 24 Apr 2010 22:39:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3OMdJFv088234 for ; Sat, 24 Apr 2010 22:39:19 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3OMdJAf088232 for perforce@freebsd.org; Sat, 24 Apr 2010 22:39:19 GMT (envelope-from anchie@FreeBSD.org) Date: Sat, 24 Apr 2010 22:39:19 GMT Message-Id: <201004242239.o3OMdJAf088232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 22:39:19 -0000 http://p4web.freebsd.org/@@177309?ac=10 Change 177309 by anchie@anchie_malimis on 2010/04/24 22:38:48 Removing whitespaces. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#27 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#36 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#27 (text+ko) ==== @@ -498,13 +498,12 @@ info.rti_info[RTAX_DST] = NULL; senderr(EINVAL); } - info.rti_flags = rtm->rtm_flags; + info.rti_flags = rtm->rtm_flags; if (info.rti_info[RTAX_DST] == NULL || - info.rti_info[RTAX_DST]->sa_family >= AF_MAX || - (info.rti_info[RTAX_GATEWAY] != NULL && - info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) - senderr(EINVAL); - + info.rti_info[RTAX_DST]->sa_family >= AF_MAX || + (info.rti_info[RTAX_GATEWAY] != NULL && + info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) + senderr(EINVAL); /* * Verify that the caller has the appropriate privilege; RTM_GET * is the only operation the non-superuser is allowed. ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#36 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Apr 24 22:55:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75497106567C; Sat, 24 Apr 2010 22:55:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0785F1065675 for ; Sat, 24 Apr 2010 22:55:36 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA0D08FC18 for ; Sat, 24 Apr 2010 22:55:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3OMtZUk089546 for ; Sat, 24 Apr 2010 22:55:35 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3OMtZnY089544 for perforce@freebsd.org; Sat, 24 Apr 2010 22:55:35 GMT (envelope-from anchie@FreeBSD.org) Date: Sat, 24 Apr 2010 22:55:35 GMT Message-Id: <201004242255.o3OMtZnY089544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 22:55:36 -0000 http://p4web.freebsd.org/@@177312?ac=10 Change 177312 by anchie@anchie_malimis on 2010/04/24 22:55:28 Cleaning whitespaces. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#28 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#37 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#28 (text+ko) ==== @@ -498,7 +498,7 @@ info.rti_info[RTAX_DST] = NULL; senderr(EINVAL); } - info.rti_flags = rtm->rtm_flags; + info.rti_flags = rtm->rtm_flags; if (info.rti_info[RTAX_DST] == NULL || info.rti_info[RTAX_DST]->sa_family >= AF_MAX || (info.rti_info[RTAX_GATEWAY] != NULL && ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#37 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. * @@ -145,6 +145,7 @@ struct ifnet *, int)); static int icmp6_notify_error(struct mbuf **, int, int, int); + void icmp6_init(void) { From owner-p4-projects@FreeBSD.ORG Sat Apr 24 23:08:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFCC61065675; Sat, 24 Apr 2010 23:08:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74525106566B for ; Sat, 24 Apr 2010 23:08:49 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4980F8FC20 for ; Sat, 24 Apr 2010 23:08:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3ON8nON091497 for ; Sat, 24 Apr 2010 23:08:49 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3ON8nVn091495 for perforce@freebsd.org; Sat, 24 Apr 2010 23:08:49 GMT (envelope-from anchie@FreeBSD.org) Date: Sat, 24 Apr 2010 23:08:49 GMT Message-Id: <201004242308.o3ON8nVn091495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 23:08:49 -0000 http://p4web.freebsd.org/@@177313?ac=10 Change 177313 by anchie@anchie_malimis on 2010/04/24 23:08:09 Whitespaces cleaning.. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#29 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#38 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#29 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#38 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Apr 24 23:39:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC2061065672; Sat, 24 Apr 2010 23:39:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0C2C106566B for ; Sat, 24 Apr 2010 23:39:20 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F5F38FC08 for ; Sat, 24 Apr 2010 23:39:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3ONdKGW093941 for ; Sat, 24 Apr 2010 23:39:20 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3ONdK9o093939 for perforce@freebsd.org; Sat, 24 Apr 2010 23:39:20 GMT (envelope-from bz@freebsd.org) Date: Sat, 24 Apr 2010 23:39:20 GMT Message-Id: <201004242339.o3ONdK9o093939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 23:39:21 -0000 http://p4web.freebsd.org/@@177318?ac=10 Change 177318 by bz@bz_dumpster on 2010/04/24 23:39:18 Eliminate the whitespace diff. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#30 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#30 (text+ko) ==== @@ -500,10 +500,10 @@ } info.rti_flags = rtm->rtm_flags; if (info.rti_info[RTAX_DST] == NULL || - info.rti_info[RTAX_DST]->sa_family >= AF_MAX || - (info.rti_info[RTAX_GATEWAY] != NULL && - info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) - senderr(EINVAL); + info.rti_info[RTAX_DST]->sa_family >= AF_MAX || + (info.rti_info[RTAX_GATEWAY] != NULL && + info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) + senderr(EINVAL); /* * Verify that the caller has the appropriate privilege; RTM_GET * is the only operation the non-superuser is allowed. From owner-p4-projects@FreeBSD.ORG Sat Apr 24 23:42:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 159FC1065672; Sat, 24 Apr 2010 23:42:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE586106564A for ; Sat, 24 Apr 2010 23:42:23 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BCEDB8FC08 for ; Sat, 24 Apr 2010 23:42:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3ONgNdT094215 for ; Sat, 24 Apr 2010 23:42:23 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3ONgNVX094213 for perforce@freebsd.org; Sat, 24 Apr 2010 23:42:23 GMT (envelope-from bz@freebsd.org) Date: Sat, 24 Apr 2010 23:42:23 GMT Message-Id: <201004242342.o3ONgNVX094213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 23:42:24 -0000 http://p4web.freebsd.org/@@177319?ac=10 Change 177319 by bz@bz_dumpster on 2010/04/24 23:41:58 Correct $FreeBSD$ probably wrong due to a mis-integ. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#14 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/icmp6.h,v 1.24 2009/04/29 10:20:17 bms Exp $ */ +/* $FreeBSD: src/sys/netinet/icmp6.h,v 1.27 2009/08/02 19:43:32 rwatson Exp $ */ /* $KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $ */ /*-