From owner-p4-projects@FreeBSD.ORG Sun Feb 12 01:18:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AA1C16A423; Sun, 12 Feb 2006 01:18:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2839416A422 for ; Sun, 12 Feb 2006 01:18:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B1EB43D55 for ; Sun, 12 Feb 2006 01:18:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1C1IUbV021846 for ; Sun, 12 Feb 2006 01:18:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1C1IU8q021843 for perforce@freebsd.org; Sun, 12 Feb 2006 01:18:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Feb 2006 01:18:30 GMT Message-Id: <200602120118.k1C1IU8q021843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 01:18:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=91600 Change 91600 by rwatson@rwatson_peppercorn on 2006/02/12 01:17:49 Integrate last few changes from OpenBSM 1.0 alpha 4 from OpenBSM branch to TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 (text+ko) ==== @@ -64,6 +64,7 @@ Poul-Henning Kamp Christian Brueffer Olivier Houchard + Christian Peron In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -85,4 +86,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#7 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 $ # MAN= audit.2 \ @@ -16,4 +16,7 @@ audit_user.5 \ audit_warn.5 +MLINKS= getaudit.2 getaudit_addr.2 \ + setaudit.2 setaudit_addr.2 + .include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#5 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 $ */ #include @@ -41,7 +41,7 @@ usage(void) { - fprintf(stderr, "usage: dump [class|class_r|control|event|event_r|" + fprintf(stderr, "usage: audump [class|class_r|control|event|event_r|" "user|user_r]\n"); exit(-1); } From owner-p4-projects@FreeBSD.ORG Sun Feb 12 03:43:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED1A716A423; Sun, 12 Feb 2006 03:43:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A944716A420 for ; Sun, 12 Feb 2006 03:43:27 +0000 (GMT) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7561D43D45 for ; Sun, 12 Feb 2006 03:43:27 +0000 (GMT) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1C3hRAn027907 for ; Sun, 12 Feb 2006 03:43:27 GMT (envelope-from jkoshy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1C3hRqV027904 for perforce@freebsd.org; Sun, 12 Feb 2006 03:43:27 GMT (envelope-from jkoshy@freebsd.org) Date: Sun, 12 Feb 2006 03:43:27 GMT Message-Id: <200602120343.k1C3hRqV027904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkoshy@freebsd.org using -f From: Joseph Koshy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 03:43:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91605 Change 91605 by jkoshy@jkoshy_orthanc_mips on 2006/02/12 03:43:02 Unbreak `make _libraries'. Affected files ... .. //depot/projects/mips/libexec/rtld-aout/shlib.c#2 integrate .. //depot/projects/mips/libexec/rtld-aout/shlib.h#2 integrate Differences ... ==== //depot/projects/mips/libexec/rtld-aout/shlib.c#2 (text+ko) ==== @@ -27,7 +27,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/libexec/rtld-aout/shlib.c,v 1.23 2002/09/17 01:48:53 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.26 2005/01/14 12:22:57 delphij Exp $ */ #include @@ -62,14 +62,13 @@ char **search_dirs; int n_search_dirs; -char *standard_search_dirs[] = { +const char *standard_search_dirs[] = { STANDARD_SEARCH_DIRS }; void -add_search_dir(name) - char *name; +add_search_dir(const char *name) { int n; @@ -269,7 +268,7 @@ int *minorp; int do_dot_a; { - int namelen; + size_t namelen; DIR *dd; struct dirent *dp; int best_dewey[MAXDEWEY]; ==== //depot/projects/mips/libexec/rtld-aout/shlib.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- - * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.5 1999/08/28 00:10:06 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.8 2005/01/14 12:22:57 delphij Exp $ */ /* @@ -33,7 +33,7 @@ extern char **search_dirs; extern int n_search_dirs; -void add_search_dir __P((char *)); +void add_search_dir __P((const char *)); void add_search_path __P((char *)); void std_search_path __P((void)); int getdewey __P((int[], char *)); From owner-p4-projects@FreeBSD.ORG Sun Feb 12 07:30:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFCEC16A423; Sun, 12 Feb 2006 07:30:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76B3D16A420 for ; Sun, 12 Feb 2006 07:30:12 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCF4943D55 for ; Sun, 12 Feb 2006 07:30:11 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1C7UBab043673 for ; Sun, 12 Feb 2006 07:30:11 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1C7UBME043670 for perforce@freebsd.org; Sun, 12 Feb 2006 07:30:11 GMT (envelope-from csjp@freebsd.org) Date: Sun, 12 Feb 2006 07:30:11 GMT Message-Id: <200602120730.k1C7UBME043670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 07:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=91607 Change 91607 by csjp@csjp_xor on 2006/02/12 07:29:11 Document the NO_AUDIT Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#8 (text+ko) ==== @@ -467,6 +467,9 @@ .Pq Vt bool Set to not build programs and libraries related to ATM networking. +.It Va NO_AUDIT +.Pq Vt bool +Set to not build audit support. .It Va NO_AUTHPF .Pq Vt bool Set to not build From owner-p4-projects@FreeBSD.ORG Sun Feb 12 13:03:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7136916A423; Sun, 12 Feb 2006 13:03:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2905716A420 for ; Sun, 12 Feb 2006 13:03:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E534943D45 for ; Sun, 12 Feb 2006 13:03:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1CD3eGq071059 for ; Sun, 12 Feb 2006 13:03:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1CD3ebW071055 for perforce@freebsd.org; Sun, 12 Feb 2006 13:03:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Feb 2006 13:03:40 GMT Message-Id: <200602121303.k1CD3ebW071055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 13:03:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=91612 Change 91612 by rwatson@rwatson_peppercorn on 2006/02/12 13:03:30 Document that /etc files will have to be installed manually. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#15 (text+ko) ==== @@ -46,6 +46,10 @@ % bsdmake # bsdmake install +In both cases, you will need to manually propagate openbsm/etc/* into /etc +on your system; this is not done automatically so as to avoid disrupting +the current configuration. + Credits The following organizations and individuals have contributed substantially @@ -86,4 +90,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#14 $ +$P4: //depot/projects/trustedbsd/openbsm/README#15 $ From owner-p4-projects@FreeBSD.ORG Sun Feb 12 17:52:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D017316A423; Sun, 12 Feb 2006 17:52:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F46116A420 for ; Sun, 12 Feb 2006 17:52:42 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 479ED43D46 for ; Sun, 12 Feb 2006 17:52:42 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1CHqgXB093766 for ; Sun, 12 Feb 2006 17:52:42 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1CHqf6M093763 for perforce@freebsd.org; Sun, 12 Feb 2006 17:52:41 GMT (envelope-from csjp@freebsd.org) Date: Sun, 12 Feb 2006 17:52:41 GMT Message-Id: <200602121752.k1CHqf6M093763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 17:52:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=91634 Change 91634 by csjp@csjp_xor on 2006/02/12 17:51:52 Take the first stab at adding audit support into su(1). This will create a failure token for any error which will result in err{x}(3) being called. Here is a sample audit trail of a failed, then successful audit trail: header,68,1,su(1),0,Sun Feb 12 11:48:01 2006, + 877 msec subject,csjp,root,1001,csjp,1001,863,863,0,0.0.0.0 return,failure : Operation not permitted,1 trailer,68 header,68,1,su(1),0,Sun Feb 12 11:48:03 2006, + 655 msec subject,csjp,root,wheel,root,wheel,865,865,0,0.0.0.0 return,success,0 trailer,68 This code will conditionally be compiled into su(1) based on the status of the NO_AUDIT boolean make flag. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#3 edit .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#3 (text+ko) ==== @@ -10,4 +10,10 @@ BINMODE=4555 PRECIOUSPROG= +.if !defined(NO_AUDIT) +CFLAGS+= -DUSE_BSM_AUDIT +DPADD+= ${LIBBSM} +LDADD+= -lbsm +.endif + .include ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#5 (text+ko) ==== @@ -81,6 +81,9 @@ #include #include +#include +#include + #include #include #include @@ -131,6 +134,7 @@ } while (0) enum tristate { UNSET, YES, NO }; +enum auditevents { AUDIT_SU_FAILURE, AUDIT_SU_SUCCESS }; static pam_handle_t *pamh = NULL; static char **environ_pam; @@ -140,6 +144,7 @@ static void usage(void) __dead2; static void export_pam_environment(void); static int ok_to_export(const char *); +static void audit_su(au_id_t, int); extern char **environ; @@ -204,19 +209,31 @@ usage(); /* NOTREACHED */ - if (strlen(user) > MAXLOGNAME - 1) + if (strlen(user) > MAXLOGNAME - 1) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "username too long"); + } /* * Try to provide more helpful debugging output if su(1) is running * non-setuid, or was run from a file system not mounted setuid. */ - if (geteuid() != 0) + if (geteuid() != 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "not running setuid"); + } nargv = malloc(sizeof(char *) * (size_t)(argc + 4)); - if (nargv == NULL) + if (nargv == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "malloc failure"); + } nargv[argc + 3] = NULL; for (i = argc; i >= optind; i--) @@ -239,12 +256,20 @@ pwd = getpwnam(username); if (username == NULL || pwd == NULL || pwd->pw_uid != ruid) pwd = getpwuid(ruid); - if (pwd == NULL) + if (pwd == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "who are you?"); + } username = strdup(pwd->pw_name); - if (username == NULL) + if (username == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "strdup failure"); + } if (asme) { if (pwd->pw_shell != NULL && *pwd->pw_shell != '\0') { @@ -262,6 +287,9 @@ /* Do the whole PAM startup thing */ retcode = pam_start("su", user, &conv, &pamh); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif syslog(LOG_ERR, "pam_start: %s", pam_strerror(pamh, retcode)); errx(1, "pam_start: %s", pam_strerror(pamh, retcode)); } @@ -275,6 +303,9 @@ retcode = pam_authenticate(pamh, 0); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(ruid, AUDIT_SU_FAILURE); +#endif syslog(LOG_AUTH|LOG_WARNING, "BAD SU %s to %s on %s", username, user, mytty); errx(1, "Sorry"); @@ -286,8 +317,12 @@ syslog(LOG_ERR, "pam_get_item(PAM_USER): %s", pam_strerror(pamh, retcode)); pwd = getpwnam(user); - if (pwd == NULL) + if (pwd == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "unknown login: %s", user); + } retcode = pam_acct_mgmt(pamh, 0); if (retcode == PAM_NEW_AUTHTOK_REQD) { @@ -296,10 +331,16 @@ if (retcode != PAM_SUCCESS) { syslog(LOG_ERR, "pam_chauthtok: %s", pam_strerror(pamh, retcode)); +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "Sorry"); } } if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif syslog(LOG_ERR, "pam_acct_mgmt: %s", pam_strerror(pamh, retcode)); errx(1, "Sorry"); @@ -309,17 +350,29 @@ if (class == NULL) lc = login_getpwclass(pwd); else { - if (ruid != 0) + if (ruid != 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "only root may use -c"); + } lc = login_getclass(class); - if (lc == NULL) + if (lc == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "unknown class: %s", class); + } } /* if asme and non-standard target shell, must be root */ if (asme) { - if (ruid != 0 && !chshell(pwd->pw_shell)) + if (ruid != 0 && !chshell(pwd->pw_shell)) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "permission denied (shell)"); + } } else if (pwd->pw_shell && *pwd->pw_shell) { shell = pwd->pw_shell; @@ -343,19 +396,30 @@ /* Switch to home directory */ if (asthem) { - if (chdir(pwd->pw_dir) < 0) + if (chdir(pwd->pw_dir) < 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "no directory"); + } } /* * PAM modules might add supplementary groups in pam_setcred(), so * initialize them first. */ - if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) + if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "setusercontext"); + } retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif syslog(LOG_ERR, "pam_setcred: %s", pam_strerror(pamh, retcode)); errx(1, "failed to establish credentials."); @@ -363,6 +427,9 @@ if (asthem) { retcode = pam_open_session(pamh, 0); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif syslog(LOG_ERR, "pam_open_session: %s", pam_strerror(pamh, retcode)); errx(1, "failed to open session."); @@ -384,6 +451,9 @@ statusp = 1; if (pipe(fds) == -1) { PAM_END(); +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "pipe"); } child_pid = fork(); @@ -416,12 +486,19 @@ child_pgrp = getpgid(child_pid); if (tcgetpgrp(STDERR_FILENO) == child_pgrp) tcsetpgrp(STDERR_FILENO, getpgrp()); - if (pid == -1) + if (pid == -1) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "waitpid"); + } PAM_END(); exit(WEXITSTATUS(statusp)); case -1: PAM_END(); +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "fork"); case 0: close(fds[1]); @@ -449,8 +526,12 @@ */ if ((asme || (!asthem && class == NULL)) && pwd->pw_uid) setwhat &= ~(LOGIN_SETPRIORITY | LOGIN_SETRESOURCES); - if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) + if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "setusercontext"); + } if (!asme) { if (asthem) { @@ -491,7 +572,10 @@ /* csh strips the first character... */ *np.a = asthem ? "-su" : iscsh == YES ? "_su" : "su"; - if (ruid != 0) +#ifdef USE_BSM_AUDIT + audit_su(ruid, AUDIT_SU_SUCCESS); +#endif + if (ruid != 0) syslog(LOG_NOTICE, "%s to %s%s", username, user, ontty()); @@ -578,3 +662,50 @@ snprintf(buf, sizeof(buf), " on %s", p); return buf; } + +#ifdef USE_BSM_AUDIT +static void +audit_su(au_id_t au_ctx, int what) +{ + token_t *token; + long acond; + int afd; + au_tid_t termid; + pid_t pid; + + if (auditon(A_GETCOND, &acond, sizeof(long)) < 0) { + /* + * If auditon(2) returns ENOSYS, then audit has not been + * compiled into the kernel, so just return. + */ + if (errno == ENOSYS) + return; + err(1, "auditon failed"); + } + afd = au_open(); + if (afd < 0) + err(1, "au_open failed"); + /* XXX what should we do for termid? */ + bzero(&termid, sizeof(termid)); + pid = getpid(); + token = au_to_subject32(au_ctx, geteuid(), getegid(), + getuid(), getgid(), pid, pid, &termid); + if (token == NULL) + errx(1, "audit: unable to build subject token"); + /* XXX what if au_fails? */ + (void) au_write(afd, token); + switch (what) { + case AUDIT_SU_FAILURE: + token = au_to_return32(1, EPERM); + break; + case AUDIT_SU_SUCCESS: + token = au_to_return32(0, 0); + break; + } + if (token == NULL) + errx(1, "audit: unable to build return32 token"); + (void) au_write(afd, token); + if (au_close(afd, 1, AUE_su) < 0) + errx(1, "audit: record not committed"); +} +#endif From owner-p4-projects@FreeBSD.ORG Sun Feb 12 17:58:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 922CA16A423; Sun, 12 Feb 2006 17:58:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5429016A420 for ; Sun, 12 Feb 2006 17:58:50 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2480543D46 for ; Sun, 12 Feb 2006 17:58:50 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1CHwoka094056 for ; Sun, 12 Feb 2006 17:58:50 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1CHwnci094053 for perforce@freebsd.org; Sun, 12 Feb 2006 17:58:49 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 12 Feb 2006 17:58:49 GMT Message-Id: <200602121758.k1CHwnci094053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 17:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=91635 Change 91635 by brueffer@brueffer_serenity on 2006/02/12 17:57:59 Document NO_AUDIT. Affected files ... .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#9 (text+ko) ==== @@ -99,6 +99,7 @@ # To avoid building various parts of the base system: #NO_ACPI= # do not build acpiconf(8) and related programs #NO_ATM= # do not build ATM related programs and libraries +#NO_AUDIT= # do not build audit(4) support #NO_AUTHPF= # do not build and install authpf (setuid/gid) #NO_BLUETOOTH= # do not build Bluetooth related stuff #NO_BOOT= # do not build boot blocks and loader From owner-p4-projects@FreeBSD.ORG Sun Feb 12 18:51:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6488916A423; Sun, 12 Feb 2006 18:51:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1982716A420 for ; Sun, 12 Feb 2006 18:51:58 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC53243D48 for ; Sun, 12 Feb 2006 18:51:57 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1CIpvx4096269 for ; Sun, 12 Feb 2006 18:51:57 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1CIpvuc096266 for perforce@freebsd.org; Sun, 12 Feb 2006 18:51:57 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 12 Feb 2006 18:51:57 GMT Message-Id: <200602121851.k1CIpvuc096266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 18:51:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=91641 Change 91641 by brueffer@brueffer_serenity on 2006/02/12 18:51:39 Make audit binaries conditional on NO_AUDIT. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#13 (text+ko) ==== @@ -12,10 +12,10 @@ ${_apmd} \ ${_arlcontrol} \ arp \ - audit \ - auditd \ - auditon \ - auditreduce \ + ${_audit} \ + ${_auditd} \ + ${_auditon} \ + ${_auditreduce} \ ${_asf} \ ${_atm} \ ${_authpf} \ @@ -124,7 +124,7 @@ pppd \ pppstats \ ${_praliases} \ - praudit \ + ${_praudit} \ procctl \ pstat \ pw \ @@ -200,6 +200,14 @@ _atm= atm .endif +.if !defined(NO_AUDIT) +_audit= audit +_auditd= auditd +_auditon= auditon +_auditreduce= auditreduce +_praudit= praudit +.endif + .if !defined(NO_BIND) .if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT) _dnssec-keygen= dnssec-keygen From owner-p4-projects@FreeBSD.ORG Mon Feb 13 00:51:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8D9216A423; Mon, 13 Feb 2006 00:51:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9594416A420 for ; Mon, 13 Feb 2006 00:51:26 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EAF243D45 for ; Mon, 13 Feb 2006 00:51:26 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1D0pQ8Y032896 for ; Mon, 13 Feb 2006 00:51:26 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1D0pQN1032893 for perforce@freebsd.org; Mon, 13 Feb 2006 00:51:26 GMT (envelope-from csjp@freebsd.org) Date: Mon, 13 Feb 2006 00:51:26 GMT Message-Id: <200602130051.k1D0pQN1032893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 00:51:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91655 Change 91655 by csjp@csjp_xor on 2006/02/13 00:50:26 - Check to see if we are runing as root, if we aren't the drop the call to audit failure. - Re-arrange the max login name logic so we don't audit failure due to excessive login name lengths when we are not root. - Don't attempt to audit after we have called setusercontext(), as it is possible that we are no longer running with the required privilege. - Move successful audits to right after the authentication succeeds. Discussed with: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#6 (text+ko) ==== @@ -209,22 +209,19 @@ usage(); /* NOTREACHED */ - if (strlen(user) > MAXLOGNAME - 1) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif - errx(1, "username too long"); - } - /* * Try to provide more helpful debugging output if su(1) is running * non-setuid, or was run from a file system not mounted setuid. */ if (geteuid() != 0) { + errx(1, "not running setuid"); + } + + if (strlen(user) > MAXLOGNAME - 1) { #ifdef USE_BSM_AUDIT audit_su(getuid(), AUDIT_SU_FAILURE); #endif - errx(1, "not running setuid"); + errx(1, "username too long"); } nargv = malloc(sizeof(char *) * (size_t)(argc + 4)); @@ -310,6 +307,9 @@ username, user, mytty); errx(1, "Sorry"); } +#ifdef USE_BSM_AUDIT + audit_su(ruid, AUDIT_SU_SUCCESS); +#endif retcode = pam_get_item(pamh, PAM_USER, (const void **)&p); if (retcode == PAM_SUCCESS) user = p; @@ -572,9 +572,6 @@ /* csh strips the first character... */ *np.a = asthem ? "-su" : iscsh == YES ? "_su" : "su"; -#ifdef USE_BSM_AUDIT - audit_su(ruid, AUDIT_SU_SUCCESS); -#endif if (ruid != 0) syslog(LOG_NOTICE, "%s to %s%s", username, user, ontty()); From owner-p4-projects@FreeBSD.ORG Mon Feb 13 01:11:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31BF816A423; Mon, 13 Feb 2006 01:11:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E681616A420 for ; Mon, 13 Feb 2006 01:11:54 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64DBD43D6D for ; Mon, 13 Feb 2006 01:11:51 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1D1Bp8v033816 for ; Mon, 13 Feb 2006 01:11:51 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1D1BoiB033813 for perforce@freebsd.org; Mon, 13 Feb 2006 01:11:50 GMT (envelope-from csjp@freebsd.org) Date: Mon, 13 Feb 2006 01:11:50 GMT Message-Id: <200602130111.k1D1BoiB033813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91656 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 01:11:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=91656 Change 91656 by csjp@csjp_xor on 2006/02/13 01:11:27 Drop audit failures for reasons which were caused by the operating system instead of reasons caused by the user. An example might be failure to create a set of pipes via pipe(2) or the failure to fork a process. Discussed with: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#7 (text+ko) ==== @@ -226,9 +226,6 @@ nargv = malloc(sizeof(char *) * (size_t)(argc + 4)); if (nargv == NULL) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "malloc failure"); } @@ -262,9 +259,6 @@ username = strdup(pwd->pw_name); if (username == NULL) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "strdup failure"); } @@ -451,9 +445,6 @@ statusp = 1; if (pipe(fds) == -1) { PAM_END(); -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "pipe"); } child_pid = fork(); @@ -487,18 +478,12 @@ if (tcgetpgrp(STDERR_FILENO) == child_pgrp) tcsetpgrp(STDERR_FILENO, getpgrp()); if (pid == -1) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "waitpid"); } PAM_END(); exit(WEXITSTATUS(statusp)); case -1: PAM_END(); -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "fork"); case 0: close(fds[1]); From owner-p4-projects@FreeBSD.ORG Mon Feb 13 03:21:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DC7D16A423; Mon, 13 Feb 2006 03:21:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC16416A420 for ; Mon, 13 Feb 2006 03:21:10 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D2AF43D48 for ; Mon, 13 Feb 2006 03:21:10 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1D3LAcZ039079 for ; Mon, 13 Feb 2006 03:21:10 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1D3KeOw039004 for perforce@freebsd.org; Mon, 13 Feb 2006 03:20:40 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 13 Feb 2006 03:20:40 GMT Message-Id: <200602130320.k1D3KeOw039004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 03:21:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=91658 Change 91658 by kmacy@kmacy:freebsd7_xen3 on 2006/02/13 03:19:58 IFC - no conflicts Affected files ... .. //depot/projects/xen3/src/sys/Makefile#2 integrate .. //depot/projects/xen3/src/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/xen3/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/xen3/src/sys/alpha/include/_types.h#2 integrate .. //depot/projects/xen3/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/xen3/src/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/xen3/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/xen3/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/xen3/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/xen3/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/xen3/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/xen3/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/xen3/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/xen3/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/xen3/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/xen3/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91st.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/files.at91rm92#1 branch .. //depot/projects/xen3/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/xen3/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/xen3/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/xen3/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/xen3/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/std.at91rm92#1 branch .. //depot/projects/xen3/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/xen3/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/xen3/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/xen3/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/xen3/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/xen3/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/xen3/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/xen3/src/sys/arm/include/param.h#2 integrate .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/xen3/src/sys/boot/common/module.c#2 integrate .. //depot/projects/xen3/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/xen3/src/sys/bsm/audit.h#2 integrate .. //depot/projects/xen3/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/xen3/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/xen3/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/xen3/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/xen3/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/xen3/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/xen3/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/xen3/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/xen3/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/xen3/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/xen3/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/xen3/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/xen3/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/xen3/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/xen3/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/xen3/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/xen3/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/xen3/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/xen3/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/xen3/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/xen3/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/xen3/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/xen3/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/xen3/src/sys/conf/NOTES#3 integrate .. //depot/projects/xen3/src/sys/conf/files#4 integrate .. //depot/projects/xen3/src/sys/conf/files.amd64#2 integrate .. //depot/projects/xen3/src/sys/conf/files.i386#2 integrate .. //depot/projects/xen3/src/sys/conf/files.pc98#2 integrate .. //depot/projects/xen3/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/xen3/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/xen3/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/xen3/src/sys/conf/options#3 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/xen3/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/xen3/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/xen3/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/xen3/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/xen3/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/xen3/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/xen3/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/xen3/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/xen3/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/xen3/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/xen3/src/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/xen3/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/xen3/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/xen3/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/xen3/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/xen3/src/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/xen3/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/xen3/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/xen3/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/xen3/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/xen3/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/xen3/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/xen3/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/xen3/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/xen3/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/xen3/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/xen3/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/xen3/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/xen3/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/xen3/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/xen3/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/xen3/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/xen3/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/xen3/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/xen3/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/xen3/src/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/xen3/src/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/xen3/src/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/xen3/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/isp_inline.h#2 delete .. //depot/projects/xen3/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/xen3/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/xen3/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/xen3/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/xen3/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/xen3/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/xen3/src/sys/dev/le/am7990.c#1 branch .. //depot/projects/xen3/src/sys/dev/le/am79900.c#1 branch .. //depot/projects/xen3/src/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/xen3/src/sys/dev/le/am79900var.h#1 branch .. //depot/projects/xen3/src/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/xen3/src/sys/dev/le/am7990var.h#1 branch .. //depot/projects/xen3/src/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/xen3/src/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/xen3/src/sys/dev/le/lance.c#1 branch .. //depot/projects/xen3/src/sys/dev/le/lancereg.h#1 branch .. //depot/projects/xen3/src/sys/dev/le/lancevar.h#1 branch .. //depot/projects/xen3/src/sys/dev/md/md.c#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/fc_log.h#2 delete .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_fc.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_lan.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/xen3/src/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/xen3/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/xen3/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/xen3/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/xen3/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ral/if_ral.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ral/if_ralvar.h#2 integrate .. //depot/projects/xen3/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/xen3/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/xen3/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/xen3/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/xen3/src/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/xen3/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/ufoma.c#1 branch .. //depot/projects/xen3/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/xen3/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/xen3/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/xen3/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/xen3/src/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/xen3/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/xen3/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/xen3/src/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/xen3/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/xen3/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/xen3/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/xen3/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/xen3/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/xen3/src/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/xen3/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/xen3/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/xen3/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/xen3/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/xen3/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/xen3/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/xen3/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/xen3/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/xen3/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/xen3/src/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/xen3/src/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/xen3/src/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/xen3/src/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/xen3/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/xen3/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/xen3/src/sys/geom/label/g_label_iso9660.c#2 integrate .. //depot/projects/xen3/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/xen3/src/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/xen3/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/xen3/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/xen3/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/xen3/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/xen3/src/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/xen3/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/xen3/src/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/xen3/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/xen3/src/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/xen3/src/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/xen3/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/xen3/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/xen3/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/xen3/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/xen3/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/xen3/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/xen3/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/xen3/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/xen3/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/xen3/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/xen3/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/xen3/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/xen3/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/xen3/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/xen3/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/xen3/src/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/xen3/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/xen3/src/sys/i386/include/cserial.h#2 integrate .. //depot/projects/xen3/src/sys/i386/include/param.h#2 integrate .. //depot/projects/xen3/src/sys/i386/include/xbox.h#2 integrate .. //depot/projects/xen3/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/xen3/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/xen3/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/xen3/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/xen3/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/xen3/src/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/xen3/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/xen3/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/xen3/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/xen3/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/xen3/src/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/xen3/src/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/xen3/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/xen3/src/sys/ia64/include/_types.h#2 integrate .. //depot/projects/xen3/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/xen3/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/xen3/src/sys/isofs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/xen3/src/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/xen3/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/xen3/src/sys/kern/init_main.c#2 integrate .. //depot/projects/xen3/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/xen3/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/xen3/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/xen3/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/xen3/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/xen3/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/xen3/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/xen3/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/xen3/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/xen3/src/sys/kern/md5c.c#2 integrate .. //depot/projects/xen3/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/xen3/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/xen3/src/sys/kern/subr_firmware.c#1 branch .. //depot/projects/xen3/src/sys/kern/subr_lock.c#1 branch .. //depot/projects/xen3/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/xen3/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/xen3/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/xen3/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/xen3/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/xen3/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/xen3/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/xen3/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/xen3/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/xen3/src/sys/kern/tty.c#3 integrate .. //depot/projects/xen3/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/xen3/src/sys/kern/tty_pts.c#1 branch .. //depot/projects/xen3/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/xen3/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/xen3/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/xen3/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/xen3/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/xen3/src/sys/libkern/fnmatch.c#2 integrate .. //depot/projects/xen3/src/sys/libkern/gets.c#2 integrate .. //depot/projects/xen3/src/sys/modules/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/amr/amr_linux/Makefile#1 branch .. //depot/projects/xen3/src/sys/modules/arcnet/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/ce/Makefile#1 branch .. //depot/projects/xen3/src/sys/modules/firmware/Makefile#1 branch .. //depot/projects/xen3/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/xen3/src/sys/modules/le/Makefile#1 branch .. //depot/projects/xen3/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/nwfs/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/pflog/Makefile#1 branch .. //depot/projects/xen3/src/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/xen3/src/sys/modules/ufoma/Makefile#1 branch .. //depot/projects/xen3/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/xen3/src/sys/net/if.c#2 integrate .. //depot/projects/xen3/src/sys/net/if.h#2 integrate .. //depot/projects/xen3/src/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/xen3/src/sys/net/if_ef.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_gif.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_gif.h#2 integrate .. //depot/projects/xen3/src/sys/net/if_gre.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_var.h#2 integrate .. //depot/projects/xen3/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/xen3/src/sys/net/pfil.c#2 integrate .. //depot/projects/xen3/src/sys/net/pfil.h#2 integrate .. //depot/projects/xen3/src/sys/net/radix.c#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/xen3/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/xen3/src/sys/netatm/atm_signal.c#2 integrate .. //depot/projects/xen3/src/sys/netatm/ipatm/ipatm_vcm.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/xen3/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/xen3/src/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/in.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/in_gif.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_gre.h#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/xen3/src/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/xen3/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/xen3/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/xen3/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/in6.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/xen3/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/xen3/src/sys/netipsec/keysock.c#2 integrate .. //depot/projects/xen3/src/sys/netipsec/keysock.h#2 integrate .. //depot/projects/xen3/src/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/xen3/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/xen3/src/sys/netkey/keysock.c#2 integrate .. //depot/projects/xen3/src/sys/netkey/keysock.h#2 integrate .. //depot/projects/xen3/src/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/xen3/src/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/xen3/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/xen3/src/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/xen3/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/xen3/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/xen3/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/xen3/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/xen3/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/xen3/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/xen3/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/xen3/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/xen3/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/xen3/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/xen3/src/sys/pc98/include/_types.h#2 integrate .. //depot/projects/xen3/src/sys/pc98/include/param.h#2 integrate .. //depot/projects/xen3/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/xen3/src/sys/pccard/cardinfo.h#2 integrate .. //depot/projects/xen3/src/sys/pccard/driver.h#2 delete .. //depot/projects/xen3/src/sys/pccard/i82365.h#2 delete .. //depot/projects/xen3/src/sys/pccard/meciareg.h#2 delete .. //depot/projects/xen3/src/sys/pccard/pccard_nbk.h#2 delete .. //depot/projects/xen3/src/sys/pccard/pcic_pci.h#2 delete .. //depot/projects/xen3/src/sys/pccard/pcicvar.h#2 delete .. //depot/projects/xen3/src/sys/pccard/slot.h#2 delete .. //depot/projects/xen3/src/sys/pci/agp.c#2 integrate .. //depot/projects/xen3/src/sys/pci/agp_i810.c#2 integrate .. //depot/projects/xen3/src/sys/pci/if_sk.c#2 integrate .. //depot/projects/xen3/src/sys/pci/if_skreg.h#2 integrate .. //depot/projects/xen3/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/xen3/src/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/xen3/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/xen3/src/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/xen3/src/sys/security/audit/audit.c#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit.h#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit_arg.c#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit_bsm.c#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit_pipe.c#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit_private.h#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit_syscalls.c#1 branch .. //depot/projects/xen3/src/sys/security/audit/audit_trigger.c#1 branch .. //depot/projects/xen3/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/xen3/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/fhc/fhc_nexus.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/xen3/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/xen3/src/sys/sparc64/include/utrap.h#2 integrate .. //depot/projects/xen3/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/xen3/src/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/xen3/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/xen3/src/sys/sys/_rwlock.h#1 branch .. //depot/projects/xen3/src/sys/sys/ata.h#2 integrate .. //depot/projects/xen3/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/xen3/src/sys/sys/firmware.h#1 branch .. //depot/projects/xen3/src/sys/sys/imgact.h#2 integrate .. //depot/projects/xen3/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/xen3/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/xen3/src/sys/sys/ipmi.h#1 branch .. //depot/projects/xen3/src/sys/sys/ktr.h#2 integrate .. //depot/projects/xen3/src/sys/sys/lock.h#3 integrate .. //depot/projects/xen3/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/xen3/src/sys/sys/md5.h#2 integrate .. //depot/projects/xen3/src/sys/sys/mount.h#2 integrate .. //depot/projects/xen3/src/sys/sys/mutex.h#2 integrate .. //depot/projects/xen3/src/sys/sys/namei.h#2 integrate .. //depot/projects/xen3/src/sys/sys/param.h#3 integrate .. //depot/projects/xen3/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/xen3/src/sys/sys/proc.h#2 integrate .. //depot/projects/xen3/src/sys/sys/ptrace.h#2 integrate .. //depot/projects/xen3/src/sys/sys/rwlock.h#1 branch .. //depot/projects/xen3/src/sys/sys/socketvar.h#2 integrate .. //depot/projects/xen3/src/sys/sys/sockio.h#2 integrate .. //depot/projects/xen3/src/sys/sys/syscall.h#2 integrate .. //depot/projects/xen3/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/xen3/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/xen3/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/xen3/src/sys/sys/systm.h#2 integrate .. //depot/projects/xen3/src/sys/sys/taskqueue.h#2 integrate .. //depot/projects/xen3/src/sys/sys/thr.h#2 integrate .. //depot/projects/xen3/src/sys/sys/tree.h#2 integrate .. //depot/projects/xen3/src/sys/sys/ttychars.h#2 integrate .. //depot/projects/xen3/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/xen3/src/sys/sys/ttydev.h#2 integrate .. //depot/projects/xen3/src/sys/sys/turnstile.h#2 integrate .. //depot/projects/xen3/src/sys/sys/user.h#2 integrate .. //depot/projects/xen3/src/sys/sys/vnode.h#2 integrate .. //depot/projects/xen3/src/sys/tools/fw_stub.awk#1 branch .. //depot/projects/xen3/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/xen3/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/xen3/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/xen3/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/xen3/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/xen3/src/sys/vm/redzone.c#1 branch .. //depot/projects/xen3/src/sys/vm/redzone.h#1 branch .. //depot/projects/xen3/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/xen3/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/xen3/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/xen3/src/sys/vm/vm_fault.c#2 integrate .. //depot/projects/xen3/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/xen3/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/xen3/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/xen3/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/xen3/src/sys/vm/vm_page.h#2 integrate .. //depot/projects/xen3/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/xen3/src/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/xen3/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/xen3/src/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.33 2005/03/08 00:09:41 grog Exp $ +# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $ # The boot loader .if !defined(NO_BOOT) @@ -11,7 +11,8 @@ CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ isofs kern libkern modules net netatalk netatm netgraph \ netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ - pccard pci posix4 sys ufs vm ${ARCHDIR} + nfsclient nfs4client rpc pccard pci posix4 sys ufs vm \ + ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/xen3/src/sys/alpha/alpha/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.57 2005/11/03 21:08:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.58 2006/02/07 21:22:01 phk Exp $"); #include "opt_kstack_pages.h" @@ -225,7 +225,7 @@ spinlock_exit(); KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); cpu_throw(NULL, choosethread()); /* doesn't return */ ==== //depot/projects/xen3/src/sys/alpha/alpha/trap.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.127 2005/12/06 11:19:36 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.128 2006/02/08 08:09:14 phk Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -259,7 +259,6 @@ register struct proc *p; register int i; u_int64_t ucode; - u_int sticks; int user; #ifdef SMP register_t s; @@ -302,12 +301,11 @@ CTR5(KTR_TRAP, "%s trap: pid %d, (%lx, %lx, %lx)", user ? "user" : "kernel", p->p_pid, a0, a1, a2); if (user) { - sticks = td->td_sticks; + td->td_pticks = 0; td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); } else { - sticks = 0; /* XXX bogus -Wuninitialized warning */ KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); } @@ -595,7 +593,7 @@ out: if (user) { framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); - userret(td, framep, sticks); + userret(td, framep); mtx_assert(&Giant, MA_NOTOWNED); } return; @@ -632,7 +630,6 @@ struct proc *p; int error = 0; u_int64_t opc; - u_int sticks; u_int64_t args[10]; /* XXX */ u_int hidden = 0, nargs; #ifdef SMP @@ -664,7 +661,7 @@ PCPU_LAZY_INC(cnt.v_syscall); td->td_frame = framep; opc = framep->tf_regs[FRAME_PC] - 4; - sticks = td->td_sticks; + td->td_pticks = 0; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_SA) @@ -773,7 +770,7 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - userret(td, framep, sticks); + userret(td, framep); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ==== //depot/projects/xen3/src/sys/alpha/conf/GENERIC#2 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.191 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ cpu EV4 cpu EV5 @@ -61,6 +61,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI ==== //depot/projects/xen3/src/sys/alpha/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.8 2006/01/09 06:05:55 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __PCI_REROUTE_INTERRUPT - /* * Basic types upon which most other types are built. */ ==== //depot/projects/xen3/src/sys/alpha/include/param.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.40 2005/12/06 13:27:20 ru Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.41 2006/01/09 06:05:55 imp Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /*- @@ -66,6 +66,8 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ ==== //depot/projects/xen3/src/sys/alpha/linux/linux_machdep.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.36 2005/02/18 18:32:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.37 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -81,7 +81,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/xen3/src/sys/alpha/linux/linux_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.23 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.24 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/xen3/src/sys/alpha/linux/linux_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/xen3/src/sys/alpha/linux/linux_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #include @@ -21,156 +21,156 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 5 = */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_NULL }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_WAIT4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 16 = linux_chown */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 17 = linux_brk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 21 = osf1_mount */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 22 = linux_umount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UNMOUNT }, /* 22 = linux_umount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 25 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 13 14:06:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD3E016A423; Mon, 13 Feb 2006 14:06:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6739116A420 for ; Mon, 13 Feb 2006 14:06:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2633543D55 for ; Mon, 13 Feb 2006 14:06:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DE6Hne089865 for ; Mon, 13 Feb 2006 14:06:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DE6E7U089862 for perforce@freebsd.org; Mon, 13 Feb 2006 14:06:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:06:14 GMT Message-Id: <200602131406.k1DE6E7U089862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:06:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=91669 Change 91669 by rwatson@rwatson_fledge on 2006/02/13 14:05:57 Move TrustedBSD.org web page from projcvs to P4 so that more TrustedBSD developers can get to it. While doing this, normalize on .pdf files as the file format for papers, rather than a blend of {postscript, pdf, compressed postscript, compressed pdf}. Obtained from: FreeBSD CVS Affected files ... .. //depot/projects/trustedbsd/www/20000809-trustedbsd-announcement.txt#1 add .. //depot/projects/trustedbsd/www/Makefile#1 add .. //depot/projects/trustedbsd/www/beastie.page#1 add .. //depot/projects/trustedbsd/www/bib-stylesheet.xsl#1 add .. //depot/projects/trustedbsd/www/components.gif#1 add .. //depot/projects/trustedbsd/www/components.page#1 add .. //depot/projects/trustedbsd/www/componentsgray.gif#1 add .. //depot/projects/trustedbsd/www/dev-stylesheet.xsl#1 add .. //depot/projects/trustedbsd/www/developers.dev#1 add .. //depot/projects/trustedbsd/www/developers.gif#1 add .. //depot/projects/trustedbsd/www/developersgray.gif#1 add .. //depot/projects/trustedbsd/www/docs.bib#1 add .. //depot/projects/trustedbsd/www/docs.gif#1 add .. //depot/projects/trustedbsd/www/docsgray.gif#1 add .. //depot/projects/trustedbsd/www/heading.xsl#1 add .. //depot/projects/trustedbsd/www/home.gif#1 add .. //depot/projects/trustedbsd/www/home.page#1 add .. //depot/projects/trustedbsd/www/homegray.gif#1 add .. //depot/projects/trustedbsd/www/horizontalbar1.gif#1 add .. //depot/projects/trustedbsd/www/includes.xsl#1 add .. //depot/projects/trustedbsd/www/legal.page#1 add .. //depot/projects/trustedbsd/www/mac.page#1 add .. //depot/projects/trustedbsd/www/mailinglists.gif#1 add .. //depot/projects/trustedbsd/www/mailinglists.page#1 add .. //depot/projects/trustedbsd/www/mailinglistsgray.gif#1 add .. //depot/projects/trustedbsd/www/minipemaquidlight.jpg#1 add .. //depot/projects/trustedbsd/www/news.page#1 add .. //depot/projects/trustedbsd/www/openbsm.page#1 add .. //depot/projects/trustedbsd/www/page.css#1 add .. //depot/projects/trustedbsd/www/page.xsl#1 add .. //depot/projects/trustedbsd/www/pemaquidlight.jpg#1 add .. //depot/projects/trustedbsd/www/powerlogo.gif#1 add .. //depot/projects/trustedbsd/www/resources.gif#1 add .. //depot/projects/trustedbsd/www/robots.txt#1 add .. //depot/projects/trustedbsd/www/sebsd-july2003.pdf#1 add .. //depot/projects/trustedbsd/www/sebsd.page#1 add .. //depot/projects/trustedbsd/www/sedarwin.page#1 add .. //depot/projects/trustedbsd/www/sidebar.xml#1 add .. //depot/projects/trustedbsd/www/trusted.web.mk#1 add .. //depot/projects/trustedbsd/www/trustedbsd-bsdcon-2000.pdf#1 add .. //depot/projects/trustedbsd/www/trustedbsd-discex3.pdf#1 add .. //depot/projects/trustedbsd/www/trustedbsd-freenix-2001.ps#1 add .. //depot/projects/trustedbsd/www/trustedbsd-supfile#1 add .. //depot/projects/trustedbsd/www/trustedbsd-usenix2003freenix.pdf#1 add .. //depot/projects/trustedbsd/www/trustydibmed2.jpg#1 add .. //depot/projects/trustedbsd/www/trustyshadow.gif#1 add .. //depot/projects/trustedbsd/www/trustyteenie.gif#1 add .. //depot/projects/trustedbsd/www/verticalbar1.gif#1 add .. //depot/projects/trustedbsd/www/wwwheader.gif#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 13 14:09:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8632316A423; Mon, 13 Feb 2006 14:09:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3305E16A420 for ; Mon, 13 Feb 2006 14:09:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 737E443D62 for ; Mon, 13 Feb 2006 14:09:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DE9LN6090206 for ; Mon, 13 Feb 2006 14:09:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DE9Lnf090203 for perforce@freebsd.org; Mon, 13 Feb 2006 14:09:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:09:21 GMT Message-Id: <200602131409.k1DE9Lnf090203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:09:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91670 Change 91670 by rwatson@rwatson_fledge on 2006/02/13 14:09:07 Move one more file from postscript to pdf. Affected files ... .. //depot/projects/trustedbsd/www/trustedbsd-freenix-2001.pdf#1 add .. //depot/projects/trustedbsd/www/trustedbsd-freenix-2001.ps#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 13 14:17:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4080616A423; Mon, 13 Feb 2006 14:17:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC0E416A420 for ; Mon, 13 Feb 2006 14:17:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ADC743D66 for ; Mon, 13 Feb 2006 14:17:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DEHdAO090863 for ; Mon, 13 Feb 2006 14:17:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DEHcKM090845 for perforce@freebsd.org; Mon, 13 Feb 2006 14:17:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:17:38 GMT Message-Id: <200602131417.k1DEHcKM090845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:17:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=91671 Change 91671 by rwatson@rwatson_fledge on 2006/02/13 14:16:41 $P4$ Affected files ... .. //depot/projects/trustedbsd/www/Makefile#2 edit .. //depot/projects/trustedbsd/www/beastie.page#2 edit .. //depot/projects/trustedbsd/www/bib-stylesheet.xsl#2 edit .. //depot/projects/trustedbsd/www/components.page#2 edit .. //depot/projects/trustedbsd/www/dev-stylesheet.xsl#2 edit .. //depot/projects/trustedbsd/www/developers.dev#2 edit .. //depot/projects/trustedbsd/www/docs.bib#2 edit .. //depot/projects/trustedbsd/www/home.page#2 edit .. //depot/projects/trustedbsd/www/includes.xsl#2 edit .. //depot/projects/trustedbsd/www/legal.page#2 edit .. //depot/projects/trustedbsd/www/mac.page#2 edit .. //depot/projects/trustedbsd/www/mailinglists.page#2 edit .. //depot/projects/trustedbsd/www/news.page#2 edit .. //depot/projects/trustedbsd/www/openbsm.page#2 edit .. //depot/projects/trustedbsd/www/page.css#2 edit .. //depot/projects/trustedbsd/www/sebsd.page#2 edit .. //depot/projects/trustedbsd/www/sedarwin.page#2 edit .. //depot/projects/trustedbsd/www/trusted.web.mk#2 edit .. //depot/projects/trustedbsd/www/trustedbsd-supfile#2 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#2 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: projects/trustedbsd/www/Makefile,v 1.17 2006/02/09 20:50:23 rwatson Exp $ +# $P4: //depot/projects/trustedbsd/www/Makefile#2 $ STYLESHEET= page.xsl ==== //depot/projects/trustedbsd/www/beastie.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/beastie.page,v 1.4 2002/12/23 22:34:04 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/beastie.page#2 $ ==== //depot/projects/trustedbsd/www/bib-stylesheet.xsl#2 (text+ko) ==== @@ -29,7 +29,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: projects/trustedbsd/www/bib-stylesheet.xsl,v 1.10 2003/08/01 17:19:56 chris Exp $ + $P4: //depot/projects/trustedbsd/www/bib-stylesheet.xsl#2 $ --> - $FreeBSD: projects/trustedbsd/www/components.page,v 1.21 2005/04/29 10:25:02 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/components.page#2 $ ==== //depot/projects/trustedbsd/www/dev-stylesheet.xsl#2 (text+ko) ==== @@ -29,7 +29,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: projects/trustedbsd/www/dev-stylesheet.xsl,v 1.4 2002/12/23 22:34:04 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/dev-stylesheet.xsl#2 $ --> - $FreeBSD: projects/trustedbsd/www/developers.dev,v 1.16 2006/02/07 22:46:16 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/developers.dev#2 $ ==== //depot/projects/trustedbsd/www/docs.bib#2 (text+ko) ==== @@ -35,7 +35,7 @@ - $FreeBSD: projects/trustedbsd/www/docs.bib,v 1.16 2005/01/21 18:39:28 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/docs.bib#2 $ ==== //depot/projects/trustedbsd/www/home.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/home.page,v 1.10 2005/04/29 10:25:23 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/home.page#2 $ ==== //depot/projects/trustedbsd/www/includes.xsl#2 (text+ko) ==== @@ -29,7 +29,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: projects/trustedbsd/www/includes.xsl,v 1.4 2003/01/17 22:31:43 chris Exp $ + $P4: //depot/projects/trustedbsd/www/includes.xsl#2 $ --> ==== //depot/projects/trustedbsd/www/legal.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/legal.page,v 1.5 2003/01/26 22:11:38 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/legal.page#2 $ ==== //depot/projects/trustedbsd/www/mac.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/mac.page,v 1.2 2005/04/29 10:26:08 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/mac.page#2 $ ==== //depot/projects/trustedbsd/www/mailinglists.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/mailinglists.page,v 1.6 2006/02/11 23:23:16 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/mailinglists.page#2 $ ==== //depot/projects/trustedbsd/www/news.page#2 (text+ko) ==== @@ -35,7 +35,7 @@ - $FreeBSD: projects/trustedbsd/www/news.page,v 1.6 2005/04/29 16:57:38 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/news.page#2 $ ==== //depot/projects/trustedbsd/www/openbsm.page#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: projects/trustedbsd/www/openbsm.page,v 1.2 2005/05/02 01:13:30 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#2 $ ==== //depot/projects/trustedbsd/www/page.css#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: projects/trustedbsd/www/page.css,v 1.4 2003/01/17 22:31:43 chris Exp $ + * $P4: //depot/projects/trustedbsd/www/page.css#2 $ */ BODY { ==== //depot/projects/trustedbsd/www/sebsd.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/sebsd.page,v 1.6 2005/07/03 10:07:17 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#2 $ ==== //depot/projects/trustedbsd/www/sedarwin.page#2 (text+ko) ==== @@ -36,7 +36,7 @@ - $FreeBSD: projects/trustedbsd/www/sedarwin.page,v 1.7 2006/02/13 13:50:44 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/sedarwin.page#2 $ ==== //depot/projects/trustedbsd/www/trusted.web.mk#2 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: projects/trustedbsd/www/trusted.web.mk,v 1.5 2003/01/03 03:28:22 chris Exp $ +# $P4: //depot/projects/trustedbsd/www/trusted.web.mk#2 $ TIDY?= tidy -i -m -f /dev/null XSLTPROC?= xsltproc -nonet ==== //depot/projects/trustedbsd/www/trustedbsd-supfile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: projects/trustedbsd/www/trustedbsd-supfile,v 1.5 2005/11/16 15:51:21 rwatson Exp $ +# $P4: //depot/projects/trustedbsd/www/trustedbsd-supfile#2 $ # # This is the sample CVSup supfile for the TrustedBSD Project. # From owner-p4-projects@FreeBSD.ORG Mon Feb 13 14:21:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 105EA16A42B; Mon, 13 Feb 2006 14:21:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4E3216A425 for ; Mon, 13 Feb 2006 14:21:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F87A43D58 for ; Mon, 13 Feb 2006 14:21:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DELvTa091088 for ; Mon, 13 Feb 2006 14:21:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DELvRk091085 for perforce@freebsd.org; Mon, 13 Feb 2006 14:21:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:21:57 GMT Message-Id: <200602131421.k1DELvRk091085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:21:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=91672 Change 91672 by rwatson@rwatson_fledge on 2006/02/13 14:20:57 Add reference to Audit handbook chapter. Affected files ... .. //depot/projects/trustedbsd/www/docs.bib#3 edit Differences ... ==== //depot/projects/trustedbsd/www/docs.bib#3 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/docs.bib#2 $ + $P4: //depot/projects/trustedbsd/www/docs.bib#3 $ @@ -201,6 +201,23 @@ + FreeBSD Handbook: Security Event Auditing + + + Tom Rhodes + + FreeBSD Project + + + + + + + Brief introduction to configuring and using TrustedBSD audit + on FreeBSD 7.x. + + + FreeBSD Handbook: File System Access Control Lists From owner-p4-projects@FreeBSD.ORG Mon Feb 13 14:34:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B028716A423; Mon, 13 Feb 2006 14:34:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36E2F16A420 for ; Mon, 13 Feb 2006 14:34:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5163843D69 for ; Mon, 13 Feb 2006 14:34:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DEYD1O091605 for ; Mon, 13 Feb 2006 14:34:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DEYDuT091602 for perforce@freebsd.org; Mon, 13 Feb 2006 14:34:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:34:13 GMT Message-Id: <200602131434.k1DEYDuT091602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:34:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=91673 Change 91673 by rwatson@rwatson_fledge on 2006/02/13 14:33:53 Correct typo. Affected files ... .. //depot/projects/trustedbsd/www/sebsd.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/sebsd.page#3 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/sebsd.page#2 $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#3 $ @@ -48,7 +48,7 @@

Perforce: - //depot/projects/trustedbsd/sebsd/... + //depot/projects/trustedbsd/sebsd/... Collection: p4-cvs-trustedbsd-sebsd

From owner-p4-projects@FreeBSD.ORG Mon Feb 13 14:52:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B2916A423; Mon, 13 Feb 2006 14:52:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50E7616A422 for ; Mon, 13 Feb 2006 14:52:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18EB043D7F for ; Mon, 13 Feb 2006 14:52:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DEqbXE092403 for ; Mon, 13 Feb 2006 14:52:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DEqbDN092400 for perforce@freebsd.org; Mon, 13 Feb 2006 14:52:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:52:37 GMT Message-Id: <200602131452.k1DEqbDN092400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=91674 Change 91674 by rwatson@rwatson_fledge on 2006/02/13 14:51:45 Give audit its own web page; expand/clarify/enhance/fix/update text relating to Audit and OpenBSM. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#3 edit .. //depot/projects/trustedbsd/www/audit.page#1 add .. //depot/projects/trustedbsd/www/components.page#3 edit .. //depot/projects/trustedbsd/www/openbsm.page#3 edit .. //depot/projects/trustedbsd/www/sidebar.xml#2 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#3 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#3 $ STYLESHEET= page.xsl @@ -44,6 +44,7 @@ SRCS+= openbsm.page SRCS+= sebsd.page SRCS+= sedarwin.page +SRCS+= audit.page IMGS= components.gif componentsgray.gif IMGS+= developers.gif developersgray.gif docs.gif ==== //depot/projects/trustedbsd/www/components.page#3 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#2 $ + $P4: //depot/projects/trustedbsd/www/components.page#3 $ @@ -103,12 +103,17 @@

Event auditing permits the selective logging of - security-relevant system events for the purposes of - analysis. Several experimental implementations of audit - for FreeBSD have been explored; the current implementation is - based on OpenBSM, an open source - implementation of Sun's Basic Security Module (BSM) API and file - format donated by Apple Computer, Inc.

+ security-relevant system events for the purposes of post-mortem + analysis, intrusion detection, and system monitoring. The + TrustedBSD audit implementation + provides a complete kernel audit event framework, extensive + auditing of system events, and user space application + integration. The user space libraries, tools, and file format + are based on the de facto industry standard Sun Basic Security + Module (BSM) API and file format. The + OpenBSM library and tool suite provides a portable, + BSD-licensed implementation, and is based on source code + donated by Apple Computer, Inc.

==== //depot/projects/trustedbsd/www/openbsm.page#3 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#2 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#3 $ @@ -45,10 +45,14 @@

OpenBSM is an open source implementation of Sun's Basic Security Module (BSM) Audit API and file format. - BSM, the de facto standard for Audit, describes a set of system call - and library interfaces for managing audit records, as well as a token - stream file format that permits extensible and generalized audit - trail processing.

+ BSM, the de facto industry standard for Audit, describes a set of + system call and library interfaces for managing audit records, as + well as a token stream file format that permits extensible and + generalized audit trail processing. + OpenBSM extends the BSM API and file format in a number of ways to + support features present in the Mac OS X and FreeBSD operating + systems, such as Mach task interfaces, sendfile(), and Linux system + calls present in the FreeBSD Linux emulation layer.

OpenBSM includes system include files appropriate for inclusion in an operating system implementation of Audit, libbsm, an @@ -60,14 +64,12 @@ easier audit trail analysis, including a pattern matching library.

-

OpenBSM is an important component of the TrustedBSD Audit Implementation for - FreeBSD, providing tools, libraries, and include files. - The first official release of OpenBSM will be made shortly before - the TrustedBSD audit presentation at BSDCan, - where members of the TrustedBSD team will describe the operation of - Audit on Darwin and FreeBSD, the components of OpenBSM, and how to - develop with the BSM APIs and file format.

+

OpenBSM is the core user space component of the TrustedBSD Audit Implementation for + FreeBSD, providing tools, libraries, and include files. Pre-releases + of OpenBSM are now available as part of the FreeBSD 7-CURRENT branch, + as integration of audit into the FreeBSD CVS tree is largely + complete.

OpenBSM is derived from the BSM audit implementation found in Apple's open source Darwin operating system, generously released by ==== //depot/projects/trustedbsd/www/sidebar.xml#2 (text+ko) ==== @@ -8,11 +8,12 @@

Components

  • Access Control Lists
    • -
  • Event Auditing and OpenBSM
    • +
  • Security Event Auditing
  • Extended Attributes
  • Fine-Grained Capabilities
  • Mandatory Access Control
    • +
  • OpenBSM
  • Security-Enhanced BSD (SEBSD)
  • Security-Enhanced Darwin (SEDarwin)
    • From owner-p4-projects@FreeBSD.ORG Mon Feb 13 14:55:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1620B16A425; Mon, 13 Feb 2006 14:55:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6EC416A429 for ; Mon, 13 Feb 2006 14:55:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD68843D45 for ; Mon, 13 Feb 2006 14:55:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DEtgiI092555 for ; Mon, 13 Feb 2006 14:55:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DEtgFd092552 for perforce@freebsd.org; Mon, 13 Feb 2006 14:55:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:55:42 GMT Message-Id: <200602131455.k1DEtgFd092552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:55:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=91675 Change 91675 by rwatson@rwatson_fledge on 2006/02/13 14:55:13 Being at BSDCan 2005 is no longer news. Affected files ... .. //depot/projects/trustedbsd/www/news.page#3 edit .. //depot/projects/trustedbsd/www/sidebar.xml#3 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#3 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#2 $ + $P4: //depot/projects/trustedbsd/www/news.page#3 $ ==== //depot/projects/trustedbsd/www/sidebar.xml#3 (text+ko) ==== @@ -1,8 +1,4 @@ -
    -

    TrustedBSD News - TrustedBSD - at BSDCan 2005!

    -

    Components

    From owner-p4-projects@FreeBSD.ORG Mon Feb 13 21:09:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11E9D16A423; Mon, 13 Feb 2006 21:09:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9BD916A420 for ; Mon, 13 Feb 2006 21:09:19 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39E2743D48 for ; Mon, 13 Feb 2006 21:09:19 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DL9J0h025233 for ; Mon, 13 Feb 2006 21:09:19 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DL9IKw025222 for perforce@freebsd.org; Mon, 13 Feb 2006 21:09:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 13 Feb 2006 21:09:18 GMT Message-Id: <200602132109.k1DL9IKw025222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:09:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=91691 Change 91691 by millert@millert_ibook on 2006/02/13 21:08:33 Fix cut and pasto Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#13 (text+ko) ==== @@ -1996,7 +1996,7 @@ /** @brief Access control check for receiving Mach messsages @param task Label of the receiving task - @param port Label of the sending task + @param sender Label of the sending task Access control check for receiving messages. The two labels are locked. From owner-p4-projects@FreeBSD.ORG Mon Feb 13 21:15:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5703F16A423; Mon, 13 Feb 2006 21:15:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2764416A420 for ; Mon, 13 Feb 2006 21:15:37 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5625F43D72 for ; Mon, 13 Feb 2006 21:15:31 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DLFU7B025642 for ; Mon, 13 Feb 2006 21:15:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLFUnS025639 for perforce@freebsd.org; Mon, 13 Feb 2006 21:15:30 GMT (envelope-from millert@freebsd.org) Date: Mon, 13 Feb 2006 21:15:30 GMT Message-Id: <200602132115.k1DLFUnS025639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:15:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91692 Change 91692 by millert@millert_ibook on 2006/02/13 21:15:23 Add mac_check_port_receive() receive entry points. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_mqueue.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_mqueue.c#4 (text+ko) ==== @@ -655,9 +655,15 @@ ipc_kmsg_t *kmsgp; mach_port_seqno_t *seqnop; spl_t s; +#ifdef MAC + ipc_labelh_t lh; + task_t task; + int rc; +#endif s = splsched(); imq_lock(mqueue); + self = current_thread(); /* XXXMAC - lock it too? deadlock? */ if (imq_is_set(mqueue)) { wait_queue_link_t wql; @@ -712,6 +718,21 @@ ipc_mqueue_select(port_mq, option, max_size); imq_unlock(port_mq); +#ifdef MAC + if (self->ith_kmsg != NULL && + self->ith_kmsg->ikm_sender != NULL) { + lh = self->ith_kmsg->ikm_sender; + task = current_task(); + tasklabel_lock(task); + ip_lock(lh->lh_port); + rc = mac_check_port_receive(&task->maclabel, + &lh->lh_label); + ip_unlock(lh->lh_port); + tasklabel_unlock(task); + if (rc) + self->ith_state = MACH_RCV_INVALID_DATA; + } +#endif splx(s); return; @@ -726,6 +747,21 @@ if (ipc_kmsg_queue_first(kmsgs) != IKM_NULL) { ipc_mqueue_select(mqueue, option, max_size); imq_unlock(mqueue); +#ifdef MAC + if (self->ith_kmsg != NULL && + self->ith_kmsg->ikm_sender != NULL) { + lh = self->ith_kmsg->ikm_sender; + task = current_task(); + tasklabel_lock(task); + ip_lock(lh->lh_port); + rc = mac_check_port_receive(&task->maclabel, + &lh->lh_label); + ip_unlock(lh->lh_port); + tasklabel_unlock(task); + if (rc) + self->ith_state = MACH_RCV_INVALID_DATA; + } +#endif splx(s); return; } @@ -736,7 +772,6 @@ * block on (whether the set's or the local port's) is * still locked. */ - self = current_thread(); if (option & MACH_RCV_TIMEOUT) { if (timeout == 0) { imq_unlock(mqueue); From owner-p4-projects@FreeBSD.ORG Mon Feb 13 21:16:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 637BB16A423; Mon, 13 Feb 2006 21:16:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D50B16A420 for ; Mon, 13 Feb 2006 21:16:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CDCF43D48 for ; Mon, 13 Feb 2006 21:16:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DLGWgO025670 for ; Mon, 13 Feb 2006 21:16:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLGWj9025667 for perforce@freebsd.org; Mon, 13 Feb 2006 21:16:32 GMT (envelope-from imp@freebsd.org) Date: Mon, 13 Feb 2006 21:16:32 GMT Message-Id: <200602132116.k1DLGWj9025667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:16:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=91693 Change 91693 by imp@imp_Speedy on 2006/02/13 21:16:30 Add usb devices Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#18 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#18 (text+ko) ==== @@ -42,9 +42,9 @@ #options SOFTUPDATES #Enable FFS soft updates support #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories -options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=4096 # 3MB ram disk -options ROOTDEVNAME=\"ufs:md0\" +#options MD_ROOT #MD is a potential root device +#options MD_ROOT_SIZE=4096 # 4MB ram disk +#options ROOTDEVNAME=\"ufs:md0\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFS_ROOT #NFS usable as /, requires NFSCLIENT From owner-p4-projects@FreeBSD.ORG Mon Feb 13 21:17:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA1EA16A424; Mon, 13 Feb 2006 21:17:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC8A516A420 for ; Mon, 13 Feb 2006 21:17:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22F6943D55 for ; Mon, 13 Feb 2006 21:17:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DLHZ3s025808 for ; Mon, 13 Feb 2006 21:17:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLHYks025805 for perforce@freebsd.org; Mon, 13 Feb 2006 21:17:34 GMT (envelope-from imp@freebsd.org) Date: Mon, 13 Feb 2006 21:17:34 GMT Message-Id: <200602132117.k1DLHYks025805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:17:37 -0000 X-List-Received-Date: Mon, 13 Feb 2006 21:17:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=91695 Change 91695 by imp@imp_Speedy on 2006/02/13 21:16:44 userret churn Affected files ... .. //depot/projects/arm/src/sys/arm/arm/undefined.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/undefined.c#5 (text+ko) ==== @@ -212,7 +212,7 @@ ksi.ksi_code = ILL_ILLADR; ksi.ksi_addr = (u_int32_t *)(intptr_t) fault_pc; trapsignal(td, &ksi); - userret(td, frame, 0); + userret(td, frame); return; } @@ -313,6 +313,6 @@ } #else - userret(td, frame, 0); + userret(td, frame); #endif } From owner-p4-projects@FreeBSD.ORG Mon Feb 13 21:17:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20C9316A439; Mon, 13 Feb 2006 21:17:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C184316A422 for ; Mon, 13 Feb 2006 21:17:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70F8643D58 for ; Mon, 13 Feb 2006 21:17:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DLHZ0d025814 for ; Mon, 13 Feb 2006 21:17:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLHZtK025811 for perforce@freebsd.org; Mon, 13 Feb 2006 21:17:35 GMT (envelope-from imp@freebsd.org) Date: Mon, 13 Feb 2006 21:17:35 GMT Message-Id: <200602132117.k1DLHZtK025811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:17:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=91696 Change 91696 by imp@imp_Speedy on 2006/02/13 21:17:16 debug Affected files ... .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#4 (text+ko) ==== @@ -64,13 +64,13 @@ /* XXX where does it say so in the spec? */ sc->sc_bus.usbrev = USBREV_1_0; - strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor)); rid = MEM_RID; sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->io_res == NULL) { - err = ENXIO; + printf("1\n"); + err = ENOMEM; goto error; } sc->iot = rman_get_bustag(sc->io_res); @@ -80,11 +80,13 @@ sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (sc->irq_res == NULL) { - err = ENXIO; + printf("2\n"); + err = ENOMEM; goto error; } sc->sc_bus.bdev = device_add_child(dev, "usb", -1); if (sc->sc_bus.bdev == NULL) { + printf("3\n"); err = ENOMEM; goto error; } @@ -93,9 +95,11 @@ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, &sc->ih); if (err) { + printf("4\n"); err = ENXIO; goto error; } + strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor)); err = ohci_init(sc); if (!err) { sc->sc_flags |= OHCI_SCFLG_DONEINIT; From owner-p4-projects@FreeBSD.ORG Mon Feb 13 21:17:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E38416A455; Mon, 13 Feb 2006 21:17:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00A2B16A420 for ; Mon, 13 Feb 2006 21:17:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C15F343D55 for ; Mon, 13 Feb 2006 21:17:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DLHZT6025820 for ; Mon, 13 Feb 2006 21:17:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLHZPi025817 for perforce@freebsd.org; Mon, 13 Feb 2006 21:17:35 GMT (envelope-from imp@freebsd.org) Date: Mon, 13 Feb 2006 21:17:35 GMT Message-Id: <200602132117.k1DLHZPi025817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:17:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91697 Change 91697 by imp@imp_Speedy on 2006/02/13 21:17:34 PA == VA for usb ohci controller, for the moment. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#16 (text+ko) ==== @@ -146,25 +146,36 @@ * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. */ - { - /* - * This at least maps the interrupt controller, the UART - * and the timer. Other devices should use newbus to - * map their memory anyway. - */ - 0xfff00000, - 0xfff00000, - 0x100000, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, - { - 0, - 0, - 0, - 0, - 0, - } + { + /* + * This at least maps the interrupt controller, the UART + * and the timer. Other devices should use newbus to + * map their memory anyway. + */ + 0xfff00000, + 0xfff00000, + 0x100000, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { + /* + * Add the ohci controller, and anything else that might be + * on this chip select for a VA/PA mapping. + */ + AT91RM92_OHCI_BASE, + AT91RM92_OHCI_BASE, + AT91RM92_OHCI_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { + 0, + 0, + 0, + 0, + 0, + } }; #define SDRAM_START 0xa0000000 From owner-p4-projects@FreeBSD.ORG Mon Feb 13 21:17:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5E5816A45A; Mon, 13 Feb 2006 21:17:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4016F16A440 for ; Mon, 13 Feb 2006 21:17:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C483543D53 for ; Mon, 13 Feb 2006 21:17:34 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DLHYC4025802 for ; Mon, 13 Feb 2006 21:17:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLHY3f025799 for perforce@freebsd.org; Mon, 13 Feb 2006 21:17:34 GMT (envelope-from millert@freebsd.org) Date: Mon, 13 Feb 2006 21:17:34 GMT Message-Id: <200602132117.k1DLHY3f025799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:17:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=91694 Change 91694 by millert@millert_ibook on 2006/02/13 21:16:38 Implement mpo_check_port_receive Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#30 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#30 (text+ko) ==== @@ -1167,6 +1167,7 @@ } CHECK_SIMPLE_PERM(msg_send,SECCLASS_MACH_PORT,MACH_PORT__SEND); +CHECK_SIMPLE_PERM(msg_receive,SECCLASS_MACH_PORT,MACH_PORT__RECV); CHECK_SIMPLE_PERM(port_make_send,SECCLASS_MACH_PORT,MACH_PORT__MAKE_SEND); CHECK_SIMPLE_PERM(port_copy_send,SECCLASS_MACH_PORT,MACH_PORT__COPY_SEND); CHECK_SIMPLE_PERM(port_move_recv,SECCLASS_MACH_PORT,MACH_PORT__MOVE_RECV); @@ -2682,6 +2683,7 @@ .mpo_check_cred_relabel = sebsd_check_cred_relabel, .mpo_check_port_relabel = sebsd_check_port_relabel, .mpo_check_port_send = sebsd_check_msg_send, + .mpo_check_port_receive = sebsd_check_msg_receive, .mpo_check_port_make_send = sebsd_check_port_make_send, .mpo_check_port_copy_send = sebsd_check_port_copy_send, .mpo_check_port_move_receive = sebsd_check_port_move_recv, From owner-p4-projects@FreeBSD.ORG Tue Feb 14 01:47:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DDDD16A424; Tue, 14 Feb 2006 01:47:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EC2A16A420 for ; Tue, 14 Feb 2006 01:47:26 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D995743D5A for ; Tue, 14 Feb 2006 01:47:24 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E1lOAV044653 for ; Tue, 14 Feb 2006 01:47:24 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E1lO4a044650 for perforce@freebsd.org; Tue, 14 Feb 2006 01:47:24 GMT (envelope-from marcel@freebsd.org) Date: Tue, 14 Feb 2006 01:47:24 GMT Message-Id: <200602140147.k1E1lO4a044650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 91714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 01:47:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91714 Change 91714 by marcel@marcel_nfs on 2006/02/14 01:46:55 Remove __RMAN_RESOURCE_VISIBLE. Affected files ... .. //depot/projects/uart/dev/scc/scc_core.c#6 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_core.c#6 (text+ko) ==== @@ -27,8 +27,6 @@ #include __FBSDID("$FreeBSD$"); -#define __RMAN_RESOURCE_VISIBLE /* XXX shouldn't be needed. */ - #include #include #include From owner-p4-projects@FreeBSD.ORG Tue Feb 14 02:43:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F40D16A423; Tue, 14 Feb 2006 02:43:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB3F516A420 for ; Tue, 14 Feb 2006 02:43:44 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0705943D70 for ; Tue, 14 Feb 2006 02:43:36 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E2hZHj046865 for ; Tue, 14 Feb 2006 02:43:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E2hYgH046862 for perforce@freebsd.org; Tue, 14 Feb 2006 02:43:34 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 02:43:34 GMT Message-Id: <200602140243.k1E2hYgH046862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 02:43:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91718 Change 91718 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 02:43:23 initial submit for branch Affected files ... .. //depot/projects/kmacy_sun4v/doc/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/README#1 add .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/post#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/pre#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/catalog#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 add .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/faq/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/flyer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/catalog#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 add .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/catalog#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 add .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/euro/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/geom-class/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hats/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/java-tomcat/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mh/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/converse.c#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/su.c#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/post#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/pre#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/extra.css#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/version-guide/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/faq/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/faq/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/flyer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/flyer/flyer.tex#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/catalog#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/README#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/faq/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/flyer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/authors.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/catalog#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 add .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/post#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/pre#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/flyer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/head.1#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/st.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 add .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/euro/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/euro/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/new-users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/flyer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/flyer/flyer.tex#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/articles.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/books.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/catalog#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/translators.ent#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#1 add .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributing/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributing/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributors/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributors/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/diskless-x/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fonts/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fonts/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/multi-os/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/multi-os/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/problem-reports/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/zip-drive/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/Makefile.inc#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/faq/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/faq/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/Makefile#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/book.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/chapter.decl#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/chapters.ent#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml#1 add .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml#1 add >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 14 03:35:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C5EF16A438; Tue, 14 Feb 2006 03:35:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD97816A4EF for ; Tue, 14 Feb 2006 03:35:41 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B49E643D75 for ; Tue, 14 Feb 2006 03:35:39 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E3ZdiW049502 for ; Tue, 14 Feb 2006 03:35:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E3ZdXa049499 for perforce@freebsd.org; Tue, 14 Feb 2006 03:35:39 GMT (envelope-from marcel@freebsd.org) Date: Tue, 14 Feb 2006 03:35:39 GMT Message-Id: <200602140335.k1E3ZdXa049499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 91721 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 03:35:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=91721 Change 91721 by marcel@marcel_nfs on 2006/02/14 03:34:53 o Don't set the newly allocated resource's start and end, because those are rman internals and implement the rman without needing them. o Fix a misleading comment. Affected files ... .. //depot/projects/uart/dev/scc/scc_core.c#7 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_core.c#7 (text+ko) ==== @@ -181,8 +181,6 @@ sc->sc_rrid); rle->res = malloc(sizeof(struct resource), M_SCC, M_WAITOK | M_ZERO); - rman_set_start(rle->res, rle->start); - rman_set_end(rle->res, rle->end); bus_space_subregion(rman_get_bustag(sc->sc_rres), rman_get_bushandle(sc->sc_rres), start - rman_get_start(sc->sc_rres), size, &bh); @@ -257,8 +255,7 @@ * Allocate the register resource. We assume that all SCCs have a * single register window in either I/O port space or memory mapped * I/O space. Any SCC that needs multiple windows will consequently - * not be supported by this driver as-is. We try I/O port space - * first to satisfy the EBus code. + * not be supported by this driver as-is. */ sc->sc_rrid = 0; sc->sc_rtype = SYS_RES_MEMORY; From owner-p4-projects@FreeBSD.ORG Tue Feb 14 04:58:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79A9F16A423; Tue, 14 Feb 2006 04:58:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B92B16A420 for ; Tue, 14 Feb 2006 04:58:22 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB04043D4C for ; Tue, 14 Feb 2006 04:58:21 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E4wLEv060180 for ; Tue, 14 Feb 2006 04:58:21 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E4wLMM060174 for perforce@freebsd.org; Tue, 14 Feb 2006 04:58:21 GMT (envelope-from csjp@freebsd.org) Date: Tue, 14 Feb 2006 04:58:21 GMT Message-Id: <200602140458.k1E4wLMM060174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 04:58:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=91725 Change 91725 by csjp@csjp_xor on 2006/02/14 04:57:23 - Remove some more audits around PAM failures which really wouldn't be a result of the user input - Implement stdargs to audit_su() so we can specify messages which will be used to create text tokens to give more verbose information for the nature of the failures or success. - Add strings to audi_su() calls for text tokens - The user must never know about auditing operations. So change any writes to stderr to syslog(3) calls and simply return. It should be noted that this is what Solaris is doing, however CAPP is pretty clear about failed audits having to result in a failed operation. That said, I am not sure what an appropriate error message would be to report to the user in the event that we have to abort the entire operation due to a audit failure. Thoughts? Discussed with: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#8 (text+ko) ==== @@ -96,6 +96,7 @@ #include #include #include +#include #include #include @@ -144,7 +145,7 @@ static void usage(void) __dead2; static void export_pam_environment(void); static int ok_to_export(const char *); -static void audit_su(au_id_t, int); +static void audit_su(au_id_t, int, const char *, ...); extern char **environ; @@ -219,7 +220,7 @@ if (strlen(user) > MAXLOGNAME - 1) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, "username too long"); #endif errx(1, "username too long"); } @@ -252,7 +253,8 @@ pwd = getpwuid(ruid); if (pwd == NULL) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, + "unable to determain invoking subject"); #endif errx(1, "who are you?"); } @@ -278,9 +280,6 @@ /* Do the whole PAM startup thing */ retcode = pam_start("su", user, &conv, &pamh); if (retcode != PAM_SUCCESS) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif syslog(LOG_ERR, "pam_start: %s", pam_strerror(pamh, retcode)); errx(1, "pam_start: %s", pam_strerror(pamh, retcode)); } @@ -295,14 +294,15 @@ retcode = pam_authenticate(pamh, 0); if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT - audit_su(ruid, AUDIT_SU_FAILURE); + audit_su(ruid, AUDIT_SU_FAILURE, "bad su %s to %s on %s", + username, user, mytty); #endif syslog(LOG_AUTH|LOG_WARNING, "BAD SU %s to %s on %s", username, user, mytty); errx(1, "Sorry"); } #ifdef USE_BSM_AUDIT - audit_su(ruid, AUDIT_SU_SUCCESS); + audit_su(ruid, AUDIT_SU_SUCCESS, "successful authentication"); #endif retcode = pam_get_item(pamh, PAM_USER, (const void **)&p); if (retcode == PAM_SUCCESS) @@ -313,7 +313,8 @@ pwd = getpwnam(user); if (pwd == NULL) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, + "unknown subject: %s", user); #endif errx(1, "unknown login: %s", user); } @@ -323,17 +324,20 @@ retcode = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE, + "pam_chauthtok: %s", + pam_strerror(pamh, retcode)); +#endif syslog(LOG_ERR, "pam_chauthtok: %s", pam_strerror(pamh, retcode)); -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "Sorry"); } } if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, "pam_acct_mgmt: %s", + pam_strerror(pamh, retcode)); #endif syslog(LOG_ERR, "pam_acct_mgmt: %s", pam_strerror(pamh, retcode)); @@ -346,15 +350,13 @@ else { if (ruid != 0) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, + "only root may use -c"); #endif errx(1, "only root may use -c"); } lc = login_getclass(class); if (lc == NULL) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "unknown class: %s", class); } } @@ -362,9 +364,6 @@ /* if asme and non-standard target shell, must be root */ if (asme) { if (ruid != 0 && !chshell(pwd->pw_shell)) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "permission denied (shell)"); } } @@ -391,9 +390,6 @@ /* Switch to home directory */ if (asthem) { if (chdir(pwd->pw_dir) < 0) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "no directory"); } } @@ -403,17 +399,11 @@ * initialize them first. */ if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "setusercontext"); } retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED); if (retcode != PAM_SUCCESS) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif syslog(LOG_ERR, "pam_setcred: %s", pam_strerror(pamh, retcode)); errx(1, "failed to establish credentials."); @@ -421,9 +411,6 @@ if (asthem) { retcode = pam_open_session(pamh, 0); if (retcode != PAM_SUCCESS) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif syslog(LOG_ERR, "pam_open_session: %s", pam_strerror(pamh, retcode)); errx(1, "failed to open session."); @@ -512,9 +499,6 @@ if ((asme || (!asthem && class == NULL)) && pwd->pw_uid) setwhat &= ~(LOGIN_SETPRIORITY | LOGIN_SETRESOURCES); if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "setusercontext"); } @@ -647,13 +631,15 @@ #ifdef USE_BSM_AUDIT static void -audit_su(au_id_t au_ctx, int what) +audit_su(au_id_t au_ctx, int what, const char *fmt, ...) { token_t *token; long acond; int afd; au_tid_t termid; pid_t pid; + char text[1024]; + va_list ap; if (auditon(A_GETCOND, &acond, sizeof(long)) < 0) { /* @@ -662,20 +648,40 @@ */ if (errno == ENOSYS) return; - err(1, "auditon failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: auditon failed: %s", + strerror(errno)); + return; } afd = au_open(); - if (afd < 0) - err(1, "au_open failed"); + if (afd < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + strerror(errno)); + return; + } /* XXX what should we do for termid? */ bzero(&termid, sizeof(termid)); pid = getpid(); token = au_to_subject32(au_ctx, geteuid(), getegid(), getuid(), getgid(), pid, pid, &termid); - if (token == NULL) - errx(1, "audit: unable to build subject token"); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "audit: unable to build subject token"); + return; + } /* XXX what if au_fails? */ (void) au_write(afd, token); + if (fmt != NULL) { + va_start(ap, fmt); + vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); + va_end(ap); + token = au_to_text(&text[0]); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "failed to generate text token"); + return; + } + (void) au_write(afd, token); + } switch (what) { case AUDIT_SU_FAILURE: token = au_to_return32(1, EPERM); @@ -684,10 +690,13 @@ token = au_to_return32(0, 0); break; } - if (token == NULL) - errx(1, "audit: unable to build return32 token"); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "audit: enable to build return token"); + return; + } (void) au_write(afd, token); - if (au_close(afd, 1, AUE_su) < 0) - errx(1, "audit: record not committed"); + if (au_close(afd, 1, AUE_su) < 0) + syslog(LOG_AUTH | LOG_ERR, "audit: record not committed"); } #endif From owner-p4-projects@FreeBSD.ORG Tue Feb 14 05:02:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEC8B16A423; Tue, 14 Feb 2006 05:02:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6FF4B16A420 for ; Tue, 14 Feb 2006 05:02:27 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1864743D6E for ; Tue, 14 Feb 2006 05:02:27 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E52QFA060392 for ; Tue, 14 Feb 2006 05:02:26 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E52Q8F060389 for perforce@freebsd.org; Tue, 14 Feb 2006 05:02:26 GMT (envelope-from csjp@freebsd.org) Date: Tue, 14 Feb 2006 05:02:26 GMT Message-Id: <200602140502.k1E52Q8F060389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 05:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91726 Change 91726 by csjp@csjp_xor on 2006/02/14 05:02:10 Remove gratuitous whitespace which managed to sneak in with my previous submit. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#9 (text+ko) ==== @@ -672,16 +672,16 @@ (void) au_write(afd, token); if (fmt != NULL) { va_start(ap, fmt); - vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); - va_end(ap); - token = au_to_text(&text[0]); - if (token == NULL) { + (void) vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); + va_end(ap); + token = au_to_text(&text[0]); + if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "failed to generate text token"); return; } - (void) au_write(afd, token); - } + (void) au_write(afd, token); + } switch (what) { case AUDIT_SU_FAILURE: token = au_to_return32(1, EPERM); From owner-p4-projects@FreeBSD.ORG Tue Feb 14 05:07:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AF4816A423; Tue, 14 Feb 2006 05:07:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A53C16A420 for ; Tue, 14 Feb 2006 05:07:57 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3C0143D5C for ; Tue, 14 Feb 2006 05:07:54 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E57sWg060587 for ; Tue, 14 Feb 2006 05:07:54 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E57spa060584 for perforce@freebsd.org; Tue, 14 Feb 2006 05:07:54 GMT (envelope-from csjp@freebsd.org) Date: Tue, 14 Feb 2006 05:07:54 GMT Message-Id: <200602140507.k1E57spa060584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91728 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 05:07:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=91728 Change 91728 by csjp@csjp_xor on 2006/02/14 05:07:08 Consistently prefix audit related syslog messages with "audit". Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#10 (text+ko) ==== @@ -654,7 +654,7 @@ } afd = au_open(); if (afd < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", strerror(errno)); return; } @@ -677,7 +677,7 @@ token = au_to_text(&text[0]); if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, - "failed to generate text token"); + "audit: failed to generate text token"); return; } (void) au_write(afd, token); From owner-p4-projects@FreeBSD.ORG Tue Feb 14 05:30:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E575016A423; Tue, 14 Feb 2006 05:30:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B82B916A420 for ; Tue, 14 Feb 2006 05:30:22 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7914F43D45 for ; Tue, 14 Feb 2006 05:30:22 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E5UMFE061484 for ; Tue, 14 Feb 2006 05:30:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E5UMhY061481 for perforce@freebsd.org; Tue, 14 Feb 2006 05:30:22 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 05:30:22 GMT Message-Id: <200602140530.k1E5UMhY061481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 05:30:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=91729 Change 91729 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 05:30:06 fixes to loader to support sun4v Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/main.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sparc64/include/asm.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sparc64/include/hypervisor_api.h#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/main.c#2 (text+ko) ==== @@ -34,6 +34,8 @@ #include #include #include +#include + #include "bootstrap.h" #include "libofw.h" @@ -50,6 +52,15 @@ vm_offset_t size; }; +struct mmu_ops { + void (*tlb_init)(void); + int (*mmu_mapin)(vm_offset_t va, vm_size_t len); +} *mmu_ops; + + + +#define UNIMPLEMENTED printf("%s function not implemented\n", __FUNCTION__); + typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); @@ -60,18 +71,35 @@ extern vm_offset_t md_load(char *, vm_offset_t *); static int __elfN(exec)(struct preloaded_file *); static int sparc64_autoload(void); -static int mmu_mapin(vm_offset_t, vm_size_t); +static int mmu_mapin_sun4u(vm_offset_t, vm_size_t); +static int mmu_mapin_sun4v(vm_offset_t, vm_size_t); +static void tlb_init_sun4u(void); +static void tlb_init_sun4v(void); + +struct mmu_ops mmu_ops_sun4u = { tlb_init_sun4u, mmu_mapin_sun4u }; +struct mmu_ops mmu_ops_sun4v = { tlb_init_sun4v, mmu_mapin_sun4v }; extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[]; +/* sun4u */ struct tlb_entry *dtlb_store; struct tlb_entry *itlb_store; - int dtlb_slot; int itlb_slot; int dtlb_slot_max; int itlb_slot_max; +/* sun4v */ +struct tlb_entry *tlb_store; +/* + * no direct TLB access on sun4v + * we somewhat arbitrarily declare enough + * slots to cover a 4GB AS with 4MB pages + */ +#define SUN4V_TLB_SLOT_MAX (1 << 10) + + + vm_offset_t curkva = 0; vm_offset_t heapva; phandle_t pmemh; /* OFW memory handle */ @@ -204,14 +232,14 @@ static ssize_t sparc64_readin(const int fd, vm_offset_t va, const size_t len) { - mmu_mapin(va, len); + mmu_ops->mmu_mapin(va, len); return read(fd, (void *)va, len); } static ssize_t sparc64_copyin(const void *src, vm_offset_t dest, size_t len) { - mmu_mapin(dest, len); + mmu_ops->mmu_mapin(dest, len); memcpy((void *)dest, src, len); return len; } @@ -252,7 +280,7 @@ } static int -mmu_mapin(vm_offset_t va, vm_size_t len) +mmu_mapin_sun4u(vm_offset_t va, vm_size_t len) { vm_offset_t pa, mva; u_long data; @@ -310,6 +338,53 @@ return 0; } +static int +mmu_mapin_sun4v(vm_offset_t va, vm_size_t len) +{ + + vm_offset_t pa, mva; + u_long data; + int ret; + + if (va + len > curkva) + curkva = va + len; + + pa = (vm_offset_t)-1; + len += va & PAGE_MASK_4M; + va &= ~PAGE_MASK_4M; + while (len) { + if ((va >> 22) > SUN4V_TLB_SLOT_MAX) + panic("trying to map more than 4GB"); + if (tlb_store[va >> 22].te_pa == -1) { + /* Allocate a physical page, claim the virtual area */ + if (pa == (vm_offset_t)-1) { + pa = (vm_offset_t)OF_alloc_phys(PAGE_SIZE_4M, + PAGE_SIZE_4M); + if (pa == (vm_offset_t)-1) + panic("out of memory"); + mva = (vm_offset_t)OF_claim_virt(va, + PAGE_SIZE_4M, 0); + if (mva != va) { + panic("can't claim virtual page " + "(wanted %#lx, got %#lx)", + va, mva); + } + } + + tlb_store[va >> 22].te_pa = pa; + data = VTD_V | VTD_PA(pa) | VTD_CP | VTD_CV | VTD_P | VTD_W | VTD_4M; + if ((ret = hv_mmu_map_perm_addr(va, 0, data, MAP_DTLB | MAP_ITLB)) != 0) + printf("hv_mmu_map_perm_addr failed: %d\n", ret);; + pa = (vm_offset_t)-1; + } + len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; + va += PAGE_SIZE_4M; + } + if (pa != (vm_offset_t)-1) + OF_release_phys(pa, PAGE_SIZE_4M); + return 0; +} + static vm_offset_t init_heap(void) { @@ -324,7 +399,7 @@ } static void -tlb_init(void) +tlb_init_sun4u(void) { phandle_t child; phandle_t root; @@ -361,11 +436,20 @@ panic("init_tlb: malloc"); } +static void +tlb_init_sun4v(void) +{ + tlb_store = malloc(SUN4V_TLB_SLOT_MAX * sizeof(*tlb_store)); + memset(tlb_store, 0xFF, SUN4V_TLB_SLOT_MAX * sizeof(*tlb_store)); +} + int main(int (*openfirm)(void *)) { char bootpath[64]; + char compatible[32]; struct devsw **dp; + phandle_t rooth; phandle_t chosenh; /* @@ -381,13 +465,22 @@ init_heap(); setheap((void *)heapva, (void *)(heapva + HEAPSZ)); - /* * Probe for a console. */ cons_probe(); - tlb_init(); + rooth = OF_peer(0); + OF_getprop(rooth, "compatible", compatible, sizeof(compatible)); + if (!strcmp(compatible, "sun4v")) { + printf("\nnice machine\n"); + mmu_ops = &mmu_ops_sun4v; + } else { + printf("\nHere's a quarter kid. Go buy yourself a new computer.\n"); + mmu_ops = &mmu_ops_sun4u; + } + + mmu_ops->tlb_init(); bcache_init(32, 512); ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/include/asm.h#2 (text+ko) ==== @@ -95,6 +95,13 @@ #define ENTRY(x) _ENTRY(x) #define END(x) .size x, . - x +#define STACK_ALIGN 16 +#define SET_SIZE(x) END(x) +#define SA(X) (((X)+(STACK_ALIGN-1)) & ~(STACK_ALIGN-1)) +#define WINDOWSIZE64 (16*8) +#define MINFRAME64 (WINDOWSIZE64 + 48) +#define MINFRAME MINFRAME64 + /* * Kernel RCS ID tag and copyright macros */ From owner-p4-projects@FreeBSD.ORG Tue Feb 14 06:56:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7238616A423; Tue, 14 Feb 2006 06:56:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4981816A420 for ; Tue, 14 Feb 2006 06:56:07 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E772A43D45 for ; Tue, 14 Feb 2006 06:56:06 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E6u6x3064980 for ; Tue, 14 Feb 2006 06:56:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E6u6JP064977 for perforce@freebsd.org; Tue, 14 Feb 2006 06:56:06 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 06:56:06 GMT Message-Id: <200602140656.k1E6u6JP064977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91732 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 06:56:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=91732 Change 91732 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 06:55:15 add sun4v sub-arch with files from sparc64 Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/Makefile.sun4v#1 add .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#1 add .. //depot/projects/kmacy_sun4v/src/sys/conf/options.sun4v#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/compile/.cvsignore#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/DEFAULTS#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC.hints#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/MAC#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/Makefile#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/NOTES#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_bus.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_inttypes.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_limits.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_stdint.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_types.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asm.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/atomic.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus_common.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus_dma.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus_private.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cache.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ccr.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/clock.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/db_machdep.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/elf.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/endian.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/exec.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/float.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/floatingpoint.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/fp.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/frame.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/fsr.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/gdb_machdep.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/idprom.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ieee.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ieeefp.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/in_cksum.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/instr.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/intr_machdep.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/iommureg.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/iommuvar.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/kdb.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/kerneldump.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ktr.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/limits.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/lsu.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/memdev.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/metadata.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/mutex.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/nexusvar.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ofw_bus.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ofw_machdep.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ofw_mem.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ofw_upa.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmc_mdep.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/proc.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/profile.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pstate.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ptrace.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/reg.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/reloc.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/resource.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/runq.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sc_machdep.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/setjmp.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sf_buf.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sigframe.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/signal.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/smp.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/stdarg.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sysarch.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tick.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tlb.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tstate.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ucontext.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/upa.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/utrap.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/varargs.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ver.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/vmparam.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/watch.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/wstate.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/autoconf.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/clock.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/counter.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/db_disasm.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/db_hwwatch.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/db_interface.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/db_trace.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/dump_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/eeprom.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/elf_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/gdb_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/genassym.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/identcpu.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/in_cksum.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/iommu.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mem.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/ofw_bus.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/ofw_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/prof_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/rtc.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/rwindow.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/sc_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/sys_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/uio_machdep.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Feb 14 07:12:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D830B16A423; Tue, 14 Feb 2006 07:12:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD80116A420 for ; Tue, 14 Feb 2006 07:12:27 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 397B243D46 for ; Tue, 14 Feb 2006 07:12:27 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E7CRZG065544 for ; Tue, 14 Feb 2006 07:12:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E7CRgs065541 for perforce@freebsd.org; Tue, 14 Feb 2006 07:12:27 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 07:12:27 GMT Message-Id: <200602140712.k1E7CRgs065541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 07:12:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91733 Change 91733 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 07:11:45 add in sun4v pmap - largely empty Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Feb 14 07:27:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE6A516A424; Tue, 14 Feb 2006 07:27:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B3AB16A422 for ; Tue, 14 Feb 2006 07:27:46 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60B8743D45 for ; Tue, 14 Feb 2006 07:27:46 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E7Rk2A068636 for ; Tue, 14 Feb 2006 07:27:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E7RkdR068633 for perforce@freebsd.org; Tue, 14 Feb 2006 07:27:46 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 07:27:46 GMT Message-Id: <200602140727.k1E7RkdR068633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91734 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 07:27:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=91734 Change 91734 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 07:27:21 remove invalid pstate bits add new tte bits remove invalid use of pstate bits in locore.S add Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pstate.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pstate.h#2 (text+ko) ==== @@ -29,7 +29,6 @@ #ifndef _MACHINE_PSTATE_H_ #define _MACHINE_PSTATE_H_ -#define PSTATE_AG (1<<0) #define PSTATE_IE (1<<1) #define PSTATE_PRIV (1<<2) #define PSTATE_AM (1<<3) @@ -45,16 +44,11 @@ #define PSTATE_TLE (1<<8) #define PSTATE_CLE (1<<9) -#define PSTATE_MG (1<<10) -#define PSTATE_IG (1<<11) + #define PSTATE_MM PSTATE_MM_TSO #define PSTATE_NORMAL (PSTATE_MM | PSTATE_PEF | PSTATE_PRIV) -#define PSTATE_ALT (PSTATE_NORMAL | PSTATE_AG) -#define PSTATE_INTR (PSTATE_NORMAL | PSTATE_IG) -#define PSTATE_MMU (PSTATE_NORMAL | PSTATE_MG) - #define PSTATE_KERNEL (PSTATE_NORMAL | PSTATE_IE) #define PSTATE_SECURE(pstate) \ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#2 (text+ko) ==== @@ -56,6 +56,10 @@ #define TS_64K (1UL) #define TS_512K (2UL) #define TS_4M (3UL) +#define TS_32M (4UL) +#define TS_256M (5UL) +#define TS_2G (6UL) +#define TS_16G (7UL) #define TS_MIN TS_8K #define TS_MAX TS_4M @@ -114,11 +118,11 @@ struct pmap; -struct tte { +typedef struct tte { u_long tte_vpn; u_long tte_data; TAILQ_ENTRY(tte) tte_link; -}; +} *tte_t; static __inline int tte_match(struct tte *tp, vm_offset_t va) @@ -127,4 +131,29 @@ (tp->tte_vpn == TV_VPN(va, TTE_GET_SIZE(tp)))); } +#define VTD_SOFT_SHIFT (56) + +#define VTD_V (1UL << 63) +#define VTD_NFO (1UL << 62) +#define VTD_PA(pa) ((pa) & (TD_PA_MASK << TD_PA_SHIFT)) +#define VTD_IE (1UL << 12) +#define VTD_E (1UL << 11) +#define VTD_CP (1UL << 10) +#define VTD_CV (1UL << 9) +#define VTD_P (1UL << 8) +#define VTD_X (1UL << 7) +#define VTD_W (1UL << 6) + +#define VTD_REF ((1UL << 3) << VTD_SOFT_SHIFT) +#define VTD_SW ((1UL << 1) << VTD_SOFT_SHIFT) + + +#define VTD_8K TS_8K +#define VTD_64K TS_64K +#define VTD_512K TS_512K +#define VTD_4M TS_4M +#define VTD_32M TS_32M +#define VTD_256M TS_256M + + #endif /* !_MACHINE_TTE_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#2 (text+ko) ==== @@ -54,7 +54,6 @@ wrpr %g0, 0, %cleanwin wrpr %g0, 0, %pil wr %g0, 0, %fprs - wrpr %g0, 0, %tick /* * Get onto our per-cpu panic stack, which precedes the struct pcpu in @@ -106,45 +105,7 @@ mov %o1, PCB_REG mov %o0, PCPU_REG - /* - * Alternate globals. - */ - wrpr %g0, PSTATE_ALT, %pstate - - /* - * Alternate %g5 points to a per-cpu panic stack, %g6 points to the - * current thread's pcb, and %g7 points to the per-cpu data structure. - */ - mov %o0, ASP_REG - mov %o1, PCB_REG - mov %o0, PCPU_REG - - /* - * Interrupt globals. - */ - wrpr %g0, PSTATE_INTR, %pstate - - /* - * Interrupt %g7 points to the per-cpu data structure. - */ - mov %o0, PCPU_REG - - /* - * Normal globals again. - */ - wrpr %g0, PSTATE_NORMAL, %pstate - - /* - * Force trap level 1 and take over the trap table. - */ - SET(tl0_base, %o2, %o1) - wrpr %g0, 1, %tl - wrpr %o1, 0, %tba - - /* - * Re-enable interrupts. - */ - wrpr %g0, PSTATE_KERNEL, %pstate + /* XXX SUN4V_FIXME need to set the scratchpad registers */ retl nop From owner-p4-projects@FreeBSD.ORG Tue Feb 14 07:28:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 922EE16A423; Tue, 14 Feb 2006 07:28:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D6DF16A420 for ; Tue, 14 Feb 2006 07:28:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2061743D48 for ; Tue, 14 Feb 2006 07:28:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E7Smrc068691 for ; Tue, 14 Feb 2006 07:28:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E7Slgt068685 for perforce@freebsd.org; Tue, 14 Feb 2006 07:28:47 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 07:28:47 GMT Message-Id: <200602140728.k1E7Slgt068685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 07:28:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=91735 Change 91735 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 07:28:29 add in missed .S files - they will all need to be re-written, but this allows us to link Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_exception.S#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_locore.S#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Feb 14 07:41:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1854816A423; Tue, 14 Feb 2006 07:41:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCA3316A420 for ; Tue, 14 Feb 2006 07:41:03 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95D0B43D4C for ; Tue, 14 Feb 2006 07:41:03 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E7f3Hi069165 for ; Tue, 14 Feb 2006 07:41:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E7f3I1069162 for perforce@freebsd.org; Tue, 14 Feb 2006 07:41:03 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 07:41:03 GMT Message-Id: <200602140741.k1E7f3I1069162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 07:41:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=91736 Change 91736 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 07:40:01 remove references to non-existent version register Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/identcpu.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#2 (text+ko) ==== @@ -54,10 +54,11 @@ void utrap_free(struct md_utrap *ut); struct md_utrap *utrap_hold(struct md_utrap *ut); -cpu_block_copy_t spitfire_block_copy; -cpu_block_zero_t spitfire_block_zero; extern cpu_block_copy_t *cpu_block_copy; extern cpu_block_zero_t *cpu_block_zero; +#define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) + + #endif /* !_MACHINE_MD_VAR_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/identcpu.c#2 (text+ko) ==== @@ -25,8 +25,6 @@ SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, "Machine model"); -int cpu_impl; - void setPQL2(int *const size, int *const ways); void ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#2 (text+ko) ==== @@ -284,12 +284,6 @@ kmdp = NULL; /* - * Find out what kind of cpu we have first, for anything that changes - * behaviour. - */ - cpu_impl = VER_IMPL(rdpr(ver)); - - /* * Initialize Open Firmware (needed for console). */ OF_init(vec); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#2 (text+ko) ==== @@ -192,8 +192,5 @@ void tick_stop(void) { - - if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - wr(asr25, 1L << 63, 0); - wrtickcmpr(1L << 63, 0); + UNIMPLEMENTED; } From owner-p4-projects@FreeBSD.ORG Tue Feb 14 08:09:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0498116A423; Tue, 14 Feb 2006 08:09:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B700416A420 for ; Tue, 14 Feb 2006 08:09:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65CA443D55 for ; Tue, 14 Feb 2006 08:09:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E89ctf070327 for ; Tue, 14 Feb 2006 08:09:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E89cKC070324 for perforce@freebsd.org; Tue, 14 Feb 2006 08:09:38 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 08:09:38 GMT Message-Id: <200602140809.k1E89cKC070324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 08:09:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=91737 Change 91737 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 08:08:44 point sub-arch at right directory Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#2 (text+ko) ==== @@ -37,41 +37,41 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard -sparc64/sparc64/autoconf.c standard -sparc64/sparc64/bus_machdep.c standard -sparc64/sparc64/clock.c standard -sparc64/sparc64/counter.c standard -sparc64/sparc64/db_disasm.c optional ddb -sparc64/sparc64/db_interface.c optional ddb -sparc64/sparc64/db_trace.c optional ddb -sparc64/sparc64/db_hwwatch.c optional ddb -sparc64/sparc64/dump_machdep.c standard -sparc64/sparc64/elf_machdep.c standard -sparc64/sparc64/exception.S standard no-obj -sparc64/sparc64/eeprom.c optional eeprom ebus | eeprom fhc | \ +sun4v/sun4v/autoconf.c standard +sun4v/sun4v/bus_machdep.c standard +sun4v/sun4v/clock.c standard +sun4v/sun4v/counter.c standard +sun4v/sun4v/db_disasm.c optional ddb +sun4v/sun4v/db_interface.c optional ddb +sun4v/sun4v/db_trace.c optional ddb +sun4v/sun4v/db_hwwatch.c optional ddb +sun4v/sun4v/dump_machdep.c standard +sun4v/sun4v/elf_machdep.c standard +sun4v/sun4v/exception.S standard no-obj +sun4v/sun4v/eeprom.c optional eeprom ebus | eeprom fhc | \ eeprom sbus -sparc64/sparc64/gdb_machdep.c optional gdb -sparc64/sparc64/identcpu.c standard -sparc64/sparc64/in_cksum.c optional inet -sparc64/sparc64/interrupt.S standard no-obj -sparc64/sparc64/intr_machdep.c standard -sparc64/sparc64/iommu.c standard -sparc64/sparc64/locore.S standard no-obj -sparc64/sparc64/machdep.c standard -sparc64/sparc64/mem.c optional mem -sparc64/sparc64/mp_exception.S optional smp -sparc64/sparc64/mp_locore.S optional smp -sparc64/sparc64/mp_machdep.c optional smp -sparc64/sparc64/nexus.c standard -sparc64/sparc64/ofw_bus.c standard -sparc64/sparc64/ofw_machdep.c standard -sparc64/sparc64/pmap.c standard -sparc64/sparc64/prof_machdep.c optional profiling-routine -sparc64/sparc64/rwindow.c standard -sparc64/sparc64/support.S standard -sparc64/sparc64/sys_machdep.c standard -sparc64/sparc64/swtch.S standard -sparc64/sparc64/tick.c standard -sparc64/sparc64/trap.c standard -sparc64/sparc64/uio_machdep.c standard -sparc64/sparc64/vm_machdep.c standard +sun4v/sun4v/gdb_machdep.c optional gdb +sun4v/sun4v/identcpu.c standard +sun4v/sun4v/in_cksum.c optional inet +sun4v/sun4v/interrupt.S standard no-obj +sun4v/sun4v/intr_machdep.c standard +sun4v/sun4v/iommu.c standard +sun4v/sun4v/locore.S standard no-obj +sun4v/sun4v/machdep.c standard +sun4v/sun4v/mem.c optional mem +sun4v/sun4v/mp_exception.S optional smp +sun4v/sun4v/mp_locore.S optional smp +sun4v/sun4v/mp_machdep.c optional smp +sun4v/sun4v/nexus.c standard +sun4v/sun4v/ofw_bus.c standard +sun4v/sun4v/ofw_machdep.c standard +sun4v/sun4v/pmap.c standard +sun4v/sun4v/prof_machdep.c optional profiling-routine +sun4v/sun4v/rwindow.c standard +sun4v/sun4v/support.S standard +sun4v/sun4v/sys_machdep.c standard +sun4v/sun4v/swtch.S standard +sun4v/sun4v/tick.c standard +sun4v/sun4v/trap.c standard +sun4v/sun4v/uio_machdep.c standard +sun4v/sun4v/vm_machdep.c standard From owner-p4-projects@FreeBSD.ORG Tue Feb 14 08:13:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9005916A424; Tue, 14 Feb 2006 08:13:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4505616A420 for ; Tue, 14 Feb 2006 08:13:05 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60D2743DA8 for ; Tue, 14 Feb 2006 08:12:47 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1E8CjVk070519 for ; Tue, 14 Feb 2006 08:12:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E8CjII070516 for perforce@freebsd.org; Tue, 14 Feb 2006 08:12:45 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 08:12:45 GMT Message-Id: <200602140812.k1E8CjII070516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 08:13:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=91738 Change 91738 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 08:11:45 "fix" ASI related compile errors in all files except exception.S fix undefined symbols issues in machdep.c Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#2 (text+ko) ==== @@ -83,6 +83,8 @@ return (rd(tick)); } +#define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) + #endif #endif /* !_MACHINE_CPU_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#3 (text+ko) ==== @@ -58,7 +58,6 @@ extern cpu_block_copy_t *cpu_block_copy; extern cpu_block_zero_t *cpu_block_zero; -#define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) #endif /* !_MACHINE_MD_VAR_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#2 (text+ko) ==== @@ -87,6 +87,11 @@ #define PAGE_SIZE_4M (1L<pc_curthread = &thread0; pc->pc_curpcb = thread0.td_pcb; +#ifdef notyet + /* SUN4V_FIXME what is pc_mid? */ pc->pc_mid = UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG)); +#endif pc->pc_addr = (vm_offset_t)pcpu0; pc->pc_node = child; pc->pc_tlb_ctx = TLB_CTX_USER_MIN; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#2 (text+ko) ==== @@ -45,10 +45,7 @@ #include #include -#include -#include #include -#include "mmu_if.h" #define PMAP_DEBUG @@ -64,6 +61,11 @@ static struct ofw_map translations[128]; static int translations_size; + +struct ofw_mem_region sparc64_memreg[128]; +int sparc64_nmemreg; + + static vm_offset_t pmap_idle_map; static vm_offset_t pmap_temp_map_1; static vm_offset_t pmap_temp_map_2; @@ -511,7 +513,7 @@ } void -pmap_growkernel(mmu_t mmu, vm_offset_t addr) +pmap_growkernel(vm_offset_t addr) { panic("pmap_growkernel: can't grow kernel"); } @@ -582,7 +584,7 @@ } void -pmap_map_tsb(mmu_t mmu) +pmap_map_tsb(void) { vm_offset_t va; vm_paddr_t pa; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#2 (text+ko) ==== @@ -659,6 +659,8 @@ ! never to return END(openfirmware_exit) +#endif + #ifdef GPROF ENTRY(user) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#2 (text+ko) ==== @@ -225,6 +225,8 @@ */ stx %i2, [PCPU(PMAP)] +#ifdef notyet + /* XXX SUN4V_FIXME */ /* * Fiddle the hardware bits. Set the tsb registers and install the * new context number in the cpu. @@ -237,7 +239,7 @@ mov AA_DMMU_PCXR, %i5 stxa %i3, [%i5] ASI_DMMU membar #Sync - +#endif /* * Done. Return and load the new process's window from the stack. */ From owner-p4-projects@FreeBSD.ORG Tue Feb 14 19:59:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CD6616A423; Tue, 14 Feb 2006 19:59:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C86D16A420 for ; Tue, 14 Feb 2006 19:59:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AD8C43D48 for ; Tue, 14 Feb 2006 19:59:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1EJxRmS030501 for ; Tue, 14 Feb 2006 19:59:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1EJxRNx030498 for perforce@freebsd.org; Tue, 14 Feb 2006 19:59:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 Feb 2006 19:59:27 GMT Message-Id: <200602141959.k1EJxRNx030498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91763 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 19:59:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=91763 Change 91763 by rwatson@rwatson_fledge on 2006/02/14 19:58:40 Update SEDarwin page: - Currently SEDarwin drop is 10.3.8. - Add DSEP project summary. - Add new DSEP drop download link. Submitted by: Christopher dot Vance at SPARTA dot com Affected files ... .. //depot/projects/trustedbsd/www/sedarwin.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/sedarwin.page#3 (text+ko) ==== @@ -36,7 +36,7 @@ - $P4: //depot/projects/trustedbsd/www/sedarwin.page#2 $ + $P4: //depot/projects/trustedbsd/www/sedarwin.page#3 $ @@ -59,7 +59,7 @@ SEBSD policy. SEDarwin is highly experimental, but current sufficiently functional to allow the enforcement of mandatory process - and file protections under Mac OS 10.3.3 and Darwin 7.3 on + and file protections under Mac OS 10.3.8 and Darwin 7.3 on a variety of Apple PowerPC hardware. The current prototype software may be downloaded using cvsup, and commits to the prototype implementation may @@ -71,6 +71,18 @@

    2006-02-08 SEDarwin (Darwin 7.8) snapshot: Download tarball.

    +

    The Darwin Security Extension Project (DSEP) complements the + SEDarwin work, but has a different goal. DSEP is primarily concerned + with updating and maintaining the TrustedBSD MAC Framework on + Darwin. While still experimental, the MAC Framework has been + updated to support Mac OS X "Tiger", currently supporting Mac OS X + 10.4.3 (Darwin 8.4). Note that the DSEP releases typically won't + have the newest FLASK and SELinux components; they will be migrated + to the Tiger platform soon.

    + +

    2006-02-13 DSEP (Darwin 8.4) snapshot: Download tarball.

    +

    2005-05-31 DSEP7 drop 20050331: Download tarball.

    From owner-p4-projects@FreeBSD.ORG Tue Feb 14 21:30:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F94416A423; Tue, 14 Feb 2006 21:30:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06C8916A420 for ; Tue, 14 Feb 2006 21:30:20 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A710543D48 for ; Tue, 14 Feb 2006 21:30:19 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1ELUJV4041930 for ; Tue, 14 Feb 2006 21:30:19 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1ELUJac041927 for perforce@freebsd.org; Tue, 14 Feb 2006 21:30:19 GMT (envelope-from marcel@freebsd.org) Date: Tue, 14 Feb 2006 21:30:19 GMT Message-Id: <200602142130.k1ELUJac041927@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 91767 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 21:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=91767 Change 91767 by marcel@marcel_nfs on 2006/02/14 21:29:47 IFC @91765 Affected files ... .. //depot/projects/uart/alpha/alpha/machdep.c#16 integrate .. //depot/projects/uart/conf/files.amd64#16 integrate .. //depot/projects/uart/conf/files.i386#21 integrate .. //depot/projects/uart/dev/asr/asr.c#11 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/uart/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/uart/dev/ath/if_ath.c#21 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/uart/dev/dc/if_dc.c#3 integrate .. //depot/projects/uart/dev/em/if_em.c#19 integrate .. //depot/projects/uart/dev/em/if_em.h#17 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#21 integrate .. //depot/projects/uart/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/uart/dev/lge/if_lge.c#12 integrate .. //depot/projects/uart/dev/mii/mii.c#7 integrate .. //depot/projects/uart/dev/nge/if_nge.c#13 integrate .. //depot/projects/uart/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/uart/dev/re/if_re.c#14 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#16 integrate .. //depot/projects/uart/dev/tx/if_tx.c#12 integrate .. //depot/projects/uart/dev/usb/if_aue.c#11 integrate .. //depot/projects/uart/dev/usb/if_axe.c#11 integrate .. //depot/projects/uart/dev/usb/if_rue.c#9 integrate .. //depot/projects/uart/dev/usb/if_udav.c#6 integrate .. //depot/projects/uart/dev/usb/umass.c#16 integrate .. //depot/projects/uart/dev/usb/umct.c#6 integrate .. //depot/projects/uart/dev/vge/if_vge.c#8 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#24 integrate .. //depot/projects/uart/ia64/ia64/mp_machdep.c#10 integrate .. //depot/projects/uart/kern/kern_sig.c#22 integrate .. //depot/projects/uart/kern/kern_thread.c#19 integrate .. //depot/projects/uart/kern/sys_process.c#13 integrate .. //depot/projects/uart/kern/uipc_socket.c#15 integrate .. //depot/projects/uart/modules/Makefile#23 integrate .. //depot/projects/uart/net/if_media.c#5 integrate .. //depot/projects/uart/net/if_media.h#6 integrate .. //depot/projects/uart/net80211/ieee80211.c#12 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#13 integrate .. //depot/projects/uart/netgraph/ng_eiface.c#9 integrate .. //depot/projects/uart/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#14 integrate .. //depot/projects/uart/netinet/ip_dummynet.h#9 integrate .. //depot/projects/uart/netinet/ip_fw.h#11 integrate .. //depot/projects/uart/netinet6/nd6.c#11 integrate .. //depot/projects/uart/pci/if_pcn.c#10 integrate .. //depot/projects/uart/pci/if_rl.c#20 integrate .. //depot/projects/uart/pci/if_sf.c#13 integrate .. //depot/projects/uart/pci/if_sis.c#17 integrate .. //depot/projects/uart/pci/if_sk.c#17 integrate .. //depot/projects/uart/pci/if_ste.c#10 integrate .. //depot/projects/uart/pci/if_vr.c#10 integrate .. //depot/projects/uart/pci/if_wb.c#10 integrate .. //depot/projects/uart/pci/if_xl.c#18 integrate .. //depot/projects/uart/security/audit/audit.c#2 integrate .. //depot/projects/uart/security/audit/audit_bsm.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/uart/ufs/ufs/ufs_quota.c#8 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/machdep.c#16 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.236 2005/10/14 12:43:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.237 2006/02/14 14:50:10 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -250,7 +250,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); - realmem = alpha_ptob(Maxmem); + realmem = Maxmem; /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/uart/conf/files.amd64#16 (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.amd64,v 1.81 2006/01/24 21:13:50 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.82 2006/02/13 17:56:24 ambrisko Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -155,6 +155,9 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_pci.c optional ipmi pci dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa ==== //depot/projects/uart/conf/files.i386#21 (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.i386,v 1.551 2006/01/31 23:11:34 rik Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.552 2006/02/13 17:56:24 ambrisko Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -183,6 +183,9 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_pci.c optional ipmi pci dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/lnc/if_lnc_isa.c optional lnc isa dev/mem/memutil.c optional mem ==== //depot/projects/uart/dev/asr/asr.c#11 (text+ko) ==== @@ -165,7 +165,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.76 2006/02/05 05:05:27 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.77 2006/02/12 06:57:41 scottl Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -387,7 +387,7 @@ struct cdev *ha_devt; } Asr_softc_t; -static Asr_softc_t * Asr_softc; +static Asr_softc_t *Asr_softc_list; /* * Prototypes of the routines we have in this object. @@ -1970,7 +1970,7 @@ sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_WAITOK | M_ZERO)) == NULL) { return (ENOMEM); } - for (ha = Asr_softc; ha; ha = ha->ha_next) { + for (ha = Asr_softc_list; ha; ha = ha->ha_next) { ++SystemTable->NumberEntries; } if ((Message_Ptr = (PI2O_EXEC_SYS_TAB_SET_MESSAGE)malloc ( @@ -2001,7 +2001,7 @@ &(Message_Ptr->StdMessageFrame)) & 0xF0) >> 2)); SG(sg, 0, I2O_SGL_FLAGS_DIR, SystemTable, sizeof(I2O_SET_SYSTAB_HEADER)); ++sg; - for (ha = Asr_softc; ha; ha = ha->ha_next) { + for (ha = Asr_softc_list; ha; ha = ha->ha_next) { SG(sg, 0, ((ha->ha_next) ? (I2O_SGL_FLAGS_DIR) @@ -2408,7 +2408,7 @@ unit = device_get_unit(dev); sc->ha_dev = dev; - if (Asr_softc == NULL) { + if (Asr_softc_list == NULL) { /* * Fixup the OS revision as saved in the dptsig for the * engine (dptioctl.h) to pick up. @@ -2420,7 +2420,7 @@ */ LIST_INIT(&(sc->ha_ccb)); /* Link us into the HA list */ - for (ha = &Asr_softc; *ha; ha = &((*ha)->ha_next)); + for (ha = &Asr_softc_list; *ha; ha = &((*ha)->ha_next)); *(ha) = sc; /* ==== //depot/projects/uart/dev/ata/ata-chipset.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.157 2006/02/09 20:54:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.158 2006/02/13 13:47:58 sos Exp $"); #include "opt_ata.h" #include @@ -1658,6 +1658,18 @@ RF_ACTIVE))) { /* is AHCI or RAID mode enabled in BIOS ? */ if (pci_read_config(dev, 0x90, 1) & 0xc0) { + + /* reset AHCI controller */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); + DELAY(1000000); + if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { + bus_release_resource(dev, ctlr->r_type2, + ctlr->r_rid2, ctlr->r_res2); + device_printf(dev, "AHCI controller reset failure\n"); + return ENXIO; + } + /* enable AHCI mode */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, ATA_AHCI_GHC_AE); ==== //depot/projects/uart/dev/ath/ath_rate/sample/sample.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.12 2006/02/09 20:49:55 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.13 2006/02/13 18:40:53 sam Exp $"); /* * John Bicket's SampleRate control algorithm. @@ -654,8 +654,7 @@ * A fixed rate is to be used; ic_fixed_rate is an * index into the supported rate set. Convert this * to the index into the negotiated rate set for - * the node. We know the rate is there because the - * rate set is checked when the station associates. + * the node. */ const struct ieee80211_rateset *rs = &ic->ic_sup_rates[ic->ic_curmode]; @@ -666,7 +665,7 @@ ; KASSERT(srate >= 0, ("fixed rate %d not in rate set", ic->ic_fixed_rate)); - sn->static_rate_ndx = srate; + sn->static_rate_ndx = srate; } DPRINTF(sc, "%s: %s size 1600 rate/tt", __func__, ether_sprintf(ni->ni_macaddr)); ==== //depot/projects/uart/dev/ath/if_ath.c#21 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.126 2006/02/10 19:07:08 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.127 2006/02/13 18:23:32 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -3870,7 +3870,6 @@ sc->sc_lastrx = ath_hal_gettsf64(sc->sc_ah); if (txqactive(sc->sc_ah, sc->sc_cabq->axq_qnum)) ath_tx_processq(sc, sc->sc_cabq); - ath_tx_processq(sc, sc->sc_cabq); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_tx_timer = 0; ==== //depot/projects/uart/dev/bfe/if_bfe.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.30 2005/11/11 16:04:50 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.31 2006/02/14 12:44:54 glebius Exp $"); #include #include @@ -386,7 +386,6 @@ ifp->if_watchdog = bfe_watchdog; ifp->if_init = bfe_init; ifp->if_mtu = ETHERMTU; - ifp->if_baudrate = 100000000; IFQ_SET_MAXLEN(&ifp->if_snd, BFE_TX_QLEN); ifp->if_snd.ifq_drv_maxlen = BFE_TX_QLEN; IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/uart/dev/dc/if_dc.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.178 2005/12/28 18:00:37 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.179 2006/02/14 12:44:54 glebius Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -2201,7 +2201,6 @@ ifp->if_start = dc_start; ifp->if_watchdog = dc_watchdog; ifp->if_init = dc_init; - ifp->if_baudrate = 10000000; IFQ_SET_MAXLEN(&ifp->if_snd, DC_TX_LIST_CNT - 1); ifp->if_snd.ifq_drv_maxlen = DC_TX_LIST_CNT - 1; IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/uart/dev/em/if_em.c#19 (text+ko) ==== @@ -31,12 +31,49 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.107 2006/02/09 12:57:17 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.108 2006/02/14 13:11:36 glebius Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include #include /********************************************************************* ==== //depot/projects/uart/dev/em/if_em.h#17 (text+ko) ==== @@ -31,51 +31,11 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.42 2006/02/04 16:50:14 scottl Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.43 2006/02/14 13:11:36 glebius Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include - /* Tunables */ /* ==== //depot/projects/uart/dev/fxp/if_fxp.c#21 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.253 2006/01/04 23:00:01 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.254 2006/02/14 12:44:54 glebius Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -758,7 +758,6 @@ } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_baudrate = 100000000; ifp->if_init = fxp_init; ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ==== //depot/projects/uart/dev/ipmi/ipmi.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.1 2006/02/10 20:51:35 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.2 2006/02/13 16:50:45 ambrisko Exp $"); #include #include @@ -1056,7 +1056,7 @@ return 0; } -#ifdef DEBUG +#ifdef IMPI_DEBUG static void dump_buf(u_char *data, int len){ char buf[20]; ==== //depot/projects/uart/dev/lge/if_lge.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.46 2005/11/23 18:51:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.47 2006/02/14 12:44:55 glebius Exp $"); /* * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public @@ -546,7 +546,6 @@ ifp->if_start = lge_start; ifp->if_watchdog = lge_watchdog; ifp->if_init = lge_init; - ifp->if_baudrate = 1000000000; ifp->if_snd.ifq_maxlen = LGE_TX_LIST_CNT - 1; ifp->if_capabilities = IFCAP_RXCSUM; ifp->if_capenable = ifp->if_capabilities; ==== //depot/projects/uart/dev/mii/mii.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/mii.c,v 1.26 2005/06/11 00:20:38 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/mii.c,v 1.27 2006/02/14 12:10:03 glebius Exp $"); /* * MII bus layer, glues MII-capable network interface drivers to sharable @@ -240,9 +240,20 @@ miibus_statchg(device_t dev) { device_t parent; + struct mii_data *mii; + struct ifnet *ifp; parent = device_get_parent(dev); MIIBUS_STATCHG(parent); + + mii = device_get_softc(dev); + + /* + * Note that each NIC's softc must start with an ifnet pointer. + * XXX: EVIL HACK! + */ + ifp = *(struct ifnet **)device_get_softc(parent); + ifp->if_baudrate = ifmedia_baudrate(mii->mii_media_active); return; } ==== //depot/projects/uart/dev/nge/if_nge.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.85 2005/12/18 18:24:26 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.86 2006/02/14 12:44:55 glebius Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -860,7 +860,6 @@ ifp->if_start = nge_start; ifp->if_watchdog = nge_watchdog; ifp->if_init = nge_init; - ifp->if_baudrate = 1000000000; ifp->if_snd.ifq_maxlen = NGE_TX_LIST_CNT - 1; ifp->if_hwassist = NGE_CSUM_FEATURES; ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_VLAN_HWTAGGING; ==== //depot/projects/uart/dev/ppbus/if_plip.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.39 2005/12/21 10:54:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.40 2006/02/13 17:53:39 jhb Exp $"); /* * Parallel port TCP/IP interfaces added. I looked at the driver from @@ -185,7 +185,7 @@ { device_t dev; - dev = device_find_child(parent, "plip", 0); + dev = device_find_child(parent, "plip", -1); if (!dev) BUS_ADD_CHILD(parent, 0, "plip", -1); } ==== //depot/projects/uart/dev/re/if_re.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.62 2005/12/18 18:24:26 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.63 2006/02/14 12:44:55 glebius Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver @@ -1225,10 +1225,6 @@ #endif ifp->if_watchdog = re_watchdog; ifp->if_init = re_init; - if (sc->rl_type == RL_8169) - ifp->if_baudrate = 1000000000; - else - ifp->if_baudrate = 100000000; IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN); ifp->if_snd.ifq_drv_maxlen = RL_IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/uart/dev/sound/pci/ich.c#16 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.59 2006/01/14 23:37:08 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.60 2006/02/12 10:42:47 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -677,7 +677,6 @@ ich_init(struct sc_info *sc) { u_int32_t stat; - int sz; ich_wr(sc, ICH_REG_GLOB_CNT, ICH_GLOB_CTL_COLD, 4); DELAY(600000); @@ -701,15 +700,6 @@ if (sc->hasmic && ich_resetchan(sc, 2)) return ENXIO; - if (bus_dmamem_alloc(sc->dmat, (void **)&sc->dtbl, BUS_DMA_NOWAIT, &sc->dtmap)) - return ENOSPC; - - sz = sizeof(struct ich_desc) * ICH_DTBL_LENGTH * 3; - if (bus_dmamap_load(sc->dmat, sc->dtmap, sc->dtbl, sz, ich_setmap, sc, 0)) { - bus_dmamem_free(sc->dmat, (void **)&sc->dtbl, sc->dtmap); - return ENOSPC; - } - return 0; } @@ -828,6 +818,15 @@ goto bad; } + if (bus_dmamem_alloc(sc->dmat, (void **)&sc->dtbl, + BUS_DMA_NOWAIT, &sc->dtmap)) + goto bad; + + if (bus_dmamap_load(sc->dmat, sc->dtmap, sc->dtbl, + sizeof(struct ich_desc) * ICH_DTBL_LENGTH * 3, + ich_setmap, sc, 0)) + goto bad; + sc->codec = AC97_CREATE(dev, sc, ich_ac97); if (sc->codec == NULL) goto bad; @@ -895,6 +894,10 @@ if (sc->nabmbar) bus_release_resource(dev, sc->regtype, sc->nabmbarid, sc->nabmbar); + if (sc->dtmap) + bus_dmamap_unload(sc->dmat, sc->dtmap); + if (sc->dmat) + bus_dma_tag_destroy(sc->dmat); if (sc->ich_lock) snd_mtxfree(sc->ich_lock); free(sc, M_DEVBUF); @@ -916,6 +919,7 @@ bus_release_resource(dev, SYS_RES_IRQ, sc->irqid, sc->irq); bus_release_resource(dev, sc->regtype, sc->nambarid, sc->nambar); bus_release_resource(dev, sc->regtype, sc->nabmbarid, sc->nabmbar); + bus_dmamap_unload(sc->dmat, sc->dtmap); bus_dma_tag_destroy(sc->dmat); snd_mtxfree(sc->ich_lock); free(sc, M_DEVBUF); @@ -987,24 +991,21 @@ } /* Reinit mixer */ ich_pci_codec_reset(sc); + ICH_UNLOCK(sc); ac97_setextmode(sc->codec, sc->hasvra | sc->hasvrm); if (mixer_reinit(dev) == -1) { device_printf(dev, "unable to reinitialize the mixer\n"); - ICH_UNLOCK(sc); return ENXIO; } /* Re-start DMA engines */ for (i = 0 ; i < 3; i++) { struct sc_chinfo *ch = &sc->ch[i]; if (sc->ch[i].run_save) { - ICH_UNLOCK(sc); ichchan_setblocksize(0, ch, ch->blksz); ichchan_setspeed(0, ch, ch->spd); ichchan_trigger(0, ch, PCMTRIG_START); - ICH_LOCK(sc); } } - ICH_UNLOCK(sc); return 0; } ==== //depot/projects/uart/dev/tx/if_tx.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.94 2006/01/21 20:07:19 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.95 2006/02/14 12:44:55 glebius Exp $"); /* * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie) @@ -248,7 +248,6 @@ ifp->if_watchdog = epic_ifwatchdog; ifp->if_init = epic_init; ifp->if_timer = 0; - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = TX_RING_SIZE - 1; /* Enable busmastering. */ @@ -1192,13 +1191,6 @@ CSR_WRITE_4(sc, MIICFG, sc->miicfg); } - /* Update baudrate. */ - if (IFM_SUBTYPE(media) == IFM_100_TX || - IFM_SUBTYPE(media) == IFM_100_FX) - sc->ifp->if_baudrate = 100000000; - else - sc->ifp->if_baudrate = 10000000; - epic_stop_activity(sc); epic_set_tx_mode(sc); epic_start_activity(sc); ==== //depot/projects/uart/dev/usb/if_aue.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.95 2005/11/11 16:04:55 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.96 2006/02/14 12:44:55 glebius Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -730,7 +730,6 @@ ifp->if_start = aue_start; ifp->if_watchdog = aue_watchdog; ifp->if_init = aue_init; - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; /* ==== //depot/projects/uart/dev/usb/if_axe.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.35 2005/11/11 16:04:55 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.36 2006/02/14 12:44:55 glebius Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -500,7 +500,6 @@ ifp->if_start = axe_start; ifp->if_watchdog = axe_watchdog; ifp->if_init = axe_init; - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; sc->axe_qdat.ifp = ifp; ==== //depot/projects/uart/dev/usb/if_rue.c#9 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.27 2005/11/11 16:04:55 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.28 2006/02/14 12:44:55 glebius Exp $"); /* * RealTek RTL8150 USB to fast ethernet controller driver. @@ -682,7 +682,6 @@ ifp->if_start = rue_start; ifp->if_watchdog = rue_watchdog; ifp->if_init = rue_init; - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; /* MII setup */ ==== //depot/projects/uart/dev/usb/if_udav.c#6 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.20 2005/12/04 10:06:04 ru Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.21 2006/02/14 12:44:55 glebius Exp $ */ /*- * Copyright (c) 2003 * Shingo WATANABE . All rights reserved. @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.20 2005/12/04 10:06:04 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.21 2006/02/14 12:44:55 glebius Exp $"); #include "opt_inet.h" #if defined(__NetBSD__) @@ -415,7 +415,6 @@ ifp->if_stop = udav_stop; #endif #if defined(__FreeBSD__) - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; #endif #if defined(__NetBSD__) ==== //depot/projects/uart/dev/usb/umass.c#16 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.132 2006/01/31 19:09:38 imp Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.133 2006/02/12 15:51:03 iedowse Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -2651,21 +2651,17 @@ } } -/* umass_cam_poll - * all requests are handled through umass_cam_action, requests - * are never pending. So, nothing to do here. - */ Static void umass_cam_poll(struct cam_sim *sim) { -#ifdef USB_DEBUG struct umass_softc *sc = (struct umass_softc *) sim->softc; DPRINTF(UDMASS_SCSI, ("%s: CAM poll\n", USBDEVNAME(sc->sc_dev))); -#endif - /* nop */ + usbd_set_polling(sc->sc_udev, 1); + usbd_dopoll(sc->iface); + usbd_set_polling(sc->sc_udev, 0); } ==== //depot/projects/uart/dev/usb/umct.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/umct.c,v 1.9 2004/10/05 04:03:00 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/umct.c,v 1.10 2006/02/12 17:32:59 glebius Exp $"); /* * Driver for the MCT (Magic Control Technology) USB-RS232 Converter. @@ -255,7 +255,7 @@ } if (sc->sc_intr_number == -1) { - printf("%s: Could not fint interrupt in\n", devname); + printf("%s: Could not find interrupt in\n", devname); ucom->sc_dying = 1; goto error; } ==== //depot/projects/uart/dev/vge/if_vge.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.23 2005/12/18 18:24:27 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.24 2006/02/14 12:44:56 glebius Exp $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. @@ -1061,7 +1061,6 @@ #endif ifp->if_watchdog = vge_watchdog; ifp->if_init = vge_init; - ifp->if_baudrate = 1000000000; ifp->if_snd.ifq_maxlen = VGE_IFQ_MAXLEN; TASK_INIT(&sc->vge_txtask, 0, vge_tx_task, ifp); ==== //depot/projects/uart/geom/mirror/g_mirror.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.72 2006/02/11 17:39:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.74 2006/02/12 17:38:09 pjd Exp $"); #include #include @@ -787,7 +787,7 @@ if (sc->sc_writes > 0) return (0); if (!from_access && sc->sc_provider->acw > 0) { - timeout = g_mirror_idletime - (time_second - sc->sc_last_write); + timeout = g_mirror_idletime - (time_uptime - sc->sc_last_write); if (timeout > 0) return (timeout); } @@ -813,7 +813,7 @@ struct g_mirror_disk *disk; sc->sc_idle = 0; - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; g_topology_lock(); LIST_FOREACH(disk, &sc->sc_disks, d_next) { if (disk->d_state != G_MIRROR_DISK_STATE_ACTIVE) @@ -1368,7 +1368,7 @@ if (sc->sc_idle) g_mirror_unidle(sc); else - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; /* * Allocate all bios before sending any request, so we can @@ -2188,9 +2188,7 @@ g_mirror_disk_state2str(disk->d_state))); DISK_STATE_CHANGED(); - if (disk->d_state == G_MIRROR_DISK_STATE_NEW) - disk->d_flags &= ~G_MIRROR_DISK_FLAG_DIRTY; - else if (disk->d_state == G_MIRROR_DISK_STATE_SYNCHRONIZING) { + if (disk->d_state == G_MIRROR_DISK_STATE_SYNCHRONIZING) { disk->d_flags &= ~G_MIRROR_DISK_FLAG_SYNCHRONIZING; disk->d_flags &= ~G_MIRROR_DISK_FLAG_FORCE_SYNC; g_mirror_sync_stop(disk, 0); @@ -2199,6 +2197,7 @@ disk->d_sync.ds_offset = 0; disk->d_sync.ds_offset_done = 0; g_mirror_update_idle(sc, disk); + g_mirror_update_metadata(disk); G_MIRROR_DEBUG(0, "Device %s: provider %s activated.", sc->sc_name, g_mirror_get_diskname(disk)); break; @@ -2534,7 +2533,7 @@ sc->sc_flags = md->md_mflags; sc->sc_bump_id = 0; sc->sc_idle = 1; - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; sc->sc_writes = 0; bioq_init(&sc->sc_queue); mtx_init(&sc->sc_queue_mtx, "gmirror:queue", NULL, MTX_DEF); ==== //depot/projects/uart/geom/raid3/g_raid3.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.50 2006/02/11 17:42:31 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.53 2006/02/12 17:38:09 pjd Exp $"); #include #include @@ -71,6 +71,8 @@ &g_raid3_syncs_per_sec, 0, "Number of synchronizations requests per second"); static u_int g_raid3_disconnect_on_failure = 1; +TUNABLE_INT("kern.geom.raid3.disconnect_on_failure", + &g_raid3_disconnect_on_failure); SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, disconnect_on_failure, CTLFLAG_RW, &g_raid3_disconnect_on_failure, 0, "Disconnect component on I/O failure."); @@ -807,7 +809,7 @@ if (sc->sc_writes > 0) return (0); if (!from_access && sc->sc_provider->acw > 0) { - timeout = g_raid3_idletime - (time_second - sc->sc_last_write); + timeout = g_raid3_idletime - (time_uptime - sc->sc_last_write); if (timeout > 0) return (timeout); } @@ -835,7 +837,7 @@ u_int i; sc->sc_idle = 0; - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; g_topology_lock(); for (i = 0; i < sc->sc_ndisks; i++) { disk = &sc->sc_disks[i]; @@ -1573,7 +1575,7 @@ if (sc->sc_idle) g_raid3_unidle(sc); else - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; ndisks = sc->sc_ndisks; @@ -2437,9 +2439,7 @@ g_raid3_disk_state2str(disk->d_state))); DISK_STATE_CHANGED(); - if (disk->d_state == G_RAID3_DISK_STATE_NEW) - disk->d_flags &= ~G_RAID3_DISK_FLAG_DIRTY; - else if (disk->d_state == G_RAID3_DISK_STATE_SYNCHRONIZING) { + if (disk->d_state == G_RAID3_DISK_STATE_SYNCHRONIZING) { disk->d_flags &= ~G_RAID3_DISK_FLAG_SYNCHRONIZING; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 14 23:59:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9383916A423; Tue, 14 Feb 2006 23:59:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD13416A420 for ; Tue, 14 Feb 2006 23:59:29 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABA7D43D46 for ; Tue, 14 Feb 2006 23:59:21 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1ENxLlw049326 for ; Tue, 14 Feb 2006 23:59:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1ENxLX6049323 for perforce@freebsd.org; Tue, 14 Feb 2006 23:59:21 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 14 Feb 2006 23:59:21 GMT Message-Id: <200602142359.k1ENxLX6049323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91772 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 23:59:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=91772 Change 91772 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 23:59:06 re-shape the trap table into something that would be valid on sun4v all handlers still need to be re-written Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#2 (text+ko) ==== @@ -681,6 +681,8 @@ .align 128 .endm +#ifdef notyet +/* SUN4V_FIXME */ ENTRY(tl0_immu_miss_set_ref) /* * Set the reference bit. @@ -701,6 +703,7 @@ 1: retry END(tl0_immu_miss_set_ref) + ENTRY(tl0_immu_miss_trap) /* * Put back the contents of the tag access register, in case we @@ -1142,7 +1145,7 @@ RSF_TRAP(T_FILL) RSF_TRAP(T_FILL) .endm - +#endif /* notyet */ ENTRY(tl0_sftrap) rdpr %tstate, %g1 and %g1, TSTATE_CWP_MASK, %g1 @@ -1302,7 +1305,8 @@ .macro tl1_intr_level INTR_LEVEL(1) .endm - +#ifdef notyet +/* SUN4V_FIXME */ .macro tl1_immu_miss /* * Load the context and the virtual page number from the tag access @@ -1665,7 +1669,7 @@ ba %xcc, tl1_trap mov T_DATA_PROTECTION | T_KERNEL, %o0 END(tl1_dmmu_prot_trap) - +#endif /* notyet */ .macro tl1_spill_0_n SPILL(stx, %sp + SPOFF, 8, EMPTY) saved @@ -1820,43 +1824,36 @@ .sect .trap .align 0x8000 .globl tl0_base - tl0_base: - tl0_reserved 8 ! 0x0-0x7 + tl0_reserved 8 ! 0x0-0x7 tl0_insn_excptn: - tl0_insn_excptn ! 0x8 - tl0_reserved 1 ! 0x9 -tl0_insn_error: - tl0_gen T_INSTRUCTION_ERROR ! 0xa - tl0_reserved 5 ! 0xb-0xf + tl0_insn_excptn ! 0x8 + tl0_reserved 7 ! 0x9-0xf tl0_insn_illegal: - tl0_gen T_ILLEGAL_INSTRUCTION ! 0x10 + tl0_gen T_ILLEGAL_INSTRUCTION ! 0x10 tl0_priv_opcode: - tl0_gen T_PRIVILEGED_OPCODE ! 0x11 - tl0_reserved 14 ! 0x12-0x1f + tl0_gen T_PRIVILEGED_OPCODE ! 0x11 + tl0_reserved 14 ! 0x12-0x1f tl0_fp_disabled: - tl0_gen T_FP_DISABLED ! 0x20 + tl0_gen T_FP_DISABLED ! 0x20 tl0_fp_ieee: - tl0_gen T_FP_EXCEPTION_IEEE_754 ! 0x21 + tl0_gen T_FP_EXCEPTION_IEEE_754 ! 0x21 tl0_fp_other: - tl0_gen T_FP_EXCEPTION_OTHER ! 0x22 + tl0_gen T_FP_EXCEPTION_OTHER ! 0x22 tl0_tag_ovflw: - tl0_gen T_TAG_OVERFLOW ! 0x23 + tl0_gen T_TAG_OVERFLOW ! 0x23 tl0_clean_window: - clean_window ! 0x24 + clean_window ! 0x24 tl0_divide: - tl0_gen T_DIVISION_BY_ZERO ! 0x28 - tl0_reserved 7 ! 0x29-0x2f + tl0_gen T_DIVISION_BY_ZERO ! 0x28 + tl0_reserved 7 ! 0x29-0x2f tl0_data_excptn: - tl0_data_excptn ! 0x30 - tl0_reserved 1 ! 0x31 -tl0_data_error: - tl0_gen T_DATA_ERROR ! 0x32 - tl0_reserved 1 ! 0x33 + tl0_data_excptn ! 0x30 + tl0_reserved 3 ! 0x31-0x33 tl0_align: - tl0_align ! 0x34 + tl0_align ! 0x34 tl0_align_lddf: - tl0_gen T_RESERVED ! 0x35 + tl0_gen T_RESERVED ! 0x35 tl0_align_stdf: tl0_gen T_RESERVED ! 0x36 tl0_priv_action: @@ -1864,35 +1861,63 @@ tl0_reserved 9 ! 0x38-0x40 tl0_intr_level: tl0_intr_level ! 0x41-0x4f - tl0_reserved 16 ! 0x50-0x5f -tl0_intr_vector: - intr_vector ! 0x60 -tl0_watch_phys: - tl0_gen T_PA_WATCHPOINT ! 0x61 + tl0_reserved 18 ! 0x50-0x61 tl0_watch_virt: tl0_gen T_VA_WATCHPOINT ! 0x62 -tl0_ecc: - tl0_gen T_CORRECTED_ECC_ERROR ! 0x63 -tl0_immu_miss: - tl0_immu_miss ! 0x64 -tl0_dmmu_miss: - tl0_dmmu_miss ! 0x68 -tl0_dmmu_prot: - tl0_dmmu_prot ! 0x6c - tl0_reserved 16 ! 0x70-0x7f -tl0_spill_0_n: - tl0_spill_0_n ! 0x80 -tl0_spill_1_n: - tl0_spill_1_n ! 0x84 - tl0_spill_bad 14 ! 0x88-0xbf -tl0_fill_0_n: - tl0_fill_0_n ! 0xc0 -tl0_fill_1_n: - tl0_fill_1_n ! 0xc4 - tl0_fill_bad 14 ! 0xc8-0xff + tl0_reserved 19 ! 0x63-0x75 +tl0_breakpoint: + tl0_gen T_BREAKPOINT ! 0x76 + tl0_reserved 5 ! 0x77-0x7b +tl0_cpu_mondo: + tl0_cpu_mondo ! 0x7c +tl0_dev_mondo: + tl0_dev_mondo ! 0x7d +tl0_resumable_error: + tl0_resumable_error ! 0x7e +tl0_unresumable_error: + tl0_unresumable_error ! 0x7f +tl0_spill_n_normal: + tl0_spill_n_normal T_SPILL_0 ! 0x80 + tl0_spill_n_normal T_SPILL_1 ! 0x84 + tl0_spill_n_normal T_SPILL_2 ! 0x88 + tl0_spill_n_normal T_SPILL_3 ! 0x8c + tl0_spill_n_normal T_SPILL_4 ! 0x90 + tl0_spill_n_normal T_SPILL_5 ! 0x94 + tl0_spill_n_normal T_SPILL_6 ! 0x98 + tl0_spill_n_normal T_SPILL_7 ! 0x9c + tl0_reserved 3 ! 0x9d-0x9f +tl0_spill_n_other: + tl0_spill_n_other T_SPILL_0 ! 0xa0 + tl0_spill_n_other T_SPILL_1 ! 0xa4 + tl0_spill_n_other T_SPILL_2 ! 0xa8 + tl0_spill_n_other T_SPILL_3 ! 0xac + tl0_spill_n_other T_SPILL_4 ! 0xb0 + tl0_spill_n_other T_SPILL_5 ! 0xb4 + tl0_spill_n_other T_SPILL_6 ! 0xb8 + tl0_spill_n_other T_SPILL_7 ! 0xbc + tl0_reserved 3 ! 0xbd-0xbf +tl0_fill_n_normal: + tl0_fill_n_normal T_FILL_0 ! 0xc0 + tl0_fill_n_normal T_FILL_1 ! 0xc4 + tl0_fill_n_normal T_FILL_2 ! 0xc8 + tl0_fill_n_normal T_FILL_3 ! 0xcc + tl0_fill_n_normal T_FILL_4 ! 0xd0 + tl0_fill_n_normal T_FILL_5 ! 0xd4 + tl0_fill_n_normal T_FILL_6 ! 0xd8 + tl0_fill_n_normal T_FILL_7 ! 0xdc + tl0_reserved 3 ! 0xdd-0xdf +tl0_fill_n_other: + tl0_fill_n_other T_FILL_0 ! 0xe0 + tl0_fill_n_other T_FILL_1 ! 0xe4 + tl0_fill_n_other T_FILL_2 ! 0xe8 + tl0_fill_n_other T_FILL_3 ! 0xec + tl0_fill_n_other T_FILL_4 ! 0xf0 + tl0_fill_n_other T_FILL_5 ! 0xf4 + tl0_fill_n_other T_FILL_6 ! 0xf8 + tl0_fill_n_other T_FILL_7 ! 0xfc + tl0_reserved 3 ! 0xfd-0xff tl0_soft: tl0_gen T_SYSCALL ! 0x100 - tl0_gen T_BREAKPOINT ! 0x101 tl0_gen T_DIVISION_BY_ZERO ! 0x102 tl0_reserved 1 ! 0x103 tl0_gen T_CLEAN_WINDOW ! 0x104 @@ -1926,42 +1951,37 @@ tl0_gen T_SYSCALL ! 0x143 tl0_reserved 188 ! 0x144-0x1ff -tl1_base: - tl1_reserved 8 ! 0x200-0x207 -tl1_insn_excptn: - tl1_insn_excptn ! 0x208 - tl1_reserved 1 ! 0x209 -tl1_insn_error: - tl1_gen T_INSTRUCTION_ERROR ! 0x20a - tl1_reserved 5 ! 0x20b-0x20f + +tll_base: + tll_reserved 8 ! 0x200-0x207 +tll_insn_excptn: + tl1_insn_excptn ! 0x208 + tl1_reserved 7 ! 0x209-0x20f tl1_insn_illegal: - tl1_gen T_ILLEGAL_INSTRUCTION ! 0x210 + tl1_gen T_ILLEGAL_INSTRUCTION ! 0x210 tl1_priv_opcode: - tl1_gen T_PRIVILEGED_OPCODE ! 0x211 - tl1_reserved 14 ! 0x212-0x21f + tl1_gen T_PRIVILEGED_OPCODE ! 0x211 + tl1_reserved 14 ! 0x212-0x21f tl1_fp_disabled: - tl1_fp_disabled ! 0x220 + tl1_gen T_FP_DISABLED ! 0x220 tl1_fp_ieee: - tl1_gen T_FP_EXCEPTION_IEEE_754 ! 0x221 + tl1_gen T_FP_EXCEPTION_IEEE_754 ! 0x221 tl1_fp_other: - tl1_gen T_FP_EXCEPTION_OTHER ! 0x222 + tl1_gen T_FP_EXCEPTION_OTHER ! 0x222 tl1_tag_ovflw: - tl1_gen T_TAG_OVERFLOW ! 0x223 + tl1_gen T_TAG_OVERFLOW ! 0x223 tl1_clean_window: - clean_window ! 0x224 + clean_window ! 0x224 tl1_divide: - tl1_gen T_DIVISION_BY_ZERO ! 0x228 - tl1_reserved 7 ! 0x229-0x22f + tl1_gen T_DIVISION_BY_ZERO ! 0x228 + tl1_reserved 7 ! 0x229-0x22f tl1_data_excptn: - tl1_data_excptn ! 0x230 - tl1_reserved 1 ! 0x231 -tl1_data_error: - tl1_gen T_DATA_ERROR ! 0x232 - tl1_reserved 1 ! 0x233 + tl1_data_excptn ! 0x230 + tl1_reserved 3 ! 0x231-0x233 tl1_align: - tl1_align ! 0x234 + tl1_align ! 0x234 tl1_align_lddf: - tl1_gen T_RESERVED ! 0x235 + tl1_gen T_RESERVED ! 0x235 tl1_align_stdf: tl1_gen T_RESERVED ! 0x236 tl1_priv_action: @@ -1969,51 +1989,64 @@ tl1_reserved 9 ! 0x238-0x240 tl1_intr_level: tl1_intr_level ! 0x241-0x24f - tl1_reserved 16 ! 0x250-0x25f -tl1_intr_vector: - intr_vector ! 0x260 -tl1_watch_phys: - tl1_gen T_PA_WATCHPOINT ! 0x261 + tl1_reserved 18 ! 0x250-0x261 tl1_watch_virt: tl1_gen T_VA_WATCHPOINT ! 0x262 -tl1_ecc: - tl1_gen T_CORRECTED_ECC_ERROR ! 0x263 -tl1_immu_miss: - tl1_immu_miss ! 0x264 -tl1_dmmu_miss: - tl1_dmmu_miss ! 0x268 -tl1_dmmu_prot: - tl1_dmmu_prot ! 0x26c - tl1_reserved 16 ! 0x270-0x27f -tl1_spill_0_n: - tl1_spill_0_n ! 0x280 - tl1_spill_bad 1 ! 0x284 -tl1_spill_2_n: - tl1_spill_2_n ! 0x288 -tl1_spill_3_n: - tl1_spill_3_n ! 0x29c - tl1_spill_bad 4 ! 0x290-0x29f -tl1_spill_0_o: - tl1_spill_0_o ! 0x2a0 -tl1_spill_1_o: - tl1_spill_1_o ! 0x2a4 -tl1_spill_2_o: - tl1_spill_2_o ! 0x2a8 - tl1_spill_bad 5 ! 0x2ac-0x2bf -tl1_fill_0_n: - tl1_fill_0_n ! 0x2c0 - tl1_fill_bad 1 ! 0x2c4 -tl1_fill_2_n: - tl1_fill_2_n ! 0x2d0 -tl1_fill_3_n: - tl1_fill_3_n ! 0x2d4 - tl1_fill_bad 12 ! 0x2d8-0x2ff - tl1_reserved 1 ! 0x300 + tl1_reserved 19 ! 0x,63-0x275 tl1_breakpoint: - tl1_gen T_BREAKPOINT ! 0x301 - tl1_gen T_RSTRWP_PHYS ! 0x302 - tl1_gen T_RSTRWP_VIRT ! 0x303 - tl1_reserved 252 ! 0x304-0x3ff + tl1_gen T_BREAKPOINT ! 0x276 + tl1_reserved 5 ! 02x77-0x27b +tl1_cpu_mondo: + tl1_cpu_mondo ! 0x27c +tl1_dev_mondo: + tl1_dev_mondo ! 0x27d +tl1_resumable_error: + tl1_resumable_error ! 0x27e +tl1_unresumable_error: + tl1_unresumable_error ! 0x27f +tl1_spill_n_normal: + tl1_spill_n_normal T_SPILL_0 ! 0x280 + tl1_spill_n_normal T_SPILL_1 ! 0x284 + tl1_spill_n_normal T_SPILL_2 ! 0x288 + tl1_spill_n_normal T_SPILL_3 ! 0x28c + tl1_spill_n_normal T_SPILL_4 ! 0x290 + tl1_spill_n_normal T_SPILL_5 ! 0x294 + tl1_spill_n_normal T_SPILL_6 ! 0x298 + tl1_spill_n_normal T_SPILL_7 ! 0x29c + tl1_reserved 3 ! 0x29d-0x29f +tl1_spill_n_other: + tl1_spill_n_other T_SPILL_0 ! 0x2a0 + tl1_spill_n_other T_SPILL_1 ! 0x2a4 + tl1_spill_n_other T_SPILL_2 ! 0x2a8 + tl1_spill_n_other T_SPILL_3 ! 0x2ac + tl1_spill_n_other T_SPILL_4 ! 0x2b0 + tl1_spill_n_other T_SPILL_5 ! 0x2b4 + tl1_spill_n_other T_SPILL_6 ! 0x2b8 + tl1_spill_n_other T_SPILL_7 ! 0x2bc + tl1_reserved 3 ! 0x2bd-0x2bf +tl1_fill_n_normal: + tl1_fill_n_normal T_FILL_0 ! 0x2c0 + tl1_fill_n_normal T_FILL_1 ! 0x2c4 + tl1_fill_n_normal T_FILL_2 ! 0x2c8 + tl1_fill_n_normal T_FILL_3 ! 0x2cc + tl1_fill_n_normal T_FILL_4 ! 0x2d0 + tl1_fill_n_normal T_FILL_5 ! 0x2d4 + tl1_fill_n_normal T_FILL_6 ! 0x2d8 + tl1_fill_n_normal T_FILL_7 ! 0x2dc + tl1_reserved 3 ! 0x2dd-0x2df +tl1_fill_n_other: + tl1_fill_n_other T_FILL_0 ! 0x2e0 + tl1_fill_n_other T_FILL_1 ! 0x2e4 + tl1_fill_n_other T_FILL_2 ! 0x2e8 + tl1_fill_n_other T_FILL_3 ! 0x2ec + tl1_fill_n_other T_FILL_4 ! 0x2f0 + tl1_fill_n_other T_FILL_5 ! 0x2f4 + tl1_fill_n_other T_FILL_6 ! 0x2f8 + tl1_fill_n_other T_FILL_7 ! 0x2fc + tl1_reserved 3 ! 0x2fd-0x2ff +tl1_soft: + tl1_reserved 256 ! 0x300-0x3ff + /* * User trap entry point. From owner-p4-projects@FreeBSD.ORG Wed Feb 15 00:10:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 378BD16A424; Wed, 15 Feb 2006 00:10:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E5F316A420 for ; Wed, 15 Feb 2006 00:10:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B517943D45 for ; Wed, 15 Feb 2006 00:10:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F0AZdl049826 for ; Wed, 15 Feb 2006 00:10:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F0AZT3049823 for perforce@freebsd.org; Wed, 15 Feb 2006 00:10:35 GMT (envelope-from imp@freebsd.org) Date: Wed, 15 Feb 2006 00:10:35 GMT Message-Id: <200602150010.k1F0AZT3049823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91773 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 00:10:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=91773 Change 91773 by imp@imp_Speedy on 2006/02/15 00:09:48 Add usb to config file, tweaks to ohci and checkpoint Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#1 add .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#11 edit .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#5 edit .. //depot/projects/arm/src/sys/arm/conf/KB920X#19 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#11 (text+ko) ==== @@ -2,16 +2,16 @@ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard +arm/at91/at91_pmc.c standard arm/at91/at91_st.c standard -arm/at91/uart_bus_at91usart.c optional uart -arm/at91/uart_cpu_at91rm9200usart.c optional uart -arm/at91/uart_dev_at91usart.c optional uart -arm/at91/if_ate.c optional ate arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c optional at91_pio -arm/at91/at91_pmc.c optional at91_pmc arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_spi.c optional at91_spi arm/at91/at91_twi.c optional at91_twi arm/at91/at91_udp.c optional at91_udp +arm/at91/if_ate.c optional ate arm/at91/ohci_atmelarm.c optional ohci +arm/at91/uart_bus_at91usart.c optional uart +arm/at91/uart_cpu_at91rm9200usart.c optional uart +arm/at91/uart_dev_at91usart.c optional uart ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#5 (text+ko) ==== @@ -69,7 +69,6 @@ sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->io_res == NULL) { - printf("1\n"); err = ENOMEM; goto error; } @@ -80,13 +79,11 @@ sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (sc->irq_res == NULL) { - printf("2\n"); err = ENOMEM; goto error; } sc->sc_bus.bdev = device_add_child(dev, "usb", -1); if (sc->sc_bus.bdev == NULL) { - printf("3\n"); err = ENOMEM; goto error; } @@ -95,7 +92,6 @@ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, &sc->ih); if (err) { - printf("4\n"); err = ENXIO; goto error; } ==== //depot/projects/arm/src/sys/arm/conf/KB920X#19 (text+ko) ==== @@ -73,6 +73,13 @@ device mii device lxtphy +# USB support +device ohci # OHCI PCI->USB interface +device usb # USB Bus (required) +device umass # Disks/Mass storage - Requires scbus and da +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) + # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS From owner-p4-projects@FreeBSD.ORG Wed Feb 15 00:10:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37DCC16A427; Wed, 15 Feb 2006 00:10:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5956216A434 for ; Wed, 15 Feb 2006 00:10:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11DF543D46 for ; Wed, 15 Feb 2006 00:10:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F0AZ36049832 for ; Wed, 15 Feb 2006 00:10:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F0AZgi049829 for perforce@freebsd.org; Wed, 15 Feb 2006 00:10:35 GMT (envelope-from imp@freebsd.org) Date: Wed, 15 Feb 2006 00:10:35 GMT Message-Id: <200602150010.k1F0AZgi049829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91774 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 00:10:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91774 Change 91774 by imp@imp_Speedy on 2006/02/15 00:10:01 copy Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 15 01:53:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5356216A423; Wed, 15 Feb 2006 01:53:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA45A16A422 for ; Wed, 15 Feb 2006 01:53:44 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC1AB43D55 for ; Wed, 15 Feb 2006 01:53:41 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F1rfLf062360 for ; Wed, 15 Feb 2006 01:53:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F1rf25062357 for perforce@freebsd.org; Wed, 15 Feb 2006 01:53:41 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 15 Feb 2006 01:53:41 GMT Message-Id: <200602150153.k1F1rf25062357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 01:53:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91778 Change 91778 by kmacy@kmacy_storage:sun4v_work on 2006/02/15 01:52:58 Update ASIs for UltraSPARC Architecture 2005 Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. + * Copyright (c) 2006 Kip Macy * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,9 +9,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Berkeley Software Design Inc's name may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. * * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -33,83 +30,89 @@ #define _MACHINE_ASI_H_ /* - * sun4v ASIs + * UltraSPARC Architecture 2005 ASIs */ -#define ASI_N 0x4 -#define ASI_NL 0xc -#define ASI_AIUP 0x10 -#define ASI_AIUS 0x11 -#define ASI_AIUPL 0x18 -#define ASI_AIUSL 0x19 -#define ASI_P 0x80 -#define ASI_S 0x81 -#define ASI_PNF 0x82 -#define ASI_SNF 0x83 -#define ASI_PL 0x88 -#define ASI_SL 0x89 -#define ASI_PNFL 0x8a -#define ASI_SNFL 0x8b +#define ASI_N 0x04 /* ASI_NUCLEUS */ + +#define ASI_NL 0x0c /* ASI_NUCLEUS_LITTLE */ + +#define ASI_AIUP 0x10 /* ASI_AS_IF_USER_PRIMARY */ +#define ASI_AIUS 0x11 /* ASI_AS_IF_USER_SECONDARY */ + +#define ASI_REAL 0x14 +#define ASI_REAL_IO 0x15 +#define ASI_BLK_AIUP 0x16 /* ASI_BLOCK_AS_IF_USER_PRIMARY */ +#define ASI_BLK_AIUS 0x17 /* ASI_BLOCK_AS_IF_USER_SECONDARY */ +#define ASI_AIUPL 0x18 /* ASI_AS_IF_USER_PRIMARY_LITTLE */ +#define ASI_AIUSL 0x19 /* ASI_AS_IF_USER_SECONDARY_LITTLE */ + +#define ASI_REAL_L 0x1C /* ASI_REAL_LITTLE */ +#define ASI_REAL_IO_L 0x1D /* ASI_REAL_IO_LITTLE */ +#define ASI_BLK_AIUPL 0x1E /* ASI_BLOCK_AS_IF_USER_PRIMARY_LITTLE */ +#define ASI_BLK_AIUSL 0x1F /* ASI_BLOCK_AS_IF_USER_SECONDARY_LITTLE */ +#define ASI_SCRATCHPAD 0x20 +#define ASI_MMU_CONTEXTID 0x21 +#define ASI_LDTD_AIUP 0x22 /* ASI_LOAD_TWIN_DW_AS_IF_USER_PRIMARY */ +#define ASI_LDTD_AIUS 0x23 /* ASI_LOAD_TWIN_DW_AS_IF_USER_SECONDARY */ +#define ASI_QUEUE 0x25 +#define ASI_LDTD_REAL 0x26 /* ASI_LOAD_TWIN_DW_REAL */ +#define ASI_LDTD_N 0x27 /* ASI_LOAD_TWIN_DW_NUCLEUS */ + +#define ASI_LDTD_AIUPL 0x2A /* ASI_LD_TWIN_DW_AS_IF_USER_PRIMARY_LITTLE */ +#define ASI_LDTD_AIUSL 0x2B /* ASI_LD_TWIN_DW_AS_IF_USER_SECONDARY_LITTLE */ + +#define ASI_LDTD_REAL_L 0x2E /* ASI_LOAD_TWIN_DW_REAL_LITTLE */ +#define ASI_LDTD_NL 0x2F /* ASI_LOAD_TWIN_DW_NUCLEUS_LITTLE */ + + + +#define ASI_P 0x80 /* ASI_PRIMARY */ +#define ASI_S 0x81 /* ASI_SECONDARY */ +#define ASI_PNF 0x82 /* ASI_PRIMARY_NO_FAULT */ +#define ASI_SNF 0x83 /* ASI_SECONDARY_NO_FAULT */ + +#define ASI_PL 0x88 /* ASI_PRIMARY_LITTLE */ +#define ASI_SL 0x89 /* ASI_SECONDARY_LITTLE */ +#define ASI_PNFL 0x8a /* ASI_PRIMARY_NO_FAULT_LITTLE */ +#define ASI_SNFL 0x8b /* ASI_SECONDARY_NO_FAULT_LITTLE */ + +#define ASI_PST8_P 0xc0 +#define ASI_PST8_S 0xc1 +#define ASI_PST16_P 0xc2 +#define ASI_PST16_S 0xc3 +#define ASI_PST32_P 0xc4 +#define ASI_PST32_S 0xc5 + + +#define ASI_PST8_PL 0xc8 +#define ASI_PST8_SL 0xc9 +#define ASI_PST16_PL 0xca +#define ASI_PST16_SL 0xcb +#define ASI_PST32_PL 0xcc +#define ASI_PST32_SL 0xcd + +#define ASI_FL8_P 0xd0 +#define ASI_FL8_S 0xd1 +#define ASI_FL16_P 0xd2 +#define ASI_FL16_S 0xd3 -/* - * UltraSPARC extensions. ASIs limited to a certain family are annotated. - */ -#define ASI_PHYS_USE_EC 0x14 -#define ASI_PHYS_BYPASS_EC_WITH_EBIT 0x15 -#define ASI_PHYS_USE_EC_L 0x1c -#define ASI_PHYS_BYPASS_EC_WITH_EBIT_L 0x1d +#define ASI_FL8_PL 0xd8 +#define ASI_FL8_SL 0xd9 +#define ASI_FL16_PL 0xda +#define ASI_FL16_SL 0xdb -#define ASI_NUCLEUS_QUAD_LDD 0x24 -#define ASI_NUCLEUS_QUAD_LDD_L 0x2c +#define ASI_LDTD_P 0xe2 /* ASI_LOAD_TWIN_DW_PRIMARY */ +#define ASI_LDTD_S 0xe3 /* ASI_LOAD_TWIN_DW_SECONDARY */ -#define AA_IMMU_TTR 0x0 -#define AA_IMMU_SFSR 0x18 -#define AA_IMMU_TSB 0x28 -#define AA_IMMU_TAR 0x30 -#define AA_DMMU_TTR 0x0 -#define AA_DMMU_PCXR 0x8 -#define AA_DMMU_SCXR 0x10 -#define AA_DMMU_SFSR 0x18 -#define AA_DMMU_SFAR 0x20 -#define AA_DMMU_TSB 0x28 -/* - * With the advent of the US-III, the numbering has changed, as additional - * registers were inserted in between. We retain the original ordering for - * now, and append an A to the inserted registers. - * Exceptions are AA_SDB_INTR_D6 and AA_SDB_INTR_D7, which were appended - * at the end. - */ -#define AA_SDB_INTR_D0 0x40 -#define AA_SDB_INTR_D1 0x50 -#define AA_SDB_INTR_D2 0x60 +#define ASI_LDTD_PL 0xea /* ASI_LOAD_TWIN_DW_PRIMARY_LITTLE */ +#define ASI_LDTD_SL 0xeb /* ASI_LOAD_TWIN_DW_SECONDARY_LITTLE */ -#define ASI_PST8_P 0xc0 -#define ASI_PST8_S 0xc1 -#define ASI_PST16_P 0xc2 -#define ASI_PST16_S 0xc3 -#define ASI_PST32_P 0xc4 -#define ASI_PST32_S 0xc5 +#define ASI_BLK_P 0xf0 /* ASI_BLOCK_PRIMARY */ +#define ASI_BLK_S 0xf1 /* ASI_BLOCK_SECONDARY */ -#define ASI_PST8_PL 0xc8 -#define ASI_PST8_SL 0xc9 -#define ASI_PST16_PL 0xca -#define ASI_PST16_SL 0xcb -#define ASI_PST32_PL 0xcc -#define ASI_PST32_SL 0xcd +#define ASI_BLK_PL 0xf8 /* ASI_BLOCK_PRIMARY_LITTLE */ +#define ASI_BLK_SL 0xf9 /* ASI_BLOCK_SECONDARY_LITTLE */ -#define ASI_FL8_P 0xd0 -#define ASI_FL8_S 0xd1 -#define ASI_FL16_P 0xd2 -#define ASI_FL16_S 0xd3 -#define ASI_FL8_PL 0xd8 -#define ASI_FL8_SL 0xd9 -#define ASI_FL16_PL 0xda -#define ASI_FL16_SL 0xdb -#define ASI_BLK_COMMIT_P 0xe0 -#define ASI_BLK_COMMIT_S 0xe1 -#define ASI_BLK_P 0xf0 -#define ASI_BLK_S 0xf1 -#define ASI_BLK_PL 0xf8 -#define ASI_BLK_SL 0xf9 #endif /* !_MACHINE_ASI_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Feb 15 01:54:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D35516A423; Wed, 15 Feb 2006 01:54:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 068C716A420 for ; Wed, 15 Feb 2006 01:54:44 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A9EB43D46 for ; Wed, 15 Feb 2006 01:54:43 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F1shAg062381 for ; Wed, 15 Feb 2006 01:54:43 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F1sh1v062378 for perforce@freebsd.org; Wed, 15 Feb 2006 01:54:43 GMT (envelope-from cognet@freebsd.org) Date: Wed, 15 Feb 2006 01:54:43 GMT Message-Id: <200602150154.k1F1sh1v062378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 01:54:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=91779 Change 91779 by cognet@cognet on 2006/02/15 01:53:56 Disable the build of at91_pmc.c while it's just a copy of at91_st.c, or it provides duplicate DELAY(), cpu_startprof() and friends. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#12 (text+ko) ==== @@ -2,7 +2,7 @@ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard -arm/at91/at91_pmc.c standard +#arm/at91/at91_pmc.c standard arm/at91/at91_st.c standard arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c optional at91_pio From owner-p4-projects@FreeBSD.ORG Wed Feb 15 02:30:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74AD216A423; Wed, 15 Feb 2006 02:30:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2820F16A420 for ; Wed, 15 Feb 2006 02:30:27 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB13443D45 for ; Wed, 15 Feb 2006 02:30:26 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F2UQeJ063890 for ; Wed, 15 Feb 2006 02:30:26 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F2UQYJ063887 for perforce@freebsd.org; Wed, 15 Feb 2006 02:30:26 GMT (envelope-from cognet@freebsd.org) Date: Wed, 15 Feb 2006 02:30:26 GMT Message-Id: <200602150230.k1F2UQYJ063887@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 02:30:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91780 Change 91780 by cognet@cognet on 2006/02/15 02:29:43 The AT91RM9200 is supposed to support USB 2.0. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#6 (text+ko) ==== @@ -62,9 +62,6 @@ int err; int rid; - /* XXX where does it say so in the spec? */ - sc->sc_bus.usbrev = USBREV_1_0; - rid = MEM_RID; sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); @@ -101,6 +98,9 @@ sc->sc_flags |= OHCI_SCFLG_DONEINIT; err = device_probe_and_attach(sc->sc_bus.bdev); } +#ifdef notyet + sc->sc_bus.usbrev = USBREV_2_0; +#endif error:; if (err) { From owner-p4-projects@FreeBSD.ORG Wed Feb 15 02:31:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5916716A423; Wed, 15 Feb 2006 02:31:29 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3273D16A420 for ; Wed, 15 Feb 2006 02:31:29 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB9CE43D45 for ; Wed, 15 Feb 2006 02:31:28 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F2VSd5063932 for ; Wed, 15 Feb 2006 02:31:28 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F2VSUK063929 for perforce@freebsd.org; Wed, 15 Feb 2006 02:31:28 GMT (envelope-from cognet@freebsd.org) Date: Wed, 15 Feb 2006 02:31:28 GMT Message-Id: <200602150231.k1F2VSUK063929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 02:31:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=91781 Change 91781 by cognet@cognet on 2006/02/15 02:31:05 Implement a dummy barrier function. XXX: stubs should be provided elsewhere for this kind of things. Handle USB memory at rman level. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#6 edit .. //depot/projects/arm/src/sys/arm/at91/at91var.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#6 (text+ko) ==== @@ -84,6 +84,12 @@ return (0); } +static void +at91_barrier(void *t, bus_space_handle_t bsh, bus_size_t size, bus_size_t b, + int a) +{ +} + bs_protos(generic); bs_protos(generic_armv4); @@ -101,7 +107,7 @@ NULL, /* barrier */ - NULL, + at91_barrier, /* read (single) */ generic_bs_r_1, @@ -228,6 +234,8 @@ sc->sc_irq_rman.rm_descr = "AT91RM92 IRQs"; sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "AT91RM92 Memory"; + sc->sc_usbmem_rman.rm_type = RMAN_ARRAY; + sc->sc_usbmem_rman.rm_descr = "AT91RM92 USB Memory-mapped regs"; if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); @@ -235,6 +243,10 @@ rman_manage_region(&sc->sc_mem_rman, 0xfff00000ul, 0xfffffffful) != 0) panic("at91_attach: failed to set up memory rman"); + if (rman_init(&sc->sc_usbmem_rman) != 0 || + rman_manage_region(&sc->sc_usbmem_rman, 0x00300000, + 0x003fffff) != 0) + panic("at91_attach: failed to set up USB memory rman"); for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + @@ -340,8 +352,12 @@ start, end, count, flags, child); break; case SYS_RES_MEMORY: - rle->res = rman_reserve_resource(&sc->sc_mem_rman, - start, end, count, flags, child); + if (start >= 0x00300000 && start <= 0x003fffff) + rle->res = rman_reserve_resource(&sc->sc_usbmem_rman, + start, end, count, flags, child); + else + rle->res = rman_reserve_resource(&sc->sc_mem_rman, + start, end, count, flags, child); rman_set_bustag(rle->res, &at91_bs_tag); rman_set_bushandle(rle->res, start); break; ==== //depot/projects/arm/src/sys/arm/at91/at91var.h#3 (text+ko) ==== @@ -36,6 +36,7 @@ bus_space_handle_t sc_sys_sh; struct rman sc_irq_rman; struct rman sc_mem_rman; + struct rman sc_usbmem_rman; }; struct at91_ivar { From owner-p4-projects@FreeBSD.ORG Wed Feb 15 02:34:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0F2716A423; Wed, 15 Feb 2006 02:34:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5290316A422 for ; Wed, 15 Feb 2006 02:34:33 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E20A343D55 for ; Wed, 15 Feb 2006 02:34:32 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F2YWFk064056 for ; Wed, 15 Feb 2006 02:34:32 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F2YWGB064053 for perforce@freebsd.org; Wed, 15 Feb 2006 02:34:32 GMT (envelope-from cognet@freebsd.org) Date: Wed, 15 Feb 2006 02:34:32 GMT Message-Id: <200602150234.k1F2YWGB064053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 02:34:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=91782 Change 91782 by cognet@cognet on 2006/02/15 02:33:34 XXX: temporary disable the rev check. Something is wrong, the AT91RM92 pretends to be rev 0.0, and have 0 port ? This should be removed as soon as what's happening is understood, and fixed. Affected files ... .. //depot/projects/arm/src/sys/dev/usb/ohci.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/dev/usb/ohci.c#7 (text+ko) ==== @@ -724,7 +724,7 @@ printf(" OHCI version %d.%d%s\n", OHCI_REV_HI(rev), OHCI_REV_LO(rev), OHCI_REV_LEGACY(rev) ? ", legacy support" : ""); - if (OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) { + if (0 && OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) { printf("%s: unsupported OHCI revision\n", USBDEVNAME(sc->sc_bus.bdev)); sc->sc_bus.usbrev = USBREV_UNKNOWN; From owner-p4-projects@FreeBSD.ORG Wed Feb 15 05:31:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAD3F16A423; Wed, 15 Feb 2006 05:31:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4AF716A420 for ; Wed, 15 Feb 2006 05:31:06 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5773743D46 for ; Wed, 15 Feb 2006 05:31:06 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F5V6g5078298 for ; Wed, 15 Feb 2006 05:31:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F5V6Ed078295 for perforce@freebsd.org; Wed, 15 Feb 2006 05:31:06 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 15 Feb 2006 05:31:06 GMT Message-Id: <200602150531.k1F5V6Ed078295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 05:31:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=91785 Change 91785 by kmacy@kmacy_storage:sun4v_work on 2006/02/15 05:30:42 fix all link-time errors except for those remaining in exception.S Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#3 (text+ko) ==== @@ -51,6 +51,7 @@ sun4v/sun4v/eeprom.c optional eeprom ebus | eeprom fhc | \ eeprom sbus sun4v/sun4v/gdb_machdep.c optional gdb +sun4v/sun4v/hcall.S standard sun4v/sun4v/identcpu.c standard sun4v/sun4v/in_cksum.c optional inet sun4v/sun4v/interrupt.S standard no-obj @@ -71,6 +72,7 @@ sun4v/sun4v/support.S standard sun4v/sun4v/sys_machdep.c standard sun4v/sun4v/swtch.S standard +sun4v/sun4v/tlb.c standard sun4v/sun4v/tick.c standard sun4v/sun4v/trap.c standard sun4v/sun4v/uio_machdep.c standard ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#2 (text+ko) ==== @@ -116,7 +116,7 @@ # Builtin hardware #device auxio # auxiliary I/O device #device clkbrd # Clock Board (blinkenlight on Sun Exx00) -#device genclock # Generic clock interface +device genclock # Generic clock interface #device eeprom # eeprom (really a front-end for the MK48Txx) #device mk48txx # Mostek MK48Txx clocks #device rtc # rtc (really a front-end for the MC146818) @@ -172,10 +172,10 @@ #device udbp # USB Double Bulk Pipe devices #device ugen # Generic #device uhid # "Human Interface Devices" -device ukbd # Keyboard +#device ukbd # Keyboard #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da -device ums # Mouse +#device ums # Mouse #device urio # Diamond Rio 500 MP3 player #device uscanner # Scanners # USB Ethernet, requires mii ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#2 (text+ko) ==== @@ -216,32 +216,36 @@ bus_space_read_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) { + __BUS_DEBUG_ACCESS(h, o, "read", 1); - return (lduba_nc((caddr_t)(h + o), bus_type_asi[t->bst_type])); + return (0); } static __inline uint16_t bus_space_read_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) { + __BUS_DEBUG_ACCESS(h, o, "read", 2); - return (lduha_nc((caddr_t)(h + o), bus_type_asi[t->bst_type])); + return (0); } static __inline uint32_t bus_space_read_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) { + __BUS_DEBUG_ACCESS(h, o, "read", 4); - return (lduwa_nc((caddr_t)(h + o), bus_type_asi[t->bst_type])); + return (0); } static __inline uint64_t bus_space_read_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) { + __BUS_DEBUG_ACCESS(h, o, "read", 8); - return (ldxa_nc((caddr_t)(h + o), bus_type_asi[t->bst_type])); + return (0); } static __inline void @@ -285,8 +289,8 @@ uint8_t v) { + __BUS_DEBUG_ACCESS(h, o, "write", 1); - stba_nc((caddr_t)(h + o), bus_type_asi[t->bst_type], v); } static __inline void @@ -294,8 +298,8 @@ uint16_t v) { + __BUS_DEBUG_ACCESS(h, o, "write", 2); - stha_nc((caddr_t)(h + o), bus_type_asi[t->bst_type], v); } static __inline void @@ -303,8 +307,8 @@ uint32_t v) { + __BUS_DEBUG_ACCESS(h, o, "write", 4); - stwa_nc((caddr_t)(h + o), bus_type_asi[t->bst_type], v); } static __inline void @@ -312,8 +316,8 @@ uint64_t v) { + __BUS_DEBUG_ACCESS(h, o, "write", 8); - stxa_nc((caddr_t)(h + o), bus_type_asi[t->bst_type], v); } static __inline void @@ -520,32 +524,36 @@ bus_space_read_stream_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) { + __BUS_DEBUG_ACCESS(h, o, "read stream", 1); - return (lduba_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type])); + return (0); } static __inline uint16_t bus_space_read_stream_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) { + __BUS_DEBUG_ACCESS(h, o, "read stream", 2); - return (lduha_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type])); + return (0); } static __inline uint32_t bus_space_read_stream_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) { + __BUS_DEBUG_ACCESS(h, o, "read stream", 4); - return (lduwa_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type])); + return (0); } static __inline uint64_t bus_space_read_stream_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) { + __BUS_DEBUG_ACCESS(h, o, "read stream", 8); - return (ldxa_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type])); + return (0); } static __inline void @@ -589,6 +597,7 @@ uint8_t v) { + __BUS_DEBUG_ACCESS(h, o, "write stream", 1); stba_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type], v); } @@ -598,8 +607,8 @@ uint16_t v) { + __BUS_DEBUG_ACCESS(h, o, "write stream", 2); - stha_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type], v); } static __inline void @@ -607,8 +616,8 @@ uint32_t v) { + __BUS_DEBUG_ACCESS(h, o, "write stream", 4); - stwa_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type], v); } static __inline void @@ -616,8 +625,8 @@ uint64_t v) { + __BUS_DEBUG_ACCESS(h, o, "write stream", 8); - stxa_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type], v); } static __inline void @@ -828,8 +837,9 @@ u_int8_t *a) { + __BUS_DEBUG_ACCESS(h, o, "peek", 1); - return (fasword8(bus_type_asi[t->bst_type], (caddr_t)(h + o), a)); + return (0); } static __inline int @@ -837,8 +847,9 @@ u_int16_t *a) { + __BUS_DEBUG_ACCESS(h, o, "peek", 2); - return (fasword16(bus_type_asi[t->bst_type], (caddr_t)(h + o), a)); + return (0); } static __inline int @@ -846,8 +857,9 @@ u_int32_t *a) { + __BUS_DEBUG_ACCESS(h, o, "peek", 4); - return (fasword32(bus_type_asi[t->bst_type], (caddr_t)(h + o), a)); + return (0); } /* Back-compat functions for old ISA drivers */ @@ -856,7 +868,7 @@ extern bus_space_tag_t isa_mem_bt; extern bus_space_handle_t isa_mem_hdl; -#define inb(o) bus_space_read_1(isa_io_bt, isa_io_hdl, o) + #define inb(o) bus_space_read_1(isa_io_bt, isa_io_hdl, o) #define inw(o) bus_space_read_2(isa_io_bt, isa_io_hdl, o) #define inl(o) bus_space_read_4(isa_io_bt, isa_io_hdl, o) #define outb(o, v) bus_space_write_1(isa_io_bt, isa_io_hdl, o, v) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#2 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#2 (text+ko) ==== @@ -83,7 +83,6 @@ void pmap_kremove(vm_offset_t); void pmap_kenter_flags(vm_offset_t va, vm_paddr_t pa, u_long flags); void pmap_kremove_flags(vm_offset_t va); -boolean_t pmap_page_is_mapped(vm_page_t m); int pmap_cache_enter(vm_page_t m, vm_offset_t va); void pmap_cache_remove(vm_page_t m, vm_offset_t va); @@ -116,6 +115,8 @@ return (1); } +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.tte_list)) + #ifdef PMAP_STATS SYSCTL_DECL(_debug_pmap_stats); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#2 (text+ko) ==== @@ -129,25 +129,6 @@ static void nexus_bus_barrier(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_size_t, int); -/* ASI's for bus access. */ -int bus_type_asi[] = { - ASI_PHYS_BYPASS_EC_WITH_EBIT, /* UPA */ - ASI_PHYS_BYPASS_EC_WITH_EBIT, /* SBUS */ - ASI_PHYS_BYPASS_EC_WITH_EBIT_L, /* PCI configuration space */ - ASI_PHYS_BYPASS_EC_WITH_EBIT_L, /* PCI memory space */ - ASI_PHYS_BYPASS_EC_WITH_EBIT_L, /* PCI I/O space */ - 0 -}; - -int bus_stream_asi[] = { - ASI_PHYS_BYPASS_EC_WITH_EBIT, /* UPA */ - ASI_PHYS_BYPASS_EC_WITH_EBIT, /* SBUS */ - ASI_PHYS_BYPASS_EC_WITH_EBIT, /* PCI configuration space */ - ASI_PHYS_BYPASS_EC_WITH_EBIT, /* PCI memory space */ - ASI_PHYS_BYPASS_EC_WITH_EBIT, /* PCI I/O space */ - 0 -}; - /* * Convenience function for manipulating driver locks from busdma (during * busdma_swi, for example). Drivers that don't provide their own locks ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#3 (text+ko) ==== @@ -276,13 +276,6 @@ ldx [ASP_REG + 0], %g1 ; \ inc 16, ASP_REG -/* - * For certain faults we need to clear the sfsr mmu register before returning. - */ -#define RSF_CLR_SFSR \ - wr %g0, ASI_DMMU, %asi ; \ - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - #define RSF_XOR(off) ((0x80 - off) - 1) /* @@ -484,40 +477,50 @@ .endm .macro tl0_insn_excptn - wrpr %g0, PSTATE_ALT, %pstate - wr %g0, ASI_IMMU, %asi - rdpr %tpc, %g3 - ldxa [%g0 + AA_IMMU_SFSR] %asi, %g4 - stxa %g0, [%g0 + AA_IMMU_SFSR] %asi - membar #Sync - ba %xcc, tl0_sfsr_trap - mov T_INSTRUCTION_EXCEPTION, %g2 .align 32 .endm .macro tl0_data_excptn - wrpr %g0, PSTATE_ALT, %pstate - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_SFAR] %asi, %g3 - ldxa [%g0 + AA_DMMU_SFSR] %asi, %g4 - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - membar #Sync - ba %xcc, tl0_sfsr_trap - mov T_DATA_EXCEPTION, %g2 .align 32 .endm .macro tl0_align - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_SFAR] %asi, %g3 - ldxa [%g0 + AA_DMMU_SFSR] %asi, %g4 - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - membar #Sync - ba %xcc, tl0_sfsr_trap - mov T_MEM_ADDRESS_NOT_ALIGNED, %g2 + .align 32 + .endm + + .macro cpu_mondo + .align 32 + .endm + + .macro dev_mondo + .align 32 + .endm + + .macro resumable_error + .align 32 + .endm + + .macro unresumable_error + .align 32 + .endm + + .macro spill_n_normal type + .align 32 + .endm + + .macro spill_n_other type + .align 32 + .endm + + .macro fill_n_normal type .align 32 .endm + .macro fill_n_other type + .align 32 + .endm + + ENTRY(tl0_sfsr_trap) tl0_split clr %o1 @@ -563,121 +566,7 @@ INTR_LEVEL(0) .endm - .macro intr_vector - ldxa [%g0] ASI_INTR_RECEIVE, %g1 - andcc %g1, IRSR_BUSY, %g0 - bnz,a,pt %xcc, intr_vector - nop - sir - .align 32 - .endm - .macro tl0_immu_miss - /* - * Load the virtual page number and context from the tag access - * register. We ignore the context. - */ - wr %g0, ASI_IMMU, %asi - ldxa [%g0 + AA_IMMU_TAR] %asi, %g1 - - /* - * Initialize the page size walker. - */ - mov TS_MIN, %g2 - - /* - * Loop over all supported page sizes. - */ - - /* - * Compute the page shift for the page size we are currently looking - * for. - */ -1: add %g2, %g2, %g3 - add %g3, %g2, %g3 - add %g3, PAGE_SHIFT, %g3 - - /* - * Extract the virtual page number from the contents of the tag - * access register. - */ - srlx %g1, %g3, %g3 - - /* - * Compute the tte bucket address. - */ - ldxa [%g0 + AA_IMMU_TSB] %asi, %g5 - and %g3, TSB_BUCKET_MASK, %g4 - sllx %g4, TSB_BUCKET_SHIFT + TTE_SHIFT, %g4 - add %g4, %g5, %g4 - - /* - * Compute the tte tag target. - */ - sllx %g3, TV_SIZE_BITS, %g3 - or %g3, %g2, %g3 - - /* - * Loop over the ttes in this bucket - */ - - /* - * Load the tte. Note that this instruction may fault, clobbering - * the contents of the tag access register, %g5, %g6, and %g7. We - * do not use %g5, and %g6 and %g7 are not used until this instruction - * completes successfully. - */ -2: ldda [%g4] ASI_NUCLEUS_QUAD_LDD, %g6 /*, %g7 */ - - /* - * Check that its valid and executable and that the tte tags match. - */ - brgez,pn %g7, 3f - andcc %g7, TD_EXEC, %g0 - bz,pn %xcc, 3f - cmp %g3, %g6 - bne,pn %xcc, 3f - EMPTY - - /* - * We matched a tte, load the tlb. - */ - - /* - * Set the reference bit, if it's currently clear. - */ - andcc %g7, TD_REF, %g0 - bz,a,pn %xcc, tl0_immu_miss_set_ref - nop - - /* - * Load the tte tag and data into the tlb and retry the instruction. - */ - stxa %g1, [%g0 + AA_IMMU_TAR] %asi - stxa %g7, [%g0] ASI_ITLB_DATA_IN_REG - retry - - /* - * Advance to the next tte in this bucket, and check the low bits - * of the bucket pointer to see if we've finished the bucket. - */ -3: add %g4, 1 << TTE_SHIFT, %g4 - andcc %g4, (1 << (TSB_BUCKET_SHIFT + TTE_SHIFT)) - 1, %g0 - bnz,pt %xcc, 2b - EMPTY - - /* - * See if we just checked the largest page size, and advance to the - * next one if not. - */ - cmp %g2, TS_MAX - bne,pt %xcc, 1b - add %g2, 1, %g2 - - /* - * Not in user tsb, call c code. - */ - ba,a %xcc, tl0_immu_miss_trap .align 128 .endm @@ -1202,14 +1091,6 @@ END(tl0_fp_restore) .macro tl1_insn_excptn - wrpr %g0, PSTATE_ALT, %pstate - wr %g0, ASI_IMMU, %asi - rdpr %tpc, %g3 - ldxa [%g0 + AA_IMMU_SFSR] %asi, %g4 - stxa %g0, [%g0 + AA_IMMU_SFSR] %asi - membar #Sync - ba %xcc, tl1_insn_exceptn_trap - mov T_INSTRUCTION_EXCEPTION | T_KERNEL, %g2 .align 32 .endm @@ -1261,9 +1142,7 @@ .endm ENTRY(tl1_data_excptn_trap) - RESUME_SPILLFILL_MMU_CLR_SFSR - ba %xcc, tl1_sfsr_trap - mov T_DATA_EXCEPTION | T_KERNEL, %g2 + END(tl1_data_excptn_trap) .macro tl1_align @@ -1273,25 +1152,9 @@ .endm ENTRY(tl1_align_trap) - RESUME_SPILLFILL_ALIGN - ba %xcc, tl1_sfsr_trap - mov T_MEM_ADDRESS_NOT_ALIGNED | T_KERNEL, %g2 END(tl1_data_excptn_trap) ENTRY(tl1_sfsr_trap) - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_SFAR] %asi, %g3 - ldxa [%g0 + AA_DMMU_SFSR] %asi, %g4 - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - membar #Sync - - tl1_split - clr %o1 - set trap, %o2 - mov %g3, %o4 - mov %g4, %o5 - ba %xcc, tl1_trap - mov %g2, %o0 END(tl1_sfsr_trap) .macro tl1_intr level, mask @@ -1869,52 +1732,52 @@ tl0_gen T_BREAKPOINT ! 0x76 tl0_reserved 5 ! 0x77-0x7b tl0_cpu_mondo: - tl0_cpu_mondo ! 0x7c + cpu_mondo ! 0x7c tl0_dev_mondo: - tl0_dev_mondo ! 0x7d + dev_mondo ! 0x7d tl0_resumable_error: - tl0_resumable_error ! 0x7e + resumable_error ! 0x7e tl0_unresumable_error: - tl0_unresumable_error ! 0x7f + unresumable_error ! 0x7f tl0_spill_n_normal: - tl0_spill_n_normal T_SPILL_0 ! 0x80 - tl0_spill_n_normal T_SPILL_1 ! 0x84 - tl0_spill_n_normal T_SPILL_2 ! 0x88 - tl0_spill_n_normal T_SPILL_3 ! 0x8c - tl0_spill_n_normal T_SPILL_4 ! 0x90 - tl0_spill_n_normal T_SPILL_5 ! 0x94 - tl0_spill_n_normal T_SPILL_6 ! 0x98 - tl0_spill_n_normal T_SPILL_7 ! 0x9c + spill_n_normal T_SPILL_0 ! 0x80 + spill_n_normal T_SPILL_1 ! 0x84 + spill_n_normal T_SPILL_2 ! 0x88 + spill_n_normal T_SPILL_3 ! 0x8c + spill_n_normal T_SPILL_4 ! 0x90 + spill_n_normal T_SPILL_5 ! 0x94 + spill_n_normal T_SPILL_6 ! 0x98 + spill_n_normal T_SPILL_7 ! 0x9c tl0_reserved 3 ! 0x9d-0x9f tl0_spill_n_other: - tl0_spill_n_other T_SPILL_0 ! 0xa0 - tl0_spill_n_other T_SPILL_1 ! 0xa4 - tl0_spill_n_other T_SPILL_2 ! 0xa8 - tl0_spill_n_other T_SPILL_3 ! 0xac - tl0_spill_n_other T_SPILL_4 ! 0xb0 - tl0_spill_n_other T_SPILL_5 ! 0xb4 - tl0_spill_n_other T_SPILL_6 ! 0xb8 - tl0_spill_n_other T_SPILL_7 ! 0xbc + spill_n_other T_SPILL_0 ! 0xa0 + spill_n_other T_SPILL_1 ! 0xa4 + spill_n_other T_SPILL_2 ! 0xa8 + spill_n_other T_SPILL_3 ! 0xac + spill_n_other T_SPILL_4 ! 0xb0 + spill_n_other T_SPILL_5 ! 0xb4 + spill_n_other T_SPILL_6 ! 0xb8 + spill_n_other T_SPILL_7 ! 0xbc tl0_reserved 3 ! 0xbd-0xbf tl0_fill_n_normal: - tl0_fill_n_normal T_FILL_0 ! 0xc0 - tl0_fill_n_normal T_FILL_1 ! 0xc4 - tl0_fill_n_normal T_FILL_2 ! 0xc8 - tl0_fill_n_normal T_FILL_3 ! 0xcc - tl0_fill_n_normal T_FILL_4 ! 0xd0 - tl0_fill_n_normal T_FILL_5 ! 0xd4 - tl0_fill_n_normal T_FILL_6 ! 0xd8 - tl0_fill_n_normal T_FILL_7 ! 0xdc + fill_n_normal T_FILL_0 ! 0xc0 + fill_n_normal T_FILL_1 ! 0xc4 + fill_n_normal T_FILL_2 ! 0xc8 + fill_n_normal T_FILL_3 ! 0xcc + fill_n_normal T_FILL_4 ! 0xd0 + fill_n_normal T_FILL_5 ! 0xd4 + fill_n_normal T_FILL_6 ! 0xd8 + fill_n_normal T_FILL_7 ! 0xdc tl0_reserved 3 ! 0xdd-0xdf tl0_fill_n_other: - tl0_fill_n_other T_FILL_0 ! 0xe0 - tl0_fill_n_other T_FILL_1 ! 0xe4 - tl0_fill_n_other T_FILL_2 ! 0xe8 - tl0_fill_n_other T_FILL_3 ! 0xec - tl0_fill_n_other T_FILL_4 ! 0xf0 - tl0_fill_n_other T_FILL_5 ! 0xf4 - tl0_fill_n_other T_FILL_6 ! 0xf8 - tl0_fill_n_other T_FILL_7 ! 0xfc + fill_n_other T_FILL_0 ! 0xe0 + fill_n_other T_FILL_1 ! 0xe4 + fill_n_other T_FILL_2 ! 0xe8 + fill_n_other T_FILL_3 ! 0xec + fill_n_other T_FILL_4 ! 0xf0 + fill_n_other T_FILL_5 ! 0xf4 + fill_n_other T_FILL_6 ! 0xf8 + fill_n_other T_FILL_7 ! 0xfc tl0_reserved 3 ! 0xfd-0xff tl0_soft: tl0_gen T_SYSCALL ! 0x100 @@ -1950,10 +1813,8 @@ tl0_gen T_SYSCALL ! 0x142 tl0_gen T_SYSCALL ! 0x143 tl0_reserved 188 ! 0x144-0x1ff - - tll_base: - tll_reserved 8 ! 0x200-0x207 + tl1_reserved 8 ! 0x200-0x207 tll_insn_excptn: tl1_insn_excptn ! 0x208 tl1_reserved 7 ! 0x209-0x20f @@ -1997,52 +1858,52 @@ tl1_gen T_BREAKPOINT ! 0x276 tl1_reserved 5 ! 02x77-0x27b tl1_cpu_mondo: - tl1_cpu_mondo ! 0x27c + cpu_mondo ! 0x27c tl1_dev_mondo: - tl1_dev_mondo ! 0x27d + dev_mondo ! 0x27d tl1_resumable_error: - tl1_resumable_error ! 0x27e + resumable_error ! 0x27e tl1_unresumable_error: - tl1_unresumable_error ! 0x27f + unresumable_error ! 0x27f tl1_spill_n_normal: - tl1_spill_n_normal T_SPILL_0 ! 0x280 - tl1_spill_n_normal T_SPILL_1 ! 0x284 - tl1_spill_n_normal T_SPILL_2 ! 0x288 - tl1_spill_n_normal T_SPILL_3 ! 0x28c - tl1_spill_n_normal T_SPILL_4 ! 0x290 - tl1_spill_n_normal T_SPILL_5 ! 0x294 - tl1_spill_n_normal T_SPILL_6 ! 0x298 - tl1_spill_n_normal T_SPILL_7 ! 0x29c + spill_n_normal T_SPILL_0 ! 0x280 + spill_n_normal T_SPILL_1 ! 0x284 + spill_n_normal T_SPILL_2 ! 0x288 + spill_n_normal T_SPILL_3 ! 0x28c + spill_n_normal T_SPILL_4 ! 0x290 + spill_n_normal T_SPILL_5 ! 0x294 + spill_n_normal T_SPILL_6 ! 0x298 + spill_n_normal T_SPILL_7 ! 0x29c tl1_reserved 3 ! 0x29d-0x29f tl1_spill_n_other: - tl1_spill_n_other T_SPILL_0 ! 0x2a0 - tl1_spill_n_other T_SPILL_1 ! 0x2a4 - tl1_spill_n_other T_SPILL_2 ! 0x2a8 - tl1_spill_n_other T_SPILL_3 ! 0x2ac - tl1_spill_n_other T_SPILL_4 ! 0x2b0 - tl1_spill_n_other T_SPILL_5 ! 0x2b4 - tl1_spill_n_other T_SPILL_6 ! 0x2b8 - tl1_spill_n_other T_SPILL_7 ! 0x2bc + spill_n_other T_SPILL_0 ! 0x2a0 + spill_n_other T_SPILL_1 ! 0x2a4 + spill_n_other T_SPILL_2 ! 0x2a8 + spill_n_other T_SPILL_3 ! 0x2ac + spill_n_other T_SPILL_4 ! 0x2b0 + spill_n_other T_SPILL_5 ! 0x2b4 + spill_n_other T_SPILL_6 ! 0x2b8 + spill_n_other T_SPILL_7 ! 0x2bc tl1_reserved 3 ! 0x2bd-0x2bf tl1_fill_n_normal: - tl1_fill_n_normal T_FILL_0 ! 0x2c0 - tl1_fill_n_normal T_FILL_1 ! 0x2c4 - tl1_fill_n_normal T_FILL_2 ! 0x2c8 - tl1_fill_n_normal T_FILL_3 ! 0x2cc - tl1_fill_n_normal T_FILL_4 ! 0x2d0 - tl1_fill_n_normal T_FILL_5 ! 0x2d4 - tl1_fill_n_normal T_FILL_6 ! 0x2d8 - tl1_fill_n_normal T_FILL_7 ! 0x2dc + fill_n_normal T_FILL_0 ! 0x2c0 + fill_n_normal T_FILL_1 ! 0x2c4 + fill_n_normal T_FILL_2 ! 0x2c8 + fill_n_normal T_FILL_3 ! 0x2cc + fill_n_normal T_FILL_4 ! 0x2d0 + fill_n_normal T_FILL_5 ! 0x2d4 + fill_n_normal T_FILL_6 ! 0x2d8 + fill_n_normal T_FILL_7 ! 0x2dc tl1_reserved 3 ! 0x2dd-0x2df tl1_fill_n_other: - tl1_fill_n_other T_FILL_0 ! 0x2e0 - tl1_fill_n_other T_FILL_1 ! 0x2e4 - tl1_fill_n_other T_FILL_2 ! 0x2e8 - tl1_fill_n_other T_FILL_3 ! 0x2ec - tl1_fill_n_other T_FILL_4 ! 0x2f0 - tl1_fill_n_other T_FILL_5 ! 0x2f4 - tl1_fill_n_other T_FILL_6 ! 0x2f8 - tl1_fill_n_other T_FILL_7 ! 0x2fc + fill_n_other T_FILL_0 ! 0x2e0 + fill_n_other T_FILL_1 ! 0x2e4 + fill_n_other T_FILL_2 ! 0x2e8 + fill_n_other T_FILL_3 ! 0x2ec + fill_n_other T_FILL_4 ! 0x2f0 + fill_n_other T_FILL_5 ! 0x2f4 + fill_n_other T_FILL_6 ! 0x2f8 + fill_n_other T_FILL_7 ! 0x2fc tl1_reserved 3 ! 0x2fd-0x2ff tl1_soft: tl1_reserved 256 ! 0x300-0x3ff ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#2 (text+ko) ==== @@ -29,7 +29,6 @@ /* * Hypervisor calls */ -#define LOCORE #define _ASM #include ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#3 (text+ko) ==== @@ -34,124 +34,6 @@ #include "assym.s" -/* - * Handle a vectored interrupt. - * - * This is either a data bearing mondo vector interrupt, or a cross trap - * request from another cpu. In either case the hardware supplies an - * interrupt packet, in the form of 3 data words which are read from internal - * registers. A data bearing mondo vector packet consists of an interrupt - * number in the first data word, and zero in 2nd and 3rd. We use the - * interrupt number to find the function, argument and priority from the - * intr_vector table, allocate and fill in an intr_request from the per-cpu - * free list, link it onto the per-cpu active list and finally post a softint - * at the desired priority. Cross trap requests come in 2 forms, direct - * and queued. Direct requests are distinguished by the first data word - * being zero. The 2nd data word carries a function to call and the 3rd - * an argument to pass. The function is jumped to directly. It executes - * in nucleus context on interrupt globals and with all interrupts disabled, - * therefore it must be fast, and the things that it can do are limited. - * Queued cross trap requests are handled much like mondo vectors, except - * that the function, argument and priority are contained in the interrupt - * packet itself. They are distinguished by the upper 4 bits of the data - * word being non-zero, which specifies the priority of the softint to - * deliver. - * - * Register usage: - * %g1 - pointer to intr_request - * %g2 - pointer to intr_vector, temp once required data is loaded - * %g3 - interrupt number for mondo vectors, unused otherwise - * %g4 - function, from the interrupt packet for cross traps, or - * loaded from the interrupt registers for mondo vecors - * %g5 - argument, as above for %g4 - * %g6 - softint priority - */ -ENTRY(intr_vector) - /* - * Load the interrupt packet from the hardware. - */ - wr %g0, ASI_SDB_INTR_R, %asi - ldxa [%g0 + AA_SDB_INTR_D0] %asi, %g3 - ldxa [%g0 + AA_SDB_INTR_D1] %asi, %g4 - ldxa [%g0 + AA_SDB_INTR_D2] %asi, %g5 -#ifdef notyet - /* XXX SUN4V_FIXME */ - stxa %g0, [%g0] ASI_INTR_RECEIVE -#endif - membar #Sync - - /* - * If the first data word is zero this is a direct cross trap request. - * The 2nd word points to code to execute and the 3rd is an argument - * to pass. Jump to it. - */ - brnz,a,pt %g3, 1f - nop - jmpl %g4, %g0 - nop - /* NOTREACHED */ - - /* - * If the high 4 bits of the 1st data word are non-zero, this is a - * queued cross trap request to be delivered as a softint. The high - * 4 bits of the 1st data word specify a priority, and the 2nd and - * 3rd a function and argument. - */ -1: srlx %g3, 60, %g6 - brnz,a,pn %g6, 2f - clr %g3 - - /* - * Find the function, argument and desired priority from the - * intr_vector table. - */ - SET(intr_vectors, %g4, %g2) - sllx %g3, IV_SHIFT, %g4 - add %g2, %g4, %g2 - - ldx [%g2 + IV_FUNC], %g4 - ldx [%g2 + IV_ARG], %g5 - lduw [%g2 + IV_PRI], %g6 - - /* - * Get an intr_request from the free list. There should always be one - * unless we are getting an interrupt storm from stray interrupts, in - * which case the we will deference a NULL pointer and panic. - */ -2: ldx [PCPU(IRFREE)], %g1 - ldx [%g1 + IR_NEXT], %g2 - stx %g2, [PCPU(IRFREE)] - - /* - * Store the vector number, function, argument and priority. - */ - stw %g3, [%g1 + IR_VEC] - stx %g4, [%g1 + IR_FUNC] - stx %g5, [%g1 + IR_ARG] - stw %g6, [%g1 + IR_PRI] - - /* - * Link it onto the end of the active list. - */ - stx %g0, [%g1 + IR_NEXT] - ldx [PCPU(IRTAIL)], %g4 - stx %g1, [%g4] - add %g1, IR_NEXT, %g1 - stx %g1, [PCPU(IRTAIL)] - - /* - * Trigger a softint at the level indicated by the priority. - */ - mov 1, %g1 - sllx %g1, %g6, %g1 - wr %g1, 0, %set_softint - - /* - * Done, retry the instruction. - */ - retry -END(intr_vector) - ENTRY(intr_fast) save %sp, -CCFSZ, %sp ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#4 (text+ko) ==== @@ -340,8 +340,6 @@ end = (vm_offset_t)_end; } - cache_init(child); - cpu_block_copy = bcopy; cpu_block_zero = bzero; @@ -666,7 +664,10 @@ #ifdef SMP cpu_mp_shutdown(); #endif +#ifdef notyet +/* XXX SUN4V_FIXME */ openfirmware_exit(args); +#endif } /* Get current clock frequency for the given cpu id. */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#3 (text+ko) ==== @@ -54,9 +54,22 @@ #define PMAP_SHPGPERPROC 200 #endif +cache_enable_t *cache_enable; +cache_flush_t *cache_flush; +dcache_page_inval_t *dcache_page_inval; +icache_page_inval_t *icache_page_inval; + +/* + * Virtual and physical address of message buffer. + */ +struct msgbuf *msgbufp; +vm_paddr_t msgbuf_phys; + + /* * Map of physical memory reagions. */ +vm_paddr_t phys_avail[128]; static struct ofw_mem_region mra[128]; static struct ofw_map translations[128]; static int translations_size; @@ -70,19 +83,30 @@ static vm_offset_t pmap_temp_map_1; static vm_offset_t pmap_temp_map_2; + /* + * First and last available kernel virtual addresses. + */ +vm_offset_t virtual_avail; +vm_offset_t virtual_end; +vm_offset_t kernel_vm_end; + +vm_offset_t vm_max_kernel_address; +struct tte *tsb_kernel; +vm_size_t tsb_kernel_mask; +vm_size_t tsb_kernel_size; +vm_paddr_t tsb_kernel_phys; + +/* + * Kernel pmap. + */ +struct pmap kernel_pmap_store; + +/* * Allocate physical memory for use in pmap_bootstrap. */ static vm_paddr_t pmap_bootstrap_alloc(vm_size_t size); -extern int tl1_immu_miss_patch_1[]; -extern int tl1_immu_miss_patch_2[]; -extern int tl1_dmmu_miss_patch_1[]; -extern int tl1_dmmu_miss_patch_2[]; -extern int tl1_dmmu_prot_patch_1[]; -extern int tl1_dmmu_prot_patch_2[]; - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 15 05:36:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8366C16A423; Wed, 15 Feb 2006 05:36:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DF4916A420 for ; Wed, 15 Feb 2006 05:36:13 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECB2743D45 for ; Wed, 15 Feb 2006 05:36:12 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F5aCq0078493 for ; Wed, 15 Feb 2006 05:36:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F5aC8n078490 for perforce@freebsd.org; Wed, 15 Feb 2006 05:36:12 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 15 Feb 2006 05:36:12 GMT Message-Id: <200602150536.k1F5aC8n078490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 05:36:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=91786 Change 91786 by kmacy@kmacy_storage:sun4v_work on 2006/02/15 05:35:20 add file with empty tlb_* functions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tlb.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 15 06:19:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F7FF16A423; Wed, 15 Feb 2006 06:19:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0691516A420 for ; Wed, 15 Feb 2006 06:19:05 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9FB043D4C for ; Wed, 15 Feb 2006 06:19:04 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1F6J4Yr080137 for ; Wed, 15 Feb 2006 06:19:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1F6J4gl080134 for perforce@freebsd.org; Wed, 15 Feb 2006 06:19:04 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 15 Feb 2006 06:19:04 GMT Message-Id: <200602150619.k1F6J4gl080134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91787 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 06:19:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=91787 Change 91787 by kmacy@kmacy_storage:sun4v_work on 2006/02/15 06:18:42 define VAs for ASIs that take values initialize scratchpad registers along with globals load globals from scratchpad registers in traps using PSTATE_ALT values aren't saved back to scratchpads - and there are definitely possibilities for removing loads in many places Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#3 (text+ko) ==== @@ -115,4 +115,30 @@ +#define SCRATCH_REG_0 0x00 +#define SCRATCH_REG_1 0x08 +#define SCRATCH_REG_2 0x10 +#define SCRATCH_REG_3 0x18 +#define SCRATCH_REG_4 0x20 +#define SCRATCH_REG_5 0x28 +#define SCRATCH_REG_6 0x30 +#define SCRATCH_REG_7 0x38 + +#define SCRATCH_REG_PCPU SCRATCH_REG_0 +#define SCRATCH_REG_PCB SCRATCH_REG_1 +#define SCRATCH_REG_PTD SCRATCH_REG_2 + +#define MMU_CID_P 0x08 +#define MMU_CID_S 0x10 + +#define CPU_MONDO_QH 0x3c0 +#define CPU_MONDO_QT 0x3c8 +#define DEV_MONDO_QH 0x3d0 +#define DEV_MONDO_QT 0x3d8 +#define RES_ERROR_QH 0x3e0 +#define RES_ERROR_QT 0x3e8 +#define NRES_ERROR_QH 0x3f0 +#define NRES_ERROR_QT 0x3f8 + + #endif /* !_MACHINE_ASI_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#4 (text+ko) ==== @@ -92,6 +92,13 @@ #define TTE_SET_REF(r1, r2, r3) TTE_SET_BIT(r1, r2, r3, TD_REF) #define TTE_SET_W(r1, r2, r3) TTE_SET_BIT(r1, r2, r3, TD_W) +#define LOAD_ALT \ + mov SCRATCH_REG_PCPU, %g0 ; \ + ldxa [%g0]ASI_SCRATCHPAD, PCPU_REG ; \ + mov SCRATCH_REG_PCB, %g0 ; \ + ldxa [%g0]ASI_SCRATCHPAD, PCB_REG + + /* * Macros for spilling and filling live windows. * @@ -604,7 +611,7 @@ /* * Switch to alternate globals. */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT /* * Reload the tag access register. @@ -761,7 +768,7 @@ /* * Switch to alternate globals. */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT /* * Check if we actually came from the kernel. @@ -940,7 +947,7 @@ /* * Switch to alternate globals. */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT /* * Check if we actually came from the kernel. @@ -1135,7 +1142,7 @@ END(tl1_fp_disabled_1) .macro tl1_data_excptn - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT ba,a %xcc, tl1_data_excptn_trap nop .align 32 @@ -1262,7 +1269,7 @@ /* * Switch to alternate globals. */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT ldxa [%g0 + AA_IMMU_TAR] %asi, %g2 @@ -1379,7 +1386,7 @@ /* * Switch to alternate globals. */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 @@ -1512,7 +1519,7 @@ /* * Switch to alternate globals. */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT /* * Load the sfar, sfsr and tar. Clear the sfsr. @@ -1621,7 +1628,11 @@ * data on kernel entry to the pcb. */ ENTRY(tl1_spill_topcb) - wrpr %g0, PSTATE_ALT, %pstate +#ifdef notyet + /* XXX SUN4V_FIXME - I think this broken from a performance + * standpoint + */ + LOAD_ALT /* Free some globals for our use. */ dec 24, ASP_REG @@ -1663,21 +1674,8 @@ inc 24, ASP_REG retry END(tl1_spill_topcb) +#endif - .macro tl1_spill_bad count - .rept \count - sir - .align 128 - .endr - .endm - - .macro tl1_fill_bad count - .rept \count - sir - .align 128 - .endr - .endm - .macro tl1_soft count .rept \count tl1_gen T_SOFT | T_KERNEL @@ -2033,11 +2031,8 @@ * of cpu migration and using the wrong pcpup. */ ENTRY(tl0_trap) - /* - * Force kernel store order. - */ - wrpr %g0, PSTATE_ALT, %pstate - + LOAD_ALT + rdpr %tstate, %l0 rdpr %tpc, %l1 rdpr %tnpc, %l2 @@ -2123,10 +2118,7 @@ * void tl0_intr(u_int level, u_int mask) */ ENTRY(tl0_intr) - /* - * Force kernel store order. - */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT rdpr %tstate, %l0 rdpr %tpc, %l1 @@ -2339,7 +2331,7 @@ * Switch to alternate globals. This frees up some registers we * can use after the restore changes our window. */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT /* * Drop %pil to zero. It must have been zero at the time of the @@ -2491,9 +2483,8 @@ * Restore the normal globals which have predefined values in the * kernel. We clobbered them above restoring the user's globals * so this is very important. - * XXX PSTATE_ALT must already be set. */ - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT mov PCB_REG, %o0 mov PCPU_REG, %o1 wrpr %g0, PSTATE_NORMAL, %pstate @@ -2626,7 +2617,7 @@ ldx [%sp + SPOFF + CCFSZ + TF_G6], %g6 ldx [%sp + SPOFF + CCFSZ + TF_G7], %g7 -1: wrpr %g0, PSTATE_ALT, %pstate +1: LOAD_ALT andn %l0, TSTATE_CWP_MASK, %g1 mov %l1, %g2 @@ -2760,7 +2751,7 @@ ldx [%sp + SPOFF + CCFSZ + TF_G4], %g4 ldx [%sp + SPOFF + CCFSZ + TF_G5], %g5 - wrpr %g0, PSTATE_ALT, %pstate + LOAD_ALT andn %l0, TSTATE_CWP_MASK, %g1 mov %l1, %g2 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#3 (text+ko) ==== @@ -105,7 +105,15 @@ mov %o1, PCB_REG mov %o0, PCPU_REG - /* XXX SUN4V_FIXME need to set the scratchpad registers */ + /* + * store PCB_REG and PCPU_REG into their respective scratchpad registers + * this allows us to retrieve them in the trap handlers - where we receive + * a new set of globals + */ + mov SCRATCH_REG_PCPU, %g1 + stxa PCPU_REG, [%g1]ASI_SCRATCHPAD + mov SCRATCH_REG_PCB, %g1 + stxa PCB_REG, [%g1]ASI_SCRATCHPAD retl nop From owner-p4-projects@FreeBSD.ORG Wed Feb 15 17:58:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0E9116A423; Wed, 15 Feb 2006 17:57:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 696B816A420 for ; Wed, 15 Feb 2006 17:57:59 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C25A43D45 for ; Wed, 15 Feb 2006 17:57:59 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FHvwC7032150 for ; Wed, 15 Feb 2006 17:57:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FHvw3T032147 for perforce@freebsd.org; Wed, 15 Feb 2006 17:57:58 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 17:57:58 GMT Message-Id: <200602151757.k1FHvw3T032147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91812 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 17:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=91812 Change 91812 by millert@millert_g4tower on 2006/02/15 17:57:41 Build and install the GUI file relabel tool Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/LabelDialog.m#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#4 (text+ko) ==== @@ -2,19 +2,23 @@ SUBDIR= checkpolicy \ loadpolicy \ - newrole + newrole \ + relabel_gui all: cd checkpolicy ; gnumake cd loadpolicy ; gnumake cd newrole ; gnumake + cd relabel_gui ; gnumake clean: cd checkpolicy ; gnumake clean cd loadpolicy ; gnumake clean cd newrole ; gnumake clean + cd relabel_gui ; gnumake clean install: cd checkpolicy ; gnumake install cd loadpolicy ; gnumake install cd newrole ; gnumake install + cd relabel_gui ; gnumake install ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/LabelDialog.m#3 (text+ko) ==== @@ -2,14 +2,16 @@ #import "LabelDialog.h" #import #import -#import +#import -const char *filename, *initial; +const char *filename; +char *initial; char **users, **roles, **types; size_t nusers, nroles, ntypes; extern int security_get_file_contexts(const char *fromcontext, char ***retcontexts, size_t *ncontexts); +extern char *getseccontext(void); static void addstring (char **ar, size_t *n, char *in) { ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#3 (text+ko) ==== @@ -171,10 +171,10 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ""; - INSTALL_PATH = "$(HOME)/Applications"; + INSTALL_PATH = "/Applications"; LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = "../../libsebsd/libsebsd.a ../../libmac/libmac.a"; + OTHER_CFLAGS = "-I../.."; + OTHER_LDFLAGS = "../../libselinux/src/libselinux.a ../../../darwin/libmac/libmac.a"; PRODUCT_NAME = relabel; SECTORDER_FLAGS = ""; USE_GCC3_PFE_SUPPORT = NO; @@ -185,7 +185,7 @@ ); isa = PBXApplicationTarget; name = relabel_gui; - productInstallPath = "$(HOME)/Applications"; + productInstallPath = "/Applications"; productName = relabel_gui; productReference = 17587328FF379C6511CA2CBB; productSettingsXML = " From owner-p4-projects@FreeBSD.ORG Wed Feb 15 18:01:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5C0216A423; Wed, 15 Feb 2006 18:01:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7832916A420 for ; Wed, 15 Feb 2006 18:01:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4558843D48 for ; Wed, 15 Feb 2006 18:01:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FI13hi032433 for ; Wed, 15 Feb 2006 18:01:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FI12RS032430 for perforce@freebsd.org; Wed, 15 Feb 2006 18:01:02 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:01:02 GMT Message-Id: <200602151801.k1FI12RS032430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:01:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=91813 Change 91813 by millert@millert_g4tower on 2006/02/15 18:00:53 Simplify args to CHECK_SIMPLE_PERM macro Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#31 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#31 (text+ko) ==== @@ -1162,17 +1162,17 @@ struct task_security_struct *tsec, *psec; \ psec = SLOT(port); \ tsec = SLOT(task); \ - return avc_has_perm_ref_audit (tsec->sid, psec->sid, class, \ - perm, NULL, NULL); \ + return avc_has_perm_ref_audit (tsec->sid, psec->sid, \ + SECCLASS_ ## class, class ## __ ## perm, NULL, NULL); \ } -CHECK_SIMPLE_PERM(msg_send,SECCLASS_MACH_PORT,MACH_PORT__SEND); -CHECK_SIMPLE_PERM(msg_receive,SECCLASS_MACH_PORT,MACH_PORT__RECV); -CHECK_SIMPLE_PERM(port_make_send,SECCLASS_MACH_PORT,MACH_PORT__MAKE_SEND); -CHECK_SIMPLE_PERM(port_copy_send,SECCLASS_MACH_PORT,MACH_PORT__COPY_SEND); -CHECK_SIMPLE_PERM(port_move_recv,SECCLASS_MACH_PORT,MACH_PORT__MOVE_RECV); -CHECK_SIMPLE_PERM(port_hold_send,SECCLASS_MACH_PORT,MACH_PORT__HOLD_SEND); -CHECK_SIMPLE_PERM(port_hold_recv,SECCLASS_MACH_PORT,MACH_PORT__HOLD_RECV); +CHECK_SIMPLE_PERM(msg_send, MACH_PORT, SEND); +CHECK_SIMPLE_PERM(msg_receive, MACH_PORT, RECV); +CHECK_SIMPLE_PERM(port_make_send, MACH_PORT, MAKE_SEND); +CHECK_SIMPLE_PERM(port_copy_send, MACH_PORT, COPY_SEND); +CHECK_SIMPLE_PERM(port_move_recv, MACH_PORT, MOVE_RECV); +CHECK_SIMPLE_PERM(port_hold_send, MACH_PORT, HOLD_SEND); +CHECK_SIMPLE_PERM(port_hold_recv, MACH_PORT, HOLD_RECV); extern struct policydb policydb; From owner-p4-projects@FreeBSD.ORG Wed Feb 15 18:07:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8FDD16A423; Wed, 15 Feb 2006 18:07:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BEE416A420 for ; Wed, 15 Feb 2006 18:07:11 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 226B443D45 for ; Wed, 15 Feb 2006 18:07:11 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FI7Bq6032747 for ; Wed, 15 Feb 2006 18:07:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FI7AOW032744 for perforce@freebsd.org; Wed, 15 Feb 2006 18:07:10 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:07:10 GMT Message-Id: <200602151807.k1FI7AOW032744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:07:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=91814 Change 91814 by millert@millert_g4tower on 2006/02/15 18:06:52 Add mac_check_port_receive() entry point to mediate message receipt. Split off mac_check_port_move_send() from mac_check_port_copy_send(). New mac_check_port_make_send_once(), mac_check_port_move_send_once(), and mac_check_port_hold_send_once() entry points to differentiate between "send" and "send once" rights. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#14 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_right.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#32 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#14 (text+ko) ==== @@ -1953,11 +1953,11 @@ ); /** - @brief Access control check for transferring a send right + @brief Access control check for copying a send right to another task @param task Label of the sender task @param port Label of the affected port - Access control check for transferring send rights to the port out of the + Access control check for copying send rights to the port from the specified task. A complementary entry point, mpo_check_port_hold_send, handles the receiving task. check_port_copy_send is called as part of a group of policy invocations when messages with port rights are sent. @@ -1974,6 +1974,27 @@ ); /** + @brief Access control check for transferring a send right + @param task Label of the sender task + @param port Label of the affected port + + Access control check for transferring a send right from one task to the + task listening to the specified port. A complementary entry point, + mpo_check_port_hold_send, handles the receiving task. + check_port_move_send is called as part of a group of policy invocations + when messages with port rights are sent. All access control checks made + for a particular message must be successful for the message to be sent. + + The task label and the port are locked. Sleeping is permitted. + + @return Return 0 if access is granted, non-zero otherwise. +*/ +typedef int mpo_check_port_move_send_t( + struct label *task, + struct label *port +); + +/** @brief Access control check for obtaining a send right @param task Label of the receiving task @param port Label of the affected port @@ -4159,10 +4180,14 @@ mpo_check_port_relabel_t *mpo_check_port_relabel; mpo_check_port_send_t *mpo_check_port_send; mpo_check_port_make_send_t *mpo_check_port_make_send; + mpo_check_port_make_send_t *mpo_check_port_make_send_once; mpo_check_port_copy_send_t *mpo_check_port_copy_send; + mpo_check_port_move_send_t *mpo_check_port_move_send; + mpo_check_port_move_send_t *mpo_check_port_move_send_once; mpo_check_port_receive_t *mpo_check_port_receive; mpo_check_port_move_receive_t *mpo_check_port_move_receive; mpo_check_port_hold_send_t *mpo_check_port_hold_send; + mpo_check_port_hold_send_t *mpo_check_port_hold_send_once; mpo_check_port_hold_receive_t *mpo_check_port_hold_receive; mpo_check_cred_visible_t *mpo_check_cred_visible; mpo_check_fcntl_t *mpo_check_fcntl; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_right.c#6 (text+ko) ==== @@ -1333,6 +1333,21 @@ switch (msgt_name) { case MACH_MSG_TYPE_MAKE_SEND: + if ((bits & MACH_PORT_TYPE_RECEIVE) == 0) + return FALSE; + +#ifdef MAC + port = (ipc_port_t) entry->ie_object; + ip_lock(port); + tasklabel_lock(self); + rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + ip_unlock(port); + if (rc) + return FALSE; +#endif + break; + case MACH_MSG_TYPE_MAKE_SEND_ONCE: if ((bits & MACH_PORT_TYPE_RECEIVE) == 0) return FALSE; @@ -1341,7 +1356,7 @@ port = (ipc_port_t) entry->ie_object; ip_lock(port); tasklabel_lock(self); - rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_make_send_once(&self->maclabel, &port->ip_label); tasklabel_unlock(self); ip_unlock(port); if (rc) @@ -1384,7 +1399,22 @@ active = ip_active(port); #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + switch (msgt_name) { + case MACH_MSG_TYPE_COPY_SEND: + rc = mac_check_port_copy_send(&self->maclabel, + &port->ip_label); + break; + case MACH_MSG_TYPE_MOVE_SEND: + rc = mac_check_port_move_send(&self->maclabel, + &port->ip_label); + break; + case MACH_MSG_TYPE_MOVE_SEND_ONCE: + rc = mac_check_port_move_send_once(&self->maclabel, + &port->ip_label); + break; + default: + panic("ipc_right_copyin_check: strange rights"); + } tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -1510,7 +1540,7 @@ #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_make_send_once(&self->maclabel, &port->ip_label); tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -1664,7 +1694,7 @@ #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_move_send(&self->maclabel, &port->ip_label); tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -1742,7 +1772,8 @@ #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_move_send_once(&self->maclabel, + &port->ip_label); tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -1947,7 +1978,7 @@ #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_move_send(&self->maclabel, &port->ip_label); tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -2053,7 +2084,7 @@ #ifdef MAC if (space->is_task) { tasklabel_lock(space->is_task); - rc = mac_check_port_hold_send(&space->is_task->maclabel, + rc = mac_check_port_hold_send_once(&space->is_task->maclabel, &port->ip_label); tasklabel_unlock(space->is_task); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#8 (text+ko) ==== @@ -148,6 +148,16 @@ } int +mac_check_port_make_send_once(struct label *task, struct label *port) +{ + int error; + + MAC_CHECK(check_port_make_send_once, task, port); + + return (error); +} + +int mac_check_port_copy_send(struct label *task, struct label *port) { int error; @@ -158,6 +168,26 @@ } int +mac_check_port_move_send(struct label *task, struct label *port) +{ + int error; + + MAC_CHECK(check_port_move_send, task, port); + + return (error); +} + +int +mac_check_port_move_send_once(struct label *task, struct label *port) +{ + int error; + + MAC_CHECK(check_port_move_send_once, task, port); + + return (error); +} + +int mac_check_port_move_receive(struct label *task, struct label *port) { int error; @@ -178,6 +208,16 @@ } int +mac_check_port_hold_send_once(struct label *task, struct label *port) +{ + int error; + + MAC_CHECK(check_port_hold_send_once, task, port); + + return (error); +} + +int mac_check_port_hold_receive(struct label *task, struct label *port) { int error; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#6 (text+ko) ==== @@ -129,10 +129,16 @@ { SECCLASS_MACH_PORT, MACH_PORT__SEND, "send" }, { SECCLASS_MACH_PORT, MACH_PORT__RECV, "recv" }, { SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND, "make_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND_ONCE, "make_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__COPY_SEND, "copy_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND, "move_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND_ONCE, "move_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV, "move_recv" }, + { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV_ONCE, "move_recv_once" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND, "hold_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND_ONCE, "hold_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV, "hold_recv" }, + { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV_ONCE, "hold_recv_once" }, { SECCLASS_MACH_TASK, MACH_TASK__TERMINATE, "terminate" }, { SECCLASS_MACH_TASK, MACH_TASK__SET_SPECIAL_PORT, "set_special_port" }, }; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#6 (text+ko) ==== @@ -606,10 +606,16 @@ #define MACH_PORT__SEND 0x0000000000000004UL #define MACH_PORT__RECV 0x0000000000000008UL #define MACH_PORT__MAKE_SEND 0x0000000000000010UL -#define MACH_PORT__COPY_SEND 0x0000000000000020UL -#define MACH_PORT__MOVE_RECV 0x0000000000000040UL -#define MACH_PORT__HOLD_SEND 0x0000000000000080UL -#define MACH_PORT__HOLD_RECV 0x0000000000000100UL +#define MACH_PORT__MAKE_SEND_ONCE 0x0000000000000020UL +#define MACH_PORT__COPY_SEND 0x0000000000000040UL +#define MACH_PORT__MOVE_SEND 0x0000000000000080UL +#define MACH_PORT__MOVE_SEND_ONCE 0x0000000000000100UL +#define MACH_PORT__MOVE_RECV 0x0000000000000200UL +#define MACH_PORT__MOVE_RECV_ONCE 0x0000000000000400UL +#define MACH_PORT__HOLD_SEND 0x0000000000000800UL +#define MACH_PORT__HOLD_SEND_ONCE 0x0000000000001000UL +#define MACH_PORT__HOLD_RECV 0x0000000000002000UL +#define MACH_PORT__HOLD_RECV_ONCE 0x0000000000004000UL #define MACH_TASK__TERMINATE 0x0000000000000001UL #define MACH_TASK__SET_SPECIAL_PORT 0x0000000000000002UL ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#7 (text+ko) ==== @@ -360,10 +360,16 @@ send recv make_send + make_send_once copy_send + move_send + move_send_once move_recv + move_recv_once hold_send + hold_send_once hold_recv + hold_recv_once } class mach_task ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#32 (text+ko) ==== @@ -116,6 +116,8 @@ int sebsd_verbose = 0; +static struct label *last_dead_cred_label, *last_dead_task_label, *last_dead_port_label; // XXX - testing + static int slot = 1; /* TBD, dynamic */ #define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -483,6 +485,24 @@ static void sebsd_destroy_cred_label(struct label *label) { + // printk("sebsd_destroy_cred_label(%p)\n", &LABEL_TO_SLOT((label), slot)); + last_dead_cred_label = label; + sebsd_free (SLOT(label)); + SLOT(label) = NULL; +} + +static void +sebsd_destroy_task_label(struct label *label) +{ + last_dead_task_label = label; + sebsd_free (SLOT(label)); + SLOT(label) = NULL; +} + +static void +sebsd_destroy_port_label(struct label *label) +{ + last_dead_port_label = label; sebsd_free (SLOT(label)); SLOT(label) = NULL; } @@ -1169,9 +1189,13 @@ CHECK_SIMPLE_PERM(msg_send, MACH_PORT, SEND); CHECK_SIMPLE_PERM(msg_receive, MACH_PORT, RECV); CHECK_SIMPLE_PERM(port_make_send, MACH_PORT, MAKE_SEND); +CHECK_SIMPLE_PERM(port_make_send_once, MACH_PORT, MAKE_SEND_ONCE); CHECK_SIMPLE_PERM(port_copy_send, MACH_PORT, COPY_SEND); +CHECK_SIMPLE_PERM(port_move_send, MACH_PORT, COPY_SEND); +CHECK_SIMPLE_PERM(port_move_send_once, MACH_PORT, MOVE_SEND_ONCE); CHECK_SIMPLE_PERM(port_move_recv, MACH_PORT, MOVE_RECV); CHECK_SIMPLE_PERM(port_hold_send, MACH_PORT, HOLD_SEND); +CHECK_SIMPLE_PERM(port_hold_send_once, MACH_PORT, HOLD_SEND_ONCE); CHECK_SIMPLE_PERM(port_hold_recv, MACH_PORT, HOLD_RECV); extern struct policydb policydb; @@ -2339,7 +2363,13 @@ { struct task_security_struct *task; - task = SLOT(label); + /* XXX - SLOT should not return NULL but there is a signal race */ + /* XXX - this may be fixed... */ + if ((task = SLOT(label)) == NULL) { + printk("sebsd_externalize_cred_label: SLOT returned NULL!\n"); + printk("label: %p, last_task: %p, last_cred: %p, last_port: %p\n", label, last_dead_task_label, last_dead_cred_label, last_dead_port_label); // XXX + return (ESRCH); + } return (sebsd_externalize_sid(task->sid, element_name, sb)); } @@ -2635,8 +2665,8 @@ .mpo_destroy = sebsd_destroy, .mpo_destroy_cred_label = sebsd_destroy_cred_label, - .mpo_destroy_task_label = sebsd_destroy_cred_label, - .mpo_destroy_port_label = sebsd_destroy_cred_label, + .mpo_destroy_task_label = sebsd_destroy_task_label, + .mpo_destroy_port_label = sebsd_destroy_port_label, .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label, @@ -2685,9 +2715,13 @@ .mpo_check_port_send = sebsd_check_msg_send, .mpo_check_port_receive = sebsd_check_msg_receive, .mpo_check_port_make_send = sebsd_check_port_make_send, + .mpo_check_port_make_send_once = sebsd_check_port_make_send_once, .mpo_check_port_copy_send = sebsd_check_port_copy_send, + .mpo_check_port_move_send = sebsd_check_port_move_send, + .mpo_check_port_move_send_once = sebsd_check_port_move_send_once, .mpo_check_port_move_receive = sebsd_check_port_move_recv, .mpo_check_port_hold_send = sebsd_check_port_hold_send, + .mpo_check_port_hold_send_once = sebsd_check_port_hold_send_once, .mpo_check_port_hold_receive = sebsd_check_port_hold_recv, .mpo_check_proc_setlcid = sebsd_check_proc_setlcid, .mpo_check_proc_signal = sebsd_check_proc_signal, From owner-p4-projects@FreeBSD.ORG Wed Feb 15 18:15:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A98416A423; Wed, 15 Feb 2006 18:15:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0ED216A420 for ; Wed, 15 Feb 2006 18:15:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84F9643D4C for ; Wed, 15 Feb 2006 18:15:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FIFLCO033196 for ; Wed, 15 Feb 2006 18:15:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FIFLoI033193 for perforce@freebsd.org; Wed, 15 Feb 2006 18:15:21 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:15:21 GMT Message-Id: <200602151815.k1FIFLoI033193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:15:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=91815 Change 91815 by millert@millert_g4tower on 2006/02/15 18:14:27 Update for new Mach message entry points. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#5 (text+ko) ==== @@ -1219,28 +1219,28 @@ ##### define(`allow_mach_ipc', ` -allow $1 $2:mach_port { send copy_send make_send hold_send hold_recv }; -allow $2 $1:mach_port { send copy_send make_send hold_send hold_recv }; +allow $1 $2:mach_port { send copy_send move_send move_send_once make_send make_send_once hold_send hold_send_once recv hold_recv }; +allow $2 $1:mach_port { send copy_send move_send move_send_once make_send make_send_once hold_send hold_send_once recv hold_recv }; ') define(`mach_bootstrap', ` -allow $1 $2:mach_port { send copy_send make_send hold_send hold_recv }; +allow $1 $2:mach_port { send copy_send move_send move_send_once make_send make_send_once hold_send hold_send_once recv hold_recv }; allow $1 $2:mi_bootstrap { bootstrap_look_up bootstrap_look_up_array }; -allow mach_init_d $1:mach_port { send copy_send hold_send hold_recv }; +allow mach_init_d $1:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; ') define(`mach_bootstrap_register', ` allow $1 $2:mi_bootstrap *; -allow $1 $2:mach_port { send copy_send hold_send hold_recv }; -allow mach_init_d $1:mach_port { send copy_send hold_send hold_recv }; +allow $1 $2:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; +allow mach_init_d $1:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; ') define(`allow_notify_ipc', ` allow $1 mach_init_d:mi_notify_ipc *; allow $1 notifyd_d:mi_notify_ipc *; allow notifyd_d $1:mi_notify_ipc *; -allow $1 notifyd_d:mach_port { send copy_send hold_send hold_recv }; -allow notifyd_d $1:mach_port { send copy_send hold_send hold_recv }; +allow $1 notifyd_d:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; +allow notifyd_d $1:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; ') ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#7 (text+ko) ==== @@ -167,13 +167,13 @@ type_change user_d devpts_t:chr_file user_devpts_t; -allow domain2 self:mach_port { send make_send copy_send hold_send move_recv hold_recv }; -allow domain2 kernel_d:mach_port { send make_send copy_send hold_send }; +allow domain2 self:mach_port { send make_send make_send_once copy_send move_send move_send_once hold_send hold_send_once recv move_recv hold_recv }; +allow domain2 kernel_d:mach_port { send make_send make_send_once copy_send move_send move_send_once hold_send hold_send_once }; allow domain2 self:mach_task set_special_port; allow domain2 self:mi_bootstrap { bootstrap_look_up }; allow domain2 root_t:dir { search getattr read }; allow domain2 self:process getsched; -allow kernel_d domain2:mach_port { send make_send copy_send hold_send }; +allow kernel_d domain2:mach_port { send make_send make_send_once copy_send move_send move_send_once hold_send hold_send_once }; allow domain2 file:{file lnk_file sock_file fifo_file} {create_file_perms execute }; allow domain2 file:file execute_no_trans; @@ -246,7 +246,7 @@ allow mach_init_d mach_init_d:mach_port relabelfrom; allow mach_init_d boot_names_t:mach_port relabelto; allow mach_init_d {loginwindow_d windowserver_d}:mach_port relabelto; -allow mach_init_d user_names_t:mach_port { copy_send hold_send relabelto }; +allow mach_init_d user_names_t:mach_port { copy_send move_send move_send_once hold_send hold_send_once relabelto }; allow_mach_ipc(systemstarter_d,unlabeled_t); allow_mach_ipc(systemstarter_d,boot_names_t); @@ -311,8 +311,8 @@ #diskarbitrationd rules mach_bootstrap(diskarbitrationd_d,mach_init_d); #allow diskarbitrationd_d notifyd_d:mi_notify_ipc { _notify_server_register_check _notify_server_register_mach_port }; -#allow notifyd_d diskarbitrationd_d:mach_port { copy_send hold_send }; -#allow diskarbitrationd_d notifyd_d:mach_port { copy_send hold_send }; +#allow notifyd_d diskarbitrationd_d:mach_port { copy_send move_send move_send_once hold_send hold_send_once }; +#allow diskarbitrationd_d notifyd_d:mach_port { copy_send move_send move_send_once hold_send hold_send_once }; allow_notify_ipc(diskarbitrationd_d); allow_mach_ipc(diskarbitrationd_d,unlabeled_t); allow_mach_ipc(diskarbitrationd_d,mach_servers_d); @@ -425,7 +425,7 @@ allow_mach_ipc($1,lookupd_d); allow_mach_ipc(pbs_d,$1); -allow pbs_d $1:mach_port { send copy_send hold_send }; +allow pbs_d $1:mach_port { send copy_send move_send move_send_once hold_send hold_send_once }; mach_bootstrap_register(pbs_d,$2); mach_bootstrap(pbs_d,$2); @@ -439,4 +439,4 @@ bool lookups false; if (lookups) { allow user_d {mach_init_d init_d systemstarter_d loginwindow_d user_d}:mi_bootstrap bootstrap_info; -}+} From owner-p4-projects@FreeBSD.ORG Wed Feb 15 18:34:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3678916A423; Wed, 15 Feb 2006 18:34:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC9D116A422 for ; Wed, 15 Feb 2006 18:34:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6CC343D46 for ; Wed, 15 Feb 2006 18:34:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FIYkqE034127 for ; Wed, 15 Feb 2006 18:34:46 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FIYk4t034124 for perforce@freebsd.org; Wed, 15 Feb 2006 18:34:46 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:34:46 GMT Message-Id: <200602151834.k1FIYk4t034124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:34:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=91819 Change 91819 by millert@millert_g4tower on 2006/02/15 18:34:39 Add missing Makefile for GUI file label tool Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 15 18:36:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7468D16A423; Wed, 15 Feb 2006 18:36:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34EF116A422 for ; Wed, 15 Feb 2006 18:36:56 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C50143D5C for ; Wed, 15 Feb 2006 18:36:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FIao9V034359 for ; Wed, 15 Feb 2006 18:36:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FIanac034356 for perforce@freebsd.org; Wed, 15 Feb 2006 18:36:49 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:36:49 GMT Message-Id: <200602151836.k1FIanac034356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:36:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=91821 Change 91821 by millert@millert_g4tower on 2006/02/15 18:36:40 Fix some whitespace issues introduced by "diff -wu" when updating from the SEFOS tree. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kdp/kdp_udp.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#3 (text+ko) ==== @@ -127,7 +127,7 @@ - (void) policyWillLogin { free(username); if (label != NULL) /* XXX */ - mac_free(label); + mac_free(label); } - (void) policyWillLogout { return; } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#8 (text+ko) ==== @@ -2057,7 +2057,7 @@ printf("ipc_kmsg_copyout_header: can't grow user ipc space\n"); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); - } + } } /* space is locked again; start over */ ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kdp/kdp_udp.c#4 (text+ko) ==== @@ -631,8 +631,8 @@ { kdp_handle_arp(); return; - } } + } if (pkt.len < (sizeof (struct ether_header) + sizeof (struct udpiphdr))) return; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#4 (text+ko) ==== @@ -76,9 +76,9 @@ if (fp == NULL) return errno; - fseek (fp, 0, SEEK_END); - la.len = ftell (fp); - fseek (fp, 0, SEEK_SET); + fseek(fp, 0, SEEK_END); + la.len = ftell(fp); + fseek(fp, 0, SEEK_SET); if ((la.data = malloc (la.len)) == NULL) return (ENOMEM); if (fread(la.data, la.len, 1, fp) != 1) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#4 (text+ko) ==== @@ -28,4 +28,4 @@ $SETFMAC sebsd/system_u:object_r:pbs_exec_t /System/Library/CoreServices/pbs $SETFMAC sebsd/system_u:object_r:windowserver_exec_t /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/WindowServer* $SETFMAC sebsd/system_u:object_r:securityserver_exec_t /System/Library/CoreServices/SecurityServer -$SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd+$SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd From owner-p4-projects@FreeBSD.ORG Wed Feb 15 19:30:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3B6C16A423; Wed, 15 Feb 2006 19:30:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8809716A420 for ; Wed, 15 Feb 2006 19:30:01 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F8B243D49 for ; Wed, 15 Feb 2006 19:30:01 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FJU1f3036740 for ; Wed, 15 Feb 2006 19:30:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FJU09V036737 for perforce@freebsd.org; Wed, 15 Feb 2006 19:30:00 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 15 Feb 2006 19:30:00 GMT Message-Id: <200602151930.k1FJU09V036737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 19:30:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91823 Change 91823 by kmacy@kmacy_storage:sun4v_work on 2006/02/15 19:29:01 update scratchpad register names to reflect those used in the documentation Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#4 (text+ko) ==== @@ -115,18 +115,16 @@ -#define SCRATCH_REG_0 0x00 -#define SCRATCH_REG_1 0x08 -#define SCRATCH_REG_2 0x10 -#define SCRATCH_REG_3 0x18 -#define SCRATCH_REG_4 0x20 -#define SCRATCH_REG_5 0x28 -#define SCRATCH_REG_6 0x30 -#define SCRATCH_REG_7 0x38 +#define ASI_SCRATCHPAD_0_REG 0x00 +#define ASI_SCRATCHPAD_1_REG 0x08 +#define ASI_SCRATCHPAD_2_REG 0x10 +#define ASI_SCRATCHPAD_3_REG 0x18 +#define ASI_SCRATCHPAD_6_REG 0x30 +#define ASI_SCRATCHPAD_7_REG 0x38 -#define SCRATCH_REG_PCPU SCRATCH_REG_0 -#define SCRATCH_REG_PCB SCRATCH_REG_1 -#define SCRATCH_REG_PTD SCRATCH_REG_2 +#define SCRATCH_REG_PCPU ASI_SCRATCHPAD_0_REG +#define SCRATCH_REG_PCB ASI_SCRATCHPAD_1_REG +#define SCRATCH_REG_PTD ASI_SCRATCHPAD_2_REG #define MMU_CID_P 0x08 #define MMU_CID_S 0x10 From owner-p4-projects@FreeBSD.ORG Wed Feb 15 19:42:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2260916A424; Wed, 15 Feb 2006 19:42:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE2F916A420 for ; Wed, 15 Feb 2006 19:42:16 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95B2A43D48 for ; Wed, 15 Feb 2006 19:42:16 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FJgGdG037172 for ; Wed, 15 Feb 2006 19:42:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FJgG0f037169 for perforce@freebsd.org; Wed, 15 Feb 2006 19:42:16 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 15 Feb 2006 19:42:16 GMT Message-Id: <200602151942.k1FJgG0f037169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 19:42:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=91824 Change 91824 by kmacy@kmacy_storage:sun4v_work on 2006/02/15 19:41:58 close inspection of the US 2005 documentation shows that key pieces of information are either wrong or missing use opensolaris' trap_table.s as guidance for missing bits Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#5 (text+ko) ==== @@ -483,11 +483,23 @@ .endr .endm - .macro tl0_insn_excptn + .macro insn_excptn + .align 32 + .endm + + .macro insn_miss + .align 32 + .endm + + .macro data_excptn + .align 32 + .endm + + .macro data_miss .align 32 .endm - .macro tl0_data_excptn + .macro data_prot .align 32 .endm @@ -511,22 +523,72 @@ .align 32 .endm - .macro spill_n_normal type - .align 32 + .macro spill_32bit_asi asi target + .align 128 + .endm + + .macro spill_64bit_asi asi target + .align 128 + .endm + + .macro spill_32bit target + .align 128 + .endm + + .macro spill_64bit target + .align 128 + .endm + + .macro spill_64bit_ktt1 target + .align 128 + .endm + + .macro spill_mixed_ktt1 target + .align 128 + .endm + + .macro spill_32bit_tt1 asi target + .align 128 + .endm + + .macro spill_64bit_tt1 asi target + .align 128 .endm - .macro spill_n_other type - .align 32 + .macro spill_32clean asi target + .align 128 .endm - .macro fill_n_normal type - .align 32 + .macro spill_64clean asi target + .align 128 .endm - .macro fill_n_other type - .align 32 + .macro spill_mixed + .align 128 .endm + + + .macro fill_32bit_asi asi target + .align 128 + .endm + + .macro fill_64bit_asi asi target + .align 128 + .endm + + .macro fill_32bit target + .align 128 + .endm + + .macro fill_64bit target + .align 128 + .endm + + .macro fill_mixed + .align 128 + .endm + ENTRY(tl0_sfsr_trap) tl0_split @@ -1688,8 +1750,10 @@ tl0_base: tl0_reserved 8 ! 0x0-0x7 tl0_insn_excptn: - tl0_insn_excptn ! 0x8 - tl0_reserved 7 ! 0x9-0xf + insn_excptn ! 0x8 +tl0_insn_miss: + insn_miss ! 0x9 + tl0_reserved 6 ! 0xa-0xf tl0_insn_illegal: tl0_gen T_ILLEGAL_INSTRUCTION ! 0x10 tl0_priv_opcode: @@ -1709,8 +1773,10 @@ tl0_gen T_DIVISION_BY_ZERO ! 0x28 tl0_reserved 7 ! 0x29-0x2f tl0_data_excptn: - tl0_data_excptn ! 0x30 - tl0_reserved 3 ! 0x31-0x33 + data_excptn ! 0x30 +tl0_data_miss: + data_miss ! 0x31 + tl0_reserved 2 ! 0x32-0x33 tl0_align: tl0_align ! 0x34 tl0_align_lddf: @@ -1725,7 +1791,10 @@ tl0_reserved 18 ! 0x50-0x61 tl0_watch_virt: tl0_gen T_VA_WATCHPOINT ! 0x62 - tl0_reserved 19 ! 0x63-0x75 + tl0_reserved 10 ! 0x63-0x6c +tl0_data_prot: + data_prot ! 0x6c + tl0_reserved 8 ! 0x6d-0x75 tl0_breakpoint: tl0_gen T_BREAKPOINT ! 0x76 tl0_reserved 5 ! 0x77-0x7b @@ -1738,47 +1807,35 @@ tl0_unresumable_error: unresumable_error ! 0x7f tl0_spill_n_normal: - spill_n_normal T_SPILL_0 ! 0x80 - spill_n_normal T_SPILL_1 ! 0x84 - spill_n_normal T_SPILL_2 ! 0x88 - spill_n_normal T_SPILL_3 ! 0x8c - spill_n_normal T_SPILL_4 ! 0x90 - spill_n_normal T_SPILL_5 ! 0x94 - spill_n_normal T_SPILL_6 ! 0x98 - spill_n_normal T_SPILL_7 ! 0x9c - tl0_reserved 3 ! 0x9d-0x9f + tl0_reserved 4 ! 0x80 + spill_32bit_asi ASI_AIUP sn0 ! 0x84 + spill_64bit_asi ASI_AIUP sn0 ! 0x88 + spill_32clean ASI_AIUP sn0 ! 0x8c + spill_64clean ASI_AIUP sn0 ! 0x90 + spill_32bit not ! 0x94 + spill_64bit not ! 0x98 + spill_mixed ! 0x9c tl0_spill_n_other: - spill_n_other T_SPILL_0 ! 0xa0 - spill_n_other T_SPILL_1 ! 0xa4 - spill_n_other T_SPILL_2 ! 0xa8 - spill_n_other T_SPILL_3 ! 0xac - spill_n_other T_SPILL_4 ! 0xb0 - spill_n_other T_SPILL_5 ! 0xb4 - spill_n_other T_SPILL_6 ! 0xb8 - spill_n_other T_SPILL_7 ! 0xbc - tl0_reserved 3 ! 0xbd-0xbf + tl0_reserved 4 ! 0xa0 + spill_32bit_asi ASI_AIUS so0 ! 0xa4 + spill_64bit_asi ASI_AIUS so0 ! 0xa8 + spill_32bit_asi ASI_AIUS so0 ! 0xac + spill_64bit_asi ASI_AIUS so0 ! 0xb0 + tl0_reserved 12 ! 0xb4-0xbf tl0_fill_n_normal: - fill_n_normal T_FILL_0 ! 0xc0 - fill_n_normal T_FILL_1 ! 0xc4 - fill_n_normal T_FILL_2 ! 0xc8 - fill_n_normal T_FILL_3 ! 0xcc - fill_n_normal T_FILL_4 ! 0xd0 - fill_n_normal T_FILL_5 ! 0xd4 - fill_n_normal T_FILL_6 ! 0xd8 - fill_n_normal T_FILL_7 ! 0xdc - tl0_reserved 3 ! 0xdd-0xdf + tl0_reserved 4 ! 0xa0 + fill_32bit_asi ASI_AIUP fn0 ! 0xc4 + fill_64bit_asi ASI_AIUP fn0 ! 0xc8 + fill_32bit_asi ASI_AIUP fn0 ! 0xcc + fill_64bit_asi ASI_AIUP fn0 ! 0xd0 + fill_32bit not ! 0xd4 + fill_64bit not ! 0xd8 + fill_mixed ! 0xdc tl0_fill_n_other: - fill_n_other T_FILL_0 ! 0xe0 - fill_n_other T_FILL_1 ! 0xe4 - fill_n_other T_FILL_2 ! 0xe8 - fill_n_other T_FILL_3 ! 0xec - fill_n_other T_FILL_4 ! 0xf0 - fill_n_other T_FILL_5 ! 0xf4 - fill_n_other T_FILL_6 ! 0xf8 - fill_n_other T_FILL_7 ! 0xfc - tl0_reserved 3 ! 0xfd-0xff + tl0_reserved 32 ! 0xe0-0xff tl0_soft: tl0_gen T_SYSCALL ! 0x100 + tl0_gen T_BREAKPOINT ! 0x101 tl0_gen T_DIVISION_BY_ZERO ! 0x102 tl0_reserved 1 ! 0x103 tl0_gen T_CLEAN_WINDOW ! 0x104 @@ -1806,105 +1863,52 @@ tl0_gen T_TRAP_INSTRUCTION_30 ! 0x11e tl0_gen T_TRAP_INSTRUCTION_31 ! 0x11f tl0_reserved 32 ! 0x120-0x13f - tl0_gen T_SYSCALL ! 0x140 + tl0_gen T_SYSCALL ! 0x140 LP64 system call tl0_syscall ! 0x141 tl0_gen T_SYSCALL ! 0x142 tl0_gen T_SYSCALL ! 0x143 tl0_reserved 188 ! 0x144-0x1ff tll_base: - tl1_reserved 8 ! 0x200-0x207 -tll_insn_excptn: - tl1_insn_excptn ! 0x208 - tl1_reserved 7 ! 0x209-0x20f -tl1_insn_illegal: - tl1_gen T_ILLEGAL_INSTRUCTION ! 0x210 -tl1_priv_opcode: - tl1_gen T_PRIVILEGED_OPCODE ! 0x211 - tl1_reserved 14 ! 0x212-0x21f -tl1_fp_disabled: - tl1_gen T_FP_DISABLED ! 0x220 -tl1_fp_ieee: - tl1_gen T_FP_EXCEPTION_IEEE_754 ! 0x221 -tl1_fp_other: - tl1_gen T_FP_EXCEPTION_OTHER ! 0x222 -tl1_tag_ovflw: - tl1_gen T_TAG_OVERFLOW ! 0x223 + tl1_reserved 9 ! 0x200-0x208 +tll_insn_miss: + insn_miss ! 0x209 + tl1_reserved 27 ! 0x20a-0x224 tl1_clean_window: clean_window ! 0x224 tl1_divide: - tl1_gen T_DIVISION_BY_ZERO ! 0x228 - tl1_reserved 7 ! 0x229-0x22f + tl1_reserved 8 ! 0x228-0x22f tl1_data_excptn: tl1_data_excptn ! 0x230 - tl1_reserved 3 ! 0x231-0x233 + data_miss ! 0x231 + tl1_reserved 2 ! 0x232-0x233 tl1_align: tl1_align ! 0x234 -tl1_align_lddf: - tl1_gen T_RESERVED ! 0x235 -tl1_align_stdf: - tl1_gen T_RESERVED ! 0x236 -tl1_priv_action: - tl1_gen T_PRIVILEGED_ACTION ! 0x237 - tl1_reserved 9 ! 0x238-0x240 -tl1_intr_level: - tl1_intr_level ! 0x241-0x24f - tl1_reserved 18 ! 0x250-0x261 -tl1_watch_virt: - tl1_gen T_VA_WATCHPOINT ! 0x262 - tl1_reserved 19 ! 0x,63-0x275 -tl1_breakpoint: - tl1_gen T_BREAKPOINT ! 0x276 - tl1_reserved 5 ! 02x77-0x27b -tl1_cpu_mondo: - cpu_mondo ! 0x27c -tl1_dev_mondo: - dev_mondo ! 0x27d -tl1_resumable_error: - resumable_error ! 0x27e + tl1_reserved 55 ! 0x235-0x26b +tl1_data_prot: + data_prot ! 0x26c + tl1_reserved 18 ! 0x26c-0x27e tl1_unresumable_error: unresumable_error ! 0x27f tl1_spill_n_normal: - spill_n_normal T_SPILL_0 ! 0x280 - spill_n_normal T_SPILL_1 ! 0x284 - spill_n_normal T_SPILL_2 ! 0x288 - spill_n_normal T_SPILL_3 ! 0x28c - spill_n_normal T_SPILL_4 ! 0x290 - spill_n_normal T_SPILL_5 ! 0x294 - spill_n_normal T_SPILL_6 ! 0x298 - spill_n_normal T_SPILL_7 ! 0x29c - tl1_reserved 3 ! 0x29d-0x29f + tl1_reserved 4 ! 0x280 + spill_32bit_tt1 ASI_AIUP sn1 ! 0x284 + spill_64bit_tt1 ASI_AIUP sn1 ! 0x288 + spill_32bit_tt1 ASI_AIUP sn1 ! 0x28c + spill_32bit_tt1 ASI_AIUP sn1 ! 0x290 + tl1_reserved ! 0x294 + spill_64bit_ktt1 sk ! 0x298 + spill_mixed_ktt1 sk ! 0x29c tl1_spill_n_other: - spill_n_other T_SPILL_0 ! 0x2a0 - spill_n_other T_SPILL_1 ! 0x2a4 - spill_n_other T_SPILL_2 ! 0x2a8 - spill_n_other T_SPILL_3 ! 0x2ac - spill_n_other T_SPILL_4 ! 0x2b0 - spill_n_other T_SPILL_5 ! 0x2b4 - spill_n_other T_SPILL_6 ! 0x2b8 - spill_n_other T_SPILL_7 ! 0x2bc - tl1_reserved 3 ! 0x2bd-0x2bf + tl1_reserved 4 ! 0x2a0 + spill_32bit_tt1 ASI_AIUS so1 ! 0x2a4 + spill_64bit_tt1 ASI_AIUS so1 ! 0x2a8 + spill_32bit_tt1 ASI_AIUS so1 ! 0x2ac + spill_64bit_tt1 ASI_AIUS so1 ! 0x2b0 + tl1_reserved 12 ! 0x2b4-0x2bf tl1_fill_n_normal: - fill_n_normal T_FILL_0 ! 0x2c0 - fill_n_normal T_FILL_1 ! 0x2c4 - fill_n_normal T_FILL_2 ! 0x2c8 - fill_n_normal T_FILL_3 ! 0x2cc - fill_n_normal T_FILL_4 ! 0x2d0 - fill_n_normal T_FILL_5 ! 0x2d4 - fill_n_normal T_FILL_6 ! 0x2d8 - fill_n_normal T_FILL_7 ! 0x2dc - tl1_reserved 3 ! 0x2dd-0x2df + tl1_reserved 32 ! 0x2c0-0x2df tl1_fill_n_other: - fill_n_other T_FILL_0 ! 0x2e0 - fill_n_other T_FILL_1 ! 0x2e4 - fill_n_other T_FILL_2 ! 0x2e8 - fill_n_other T_FILL_3 ! 0x2ec - fill_n_other T_FILL_4 ! 0x2f0 - fill_n_other T_FILL_5 ! 0x2f4 - fill_n_other T_FILL_6 ! 0x2f8 - fill_n_other T_FILL_7 ! 0x2fc - tl1_reserved 3 ! 0x2fd-0x2ff -tl1_soft: - tl1_reserved 256 ! 0x300-0x3ff + tl1_reserved 32 ! 0x2e0-0x2ff /* From owner-p4-projects@FreeBSD.ORG Wed Feb 15 22:43:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE4FA16A423; Wed, 15 Feb 2006 22:43:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68A7116A420 for ; Wed, 15 Feb 2006 22:43:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AF9943D45 for ; Wed, 15 Feb 2006 22:43:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FMh2ah052689 for ; Wed, 15 Feb 2006 22:43:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FMh20U052686 for perforce@freebsd.org; Wed, 15 Feb 2006 22:43:02 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 22:43:02 GMT Message-Id: <200602152243.k1FMh20U052686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91843 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 22:43:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=91843 Change 91843 by millert@millert_ibook on 2006/02/15 22:43:01 Fix cust and pasto; there is no such thing as a "receive once" right Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#7 (text+ko) ==== @@ -134,11 +134,9 @@ { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND, "move_send" }, { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND_ONCE, "move_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV, "move_recv" }, - { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV_ONCE, "move_recv_once" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND, "hold_send" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND_ONCE, "hold_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV, "hold_recv" }, - { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV_ONCE, "hold_recv_once" }, { SECCLASS_MACH_TASK, MACH_TASK__TERMINATE, "terminate" }, { SECCLASS_MACH_TASK, MACH_TASK__SET_SPECIAL_PORT, "set_special_port" }, }; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#7 (text+ko) ==== @@ -611,11 +611,9 @@ #define MACH_PORT__MOVE_SEND 0x0000000000000080UL #define MACH_PORT__MOVE_SEND_ONCE 0x0000000000000100UL #define MACH_PORT__MOVE_RECV 0x0000000000000200UL -#define MACH_PORT__MOVE_RECV_ONCE 0x0000000000000400UL -#define MACH_PORT__HOLD_SEND 0x0000000000000800UL -#define MACH_PORT__HOLD_SEND_ONCE 0x0000000000001000UL -#define MACH_PORT__HOLD_RECV 0x0000000000002000UL -#define MACH_PORT__HOLD_RECV_ONCE 0x0000000000004000UL +#define MACH_PORT__HOLD_SEND 0x0000000000000400UL +#define MACH_PORT__HOLD_SEND_ONCE 0x0000000000000800UL +#define MACH_PORT__HOLD_RECV 0x0000000000001000UL #define MACH_TASK__TERMINATE 0x0000000000000001UL #define MACH_TASK__SET_SPECIAL_PORT 0x0000000000000002UL ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#6 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#8 (text+ko) ==== @@ -365,11 +365,9 @@ move_send move_send_once move_recv - move_recv_once hold_send hold_send_once hold_recv - hold_recv_once } class mach_task From owner-p4-projects@FreeBSD.ORG Thu Feb 16 00:30:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C97C516A423; Thu, 16 Feb 2006 00:30:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BEAC16A420 for ; Thu, 16 Feb 2006 00:30:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 497B943D46 for ; Thu, 16 Feb 2006 00:30:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1G0UGK7058113 for ; Thu, 16 Feb 2006 00:30:16 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1G0UFNI058105 for perforce@freebsd.org; Thu, 16 Feb 2006 00:30:15 GMT (envelope-from imp@freebsd.org) Date: Thu, 16 Feb 2006 00:30:15 GMT Message-Id: <200602160030.k1G0UFNI058105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91852 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 00:30:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=91852 Change 91852 by imp@imp_Speedy on 2006/02/16 00:29:30 Checkpoint start of pmc driver. Need to init clocks still. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#2 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#2 (text+ko) ==== @@ -43,173 +43,64 @@ #include #include #include -#include +#include -static struct at91st_softc { +static struct at91pmc_softc { bus_space_tag_t sc_st; bus_space_handle_t sc_sh; device_t dev; -} *timer_softc; +} *pmc_softc; #define RD4(off) \ - bus_space_read_4(timer_softc->sc_st, timer_softc->sc_sh, (off)) + bus_space_read_4(pmc_softc->sc_st, pmc_softc->sc_sh, (off)) #define WR4(off, val) \ - bus_space_write_4(timer_softc->sc_st, timer_softc->sc_sh, (off), (val)) - -static inline int -st_crtr(void) -{ - int cur1, cur2; - do { - cur1 = RD4(ST_CRTR); - cur2 = RD4(ST_CRTR); - } while (cur1 != cur2); - return (cur1); -} - -static unsigned at91st_get_timecount(struct timecounter *tc); + bus_space_write_4(pmc_softc->sc_st, pmc_softc->sc_sh, (off), (val)) -static struct timecounter at91st_timecounter = { - at91st_get_timecount, /* get_timecount */ - NULL, /* no poll_pps */ - 0xfffffu, /* counter_mask */ - 32768, /* frequency */ - "AT91RM9200 timer", /* name */ - 0 /* quality */ -}; - static int -at91st_probe(device_t dev) +at91pmc_probe(device_t dev) { - device_set_desc(dev, "ST"); + device_set_desc(dev, "PMC"); return (0); } static int -at91st_attach(device_t dev) +at91pmc_attach(device_t dev) { struct at91_softc *sc = device_get_softc(device_get_parent(dev)); - timer_softc = device_get_softc(dev); - timer_softc->sc_st = sc->sc_st; - timer_softc->dev = dev; - if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_ST_BASE, - AT91RM92_ST_SIZE, &timer_softc->sc_sh) != 0) + pmc_softc = device_get_softc(dev); + pmc_softc->sc_st = sc->sc_st; + pmc_softc->dev = dev; + if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_PMC_BASE, + AT91RM92_PMC_SIZE, &pmc_softc->sc_sh) != 0) panic("couldn't subregion timer registers"); - /* - * Real time counter increments every clock cycle, need to set before - * initializing clocks so that DELAY works. - */ - WR4(ST_RTMR, 1); + printf("SCSR: %x\n", RD4(PMC_SCSR)); + WR4(PMC_PCER, 0xffffffff); + printf("PCSR: %x\n", RD4(PMC_PCSR)); + printf("MOR: %x\n", RD4(CKGR_MOR)); + printf("PLLA: %x\n", RD4(CKGR_PLLAR)); + printf("PLLB: %x\n", RD4(CKGR_PLLBR)); + printf("MCFR: %x\n", RD4(CKGR_MCFR)); + printf("MCFR: %x\n", RD4(CKGR_MCFR)); + printf("MCFR: %x\n", RD4(CKGR_MCFR)); + printf("MCKR: %x\n", RD4(PMC_MCKR)); + printf("SR: %x\n", RD4(PMC_SR)); return (0); } -static device_method_t at91st_methods[] = { - DEVMETHOD(device_probe, at91st_probe), - DEVMETHOD(device_attach, at91st_attach), +static device_method_t at91pmc_methods[] = { + DEVMETHOD(device_probe, at91pmc_probe), + DEVMETHOD(device_attach, at91pmc_attach), {0, 0}, }; -static driver_t at91st_driver = { - "at91_st", - at91st_methods, - sizeof(struct at91st_softc), +static driver_t at91pmc_driver = { + "at91_pmc", + at91pmc_methods, + sizeof(struct at91pmc_softc), }; -static devclass_t at91st_devclass; +static devclass_t at91pmc_devclass; -DRIVER_MODULE(at91_st, atmelarm, at91st_driver, at91st_devclass, 0, 0); - -static unsigned -at91st_get_timecount(struct timecounter *tc) -{ - return (st_crtr()); -} - -static void -clock_intr(void *arg) -{ - struct trapframe *fp = arg; - - /* The interrupt is shared, so we have to make sure it's for us. */ - if (RD4(ST_SR) & ST_SR_PITS) - hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); -} - -void -cpu_initclocks(void) -{ - int rel_value; - struct resource *irq; - int rid = 0; - void *ih; - device_t dev = timer_softc->dev; - - if (32768 % hz) { - printf("Cannot get %d Hz clock; using 128Hz\n", hz); - hz = 128; - } - rel_value = 32768 / hz; - /* Disable all interrupts. */ - WR4(ST_IDR, 0xffffffff); - /* The system timer shares the system irq (1) */ - irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 1, 1, 1, - RF_ACTIVE | RF_SHAREABLE); - if (!irq) - panic("Unable to allocate irq for the system timer"); - else - bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, - clock_intr, NULL, &ih); - - WR4(ST_PIMR, rel_value); - - /* Enable PITS interrupts. */ - WR4(ST_IER, ST_SR_PITS); - tc_init(&at91st_timecounter); -} - -void -DELAY(int n) -{ - uint32_t start, end, cur; - - start = st_crtr(); - n = (n * 1000000) / 32768; - if (n <= 0) - n = 1; - end = (start + n) & ST_CRTR_MASK; - cur = start; - if (start > end) { - while (cur >= start || cur < end) - cur = st_crtr(); - } else { - while (cur < end) - cur = st_crtr(); - } -} - -void -cpu_reset(void) -{ - /* - * Reset the CPU by programmig the watchdog timer to reset the - * CPU after 128 'slow' clocks, or about ~4ms. Loop until - * the reset happens for safety. - */ - WR4(ST_WDMR, ST_WDMR_RSTEN | 2); - WR4(ST_CR, ST_CR_WDRST); - while (1) - continue; -} - -void -cpu_startprofclock(void) -{ -} - -void -cpu_stopprofclock(void) -{ -} - +DRIVER_MODULE(at91_pmc, atmelarm, at91pmc_driver, at91pmc_devclass, 0, 0); ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#14 (text+ko) ==== @@ -203,6 +203,9 @@ #define PIOD_OWDR (0xa00 + 164) /* Output write disable register */ #define PIOD_OWSR (0xa00 + 168) /* Output write status register */ +#define AT91RM92_PMC_BASE 0xffffd00 +#define AT91RM92_PMC_SIZE 0xc00 + /* IRQs : */ /* * 0: AIC From owner-p4-projects@FreeBSD.ORG Thu Feb 16 05:01:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CDF116A425; Thu, 16 Feb 2006 05:01:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 382A316A428 for ; Thu, 16 Feb 2006 05:01:49 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE74F43D49 for ; Thu, 16 Feb 2006 05:01:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1G51mPX086392 for ; Thu, 16 Feb 2006 05:01:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1G51mH4086389 for perforce@freebsd.org; Thu, 16 Feb 2006 05:01:48 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 16 Feb 2006 05:01:48 GMT Message-Id: <200602160501.k1G51mH4086389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 05:01:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=91863 Change 91863 by kmacy@kmacy_storage:sun4v_work on 2006/02/16 05:01:43 re-add tsb.c in anticipation of tsb manipulation MMU_SFSR no longer directly accessible - remove defines don't bother with manipulating tsb virtually remove tte bucket management - switching to 2 level page tables remove pmap temporary mappings - remove 256M hack for TSB remove pmap_map_tsb remove WATCHPOINT handling - not available ifdef out soon to be re-written functionality in tsb.c Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tlb.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/dump_machdep.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#4 (text+ko) ==== @@ -73,6 +73,7 @@ sun4v/sun4v/sys_machdep.c standard sun4v/sun4v/swtch.S standard sun4v/sun4v/tlb.c standard +sun4v/sun4v/tsb.c standard sun4v/sun4v/tick.c standard sun4v/sun4v/trap.c standard sun4v/sun4v/uio_machdep.c standard ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#3 (text+ko) ==== @@ -85,6 +85,8 @@ #define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) +#define likely(x) __builtin_expect((x),1) +#define unlikely(x) __builtin_expect((x),0) #endif #endif /* !_MACHINE_CPU_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#3 (text+ko) ==== @@ -52,7 +52,7 @@ #define _MACHINE_PARAM_H_ #ifndef MACHINE -#define MACHINE "sparc64" +#define MACHINE "sun4v" #endif #ifndef MACHINE_ARCH #define MACHINE_ARCH "sparc64" @@ -60,7 +60,7 @@ #define MID_MACHINE MID_SPARC64 #ifdef SMP -#define MAXCPU 16 +#define MAXCPU 32 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tlb.h#2 (text+ko) ==== @@ -75,24 +75,6 @@ #define TLB_CTX_USER_MIN (1) #define TLB_CTX_USER_MAX (8192) -#define MMU_SFSR_ASI_SHIFT (16) -#define MMU_SFSR_FT_SHIFT (7) -#define MMU_SFSR_E_SHIFT (6) -#define MMU_SFSR_CT_SHIFT (4) -#define MMU_SFSR_PR_SHIFT (3) -#define MMU_SFSR_W_SHIFT (2) -#define MMU_SFSR_OW_SHIFT (1) -#define MMU_SFSR_FV_SHIFT (0) - -#define MMU_SFSR_ASI_SIZE (8) -#define MMU_SFSR_FT_SIZE (6) -#define MMU_SFSR_CT_SIZE (2) - -#define MMU_SFSR_GET_ASI(sfsr) \ - (((sfsr) >> MMU_SFSR_ASI_SHIFT) & ((1UL << MMU_SFSR_ASI_SIZE) - 1)) -#define MMU_SFSR_W (1UL << MMU_SFSR_W_SHIFT) -#define MMU_SFSR_FV (1UL << MMU_SFSR_FV_SHIFT) - typedef void tlb_flush_user_t(void); struct pmap; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#2 (text+ko) ==== @@ -43,44 +43,26 @@ (TSB_BSHIFT - TSB_BUCKET_SHIFT - TTE_SHIFT) #define TSB_BUCKET_MASK ((1 << TSB_BUCKET_ADDRESS_BITS) - 1) -extern struct tte *tsb_kernel; extern vm_size_t tsb_kernel_mask; extern vm_size_t tsb_kernel_size; extern vm_paddr_t tsb_kernel_phys; -static __inline struct tte * -tsb_vpntobucket(pmap_t pm, vm_offset_t vpn) -{ - return (&pm->pm_tsb[(vpn & TSB_BUCKET_MASK) << TSB_BUCKET_SHIFT]); -} -static __inline struct tte * -tsb_vtobucket(pmap_t pm, u_long sz, vm_offset_t va) -{ - return (tsb_vpntobucket(pm, va >> TTE_PAGE_SHIFT(sz))); -} +typedef int (tsb_callback_t)(struct pmap *, struct pmap *, struct tte *, vm_offset_t); -static __inline struct tte * -tsb_kvpntotte(vm_offset_t vpn) -{ - return (&tsb_kernel[vpn & tsb_kernel_mask]); -} +void tsb_set_tte(vm_paddr_t tsb_phys, vm_offset_t va, uint64_t tsb_tag, uint64_t tsb_data); -static __inline struct tte * -tsb_kvtotte(vm_offset_t va) -{ - return (tsb_kvpntotte(va >> PAGE_SHIFT)); -} +struct tte *tsb_tte_lookup(pmap_t pm, vm_offset_t va); -typedef int (tsb_callback_t)(struct pmap *, struct pmap *, struct tte *, - vm_offset_t); +void tsb_tte_remove(struct tte *stp); -struct tte *tsb_tte_lookup(pmap_t pm, vm_offset_t va); -void tsb_tte_remove(struct tte *stp); -struct tte *tsb_tte_enter(pmap_t pm, vm_page_t m, vm_offset_t va, u_long sz, +struct tte *tsb_tte_enter(pmap_t pm, vm_page_t m, vm_offset_t va, u_long sz, u_long data); -void tsb_tte_local_remove(struct tte *tp); -void tsb_foreach(pmap_t pm1, pmap_t pm2, vm_offset_t start, vm_offset_t end, - tsb_callback_t *callback); + +void tsb_tte_local_remove(struct tte *tp); + +void tsb_foreach(pmap_t pm1, pmap_t pm2, vm_offset_t start, vm_offset_t end, + tsb_callback_t *callback); + #endif /* !_MACHINE_TSB_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/dump_machdep.c#2 (text+ko) ==== @@ -204,7 +204,6 @@ hdr.dh_hdr_size = hdrsize; hdr.dh_tsb_pa = tsb_kernel_phys; hdr.dh_tsb_size = tsb_kernel_size; - hdr.dh_tsb_mask = tsb_kernel_mask; hdr.dh_nregions = nreg; if (buf_write(di, (char *)&hdr, sizeof(hdr)) != 0) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -79,11 +80,6 @@ int sparc64_nmemreg; -static vm_offset_t pmap_idle_map; -static vm_offset_t pmap_temp_map_1; -static vm_offset_t pmap_temp_map_2; - - /* * First and last available kernel virtual addresses. */ @@ -92,10 +88,8 @@ vm_offset_t kernel_vm_end; vm_offset_t vm_max_kernel_address; -struct tte *tsb_kernel; -vm_size_t tsb_kernel_mask; -vm_size_t tsb_kernel_size; -vm_paddr_t tsb_kernel_phys; + + /* * Kernel pmap. @@ -121,6 +115,8 @@ */ #define PMAP_TSB_THRESH ((TSB_SIZE / 2) * PAGE_SIZE) +#define PANIC_IF(exp) if (unlikely(exp)) {panic("%s: %s:%d", #exp, __FILE__, __LINE__);} + /* * Kernel MMU interface */ @@ -175,22 +171,10 @@ vm_paddr_t pa; int i; - /* XXX start from 32MB offset for really large requests */ printf("looking for size %lx\n", size); size = round_page(size); - i = 0; -#ifndef NO_SUN4V_HACK - /* set us up to return memory on a 256M boundary */ - if (size > PAGE_SIZE_4M) { - i = phys_avail[1]; /* current end */ - phys_avail[1] = PAGE_SIZE_256M; - phys_avail[2] = PAGE_SIZE_256M; - phys_avail[3] = i; - i = 2; - } -#endif - for (; phys_avail[i + 1] != 0; i += 2) { + for (i = 0; phys_avail[i + 1] != 0; i += 2) { if (phys_avail[i + 1] - phys_avail[i] < size) continue; pa = phys_avail[i]; @@ -224,17 +208,12 @@ pmap_bootstrap(vm_offset_t ekva) { struct pmap *pm; - struct tte *tp; - vm_offset_t off; - vm_offset_t va; + vm_offset_t off, va; vm_paddr_t pa; - vm_size_t physsz; - vm_size_t virtsz; - ihandle_t pmem; - ihandle_t vmem; - int sz; - int i; - int j; + vm_size_t physsz, virtsz, scrubbed; + ihandle_t pmem, vmem; + int i, sz, j; + /* * Find out what physical memory is available from the prom and * initialize the phys_avail array. This must be done before @@ -282,10 +261,9 @@ * Calculate the size of kernel virtual memory, and the size and mask * for the kernel tsb. */ - virtsz = roundup(physsz, PAGE_SIZE_256M << (PAGE_SHIFT - TTE_SHIFT)); + virtsz = roundup(physsz, PAGE_SIZE_4M << (PAGE_SHIFT - TTE_SHIFT)); vm_max_kernel_address = VM_MIN_KERNEL_ADDRESS + virtsz; - tsb_kernel_size = virtsz >> (PAGE_SHIFT - TTE_SHIFT); - tsb_kernel_mask = (tsb_kernel_size >> TTE_SHIFT) - 1; + tsb_kernel_size = PAGE_SIZE_4M; /* * Allocate the kernel tsb and lock it in the tlb. @@ -294,13 +272,7 @@ if (pa & PAGE_MASK_4M) panic("pmap_bootstrap: tsb unaligned\n"); tsb_kernel_phys = pa; - tsb_kernel = (struct tte *)(VM_MIN_KERNEL_ADDRESS - tsb_kernel_size); - hv_cnputchar('B'); - pmap_map_tsb(); - hv_cnputchar('C'); - printf("bzeroing\n"); - bzero(tsb_kernel, tsb_kernel_size); - printf("bzeroed\n"); + PANIC_IF(hv_mem_scrub(tsb_kernel_phys, tsb_kernel_size, &scrubbed)); /* * Allocate and map the message buffer. */ @@ -308,45 +280,6 @@ msgbufp = (struct msgbuf *)TLB_PHYS_TO_DIRECT(msgbuf_phys); /* - * Patch the virtual address and the tsb mask into the trap table. - */ - -#define SETHI(rd, imm22) \ - (EIF_OP(IOP_FORM2) | EIF_F2_RD(rd) | EIF_F2_OP2(INS0_SETHI) | \ - EIF_IMM((imm22) >> 10, 22)) -#define OR_R_I_R(rd, imm13, rs1) \ - (EIF_OP(IOP_MISC) | EIF_F3_RD(rd) | EIF_F3_OP3(INS2_OR) | \ - EIF_F3_RS1(rs1) | EIF_F3_I(1) | EIF_IMM(imm13, 13)) - -#define PATCH(addr) do { \ - if (addr[0] != SETHI(IF_F2_RD(addr[0]), 0x0) || \ - addr[1] != OR_R_I_R(IF_F3_RD(addr[1]), 0x0, IF_F3_RS1(addr[1])) || \ - addr[2] != SETHI(IF_F2_RD(addr[2]), 0x0)) \ - panic("pmap_boostrap: patched instructions have changed"); \ - addr[0] |= EIF_IMM((tsb_kernel_mask) >> 10, 22); \ - addr[1] |= EIF_IMM(tsb_kernel_mask, 10); \ - addr[2] |= EIF_IMM(((vm_offset_t)tsb_kernel) >> 10, 22); \ - flush(addr); \ - flush(addr + 1); \ - flush(addr + 2); \ -} while (0) - - /* - * Enter fake 8k pages for the 4MB kernel pages, so that - * pmap_kextract() will work for them. - */ - for (i = 0; i < kernel_tlb_slots; i++) { - pa = kernel_tlbs[i].te_pa; - va = kernel_tlbs[i].te_va; - for (off = 0; off < PAGE_SIZE_4M; off += PAGE_SIZE) { - tp = tsb_kvtotte(va + off); - tp->tte_vpn = TV_VPN(va + off, TS_8K); - tp->tte_data = VTD_V | VTD_PA(pa + off) | VTD_REF | - VTD_SW | VTD_CP | VTD_CV | VTD_P | VTD_W | VTD_8K; - } - } - - /* * Set the start and end of kva. The kernel is loaded at the first * available 4 meg super page, so round up to the end of the page. */ @@ -355,16 +288,6 @@ kernel_vm_end = vm_max_kernel_address; /* - * Allocate kva space for temporary mappings. - */ - pmap_idle_map = virtual_avail; - virtual_avail += PAGE_SIZE * DCACHE_COLORS; - pmap_temp_map_1 = virtual_avail; - virtual_avail += PAGE_SIZE * DCACHE_COLORS; - pmap_temp_map_2 = virtual_avail; - virtual_avail += PAGE_SIZE * DCACHE_COLORS; - - /* * Allocate a kernel stack with guard page for thread0 and map it into * the kernel tsb. We must ensure that the virtual address is coloured * properly, since we're allocating from phys_avail so the memory won't @@ -382,10 +305,7 @@ for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; va = kstack0 + i * PAGE_SIZE; - tp = tsb_kvtotte(va); - tp->tte_vpn = TV_VPN(va, TS_8K); - tp->tte_data = VTD_V | VTD_PA(pa) | VTD_REF | VTD_SW | - VTD_CP | VTD_CV | VTD_P | VTD_W | VTD_8K; + UNIMPLEMENTED; } /* @@ -422,12 +342,10 @@ for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { va = translations[i].om_start + off; - tp = tsb_kvtotte(va); - tp->tte_vpn = TV_VPN(va, TS_8K); - tp->tte_data = - ((translations[i].om_tte & - ~(TD_SOFT_MASK << TD_SOFT_SHIFT)) | TD_EXEC) + + pa = ((translations[i].om_tte & + ~(TD_SOFT_MASK << TD_SOFT_SHIFT)) | TD_EXEC) + off; + tsb_set_tte(tsb_kernel_phys, va, TV_VPN(va, TS_8K), pa); } } @@ -614,45 +532,6 @@ return (0); } -void -pmap_map_tsb(void) -{ - vm_offset_t va; - vm_paddr_t pa; - u_long data; - u_long s; - int i, ret; - - s = intr_disable(); - - /* - * Map a 256MB TSB page - */ - for (i = 0; i < tsb_kernel_size; i += 64*PAGE_SIZE_4M) { - va = (vm_offset_t)tsb_kernel + i; - pa = tsb_kernel_phys + i; - data = VTD_V | VTD_PA(pa) | VTD_CP | VTD_CV | VTD_P | VTD_W | VTD_256M; - printf("va: %lx tte: %lx\n", va, data); - ret = hv_mmu_map_perm_addr((char *)va, 0, data, MAP_DTLB); - if (ret) -#ifdef notyet - panic("hv_mmu_map_perm_addr failed: %d\n", ret); -#else - printf("hv_mmu_map_perm_addr failed: %d\n", ret); -#endif - } -#ifdef notyet - /* XXX SUN4V_FIXME */ - /* - * Set the secondary context to be the kernel context (needed for - * fp block operations in the kernel and the cache code). - */ - stxa(AA_DMMU_SCXR, ASI_DMMU, TLB_CTX_KERNEL); - membar(Sync); -#endif - intr_restore(s); -} - int pmap_mincore(pmap_t pmap, vm_offset_t addr) { ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#2 (text+ko) ==== @@ -312,12 +312,6 @@ error = (kdb_trap(tf->tf_type, 0, tf) == 0); TF_DONE(tf); break; -#ifdef notyet - case T_PA_WATCHPOINT: - case T_VA_WATCHPOINT: - error = db_watch_trap(tf); - break; -#endif #endif case T_DATA_MISS: case T_DATA_PROTECTION: @@ -326,6 +320,7 @@ break; case T_DATA_EXCEPTION: case T_MEM_ADDRESS_NOT_ALIGNED: +#ifdef notyet if ((tf->tf_sfsr & MMU_SFSR_FV) != 0 && MMU_SFSR_GET_ASI(tf->tf_sfsr) == ASI_AIUP) { if (tf->tf_tpc >= (u_long)copy_nofault_begin && @@ -343,26 +338,11 @@ break; } } +#endif error = 1; break; case T_DATA_ERROR: - /* - * handle PCI poke/peek as per UltraSPARC IIi - * User's Manual 16.2.1. - */ -#define MEMBARSYNC_INST ((u_int32_t)0x8143e040) - if (tf->tf_tpc > (u_long)fas_nofault_begin && - tf->tf_tpc < (u_long)fas_nofault_end && - *(u_int32_t *)tf->tf_tpc == MEMBARSYNC_INST && - ((u_int32_t *)tf->tf_tpc)[-2] == MEMBARSYNC_INST) { - cache_flush(); - cache_enable(); - tf->tf_tpc = (u_long)fas_fault; - tf->tf_tnpc = tf->tf_tpc + 4; - error = 0; - break; - } -#undef MEMBARSYNC_INST + UNIMPLEMENTED; error = 1; break; default: ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#2 (text+ko) ==== @@ -74,19 +74,18 @@ PMAP_STATS_VAR(tsb_nenter_u_oc); PMAP_STATS_VAR(tsb_nforeach); -struct tte *tsb_kernel; -vm_size_t tsb_kernel_mask; vm_size_t tsb_kernel_size; vm_paddr_t tsb_kernel_phys; + struct tte * tsb_tte_lookup(pmap_t pm, vm_offset_t va) { +#ifdef notyet struct tte *bucket; struct tte *tp; u_long sz; u_int i; - if (pm == kernel_pmap) { PMAP_STATS_INC(tsb_nlookup_k); tp = tsb_kvtotte(va); @@ -104,12 +103,14 @@ } } } +#endif return (NULL); } struct tte * tsb_tte_enter(pmap_t pm, vm_page_t m, vm_offset_t va, u_long sz, u_long data) { +#if 0 struct tte *bucket; struct tte *rtp; struct tte *tp; @@ -186,6 +187,8 @@ tp->tte_data = data; return (tp); +#endif + return (0); } /* From owner-p4-projects@FreeBSD.ORG Thu Feb 16 05:48:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19B8016A423; Thu, 16 Feb 2006 05:48:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9B6B16A420 for ; Thu, 16 Feb 2006 05:48:45 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85DDA43D45 for ; Thu, 16 Feb 2006 05:48:45 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1G5mjQ2088174 for ; Thu, 16 Feb 2006 05:48:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1G5mjhQ088171 for perforce@freebsd.org; Thu, 16 Feb 2006 05:48:45 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 16 Feb 2006 05:48:45 GMT Message-Id: <200602160548.k1G5mjhQ088171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91864 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 05:48:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91864 Change 91864 by kmacy@kmacy_storage:sun4v_work on 2006/02/16 05:47:44 T1 has physically indexed caches - allowing us to gut the virtual cache coloring but it does have a 3MB 12-way L2 so it could benefit from physical page coloring set the values in identcpu.c - ultimately want this to be keyed off of the machine description Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cache.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/identcpu.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mem.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/uio_machdep.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cache.h#2 (text+ko) ==== @@ -47,13 +47,6 @@ #include -#define DCACHE_COLOR_BITS (1) -#define DCACHE_COLORS (1 << DCACHE_COLOR_BITS) -#define DCACHE_COLOR_MASK (DCACHE_COLORS - 1) -#define DCACHE_COLOR(va) (((va) >> PAGE_SHIFT) & DCACHE_COLOR_MASK) -#define DCACHE_OTHER_COLOR(color) \ - ((color) ^ DCACHE_COLOR_BITS) - #define DC_TAG_SHIFT 2 #define DC_VALID_SHIFT 0 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#3 (text+ko) ==== @@ -52,8 +52,6 @@ struct md_page { TAILQ_HEAD(, tte) tte_list; struct pmap *pmap; - uint32_t colors[DCACHE_COLORS]; - int32_t color; uint32_t flags; }; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/identcpu.c#3 (text+ko) ==== @@ -30,7 +30,11 @@ void setPQL2(int *const size, int *const ways) { - return; + /* XXX SUN4V_FIXME - this is hardcoded for the T1 + * this info should really be pulled from the machine description + */ + *size = 3*1024*1024; + *ways = 12; } void ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mem.c#2 (text+ko) ==== @@ -91,7 +91,6 @@ vm_paddr_t pa; vm_size_t cnt; vm_page_t m; - int color; int error; int i; @@ -135,12 +134,9 @@ if (m != NULL) { if (ova == 0) { ova = kmem_alloc_wait(kernel_map, - PAGE_SIZE * DCACHE_COLORS); + PAGE_SIZE); } - if ((color = m->md.color) == -1) - va = ova; - else - va = ova + color * PAGE_SIZE; + va = ova; pmap_qenter(va, &m, 1); error = uiomove((void *)(va + off), cnt, uio); @@ -177,7 +173,7 @@ /* else panic! */ } if (ova != 0) - kmem_free_wakeup(kernel_map, ova, PAGE_SIZE * DCACHE_COLORS); + kmem_free_wakeup(kernel_map, ova, PAGE_SIZE); return (error); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#5 (text+ko) ==== @@ -273,6 +273,7 @@ panic("pmap_bootstrap: tsb unaligned\n"); tsb_kernel_phys = pa; PANIC_IF(hv_mem_scrub(tsb_kernel_phys, tsb_kernel_size, &scrubbed)); + PANIC_IF(scrubbed != tsb_kernel_size); /* * Allocate and map the message buffer. */ @@ -293,15 +294,11 @@ * properly, since we're allocating from phys_avail so the memory won't * have an associated vm_page_t. */ - pa = pmap_bootstrap_alloc(roundup(KSTACK_PAGES, DCACHE_COLORS) * - PAGE_SIZE); + pa = pmap_bootstrap_alloc(KSTACK_PAGES*PAGE_SIZE); kstack0_phys = pa; - virtual_avail += roundup(KSTACK_GUARD_PAGES, DCACHE_COLORS) * - PAGE_SIZE; + virtual_avail += KSTACK_GUARD_PAGES * PAGE_SIZE; kstack0 = virtual_avail; - virtual_avail += roundup(KSTACK_PAGES, DCACHE_COLORS) * PAGE_SIZE; - KASSERT(DCACHE_COLOR(kstack0) == DCACHE_COLOR(kstack0_phys), - ("pmap_bootstrap: kstack0 miscoloured")); + virtual_avail += KSTACK_PAGES * PAGE_SIZE; for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; va = kstack0 + i * PAGE_SIZE; @@ -456,7 +453,7 @@ void pmap_growkernel(vm_offset_t addr) { - panic("pmap_growkernel: can't grow kernel"); + } void @@ -567,7 +564,6 @@ { TAILQ_INIT(&m->md.tte_list); - m->md.color = DCACHE_COLOR(VM_PAGE_TO_PHYS(m)); m->md.flags = 0; m->md.pmap = NULL; } @@ -693,7 +689,9 @@ void pmap_zero_page(vm_page_t m) { - UNIMPLEMENTED; + uint64_t bytes_zeroed; + PANIC_IF(hv_mem_scrub(VM_PAGE_TO_PHYS(m), PAGE_SIZE, &bytes_zeroed)); + PANIC_IF(bytes_zeroed != PAGE_SIZE); } void @@ -705,5 +703,7 @@ void pmap_zero_page_idle(vm_page_t m) { - UNIMPLEMENTED; + uint64_t bytes_zeroed; + PANIC_IF(hv_mem_scrub(VM_PAGE_TO_PHYS(m), PAGE_SIZE, &bytes_zeroed)); + PANIC_IF(bytes_zeroed != PAGE_SIZE); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/uio_machdep.c#2 (text+ko) ==== @@ -92,13 +92,8 @@ cnt = ulmin(cnt, PAGE_SIZE - page_offset); m = ma[offset >> PAGE_SHIFT]; pa = VM_PAGE_TO_PHYS(m); - if (m->md.color != DCACHE_COLOR(pa)) { - sf = sf_buf_alloc(m, 0); - cp = (char *)sf_buf_kva(sf) + page_offset; - } else { - sf = NULL; - cp = (char *)TLB_PHYS_TO_DIRECT(pa) + page_offset; - } + sf = NULL; + cp = (char *)TLB_PHYS_TO_DIRECT(pa) + page_offset; switch (uio->uio_segflg) { case UIO_USERSPACE: if (ticks - PCPU_GET(switchticks) >= hogticks) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#3 (text+ko) ==== @@ -485,13 +485,6 @@ } pa = VM_PAGE_TO_PHYS(m); - if (m->md.color != DCACHE_COLOR(pa)) { - KASSERT(m->md.colors[0] == 0 && m->md.colors[1] == 0, - ("uma_small_alloc: free page still has mappings!")); - PMAP_STATS_INC(uma_nsmall_alloc_oc); - m->md.color = DCACHE_COLOR(pa); - dcache_page_inval(pa); - } va = (void *)TLB_PHYS_TO_DIRECT(pa); if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) bzero(va, PAGE_SIZE); From owner-p4-projects@FreeBSD.ORG Thu Feb 16 08:39:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CB8516A423; Thu, 16 Feb 2006 08:39:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0553B16A420 for ; Thu, 16 Feb 2006 08:39:20 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A361443D4C for ; Thu, 16 Feb 2006 08:39:19 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1G8dJiS094430 for ; Thu, 16 Feb 2006 08:39:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1G8dIRA094425 for perforce@freebsd.org; Thu, 16 Feb 2006 08:39:18 GMT (envelope-from imp@freebsd.org) Date: Thu, 16 Feb 2006 08:39:18 GMT Message-Id: <200602160839.k1G8dIRA094425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 08:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=91871 Change 91871 by imp@imp_harmony on 2006/02/16 08:38:32 IFC @91870 Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/machdep.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#8 integrate .. //depot/projects/arm/src/sys/conf/files.i386#10 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/arm/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#15 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#6 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#7 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/arm/src/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/arm/src/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#7 integrate .. //depot/projects/arm/src/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/mii.c#3 integrate .. //depot/projects/arm/src/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/arm/src/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/arm/src/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/arm/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#8 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/arm/src/sys/modules/Makefile#12 integrate .. //depot/projects/arm/src/sys/net/if_media.c#3 integrate .. //depot/projects/arm/src/sys/net/if_media.h#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#8 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_pcn.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_rl.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_sf.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_sis.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_sk.c#5 integrate .. //depot/projects/arm/src/sys/pci/if_ste.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_vr.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_wb.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_xl.c#5 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#5 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/eeprom.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/arm/src/sys/sys/proc.h#9 integrate .. //depot/projects/arm/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#8 integrate .. //depot/projects/arm/src/usr.sbin/config/config.5#2 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/machdep.c#4 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.236 2005/10/14 12:43:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.237 2006/02/14 14:50:10 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -250,7 +250,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); - realmem = alpha_ptob(Maxmem); + realmem = Maxmem; /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.143 2006/01/01 05:35:57 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.144 2006/02/15 14:48:59 dwmalone Exp $"); #include "opt_cpu.h" @@ -224,8 +224,8 @@ "\003RSVD2" /* "Reserved" bit 2 */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ - "\006" /* Machine specific registers */ - "\007" /* Physical address extension */ + "\006VMX" /* Virtual Machine Extensions */ + "\007" "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ "\012" ==== //depot/projects/arm/src/sys/conf/files.amd64#8 (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.amd64,v 1.81 2006/01/24 21:13:50 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.82 2006/02/13 17:56:24 ambrisko Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -155,6 +155,9 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_pci.c optional ipmi pci dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa ==== //depot/projects/arm/src/sys/conf/files.i386#10 (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.i386,v 1.551 2006/01/31 23:11:34 rik Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.552 2006/02/13 17:56:24 ambrisko Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -183,6 +183,9 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_pci.c optional ipmi pci dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/lnc/if_lnc_isa.c optional lnc isa dev/mem/memutil.c optional mem ==== //depot/projects/arm/src/sys/dev/asr/asr.c#7 (text+ko) ==== @@ -165,7 +165,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.76 2006/02/05 05:05:27 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.77 2006/02/12 06:57:41 scottl Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -387,7 +387,7 @@ struct cdev *ha_devt; } Asr_softc_t; -static Asr_softc_t * Asr_softc; +static Asr_softc_t *Asr_softc_list; /* * Prototypes of the routines we have in this object. @@ -1970,7 +1970,7 @@ sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_WAITOK | M_ZERO)) == NULL) { return (ENOMEM); } - for (ha = Asr_softc; ha; ha = ha->ha_next) { + for (ha = Asr_softc_list; ha; ha = ha->ha_next) { ++SystemTable->NumberEntries; } if ((Message_Ptr = (PI2O_EXEC_SYS_TAB_SET_MESSAGE)malloc ( @@ -2001,7 +2001,7 @@ &(Message_Ptr->StdMessageFrame)) & 0xF0) >> 2)); SG(sg, 0, I2O_SGL_FLAGS_DIR, SystemTable, sizeof(I2O_SET_SYSTAB_HEADER)); ++sg; - for (ha = Asr_softc; ha; ha = ha->ha_next) { + for (ha = Asr_softc_list; ha; ha = ha->ha_next) { SG(sg, 0, ((ha->ha_next) ? (I2O_SGL_FLAGS_DIR) @@ -2408,7 +2408,7 @@ unit = device_get_unit(dev); sc->ha_dev = dev; - if (Asr_softc == NULL) { + if (Asr_softc_list == NULL) { /* * Fixup the OS revision as saved in the dptsig for the * engine (dptioctl.h) to pick up. @@ -2420,7 +2420,7 @@ */ LIST_INIT(&(sc->ha_ccb)); /* Link us into the HA list */ - for (ha = &Asr_softc; *ha; ha = &((*ha)->ha_next)); + for (ha = &Asr_softc_list; *ha; ha = &((*ha)->ha_next)); *(ha) = sc; /* ==== //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.157 2006/02/09 20:54:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.158 2006/02/13 13:47:58 sos Exp $"); #include "opt_ata.h" #include @@ -1658,6 +1658,18 @@ RF_ACTIVE))) { /* is AHCI or RAID mode enabled in BIOS ? */ if (pci_read_config(dev, 0x90, 1) & 0xc0) { + + /* reset AHCI controller */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); + DELAY(1000000); + if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { + bus_release_resource(dev, ctlr->r_type2, + ctlr->r_rid2, ctlr->r_res2); + device_printf(dev, "AHCI controller reset failure\n"); + return ENXIO; + } + /* enable AHCI mode */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, ATA_AHCI_GHC_AE); ==== //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.12 2006/02/09 20:49:55 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.13 2006/02/13 18:40:53 sam Exp $"); /* * John Bicket's SampleRate control algorithm. @@ -654,8 +654,7 @@ * A fixed rate is to be used; ic_fixed_rate is an * index into the supported rate set. Convert this * to the index into the negotiated rate set for - * the node. We know the rate is there because the - * rate set is checked when the station associates. + * the node. */ const struct ieee80211_rateset *rs = &ic->ic_sup_rates[ic->ic_curmode]; @@ -666,7 +665,7 @@ ; KASSERT(srate >= 0, ("fixed rate %d not in rate set", ic->ic_fixed_rate)); - sn->static_rate_ndx = srate; + sn->static_rate_ndx = srate; } DPRINTF(sc, "%s: %s size 1600 rate/tt", __func__, ether_sprintf(ni->ni_macaddr)); ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.126 2006/02/10 19:07:08 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.135 2006/02/15 18:36:52 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -256,13 +256,17 @@ if (sc->sc_debug & ATH_DEBUG_KEYCACHE) \ ath_keyprint(__func__, ix, hk, mac); \ } while (0) -static void ath_printrxbuf(struct ath_buf *bf, int); -static void ath_printtxbuf(struct ath_buf *bf, int); +static void ath_printrxbuf(struct ath_buf *bf, u_int ix, int); +static void ath_printtxbuf(struct ath_buf *bf, u_int qnum, u_int ix, int done); #else #define IFF_DUMPPKTS(sc, m) \ ((sc->sc_ifp->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) -#define DPRINTF(m, fmt, ...) -#define KEYPRINTF(sc, k, ix, mac) +#define DPRINTF(sc, m, fmt, ...) do { \ + (void) sc; \ +} while (0) +#define KEYPRINTF(sc, k, ix, mac) do { \ + (void) sc; \ +} while (0) #endif MALLOC_DEFINE(M_ATHDEV, "athdev", "ath driver dma buffers"); @@ -394,7 +398,6 @@ TASK_INIT(&sc->sc_rxtask, 0, ath_rx_proc, sc); TASK_INIT(&sc->sc_rxorntask, 0, ath_rxorn_proc, sc); - TASK_INIT(&sc->sc_fataltask, 0, ath_fatal_proc, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); TASK_INIT(&sc->sc_radartask, 0, ath_radar_proc, sc); @@ -745,15 +748,9 @@ DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status); status &= sc->sc_imask; /* discard unasked for bits */ if (status & HAL_INT_FATAL) { - /* - * Fatal errors are unrecoverable. Typically - * these are caused by DMA errors. Unfortunately - * the exact reason is not (presently) returned - * by the hal. - */ sc->sc_stats.ast_hardware++; ath_hal_intrset(ah, 0); /* disable intr's until reset */ - taskqueue_enqueue(sc->sc_tq, &sc->sc_fataltask); + ath_fatal_proc(sc, 0); } else if (status & HAL_INT_RXORN) { sc->sc_stats.ast_rxorn++; ath_hal_intrset(ah, 0); /* disable intr's until reset */ @@ -812,8 +809,21 @@ { struct ath_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; + u_int32_t *state; + u_int32_t len; if_printf(ifp, "hardware error; resetting\n"); + /* + * Fatal errors are unrecoverable. Typically these + * are caused by DMA errors. Collect h/w state from + * the hal so we can diagnose what's going on. + */ + if (ath_hal_getfatalstate(sc->sc_ah, &state, &len)) { + KASSERT(len >= 6*sizeof(u_int32_t), ("len %u bytes", len)); + if_printf(ifp, "0x%08x 0x%08x 0x%08x, 0x%08x 0x%08x 0x%08x\n", + state[0], state[1] , state[2], state[3], + state[4], state[5]); + } ath_reset(ifp); } @@ -2004,10 +2014,10 @@ } /* * Check if the previous beacon has gone out. If - * not don't don't try to post another, skip this - * period and wait for the next. Missed beacons - * indicate a problem and should not occur. If we - * miss too many consecutive beacons reset the device. + * not don't try to post another, skip this period + * and wait for the next. Missed beacons indicate + * a problem and should not occur. If we miss too + * many consecutive beacons reset the device. */ if (ath_hal_numtxpending(ah, sc->sc_bhalq) != 0) { sc->sc_bmisscount++; @@ -2562,7 +2572,6 @@ rssi = HAL_EP_RND(avgrssi, HAL_RSSI_EP_MULTIPLIER); else rssi = ni->ni_rssi; - /* NB: theoretically we shouldn't need this, but be paranoid */ return rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; #undef HAL_EP_RND } @@ -2824,7 +2833,7 @@ bf->bf_daddr, PA2DESC(sc, ds->ds_link)); #ifdef AR_DEBUG if (sc->sc_debug & ATH_DEBUG_RECV_DESC) - ath_printrxbuf(bf, status == HAL_OK); + ath_printrxbuf(bf, 0, status == HAL_OK); #endif if (status == HAL_EINPROGRESS) break; @@ -2910,7 +2919,7 @@ /* * Sync and unmap the frame. At this point we're * committed to passing the mbuf somewhere so clear - * bf_m; this means a new sk_buff must be allocated + * bf_m; this means a new mbuf must be allocated * when the rx descriptor is setup again to receive * another frame. */ @@ -3766,7 +3775,6 @@ txq->axq_intrcnt = 0; /* reset periodic desc intr count */ bf = STAILQ_FIRST(&txq->axq_q); if (bf == NULL) { - txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); break; } @@ -3775,13 +3783,15 @@ status = ath_hal_txprocdesc(ah, ds); #ifdef AR_DEBUG if (sc->sc_debug & ATH_DEBUG_XMIT_DESC) - ath_printtxbuf(bf, status == HAL_OK); + ath_printtxbuf(bf, txq->axq_qnum, 0, status == HAL_OK); #endif if (status == HAL_EINPROGRESS) { ATH_TXQ_UNLOCK(txq); break; } ATH_TXQ_REMOVE_HEAD(txq, bf_list); + if (txq->axq_depth == 0) + txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); ni = bf->bf_node; @@ -3852,8 +3862,9 @@ static __inline int txqactive(struct ath_hal *ah, int qnum) { - /* XXX not yet */ - return 1; + u_int32_t txqs = 1<sc_lastrx = ath_hal_gettsf64(sc->sc_ah); if (txqactive(sc->sc_ah, sc->sc_cabq->axq_qnum)) ath_tx_processq(sc, sc->sc_cabq); - ath_tx_processq(sc, sc->sc_cabq); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_tx_timer = 0; @@ -3949,15 +3959,18 @@ static void ath_tx_draintxq(struct ath_softc *sc, struct ath_txq *txq) { +#ifdef AR_DEBUG struct ath_hal *ah = sc->sc_ah; +#endif struct ieee80211_node *ni; struct ath_buf *bf; + u_int ix; /* * NB: this assumes output has been stopped and * we do not need to block ath_tx_tasklet */ - for (;;) { + for (ix = 0;; ix++) { ATH_TXQ_LOCK(txq); bf = STAILQ_FIRST(&txq->axq_q); if (bf == NULL) { @@ -3969,7 +3982,7 @@ ATH_TXQ_UNLOCK(txq); #ifdef AR_DEBUG if (sc->sc_debug & ATH_DEBUG_RESET) - ath_printtxbuf(bf, + ath_printtxbuf(bf, txq->axq_qnum, ix, ath_hal_txprocdesc(ah, bf->bf_desc) == HAL_OK); #endif /* AR_DEBUG */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); @@ -4047,15 +4060,18 @@ #ifdef AR_DEBUG if (sc->sc_debug & (ATH_DEBUG_RESET | ATH_DEBUG_FATAL)) { struct ath_buf *bf; + u_int ix; printf("%s: rx queue %p, link %p\n", __func__, (caddr_t)(uintptr_t) ath_hal_getrxbuf(ah), sc->sc_rxlink); + ix = 0; STAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) { struct ath_desc *ds = bf->bf_desc; HAL_STATUS status = ath_hal_rxprocdesc(ah, ds, bf->bf_daddr, PA2DESC(sc, ds->ds_link)); if (status == HAL_OK || (sc->sc_debug & ATH_DEBUG_FATAL)) - ath_printrxbuf(bf, status == HAL_OK); + ath_printrxbuf(bf, ix, status == HAL_OK); + ix++; } } #endif @@ -4837,34 +4853,37 @@ #ifdef AR_DEBUG static void -ath_printrxbuf(struct ath_buf *bf, int done) +ath_printrxbuf(struct ath_buf *bf, u_int ix, int done) { struct ath_desc *ds; int i; for (i = 0, ds = bf->bf_desc; i < bf->bf_nseg; i++, ds++) { - printf("R%d (%p %p) L:%08x D:%08x %08x %08x %08x %08x %c\n", - i, ds, (struct ath_desc *)bf->bf_daddr + i, + printf("R[%2u] (DS.V:%p DS.P:%p) L:%08x D:%08x%s\n" + " %08x %08x %08x %08x\n", + ix, ds, (struct ath_desc *)bf->bf_daddr + i, ds->ds_link, ds->ds_data, + !done ? "" : (ds->ds_rxstat.rs_status == 0) ? " *" : " !", ds->ds_ctl0, ds->ds_ctl1, - ds->ds_hw[0], ds->ds_hw[1], - !done ? ' ' : (ds->ds_rxstat.rs_status == 0) ? '*' : '!'); + ds->ds_hw[0], ds->ds_hw[1]); } } static void -ath_printtxbuf(struct ath_buf *bf, int done) +ath_printtxbuf(struct ath_buf *bf, u_int qnum, u_int ix, int done) { struct ath_desc *ds; int i; + printf("Q%u[%3u]", qnum, ix); for (i = 0, ds = bf->bf_desc; i < bf->bf_nseg; i++, ds++) { - printf("T%d (%p %p) L:%08x D:%08x %08x %08x %08x %08x %08x %08x %c\n", - i, ds, (struct ath_desc *)bf->bf_daddr + i, - ds->ds_link, ds->ds_data, + printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:04%x%s\n" + " %08x %08x %08x %08x %08x %08x\n", + ds, (struct ath_desc *)bf->bf_daddr + i, + ds->ds_link, ds->ds_data, bf->bf_flags, + !done ? "" : (ds->ds_txstat.ts_status == 0) ? " *" : " !", ds->ds_ctl0, ds->ds_ctl1, - ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3], - !done ? ' ' : (ds->ds_txstat.ts_status == 0) ? '*' : '!'); + ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3]); } } #endif /* AR_DEBUG */ @@ -5011,7 +5030,9 @@ return copyout(&sc->sc_stats, ifr->ifr_data, sizeof (sc->sc_stats)); case SIOCGATHDIAG: + ATH_UNLOCK(sc); error = ath_ioctl_diag(sc, (struct ath_diag *) ifr); + ATH_LOCK(sc); break; default: error = ieee80211_ioctl(ic, cmd, data); @@ -5258,11 +5279,12 @@ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "regdomain", CTLTYPE_INT | CTLFLAG_RW, sc, 0, ath_sysctl_regdomain, "I", "EEPROM regdomain code"); +#ifdef AR_DEBUG sc->sc_debug = ath_debug; SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "debug", CTLFLAG_RW, &sc->sc_debug, 0, "control debugging printfs"); - +#endif SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "slottime", CTLTYPE_INT | CTLFLAG_RW, sc, 0, ath_sysctl_slottime, "I", "802.11 slot time (us)"); ==== //depot/projects/arm/src/sys/dev/ath/if_athvar.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.44 2006/02/10 19:07:08 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.45 2006/02/15 18:23:03 sam Exp $ */ /* @@ -251,8 +251,6 @@ int sc_rx_th_len; u_int sc_monpass; /* frames to pass in mon.mode */ - struct task sc_fataltask; /* fatal int processing */ - struct ath_descdma sc_rxdma; /* RX descriptos */ ath_bufhead sc_rxbuf; /* receive buffer */ u_int32_t *sc_rxlink; /* link ptr in last RX desc */ @@ -419,6 +417,8 @@ #define ath_hal_getdiagstate(_ah, _id, _indata, _insize, _outdata, _outsize) \ ((*(_ah)->ah_getDiagState)((_ah), (_id), \ (_indata), (_insize), (_outdata), (_outsize))) +#define ath_hal_getfatalstate(_ah, _outdata, _outsize) \ + ath_hal_getdiagstate(_ah, 27, NULL, 0, (void **)(_outdata), _outsize) #define ath_hal_setuptxqueue(_ah, _type, _irq) \ ((*(_ah)->ah_setupTxQueue)((_ah), (_type), (_irq))) #define ath_hal_resettxqueue(_ah, _q) \ ==== //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.30 2005/11/11 16:04:50 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.31 2006/02/14 12:44:54 glebius Exp $"); #include #include @@ -386,7 +386,6 @@ ifp->if_watchdog = bfe_watchdog; ifp->if_init = bfe_init; ifp->if_mtu = ETHERMTU; - ifp->if_baudrate = 100000000; IFQ_SET_MAXLEN(&ifp->if_snd, BFE_TX_QLEN); ifp->if_snd.ifq_drv_maxlen = BFE_TX_QLEN; IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/arm/src/sys/dev/dc/if_dc.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.178 2005/12/28 18:00:37 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.179 2006/02/14 12:44:54 glebius Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -2201,7 +2201,6 @@ ifp->if_start = dc_start; ifp->if_watchdog = dc_watchdog; ifp->if_init = dc_init; - ifp->if_baudrate = 10000000; IFQ_SET_MAXLEN(&ifp->if_snd, DC_TX_LIST_CNT - 1); ifp->if_snd.ifq_drv_maxlen = DC_TX_LIST_CNT - 1; IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/arm/src/sys/dev/em/if_em.c#15 (text+ko) ==== @@ -31,18 +31,55 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.107 2006/02/09 12:57:17 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.113 2006/02/15 14:27:38 glebius Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include #include /********************************************************************* * Set this to one to display debug statistics *********************************************************************/ -int em_display_debug_stats = 0; +int em_display_debug_stats = 0; /********************************************************************* * Driver version @@ -63,64 +100,64 @@ static em_vendor_info_t em_vendor_info_array[] = { - /* Intel(R) PRO/1000 Network Connection */ - { 0x8086, E1000_DEV_ID_82540EM, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82540EM_LOM, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82540EP, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82540EP_LOM, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82540EP_LP, PCI_ANY_ID, PCI_ANY_ID, 0}, + /* Intel(R) PRO/1000 Network Connection */ + { 0x8086, E1000_DEV_ID_82540EM, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82540EM_LOM, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82540EP, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82540EP_LOM, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82540EP_LP, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82541EI, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82541ER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82541ER_LOM, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82541EI_MOBILE, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82541GI, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82541GI_LF, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82541GI_MOBILE, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82541EI, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82541ER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82541ER_LOM, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82541EI_MOBILE, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82541GI, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82541GI_LF, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82541GI_MOBILE, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82542, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82542, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82543GC_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82543GC_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82543GC_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82543GC_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82544EI_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82544EI_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82544GC_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82544GC_LOM, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82544EI_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82544EI_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82544GC_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82544GC_LOM, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82545EM_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82545EM_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82545GM_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82545GM_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82545GM_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82545EM_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82545EM_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82545GM_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82545GM_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82545GM_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82546EB_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82546EB_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82546EB_QUAD_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82546GB_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82546GB_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82546GB_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82546GB_PCIE, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82546GB_QUAD_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82546EB_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82546EB_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82546EB_QUAD_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82546GB_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82546GB_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82546GB_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82546GB_PCIE, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82546GB_QUAD_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82547EI, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82547EI_MOBILE, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82547GI, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82547EI, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82547EI_MOBILE, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82547GI, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82571EB_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82571EB_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82571EB_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82571EB_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82571EB_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82571EB_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82572EI_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82572EI_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82572EI_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82572EI_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82572EI_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82572EI_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82573E, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82573E_IAMT, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82573L, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82573E, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82573E_IAMT, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82573L, PCI_ANY_ID, PCI_ANY_ID, 0}, - /* required last entry */ - { 0, 0, 0, 0, 0} + /* required last entry */ + { 0, 0, 0, 0, 0} }; /********************************************************************* @@ -134,91 +171,85 @@ /********************************************************************* * Function prototypes *********************************************************************/ -static int em_probe(device_t); -static int em_attach(device_t); -static int em_detach(device_t); -static int em_shutdown(device_t); -static int em_suspend(device_t); -static int em_resume(device_t); -static void em_intr(void *); +static int em_probe(device_t); +static int em_attach(device_t); +static int em_detach(device_t); +static int em_shutdown(device_t); +static int em_suspend(device_t); +static int em_resume(device_t); +static void em_intr(void *); #ifndef NO_EM_FASTINTR -static void em_intr_fast(void *); +static void em_intr_fast(void *); #endif -static void em_start(struct ifnet *); -static void em_start_locked(struct ifnet *ifp); -static int em_ioctl(struct ifnet *, u_long, caddr_t); -static void em_watchdog(struct ifnet *); -static void em_init(void *); -static void em_init_locked(struct adapter *); -static void em_stop(void *); -static void em_media_status(struct ifnet *, struct ifmediareq *); -static int em_media_change(struct ifnet *); -static void em_identify_hardware(struct adapter *); -static int em_allocate_pci_resources(struct adapter *); -static int em_allocate_intr(struct adapter *); -static void em_free_intr(struct adapter *); -static void em_free_pci_resources(struct adapter *); -static void em_local_timer(void *); -static int em_hardware_init(struct adapter *); -static void em_setup_interface(device_t, struct adapter *); -static int em_setup_transmit_structures(struct adapter *); -static void em_initialize_transmit_unit(struct adapter *); -static int em_setup_receive_structures(struct adapter *); -static void em_initialize_receive_unit(struct adapter *); -static void em_enable_intr(struct adapter *); -static void em_disable_intr(struct adapter *); -static void em_free_transmit_structures(struct adapter *); -static void em_free_receive_structures(struct adapter *); -static void em_update_stats_counters(struct adapter *); -static void em_clean_transmit_interrupts(struct adapter *); -static int em_allocate_receive_structures(struct adapter *); -static int em_allocate_transmit_structures(struct adapter *); -static int em_process_receive_interrupts(struct adapter *, int); +static void em_start(struct ifnet *); +static void em_start_locked(struct ifnet *ifp); +static int em_ioctl(struct ifnet *, u_long, caddr_t); +static void em_watchdog(struct ifnet *); +static void em_init(void *); +static void em_init_locked(struct em_softc *); +static void em_stop(void *); +static void em_media_status(struct ifnet *, struct ifmediareq *); +static int em_media_change(struct ifnet *); +static void em_identify_hardware(struct em_softc *); +static int em_allocate_pci_resources(struct em_softc *); +static int em_allocate_intr(struct em_softc *); +static void em_free_intr(struct em_softc *); +static void em_free_pci_resources(struct em_softc *); +static void em_local_timer(void *); +static int em_hardware_init(struct em_softc *); +static void em_setup_interface(device_t, struct em_softc *); +static int em_setup_transmit_structures(struct em_softc *); +static void em_initialize_transmit_unit(struct em_softc *); +static int em_setup_receive_structures(struct em_softc *); +static void em_initialize_receive_unit(struct em_softc *); +static void em_enable_intr(struct em_softc *); +static void em_disable_intr(struct em_softc *); +static void em_free_transmit_structures(struct em_softc *); +static void em_free_receive_structures(struct em_softc *); +static void em_update_stats_counters(struct em_softc *); +static void em_txeof(struct em_softc *); +static int em_allocate_receive_structures(struct em_softc *); +static int em_allocate_transmit_structures(struct em_softc *); +static int em_rxeof(struct em_softc *, int); #ifndef __NO_STRICT_ALIGNMENT -static int em_fixup_rx(struct adapter *); +static int em_fixup_rx(struct em_softc *); #endif -static void em_receive_checksum(struct adapter *, - struct em_rx_desc *, - struct mbuf *); -static void em_transmit_checksum_setup(struct adapter *, - struct mbuf *, - u_int32_t *, - u_int32_t *); -static void em_set_promisc(struct adapter *); -static void em_disable_promisc(struct adapter *); -static void em_set_multi(struct adapter *); -static void em_print_hw_stats(struct adapter *); -static void em_print_link_status(struct adapter *); -static int em_get_buf(int i, struct adapter *, - struct mbuf *); -static void em_enable_vlans(struct adapter *); -static void em_disable_vlans(struct adapter *); -static int em_encap(struct adapter *, struct mbuf **); -static void em_smartspeed(struct adapter *); -static int em_82547_fifo_workaround(struct adapter *, int); -static void em_82547_update_fifo_head(struct adapter *, int); -static int em_82547_tx_fifo_reset(struct adapter *); -static void em_82547_move_tail(void *arg); -static void em_82547_move_tail_locked(struct adapter *); -static int em_dma_malloc(struct adapter *, bus_size_t, - struct em_dma_alloc *, int); -static void em_dma_free(struct adapter *, struct em_dma_alloc *); -static void em_print_debug_info(struct adapter *); -static int em_is_valid_ether_addr(u_int8_t *); -static int em_sysctl_stats(SYSCTL_HANDLER_ARGS); -static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); -static u_int32_t em_fill_descriptors (bus_addr_t address, - u_int32_t length, - PDESC_ARRAY desc_array); -static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); -static void em_add_int_delay_sysctl(struct adapter *, const char *, - const char *, struct em_int_delay_info *, - int, int); +static void em_receive_checksum(struct em_softc *, struct em_rx_desc *, + struct mbuf *); +static void em_transmit_checksum_setup(struct em_softc *, struct mbuf *, + uint32_t *, uint32_t *); +static void em_set_promisc(struct em_softc *); +static void em_disable_promisc(struct em_softc *); +static void em_set_multi(struct em_softc *); +static void em_print_hw_stats(struct em_softc *); +static void em_update_link_status(struct em_softc *); +static int em_get_buf(int i, struct em_softc *, struct mbuf *); +static void em_enable_vlans(struct em_softc *); +static void em_disable_vlans(struct em_softc *); +static int em_encap(struct em_softc *, struct mbuf **); +static void em_smartspeed(struct em_softc *); +static int em_82547_fifo_workaround(struct em_softc *, int); +static void em_82547_update_fifo_head(struct em_softc *, int); +static int em_82547_tx_fifo_reset(struct em_softc *); +static void em_82547_move_tail(void *arg); +static void em_82547_move_tail_locked(struct em_softc *); +static int em_dma_malloc(struct em_softc *, bus_size_t, + struct em_dma_alloc *, int); +static void em_dma_free(struct em_softc *, struct em_dma_alloc *); +static void em_print_debug_info(struct em_softc *); +static int em_is_valid_ether_addr(uint8_t *); +static int em_sysctl_stats(SYSCTL_HANDLER_ARGS); +static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); +static uint32_t em_fill_descriptors (bus_addr_t address, uint32_t length, + PDESC_ARRAY desc_array); +static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); +static void em_add_int_delay_sysctl(struct em_softc *, const char *, + const char *, struct em_int_delay_info *, int, int); #ifndef NO_EM_FASTINTR -static void em_add_int_process_limit(struct adapter *, const char *, - const char *, int *, int); -static void em_handle_rxtx(void *context, int pending); -static void em_handle_link(void *context, int pending); +static void em_add_int_process_limit(struct em_softc *, const char *, + const char *, int *, int); +static void em_handle_rxtx(void *context, int pending); +static void em_handle_link(void *context, int pending); #endif #ifdef DEVICE_POLLING static poll_handler_t em_poll; @@ -240,7 +271,7 @@ }; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 16 08:43:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAF0016A423; Thu, 16 Feb 2006 08:43:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5CBEF16A420 for ; Thu, 16 Feb 2006 08:43:30 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22CB243D6E for ; Thu, 16 Feb 2006 08:43:26 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1G8hPMD094663 for ; Thu, 16 Feb 2006 08:43:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1G8hPUS094660 for perforce@freebsd.org; Thu, 16 Feb 2006 08:43:25 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 16 Feb 2006 08:43:25 GMT Message-Id: <200602160843.k1G8hPUS094660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 08:43:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=91873 Change 91873 by kmacy@kmacy_storage:sun4v_work on 2006/02/16 08:43:14 set up trap table and comment areas for dev and cpu mondo initialization next steps - actually allocate and declare dev and cpu mondo areas and initialize kernel page tables Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#5 (text+ko) ==== @@ -122,9 +122,10 @@ #define ASI_SCRATCHPAD_6_REG 0x30 #define ASI_SCRATCHPAD_7_REG 0x38 -#define SCRATCH_REG_PCPU ASI_SCRATCHPAD_0_REG -#define SCRATCH_REG_PCB ASI_SCRATCHPAD_1_REG -#define SCRATCH_REG_PTD ASI_SCRATCHPAD_2_REG +/* MMFSA == 0 */ +#define SCRATCH_REG_PCPU ASI_SCRATCHPAD_1_REG +#define SCRATCH_REG_PCB ASI_SCRATCHPAD_2_REG +#define SCRATCH_REG_PTD ASI_SCRATCHPAD_3_REG #define MMU_CID_P 0x08 #define MMU_CID_S 0x10 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#3 (text+ko) ==== @@ -224,7 +224,9 @@ void ascopyfrom(u_long sasi, vm_offset_t src, caddr_t dst, size_t len); void ascopyto(caddr_t src, u_long dasi, vm_offset_t dst, size_t len); void aszero(u_long asi, vm_offset_t dst, size_t len); - +void set_mmfsa_scratchpad(vm_paddr_t mmfsa); +void setwstate(u_long wstate); +void set_tba(void *tba); /* * Ultrasparc II doesn't implement popc in hardware. Suck. */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#4 (text+ko) ==== @@ -90,7 +90,7 @@ int pmap_protect_tte(struct pmap *pm1, struct pmap *pm2, struct tte *tp, vm_offset_t va); -void pmap_map_tsb(void); +void pmap_set_tsbs(void); void pmap_clear_write(vm_page_t m); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#2 (text+ko) ==== @@ -91,6 +91,7 @@ #ifndef LOCORE extern const char *trap_msg[]; +void trap_init(void); #endif #endif ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#2 (text+ko) ==== @@ -228,6 +228,9 @@ { mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); + /* SUN4V_FIXME - declare cpu and dev mondo etc. areas + * to hypervisor here + */ } static void ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#5 (text+ko) ==== @@ -400,10 +400,16 @@ /* * Initialize global registers. + * needed for curthread to work */ cpu_setregs(pc); /* + * setup trap table and fault status area + */ + trap_init(); + + /* * Initialize the message buffer (after setting trap table). */ msgbufinit(msgbufp, MSGBUF_SIZE); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#6 (text+ko) ==== @@ -79,6 +79,8 @@ struct ofw_mem_region sparc64_memreg[128]; int sparc64_nmemreg; +extern vm_paddr_t mmu_fault_status_area; + /* * First and last available kernel virtual addresses. @@ -274,6 +276,19 @@ tsb_kernel_phys = pa; PANIC_IF(hv_mem_scrub(tsb_kernel_phys, tsb_kernel_size, &scrubbed)); PANIC_IF(scrubbed != tsb_kernel_size); + + /* + * allocate MMU fault status areas for all CPUS + */ + mmu_fault_status_area = pmap_bootstrap_alloc(MMFSA_SIZE*MAXCPU); + + /* + * Allocate mondo areas for cpu / dev mondos + * + */ + + /* XXX SUN4V_FIXME - add allocation here */ + /* * Allocate and map the message buffer. */ @@ -453,7 +468,7 @@ void pmap_growkernel(vm_offset_t addr) { - + UNIMPLEMENTED; } void @@ -666,6 +681,20 @@ return (0); } +void +pmap_set_tsbs(void) +{ + uint64_t rv; + /* XXX SUN4V_FIXME + * we actually want to have the TSB be per-strand + * which means we don't necessarily want 128MB + * devoted to TSBs + */ + rv = hv_set_ctx0(1, tsb_kernel_phys); + if (rv != H_EOK) + panic("setting ctx0 tsb failed"); +} + /* * pmap_ts_referenced: * ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#3 (text+ko) ==== @@ -660,7 +660,25 @@ END(openfirmware_exit) #endif - +ENTRY(setwstate) + retl + wrpr %g0, %o0, %wstate +END(setwstate) + +ENTRY(set_mmfsa_scratchpad) + stxa %o0, [%g0]ASI_SCRATCHPAD + retl + nop +END(set_mmfsa_scratchpad) + +ENTRY(set_tba) + mov %o0, %o1 + rdpr %tba, %o0 + wrpr %o1, %tba + retl + nop +END(set_tba) + #ifdef GPROF ENTRY(user) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#3 (text+ko) ==== @@ -87,10 +87,14 @@ #include #include #include +#include +#include void trap(struct trapframe *tf); void syscall(struct trapframe *tf); +vm_paddr_t mmu_fault_status_area; + static int trap_pfault(struct thread *td, struct trapframe *tf); extern char copy_fault[]; @@ -222,8 +226,29 @@ CTASSERT(sizeof(struct trapframe) == 256); int debugger_on_signal = 0; +#ifdef DEBUG SYSCTL_INT(_debug, OID_AUTO, debugger_on_signal, CTLFLAG_RW, &debugger_on_signal, 0, ""); +#endif + + +void +trap_init(void) +{ + vm_paddr_t mmfsa; + + mmfsa = mmu_fault_status_area + (MMFSA_SIZE*PCPU_GET(cpuid)); + setwstate(WSTATE_KERNEL); + set_mmfsa_scratchpad(mmfsa); +#ifdef notyet +/* XXX SUN4V_FIXME - need to add to OFW support code */ + OF_set_mmfsa_traptable(tl0_base, mmfsa); +#else + set_tba(tl0_base); +#endif + + pmap_set_tsbs(); +} void trap(struct trapframe *tf) From owner-p4-projects@FreeBSD.ORG Thu Feb 16 14:27:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 619E916A425; Thu, 16 Feb 2006 14:27:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A73416A423 for ; Thu, 16 Feb 2006 14:27:38 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C71143D4C for ; Thu, 16 Feb 2006 14:27:37 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1GERbAd027766 for ; Thu, 16 Feb 2006 14:27:37 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1GERbMm027763 for perforce@freebsd.org; Thu, 16 Feb 2006 14:27:37 GMT (envelope-from millert@freebsd.org) Date: Thu, 16 Feb 2006 14:27:37 GMT Message-Id: <200602161427.k1GERbMm027763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 14:27:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=91886 Change 91886 by millert@millert_g4tower on 2006/02/16 14:26:54 Grab MAC Framework includes from source dir, not system include dir. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#4 (text+ko) ==== @@ -173,7 +173,7 @@ HEADER_SEARCH_PATHS = ""; INSTALL_PATH = "/Applications"; LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = "-I../.."; + OTHER_CFLAGS = "-I../.. -I../../../darwin/xnu/BUILD/obj/EXPORT_HDRS/bsd -idirafter ../../../darwin/xnu/BUILD/obj/EXPORT_HDRS/osfmk"; OTHER_LDFLAGS = "../../libselinux/src/libselinux.a ../../../darwin/libmac/libmac.a"; PRODUCT_NAME = relabel; SECTORDER_FLAGS = ""; From owner-p4-projects@FreeBSD.ORG Thu Feb 16 21:03:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6040116A423; Thu, 16 Feb 2006 21:03:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 185B416A422 for ; Thu, 16 Feb 2006 21:03:26 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DA5C43D49 for ; Thu, 16 Feb 2006 21:03:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1GL3P3x060693 for ; Thu, 16 Feb 2006 21:03:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1GL3PjJ060690 for perforce@freebsd.org; Thu, 16 Feb 2006 21:03:25 GMT (envelope-from marcel@freebsd.org) Date: Thu, 16 Feb 2006 21:03:25 GMT Message-Id: <200602162103.k1GL3PjJ060690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 91901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 21:03:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91901 Change 91901 by marcel@marcel_nfs on 2006/02/16 21:02:43 Make scc(4) work in a minimal fashion: o Add a new serdev interface to bring the umbrella driver (e.g. scc(4)) and the child driver (e.g. uart(4)) closer together. The interface helps out with configuration and interrupts. This is intended to be usable by multi-port serial cards as well. o Split the probe and attach of the child drivers. First the scc(4) driver creates control structures for each channel and each mode of operation and probes for devices. Then it queries the probed drivers whether a hardware reset is allowed or not (to avoid disrupting the system console if it happens to be on a channel). The scc(4) driver passes that information on to the hardware driver, which does the initial hardware setup. Then all child drivers are attached. o Avoid using INTR_FAST for now as the umbrella driver is still as stupid as puc(4). Of course scc(4) will become smarter and will be able to clear interrupts of un-attached channels or otherwise invoke source-dependent interrupt handlers of the child driver. When that's done, INTR_FAST is safe. This works on my U2 with the console on channel B of the Z8530. Affected files ... .. //depot/projects/uart/conf/files#47 edit .. //depot/projects/uart/dev/scc/scc_bfe.h#8 edit .. //depot/projects/uart/dev/scc/scc_bus.h#4 edit .. //depot/projects/uart/dev/scc/scc_core.c#8 edit .. //depot/projects/uart/dev/scc/scc_dev_sab82532.c#4 edit .. //depot/projects/uart/dev/scc/scc_dev_z8530.c#4 edit .. //depot/projects/uart/dev/scc/scc_if.m#3 edit .. //depot/projects/uart/dev/uart/uart_bus.h#36 edit .. //depot/projects/uart/dev/uart/uart_bus_scc.c#4 edit .. //depot/projects/uart/dev/uart/uart_core.c#41 edit .. //depot/projects/uart/kern/serdev_if.m#1 add Differences ... ==== //depot/projects/uart/conf/files#47 (text+ko) ==== @@ -1315,6 +1315,7 @@ kern/md5c.c standard kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule +kern/serdev_if.m optional scc kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard ==== //depot/projects/uart/dev/scc/scc_bfe.h#8 (text+ko) ==== @@ -57,18 +57,22 @@ /* * SCC mode (child) and channel control structures. */ + +#define SCC_NMODES 3 + struct scc_chan; struct scc_mode { - STAILQ_ENTRY(scc_mode) m_link; struct scc_chan *m_chan; device_t m_dev; - int m_mode; + u_int m_mode; int m_alloc_rres:1; + int m_attached:1; + int m_probed:1; driver_intr_t *ih; - driver_intr_t *ih_ovrrun; + driver_intr_t *ih_overrun; driver_intr_t *ih_break; driver_intr_t *ih_rxready; driver_intr_t *ih_sigchg; @@ -78,10 +82,10 @@ }; struct scc_chan { - STAILQ_ENTRY(scc_chan) ch_link; + struct resource ch_rres; struct resource_list ch_rlist; - STAILQ_HEAD(, scc_mode) ch_mode; + struct scc_mode ch_mode[SCC_NMODES]; u_int ch_nr; }; @@ -91,12 +95,12 @@ */ struct scc_class { KOBJ_CLASS_FIELDS; - int cl_channels; /* Number of independent channels. */ - int cl_class; /* SCC bus class ID. */ - int cl_modes; /* Supported modes (bitset). */ + u_int cl_channels; /* Number of independent channels. */ + u_int cl_class; /* SCC bus class ID. */ + u_int cl_modes; /* Supported modes (bitset). */ int cl_range; - int cl_rclk; - int cl_regshft; + u_int cl_rclk; + u_int cl_regshft; }; extern struct scc_class scc_sab82532_class; @@ -117,7 +121,7 @@ void *sc_icookie; int sc_irid; - STAILQ_HEAD(, scc_chan) sc_chan; + struct scc_chan *sc_chan; int sc_fastintr:1; int sc_leaving:1; ==== //depot/projects/uart/dev/scc/scc_bus.h#4 (text+ko) ==== @@ -29,6 +29,8 @@ #ifndef _DEV_SCC_BUS_H_ #define _DEV_SCC_BUS_H_ +#include + #define SCC_IVAR_CHANNEL 0 #define SCC_IVAR_CLASS 1 #define SCC_IVAR_CLOCK 2 ==== //depot/projects/uart/dev/scc/scc_core.c#8 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -53,10 +54,26 @@ scc_bfe_intr(void *arg) { struct scc_softc *sc = arg; - int ipend; + struct scc_chan *ch; + struct scc_class *cl; + struct scc_mode *m; + int c; + + if (sc->sc_leaving) + return; + + cl = sc->sc_class; + for (c = 0; c < cl->cl_channels; c++) { + ch = &sc->sc_chan[c]; + m = &ch->ch_mode[0]; + if (!m->m_attached) + continue; + if (m->ih != NULL) + (*m->ih)(m->ih_arg); + } +#if 0 while (!sc->sc_leaving && (ipend = SCC_IPEND(sc)) != 0) { -#if 0 if (ipend & SER_INT_OVERRUN) uart_intr_overrun(sc); if (ipend & SER_INT_BREAK) @@ -67,8 +84,8 @@ uart_intr_sigchg(sc); if (ipend & SER_INT_TXIDLE) uart_intr_txidle(sc); + } #endif - } } int @@ -81,8 +98,8 @@ struct scc_softc *sc, *sc0; const char *sep; bus_space_handle_t bh; - u_long size, start; - int c, error, i, mode; + u_long base, size, start; + int c, error, mode, reset; /* * The sc_class field defines the type of SCC we're going to work @@ -99,6 +116,8 @@ } else sc = sc0; + size = abs(cl->cl_range); + /* * Protect ourselves against interrupts while we're not completely * finished attaching and initializing. We don't expect interrupts @@ -113,7 +132,7 @@ * collected by scc_bfe_probe() intact. */ sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, - 0, ~0, cl->cl_channels * cl->cl_range, RF_ACTIVE); + 0, ~0, cl->cl_channels * size, RF_ACTIVE); if (sc->sc_rres == NULL) return (ENXIO); sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); @@ -121,11 +140,15 @@ sc->sc_irid = 0; sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, - RF_ACTIVE); + RF_ACTIVE | RF_SHAREABLE); if (sc->sc_ires != NULL) { +#if 0 error = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, scc_bfe_intr, sc, &sc->sc_icookie); +#else + error = -1; +#endif if (error) error = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE, @@ -145,7 +168,61 @@ sc->sc_polled = 1; } - error = SCC_ATTACH(sc); + /* + * Create the control structures for our children. Probe devices + * and query them to see if we can reset the hardware. + */ + reset = 1; + + sc->sc_chan = malloc(sizeof(struct scc_chan) * cl->cl_channels, + M_SCC, M_WAITOK | M_ZERO); + base = rman_get_start(sc->sc_rres); + start = base + ((cl->cl_range < 0) ? size * (cl->cl_channels - 1) : 0); + for (c = 0; c < cl->cl_channels; c++) { + ch = &sc->sc_chan[c]; + resource_list_init(&ch->ch_rlist); + ch->ch_nr = c + 1; + + resource_list_add(&ch->ch_rlist, sc->sc_rtype, 0, start, + start + size - 1, size); + rle = resource_list_find(&ch->ch_rlist, sc->sc_rtype, 0); + rle->res = &ch->ch_rres; + bus_space_subregion(rman_get_bustag(sc->sc_rres), + rman_get_bushandle(sc->sc_rres), start - base, size, &bh); + rman_set_bushandle(rle->res, bh); + rman_set_bustag(rle->res, rman_get_bustag(sc->sc_rres)); + + resource_list_add(&ch->ch_rlist, SYS_RES_IRQ, 0, c, c, 1); + rle = resource_list_find(&ch->ch_rlist, SYS_RES_IRQ, 0); + rle->res = sc->sc_ires; + + for (mode = 0; mode < SCC_NMODES; mode++) { + m = &ch->ch_mode[mode]; + m->m_chan = ch; + m->m_mode = 1U << mode; + if ((cl->cl_modes & m->m_mode) == 0) + continue; + m->m_dev = device_add_child(dev, NULL, -1); + device_set_ivars(m->m_dev, (void *)m); + error = device_probe_child(dev, m->m_dev); + if (!error) { + m->m_probed = 1; + reset = (reset && SERDEV_RESET(m->m_dev)); + } + } + + start += (cl->cl_range < 0) ? -size : size; + } + + /* + * Have the hardware driver initialize the hardware. Tell it + * whether or not a hardware reset should be performed. + */ + if (bootverbose) { + device_printf(dev, "%sresetting hardware\n", + (reset) ? "" : "not "); + } + error = SCC_ATTACH(sc, reset); if (error) goto fail; @@ -163,53 +240,30 @@ printf("\n"); } + /* + * Attach all child devices that were probed successfully. + */ + for (c = 0; c < cl->cl_channels; c++) { + ch = &sc->sc_chan[c]; + for (mode = 0; mode < SCC_NMODES; mode++) { + m = &ch->ch_mode[mode]; + if (!m->m_probed) + continue; + error = device_attach(m->m_dev); + if (error) + continue; + m->m_attached = 1; + m->ih_break = SERDEV_IHAND(m->m_dev, SER_INT_BREAK); + m->ih_overrun = SERDEV_IHAND(m->m_dev, SER_INT_OVERRUN); + m->ih_rxready = SERDEV_IHAND(m->m_dev, SER_INT_RXREADY); + m->ih_sigchg = SERDEV_IHAND(m->m_dev, SER_INT_SIGCHG); + m->ih_txidle = SERDEV_IHAND(m->m_dev, SER_INT_TXIDLE); + } + } + sc->sc_leaving = 0; scc_bfe_intr(sc); - STAILQ_INIT(&sc->sc_chan); - size = cl->cl_range; - start = rman_get_start(sc->sc_rres); - for (c = 1; c <= cl->cl_channels; c++) { - ch = malloc(sizeof(struct scc_chan), M_SCC, M_WAITOK | M_ZERO); - STAILQ_INSERT_TAIL(&sc->sc_chan, ch, ch_link); - resource_list_init(&ch->ch_rlist); - ch->ch_nr = c; - - resource_list_add(&ch->ch_rlist, sc->sc_rtype, sc->sc_rrid, - start, start + size - 1, size); - rle = resource_list_find(&ch->ch_rlist, sc->sc_rtype, - sc->sc_rrid); - rle->res = malloc(sizeof(struct resource), M_SCC, - M_WAITOK | M_ZERO); - bus_space_subregion(rman_get_bustag(sc->sc_rres), - rman_get_bushandle(sc->sc_rres), - start - rman_get_start(sc->sc_rres), size, &bh); - rman_set_bushandle(rle->res, bh); - rman_set_bustag(rle->res, rman_get_bustag(sc->sc_rres)); - - resource_list_add(&ch->ch_rlist, SYS_RES_IRQ, sc->sc_irid, - rman_get_start(sc->sc_ires), rman_get_end(sc->sc_ires), 1); - rle = resource_list_find(&ch->ch_rlist, SYS_RES_IRQ, - sc->sc_irid); - rle->res = sc->sc_ires; - - STAILQ_INIT(&ch->ch_mode); - mode = cl->cl_modes; - while (mode != 0) { - m = malloc(sizeof(struct scc_mode), M_SCC, - M_WAITOK | M_ZERO); - STAILQ_INSERT_TAIL(&ch->ch_mode, m, m_link); - m->m_chan = ch; - m->m_dev = device_add_child(dev, NULL, -1); - device_set_ivars(m->m_dev, (void *)m); - i = ffs(mode) - 1; - m->m_mode = 1 << i; - mode &= ~m->m_mode; - device_probe_and_attach(m->m_dev); - } - - start += size >> cl->cl_regshft; - } return (0); fail: @@ -251,6 +305,8 @@ if (device_get_desc(dev) == NULL) device_set_desc(dev, cl->name); + size = abs(cl->cl_range); + /* * Allocate the register resource. We assume that all SCCs have a * single register window in either I/O port space or memory mapped @@ -259,14 +315,13 @@ */ sc->sc_rrid = 0; sc->sc_rtype = SYS_RES_MEMORY; - size = cl->cl_channels * cl->cl_range; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, - 0, ~0, size, RF_ACTIVE); + 0, ~0, cl->cl_channels * size, RF_ACTIVE); if (sc->sc_rres == NULL) { sc->sc_rrid = 0; sc->sc_rtype = SYS_RES_IOPORT; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, - &sc->sc_rrid, 0, ~0, size, RF_ACTIVE); + &sc->sc_rrid, 0, ~0, cl->cl_channels * size, RF_ACTIVE); if (sc->sc_rres == NULL) return (ENXIO); } @@ -277,7 +332,7 @@ */ sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); - sc->sc_bas.range = sc->sc_class->cl_range; + sc->sc_bas.range = size; sc->sc_bas.rclk = sc->sc_class->cl_rclk; sc->sc_bas.regshft = sc->sc_class->cl_regshft; @@ -304,9 +359,10 @@ m = device_get_ivars(child); ch = m->m_chan; - rle = resource_list_find(&ch->ch_rlist, type, *rid); + rle = resource_list_find(&ch->ch_rlist, type, 0); if (rle == NULL) return (NULL); + *rid = 0; return (rle->res); } @@ -392,8 +448,16 @@ scc_bus_setup_intr(device_t dev, device_t child, struct resource *r, int flags, void (*ihand)(void *), void *arg, void **cookiep) { + struct scc_mode *m; + + /* We don't support any grandchildren or children thereof. */ + if (device_get_parent(child) != dev) + return (EINVAL); - return (ENXIO); + m = device_get_ivars(child); + m->ih = ihand; + m->ih_arg = arg; + return (0); } int ==== //depot/projects/uart/dev/scc/scc_dev_sab82532.c#4 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -43,7 +44,7 @@ #define DEFAULT_RCLK 29491200 -static int sab82532_bfe_attach(struct scc_softc *); +static int sab82532_bfe_attach(struct scc_softc *, int); static int sab82532_bfe_ipend(struct scc_softc *); static int sab82532_bfe_probe(struct scc_softc *); @@ -67,7 +68,7 @@ }; static int -sab82532_bfe_attach(struct scc_softc *sc) +sab82532_bfe_attach(struct scc_softc *sc, int reset) { struct scc_bas *bas; ==== //depot/projects/uart/dev/scc/scc_dev_z8530.c#4 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -43,7 +44,7 @@ #define DEFAULT_RCLK 307200 -static int z8530_bfe_attach(struct scc_softc *); +static int z8530_bfe_attach(struct scc_softc *, int); static int z8530_bfe_ipend(struct scc_softc *); static int z8530_bfe_probe(struct scc_softc *); @@ -61,7 +62,7 @@ .cl_channels = 2, .cl_class = SCC_CLASS_Z8530, .cl_modes = SCC_MODE_ASYNC | SCC_MODE_BISYNC | SCC_MODE_HDLC, - .cl_range = CHAN_A - CHAN_B, + .cl_range = (CHAN_B - CHAN_A) << 1, .cl_rclk = DEFAULT_RCLK, .cl_regshft = 1, }; @@ -86,7 +87,7 @@ } static int -z8530_bfe_attach(struct scc_softc *sc) +z8530_bfe_attach(struct scc_softc *sc, int reset) { struct scc_bas *bas; ==== //depot/projects/uart/dev/scc/scc_if.m#3 (text+ko) ==== @@ -25,10 +25,11 @@ # $FreeBSD$ #include +#include +#include #include #include -#include -#include +#include #include # The SCC hardware interface. The core SCC code is hardware independent. @@ -40,8 +41,12 @@ # This method is called when the device is being attached. All resources # have been allocated. The intend of this method is to setup the hardware # for normal operation. +# The reset parameter informs the hardware driver whether a full device +# reset is allowed or not. This is important when one of the channels can +# be used as system console and a hardware reset would disrupt output. METHOD int attach { struct scc_softc *this; + int reset; }; # ipend() - query SCC for pending interrupts. ==== //depot/projects/uart/dev/uart/uart_bus.h#36 (text+ko) ==== @@ -144,7 +144,9 @@ int uart_bus_attach(device_t dev); int uart_bus_detach(device_t dev); +driver_intr_t *uart_bus_ihand(device_t dev, int ipend); int uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan); +int uart_bus_reset(device_t dev); int uart_tty_attach(struct uart_softc *); int uart_tty_detach(struct uart_softc *); ==== //depot/projects/uart/dev/uart/uart_bus_scc.c#4 (text+ko) ==== @@ -50,6 +50,9 @@ DEVMETHOD(device_probe, uart_scc_probe), DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), + /* Serdev interface */ + DEVMETHOD(serdev_ihand, uart_bus_ihand), + DEVMETHOD(serdev_reset, uart_bus_reset), { 0, 0 } }; ==== //depot/projects/uart/dev/uart/uart_core.c#41 (text+ko) ==== @@ -225,6 +225,36 @@ swi_sched(sc->sc_softih, 0); } +driver_intr_t * +uart_bus_ihand(device_t dev, int ipend) +{ + + switch (ipend) { + case SER_INT_BREAK: + return (uart_intr_break); + case SER_INT_OVERRUN: + return (uart_intr_overrun); + case SER_INT_RXREADY: + return (uart_intr_rxready); + case SER_INT_SIGCHG: + return (uart_intr_sigchg); + case SER_INT_TXIDLE: + return (uart_intr_txidle); + } + return (NULL); +} + +int +uart_bus_reset(device_t dev) +{ + struct uart_softc *sc; + int reset; + + sc = device_get_softc(dev); + reset = (sc->sc_sysdev == NULL) ? 1 : 0; + return (reset); +} + int uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan) { From owner-p4-projects@FreeBSD.ORG Thu Feb 16 21:08:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A41B116A424; Thu, 16 Feb 2006 21:08:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78E5C16A420 for ; Thu, 16 Feb 2006 21:08:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3177943D48 for ; Thu, 16 Feb 2006 21:08:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1GL8WqE060867 for ; Thu, 16 Feb 2006 21:08:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1GL8VVG060864 for perforce@freebsd.org; Thu, 16 Feb 2006 21:08:31 GMT (envelope-from marcel@freebsd.org) Date: Thu, 16 Feb 2006 21:08:31 GMT Message-Id: <200602162108.k1GL8VVG060864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 91902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 21:08:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=91902 Change 91902 by marcel@marcel_nfs on 2006/02/16 21:07:49 serdev_if.m is also needed when uart(4) is configured. Maybe this should be standard... Affected files ... .. //depot/projects/uart/conf/files#48 edit Differences ... ==== //depot/projects/uart/conf/files#48 (text+ko) ==== @@ -1316,6 +1316,7 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule kern/serdev_if.m optional scc +kern/serdev_if.m optional uart kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard From owner-p4-projects@FreeBSD.ORG Thu Feb 16 22:56:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7266416A424; Thu, 16 Feb 2006 22:56:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4690516A422 for ; Thu, 16 Feb 2006 22:56:45 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBC2843D46 for ; Thu, 16 Feb 2006 22:56:44 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1GMuiQt067857 for ; Thu, 16 Feb 2006 22:56:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1GMuigh067854 for perforce@freebsd.org; Thu, 16 Feb 2006 22:56:44 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 16 Feb 2006 22:56:44 GMT Message-Id: <200602162256.k1GMuigh067854@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 22:56:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91907 Change 91907 by kmacy@kmacy_storage:sun4v_work on 2006/02/16 22:56:01 update queue address names to correspond to HV API spec Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#6 (text+ko) ==== @@ -130,14 +130,14 @@ #define MMU_CID_P 0x08 #define MMU_CID_S 0x10 -#define CPU_MONDO_QH 0x3c0 -#define CPU_MONDO_QT 0x3c8 -#define DEV_MONDO_QH 0x3d0 -#define DEV_MONDO_QT 0x3d8 -#define RES_ERROR_QH 0x3e0 -#define RES_ERROR_QT 0x3e8 -#define NRES_ERROR_QH 0x3f0 -#define NRES_ERROR_QT 0x3f8 +#define CPU_MONDO_QUEUE_HEAD 0x3c0 +#define CPU_MONDO_QUEUE_TAIL 0x3c8 +#define DEV_MONDO_QUEUE_HEAD 0x3d0 +#define DEV_MONDO_QUEUE_TAIL 0x3d8 +#define RESUMABLE_ERROR_QUEUE_HEAD 0x3e0 +#define RESUMABLE_ERROR_QUEUE_TAIL 0x3e8 +#define NONRESUMABLE_ERROR_QUEUE_HEAD 0x3f0 +#define NONRESUMABLE_ERROR_QUEUE_TAIL 0x3f8 #endif /* !_MACHINE_ASI_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Feb 17 00:56:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FD3916A423; Fri, 17 Feb 2006 00:56:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E613216A420 for ; Fri, 17 Feb 2006 00:56:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0F7443D46 for ; Fri, 17 Feb 2006 00:56:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1H0uBbx079473 for ; Fri, 17 Feb 2006 00:56:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1H0uAqN079470 for perforce@freebsd.org; Fri, 17 Feb 2006 00:56:10 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 17 Feb 2006 00:56:10 GMT Message-Id: <200602170056.k1H0uAqN079470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91910 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 00:56:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=91910 Change 91910 by kmacy@kmacy_storage:sun4v_work on 2006/02/17 00:55:18 allow SYSINIT to take care of interrupt initialization as it does on other platforms do interrupt queue allocation and registration add md_var.h to trap.c so that tl0_base is declared Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/intr_machdep.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#7 (text+ko) ==== @@ -139,5 +139,8 @@ #define NONRESUMABLE_ERROR_QUEUE_HEAD 0x3f0 #define NONRESUMABLE_ERROR_QUEUE_TAIL 0x3f8 +#define Q(queue_head) (queue_head >> 4) + + #endif /* !_MACHINE_ASI_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/intr_machdep.h#2 (text+ko) ==== @@ -77,12 +77,29 @@ void intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf, void *iva); -void intr_init1(void); -void intr_init2(void); int inthand_add(const char *name, int vec, void (*handler)(void *), void *arg, int flags, void **cookiep); int inthand_remove(int vec, void *cookie); +void cpu_intrq_init(void); + ih_func_t intr_fast; +#define CPU_LIST_SIZE (MAXCPU * sizeof(uint16_t)) + +#define INTR_REPORT_SIZE 64 +#define INTR_CPU_Q_SIZE (cpu_q_entries * INTR_REPORT_SIZE) +#define INTR_DEV_Q_SIZE (dev_q_entries * INTR_REPORT_SIZE) + +#define CPU_RQ_ENTRIES 64 +#define CPU_NRQ_ENTRIES 64 + +#define Q_ENTRY_SIZE 64 +#define CPU_RQ_SIZE (CPU_RQ_ENTRIES * Q_ENTRY_SIZE) +#define CPU_NRQ_SIZE (CPU_NRQ_ENTRIES * Q_ENTRY_SIZE) + + + + + #endif ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#2 (text+ko) ==== @@ -51,6 +51,22 @@ struct intr_request *pc_irfree; \ struct pmap *pc_pmap; \ vm_offset_t pc_addr; \ + vm_offset_t *pc_mondo_data; \ + vm_offset_t *pc_cpu_list; \ + vm_offset_t *pc_cpu_q; \ + vm_offset_t *pc_dev_q; \ + vm_offset_t *pc_rq; \ + vm_offset_t *pc_nrq; \ + vm_paddr_t pc_mondo_data_ra; \ + vm_paddr_t pc_cpu_list_ra; \ + vm_paddr_t pc_cpu_q_ra; \ + uint64_t pc_cpu_q_size; \ + vm_paddr_t pc_dev_q_ra; \ + uint64_t pc_dev_q_size; \ + vm_paddr_t pc_rq_ra; \ + uint64_t pc_rq_size; \ + vm_paddr_t pc_nrq_ra; \ + uint64_t pc_nrq_size; \ u_long pc_tickref; \ u_long pc_tickadj; \ u_int pc_mid; \ @@ -59,6 +75,12 @@ u_int pc_tlb_ctx_max; \ u_int pc_tlb_ctx_min + /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick + * succession we _really_ want them to be L1 cache line size aligned + * and it is quite possible that we want all of ASI_QUEUE fields to + * be L2 cache aligned - they're surrounded by per-cpu data, so there is + * no possibility of false sharing, but this might help in reducing misses + */ struct pcb; struct pcpu; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#3 (text+ko) ==== @@ -63,10 +63,12 @@ #include #include -#include +#include +#include #include #include #include +#include #include #include #include @@ -76,7 +78,14 @@ #include #include +#include +#include +#include +#include + +#define PANIC_IF(exp) if (unlikely(exp)) {panic("%s: %s:%d", #exp, __FILE__, __LINE__);} + #define MAX_STRAY_LOG 5 CTASSERT((1 << IV_SHIFT) == sizeof(struct intr_vector)); @@ -100,6 +109,16 @@ "tick", /* PIL_TICK */ }; + +/* + * XXX SUN4V_FIXME - the queue size values should + * really be calculated based on the size of the partition + * + */ + +int cpu_q_entries = 128; +int dev_q_entries = 128; + /* protect the intr_vectors table */ static struct mtx intr_table_lock; @@ -206,8 +225,8 @@ } } -void -intr_init1() +static void +intr_init(void) { int i; @@ -221,17 +240,13 @@ intr_vectors[i].iv_vec = i; } intr_handlers[PIL_LOW] = intr_fast; + mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); + + cpu_intrq_init(); + } - -void -intr_init2() -{ +SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL); - mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); - /* SUN4V_FIXME - declare cpu and dev mondo etc. areas - * to hypervisor here - */ -} static void intr_execute_handlers(void *cookie) @@ -346,3 +361,61 @@ } return (error); } + +/* + * Allocate and register intrq fields + */ +void +cpu_intrq_init() +{ + + uint64_t error; + int cpu_list_size; + + pcpup->pc_mondo_data = malloc(INTR_REPORT_SIZE, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(pcpup->pc_mondo_data == NULL) + pcpup->pc_mondo_data_ra = vtophys(pcpup->pc_mondo_data); + + cpu_list_size = CPU_LIST_SIZE > INTR_REPORT_SIZE ? CPU_LIST_SIZE : INTR_REPORT_SIZE; + pcpup->pc_cpu_list = malloc(cpu_list_size, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(pcpup->pc_cpu_list == NULL) + pcpup->pc_cpu_list_ra = vtophys(pcpup->pc_cpu_list); + + pcpup->pc_cpu_q = malloc(INTR_CPU_Q_SIZE, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(pcpup->pc_cpu_q == NULL); + pcpup->pc_cpu_q_ra = vtophys(pcpup->pc_cpu_q); + pcpup->pc_cpu_q_size = INTR_CPU_Q_SIZE; + + pcpup->pc_dev_q = malloc(INTR_DEV_Q_SIZE, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(pcpup->pc_dev_q == NULL); + pcpup->pc_dev_q_ra = vtophys(pcpup->pc_dev_q); + pcpup->pc_dev_q_size = INTR_DEV_Q_SIZE; + + pcpup->pc_rq = malloc(2*CPU_RQ_SIZE, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(pcpup->pc_rq == NULL); + pcpup->pc_rq_ra = vtophys(pcpup->pc_rq); + pcpup->pc_rq_size = CPU_RQ_SIZE; + + pcpup->pc_nrq = malloc(2*CPU_NRQ_SIZE, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(pcpup->pc_nrq == NULL); + pcpup->pc_nrq_ra = vtophys(pcpup->pc_nrq); + pcpup->pc_nrq_size = CPU_NRQ_SIZE; + + error = hv_cpu_qconf(Q(CPU_MONDO_QUEUE_HEAD), pcpup->pc_cpu_q_ra, cpu_q_entries); + if (error != H_EOK) + panic("cpu_mondo queue configuration failed: %lu", error); + + error = hv_cpu_qconf(Q(DEV_MONDO_QUEUE_HEAD), pcpup->pc_dev_q_ra, dev_q_entries); + if (error != H_EOK) + panic("dev_mondo queue configuration failed: %lu", error); + + error = hv_cpu_qconf(Q(RESUMABLE_ERROR_QUEUE_HEAD), pcpup->pc_rq_ra, CPU_RQ_ENTRIES); + if (error != H_EOK) + panic("resumable error queue configuration failed: %lu", error); + + error = hv_cpu_qconf(Q(NONRESUMABLE_ERROR_QUEUE_HEAD), pcpup->pc_nrq_ra, CPU_NRQ_ENTRIES); + if (error != H_EOK) + panic("non-resumable error queue configuration failed: %lu", error); + + +} ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#6 (text+ko) ==== @@ -363,11 +363,6 @@ } /* - * Initialize the interrupt tables. - */ - intr_init1(); - - /* * Initialize proc0 stuff (p_contested needs to be done early). */ proc_linkup(&proc0, &ksegrp0, &thread0); @@ -415,7 +410,6 @@ msgbufinit(msgbufp, MSGBUF_SIZE); mutex_init(); - intr_init2(); /* * Finish pmap initialization now that we're ready for mutexes. ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#7 (text+ko) ==== @@ -282,13 +282,6 @@ */ mmu_fault_status_area = pmap_bootstrap_alloc(MMFSA_SIZE*MAXCPU); - /* - * Allocate mondo areas for cpu / dev mondos - * - */ - - /* XXX SUN4V_FIXME - add allocation here */ - /* * Allocate and map the message buffer. */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#4 (text+ko) ==== @@ -88,6 +88,8 @@ #include #include #include + +#include #include void trap(struct trapframe *tf); From owner-p4-projects@FreeBSD.ORG Fri Feb 17 01:37:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ECC116A423; Fri, 17 Feb 2006 01:37:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E47316A420 for ; Fri, 17 Feb 2006 01:37:01 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF6B043D46 for ; Fri, 17 Feb 2006 01:37:00 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1H1b00i081073 for ; Fri, 17 Feb 2006 01:37:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1H1b07R081070 for perforce@freebsd.org; Fri, 17 Feb 2006 01:37:00 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 17 Feb 2006 01:37:00 GMT Message-Id: <200602170137.k1H1b07R081070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 01:37:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91911 Change 91911 by kmacy@kmacy_storage:sun4v_work on 2006/02/17 01:36:00 change unresumable -> nonresumable add symbols for use by queue handlers Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#2 (text+ko) ==== @@ -187,6 +187,20 @@ ASSYM(PC_CNT, offsetof(struct pcpu, pc_cnt)); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); +#ifdef SUN4V +ASSYM(PC_CPU_Q_BASE, offsetof(struct pcpu, pc_cpu_q_ra)); +ASSYM(PC_CPU_Q_SIZE, offsetof(struct pcpu, pc_cpu_q_size)); +ASSYM(PC_DEV_Q_BASE, offsetof(struct pcpu, pc_dev_q_ra)); +ASSYM(PC_DEV_Q_SIZE, offsetof(struct pcpu, pc_dev_q_size)); + +ASSYM(PC_RQ_BASE, offsetof(struct pcpu, pc_rq_ra)); +ASSYM(PC_RQ_SIZE, offsetof(struct pcpu, pc_rq_size)); +ASSYM(PC_NRQ_BASE, offsetof(struct pcpu, pc_nrq_ra)); +ASSYM(PC_NRQ_SIZE, offsetof(struct pcpu, pc_nrq_size)); +#endif + + + ASSYM(IH_SHIFT, IH_SHIFT); ASSYM(IRSR_BUSY, IRSR_BUSY); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#6 (text+ko) ==== @@ -519,7 +519,7 @@ .align 32 .endm - .macro unresumable_error + .macro nonresumable_error .align 32 .endm @@ -1804,8 +1804,8 @@ dev_mondo ! 0x7d tl0_resumable_error: resumable_error ! 0x7e -tl0_unresumable_error: - unresumable_error ! 0x7f +tl0_nonresumable_error: + nonresumable_error ! 0x7f tl0_spill_n_normal: tl0_reserved 4 ! 0x80 spill_32bit_asi ASI_AIUP sn0 ! 0x84 @@ -1887,8 +1887,8 @@ tl1_data_prot: data_prot ! 0x26c tl1_reserved 18 ! 0x26c-0x27e -tl1_unresumable_error: - unresumable_error ! 0x27f +tl1_nonresumable_error: + nonresumable_error ! 0x27f tl1_spill_n_normal: tl1_reserved 4 ! 0x280 spill_32bit_tt1 ASI_AIUP sn1 ! 0x284 From owner-p4-projects@FreeBSD.ORG Fri Feb 17 03:13:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B899116A423; Fri, 17 Feb 2006 03:13:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5681616A420; Fri, 17 Feb 2006 03:13:12 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id F179E43D45; Fri, 17 Feb 2006 03:13:11 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [127.0.0.1] (may be forged)) by harmony.bsdimp.com (8.13.3/8.13.3) with ESMTP id k1H3AjDI014355; Thu, 16 Feb 2006 20:10:45 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 16 Feb 2006 20:11:01 -0700 (MST) Message-Id: <20060216.201101.121294376.imp@bsdimp.com> To: cognet@freebsd.org From: "M. Warner Losh" In-Reply-To: <200602150230.k1F2UQYJ063887@repoman.freebsd.org> References: <200602150230.k1F2UQYJ063887@repoman.freebsd.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Thu, 16 Feb 2006 20:10:45 -0700 (MST) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 91780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 03:13:13 -0000 In message: <200602150230.k1F2UQYJ063887@repoman.freebsd.org> Olivier Houchard writes: : http://perforce.freebsd.org/chv.cgi?CH=91780 : : Change 91780 by cognet@cognet on 2006/02/15 02:29:43 : : The AT91RM9200 is supposed to support USB 2.0. USB FULL SPEED, which is really usb 1.0... : Affected files ... : : .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#6 edit : : Differences ... : : ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#6 (text+ko) ==== : : @@ -62,9 +62,6 @@ : int err; : int rid; : : - /* XXX where does it say so in the spec? */ : - sc->sc_bus.usbrev = USBREV_1_0; : - : rid = MEM_RID; : sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, : RF_ACTIVE); : @@ -101,6 +98,9 @@ : sc->sc_flags |= OHCI_SCFLG_DONEINIT; : err = device_probe_and_attach(sc->sc_bus.bdev); : } : +#ifdef notyet : + sc->sc_bus.usbrev = USBREV_2_0; : +#endif : : error:; : if (err) { : From owner-p4-projects@FreeBSD.ORG Fri Feb 17 06:04:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE6C516A423; Fri, 17 Feb 2006 06:04:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F7C116A420 for ; Fri, 17 Feb 2006 06:04:24 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5307143D45 for ; Fri, 17 Feb 2006 06:04:24 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1H64OIo098072 for ; Fri, 17 Feb 2006 06:04:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1H64ORh098069 for perforce@freebsd.org; Fri, 17 Feb 2006 06:04:24 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 17 Feb 2006 06:04:24 GMT Message-Id: <200602170604.k1H64ORh098069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91917 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 06:04:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=91917 Change 91917 by kmacy@kmacy_storage:sun4v_work on 2006/02/17 06:04:14 add note to self to use block initializing loads and stores for spill/fill handling fix mislabelled spill trap while I'm in there Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#7 (text+ko) ==== @@ -1809,25 +1809,25 @@ tl0_spill_n_normal: tl0_reserved 4 ! 0x80 spill_32bit_asi ASI_AIUP sn0 ! 0x84 - spill_64bit_asi ASI_AIUP sn0 ! 0x88 + spill_64bit_asi ASI_AIUP sn0 ! 0x88 - ASI_BLK_AIUP spill_32clean ASI_AIUP sn0 ! 0x8c - spill_64clean ASI_AIUP sn0 ! 0x90 + spill_64clean ASI_AIUP sn0 ! 0x90 - ASI_BLK_AIUP spill_32bit not ! 0x94 spill_64bit not ! 0x98 spill_mixed ! 0x9c tl0_spill_n_other: tl0_reserved 4 ! 0xa0 spill_32bit_asi ASI_AIUS so0 ! 0xa4 - spill_64bit_asi ASI_AIUS so0 ! 0xa8 + spill_64bit_asi ASI_AIUS so0 ! 0xa8 - ASI_BLK_AIUS spill_32bit_asi ASI_AIUS so0 ! 0xac - spill_64bit_asi ASI_AIUS so0 ! 0xb0 + spill_64bit_asi ASI_AIUS so0 ! 0xb0 - ASI_BLK_AIUS tl0_reserved 12 ! 0xb4-0xbf tl0_fill_n_normal: tl0_reserved 4 ! 0xa0 - fill_32bit_asi ASI_AIUP fn0 ! 0xc4 - fill_64bit_asi ASI_AIUP fn0 ! 0xc8 + fill_32bit_asi ASI_AIUP fn0 ! 0xc4 + fill_64bit_asi ASI_AIUP fn0 ! 0xc8 - ASI_LDTD_AIUP - (requires rewrite) fill_32bit_asi ASI_AIUP fn0 ! 0xcc - fill_64bit_asi ASI_AIUP fn0 ! 0xd0 + fill_64bit_asi ASI_AIUP fn0 ! 0xd0 - ASI_LDTD_AIUP - (requires rewrite) fill_32bit not ! 0xd4 fill_64bit not ! 0xd8 fill_mixed ! 0xdc @@ -1892,18 +1892,18 @@ tl1_spill_n_normal: tl1_reserved 4 ! 0x280 spill_32bit_tt1 ASI_AIUP sn1 ! 0x284 - spill_64bit_tt1 ASI_AIUP sn1 ! 0x288 + spill_64bit_tt1 ASI_AIUP sn1 ! 0x288 - ASI_BLK_AIUP spill_32bit_tt1 ASI_AIUP sn1 ! 0x28c - spill_32bit_tt1 ASI_AIUP sn1 ! 0x290 + spill_64bit_tt1 ASI_AIUP sn1 ! 0x290 - ASI_BLK_AIUP tl1_reserved ! 0x294 spill_64bit_ktt1 sk ! 0x298 spill_mixed_ktt1 sk ! 0x29c tl1_spill_n_other: tl1_reserved 4 ! 0x2a0 spill_32bit_tt1 ASI_AIUS so1 ! 0x2a4 - spill_64bit_tt1 ASI_AIUS so1 ! 0x2a8 + spill_64bit_tt1 ASI_AIUS so1 ! 0x2a8 - ASI_BLK_AIUS spill_32bit_tt1 ASI_AIUS so1 ! 0x2ac - spill_64bit_tt1 ASI_AIUS so1 ! 0x2b0 + spill_64bit_tt1 ASI_AIUS so1 ! 0x2b0 - ASI_BLK_AIUS tl1_reserved 12 ! 0x2b4-0x2bf tl1_fill_n_normal: tl1_reserved 32 ! 0x2c0-0x2df From owner-p4-projects@FreeBSD.ORG Fri Feb 17 16:15:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46EEA16A423; Fri, 17 Feb 2006 16:15:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAD1C16A420 for ; Fri, 17 Feb 2006 16:15:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21E8E43D55 for ; Fri, 17 Feb 2006 16:15:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1HGEnPl033688 for ; Fri, 17 Feb 2006 16:14:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1HGEmd9033685 for perforce@freebsd.org; Fri, 17 Feb 2006 16:14:48 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Feb 2006 16:14:48 GMT Message-Id: <200602171614.k1HGEmd9033685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 16:15:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=91931 Change 91931 by jhb@jhb_slimer on 2006/02/17 16:14:19 Fix various nits with ptrace and procfs: - Consistently hold the proc lock when calling ptrace_*single_step(). Also, the caller must have done a _PHOLD() in case the MD code needs to use proc_rwmem(). (I thought about pushing the _PHOLD into the MD code, but then the error handling gets ugly.) For most archs this was a nop (but avoided thrashing the proc lock). Alpha and arm have to drop the proc lock while they overwite the code with breakpoints to do single stepping. - Hold the proc lock across ptrace_set_pc() as well. Dropping it just wasted time. - Assert _PHOLD in proc_rwmem() and stop trying to futz with the vmspace's refcount in proc_rwmem(). The _PHOLD changes should keep the process around. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#82 edit .. //depot/projects/smpng/sys/arm/arm/machdep.c#17 edit .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#23 edit .. //depot/projects/smpng/sys/kern/kern_kse.c#28 edit .. //depot/projects/smpng/sys/kern/sys_process.c#49 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#82 (text+ko) ==== @@ -1756,6 +1756,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -1773,6 +1775,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) &v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -1836,6 +1840,8 @@ static int ptrace_clear_bpt(struct thread *td, struct mdbpt *bpt) { + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); return ptrace_write_int(td, bpt->addr, bpt->contents); } @@ -1844,6 +1850,8 @@ { int error; u_int32_t bpins = 0x00000080; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); error = ptrace_read_int(td, bpt->addr, &bpt->contents); if (error) return error; @@ -1853,12 +1861,20 @@ int ptrace_clear_single_step(struct thread *td) { + struct proc *p; + + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); if (td->td_md.md_flags & MDTD_STEP2) { + PROC_UNLOCK(p); ptrace_clear_bpt(td, &td->td_md.md_sstep[1]); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); + PROC_LOCK(p); td->td_md.md_flags &= ~MDTD_STEP2; } else if (td->td_md.md_flags & MDTD_STEP1) { + PROC_UNLOCK(p); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); + PROC_LOCK(p); td->td_md.md_flags &= ~MDTD_STEP1; } return 0; @@ -1867,6 +1883,7 @@ int ptrace_single_step(struct thread *td) { + struct proc *p; int error; vm_offset_t pc = td->td_frame->tf_regs[FRAME_PC]; alpha_instruction ins; @@ -1876,9 +1893,11 @@ if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) panic("ptrace_single_step: step breakpoints not removed"); + p = td->td_proc; + PROC_UNLOCK(p); error = ptrace_read_int(td, pc, &ins.bits); if (error) - return (error); + goto out; switch (ins.branch_format.opcode) { @@ -1918,18 +1937,20 @@ td->td_md.md_sstep[0].addr = addr[0]; error = ptrace_set_bpt(td, &td->td_md.md_sstep[0]); if (error) - return (error); + goto out; if (count == 2) { td->td_md.md_sstep[1].addr = addr[1]; error = ptrace_set_bpt(td, &td->td_md.md_sstep[1]); if (error) { ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - return (error); + goto out; } td->td_md.md_flags |= MDTD_STEP2; } else td->td_md.md_flags |= MDTD_STEP1; +out: + PROC_LOCK(p); return (error); } ==== //depot/projects/smpng/sys/arm/arm/machdep.c#17 (text+ko) ==== @@ -327,6 +327,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -344,6 +346,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) &v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -359,28 +363,38 @@ int ptrace_single_step(struct thread *td) { + struct proc *p; int error; KASSERT(td->td_md.md_ptrace_instr == 0, ("Didn't clear single step")); + p = td->td_proc; + PROC_UNLOCK(p); error = ptrace_read_int(td, td->td_frame->tf_pc + 4, &td->td_md.md_ptrace_instr); if (error) - return (error); + goto out; error = ptrace_write_int(td, td->td_frame->tf_pc + 4, PTRACE_BREAKPOINT); if (error) td->td_md.md_ptrace_instr = 0; td->td_md.md_ptrace_addr = td->td_frame->tf_pc + 4; +out: + PROC_LOCK(p); return (error); } int ptrace_clear_single_step(struct thread *td) { + struct proc *p; + if (td->td_md.md_ptrace_instr) { + p = td->td_proc; + PROC_UNLOCK(p); ptrace_write_int(td, td->td_md.md_ptrace_addr, td->td_md.md_ptrace_instr); + PROC_LOCK(p); td->td_md.md_ptrace_instr = 0; } return (0); ==== //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#23 (text+ko) ==== @@ -245,9 +245,8 @@ * What does it mean to single step a threaded program? */ case PROCFS_CTL_STEP: + error = proc_sstep(FIRST_THREAD_IN_PROC(p)); /* XXXKSE */ PROC_UNLOCK(p); - error = proc_sstep(FIRST_THREAD_IN_PROC(p)); /* XXXKSE */ - PRELE(p); if (error) return (error); break; ==== //depot/projects/smpng/sys/kern/kern_kse.c#28 (text+ko) ==== @@ -148,7 +148,9 @@ td->td_mailbox = uap->tmbx; td->td_pflags |= TDP_CAN_UNBIND; } + PROC_LOCK(td->td_proc); if (td->td_proc->p_flag & P_TRACED) { + _PHOLD(td->td_proc); if (tmbx.tm_dflags & TMDF_SSTEP) ptrace_single_step(td); else @@ -160,7 +162,9 @@ ku->ku_flags |= KUF_DOUPCALL; mtx_unlock_spin(&sched_lock); } + _PRELE(td->td_proc); } + PROC_UNLOCK(td->td_proc); } return ((error == 0) ? EJUSTRETURN : error); } ==== //depot/projects/smpng/sys/kern/sys_process.c#49 (text+ko) ==== @@ -204,7 +204,9 @@ proc_sstep(struct thread *td) { + _PHOLD(td->td_proc); PROC_ACTION(ptrace_single_step(td)); + _PRELE(td->td_proc); } int @@ -218,22 +220,16 @@ int error, refcnt, writing; /* - * if the vmspace is in the midst of being deallocated or the - * process is exiting, don't try to grab anything. The page table - * usage in that process can be messed up. + * Assert that someone has locked this vmspace. (Should be + * curthread but we can't assert that.) This keeps the process + * from exiting out from under us until this operation completes. */ - vm = p->p_vmspace; - if ((p->p_flag & P_WEXIT)) - return (EFAULT); - do { - if ((refcnt = vm->vm_refcnt) < 1) - return (EFAULT); - } while (!atomic_cmpset_int(&vm->vm_refcnt, refcnt, refcnt + 1)); + KASSERT(p->p_lock >= 1); /* * The map we want... */ - map = &vm->vm_map; + map = &p->p_vmspace->vm_map; writing = uio->uio_rw == UIO_WRITE; reqprot = writing ? (VM_PROT_WRITE | VM_PROT_OVERRIDE_WRITE) : @@ -336,7 +332,6 @@ } while (error == 0 && uio->uio_resid > 0); - vmspace_free(vm); return (error); } @@ -764,13 +759,11 @@ } if (addr != (void *)1) { - PROC_UNLOCK(p); error = ptrace_set_pc(td2, (u_long)(uintfptr_t)addr); if (error) { - PRELE(p); - goto fail_noproc; + _PRELE(p); + goto fail; } - PROC_LOCK(p); } _PRELE(p); From owner-p4-projects@FreeBSD.ORG Fri Feb 17 16:44:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D38116A46A; Fri, 17 Feb 2006 16:44:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0883416A42D for ; Fri, 17 Feb 2006 16:44:37 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90FB843D4C for ; Fri, 17 Feb 2006 16:44:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1HGiPND034993 for ; Fri, 17 Feb 2006 16:44:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1HGiPbx034989 for perforce@freebsd.org; Fri, 17 Feb 2006 16:44:25 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Feb 2006 16:44:25 GMT Message-Id: <200602171644.k1HGiPbx034989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 16:44:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91932 Change 91932 by jhb@jhb_slimer on 2006/02/17 16:43:33 PHOLD around proc_rwmem(). Affected files ... .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#100 edit Differences ... ==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#100 (text+ko) ==== @@ -1097,6 +1097,8 @@ r->rnat = (bspst > kstk && (bspst & 0x1ffL) < (kstk & 0x1ffL)) ? *(uint64_t*)(kstk | 0x1f8L) : rnat; } else { + /* XXX: What if P_WEXIT is set? */ + PHOLD(td->td_proc); iov.iov_base = (void*)(uintptr_t)kstk; iov.iov_len = r->ndirty; uio.uio_iov = &iov; @@ -1114,6 +1116,7 @@ */ if (uio.uio_resid != 0 && error == 0) error = ENOSPC; + PRELE(td->td_proc); } r->bspstore += r->ndirty; From owner-p4-projects@FreeBSD.ORG Fri Feb 17 16:49:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B865A16A424; Fri, 17 Feb 2006 16:49:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91B8D16A420 for ; Fri, 17 Feb 2006 16:49:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4460143D7D for ; Fri, 17 Feb 2006 16:49:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1HGnWDY042662 for ; Fri, 17 Feb 2006 16:49:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1HGnVZk042659 for perforce@freebsd.org; Fri, 17 Feb 2006 16:49:31 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Feb 2006 16:49:31 GMT Message-Id: <200602171649.k1HGnVZk042659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 16:49:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=91933 Change 91933 by jhb@jhb_slimer on 2006/02/17 16:49:17 - Note the S_EXIT stop event before setting P_WEXIT so processes that are watching us can notice the exit w/o getting EIO back. - Do set P_WEXIT before the next wakeup of any waiting processes. They will get EIO, but they weren't listening for exits, so this matches previous behavior. Note that we don't handle multiple listeners at all. (And have never done so it seems) - Move the STOPEVENT and friends up to where we set P_WEXIT to avoid one more set of proc lock / unlock. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exit.c#111 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#111 (text+ko) ==== @@ -173,8 +173,30 @@ */ } + /* + * Wakeup anyone in procfs' PIOCWAIT. They should have a hold + * on our vmspace, so we should block below until they have + * released their reference to us. Note that if they have + * requested S_EXIT stops we will block here until they ack + * via PIOCCONT. + */ + _STOPEVENT(p, S_EXIT, rv); + + /* + * Note that we are exiting and do another wakeup of anyone in + * PIOCWAIT in case they aren't listening for S_EXIT stops or + * decided to wait again after we told them we are exiting. + */ p->p_flag |= P_WEXIT; + wakeup(&p->p_stype); + /* + * Wait for any processes that have a hold on our vmspace to + * release their reference. + */ + while (p->p_lock > 0) + msleep(&p->p_lock, &p->p_mtx, PWAIT, "exithold", 0); + PROC_LOCK(p->p_pptr); sigqueue_take(p->p_ksi); PROC_UNLOCK(p->p_pptr); @@ -196,25 +218,6 @@ mtx_unlock(&ppeers_lock); } - PROC_LOCK(p); - _STOPEVENT(p, S_EXIT, rv); - - /* - * Wakeup anyone in procfs' PIOCWAIT. They should have a hold - * on our vmspace, so we should block below until they have - * released their reference to us. - */ - wakeup(&p->p_stype); - - /* - * Wait for any processes that have a hold on our vmspace to - * release their reference. - */ - while (p->p_lock > 0) - msleep(&p->p_lock, &p->p_mtx, PWAIT, "exithold", 0); - - PROC_UNLOCK(p); - /* * Check if any loadable modules need anything done at process exit. * E.g. SYSV IPC stuff From owner-p4-projects@FreeBSD.ORG Fri Feb 17 18:28:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B55616A423; Fri, 17 Feb 2006 18:28:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4111D16A420 for ; Fri, 17 Feb 2006 18:28:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DAEE43D46 for ; Fri, 17 Feb 2006 18:28:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1HISZ9S046662 for ; Fri, 17 Feb 2006 18:28:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1HISZjf046659 for perforce@freebsd.org; Fri, 17 Feb 2006 18:28:35 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Feb 2006 18:28:35 GMT Message-Id: <200602171828.k1HISZjf046659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 18:28:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=91938 Change 91938 by jhb@jhb_twclab on 2006/02/17 18:27:53 Compile. Affected files ... .. //depot/projects/smpng/sys/kern/sys_process.c#50 edit Differences ... ==== //depot/projects/smpng/sys/kern/sys_process.c#50 (text+ko) ==== @@ -212,19 +212,19 @@ int proc_rwmem(struct proc *p, struct uio *uio) { - struct vmspace *vm; vm_map_t map; vm_object_t backing_object, object = NULL; vm_offset_t pageno = 0; /* page number */ vm_prot_t reqprot; - int error, refcnt, writing; + int error, writing; /* * Assert that someone has locked this vmspace. (Should be * curthread but we can't assert that.) This keeps the process * from exiting out from under us until this operation completes. */ - KASSERT(p->p_lock >= 1); + KASSERT(p->p_lock >= 1, ("%s: process %p (pid %d) not held", __func__, + p, p->p_pid)); /* * The map we want... @@ -1035,7 +1035,6 @@ fail: PROC_UNLOCK(p); -fail_noproc: if (proctree_locked) sx_xunlock(&proctree_lock); return (error); From owner-p4-projects@FreeBSD.ORG Fri Feb 17 18:56:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B92316A423; Fri, 17 Feb 2006 18:56:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 419C016A420 for ; Fri, 17 Feb 2006 18:56:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5662B43D7E for ; Fri, 17 Feb 2006 18:56:10 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1HIuA8o047964 for ; Fri, 17 Feb 2006 18:56:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1HIu9sS047961 for perforce@freebsd.org; Fri, 17 Feb 2006 18:56:09 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Feb 2006 18:56:09 GMT Message-Id: <200602171856.k1HIu9sS047961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 18:56:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=91940 Change 91940 by jhb@jhb_slimer on 2006/02/17 18:55:16 Tidy. Affected files ... .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#42 edit Differences ... ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#42 (text+ko) ==== @@ -189,8 +189,7 @@ PFS_TRACE((pn->pn_name)); if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) - PFS_RETURN (ENOENT); - + PFS_RETURN (ENOENT); VATTR_NULL(vap); vap->va_type = vn->v_type; From owner-p4-projects@FreeBSD.ORG Fri Feb 17 19:29:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CA5716A423; Fri, 17 Feb 2006 19:29:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0902E16A420 for ; Fri, 17 Feb 2006 19:29:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8E8E43D45 for ; Fri, 17 Feb 2006 19:29:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1HJTp48049539 for ; Fri, 17 Feb 2006 19:29:51 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1HJTp5M049535 for perforce@freebsd.org; Fri, 17 Feb 2006 19:29:51 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Feb 2006 19:29:51 GMT Message-Id: <200602171929.k1HJTp5M049535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 19:29:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=91942 Change 91942 by jhb@jhb_slimer on 2006/02/17 19:29:48 Tidy again. Affected files ... .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#43 edit Differences ... ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#43 (text+ko) ==== @@ -189,7 +189,7 @@ PFS_TRACE((pn->pn_name)); if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) - PFS_RETURN (ENOENT); + PFS_RETURN (ENOENT); VATTR_NULL(vap); vap->va_type = vn->v_type; From owner-p4-projects@FreeBSD.ORG Fri Feb 17 20:30:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D461916A423; Fri, 17 Feb 2006 20:30:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A521E16A420 for ; Fri, 17 Feb 2006 20:30:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1AD043D81 for ; Fri, 17 Feb 2006 20:30:04 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1HKU4nv052421 for ; Fri, 17 Feb 2006 20:30:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1HKU44P052418 for perforce@freebsd.org; Fri, 17 Feb 2006 20:30:04 GMT (envelope-from imp@freebsd.org) Date: Fri, 17 Feb 2006 20:30:04 GMT Message-Id: <200602172030.k1HKU44P052418@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 20:30:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=91944 Change 91944 by imp@imp_Speedy on 2006/02/17 20:29:09 Move clock hacking Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#3 (text+ko) ==== @@ -49,14 +49,238 @@ bus_space_tag_t sc_st; bus_space_handle_t sc_sh; device_t dev; + int main_clock_hz; + uint32_t pllb_init; } *pmc_softc; +struct at91pmc_clock +{ + const char *name; + uint32_t hz; + struct at91pmc_clock *parent; + uint32_t pmc_mask; + void (*set_mode)(struct at91pmc_clock *, int); + uint32_t refcnt; + unsigned id:2; + unsigned primary:1; + unsigned pll:1; + unsigned programmable:1; +}; + +static void at91pmc_set_pllb_mode(struct at91pmc_clock *, int); +static void at91pmc_set_sys_mode(struct at91pmc_clock *, int); +static void at91pmc_set_periph_mode(struct at91pmc_clock *, int); + +static struct at91pmc_clock slck = { + .name = "slck", // 32,768 Hz slow clock + .hz = 32768, + .refcnt = 1, + .id = 0, + .primary = 1, +}; + +static struct at91pmc_clock main_ck = { + .name = "main", // Main clock + .refcnt = 1, + .id = 1, + .primary = 1, + .pmc_mask = PMC_IER_MOSCS, +}; + +static struct at91pmc_clock plla = { + .name = "plla", // PLLA Clock, used for CPU clocking + .parent = &main_ck, + .refcnt = 1, + .id = 0, + .primary = 1, + .pll = 1, + .pmc_mask = PMC_IER_LOCKA, +}; + +static struct at91pmc_clock pllb = { + .name = "pllb", // PLLB Clock, used for USB functions + .parent = &main_ck, + .refcnt = 1, + .id = 0, + .primary = 1, + .pll = 1, + .pmc_mask = PMC_IER_LOCKB, + .set_mode = &at91pmc_set_pllb_mode, +}; + +static struct at91pmc_clock udpck = { + .name = "udpck", + .parent = &pllb, + .pmc_mask = PMC_SCER_UDP, + .set_mode = at91pmc_set_sys_mode +}; + +static struct at91pmc_clock uhpck = { + .name = "uhpck", + .parent = &pllb, + .pmc_mask = PMC_SCER_UHP, + .set_mode = at91pmc_set_sys_mode +}; + +static struct at91pmc_clock mck = { + .name = "mck", + .pmc_mask = PMC_IER_MCKRDY, + .refcnt = 1, +}; + +static struct at91pmc_clock udc_clk = { + .name = "udc_clk", + .parent = &mck, + .pmc_mask = 1 << AT91RM92_IRQ_UDP, + .set_mode = &at91pmc_set_periph_mode +}; + +static struct at91pmc_clock ohci_clk = { + .name = "ohci_clk", + .parent = &mck, + .pmc_mask = 1 << AT91RM92_IRQ_UDP, + .set_mode = &at91pmc_set_periph_mode +}; + +static struct at91pmc_clock *const clock_list[] = { + &slck, + &main_ck, + &plla, + &pllb, + &udpck, + &uhpck, + &mck, + &udc_clk, + &ohci_clk +}; + #define RD4(off) \ bus_space_read_4(pmc_softc->sc_st, pmc_softc->sc_sh, (off)) #define WR4(off, val) \ bus_space_write_4(pmc_softc->sc_st, pmc_softc->sc_sh, (off), (val)) +static void +at91pmc_set_pllb_mode(struct at91pmc_clock *clk, int on) +{ +} + +static void +at91pmc_set_sys_mode(struct at91pmc_clock *clk, int on) +{ +} + +static void +at91pmc_set_periph_mode(struct at91pmc_clock *clk, int on) +{ +} + static int +at91pmc_pll_rate(int freq, uint32_t reg, int is_pllb) +{ + uint32_t mul, div; + + div = reg & 0xff; + mul = (reg >> 16) & 0x7ff; + if (div != 0 && mul != 0) { + freq /= div; + freq *= mul + 1; + } else { + freq = 0; + } + if (is_pllb && (reg & (1 << 28))) + freq >>= 1; + return freq; +} + +static uint32_t +at91pmc_pll_calc(uint32_t main_freq, uint32_t out_freq) +{ + uint32_t i, div = 0, mul = 0, diff = 1 << 30; + unsigned ret = (out_freq > 155000000) ? 0xbe00 : 0x3e00; + + /* PLL output max 240 MHz (or 180 MHz per errata) */ + if (out_freq > 240000000) + goto fail; + + for (i = 1; i < 256; i++) { + int32_t diff1; + uint32_t input, mul1; + + /* + * PLL input between 1MHz and 32MHz per spec, but lower + * frequences seem necessary in some cases so allow 100K. + */ + input = main_freq / i; + if (input < 100000) + continue; + if (input > 32000000) + continue; + + mul1 = out_freq / input; + if (mul1 > 2048) + continue; + if (mul1 < 2) + goto fail; + + diff1 = out_freq - input * mul1; + if (diff1 < 0) + diff1 = -diff1; + if (diff > diff1) { + diff = diff1; + div = i; + mul = mul1; + if (diff == 0) + break; + } + } + if (i == 256 && diff > (out_freq >> 5)) + goto fail; + return ret | ((mul - 1) << 16) | div; +fail: + return 0; +} + +static void +at91pmc_init_clock(struct at91pmc_softc *sc, int main_clock) +{ + uint32_t mckr; + int freq; + + sc->main_clock_hz = main_clock; + + /* + * Initialize the usb clock. This sets up pllb, but disables the + * actual clock. + */ + sc->pllb_init = at91pmc_pll_calc(main_clock, 48000000 * 2) |0x10000000; + pllb.hz = at91pmc_pll_rate(main_clock, sc->pllb_init, 1); + WR4(PMC_PCDR, (1 << AT91RM92_IRQ_UHP) | (1 << AT91RM92_IRQ_UDP)); + WR4(PMC_SCDR, PMC_SCER_UHP | PMC_SCER_UDP); + WR4(CKGR_PLLBR, 0); + WR4(PMC_SCER, PMC_SCER_MCKUDP); + + /* + * MCK and PCU derive from one of the primary clocks. Initialize + * this relationship. + */ + mckr = RD4(PMC_MCKR); + mck.parent = clock_list[mckr & 0x3]; + mck.parent->refcnt++; + freq = mck.parent->hz; + freq /= 1 << ((mckr >> 2) & 3); + mck.hz = freq / (1 + ((mckr >> 8) & 3)); + + printf("Main clock is %x\n", RD4(PMC_MCKR)); + + device_printf(sc->dev, "main clock = %d Hz PLLA = %d Hz CPU %d Hz main %d Hz\n", + sc->main_clock_hz, + at91pmc_pll_rate(main_clock, RD4(CKGR_PLLAR), 0), + freq, mck.hz); + WR4(PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 | + PMC_SCER_PCK3); +} + +static int at91pmc_probe(device_t dev) { @@ -75,17 +299,7 @@ if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_PMC_BASE, AT91RM92_PMC_SIZE, &pmc_softc->sc_sh) != 0) panic("couldn't subregion timer registers"); - printf("SCSR: %x\n", RD4(PMC_SCSR)); - WR4(PMC_PCER, 0xffffffff); - printf("PCSR: %x\n", RD4(PMC_PCSR)); - printf("MOR: %x\n", RD4(CKGR_MOR)); - printf("PLLA: %x\n", RD4(CKGR_PLLAR)); - printf("PLLB: %x\n", RD4(CKGR_PLLBR)); - printf("MCFR: %x\n", RD4(CKGR_MCFR)); - printf("MCFR: %x\n", RD4(CKGR_MCFR)); - printf("MCFR: %x\n", RD4(CKGR_MCFR)); - printf("MCKR: %x\n", RD4(PMC_MCKR)); - printf("SR: %x\n", RD4(PMC_SR)); + at91pmc_init_clock(pmc_softc, 10000000); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Feb 17 22:21:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A085016A423; Fri, 17 Feb 2006 22:21:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79BDA16A420 for ; Fri, 17 Feb 2006 22:21:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3302243D46 for ; Fri, 17 Feb 2006 22:21:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1HMLNff064380 for ; Fri, 17 Feb 2006 22:21:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1HMLMKH064377 for perforce@freebsd.org; Fri, 17 Feb 2006 22:21:22 GMT (envelope-from imp@freebsd.org) Date: Fri, 17 Feb 2006 22:21:22 GMT Message-Id: <200602172221.k1HMLMKH064377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2006 22:21:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91952 Change 91952 by imp@imp_plunger on 2006/02/17 22:21:12 Kill old file Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91st.c#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Feb 18 02:57:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BEFA16A423; Sat, 18 Feb 2006 02:57:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C81E516A422 for ; Sat, 18 Feb 2006 02:57:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3277743D4C for ; Sat, 18 Feb 2006 02:57:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1I2vcoU083032 for ; Sat, 18 Feb 2006 02:57:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1I2vb8m083029 for perforce@freebsd.org; Sat, 18 Feb 2006 02:57:37 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 18 Feb 2006 02:57:37 GMT Message-Id: <200602180257.k1I2vb8m083029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91975 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Feb 2006 02:57:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91975 Change 91975 by kmacy@kmacy_storage:sun4v_work on 2006/02/18 02:57:18 flesh out initial register spill-fill handling code remove rwindow.c as its rwindow_load / rwindow_store as it is all code that should be handled in assembler Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/rwindow.c#2 delete Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#8 (text+ko) ==== @@ -101,47 +101,79 @@ /* * Macros for spilling and filling live windows. + * Here we use the more complicated [regaddr] format which requires + * us to interleave setting the globals in order to be able to use + * imm_asi - we don't ever implicitly assume kernel context as in + * Solaris' spill/fill handlers so that we have the option of using + * block initializing stores - twin doubleword loads could also be + * advantageous but will require an additional macro * - * NOTE: These macros use exactly 16 instructions, and it is assumed that the - * handler will not use more than 24 instructions total, to leave room for - * resume vectors which occupy the last 8 instructions. */ -#define SPILL(storer, base, size, asi) \ - storer %l0, [base + (0 * size)] asi ; \ - storer %l1, [base + (1 * size)] asi ; \ - storer %l2, [base + (2 * size)] asi ; \ - storer %l3, [base + (3 * size)] asi ; \ - storer %l4, [base + (4 * size)] asi ; \ - storer %l5, [base + (5 * size)] asi ; \ - storer %l6, [base + (6 * size)] asi ; \ - storer %l7, [base + (7 * size)] asi ; \ - storer %i0, [base + (8 * size)] asi ; \ - storer %i1, [base + (9 * size)] asi ; \ - storer %i2, [base + (10 * size)] asi ; \ - storer %i3, [base + (11 * size)] asi ; \ - storer %i4, [base + (12 * size)] asi ; \ - storer %i5, [base + (13 * size)] asi ; \ - storer %i6, [base + (14 * size)] asi ; \ - storer %i7, [base + (15 * size)] asi +#define SPILL(storer, bias, size, asi) \ + mov 0 + bias, %g1 ;\ + storer %l0, [%sp + %g1]asi ;\ + mov size + bias, %g2 ;\ + storer %l1, [%sp + %g2]asi ;\ + mov (2 * size) + bias, %g3 ;\ + storer %l2, [%sp + %g3]asi ;\ + mov (3 * size) + bias, %g4 ;\ + storer %l3, [%sp + %g4]asi ;\ + add %sp, (4 * size), %g5 ;\ + storer %l4, [%g5 + %g1]asi ;\ + storer %l5, [%g5 + %g2]asi ;\ + storer %l6, [%g5 + %g3]asi ;\ + storer %l7, [%g5 + %g4]asi ;\ + add %sp, (4 * size), %g5 ;\ + storer %i0, [%g5 + %g1]asi ;\ + storer %i1, [%g5 + %g2]asi ;\ + storer %i2, [%g5 + %g3]asi ;\ + storer %i3, [%g5 + %g4]asi ;\ + add %sp, (4 * size), %g5 ;\ + storer %i4, [%g5 + %g1]asi ;\ + storer %i5, [%g5 + %g2]asi ;\ + storer %i6, [%g5 + %g3]asi ;\ + storer %i7, [%g5 + %g4]asi + +#define FILL(loader, bias, size, asi) \ + mov 0 + bias, %g1 ;\ + loader [%sp + %g1]asi, %l0 ;\ + mov size + bias, %g2 ;\ + loader [%sp + %g2]asi, %l1 ;\ + mov (2 * size) + bias, %g3 ;\ + loader [%sp + %g3]asi, %l2 ;\ + mov (3 * size) + bias, %g4 ;\ + loader [%sp + %g4]asi, %l3 ;\ + add %sp, (4 * size), %g5 ;\ + loader [%g5 + %g1]asi, %l4 ;\ + loader [%g5 + %g2]asi, %l5 ;\ + loader [%g5 + %g3]asi, %l6 ;\ + loader [%g5 + %g4]asi, %l7 ;\ + add %sp, (4 * size), %g5 ;\ + loader [%g5 + %g1]asi, %i0 ;\ + loader [%g5 + %g2]asi, %i1 ;\ + loader [%g5 + %g3]asi, %i2 ;\ + loader [%g5 + %g4]asi, %i3 ;\ + add %sp, (4 * size), %g5 ;\ + loader [%g5 + %g1]asi, %i4 ;\ + loader [%g5 + %g2]asi, %i5 ;\ + loader [%g5 + %g3]asi, %i6 ;\ + loader [%g5 + %g4]asi, %i7 -#define FILL(loader, base, size, asi) \ - loader [base + (0 * size)] asi, %l0 ; \ - loader [base + (1 * size)] asi, %l1 ; \ - loader [base + (2 * size)] asi, %l2 ; \ - loader [base + (3 * size)] asi, %l3 ; \ - loader [base + (4 * size)] asi, %l4 ; \ - loader [base + (5 * size)] asi, %l5 ; \ - loader [base + (6 * size)] asi, %l6 ; \ - loader [base + (7 * size)] asi, %l7 ; \ - loader [base + (8 * size)] asi, %i0 ; \ - loader [base + (9 * size)] asi, %i1 ; \ - loader [base + (10 * size)] asi, %i2 ; \ - loader [base + (11 * size)] asi, %i3 ; \ - loader [base + (12 * size)] asi, %i4 ; \ - loader [base + (13 * size)] asi, %i5 ; \ - loader [base + (14 * size)] asi, %i6 ; \ - loader [base + (15 * size)] asi, %i7 +#define FILL_DW(asi) \ + mov 0 + SPOFF, %g1 ;\ + ldda [%sp + %g1]asi, %l0 ;\ + mov 16 + SPOFF, %g2 ;\ + ldda [%sp + %g2]asi, %l2 ;\ + add %sp, 32, %g3 ;\ + ldda [%g3 + %g1]asi, %l4 ;\ + ldda [%g3 + %g2]asi, %l6 ;\ + add %sp, 32, %g3 ;\ + ldda [%g3 + %g1]asi, %i0 ;\ + ldda [%g3 + %g2]asi, %i2 ;\ + add %sp, 32, %g3 ;\ + ldda [%g3 + %g1]asi, %i4 ;\ + ldda [%g3 + %g2]asi, %i6 #define ERRATUM50(reg) mov reg, reg @@ -314,41 +346,7 @@ retry ; \ .align 16 -/* - * Generate a T_SPILL or T_FILL trap if the window operation fails. - */ -#define RSF_TRAP(type) \ - ba %xcc, tl0_sftrap ; \ - mov type, %g2 ; \ - .align 16 -/* - * Game over if the window operation fails. - */ -#define RSF_FATAL(type) \ - ba %xcc, rsf_fatal ; \ - mov type, %g2 ; \ - .align 16 - -/* - * Magic to resume from a failed fill a few instructions after the corrsponding - * restore. This is used on return from the kernel to usermode. - */ -#define RSF_FILL_MAGIC \ - rdpr %tnpc, %g1 ; \ - add %g1, RSF_FILL_INC, %g1 ; \ - wrpr %g1, 0, %tnpc ; \ - done ; \ - .align 16 - -/* - * Spill to the pcb if a spill to the user stack in kernel mode fails. - */ -#define RSF_SPILL_TOPCB \ - ba,a %xcc, tl1_spill_topcb ; \ - nop ; \ - .align 16 - ENTRY(rsf_fatal) #if KTR_COMPILE & KTR_TRAP CATR(KTR_TRAP, "rsf_fatal: bad window trap tt=%#lx type=%#lx" @@ -523,65 +521,148 @@ .align 32 .endm - .macro spill_32bit_asi asi target + + +#define spill_32bit_asi(asi, target) \ + srl %sp, 0, %sp ; \ + SPILL(sta, 0, 4, asi) ; \ + saved ; \ + retry ; \ + .skip (31-26)*4 ; \ + ba,a,pt %xcc, fault_32bit_##target ; \ + .align 128 + +#define spill_64bit_asi(asi, target) \ + SPILL(stxa, SPOFF, 8, asi) ; \ + saved ; \ + retry ; \ + .skip (31-25)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + .align 128 + +#define spill_32clean(asi, target) \ + srl %sp, 0, %sp ; \ + SPILL(sta, 0, 4, asi) ; \ + b spill_clean ; \ + mov WSTATE_USER32, %g7 ; \ + .skip (31-26)*4 ; \ + ba,a,pt %xcc, fault_32bit_##target ; \ .align 128 + +#define spill_64clean(asi, target) \ + SPILL(stxa, SPOFF, 8, asi) ; \ + b spill_clean ; \ + mov WSTATE_USER64, %g7 ; \ + .skip (31-25)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + .align 128 + +#define fill_32bit_asi(asi, target) \ + srl %sp, 0, %sp ; \ + FILL(lda, 0, 4, asi) ; \ + saved ; \ + retry ; \ + .skip (31-26)*4 ; \ + ba,a,pt %xcc, fault_32bit_##target ; \ + .align 128 + +#define fill_64bit_asi(asi, target) \ + FILL(ldxa, SPOFF, 8, asi) ; \ + saved ; \ + retry ; \ + .skip (31-25)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + .align 128 + + .macro spill_32bit_primary_sn0 + spill_32bit_asi(ASI_AIUP, sn0) + .endm + + .macro spill_64bit_primary_sn0 + spill_64bit_asi(ASI_AIUP, sn0) .endm - .macro spill_64bit_asi asi target - .align 128 + .macro spill_32clean_primary_sn0 + spill_32clean(ASI_AIUP, sn0) + .endm + + .macro spill_64clean_primary_sn0 + spill_64clean(ASI_AIUP, sn0) .endm - .macro spill_32bit target - .align 128 + .macro spill_32bit_nucleus_not + spill_32bit_asi(ASI_N, not) .endm - .macro spill_64bit target - .align 128 + .macro spill_64bit_nucleus_not + spill_64bit_asi(ASI_N,not) .endm - .macro spill_64bit_ktt1 target - .align 128 + .macro spill_32bit_secondary_so0 + spill_32bit_asi(ASI_AIUS, so0) .endm - .macro spill_mixed_ktt1 target - .align 128 + .macro spill_64bit_secondary_so0 + spill_64bit_asi(ASI_AIUS, so0) + .endm + + .macro fill_32bit_primary_fn0 + fill_32bit_asi(ASI_AIUP, fn0) .endm - .macro spill_32bit_tt1 asi target - .align 128 + .macro fill_64bit_primary_fn0 + fill_64bit_asi(ASI_AIUP, fn0) .endm - .macro spill_64bit_tt1 asi target - .align 128 + .macro fill_32bit_nucleus_not + fill_32bit_asi(ASI_N, not) .endm - .macro spill_32clean asi target - .align 128 + .macro fill_64bit_nucleus_not + fill_64bit_asi(ASI_N, not) .endm - .macro spill_64clean asi target - .align 128 + .macro spill_32bit_tt1_primary_sn1 + ba,a,pt %xcc, fault_32bit_sn1 + nop + .align 128 .endm - .macro spill_mixed - .align 128 + .macro spill_64bit_tt1_primary_sn1 + ba,a,pt %xcc, fault_64bit_sn1 + nop + .align 128 .endm + .macro spill_64bit_ktt1_sk + ba,a,pt %xcc, fault_64bit_sk + nop + .align 128 + .endm - - .macro fill_32bit_asi asi target - .align 128 + .macro spill_mixed_ktt1_sk + btst 1, %sp + bz,a,pt %xcc, fault_32bit_sk + srl %sp, 0, %sp + ba,a,pt %xcc, fault_64bit_sk + nop + .align 128 .endm - .macro fill_64bit_asi asi target - .align 128 + .macro spill_32bit_tt1_secondary_so1 + ba,a,pt %xcc, fault_32bit_so1 + nop + .align 128 .endm - .macro fill_32bit target - .align 128 + .macro spill_64bit_tt1_secondary_so1 + ba,a,pt %xcc, fault_64bit_so1 + nop + .align 128 + .endm - .macro fill_64bit target + .macro spill_mixed .align 128 .endm @@ -1064,45 +1145,6 @@ mov T_DATA_PROTECTION | T_KERNEL, %o0 END(tl0_dmmu_prot_trap) - .macro tl0_spill_0_n - wr %g0, ASI_AIUP, %asi - SPILL(stxa, %sp + SPOFF, 8, %asi) - saved - retry - .align 32 - RSF_TRAP(T_SPILL) - RSF_TRAP(T_SPILL) - .endm - - .macro tl0_spill_1_n - wr %g0, ASI_AIUP, %asi - SPILL(stwa, %sp, 4, %asi) - saved - retry - .align 32 - RSF_TRAP(T_SPILL) - RSF_TRAP(T_SPILL) - .endm - - .macro tl0_fill_0_n - wr %g0, ASI_AIUP, %asi - FILL(ldxa, %sp + SPOFF, 8, %asi) - restored - retry - .align 32 - RSF_TRAP(T_FILL) - RSF_TRAP(T_FILL) - .endm - - .macro tl0_fill_1_n - wr %g0, ASI_AIUP, %asi - FILL(lduwa, %sp, 4, %asi) - restored - retry - .align 32 - RSF_TRAP(T_FILL) - RSF_TRAP(T_FILL) - .endm #endif /* notyet */ ENTRY(tl0_sftrap) rdpr %tstate, %g1 @@ -1602,142 +1644,8 @@ mov T_DATA_PROTECTION | T_KERNEL, %o0 END(tl1_dmmu_prot_trap) #endif /* notyet */ - .macro tl1_spill_0_n - SPILL(stx, %sp + SPOFF, 8, EMPTY) - saved - retry - .align 32 - RSF_FATAL(T_SPILL) - RSF_FATAL(T_SPILL) - .endm - - .macro tl1_spill_2_n - wr %g0, ASI_AIUP, %asi - SPILL(stxa, %sp + SPOFF, 8, %asi) - saved - retry - .align 32 - RSF_SPILL_TOPCB - RSF_SPILL_TOPCB - .endm - - .macro tl1_spill_3_n - wr %g0, ASI_AIUP, %asi - SPILL(stwa, %sp, 4, %asi) - saved - retry - .align 32 - RSF_SPILL_TOPCB - RSF_SPILL_TOPCB - .endm - - .macro tl1_spill_0_o - wr %g0, ASI_AIUP, %asi - SPILL(stxa, %sp + SPOFF, 8, %asi) - saved - retry - .align 32 - RSF_SPILL_TOPCB - RSF_SPILL_TOPCB - .endm - - .macro tl1_spill_1_o - wr %g0, ASI_AIUP, %asi - SPILL(stwa, %sp, 4, %asi) - saved - retry - .align 32 - RSF_SPILL_TOPCB - RSF_SPILL_TOPCB - .endm - - .macro tl1_spill_2_o - RSF_SPILL_TOPCB - .align 128 - .endm - - .macro tl1_fill_0_n - FILL(ldx, %sp + SPOFF, 8, EMPTY) - restored - retry - .align 32 - RSF_FATAL(T_FILL) - RSF_FATAL(T_FILL) - .endm - - .macro tl1_fill_2_n - wr %g0, ASI_AIUP, %asi - FILL(ldxa, %sp + SPOFF, 8, %asi) - restored - retry - .align 32 - RSF_FILL_MAGIC - RSF_FILL_MAGIC - .endm - - .macro tl1_fill_3_n - wr %g0, ASI_AIUP, %asi - FILL(lduwa, %sp, 4, %asi) - restored - retry - .align 32 - RSF_FILL_MAGIC - RSF_FILL_MAGIC - .endm - -/* - * This is used to spill windows that are still occupied with user - * data on kernel entry to the pcb. - */ -ENTRY(tl1_spill_topcb) -#ifdef notyet - /* XXX SUN4V_FIXME - I think this broken from a performance - * standpoint - */ - LOAD_ALT - - /* Free some globals for our use. */ - dec 24, ASP_REG - stx %g1, [ASP_REG + 0] - stx %g2, [ASP_REG + 8] - stx %g3, [ASP_REG + 16] - - ldx [PCB_REG + PCB_NSAVED], %g1 - - sllx %g1, PTR_SHIFT, %g2 - add %g2, PCB_REG, %g2 - stx %sp, [%g2 + PCB_RWSP] - - sllx %g1, RW_SHIFT, %g2 - add %g2, PCB_REG, %g2 - SPILL(stx, %g2 + PCB_RW, 8, EMPTY) - - inc %g1 - stx %g1, [PCB_REG + PCB_NSAVED] -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, "tl1_spill_topcb: pc=%#lx npc=%#lx sp=%#lx nsaved=%d" - , %g1, %g2, %g3, 7, 8, 9) - rdpr %tpc, %g2 - stx %g2, [%g1 + KTR_PARM1] - rdpr %tnpc, %g2 - stx %g2, [%g1 + KTR_PARM2] - stx %sp, [%g1 + KTR_PARM3] - ldx [PCB_REG + PCB_NSAVED], %g2 - stx %g2, [%g1 + KTR_PARM4] -9: -#endif - - saved - ldx [ASP_REG + 16], %g3 - ldx [ASP_REG + 8], %g2 - ldx [ASP_REG + 0], %g1 - inc 24, ASP_REG - retry -END(tl1_spill_topcb) -#endif - .macro tl1_soft count .rept \count tl1_gen T_SOFT | T_KERNEL @@ -1808,28 +1716,28 @@ nonresumable_error ! 0x7f tl0_spill_n_normal: tl0_reserved 4 ! 0x80 - spill_32bit_asi ASI_AIUP sn0 ! 0x84 - spill_64bit_asi ASI_AIUP sn0 ! 0x88 - ASI_BLK_AIUP - spill_32clean ASI_AIUP sn0 ! 0x8c - spill_64clean ASI_AIUP sn0 ! 0x90 - ASI_BLK_AIUP - spill_32bit not ! 0x94 - spill_64bit not ! 0x98 + spill_32bit_primary_sn0 ! 0x84 + spill_64bit_primary_sn0 ! 0x88 + spill_32clean_primary_sn0 ! 0x8c + spill_64clean_primary_sn0 ! 0x90 + spill_32bit_nucleus_not ! 0x94 + spill_64bit_nucleus_not ! 0x98 spill_mixed ! 0x9c tl0_spill_n_other: tl0_reserved 4 ! 0xa0 - spill_32bit_asi ASI_AIUS so0 ! 0xa4 - spill_64bit_asi ASI_AIUS so0 ! 0xa8 - ASI_BLK_AIUS - spill_32bit_asi ASI_AIUS so0 ! 0xac - spill_64bit_asi ASI_AIUS so0 ! 0xb0 - ASI_BLK_AIUS + spill_32bit_secondary_so0 ! 0xa4 + spill_64bit_secondary_so0 ! 0xa8 + spill_32bit_secondary_so0 ! 0xac + spill_64bit_secondary_so0 ! 0xb0 tl0_reserved 12 ! 0xb4-0xbf tl0_fill_n_normal: tl0_reserved 4 ! 0xa0 - fill_32bit_asi ASI_AIUP fn0 ! 0xc4 - fill_64bit_asi ASI_AIUP fn0 ! 0xc8 - ASI_LDTD_AIUP - (requires rewrite) - fill_32bit_asi ASI_AIUP fn0 ! 0xcc - fill_64bit_asi ASI_AIUP fn0 ! 0xd0 - ASI_LDTD_AIUP - (requires rewrite) - fill_32bit not ! 0xd4 - fill_64bit not ! 0xd8 + fill_32bit_primary_fn0 ! 0xc4 + fill_64bit_primary_fn0 ! 0xc8 + fill_32bit_primary_fn0 ! 0xcc + fill_64bit_primary_fn0 ! 0xd0 + fill_32bit_nucleus_not ! 0xd4 + fill_64bit_nucleus_not ! 0xd8 fill_mixed ! 0xdc tl0_fill_n_other: tl0_reserved 32 ! 0xe0-0xff @@ -1891,26 +1799,49 @@ nonresumable_error ! 0x27f tl1_spill_n_normal: tl1_reserved 4 ! 0x280 - spill_32bit_tt1 ASI_AIUP sn1 ! 0x284 - spill_64bit_tt1 ASI_AIUP sn1 ! 0x288 - ASI_BLK_AIUP - spill_32bit_tt1 ASI_AIUP sn1 ! 0x28c - spill_64bit_tt1 ASI_AIUP sn1 ! 0x290 - ASI_BLK_AIUP + spill_32bit_tt1_primary_sn1 ! 0x284 + spill_64bit_tt1_primary_sn1 ! 0x288 + spill_32bit_tt1_primary_sn1 ! 0x28c + spill_64bit_tt1_primary_sn1 ! 0x290 tl1_reserved ! 0x294 - spill_64bit_ktt1 sk ! 0x298 - spill_mixed_ktt1 sk ! 0x29c + spill_64bit_ktt1_sk ! 0x298 + spill_mixed_ktt1_sk ! 0x29c tl1_spill_n_other: tl1_reserved 4 ! 0x2a0 - spill_32bit_tt1 ASI_AIUS so1 ! 0x2a4 - spill_64bit_tt1 ASI_AIUS so1 ! 0x2a8 - ASI_BLK_AIUS - spill_32bit_tt1 ASI_AIUS so1 ! 0x2ac - spill_64bit_tt1 ASI_AIUS so1 ! 0x2b0 - ASI_BLK_AIUS + spill_32bit_tt1_secondary_so1 ! 0x2a4 + spill_64bit_tt1_secondary_so1 ! 0x2a8 + spill_32bit_tt1_secondary_so1 ! 0x2ac + spill_64bit_tt1_secondary_so1 ! 0x2b0 tl1_reserved 12 ! 0x2b4-0x2bf tl1_fill_n_normal: tl1_reserved 32 ! 0x2c0-0x2df tl1_fill_n_other: tl1_reserved 32 ! 0x2e0-0x2ff +/* + * no discretionary traps at TL 1 - leaving us with a 24k trap table + */ +spill_clean: + sethi %hi(nwin_minus_one), %g5 + ld [%g5 + %lo(nwin_minus_one)], %g5 + rdpr %cwp, %g6 + deccc %g6 + movneg %xcc, %g5, %g6 ! if (--%cwp < 0) %g6 = nwin-1 + wrpr %g6, %cwp + clr %l0 + clr %l1 + clr %l2 + clr %l3 + clr %l4 + clr %l5 + clr %l6 + clr %l7 + wrpr %g0, %g7, %wstate + saved + retry + + /* * User trap entry point. * ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#4 (text+ko) ==== @@ -37,7 +37,10 @@ .globl kernbase .set kernbase,KERNBASE - + + .globl nwin_minus_one + .set nwin_minus_one,7 + /* * void _start(caddr_t metadata, u_long o1, u_long o2, u_long o3, * u_long ofw_vec) From owner-p4-projects@FreeBSD.ORG Sat Feb 18 17:08:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C0D416A420; Sat, 18 Feb 2006 17:08:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A76716A420 for ; Sat, 18 Feb 2006 17:08:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDF2B43D45 for ; Sat, 18 Feb 2006 17:08:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1IH8hSb050148 for ; Sat, 18 Feb 2006 17:08:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1IH8hIF050143 for perforce@freebsd.org; Sat, 18 Feb 2006 17:08:43 GMT (envelope-from imp@freebsd.org) Date: Sat, 18 Feb 2006 17:08:43 GMT Message-Id: <200602181708.k1IH8hIF050143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Feb 2006 17:08:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=91995 Change 91995 by imp@imp_harmony on 2006/02/18 17:08:21 @91961 Affected files ... .. //depot/projects/arm/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#13 delete .. //depot/projects/arm/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/arm/src/sys/arm/at91/std.at91rm92#3 delete .. //depot/projects/arm/src/sys/arm/at91/std.kb920x#3 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#9 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#8 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/arm/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/arm/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/arm/src/sys/modules/if_vlan/Makefile#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/arm/src/sys/pci/agp_intel.c#5 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#9 integrate .. //depot/projects/arm/src/sys/sys/param.h#10 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#5 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#6 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/at91/std.kb920x#3 (text+ko) ==== @@ -1,5 +1,5 @@ -#$FreeBSD$ -include "../at91/std.at91rm92" +#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.2 2006/02/17 22:33:13 imp Exp $ +include "../at91/std.at91" files "../at91/files.kb920x" makeoptions KERNPHYSADDR=0x20000000 ==== //depot/projects/arm/src/sys/conf/kmod.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.202 2006/02/04 06:22:27 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.203 2006/02/17 04:59:23 obrien Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -240,7 +240,7 @@ esac ; \ path=`(cd $$path && /bin/pwd)` ; \ ${ECHO} ${.TARGET} "->" $$path ; \ - ln -s $$path ${.TARGET} + ln -sf $$path ${.TARGET} CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS} @@ -299,7 +299,7 @@ CLEANFILES+= ${_src} .if !target(${_src}) ${_src}: - ln -s ${KERNBUILDDIR}/${_src} ${.TARGET} + ln -sf ${KERNBUILDDIR}/${_src} ${.TARGET} .endif .endfor .else ==== //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.158 2006/02/13 13:47:58 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.159 2006/02/16 17:09:24 sos Exp $"); #include "opt_ata.h" #include @@ -100,6 +100,10 @@ static int ata_ite_chipinit(device_t dev); static void ata_ite_setmode(device_t dev, int mode); static int ata_jmicron_chipinit(device_t dev); +static int ata_jmicron_allocate(device_t dev); +static void ata_jmicron_reset(device_t dev); +static void ata_jmicron_dmainit(device_t dev); +static void ata_jmicron_setmode(device_t dev, int mode); static int ata_marvell_chipinit(device_t dev); static int ata_marvell_allocate(device_t dev); static int ata_marvell_status(device_t dev); @@ -2065,6 +2069,7 @@ struct ata_chip_id *idx; static struct ata_chip_id ids[] = {{ ATA_JMB360, 0, 0, 0, ATA_SA300, "JMB360" }, + { ATA_JMB363, 0, 1, 0, ATA_SA300, "JMB363" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -2087,49 +2092,110 @@ if (ata_setup_interrupt(dev)) return ENXIO; + /* set controller configuration to a setup we support */ + pci_write_config(dev, 0x40, 0x80c0a131, 4); + + ctlr->allocate = ata_jmicron_allocate; + ctlr->reset = ata_jmicron_reset; + ctlr->dmainit = ata_jmicron_dmainit; + ctlr->setmode = ata_jmicron_setmode; + ctlr->r_type2 = SYS_RES_MEMORY; ctlr->r_rid2 = PCIR_BAR(5); - if (!(ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, - &ctlr->r_rid2, RF_ACTIVE))) - return ENXIO; + if ((ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, + &ctlr->r_rid2, RF_ACTIVE))) { + /* reset AHCI controller */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); + DELAY(1000000); + if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { + bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2,ctlr->r_res2); + device_printf(dev, "AHCI controller reset failure\n"); + return ENXIO; + } + + /* enable AHCI mode */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_AE); + + /* get the number of HW channels */ + ctlr->channels = + (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_NPMASK) + 1; + + /* clear interrupts */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_IS, ATA_INL(ctlr->r_res2, ATA_AHCI_IS)); + + /* enable AHCI interrupts */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_IE); + + /* enable PCI interrupt */ + pci_write_config(dev, PCIR_COMMAND, + pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); + } + /* add in PATA channel(s) */ + ctlr->channels += ctlr->chip->cfg1; + return 0; +} - /* enable AHCI mode */ - pci_write_config(dev, 0x41, 0xa1, 1); +static int +ata_jmicron_allocate(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + int error; - /* reset AHCI controller */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); - DELAY(1000000); - if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { - bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2, ctlr->r_res2); - device_printf(dev, "AHCI controller reset failure\n"); - return ENXIO; + if (ch->unit >= 2) { + ch->unit -= 2; + error = ata_pci_allocate(dev); + ch->unit += 2; } + else + error = ata_ahci_allocate(dev); + return error; +} + +static void +ata_jmicron_reset(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); - /* enable AHCI mode */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_AE); + if (ch->unit >= 2) + ata_generic_reset(dev); + else + ata_ahci_reset(dev); +} + +static void +ata_jmicron_dmainit(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); - /* get the number of HW channels */ - ctlr->channels = (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_NPMASK) +1; + if (ch->unit >= 2) + ata_pci_dmainit(dev); + else + ata_ahci_dmainit(dev); +} - ctlr->allocate = ata_ahci_allocate; - ctlr->reset = ata_ahci_reset; - ctlr->dmainit = ata_ahci_dmainit; - ctlr->setmode = ata_sata_setmode; +static void +ata_jmicron_setmode(device_t dev, int mode) +{ + struct ata_channel *ch = device_get_softc(device_get_parent(dev)); - /* clear interrupts */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_IS, ATA_INL(ctlr->r_res2, ATA_AHCI_IS)); + if (ch->unit >= 2) { + struct ata_device *atadev = device_get_softc(dev); - /* enable AHCI interrupts */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_IE); + /* check for 80pin cable present */ + if (pci_read_config(dev, 0x40, 1) & 0x08) + mode = ata_limit_mode(dev, mode, ATA_UDMA2); + else + mode = ata_limit_mode(dev, mode, ATA_UDMA6); - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); - return 0; + if (!ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode)) + atadev->mode = mode; + } + else + ata_sata_setmode(dev, mode); } ==== //depot/projects/arm/src/sys/dev/ata/ata-pci.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.115 2006/02/09 20:53:32 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.116 2006/02/16 17:09:24 sos Exp $"); #include "opt_ata.h" #include @@ -59,9 +59,6 @@ #define IOMASK 0xfffffffc #define ATA_PROBE_OK -10 -/* prototypes */ -static void ata_pci_dmainit(device_t); - int ata_legacy(device_t dev) { @@ -505,7 +502,7 @@ ch->dma->unload(dev); } -static void +void ata_pci_dmainit(device_t dev) { struct ata_channel *ch = device_get_softc(dev); ==== //depot/projects/arm/src/sys/dev/ata/ata-pci.h#8 (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/dev/ata/ata-pci.h,v 1.62 2006/01/25 23:07:42 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.63 2006/02/16 17:09:24 sos Exp $ */ /* structure holding chipset config info */ @@ -161,6 +161,7 @@ #define ATA_JMICRON_ID 0x197b #define ATA_JMB360 0x2360197b +#define ATA_JMB363 0x2363197b #define ATA_MARVELL_ID 0x11ab #define ATA_M88SX5040 0x504011ab @@ -401,6 +402,7 @@ int ata_pci_allocate(device_t dev); void ata_pci_hw(device_t dev); int ata_pci_status(device_t dev); +void ata_pci_dmainit(device_t); /* global prototypes ata-chipset.c */ ==== //depot/projects/arm/src/sys/dev/ata/ata-raid.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.117 2006/01/18 13:10:17 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.118 2006/02/17 13:02:09 sos Exp $"); #include "opt_ata.h" #include @@ -71,6 +71,8 @@ static int ata_raid_intel_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_intel_write_meta(struct ar_softc *rdp); static int ata_raid_ite_read_meta(device_t dev, struct ar_softc **raidp); +static int ata_raid_jmicron_read_meta(device_t dev, struct ar_softc **raidp); +static int ata_raid_jmicron_write_meta(struct ar_softc *rdp); static int ata_raid_lsiv2_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_lsiv3_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_nvidia_read_meta(device_t dev, struct ar_softc **raidp); @@ -95,6 +97,7 @@ static void ata_raid_hptv3_print_meta(struct hptv3_raid_conf *meta); static void ata_raid_intel_print_meta(struct intel_raid_conf *meta); static void ata_raid_ite_print_meta(struct ite_raid_conf *meta); +static void ata_raid_jmicron_print_meta(struct jmicron_raid_conf *meta); static void ata_raid_lsiv2_print_meta(struct lsiv2_raid_conf *meta); static void ata_raid_lsiv3_print_meta(struct lsiv3_raid_conf *meta); static void ata_raid_nvidia_print_meta(struct nvidia_raid_conf *meta); @@ -937,6 +940,11 @@ rdp->disks[disk].sectors = ITE_LBA(rdp->disks[disk].dev); break; + case ATA_JMICRON_ID: + ctlr = AR_F_JMICRON_RAID; + rdp->disks[disk].sectors = JMICRON_LBA(rdp->disks[disk].dev); + break; + case 0: /* XXX SOS cover up for bug in our PCI code */ case ATA_PROMISE_ID: ctlr = AR_F_PROMISE_RAID; @@ -1072,6 +1080,10 @@ rdp->interleave = min(max(2, rdp->interleave), 128); /*+*/ break; + case AR_F_JMICRON_RAID: + rdp->interleave = min(max(8, rdp->interleave), 256); /*+*/ + break; + case AR_F_LSIV2_RAID: rdp->interleave = min(max(2, rdp->interleave), 4096); break; @@ -1274,6 +1286,11 @@ return 0; break; + case ATA_JMICRON_ID: + if (ata_raid_jmicron_read_meta(subdisk, ata_raid_arrays)) + return 0; + break; + case ATA_NVIDIA_ID: if (ata_raid_nvidia_read_meta(subdisk, ata_raid_arrays)) return 0; @@ -1339,6 +1356,9 @@ case AR_F_INTEL_RAID: return ata_raid_intel_write_meta(rdp); + case AR_F_JMICRON_RAID: + return ata_raid_jmicron_write_meta(rdp); + case AR_F_SIS_RAID: return ata_raid_sis_write_meta(rdp); @@ -1410,6 +1430,11 @@ size = sizeof(struct ite_raid_conf); break; + case AR_F_JMICRON_RAID: + lba = JMICRON_LBA(rdp->disks[disk].dev); + size = sizeof(struct jmicron_raid_conf); + break; + case AR_F_LSIV2_RAID: lba = LSIV2_LBA(rdp->disks[disk].dev); size = sizeof(struct lsiv2_raid_conf); @@ -2392,6 +2417,231 @@ return retval; } +/* JMicron Technology Corp Metadata */ +static int +ata_raid_jmicron_read_meta(device_t dev, struct ar_softc **raidp) +{ + struct ata_raid_subdisk *ars = device_get_softc(dev); + device_t parent = device_get_parent(dev); + struct jmicron_raid_conf *meta; + struct ar_softc *raid = NULL; + u_int16_t checksum, *ptr; + u_int64_t disk_size; + int count, array, disk, total_disks, retval = 0; + + if (!(meta = (struct jmicron_raid_conf *) + malloc(sizeof(struct jmicron_raid_conf), M_AR, M_NOWAIT | M_ZERO))) + return ENOMEM; + + if (ata_raid_rw(parent, JMICRON_LBA(parent), + meta, sizeof(struct jmicron_raid_conf), ATA_R_READ)) { + if (testing || bootverbose) + device_printf(parent, + "JMicron read metadata failed\n"); + } + + /* check for JMicron signature */ + if (strncmp(meta->signature, JMICRON_MAGIC, 2)) { + if (testing || bootverbose) + device_printf(parent, "JMicron check1 failed\n"); + goto jmicron_out; + } + + /* calculate checksum and compare for valid */ + for (checksum = 0, ptr = (u_int16_t *)meta, count = 0; count < 64; count++) + checksum += *ptr++; + if (checksum) { + if (testing || bootverbose) + device_printf(parent, "JMicron check2 failed\n"); + goto jmicron_out; + } + + if (testing || bootverbose) + ata_raid_jmicron_print_meta(meta); + + /* now convert JMicron meta into our generic form */ + for (array = 0; array < MAX_ARRAYS; array++) { +jmicron_next: + if (!raidp[array]) { + raidp[array] = + (struct ar_softc *)malloc(sizeof(struct ar_softc), M_AR, + M_NOWAIT | M_ZERO); + if (!raidp[array]) { + device_printf(parent, "failed to allocate metadata storage\n"); + goto jmicron_out; + } + } + raid = raidp[array]; + if (raid->format && (raid->format != AR_F_JMICRON_RAID)) + continue; + + for (total_disks = 0, disk = 0; disk < JM_MAX_DISKS; disk++) { + if (meta->disks[disk]) { + if (raid->format == AR_F_JMICRON_RAID) { + if (bcmp(&meta->disks[disk], + raid->disks[disk].serial, sizeof(u_int32_t))) { + array++; + goto jmicron_next; + } + } + else + bcopy(&meta->disks[disk], + raid->disks[disk].serial, sizeof(u_int32_t)); + total_disks++; + } + } + /* handle spares XXX SOS */ + + switch (meta->type) { + case JM_T_RAID0: + raid->type = AR_T_RAID0; + raid->width = total_disks; + break; + + case JM_T_RAID1: + raid->type = AR_T_RAID1; + raid->width = 1; + break; + + case JM_T_RAID01: + raid->type = AR_T_RAID01; + raid->width = total_disks / 2; + break; + + case JM_T_RAID5: + raid->type = AR_T_RAID5; + raid->width = total_disks; + break; + + case JM_T_JBOD: + raid->type = AR_T_SPAN; + raid->width = 1; + break; + + default: + device_printf(parent, + "JMicron unknown RAID type 0x%02x\n", meta->type); + free(raidp[array], M_AR); + raidp[array] = NULL; + goto jmicron_out; + } + disk_size = (meta->disk_sectors_high << 16) + meta->disk_sectors_low; + raid->format = AR_F_JMICRON_RAID; + strncpy(raid->name, meta->name, sizeof(meta->name)); + raid->generation = 0; + raid->interleave = 2 << meta->stripe_shift; + raid->total_disks = total_disks; + raid->total_sectors = disk_size * (raid->width-(raid->type==AR_RAID5)); + raid->heads = 255; + raid->sectors = 63; + raid->cylinders = raid->total_sectors / (63 * 255); + raid->offset_sectors = meta->offset * 16; + raid->rebuild_lba = 0; + raid->lun = array; + + for (disk = 0; disk < raid->total_disks; disk++) { + if (meta->disks[disk] == meta->disk_id) { + raid->disks[disk].dev = parent; + raid->disks[disk].sectors = disk_size; + raid->disks[disk].flags = + (AR_DF_ONLINE | AR_DF_PRESENT | AR_DF_ASSIGNED); + ars->raid[raid->volume] = raid; + ars->disk_number[raid->volume] = disk; + retval = 1; + break; + } + } + break; + } +jmicron_out: + free(meta, M_AR); + return retval; +} + +static int +ata_raid_jmicron_write_meta(struct ar_softc *rdp) +{ + struct jmicron_raid_conf *meta; + u_int64_t disk_sectors; + int disk, error = 0; + + if (!(meta = (struct jmicron_raid_conf *) + malloc(sizeof(struct jmicron_raid_conf), M_AR, M_NOWAIT | M_ZERO))) { + printf("ar%d: failed to allocate metadata storage\n", rdp->lun); + return ENOMEM; + } + + rdp->generation++; + switch (rdp->type) { + case AR_T_JBOD: + meta->type = JM_T_JBOD; + break; + + case AR_T_RAID0: + meta->type = JM_T_RAID0; + break; + + case AR_T_RAID1: + meta->type = JM_T_RAID1; + break; + + case AR_T_RAID5: + meta->type = JM_T_RAID5; + break; + + case AR_T_RAID01: + meta->type = JM_T_RAID01; + break; + + default: + free(meta, M_AR); + return ENODEV; + } + bcopy(JMICRON_MAGIC, meta->signature, sizeof(JMICRON_MAGIC)); + meta->version = JMICRON_VERSION; + meta->offset = rdp->offset_sectors / 16; + disk_sectors = rdp->total_sectors / (rdp->width - (rdp->type == AR_RAID5)); + meta->disk_sectors_low = disk_sectors & 0xffff; + meta->disk_sectors_high = disk_sectors >> 16; + strncpy(meta->name, rdp->name, sizeof(meta->name)); + meta->stripe_shift = ffs(rdp->interleave) - 2; + + for (disk = 0; disk < rdp->total_disks; disk++) { + if (rdp->disks[disk].serial[0]) + bcopy(rdp->disks[disk].serial,&meta->disks[disk],sizeof(u_int32_t)); + else + meta->disks[disk] = (u_int32_t)(uintptr_t)rdp->disks[disk].dev; + } + + for (disk = 0; disk < rdp->total_disks; disk++) { + if (rdp->disks[disk].dev) { + u_int16_t checksum = 0, *ptr; + int count; + + meta->disk_id = meta->disks[disk]; + meta->checksum = 0; + for (ptr = (u_int16_t *)meta, count = 0; count < 64; count++) + checksum += *ptr++; + meta->checksum -= checksum; + + if (testing || bootverbose) + ata_raid_jmicron_print_meta(meta); + + if (ata_raid_rw(rdp->disks[disk].dev, + JMICRON_LBA(rdp->disks[disk].dev), + meta, sizeof(struct jmicron_raid_conf), + ATA_R_WRITE | ATA_R_DIRECT)) { + device_printf(rdp->disks[disk].dev, "write metadata failed\n"); + error = EIO; + } + } + } + /* handle spares XXX SOS */ + + free(meta, M_AR); + return error; +} + /* LSILogic V2 MegaRAID Metadata */ static int ata_raid_lsiv2_read_meta(device_t dev, struct ar_softc **raidp) @@ -3600,6 +3850,7 @@ free(meta, M_AR); return retval; } + static int ata_raid_via_write_meta(struct ar_softc *rdp) { @@ -3931,6 +4182,7 @@ case AR_F_HPTV3_RAID: return "HighPoint v3 RocketRAID"; case AR_F_INTEL_RAID: return "Intel MatrixRAID"; case AR_F_ITE_RAID: return "Integrated Technology Express"; + case AR_F_JMICRON_RAID: return "JMicron Technology Corp"; case AR_F_LSIV2_RAID: return "LSILogic v2 MegaRAID"; case AR_F_LSIV3_RAID: return "LSILogic v3 MegaRAID"; case AR_F_NVIDIA_RAID: return "nVidia MediaShield"; @@ -4301,6 +4553,48 @@ } static char * +ata_raid_jmicron_type(int type) +{ + static char buffer[16]; + + switch (type) { + case JM_T_RAID0: return "RAID0"; + case JM_T_RAID1: return "RAID1"; + case JM_T_RAID01: return "RAID0+1"; + case JM_T_JBOD: return "JBOD"; + case JM_T_RAID5: return "RAID5"; + default: sprintf(buffer, "UNKNOWN 0x%02x", type); + return buffer; + } +} + +static void +ata_raid_jmicron_print_meta(struct jmicron_raid_conf *meta) +{ + int i; + + printf("***** ATA JMicron Technology Corp Metadata ******\n"); + printf("signature %.2s\n", meta->signature); + printf("version 0x%04x\n", meta->version); + printf("checksum 0x%04x\n", meta->checksum); + printf("disk_id 0x%08x\n", meta->disk_id); + printf("offset 0x%08x\n", meta->offset); + printf("disk_sectors_low 0x%08x\n", meta->disk_sectors_low); + printf("disk_sectors_high 0x%08x\n", meta->disk_sectors_high); + printf("name %.16s\n", meta->name); + printf("type %s\n", ata_raid_jmicron_type(meta->type)); + printf("stripe_shift %d\n", meta->stripe_shift); + printf("flags 0x%04x\n", meta->flags); + printf("spare:\n"); + for (i=0; i < 2 && meta->spare[i]; i++) + printf(" %d 0x%08x\n", i, meta->spare[i]); + printf("disks:\n"); + for (i=0; i < 8 && meta->disks[i]; i++) + printf(" %d 0x%08x\n", i, meta->disks[i]); + printf("=================================================\n"); +} + +static char * ata_raid_lsiv2_type(int type) { static char buffer[16]; ==== //depot/projects/arm/src/sys/dev/ata/ata-raid.h#8 (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/dev/ata/ata-raid.h,v 1.43 2006/01/18 13:10:17 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.44 2006/02/17 13:02:10 sos Exp $ */ /* misc defines */ @@ -68,13 +68,14 @@ #define AR_F_HPTV3_RAID 0x0008 #define AR_F_INTEL_RAID 0x0010 #define AR_F_ITE_RAID 0x0020 -#define AR_F_LSIV2_RAID 0x0040 -#define AR_F_LSIV3_RAID 0x0080 -#define AR_F_NVIDIA_RAID 0x0100 -#define AR_F_PROMISE_RAID 0x0200 -#define AR_F_SII_RAID 0x0400 -#define AR_F_SIS_RAID 0x0800 -#define AR_F_VIA_RAID 0x1000 +#define AR_F_JMICRON_RAID 0x0040 +#define AR_F_LSIV2_RAID 0x0080 +#define AR_F_LSIV3_RAID 0x0100 +#define AR_F_NVIDIA_RAID 0x0200 +#define AR_F_PROMISE_RAID 0x0400 +#define AR_F_SII_RAID 0x0800 +#define AR_F_SIS_RAID 0x1000 +#define AR_F_VIA_RAID 0x2000 #define AR_F_FORMAT_MASK 0x1fff u_int generation; @@ -398,6 +399,50 @@ } __packed; +/* JMicron Technology Corp Metadata */ +#define JMICRON_LBA(dev) \ + (((struct ad_softc *)device_get_ivars(dev))->total_secs - 1) +#define JM_MAX_DISKS 8 + +struct jmicron_raid_conf { + u_int8_t signature[2]; +#define JMICRON_MAGIC "JM" + + u_int16_t version; +#define JMICRON_VERSION 0x0001 + + u_int16_t checksum; + u_int8_t filler_1[10]; + u_int32_t disk_id; + u_int32_t offset; + u_int32_t disk_sectors_high; + u_int16_t disk_sectors_low; + u_int8_t filler_2[2]; + u_int8_t name[16]; + u_int8_t type; +#define JM_T_RAID0 0 +#define JM_T_RAID1 1 +#define JM_T_RAID01 2 +#define JM_T_JBOD 3 +#define JM_T_RAID5 5 + + u_int8_t stripe_shift; + u_int16_t flags; +#define JM_F_READY 0x0001 +#define JM_F_BOOTABLE 0x0002 +#define JM_F_BAD 0x0004 +#define JM_F_ACTIVE 0c0010 +#define JM_F_UNSYNC 0c0020 +#define JM_F_NEWEST 0c0040 + + u_int8_t filler_3[4]; + u_int32_t spare[2]; + u_int32_t disks[JM_MAX_DISKS]; + u_int8_t filler_4[32]; + u_int8_t filler_5[384]; +}; + + /* LSILogic V2 MegaRAID Metadata */ #define LSIV2_LBA(dev) \ (((struct ad_softc *)device_get_ivars(dev))->total_secs - 1) ==== //depot/projects/arm/src/sys/dev/bge/if_bge.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.123 2006/02/02 09:58:31 oleg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.124 2006/02/17 14:33:35 oleg Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -3382,6 +3382,7 @@ return(0); } + sc->bge_link_evt++; mii = device_get_softc(sc->bge_miibus); if (mii->mii_instance) { struct mii_softc *miisc; @@ -3682,9 +3683,17 @@ sc->bge_tx_saved_considx = BGE_TXCONS_UNSET; + /* + * We can't just call bge_link_upd() cause chip is almost stopped so + * bge_link_upd -> bge_tick_locked -> bge_stats_update sequence may + * lead to hardware deadlock. So we just clearing MAC's link state + * (PHY may still have link UP). + */ + if (bootverbose && sc->bge_link) + if_printf(sc->bge_ifp, "link DOWN\n"); + sc->bge_link = 0; + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); - - return; } /* @@ -3817,7 +3826,8 @@ if_printf(sc->bge_ifp, "link DOWN\n"); if_link_state_change(sc->bge_ifp, LINK_STATE_DOWN); } - } else { + /* Discard link events for MII/GMII cards if MI auto-polling disabled */ + } else if (CSR_READ_4(sc, BGE_MI_MODE) & BGE_MIMODE_AUTOPOLL) { /* * Some broken BCM chips have BGE_STATFLAG_LINKSTATE_CHANGED bit * in status word always set. Workaround this bug by reading @@ -3847,7 +3857,7 @@ } } - /* Clear the interrupt */ + /* Clear the attention */ CSR_WRITE_4(sc, BGE_MAC_STS, BGE_MACSTAT_SYNC_CHANGED| BGE_MACSTAT_CFG_CHANGED|BGE_MACSTAT_MI_COMPLETE| BGE_MACSTAT_LINK_CHANGED); ==== //depot/projects/arm/src/sys/dev/ichwd/ichwd.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.5 2005/01/06 01:42:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.6 2006/02/17 18:46:18 ambrisko Exp $"); #include #include @@ -81,43 +81,51 @@ { VENDORID_INTEL, DEVICEID_82801DBM, "Intel 82801DBM watchdog timer" }, { VENDORID_INTEL, DEVICEID_82801E, "Intel 82801E watchdog timer" }, { VENDORID_INTEL, DEVICEID_82801EBR, "Intel 82801EB/ER watchdog timer" }, + { VENDORID_INTEL, DEVICEID_82801FBR, "Intel 82801FB/FR watchdog timer" }, + { VENDORID_INTEL, DEVICEID_ICH5, "Intel ICH5 watchdog timer"}, + { VENDORID_INTEL, DEVICEID_6300ESB, "Intel 6300ESB watchdog timer"}, { 0, 0, NULL }, }; static devclass_t ichwd_devclass; -#define ichwd_read_1(sc, off) \ - bus_space_read_1((sc)->smi_bst, (sc)->smi_bsh, (off)) -#define ichwd_read_2(sc, off) \ - bus_space_read_2((sc)->smi_bst, (sc)->smi_bsh, (off)) -#define ichwd_read_4(sc, off) \ +#define ichwd_read_tco_1(sc, off) \ + bus_space_read_1((sc)->tco_bst, (sc)->tco_bsh, (off)) +#define ichwd_read_tco_2(sc, off) \ + bus_space_read_2((sc)->tco_bst, (sc)->tco_bsh, (off)) +#define ichwd_read_tco_4(sc, off) \ + bus_space_read_4((sc)->tco_bst, (sc)->tco_bsh, (off)) + +#define ichwd_write_tco_1(sc, off, val) \ + bus_space_write_1((sc)->tco_bst, (sc)->tco_bsh, (off), (val)) +#define ichwd_write_tco_2(sc, off, val) \ + bus_space_write_2((sc)->tco_bst, (sc)->tco_bsh, (off), (val)) +#define ichwd_write_tco_4(sc, off, val) \ + bus_space_write_4((sc)->tco_bst, (sc)->tco_bsh, (off), (val)) + +#define ichwd_read_smi_4(sc, off) \ bus_space_read_4((sc)->smi_bst, (sc)->smi_bsh, (off)) - -#define ichwd_write_1(sc, off, val) \ - bus_space_write_1((sc)->smi_bst, (sc)->smi_bsh, (off), (val)) -#define ichwd_write_2(sc, off, val) \ - bus_space_write_2((sc)->smi_bst, (sc)->smi_bsh, (off), (val)) -#define ichwd_write_4(sc, off, val) \ +#define ichwd_write_smi_4(sc, off, val) \ bus_space_write_4((sc)->smi_bst, (sc)->smi_bsh, (off), (val)) static __inline void ichwd_intr_enable(struct ichwd_softc *sc) { - ichwd_write_4(sc, SMI_EN, ichwd_read_4(sc, SMI_EN) | SMI_TCO_EN); + ichwd_write_smi_4(sc, SMI_EN, ichwd_read_smi_4(sc, SMI_EN) & ~SMI_TCO_EN); } static __inline void ichwd_intr_disable(struct ichwd_softc *sc) { - ichwd_write_4(sc, SMI_EN, ichwd_read_4(sc, SMI_EN) & ~SMI_TCO_EN); + ichwd_write_smi_4(sc, SMI_EN, ichwd_read_smi_4(sc, SMI_EN) | SMI_TCO_EN); } static __inline void ichwd_sts_reset(struct ichwd_softc *sc) { - ichwd_write_2(sc, TCO1_STS, TCO_TIMEOUT); - ichwd_write_2(sc, TCO2_STS, TCO_BOOT_STS); - ichwd_write_2(sc, TCO2_STS, TCO_SECOND_TO_STS); + ichwd_write_tco_2(sc, TCO1_STS, TCO_TIMEOUT); + ichwd_write_tco_2(sc, TCO2_STS, TCO_BOOT_STS); + ichwd_write_tco_2(sc, TCO2_STS, TCO_SECOND_TO_STS); } static __inline void @@ -125,8 +133,8 @@ { uint16_t cnt; - cnt = ichwd_read_2(sc, TCO1_CNT) & TCO_CNT_PRESERVE; - ichwd_write_2(sc, TCO1_CNT, cnt & ~TCO_TMR_HALT); + cnt = ichwd_read_tco_2(sc, TCO1_CNT) & TCO_CNT_PRESERVE; + ichwd_write_tco_2(sc, TCO1_CNT, cnt & ~TCO_TMR_HALT); sc->active = 1; if (bootverbose) device_printf(sc->device, "timer enabled\n"); @@ -137,8 +145,8 @@ { uint16_t cnt; - cnt = ichwd_read_2(sc, TCO1_CNT) & TCO_CNT_PRESERVE; - ichwd_write_2(sc, TCO1_CNT, cnt | TCO_TMR_HALT); + cnt = ichwd_read_tco_2(sc, TCO1_CNT) & TCO_CNT_PRESERVE; + ichwd_write_tco_2(sc, TCO1_CNT, cnt | TCO_TMR_HALT); sc->active = 0; if (bootverbose) device_printf(sc->device, "timer disabled\n"); @@ -147,7 +155,7 @@ static __inline void ichwd_tmr_reload(struct ichwd_softc *sc) { - ichwd_write_1(sc, TCO_RLD, 1); + ichwd_write_tco_1(sc, TCO_RLD, 1); if (bootverbose) device_printf(sc->device, "timer reloaded\n"); } @@ -155,7 +163,7 @@ static __inline void ichwd_tmr_set(struct ichwd_softc *sc, uint8_t timeout) { - ichwd_write_1(sc, TCO_TMR, timeout); + ichwd_write_tco_1(sc, TCO_TMR, timeout); sc->timeout = timeout; if (bootverbose) device_printf(sc->device, "timeout set to %u ticks\n", timeout); @@ -170,10 +178,9 @@ struct ichwd_softc *sc = arg; unsigned int timeout; - cmd &= WD_INTERVAL; /* disable / enable */ - if (cmd == 0) { + if (!(cmd & WD_ACTIVE)) { if (sc->active) ichwd_tmr_disable(sc); *error = 0; @@ -182,6 +189,7 @@ if (!sc->active) ichwd_tmr_enable(sc); + cmd &= WD_INTERVAL; /* convert from power-of-to-ns to WDT ticks */ if (cmd >= 64) { *error = EINVAL; @@ -204,7 +212,7 @@ return; } -static unsigned long pmbase; +static unsigned int pmbase = 0; /* * Look for an ICH LPC interface bridge. If one is found, register an @@ -268,27 +276,34 @@ sc = device_get_softc(dev); sc->device = dev; + if (pmbase == 0) { + printf("Not found\n"); + } + /* allocate I/O register space */ + sc->smi_rid = 0; sc->smi_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->smi_rid, - pmbase + SMI_BASE, pmbase + SMI_BASE + SMI_LEN - 1, SMI_LEN, - RF_ACTIVE|RF_SHAREABLE); + pmbase + SMI_BASE, ~0ul, SMI_LEN, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 18 17:38:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE1DC16A423; Sat, 18 Feb 2006 17:38:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 89BD816A420 for ; Sat, 18 Feb 2006 17:38:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0510143D46 for ; Sat, 18 Feb 2006 17:38:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1IHcL5S051680 for ; Sat, 18 Feb 2006 17:38:21 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1IHcLOn051677 for perforce@freebsd.org; Sat, 18 Feb 2006 17:38:21 GMT (envelope-from imp@freebsd.org) Date: Sat, 18 Feb 2006 17:38:21 GMT Message-Id: <200602181738.k1IHcLOn051677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 92000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Feb 2006 17:38:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=92000 Change 92000 by imp@imp_harmony on 2006/02/18 17:37:44 Note need to enable clocks once that api is established. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#7 (text+ko) ==== @@ -62,6 +62,8 @@ int err; int rid; + /* XXX need to enable clocks here, and some other stuff */ + rid = MEM_RID; sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);