From owner-p4-projects@FreeBSD.ORG Sun Apr 2 01:08: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 1D46216A420; Sun, 2 Apr 2006 01:08:39 +0000 (UTC) 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 CB5B416A401 for ; Sun, 2 Apr 2006 01:08:38 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DE0043D46 for ; Sun, 2 Apr 2006 01:08:38 +0000 (GMT) (envelope-from jmg@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 k3218cAB086116 for ; Sun, 2 Apr 2006 01:08:38 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3218cU5086113 for perforce@freebsd.org; Sun, 2 Apr 2006 01:08:38 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 01:08:38 GMT Message-Id: <200604020108.k3218cU5086113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94430 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, 02 Apr 2006 01:08:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=94430 Change 94430 by jmg@jmg_carbon-60 on 2006/04/02 01:08:08 kill of doc and www, since we don't need them... Affected files ... .. //depot/projects/kmacy_sun4v/doc/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/README#3 delete .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/euro/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/euro/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/post#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/pre#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/authors.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/license.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/translators.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/contributing/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/laptop/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/new-users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/faq/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/flyer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/flyer/flyer.tex#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/articles.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/books.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/translators.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#3 delete .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/laptop/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/new-users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/extra.css#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/articles.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/catalog#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/teams.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/building-products/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/building-products/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/console-server/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/console-server/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/euro/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/euro/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fonts/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fonts/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/geom-class/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hats/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hats/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hubs/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hubs/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/laptop/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/laptop/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mh/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mh/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/multi-os/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/new-users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/new-users/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/converse.c#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/su.c#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/portbuild/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/install.cfg#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/loader.rc#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/post#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/pre#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/extra.css#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/solid-state/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/version-guide/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vinum/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vinum/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vm-design/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/bibliography/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/bibliography/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/faq/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/faq/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/appendix.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/config/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/security/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/flyer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/flyer/flyer.tex#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/mk/doc.local.mk#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/authors.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/README#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/admin.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/applications.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/includes.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/install.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/misc.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/network.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/preface.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/serial.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/x.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/contributing/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/euro/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/euro/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/laptop/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/extra.css#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/faq/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/faq/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/authors.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/flyer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/flyer/flyer.tex#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/authors.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/translators.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/euro/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/mh/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/converse.c#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/su.c#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/post#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/pre#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/extra.css#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/faq/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/faq/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/flyer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/flyer/flyer.tex#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/builtin.1#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/cat.1#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/chkey.1#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/echo.1#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/head.1#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/intro.1#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/agp.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/amd.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/ncr.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/sd.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/sn.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/spic.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/st.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man5/intro.5#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man5/publickey.5#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man6/intro.6#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man7/ascii.7#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man7/intro.7#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/books.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/euro/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/euro/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/new-users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/flyer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/flyer/flyer.tex#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/articles.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/books.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/catalog#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/translators.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#3 delete .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributing/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributing/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributors/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributors/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/diskless-x/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fonts/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fonts/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/multi-os/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/multi-os/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/problem-reports/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/zip-drive/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/Makefile.inc#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/faq/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/faq/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/Makefile#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/book.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/chapter.decl#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/chapters.ent#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml#3 delete .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml#3 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 2 01:11: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 0D49A16A424; Sun, 2 Apr 2006 01:11:43 +0000 (UTC) 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 E073116A400 for ; Sun, 2 Apr 2006 01:11:42 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97A6E43D45 for ; Sun, 2 Apr 2006 01:11:42 +0000 (GMT) (envelope-from jmg@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 k321Bg4x086325 for ; Sun, 2 Apr 2006 01:11:42 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k321BgZ5086321 for perforce@freebsd.org; Sun, 2 Apr 2006 01:11:42 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 01:11:42 GMT Message-Id: <200604020111.k321BgZ5086321@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94431 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, 02 Apr 2006 01:11:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=94431 Change 94431 by jmg@jmg_carbon-60 on 2006/04/02 01:10:41 submit part of the sun4v tree to be cleaned up.. Affected files ... .. //depot/doc/obliterate#4 edit Differences ... ==== //depot/doc/obliterate#4 (text+ko) ==== @@ -3,3 +3,5 @@ //depot/user/des/pam/... //depot/user/pjd/geom/... //depot/user/flz/src/... +//depot/projects/kmacy_sun4v/doc/... +//depot/projects/kmacy_sun4v/www/... From owner-p4-projects@FreeBSD.ORG Sun Apr 2 03:53: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 5998616A423; Sun, 2 Apr 2006 03:53:58 +0000 (UTC) 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 2DE9316A400 for ; Sun, 2 Apr 2006 03:53:58 +0000 (UTC) (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 ACF5D43D45 for ; Sun, 2 Apr 2006 03:53:57 +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 k323rvl2095942 for ; Sun, 2 Apr 2006 03:53:57 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k323rvRE095939 for perforce@freebsd.org; Sun, 2 Apr 2006 03:53:57 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 2 Apr 2006 03:53:57 GMT Message-Id: <200604020353.k323rvRE095939@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 94432 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, 02 Apr 2006 03:53:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=94432 Change 94432 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 03:53:03 add hvio_peek fix broken include Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#3 (text+ko) ==== @@ -836,10 +836,14 @@ bus_space_peek_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, u_int8_t *a) { + + int error; + uint64_t error_flag; - __BUS_DEBUG_ACCESS(h, o, "peek", 1); - return (0); + error = hvio_peek(h, o, 1, &error_flag, (uint64_t *)a); + /* XXX map HV errors to BSD errors */ + return (error); } static __inline int @@ -847,9 +851,12 @@ u_int16_t *a) { - + int error; + uint64_t error_flag; + __BUS_DEBUG_ACCESS(h, o, "peek", 2); - return (0); + error = hvio_peek(h, o, 2, &error_flag, (uint64_t *)a); + return (error); } static __inline int @@ -857,8 +864,13 @@ u_int32_t *a) { + int error; + uint64_t error_flag; + + __BUS_DEBUG_ACCESS(h, o, "peek", 4); + error = hvio_peek(h, o, 4, &error_flag, (uint64_t *)a); + return (error); - __BUS_DEBUG_ACCESS(h, o, "peek", 4); return (0); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#5 (text+ko) ==== @@ -38,6 +38,9 @@ #ifndef _ASM +typedef uint64_t devhandle_t; + + extern uint64_t hv_mmu_map_perm_addr(void *, int, uint64_t, int); extern uint64_t hv_mmu_unmap_perm_addr(void *, int, int); extern uint64_t hv_set_ctx0(uint64_t, uint64_t); @@ -47,6 +50,7 @@ #endif /* SET_MMU_STATS */ extern uint64_t hv_cpu_qconf(int queue, uint64_t paddr, int size); +extern uint64_t hv_cpu_mondo_send(int n, vm_paddr_t cpu_list_ra); extern uint64_t hv_cpu_yield(void); extern uint64_t hv_cpu_state(uint64_t cpuid, uint64_t *cpu_state); @@ -88,6 +92,9 @@ extern uint64_t hvio_intr_setstate(uint64_t sysino, int intr_state); extern uint64_t hvio_intr_gettarget(uint64_t sysino, uint32_t *cpuid); extern uint64_t hvio_intr_settarget(uint64_t sysino, uint32_t cpuid); +extern uint64_t hvio_peek(uint64_t dev_hdl, uint64_t r_addr, uint64_t size, + uint64_t *err_flag, uint64_t *data); + extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#5 (text+ko) ==== @@ -199,6 +199,8 @@ }; #endif /* SET_MMU_STATS */ +typedef uint64_t devhandle_t; + #endif /* _ASM */ /* @@ -287,7 +289,6 @@ #define HVIO_FIRE_PERFREG_PCIE_LNK_CNT1 14 #define HVIO_FIRE_PERFREG_PCIE_LNK_CNT2 15 -#include "opt_simulator.h" #ifdef SIMULATOR #define MAGIC_TRAP_ON ta 0x77 From owner-p4-projects@FreeBSD.ORG Sun Apr 2 03:56:03 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 4656616A423; Sun, 2 Apr 2006 03:56:01 +0000 (UTC) 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 DEE0A16A420 for ; Sun, 2 Apr 2006 03:56:00 +0000 (UTC) (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 9820F43D45 for ; Sun, 2 Apr 2006 03:56: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 k323u0p2096101 for ; Sun, 2 Apr 2006 03:56:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k323u0KL096098 for perforce@freebsd.org; Sun, 2 Apr 2006 03:56:00 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 2 Apr 2006 03:56:00 GMT Message-Id: <200604020356.k323u0KL096098@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 94433 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, 02 Apr 2006 03:56:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=94433 Change 94433 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 03:55:01 remove duplicated typedef Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#6 (text+ko) ==== @@ -199,8 +199,6 @@ }; #endif /* SET_MMU_STATS */ -typedef uint64_t devhandle_t; - #endif /* _ASM */ /* From owner-p4-projects@FreeBSD.ORG Sun Apr 2 04:13: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 6B81C16A401; Sun, 2 Apr 2006 04:13:22 +0000 (UTC) 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 23B9716A422 for ; Sun, 2 Apr 2006 04:13:22 +0000 (UTC) (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 E226D43D45 for ; Sun, 2 Apr 2006 04:13: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 k324DLqZ098065 for ; Sun, 2 Apr 2006 04:13:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k324DLvh098062 for perforce@freebsd.org; Sun, 2 Apr 2006 04:13:21 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 2 Apr 2006 04:13:21 GMT Message-Id: <200604020413.k324DLvh098062@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 94434 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, 02 Apr 2006 04:13:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=94434 Change 94434 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 04:13:10 add hvio_config_get Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#6 (text+ko) ==== @@ -92,9 +92,10 @@ extern uint64_t hvio_intr_setstate(uint64_t sysino, int intr_state); extern uint64_t hvio_intr_gettarget(uint64_t sysino, uint32_t *cpuid); extern uint64_t hvio_intr_settarget(uint64_t sysino, uint32_t cpuid); -extern uint64_t hvio_peek(uint64_t dev_hdl, uint64_t r_addr, uint64_t size, +extern uint64_t hvio_peek(devhandle_t dev_hdl, uint64_t r_addr, uint64_t size, uint64_t *err_flag, uint64_t *data); - +extern uint64_t hvio_config_get(devhandle_t dev_hdl, uint64_t pci_device, + uint64_t r_addr, uint64_t size, uint32_t *data); extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); From owner-p4-projects@FreeBSD.ORG Sun Apr 2 04:23: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 C390516A424; Sun, 2 Apr 2006 04:23:35 +0000 (UTC) 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 62C0E16A420 for ; Sun, 2 Apr 2006 04:23:35 +0000 (UTC) (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 2ADF543D45 for ; Sun, 2 Apr 2006 04:23:35 +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 k324NZ08098530 for ; Sun, 2 Apr 2006 04:23:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k324NY7o098527 for perforce@freebsd.org; Sun, 2 Apr 2006 04:23:34 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 2 Apr 2006 04:23:34 GMT Message-Id: <200604020423.k324NY7o098527@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 94436 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, 02 Apr 2006 04:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=94436 Change 94436 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 04:22:44 add hvio_config_put fix hcall implementation Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#7 (text+ko) ==== @@ -96,6 +96,8 @@ uint64_t *err_flag, uint64_t *data); extern uint64_t hvio_config_get(devhandle_t dev_hdl, uint64_t pci_device, uint64_t r_addr, uint64_t size, uint32_t *data); +extern uint64_t hvio_config_put(devhandle_t dev_hdl, uint64_t pci_device, + uint64_t r_addr, uint64_t size, uint32_t data, uint32_t err_flags); extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#6 (text+ko) ==== @@ -33,9 +33,12 @@ #include #include +#include #include #include +#include "assym.s" + #if defined(lint) #error lint #endif @@ -524,6 +527,20 @@ SET_SIZE(hv_cpu_qconf) /* + * CPU Mondo Send + * arg0-1 cpulist (%o0, %o1) + * arg2 data (%o2) + * + */ + ENTRY(hv_cpu_mondo_send) + ldx [PCPU(MONDO_DATA_RA)], %o2 + mov HV_INTR_SEND, %o5 + ta FAST_TRAP + retl + membar #Sync + END(hv_cpu_mondo_send) + + /* * arg0 - devhandle * arg1 - pci_device * arg2 - pci_config_offset @@ -557,6 +574,7 @@ ENTRY(hvio_config_put) mov HVIO_CONFIG_PUT, %o5 ta FAST_TRAP + stuw %o1, [%o5] retl nop SET_SIZE(hvio_config_put) From owner-p4-projects@FreeBSD.ORG Sun Apr 2 04:23: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 9B2D216A425; Sun, 2 Apr 2006 04:23:36 +0000 (UTC) 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 ABEF016A422 for ; Sun, 2 Apr 2006 04:23:35 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78E4543D46 for ; Sun, 2 Apr 2006 04:23:35 +0000 (GMT) (envelope-from jmg@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 k324NZHK098536 for ; Sun, 2 Apr 2006 04:23:35 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k324NZ2J098533 for perforce@freebsd.org; Sun, 2 Apr 2006 04:23:35 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 04:23:35 GMT Message-Id: <200604020423.k324NZ2J098533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94437 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, 02 Apr 2006 04:23:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=94437 Change 94437 by jmg@jmg_carbon-60 on 2006/04/02 04:23:14 add first cut at the hv pci bus implementation... also fix ofw where cell_t was the wrong size of L64 machines... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#10 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pcivar.h#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#10 (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/hv_pci.c optional pci # XXX hvcons should be optional sun4v/sun4v/hvcons.c standard sun4v/sun4v/hcall.S standard ==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#6 (text+ko) ==== @@ -64,7 +64,7 @@ * Prototypes for Open Firmware Interface Routines */ -typedef unsigned long cell_t; +typedef uint32_t cell_t; typedef unsigned int ihandle_t; typedef unsigned int phandle_t; From owner-p4-projects@FreeBSD.ORG Sun Apr 2 04:33: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 7C36F16A426; Sun, 2 Apr 2006 04:33:51 +0000 (UTC) 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 E32BF16A424 for ; Sun, 2 Apr 2006 04:33:48 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0A8743D46 for ; Sun, 2 Apr 2006 04:33:48 +0000 (GMT) (envelope-from jmg@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 k324XmSr098980 for ; Sun, 2 Apr 2006 04:33:48 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k324XmtM098977 for perforce@freebsd.org; Sun, 2 Apr 2006 04:33:48 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 04:33:48 GMT Message-Id: <200604020433.k324XmtM098977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94439 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, 02 Apr 2006 04:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=94439 Change 94439 by jmg@jmg_carbon-60 on 2006/04/02 04:33:20 put cell_t back to unsigned long, and make hv_pci.c use a uint32_t... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#7 (text+ko) ==== @@ -64,7 +64,7 @@ * Prototypes for Open Firmware Interface Routines */ -typedef uint32_t cell_t; +typedef unsigned long cell_t; typedef unsigned int ihandle_t; typedef unsigned int phandle_t; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#2 (text+ko) ==== @@ -120,7 +120,7 @@ { struct hvpci_softc *sc; phandle_t node; - cell_t cell; + uint32_t cell; node = ofw_bus_get_node(dev); if (node == -1) @@ -129,7 +129,7 @@ sc = device_get_softc(dev); if (OF_getprop(node, "reg", &cell, sizeof cell) == -1) panic("%s: OF_getprop failed.", __func__); - sc->hs_devhandle = p1275_cell2uint(cell) & 0xfffffff; + sc->hs_devhandle = cell & 0xfffffff; return (0); } From owner-p4-projects@FreeBSD.ORG Sun Apr 2 04:45: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 18BA216A436; Sun, 2 Apr 2006 04:45:03 +0000 (UTC) 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 6F8EF16A433 for ; Sun, 2 Apr 2006 04:45:03 +0000 (UTC) (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 17F5543D48 for ; Sun, 2 Apr 2006 04:45: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 k324j2xZ099574 for ; Sun, 2 Apr 2006 04:45:02 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k324j2ph099571 for perforce@freebsd.org; Sun, 2 Apr 2006 04:45:02 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 2 Apr 2006 04:45:02 GMT Message-Id: <200604020445.k324j2ph099571@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 94441 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, 02 Apr 2006 04:45:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=94441 Change 94441 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 04:44:08 compile Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#3 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -46,7 +47,7 @@ #include #include -#include "hv_pcivar.h" +#include #include "pcib_if.h" @@ -54,7 +55,7 @@ * Methods */ static device_probe_t hvpci_probe; -static device_attach-t hvpci_attach; +static device_attach_t hvpci_attach; static bus_setup_intr_t hvpci_setup_intr; static bus_teardown_intr_t hvpci_teardown_intr; static bus_alloc_resource_t hvpci_alloc_resource; @@ -64,7 +65,9 @@ static pcib_maxslots_t hvpci_maxslots; static pcib_read_config_t hvpci_read_config; static pcib_write_config_t hvpci_write_config; +#ifdef notyet static pcib_route_interrupt_t hvpci_route_interrupt; +#endif static device_method_t hv_pcib_methods[] = { /* Device interface */ @@ -96,13 +99,13 @@ static driver_t hvpci_driver = { "pcib", - hvpci_methods, + hv_pcib_methods, sizeof(struct hvpci_softc), }; static devclass_t hvpci_devclass; -DRIVER_MODULE(hvpci, nexus, hvcpi_driver, hvpci_devclass, 0, 0); +DRIVER_MODULE(hvpci, nexus, hvpci_driver, hvpci_devclass, 0, 0); static int hvpci_probe(device_t dev) @@ -153,7 +156,10 @@ int width) { struct hvpci_softc *sc; +#ifdef notyet pci_cfg_data_t data; +#endif + uint32_t data; sc = device_get_softc(dev); @@ -174,49 +180,57 @@ uint32_t val, int width) { struct hvpci_softc *sc; + uint32_t err_flags; sc = device_get_softc(dev); hvio_config_put(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, - size, val); + width, val, &err_flags); } +#ifdef notyet static int hvpci_route_interrupt(device_t bridge, device_t dev, int pin) { } - +#endif static int hvpci_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) { + return (0); } static int hvpci_teardown_intr(device_t dev, device_t child, struct resource *vec, void *cookie) { + return (0); } static struct resource * hvpci_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + return (NULL); } static int hvpci_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); } static int hvpci_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); } static int hvpci_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); } From owner-p4-projects@FreeBSD.ORG Sun Apr 2 05:37: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 044C616A424; Sun, 2 Apr 2006 05:37:07 +0000 (UTC) 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 D206816A422 for ; Sun, 2 Apr 2006 05:37:06 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B80043D49 for ; Sun, 2 Apr 2006 05:37:06 +0000 (GMT) (envelope-from jmg@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 k325b6u1010603 for ; Sun, 2 Apr 2006 05:37:06 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k325b6Tr010600 for perforce@freebsd.org; Sun, 2 Apr 2006 05:37:06 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 05:37:06 GMT Message-Id: <200604020537.k325b6Tr010600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94443 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, 02 Apr 2006 05:37:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=94443 Change 94443 by jmg@jmg_carbon-60 on 2006/04/02 05:36:44 add pci as a child for pcib, this should get things going a bit farther... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#4 (text+ko) ==== @@ -134,7 +134,8 @@ panic("%s: OF_getprop failed.", __func__); sc->hs_devhandle = cell & 0xfffffff; - return (0); + device_add_child(dev, "pci", -1); + return (bus_generic_attach(dev)); } static int From owner-p4-projects@FreeBSD.ORG Sun Apr 2 06:11: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 5E21916A424; Sun, 2 Apr 2006 06:11:50 +0000 (UTC) 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 39FBE16A401 for ; Sun, 2 Apr 2006 06:11:50 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD2AB43D45 for ; Sun, 2 Apr 2006 06:11:49 +0000 (GMT) (envelope-from jmg@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 k326BnCu013352 for ; Sun, 2 Apr 2006 06:11:49 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k326BnbD013349 for perforce@freebsd.org; Sun, 2 Apr 2006 06:11:49 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 06:11:49 GMT Message-Id: <200604020611.k326BnbD013349@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94446 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, 02 Apr 2006 06:11:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=94446 Change 94446 by jmg@jmg_carbon-60 on 2006/04/02 06:11:15 add debuging printf.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#5 (text+ko) ==== @@ -157,6 +157,7 @@ int width) { struct hvpci_softc *sc; + int r; #ifdef notyet pci_cfg_data_t data; #endif @@ -164,11 +165,16 @@ sc = device_get_softc(dev); - if (hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, - width, &data) == -1) - return -1; + data = 0; + r = hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), + reg, width, &data); + + printf("read_config(%#x, %#x, %d, %d) = %#x\n", sc->hs_devhandle, + HVPCI_BDF(bus, slot, func), reg, width, data); + if (r == H_EOK) + return data; - return data; + return -1; } #if 0 From owner-p4-projects@FreeBSD.ORG Sun Apr 2 06:13:53 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 2472716A423; Sun, 2 Apr 2006 06:13:53 +0000 (UTC) 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 02FDA16A400 for ; Sun, 2 Apr 2006 06:13:53 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C682343D45 for ; Sun, 2 Apr 2006 06:13:52 +0000 (GMT) (envelope-from jmg@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 k326Dqho013428 for ; Sun, 2 Apr 2006 06:13:52 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k326DqNQ013425 for perforce@freebsd.org; Sun, 2 Apr 2006 06:13:52 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 06:13:52 GMT Message-Id: <200604020613.k326DqNQ013425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94447 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, 02 Apr 2006 06:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=94447 Change 94447 by jmg@jmg_carbon-60 on 2006/04/02 06:13:09 print return.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#6 (text+ko) ==== @@ -169,8 +169,8 @@ r = hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, &data); - printf("read_config(%#x, %#x, %d, %d) = %#x\n", sc->hs_devhandle, - HVPCI_BDF(bus, slot, func), reg, width, data); + printf("%d = read_config(%#x, %#x, %d, %d) = %#x\n", r, + sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data); if (r == H_EOK) return data; From owner-p4-projects@FreeBSD.ORG Sun Apr 2 06:21: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 6A58816A420; Sun, 2 Apr 2006 06:21:02 +0000 (UTC) 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 2CEDE16A401 for ; Sun, 2 Apr 2006 06:21:02 +0000 (UTC) (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 EEF3543D45 for ; Sun, 2 Apr 2006 06:21: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 k326L1wj013744 for ; Sun, 2 Apr 2006 06:21:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k326L1wf013741 for perforce@freebsd.org; Sun, 2 Apr 2006 06:21:01 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 2 Apr 2006 06:21:01 GMT Message-Id: <200604020621.k326L1wf013741@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 94448 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, 02 Apr 2006 06:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=94448 Change 94448 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 06:20:04 update hvio_config_* functions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#8 (text+ko) ==== @@ -40,7 +40,21 @@ typedef uint64_t devhandle_t; +typedef uint32_t pci_config_offset_t; + +typedef enum pci_config_size { + PCI_CFG_SIZE_BYTE = 0, + PCI_CFG_SIZE_WORD, + PCI_CFG_SIZE_DWORD +} pci_config_size_t; +typedef union pci_cfg_data { + uint8_t b; + uint16_t w; + uint32_t dw; + uint64_t qw; +} pci_cfg_data_t; + extern uint64_t hv_mmu_map_perm_addr(void *, int, uint64_t, int); extern uint64_t hv_mmu_unmap_perm_addr(void *, int, int); extern uint64_t hv_set_ctx0(uint64_t, uint64_t); @@ -95,9 +109,10 @@ extern uint64_t hvio_peek(devhandle_t dev_hdl, uint64_t r_addr, uint64_t size, uint64_t *err_flag, uint64_t *data); extern uint64_t hvio_config_get(devhandle_t dev_hdl, uint64_t pci_device, - uint64_t r_addr, uint64_t size, uint32_t *data); + uint64_t r_addr, pci_config_size_t size, pci_cfg_data_t *data); extern uint64_t hvio_config_put(devhandle_t dev_hdl, uint64_t pci_device, - uint64_t r_addr, uint64_t size, uint32_t data, uint32_t err_flags); + pci_config_offset_t off, pci_config_size_t size, + pci_cfg_data_t data, uint32_t *err_flags); extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); From owner-p4-projects@FreeBSD.ORG Sun Apr 2 06:25:08 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 F0E1C16A420; Sun, 2 Apr 2006 06:25:07 +0000 (UTC) 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 D12A816A401 for ; Sun, 2 Apr 2006 06:25:07 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FDA843D46 for ; Sun, 2 Apr 2006 06:25:07 +0000 (GMT) (envelope-from jmg@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 k326P7Br013874 for ; Sun, 2 Apr 2006 06:25:07 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k326P77x013871 for perforce@freebsd.org; Sun, 2 Apr 2006 06:25:07 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 06:25:07 GMT Message-Id: <200604020625.k326P77x013871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94449 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, 02 Apr 2006 06:25:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=94449 Change 94449 by jmg@jmg_carbon-60 on 2006/04/02 06:24:07 convert FreeBSD's width to HV's size enum... and use the union to get the proper returned data.. hopefully packing won't be an issue... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#7 (text+ko) ==== @@ -157,22 +157,46 @@ int width) { struct hvpci_softc *sc; - int r; -#ifdef notyet + pci_config_size_t size; pci_cfg_data_t data; -#endif - uint32_t data; + uint32_t ret; sc = device_get_softc(dev); - data = 0; + switch (width) { + case 1: + size = PCI_CFG_SIZE_BYTE; + break; + case 2: + size = PCI_CFG_SIZE_WORD; + break; + case 4: + size = PCI_CFG_SIZE_DWORD; + break; + default: + panic("unsupported width: %d", width); + } + r = hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), - reg, width, &data); + reg, size, &data); printf("%d = read_config(%#x, %#x, %d, %d) = %#x\n", r, - sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data); - if (r == H_EOK) - return data; + sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data.dw); + + if (r == H_EOK) { + switch (width) { + case 1: + ret = data.b; + break; + case 2: + ret = data.w; + break; + case 4: + ret = data.dw; + break; + } + return ret; + } return -1; } From owner-p4-projects@FreeBSD.ORG Sun Apr 2 06:31: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 8A16316A420; Sun, 2 Apr 2006 06:31:15 +0000 (UTC) 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 68E6D16A400 for ; Sun, 2 Apr 2006 06:31:15 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37AFF43D46 for ; Sun, 2 Apr 2006 06:31:15 +0000 (GMT) (envelope-from jmg@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 k326VFIA014173 for ; Sun, 2 Apr 2006 06:31:15 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k326VEV2014170 for perforce@freebsd.org; Sun, 2 Apr 2006 06:31:14 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 06:31:14 GMT Message-Id: <200604020631.k326VEV2014170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94450 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, 02 Apr 2006 06:31:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=94450 Change 94450 by jmg@jmg_carbon-60 on 2006/04/02 06:31:02 make comple.. support writing config registers.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#8 (text+ko) ==== @@ -160,6 +160,7 @@ pci_config_size_t size; pci_cfg_data_t data; uint32_t ret; + int r; sc = device_get_softc(dev); @@ -211,11 +212,31 @@ uint32_t val, int width) { struct hvpci_softc *sc; + pci_config_size_t size; + pci_cfg_data_t data; uint32_t err_flags; sc = device_get_softc(dev); + + switch (width) { + case 1: + size = PCI_CFG_SIZE_BYTE; + data.b = val; + break; + case 2: + size = PCI_CFG_SIZE_WORD; + data.w = val; + break; + case 4: + size = PCI_CFG_SIZE_DWORD; + data.dw = val; + break; + default: + panic("unsupported width: %d", width); + } + hvio_config_put(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, - width, val, &err_flags); + size, data, &err_flags); } #ifdef notyet From owner-p4-projects@FreeBSD.ORG Sun Apr 2 08:07: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 6BB5716A420; Sun, 2 Apr 2006 08:07:15 +0000 (UTC) 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 4457E16A401 for ; Sun, 2 Apr 2006 08:07:15 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D759243D48 for ; Sun, 2 Apr 2006 08:07:14 +0000 (GMT) (envelope-from jmg@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 k3287EUm020655 for ; Sun, 2 Apr 2006 08:07:14 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3287EIH020631 for perforce@freebsd.org; Sun, 2 Apr 2006 08:07:14 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 08:07:14 GMT Message-Id: <200604020807.k3287EIH020631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94451 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, 02 Apr 2006 08:07:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=94451 Change 94451 by jmg@jmg_carbon-60 on 2006/04/02 08:06:48 use casting instead of the union.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#9 (text+ko) ==== @@ -158,7 +158,7 @@ { struct hvpci_softc *sc; pci_config_size_t size; - pci_cfg_data_t data; + uint32_t data; uint32_t ret; int r; @@ -182,18 +182,18 @@ reg, size, &data); printf("%d = read_config(%#x, %#x, %d, %d) = %#x\n", r, - sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data.dw); + sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data); if (r == H_EOK) { switch (width) { case 1: - ret = data.b; + ret = *(uint8_t *)&data; break; case 2: - ret = data.w; + ret = *(uint16_t *)&data; break; case 4: - ret = data.dw; + ret = data; break; } return ret; @@ -213,7 +213,7 @@ { struct hvpci_softc *sc; pci_config_size_t size; - pci_cfg_data_t data; + uint32_t data; uint32_t err_flags; sc = device_get_softc(dev); @@ -221,15 +221,15 @@ switch (width) { case 1: size = PCI_CFG_SIZE_BYTE; - data.b = val; + *(uint8_t *)&data = val; break; case 2: size = PCI_CFG_SIZE_WORD; - data.w = val; + *(uint16_t *)&data = val; break; case 4: size = PCI_CFG_SIZE_DWORD; - data.dw = val; + data = val; break; default: panic("unsupported width: %d", width); From owner-p4-projects@FreeBSD.ORG Sun Apr 2 08:19: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 B79BD16A595; Sun, 2 Apr 2006 08:19:32 +0000 (UTC) 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 7A82116A591 for ; Sun, 2 Apr 2006 08:19:32 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A16C943D58 for ; Sun, 2 Apr 2006 08:19:31 +0000 (GMT) (envelope-from jmg@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 k328JVG4021187 for ; Sun, 2 Apr 2006 08:19:31 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k328JUQn021184 for perforce@freebsd.org; Sun, 2 Apr 2006 08:19:31 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 08:19:31 GMT Message-Id: <200604020819.k328JUQn021184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94453 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, 02 Apr 2006 08:19:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=94453 Change 94453 by jmg@jmg_carbon-60 on 2006/04/02 08:19:24 remove the enum size stuff, turned out that wasn't a good idea.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#10 (text+ko) ==== @@ -157,29 +157,14 @@ int width) { struct hvpci_softc *sc; - pci_config_size_t size; uint32_t data; uint32_t ret; int r; sc = device_get_softc(dev); - switch (width) { - case 1: - size = PCI_CFG_SIZE_BYTE; - break; - case 2: - size = PCI_CFG_SIZE_WORD; - break; - case 4: - size = PCI_CFG_SIZE_DWORD; - break; - default: - panic("unsupported width: %d", width); - } - r = hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), - reg, size, &data); + reg, width, &data); printf("%d = read_config(%#x, %#x, %d, %d) = %#x\n", r, sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data); @@ -212,7 +197,6 @@ uint32_t val, int width) { struct hvpci_softc *sc; - pci_config_size_t size; uint32_t data; uint32_t err_flags; @@ -220,15 +204,12 @@ switch (width) { case 1: - size = PCI_CFG_SIZE_BYTE; *(uint8_t *)&data = val; break; case 2: - size = PCI_CFG_SIZE_WORD; *(uint16_t *)&data = val; break; case 4: - size = PCI_CFG_SIZE_DWORD; data = val; break; default: @@ -236,7 +217,7 @@ } hvio_config_put(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, - size, data, &err_flags); + width, data, &err_flags); } #ifdef notyet From owner-p4-projects@FreeBSD.ORG Sun Apr 2 09:27: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 82A6A16A422; Sun, 2 Apr 2006 09:27:00 +0000 (UTC) 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 407C516A420 for ; Sun, 2 Apr 2006 09:27:00 +0000 (UTC) (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 C076643D4C for ; Sun, 2 Apr 2006 09:26:59 +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 k329Qxxr034318 for ; Sun, 2 Apr 2006 09:26:59 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k329QxiA034315 for perforce@freebsd.org; Sun, 2 Apr 2006 09:26:59 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 2 Apr 2006 09:26:59 GMT Message-Id: <200604020926.k329QxiA034315@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 94458 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, 02 Apr 2006 09:27:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=94458 Change 94458 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 09:26:45 fix PCI probing issues Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#11 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#9 (text+ko) ==== @@ -39,15 +39,9 @@ #ifndef _ASM typedef uint64_t devhandle_t; - +typedef uint64_t pci_device_t; typedef uint32_t pci_config_offset_t; - -typedef enum pci_config_size { - PCI_CFG_SIZE_BYTE = 0, - PCI_CFG_SIZE_WORD, - PCI_CFG_SIZE_DWORD -} pci_config_size_t; - +typedef uint8_t pci_config_size_t; typedef union pci_cfg_data { uint8_t b; uint16_t w; @@ -108,11 +102,11 @@ extern uint64_t hvio_intr_settarget(uint64_t sysino, uint32_t cpuid); extern uint64_t hvio_peek(devhandle_t dev_hdl, uint64_t r_addr, uint64_t size, uint64_t *err_flag, uint64_t *data); -extern uint64_t hvio_config_get(devhandle_t dev_hdl, uint64_t pci_device, - uint64_t r_addr, pci_config_size_t size, pci_cfg_data_t *data); -extern uint64_t hvio_config_put(devhandle_t dev_hdl, uint64_t pci_device, +extern uint64_t hvio_config_get(devhandle_t dev_hdl, pci_device_t pci_device, + pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t *data); +extern uint64_t hvio_config_put(devhandle_t dev_hdl, pci_device_t pci_device, pci_config_offset_t off, pci_config_size_t size, - pci_cfg_data_t data, uint32_t *err_flags); + pci_cfg_data_t data); extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#7 (text+ko) ==== @@ -574,7 +574,6 @@ ENTRY(hvio_config_put) mov HVIO_CONFIG_PUT, %o5 ta FAST_TRAP - stuw %o1, [%o5] retl nop SET_SIZE(hvio_config_put) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#11 (text+ko) ==== @@ -51,6 +51,8 @@ #include "pcib_if.h" +#include +#define SUN4V_REG_SPEC2CFG_HDL(x) ((x >> 32) & ~(0xfull << 28)) /* * Methods */ @@ -122,19 +124,32 @@ hvpci_attach(device_t dev) { struct hvpci_softc *sc; + phandle_t node; +#if 0 uint32_t cell; +#endif + uint64_t reg, nreg; node = ofw_bus_get_node(dev); if (node == -1) panic("%s: ofw_bus_get_node failed.", __func__); sc = device_get_softc(dev); +#if 0 if (OF_getprop(node, "reg", &cell, sizeof cell) == -1) panic("%s: OF_getprop failed.", __func__); sc->hs_devhandle = cell & 0xfffffff; +#else + bus_get_resource(dev, SYS_RES_MEMORY, 0, ®, &nreg); + sc->hs_devhandle = SUN4V_REG_SPEC2CFG_HDL(reg); +#endif + + printf("%s, devhandle=0x%lx\n", __func__, sc->hs_devhandle); + device_add_child(dev, "pci", -1); + return (bus_generic_attach(dev)); } @@ -158,17 +173,17 @@ { struct hvpci_softc *sc; uint32_t data; - uint32_t ret; int r; + uint64_t ret; sc = device_get_softc(dev); r = hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), - reg, width, &data); - - printf("%d = read_config(%#x, %#x, %d, %d) = %#x\n", r, - sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data); - + reg, width, (pci_cfg_data_t *)&data); +#if 0 + printf("%d = read_config(%#lx, %#x, %d, %d) = %#x\n", r, + sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data); +#endif if (r == H_EOK) { switch (width) { case 1: @@ -180,10 +195,11 @@ case 4: ret = data; break; + default: + ret = -1; } - return ret; + return data; } - return -1; } @@ -198,10 +214,8 @@ { struct hvpci_softc *sc; uint32_t data; - uint32_t err_flags; sc = device_get_softc(dev); - switch (width) { case 1: *(uint8_t *)&data = val; @@ -215,9 +229,8 @@ default: panic("unsupported width: %d", width); } - hvio_config_put(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, - width, data, &err_flags); + width, (pci_cfg_data_t)data); } #ifdef notyet From owner-p4-projects@FreeBSD.ORG Sun Apr 2 19:19: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 6631C16A427; Sun, 2 Apr 2006 19:19:47 +0000 (UTC) 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 41A9A16A426 for ; Sun, 2 Apr 2006 19:19:47 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 042AA43D45 for ; Sun, 2 Apr 2006 19:19:47 +0000 (GMT) (envelope-from alc@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 k32JJkJd086427 for ; Sun, 2 Apr 2006 19:19:46 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k32JJkMZ086424 for perforce@freebsd.org; Sun, 2 Apr 2006 19:19:46 GMT (envelope-from alc@freebsd.org) Date: Sun, 2 Apr 2006 19:19:46 GMT Message-Id: <200604021919.k32JJkMZ086424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 94482 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, 02 Apr 2006 19:19:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=94482 Change 94482 by alc@alc_home on 2006/04/02 19:18:47 IFC pmap change to pmap_copy() Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/superpages/src/sys/i386/i386/pmap.c#8 integrate Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.539 2006/03/21 18:07:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.540 2006/04/02 05:45:05 alc Exp $"); /* * Manages physical address maps. @@ -216,6 +216,8 @@ static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); +static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, + vm_page_t m); static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, int flags); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); @@ -1597,6 +1599,29 @@ } /* + * Conditionally create a pv entry. + */ +static boolean_t +pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) +{ + pv_entry_t pv; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if (pv_entry_count < pv_entry_high_water && + (pv = uma_zalloc(pvzone, M_NOWAIT)) != NULL) { + pv_entry_count++; + pv->pv_va = va; + pv->pv_pmap = pmap; + TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count++; + return (TRUE); + } else + return (FALSE); +} + +/* * pmap_remove_pde: do the things to unmap a superpage in a process */ static int @@ -2530,7 +2555,6 @@ vm_offset_t addr; vm_offset_t end_addr = src_addr + len; vm_offset_t va_next; - vm_page_t m; if (dst_addr != src_addr) return; @@ -2556,15 +2580,6 @@ if (addr >= UPT_MIN_ADDRESS) panic("pmap_copy: invalid to pmap_copy page tables"); - /* - * Don't let optional prefaulting of pages make us go - * way below the low water mark of free pages or way - * above high water mark of used pv entries. - */ - if (cnt.v_free_count < cnt.v_free_reserved || - pv_entry_count > pv_entry_high_water) - break; - pml4e = pmap_pml4e(src_pmap, addr); if ((*pml4e & PG_V) == 0) { va_next = (addr + NBPML4) & ~PML4MASK; @@ -2634,16 +2649,16 @@ dst_pte = (pt_entry_t *) PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpte)); dst_pte = &dst_pte[pmap_pte_index(addr)]; - if (*dst_pte == 0) { + if (*dst_pte == 0 && + pmap_try_insert_pv_entry(dst_pmap, addr, + PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* * Clear the modified and * accessed (referenced) bits * during the copy. */ - m = PHYS_TO_VM_PAGE(ptetemp & PG_FRAME); *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; - pmap_insert_entry(dst_pmap, addr, m); } else pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) ==== //depot/projects/superpages/src/sys/i386/i386/pmap.c#8 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.546 2006/03/21 18:07:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.547 2006/04/02 05:45:05 alc Exp $"); /* * Manages physical address maps. @@ -266,6 +266,8 @@ static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); +static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, + vm_page_t m); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); @@ -1591,6 +1593,29 @@ } /* + * Conditionally create a pv entry. + */ +static boolean_t +pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) +{ + pv_entry_t pv; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if (pv_entry_count < pv_entry_high_water && + (pv = uma_zalloc(pvzone, M_NOWAIT)) != NULL) { + pv_entry_count++; + pv->pv_va = va; + pv->pv_pmap = pmap; + TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count++; + return (TRUE); + } else + return (FALSE); +} + +/* * pmap_remove_pde: do the things to unmap a superpage in a process */ static void @@ -2499,7 +2524,6 @@ vm_offset_t addr; vm_offset_t end_addr = src_addr + len; vm_offset_t pdnxt; - vm_page_t m; if (dst_addr != src_addr) return; @@ -2525,15 +2549,6 @@ if (addr >= UPT_MIN_ADDRESS) panic("pmap_copy: invalid to pmap_copy page tables"); - /* - * Don't let optional prefaulting of pages make us go - * way below the low water mark of free pages or way - * above high water mark of used pv entries. - */ - if (cnt.v_free_count < cnt.v_free_reserved || - pv_entry_count > pv_entry_high_water) - break; - pdnxt = (addr + NBPDR) & ~PDRMASK; ptepindex = addr >> PDRSHIFT; @@ -2582,16 +2597,16 @@ if (dstmpte == NULL) break; dst_pte = pmap_pte_quick(dst_pmap, addr); - if (*dst_pte == 0) { + if (*dst_pte == 0 && + pmap_try_insert_pv_entry(dst_pmap, addr, + PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* * Clear the modified and * accessed (referenced) bits * during the copy. */ - m = PHYS_TO_VM_PAGE(ptetemp); *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; - pmap_insert_entry(dst_pmap, addr, m); } else pmap_unwire_pte_hold(dst_pmap, dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) From owner-p4-projects@FreeBSD.ORG Sun Apr 2 20:59:57 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 73AB116A429; Sun, 2 Apr 2006 20:59:57 +0000 (UTC) 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 316A316A45E for ; Sun, 2 Apr 2006 20:59:57 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C175D43D6B for ; Sun, 2 Apr 2006 20:59:55 +0000 (GMT) (envelope-from jmg@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 k32KxtrL099496 for ; Sun, 2 Apr 2006 20:59:55 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k32KxtqB099493 for perforce@freebsd.org; Sun, 2 Apr 2006 20:59:55 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 20:59:55 GMT Message-Id: <200604022059.k32KxtqB099493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94486 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, 02 Apr 2006 20:59:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=94486 Change 94486 by jmg@jmg_carbon-60 on 2006/04/02 20:59:42 the hv api assumes that data is a 32bit word, it does not write directly to memory, so just letoh the data value... hopefully this will fix thigns... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#12 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#12 (text+ko) ==== @@ -180,26 +180,25 @@ r = hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, (pci_cfg_data_t *)&data); -#if 0 printf("%d = read_config(%#lx, %#x, %d, %d) = %#x\n", r, sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data); -#endif if (r == H_EOK) { switch (width) { case 1: - ret = *(uint8_t *)&data; + ret = data & 0xff; break; case 2: - ret = *(uint16_t *)&data; + ret = le16toh(data & 0xffff); break; case 4: - ret = data; + ret = le32toh(data); break; default: ret = -1; } - return data; + return ret; } + return -1; } @@ -218,13 +217,13 @@ sc = device_get_softc(dev); switch (width) { case 1: - *(uint8_t *)&data = val; + data = val; break; case 2: - *(uint16_t *)&data = val; + data = htole16(val); break; case 4: - data = val; + data = htole32(val); break; default: panic("unsupported width: %d", width); @@ -239,10 +238,12 @@ { } #endif + static int hvpci_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) { + return (0); } @@ -250,6 +251,7 @@ hvpci_teardown_intr(device_t dev, device_t child, struct resource *vec, void *cookie) { + return (0); } @@ -257,6 +259,7 @@ hvpci_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + return (NULL); } @@ -264,6 +267,7 @@ hvpci_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); } @@ -271,6 +275,7 @@ hvpci_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); } @@ -278,5 +283,6 @@ hvpci_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); } From owner-p4-projects@FreeBSD.ORG Sun Apr 2 21:14:14 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 3BA9F16A425; Sun, 2 Apr 2006 21:14:14 +0000 (UTC) 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 128C216A423 for ; Sun, 2 Apr 2006 21:14:14 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD43F43D48 for ; Sun, 2 Apr 2006 21:14:13 +0000 (GMT) (envelope-from jmg@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 k32LEDR8001592 for ; Sun, 2 Apr 2006 21:14:13 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k32LED2L001585 for perforce@freebsd.org; Sun, 2 Apr 2006 21:14:13 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 21:14:13 GMT Message-Id: <200604022114.k32LED2L001585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94487 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, 02 Apr 2006 21:14:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=94487 Change 94487 by jmg@jmg_arlene on 2006/04/02 21:14:06 drop opt_simulator.h, not needed anymore.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/fs.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/fs.h#4 (text+ko) ==== @@ -33,8 +33,6 @@ #ifndef _UFS_FFS_FS_H_ #define _UFS_FFS_FS_H_ -#include "opt_simulator.h" - /* * Each disk drive contains some number of filesystems. * A filesystem consists of a number of cylinder groups. From owner-p4-projects@FreeBSD.ORG Sun Apr 2 21:15: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 D1B5C16A420; Sun, 2 Apr 2006 21:15:15 +0000 (UTC) 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 B0E4A16A401 for ; Sun, 2 Apr 2006 21:15:15 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A8C843D45 for ; Sun, 2 Apr 2006 21:15:15 +0000 (GMT) (envelope-from jmg@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 k32LFFEu001772 for ; Sun, 2 Apr 2006 21:15:15 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k32LFFwC001769 for perforce@freebsd.org; Sun, 2 Apr 2006 21:15:15 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 21:15:15 GMT Message-Id: <200604022115.k32LFFwC001769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94488 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, 02 Apr 2006 21:15:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=94488 Change 94488 by jmg@jmg_arlene on 2006/04/02 21:15:05 add pci and ata to GENERIC so I have an environment I can test compile in... add sys/endian.h so it compiles, and relocate hv_pcivar.h into include by request of kmacy... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#13 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pcivar.h#2 delete Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#6 (text+ko) ==== @@ -71,15 +71,17 @@ # To make an SMP kernel, the next line is needed #options SMP # Symmetric MultiProcessor Kernel +device pci + # Floppy drives #device fdc # ATA and ATAPI devices -#device ata -#device atadisk # ATA disk drives -#device atapicd # ATAPI CDROM drives -#device atapifd # ATAPI floppy drives -#device atapist # ATAPI tape drives +device ata +device atadisk # ATA disk drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives # Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!, # and you will not mount an ATA /. #options ATA_STATIC_ID # Static device numbering ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#13 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Apr 2 21:52:01 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 C0FDB16A425; Sun, 2 Apr 2006 21:52:01 +0000 (UTC) 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 6CD4616A401 for ; Sun, 2 Apr 2006 21:52:01 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C77F43D46 for ; Sun, 2 Apr 2006 21:52:01 +0000 (GMT) (envelope-from jmg@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 k32Lq1Xg003213 for ; Sun, 2 Apr 2006 21:52:01 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k32Lq0wB003210 for perforce@freebsd.org; Sun, 2 Apr 2006 21:52:00 GMT (envelope-from jmg@freebsd.org) Date: Sun, 2 Apr 2006 21:52:00 GMT Message-Id: <200604022152.k32Lq0wB003210@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94491 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, 02 Apr 2006 21:52:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=94491 Change 94491 by jmg@jmg_arlene on 2006/04/02 21:51:20 disable modules, we aren't far enough to really use them, and aicasm not being part of build tools is anoying.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#7 (text+ko) ==== @@ -24,6 +24,7 @@ ident GENERIC makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions NO_MODULES="" # disable modules (aicasm in buildenv) # Platforms supported # At this time all platforms are supported, as-is. From owner-p4-projects@FreeBSD.ORG Sun Apr 2 22:02: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 9154816A423; Sun, 2 Apr 2006 22:02:15 +0000 (UTC) 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 5897516A41F for ; Sun, 2 Apr 2006 22:02:15 +0000 (UTC) (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 E71C543D4C for ; Sun, 2 Apr 2006 22:02:14 +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 k32M2EE1003733 for ; Sun, 2 Apr 2006 22:02:14 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k32M2E0m003730 for perforce@freebsd.org; Sun, 2 Apr 2006 22:02:14 GMT (envelope-from marcel@freebsd.org) Date: Sun, 2 Apr 2006 22:02:14 GMT Message-Id: <200604022202.k32M2E0m003730@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 94494 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, 02 Apr 2006 22:02:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=94494 Change 94494 by marcel@marcel_nfs on 2006/04/02 22:01:59 IFC @94493 Affected files ... .. //depot/projects/uart/amd64/amd64/pmap.c#28 integrate .. //depot/projects/uart/dev/mpt/mpt.c#13 integrate .. //depot/projects/uart/dev/uart/uart_bus.h#45 integrate .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#15 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#40 integrate .. //depot/projects/uart/i386/i386/pmap.c#31 integrate .. //depot/projects/uart/kern/kern_event.c#10 integrate .. //depot/projects/uart/netinet/tcp_subr.c#16 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#11 integrate .. //depot/projects/uart/nfsserver/nfs_srvsubs.c#9 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/pmap.c#28 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.539 2006/03/21 18:07:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.540 2006/04/02 05:45:05 alc Exp $"); /* * Manages physical address maps. @@ -208,6 +208,8 @@ static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); +static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, + vm_page_t m); static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, int flags); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); @@ -1584,6 +1586,29 @@ } /* + * Conditionally create a pv entry. + */ +static boolean_t +pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) +{ + pv_entry_t pv; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if (pv_entry_count < pv_entry_high_water && + (pv = uma_zalloc(pvzone, M_NOWAIT)) != NULL) { + pv_entry_count++; + pv->pv_va = va; + pv->pv_pmap = pmap; + TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count++; + return (TRUE); + } else + return (FALSE); +} + +/* * pmap_remove_pte: do the things to unmap a page in a process */ static int @@ -2370,7 +2395,6 @@ vm_offset_t addr; vm_offset_t end_addr = src_addr + len; vm_offset_t va_next; - vm_page_t m; if (dst_addr != src_addr) return; @@ -2396,15 +2420,6 @@ if (addr >= UPT_MIN_ADDRESS) panic("pmap_copy: invalid to pmap_copy page tables"); - /* - * Don't let optional prefaulting of pages make us go - * way below the low water mark of free pages or way - * above high water mark of used pv entries. - */ - if (cnt.v_free_count < cnt.v_free_reserved || - pv_entry_count > pv_entry_high_water) - break; - pml4e = pmap_pml4e(src_pmap, addr); if ((*pml4e & PG_V) == 0) { va_next = (addr + NBPML4) & ~PML4MASK; @@ -2467,16 +2482,16 @@ dst_pte = (pt_entry_t *) PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpte)); dst_pte = &dst_pte[pmap_pte_index(addr)]; - if (*dst_pte == 0) { + if (*dst_pte == 0 && + pmap_try_insert_pv_entry(dst_pmap, addr, + PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* * Clear the modified and * accessed (referenced) bits * during the copy. */ - m = PHYS_TO_VM_PAGE(ptetemp & PG_FRAME); *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; - pmap_insert_entry(dst_pmap, addr, m); } else pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) ==== //depot/projects/uart/dev/mpt/mpt.c#13 (text+ko) ==== @@ -92,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.24 2006/04/01 07:12:18 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.25 2006/04/01 19:49:55 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -1398,11 +1398,11 @@ (hdr->Function != MPI_FUNCTION_IOC_FACTS)){ #if __FreeBSD_version >= 500000 mpt_prt(mpt, "reply length does not match message length: " - "got %x; expected %x for function %x\n", + "got %x; expected %zx for function %x\n", hdr->MsgLength << 2, reply_len << 1, hdr->Function); #else mpt_prt(mpt, "reply length does not match message length: " - "got %x; expected %zx for function %x\n", + "got %x; expected %x for function %x\n", hdr->MsgLength << 2, reply_len << 1, hdr->Function); #endif } ==== //depot/projects/uart/dev/uart/uart_bus.h#45 (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/uart/uart_bus.h,v 1.12 2006/03/30 18:37:03 marcel Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.13 2006/04/02 21:45:54 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ @@ -93,7 +93,6 @@ int sc_callout:1; /* This UART is opened for callout. */ int sc_fastintr:1; /* This UART uses fast interrupts. */ - int sc_hasfifo:1; /* This UART has FIFOs. */ int sc_hwiflow:1; /* This UART has HW input flow ctl. */ int sc_hwoflow:1; /* This UART has HW output flow ctl. */ int sc_leaving:1; /* This UART is going away. */ ==== //depot/projects/uart/dev/uart/uart_bus_ebus.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.10 2006/02/24 05:36:44 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.12 2006/04/02 21:58:09 marcel Exp $"); #include #include @@ -66,7 +66,6 @@ const char *nm, *cmpt; struct uart_softc *sc; struct uart_devinfo dummy; - int error; sc = device_get_softc(dev); sc->sc_class = NULL; ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#40 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.18 2006/04/01 19:04:54 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.19 2006/04/02 21:45:54 marcel Exp $"); #include #include @@ -443,7 +443,7 @@ bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); - if (sc->sc_hasfifo) { + if (sc->sc_rxfifosz > 1) { ns8250_flush(bas, what); uart_setreg(bas, REG_FCR, ns8250->fcr); uart_barrier(bas); @@ -635,14 +635,14 @@ */ uart_setreg(bas, REG_FCR, FCR_ENABLE); uart_barrier(bas); - sc->sc_hasfifo = (uart_getreg(bas, REG_IIR) & IIR_FIFO_MASK) ? 1 : 0; - if (!sc->sc_hasfifo) { + if (!(uart_getreg(bas, REG_IIR) & IIR_FIFO_MASK)) { /* * NS16450 or INS8250. We don't bother to differentiate * between them. They're too old to be interesting. */ uart_setreg(bas, REG_MCR, mcr); uart_barrier(bas); + sc->sc_rxfifosz = sc->sc_txfifosz = 1; device_set_desc(sc->sc_dev, "8250 or 16450 or compatible"); return (0); } ==== //depot/projects/uart/i386/i386/pmap.c#31 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.546 2006/03/21 18:07:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.547 2006/04/02 05:45:05 alc Exp $"); /* * Manages physical address maps. @@ -263,6 +263,8 @@ static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); +static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, + vm_page_t m); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); @@ -1587,6 +1589,29 @@ } /* + * Conditionally create a pv entry. + */ +static boolean_t +pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) +{ + pv_entry_t pv; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if (pv_entry_count < pv_entry_high_water && + (pv = uma_zalloc(pvzone, M_NOWAIT)) != NULL) { + pv_entry_count++; + pv->pv_va = va; + pv->pv_pmap = pmap; + TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count++; + return (TRUE); + } else + return (FALSE); +} + +/* * pmap_remove_pte: do the things to unmap a page in a process */ static int @@ -2341,7 +2366,6 @@ vm_offset_t addr; vm_offset_t end_addr = src_addr + len; vm_offset_t pdnxt; - vm_page_t m; if (dst_addr != src_addr) return; @@ -2367,15 +2391,6 @@ if (addr >= UPT_MIN_ADDRESS) panic("pmap_copy: invalid to pmap_copy page tables"); - /* - * Don't let optional prefaulting of pages make us go - * way below the low water mark of free pages or way - * above high water mark of used pv entries. - */ - if (cnt.v_free_count < cnt.v_free_reserved || - pv_entry_count > pv_entry_high_water) - break; - pdnxt = (addr + NBPDR) & ~PDRMASK; ptepindex = addr >> PDRSHIFT; @@ -2417,16 +2432,16 @@ if (dstmpte == NULL) break; dst_pte = pmap_pte_quick(dst_pmap, addr); - if (*dst_pte == 0) { + if (*dst_pte == 0 && + pmap_try_insert_pv_entry(dst_pmap, addr, + PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* * Clear the modified and * accessed (referenced) bits * during the copy. */ - m = PHYS_TO_VM_PAGE(ptetemp); *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; - pmap_insert_entry(dst_pmap, addr, m); } else pmap_unwire_pte_hold(dst_pmap, dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) ==== //depot/projects/uart/kern/kern_event.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.96 2006/03/29 18:15:30 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.97 2006/04/01 20:15:39 jmg Exp $"); #include #include @@ -887,6 +887,8 @@ kev->fflags = 0; kev->data = 0; kn->kn_kevent = *kev; + kn->kn_kevent.flags &= ~(EV_ADD | EV_DELETE | + EV_ENABLE | EV_DISABLE); kn->kn_status = KN_INFLUX|KN_DETACHED; error = knote_attach(kn, kq); ==== //depot/projects/uart/netinet/tcp_subr.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.238 2006/04/01 16:36:36 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.239 2006/04/01 23:53:25 rwatson Exp $ */ #include "opt_compat.h" @@ -1823,10 +1823,14 @@ struct inpcb *inp; /* - * At this point, we should have an inpcb<->twtcp pair, with no - * associated socket. Validate that this is the case. + * At this point, we are in one of two situations: + * + * (1) We have no socket, just an inpcb<->twtcp pair. Release it all + * after validating. * - * XXXRW: This comment stale -- could still have socket ...? + * (2) We have a socket, which we may or may now own the reference + * for. If we own the reference, release all the state after + * validating. If not, leave it for the socket close to clean up. */ inp = tw->tw_inpcb; KASSERT((inp->inp_vflag & INP_TIMEWAIT), ("tcp_twclose: !timewait")); @@ -1840,32 +1844,45 @@ inp->inp_vflag |= INP_DROPPED; so = inp->inp_socket; - if (so != NULL && inp->inp_vflag & INP_SOCKREF) { - KASSERT(so->so_state & SS_PROTOREF, - ("tcp_twclose: !SS_PROTOREF")); - inp->inp_vflag &= ~INP_SOCKREF; + if (so != NULL) { + if (inp->inp_vflag & INP_SOCKREF) { + /* + * If a socket is present, and we own the only + * reference, we need to tear down the socket and the + * inpcb. + */ + inp->inp_vflag &= ~INP_SOCKREF; #ifdef INET6 - if (inp->inp_vflag & INP_IPV6PROTO) { - in6_pcbdetach(inp); - in6_pcbfree(inp); + if (inp->inp_vflag & INP_IPV6PROTO) { + in6_pcbdetach(inp); + in6_pcbfree(inp); + } else { + in_pcbdetach(inp); + in_pcbfree(inp); + } +#endif + ACCEPT_LOCK(); + SOCK_LOCK(so); + KASSERT(so->so_state & SS_PROTOREF, + ("tcp_twclose: INP_SOCKREF && !SS_PROTOREF")); + so->so_state &= ~SS_PROTOREF; + sofree(so); } else { - in_pcbdetach(inp); - in_pcbfree(inp); + /* + * If we don't own the only reference, the socket and + * inpcb need to be left around to be handled by + * tcp_usr_detach() later. + */ + INP_UNLOCK(inp); } -#endif - ACCEPT_LOCK(); - SOCK_LOCK(so); - so->so_state &= ~SS_PROTOREF; - sofree(so); - } else if (so == NULL) { + } else { #ifdef INET6 if (inp->inp_vflag & INP_IPV6PROTO) in6_pcbfree(inp); else #endif in_pcbfree(inp); - } else - printf("tcp_twclose: so != NULL but !INP_SOCKREF"); + } tcpstat.tcps_closed++; crfree(tw->tw_cred); tw->tw_cred = NULL; ==== //depot/projects/uart/netinet/tcp_usrreq.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.131 2006/04/01 16:36:36 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.133 2006/04/02 16:42:51 rwatson Exp $ */ #include "opt_inet.h" @@ -161,16 +161,33 @@ INP_LOCK(inp); KASSERT(inp->inp_socket != NULL, ("tcp_usr_detach: inp_socket == NULL")); + TCPDEBUG1(); - TCPDEBUG1(); - tp = intotcpcb(inp); + /* + * First, if we still have full TCP state, and we're not dropped, + * initiate a disconnect. + */ + if (!(inp->inp_vflag & INP_TIMEWAIT) && + !(inp->inp_vflag & INP_DROPPED)) { + tp = intotcpcb(inp); + tcp_disconnect(tp); + } + /* + * Second, release any protocol state that we can reasonably release. + * Note that the call to tcp_disconnect() may actually have changed + * the TCP state, so we have to re-evaluate INP_TIMEWAIT and + * INP_DROPPED. + */ if (inp->inp_vflag & INP_TIMEWAIT) { if (inp->inp_vflag & INP_DROPPED) { /* * Connection was in time wait and has been dropped; - * the calling path is via tcp_twclose(), which will - * free the tcptw, so we can discard the remainder. + * the calling path is either via tcp_twclose(), or + * as a result of an eventual soclose() after + * tcp_twclose() has been called. In either case, + * tcp_twclose() has detached the tcptw from the + * inpcb, so we just detach and free the inpcb. * * XXXRW: Would it be cleaner to free the tcptw * here? @@ -222,10 +239,6 @@ } #endif } else { - /* - * Connection state still required, as is socket, so - * mark socket for TCP to free later. - */ SOCK_LOCK(so); so->so_state |= SS_PROTOREF; SOCK_UNLOCK(so); @@ -1447,7 +1460,8 @@ soisdisconnecting(so); sbflush(&so->so_rcv); tcp_usrclosed(tp); - tcp_output(tp); + if (!(inp->inp_vflag & INP_DROPPED)) + tcp_output(tp); } } ==== //depot/projects/uart/nfsserver/nfs_srvsubs.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.139 2006/03/31 03:54:19 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.140 2006/04/02 04:24:57 cel Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -1399,6 +1399,7 @@ nfsm_srvsattr_xx(struct vattr *a, struct mbuf **md, caddr_t *dpos) { u_int32_t *tl; + int toclient = 0; NFSD_LOCK_DONTCARE(); @@ -1447,9 +1448,11 @@ if (tl == NULL) return EBADRPC; fxdr_nfsv3time(tl, &(a)->va_atime); + toclient = 1; break; case NFSV3SATTRTIME_TOSERVER: getnanotime(&(a)->va_atime); + a->va_vaflags |= VA_UTIMES_NULL; break; } tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos); @@ -1461,9 +1464,12 @@ if (tl == NULL) return EBADRPC; fxdr_nfsv3time(tl, &(a)->va_mtime); + a->va_vaflags &= ~VA_UTIMES_NULL; break; case NFSV3SATTRTIME_TOSERVER: getnanotime(&(a)->va_mtime); + if (toclient == 0) + a->va_vaflags |= VA_UTIMES_NULL; break; } return 0; From owner-p4-projects@FreeBSD.ORG Mon Apr 3 00:00: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 F02CF16A48C; Mon, 3 Apr 2006 00:00:25 +0000 (UTC) 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 B4E2C16A484 for ; Mon, 3 Apr 2006 00:00:25 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3FA243D55 for ; Mon, 3 Apr 2006 00:00:24 +0000 (GMT) (envelope-from jmg@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 k3300OvT012774 for ; Mon, 3 Apr 2006 00:00:24 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3300OmM012771 for perforce@freebsd.org; Mon, 3 Apr 2006 00:00:24 GMT (envelope-from jmg@freebsd.org) Date: Mon, 3 Apr 2006 00:00:24 GMT Message-Id: <200604030000.k3300OmM012771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94499 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, 03 Apr 2006 00:00:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=94499 Change 94499 by jmg@jmg_carbon-60 on 2006/04/02 23:59:55 add ivar stuff to get the bus number... the OF_getprop stuff probably won't work because last time I tried this is broke... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#14 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#2 (text+ko) ==== @@ -32,6 +32,7 @@ struct hvpci_softc { devhandle_t hs_devhandle; + uint8_t hs_busnum; }; #endif /* _HV_PCIVAR_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#14 (text+ko) ==== @@ -82,6 +82,8 @@ /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), + DEVMETHOD(bus_read_ivar, hvpci_read_ivar), + DEVMETHOD(bus_write_ivar, hvpci_write_ivar), DEVMETHOD(bus_setup_intr, hvpci_setup_intr), DEVMETHOD(bus_teardown_intr, hvpci_teardown_intr), DEVMETHOD(bus_alloc_resource, hvpci_alloc_resource), @@ -125,18 +127,25 @@ hvpci_attach(device_t dev) { struct hvpci_softc *sc; - phandle_t node; #if 0 uint32_t cell; #endif uint64_t reg, nreg; + int br[2]; + int n; node = ofw_bus_get_node(dev); if (node == -1) panic("%s: ofw_bus_get_node failed.", __func__); sc = device_get_softc(dev); + n = OF_getprop(node, "bus-range", (void *)br, sizeof br); + if (n == -1) + panic("%s: could not get bus-range", __func__); + if (n != sizeof(psycho_br)) + panic("%s: broken bus-range (%d)", __func__, n); + sc->hs_busnum = br[0]; #if 0 if (OF_getprop(node, "reg", &cell, sizeof cell) == -1) panic("%s: OF_getprop failed.", __func__); @@ -144,10 +153,10 @@ #else bus_get_resource(dev, SYS_RES_MEMORY, 0, ®, &nreg); sc->hs_devhandle = SUN4V_REG_SPEC2CFG_HDL(reg); - #endif - printf("%s, devhandle=0x%lx\n", __func__, sc->hs_devhandle); + printf("%s, devhandle=0x%lx, busnum: %hhu\n", __func__, + sc->hs_devhandle, sc->hs_busnum); device_add_child(dev, "pci", -1); @@ -241,6 +250,36 @@ #endif static int +hypci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) +{ + struct hvpci_softc *sc; + + sc = device_get_softc(dev); + + switch (which) { + case PCIB_IVAR_BUS: + *result = sc->hs_busnum; + return (0); + } + + return (ENOENT); +} + +static int +hypci_write_ivar(device_t dev, device_t child, int which, uintptr_t value) +{ + struct hvpci_softc *sc; + + sc = device_get_softc(dev); + case PCIB_IVAR_BUS: + sc->hs_busnum = value; + return (0); + } + + return (ENOENT); +} + +static int hvpci_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) { From owner-p4-projects@FreeBSD.ORG Mon Apr 3 00:05: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 CD5F716A423; Mon, 3 Apr 2006 00:05:31 +0000 (UTC) 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 7DC9F16A420 for ; Mon, 3 Apr 2006 00:05:31 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4764443D45 for ; Mon, 3 Apr 2006 00:05:31 +0000 (GMT) (envelope-from jmg@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 k3305Vfd014284 for ; Mon, 3 Apr 2006 00:05:31 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3305UTs014281 for perforce@freebsd.org; Mon, 3 Apr 2006 00:05:30 GMT (envelope-from jmg@freebsd.org) Date: Mon, 3 Apr 2006 00:05:30 GMT Message-Id: <200604030005.k3305UTs014281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94500 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, 03 Apr 2006 00:05:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=94500 Change 94500 by jmg@jmg_arlene on 2006/04/03 00:05:01 make compile... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#15 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#15 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include @@ -59,6 +60,8 @@ */ static device_probe_t hvpci_probe; static device_attach_t hvpci_attach; +static bus_read_ivar_t hvpci_read_ivar; +static bus_write_ivar_t hvpci_write_ivar; static bus_setup_intr_t hvpci_setup_intr; static bus_teardown_intr_t hvpci_teardown_intr; static bus_alloc_resource_t hvpci_alloc_resource; @@ -143,7 +146,7 @@ n = OF_getprop(node, "bus-range", (void *)br, sizeof br); if (n == -1) panic("%s: could not get bus-range", __func__); - if (n != sizeof(psycho_br)) + if (n != sizeof br) panic("%s: broken bus-range (%d)", __func__, n); sc->hs_busnum = br[0]; #if 0 @@ -250,7 +253,7 @@ #endif static int -hypci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) +hvpci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { struct hvpci_softc *sc; @@ -266,11 +269,12 @@ } static int -hypci_write_ivar(device_t dev, device_t child, int which, uintptr_t value) +hvpci_write_ivar(device_t dev, device_t child, int which, uintptr_t value) { struct hvpci_softc *sc; sc = device_get_softc(dev); + switch (which) { case PCIB_IVAR_BUS: sc->hs_busnum = value; return (0); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 00:08: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 BEE7716A42C; Mon, 3 Apr 2006 00:08:42 +0000 (UTC) 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 9E03816A424 for ; Mon, 3 Apr 2006 00:08:42 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C80A243D7D for ; Mon, 3 Apr 2006 00:08:35 +0000 (GMT) (envelope-from jmg@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 k3308Zwf014452 for ; Mon, 3 Apr 2006 00:08:35 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3308ZQs014449 for perforce@freebsd.org; Mon, 3 Apr 2006 00:08:35 GMT (envelope-from jmg@freebsd.org) Date: Mon, 3 Apr 2006 00:08:35 GMT Message-Id: <200604030008.k3308ZQs014449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94501 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, 03 Apr 2006 00:08:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=94501 Change 94501 by jmg@jmg_arlene on 2006/04/03 00:07:36 the hypervisor api does the byte swizzle for us... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#16 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#16 (text+ko) ==== @@ -201,10 +201,10 @@ ret = data & 0xff; break; case 2: - ret = le16toh(data & 0xffff); + ret = data & 0xffff; break; case 4: - ret = le32toh(data); + ret = data; break; default: ret = -1; @@ -233,10 +233,10 @@ data = val; break; case 2: - data = htole16(val); + data = val & 0xffff; break; case 4: - data = htole32(val); + data = val; break; default: panic("unsupported width: %d", width); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 06:06: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 DC55016A423; Mon, 3 Apr 2006 06:06:24 +0000 (UTC) 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 B785D16A41F for ; Mon, 3 Apr 2006 06:06:24 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DC4F43D45 for ; Mon, 3 Apr 2006 06:06:24 +0000 (GMT) (envelope-from jmg@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 k3366Ons053433 for ; Mon, 3 Apr 2006 06:06:24 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3366Nhx053430 for perforce@freebsd.org; Mon, 3 Apr 2006 06:06:23 GMT (envelope-from jmg@freebsd.org) Date: Mon, 3 Apr 2006 06:06:23 GMT Message-Id: <200604030606.k3366Nhx053430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94508 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, 03 Apr 2006 06:06:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=94508 Change 94508 by jmg@jmg_arlene on 2006/04/03 06:05:45 only have one slot.. otherwise we respond on all slots, which isn't very useful... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#17 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#17 (text+ko) ==== @@ -170,7 +170,7 @@ hvpci_maxslots(device_t dev) { - return (PCI_SLOTMAX); + return (0); } #define HVPCI_BDF(b, d, f) \ From owner-p4-projects@FreeBSD.ORG Mon Apr 3 06:41: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 54DE516A420; Mon, 3 Apr 2006 06:41:07 +0000 (UTC) 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 3006216A41F for ; Mon, 3 Apr 2006 06:41:07 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1EFC43D49 for ; Mon, 3 Apr 2006 06:41:06 +0000 (GMT) (envelope-from jmg@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 k336f6fj055024 for ; Mon, 3 Apr 2006 06:41:06 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k336f6iG055021 for perforce@freebsd.org; Mon, 3 Apr 2006 06:41:06 GMT (envelope-from jmg@freebsd.org) Date: Mon, 3 Apr 2006 06:41:06 GMT Message-Id: <200604030641.k336f6iG055021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94510 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, 03 Apr 2006 06:41:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=94510 Change 94510 by jmg@jmg_arlene on 2006/04/03 06:40:19 don't force the unit number to match the bus number, this breaks machines with multiple pci domains... how the alpha worked with this is beyond me (besides using custom pci bridge drivers?) Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#3 (text+ko) ==== @@ -245,7 +245,7 @@ pcib_attach_common(dev); sc = device_get_softc(dev); if (sc->secbus != 0) { - child = device_add_child(dev, "pci", sc->secbus); + child = device_add_child(dev, "pci", -1); if (child != NULL) return(bus_generic_attach(dev)); } From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:14: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 BC79316A424; Mon, 3 Apr 2006 07:14:49 +0000 (UTC) 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 905FB16A401 for ; Mon, 3 Apr 2006 07:14:49 +0000 (UTC) (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 0769643D4C for ; Mon, 3 Apr 2006 07:14:49 +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 k337EmJR057965 for ; Mon, 3 Apr 2006 07:14:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337Emo4057962 for perforce@freebsd.org; Mon, 3 Apr 2006 07:14:48 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:14:48 GMT Message-Id: <200604030714.k337Emo4057962@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 94511 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, 03 Apr 2006 07:14:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=94511 Change 94511 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:13:54 add pmap_ipi add SMP support to page invalidate functions some cleanup fix bug where we weren't mapping part OFW space Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#35 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#9 (text+ko) ==== @@ -69,7 +69,8 @@ struct tte_hash *pm_hash; TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ struct hv_tsb_info pm_tsb; - cpumask_t pm_active; + cpumask_t pm_active; /* mask of cpus currently using pmap */ + cpumask_t pm_tlbactive; /* mask of cpus that have used this pmap */ struct pmap_statistics pm_stats; }; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#35 (text+ko) ==== @@ -113,8 +113,6 @@ vm_offset_t virtual_end; vm_offset_t kernel_vm_end; vm_offset_t vm_max_kernel_address; -vm_paddr_t kernel_phys; - #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 @@ -127,7 +125,9 @@ static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; int pmap_debug = 0; static int context = 1; /* XXX */ - +static int permanent_mappings = 0; +static uint64_t nucleus_memory; +static uint64_t nucleus_mappings[2]; /* * Kernel pmap. */ @@ -359,7 +359,7 @@ pmap = vmspace_pmap(td->td_proc->p_vmspace); oldpmap = PCPU_GET(curpmap); #if defined(SMP) - atomic_clear_long(&oldpmap->pm_active, PCPU_GET(cpumask)); + atomic_clear_int(&oldpmap->pm_active, PCPU_GET(cpumask)); pmap->pm_active = PCPU_GET(cpumask); #else oldpmap->pm_active &= ~1; @@ -473,7 +473,6 @@ */ #ifdef notyet tsb_8k_size = virtsz >> (PAGE_SHIFT - TTE_SHIFT); - DPRINTF("tsb_8k_size is 0x%lx\n", tsb_8k_size); #else /* avoid alignment complaints from the hypervisor */ tsb_8k_size = PAGE_SIZE_4M; @@ -482,6 +481,7 @@ pa = pmap_bootstrap_alloc(tsb_8k_size); if (pa & PAGE_MASK_4M) panic("pmap_bootstrap: tsb unaligned\n"); + DPRINTF("tsb_8k_size is 0x%lx, tsb_8k_pa is 0x%lx\n", tsb_8k_size, pa); kernel_td[TSB8K_INDEX].hvtsb_idxpgsz = TTE8K; kernel_td[TSB8K_INDEX].hvtsb_assoc = 1; kernel_td[TSB8K_INDEX].hvtsb_ntte = (tsb_8k_size >> TTE_SHIFT); @@ -531,7 +531,7 @@ */ mmu_fault_status_area = pmap_bootstrap_alloc(MMFSA_SIZE*MAXCPU); - proc0_mem = pmap_bootstrap_alloc(PAGE_SIZE*4*40); + proc0_mem = pmap_bootstrap_alloc(PAGE_SIZE*4*400); /* * Allocate and map the message buffer. */ @@ -559,16 +559,6 @@ for (i = 0; phys_avail[i + 2] != 0; i += 2) ; Maxmem = sparc64_btop(phys_avail[i + 1]); - /* - * setup direct mappings - * - */ - pa = PAGE_SIZE_4M; - for (i = 0; phys_avail[i + 2] != 0; i += 2) - for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) { - tsb_set_tte(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), - pa | TTE_KERNEL | VTD_4M, 0); - } /* * Add the prom mappings to the kernel tsb. @@ -595,24 +585,28 @@ translations[i].om_size, translations[i].om_start, translations[i].om_tte); - if (translations[i].om_size == PAGE_SIZE_4M && - translations[i].om_start == KERNBASE) { - kernel_phys = pa = TTE_GET_PA(translations[i].om_tte); + (translations[i].om_start == KERNBASE || + translations[i].om_start == KERNBASE + PAGE_SIZE_4M)) { DPRINTF("mapping permanent translation\n"); - error = hv_mmu_map_perm_addr((char *)translations[i].om_start, KCONTEXT, - pa | TTE_KERNEL | VTD_4M, MAP_ITLB | MAP_DTLB); + pa = TTE_GET_PA(translations[i].om_tte); + error = hv_mmu_map_perm_addr((char *)translations[i].om_start, + KCONTEXT, pa | TTE_KERNEL | VTD_4M, MAP_ITLB | MAP_DTLB); + nucleus_mappings[permanent_mappings++] = pa; + nucleus_memory += PAGE_SIZE_4M; + +#ifdef SMP + mp_add_nucleus_mapping(translations[i].om_start, + pa | TTE_KERNEL | VTD_4M); +#endif + if (error != H_EOK) panic("map_perm_addr returned error=%ld", error); continue; - } -#if 1 - else if (translations[i].om_start < VM_MIN_PROM_ADDRESS || + } else if (translations[i].om_start < VM_MIN_PROM_ADDRESS || translations[i].om_start > VM_MAX_PROM_ADDRESS) { continue; - } -#endif - else { + } else { for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { va = translations[i].om_start + off; @@ -624,6 +618,18 @@ } } + + /* + * setup direct mappings + * + */ + pa = PAGE_SIZE_4M; + for (i = 0; phys_avail[i + 2] != 0; i += 2) + for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) { + tsb_set_tte(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), + pa | TTE_KERNEL | VTD_4M, 0); + } + /* * Get the available physical memory ranges from /memory/reg. These * are only used for kernel dumps, but it may not be wise to do prom @@ -639,6 +645,7 @@ pm = kernel_pmap; pm->pm_active = ~0; + pm->pm_tlbactive = ~0; PMAP_LOCK_INIT(kernel_pmap); TAILQ_INIT(&kernel_pmap->pm_pvlist); @@ -647,6 +654,10 @@ if (error != H_EOK) panic("failed to set ctx0 TSBs error: %ld", error); +#ifdef SMP + mp_set_tsb_desc_ra(vtophys((vm_offset_t)&kernel_td)); +#endif + /* * This could happen earlier - but I put it here to avoid * attempts to do updates until they're legal @@ -654,12 +665,16 @@ pm->pm_hash = tte_hash_kernel_create(TLB_PHYS_TO_DIRECT(kernel_hash_pa), PAGE_SIZE_4M); pm->pm_hashscratch = tte_hash_set_scratchpad_kernel(pm->pm_hash); - for (i = 0; i < sz; i++) { -#if 1 + for (i = 0; i < translations_size; i++) { + DPRINTF("om_size=%ld om_start=%lx om_tte=%lx\n", + translations[i].om_size, translations[i].om_start, + translations[i].om_tte); + if (translations[i].om_start < VM_MIN_PROM_ADDRESS || - translations[i].om_start > VM_MAX_PROM_ADDRESS) + translations[i].om_start > VM_MAX_PROM_ADDRESS) { + DPRINTF("skipping\n"); continue; -#endif + } for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { va = translations[i].om_start + off; pa = TTE_GET_PA(translations[i].om_tte) + off; @@ -767,8 +782,6 @@ pmap_insert_entry(dst_pmap, addr, m); } } - - } sched_unpin(); @@ -806,7 +819,8 @@ int invlva; if (pmap->pm_context) - DPRINTF("pmap_enter(va=%lx, pa=0x%lx, prot=%x)\n", va, VM_PAGE_TO_PHYS(m), prot); + DPRINTF("pmap_enter(va=%lx, pa=0x%lx, prot=%x)\n", va, + VM_PAGE_TO_PHYS(m), prot); om = NULL; @@ -929,7 +943,8 @@ uint64_t tte_data; if (pmap->pm_context) - DPRINTF("pmap_enter_quick(ctx=0x%lx va=%lx, pa=0x%lx prot=%x)\n", pmap->pm_context, va, VM_PAGE_TO_PHYS(m), prot); + DPRINTF("pmap_enter_quick(ctx=0x%lx va=%lx, pa=0x%lx prot=%x)\n", + pmap->pm_context, va, VM_PAGE_TO_PHYS(m), prot); mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); @@ -1049,12 +1064,6 @@ { pv_entry_t pv; -#if 0 - TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) - if (pv->pv_va == va) - panic("va=0x%lx already in pmap for ctx=0x%lx\n", - va, pmap->pm_context); -#endif DPRINTF("pmap_insert_entry(va=0x%lx, pa=0x%lx)\n", va, VM_PAGE_TO_PHYS(m)); pv = get_pv_entry(pmap); pv->pv_va = va; @@ -1065,22 +1074,56 @@ TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; +} + +#ifdef SMP +static void +pmap_ipi(pmap_t pmap, char *func, uint64_t arg1, uint64_t arg2) +{ + int active; + cpumask_t cpumask; - + if (!smp_started) + return; + + cpumask = PCPU_GET(cpumask); + +#ifndef CPUMASK_NOT_BEING_ERRONEOUSLY_CHANGED + /* by definition cpumask should have curcpu's bit set */ + if (cpumask != (1 << curcpu)) + panic("cpumask(0x%x) != (1 << curcpu) (0x%x)\n", + cpumask, (1 << curcpu)); + + /* tlbactive should be set if we're using a pmap */ + if ((cpumask & pmap->pm_tlbactive) == 0) + panic("cpumask(0x%x) & tlbactive (0x%x) == 0\n", + cpumask, pmap->pm_tlbactive); +#endif + + if (cpumask == pmap->pm_tlbactive) + return; + + if (pmap != kernel_pmap) + active = pmap->pm_tlbactive & ~cpumask; + else + active = PCPU_GET(other_cpus); + + cpu_ipi_selected(active, (uint64_t)func, (uint64_t)arg1, (uint64_t)arg2); } +#endif void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { -#ifdef SMP -#error __FUNCTION_ not implemented -#else tsb_clear_tte(&pmap->pm_tsb, va); DPRINTF("pmap_invalidate_page(va=0x%lx)\n", va); invlpg(va, pmap->pm_context); + +#ifdef SMP + pmap_ipi(pmap, (void *)tl_invlpg, (uint64_t)va, (uint64_t)pmap->pm_context); #endif } @@ -1088,43 +1131,58 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { vm_offset_t tva; - /* XXX */ - invltlb(); + char *func; if (pmap != kernel_pmap) DPRINTF("pmap_invalidate_range(sva=%lx, eva=%lx)\n", sva, eva); - /* XXX SUN4V_FIXME - oversimplified logic */ if ((((eva - sva) >> PAGE_SHIFT) < MAX_TSB_CLEARS) || - (pmap->pm_context == 0)) + (pmap->pm_context == 0)) { tsb_clear_range(&pmap->pm_tsb, sva, eva); - else + func = tl_invltlb; + } else { tsb_clear(&pmap->pm_tsb); + func = tl_invlctx; + } + /* XXX */ + invltlb(); if ((((eva - sva) >> PAGE_SHIFT) < MAX_INVALIDATES)) { for (tva = sva; tva < eva; tva += PAGE_SIZE_8K) invlpg(tva, pmap->pm_context); - } else if (pmap->pm_context) + } else if (pmap->pm_context) { invlctx(pmap->pm_context); - else + } else invltlb(); +#ifdef SMP + pmap_ipi(pmap, (void *)func, 0, 0); + pmap->pm_tlbactive = pmap->pm_active; +#endif + + } - void pmap_invalidate_all(pmap_t pmap) { -#ifdef SMP -#error __FUNCTION_ not implemented -#else + char *func; tsb_clear(&pmap->pm_tsb); - if (pmap->pm_context) + + if (pmap->pm_context) { invlctx(pmap->pm_context); - else + func = tl_invlctx; + } else { invltlb(); + func = tl_invltlb; + } + +#ifdef SMP + pmap_ipi(pmap, func, pmap->pm_context, 0); + pmap->pm_tlbactive = pmap->pm_active; #endif + } boolean_t @@ -1163,9 +1221,11 @@ vm_paddr_t pa; pa = 0; - if (va > KERNBASE && va < KERNBASE + PAGE_SIZE_4M) - pa = kernel_phys + (va - KERNBASE); - + if (va > KERNBASE && va < KERNBASE + nucleus_memory) { + uint64_t offset; + offset = va - KERNBASE; + pa = nucleus_mappings[offset >> 22] + offset; + } if ((pa == 0) && (tte_data = tsb_lookup_tte(va, 0)) != 0) pa = TTE_GET_PA(tte_data) | (va & TTE_GET_PAGE_MASK(tte_data)); @@ -1662,23 +1722,6 @@ } /* - * Set the 2 global kernel TSBs - * - */ - -void -pmap_set_tsbs(void) -{ - uint64_t error; - - error = hv_set_ctx0(2, vtophys(&kernel_td)); - - if (error != H_EOK) - panic("failed to set ctx0 TSBs error: %ld", error); - -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:16: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 7489016A41F; Mon, 3 Apr 2006 07:16:52 +0000 (UTC) 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 3ABA816A400 for ; Mon, 3 Apr 2006 07:16:52 +0000 (UTC) (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 0857643D49 for ; Mon, 3 Apr 2006 07:16:52 +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 k337GpJF058068 for ; Mon, 3 Apr 2006 07:16:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337GpDf058065 for perforce@freebsd.org; Mon, 3 Apr 2006 07:16:51 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:16:51 GMT Message-Id: <200604030716.k337GpDf058065@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 94512 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, 03 Apr 2006 07:16:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=94512 Change 94512 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:16:09 bump up number of static allocations reduce noise until we start to run out Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#12 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#12 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -159,7 +160,7 @@ m = NULL; - if (proc0_mem_allocated < 40) { + if (proc0_mem_allocated < 400) { proc0_mem_allocated++; th->th_hashtable = (void *)TLB_PHYS_TO_DIRECT(proc0_mem); @@ -183,8 +184,8 @@ th->th_hashtable = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); done: *scratchval = (uint64_t)((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size); - - printf("hash_create done\n"); + if (proc0_mem_allocated > 390) + printf("hash_create done\n"); return (th); } From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:16:53 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 5748E16A482; Mon, 3 Apr 2006 07:16:52 +0000 (UTC) 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 9D2A616A462 for ; Mon, 3 Apr 2006 07:16:52 +0000 (UTC) (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 5910343D49 for ; Mon, 3 Apr 2006 07:16:52 +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 k337GqWJ058074 for ; Mon, 3 Apr 2006 07:16:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337GqX2058071 for perforce@freebsd.org; Mon, 3 Apr 2006 07:16:52 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:16:52 GMT Message-Id: <200604030716.k337GqX2058071@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 94513 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, 03 Apr 2006 07:16:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=94513 Change 94513 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:16:47 add init_mondo implementation Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#11 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#11 (text+ko) ==== @@ -806,7 +806,21 @@ restore END(bzerophyspage) - + +ENTRY(init_mondo) + ldx [PCPU(MONDO_DATA)], %g2 + stx %o0, [%g2] + stx %o1, [%g2+8] + stx %o2, [%g2+0x10] + stx %g0, [%g2+0x18] + stx %g0, [%g2+0x20] + stx %g0, [%g2+0x28] + stx %g0, [%g2+0x30] + stx %g0, [%g2+0x38] + retl + membar #Sync +END(init_mondo) + #ifdef GPROF From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:19:57 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 688D016A422; Mon, 3 Apr 2006 07:19:57 +0000 (UTC) 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 2E88F16A41F for ; Mon, 3 Apr 2006 07:19:57 +0000 (UTC) (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 92D7743D46 for ; Mon, 3 Apr 2006 07:19:56 +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 k337JuWO058166 for ; Mon, 3 Apr 2006 07:19:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337JueQ058163 for perforce@freebsd.org; Mon, 3 Apr 2006 07:19:56 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:19:56 GMT Message-Id: <200604030719.k337JueQ058163@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 94514 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, 03 Apr 2006 07:19:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=94514 Change 94514 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:19:10 rework for sun4v ifdef out sun4u specific code in exception.S Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_exception.S#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_locore.S#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_machdep.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_exception.S#2 (text+ko) ==== @@ -44,6 +44,7 @@ /* * Invalidate a physical page in the data cache. For UltraSPARC I and II. */ +#if 0 ENTRY(tl_ipi_spitfire_dcache_page_inval) #if KTR_COMPILE & KTR_SMP CATR(KTR_SMP, "ipi_dcache_page_inval: pa=%#lx" @@ -153,7 +154,8 @@ IPI_DONE(%g5, %g1, %g2, %g3) retry END(tl_ipi_cheetah_dcache_page_inval) - +#endif + /* * Trigger a softint at the desired level. */ @@ -170,15 +172,16 @@ 9: #endif - mov 1, %g1 - sllx %g1, %g5, %g1 - wr %g1, 0, %set_softint + mov 1, %g2 + sllx %g2, %g1, %g2 + wr %g2, 0, %set_softint retry END(tl_ipi_level) /* * Demap a page from the dtlb and/or itlb. */ +#if 0 ENTRY(tl_ipi_tlb_page_demap) #if KTR_COMPILE & KTR_SMP CATR(KTR_SMP, "ipi_tlb_page_demap: pm=%p va=%#lx" @@ -274,3 +277,4 @@ IPI_DONE(%g5, %g1, %g2, %g3) retry END(tl_ipi_tlb_context_demap) +#endif ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_locore.S#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "assym.s" @@ -40,46 +40,69 @@ .text _ALIGN_TEXT -1: rd %pc, %l0 - ldx [%l0 + (4f-1b)], %l1 - add %l0, (6f-1b), %l2 + +1: rd %pc, %l0 ! startpc + mov %o0, %g1 ! save arg to to mp_tramp_func + ldx [%l0 + (6f-1b)], %l1 ! read mp_tramp_tte_slots + add %l0, (7f-1b), %l2 ! %l2 points to start of slot area clr %l3 -2: cmp %l3, %l1 +2: cmp %l3, %l1 ! number of slots entered == total? be %xcc, 3f - nop - ldx [%l2 + TTE_VPN], %l4 - ldx [%l2 + TTE_DATA], %l5 - srlx %l4, TV_SIZE_BITS, %l4 - sllx %l4, PAGE_SHIFT_4M, %l4 - wr %g0, ASI_DMMU, %asi - stxa %l4, [%g0 + AA_DMMU_TAR] %asi - stxa %l5, [%g0] ASI_DTLB_DATA_IN_REG - wr %g0, ASI_IMMU, %asi - stxa %l4, [%g0 + AA_IMMU_TAR] %asi - stxa %l5, [%g0] ASI_ITLB_DATA_IN_REG - membar #Sync - flush %l4 - add %l2, 1 << TTE_SHIFT, %l2 - add %l3, 1, %l3 + nop + ldx [%l2], %o0 ! VA + mov 0, %o1 ! ctx0 + ldx [%l2 + 8], %o2 ! TTE + mov MAP_ITLB|MAP_DTLB, %o3 + mov MAP_PERM_ADDR, %o5 + ta FAST_TRAP +#ifdef DEBUG + brz %o0, 9f + nop + ta 0x77 + ta 0x71 +9: +#endif + add %l2, 16, %l2 ! point %l2 at next slot + inc %l3 ba %xcc, 2b - nop -3: ldx [%l0 + (5f-1b)], %l1 - jmpl %l1, %g0 - nop + nop +3: + ldx [%l0 + (4f-1b)], %o1 ! read mp_tramp_tsb_ra + mov 2, %o0 + mov MMU_TSB_CTX0, %o5 ! set ctx0 TSBs + ta FAST_TRAP +#ifdef DEBUG + brz %o0, 9f + nop + ta 0x77 + ta 0x71 +9: +#endif + ldx [%l0 + (5f-1b)], %l1 ! fetch mp_tramp_func + jmpl %l1, %g0 ! and off we go + mov %g1, %o0 _ALIGN_DATA 4: .xword 0x0 5: .xword 0x0 -6: +6: .xword 0x0 +7: DATA(mp_tramp_code) .xword 1b DATA(mp_tramp_code_len) - .xword 6b-1b -DATA(mp_tramp_tlb_slots) + .xword 7b-1b +DATA(mp_tramp_tsb_desc_ra) .xword 4b-1b DATA(mp_tramp_func) .xword 5b-1b +DATA(mp_tramp_tte_slots) + .xword 6b-1b + +#define PUTCHAR(x) \ + mov x, %o0 ; \ + mov CONS_WRITE, %o5 ; \ + ta FAST_TRAP /* * void mp_startup(void) */ @@ -90,18 +113,6 @@ wr %g0, 0, %fprs SET(cpu_start_args, %l1, %l0) - - mov CPU_CLKSYNC, %l1 - membar #StoreLoad - stw %l1, [%l0 + CSA_STATE] - -1: ldx [%l0 + CSA_TICK], %l1 - brz %l1, 1b - nop - wrpr %l1, 0, %tick - - UPA_GET_MID(%o0) - #if KTR_COMPILE & KTR_SMP CATR(KTR_SMP, "mp_start: cpu %d entered kernel" , %g1, %g2, %g3, 7, 8, 9) @@ -109,9 +120,6 @@ 9: #endif - rdpr %ver, %l1 - stx %l1, [%l0 + CSA_VER] - /* * Inform the boot processor we have inited. */ @@ -119,59 +127,31 @@ membar #LoadStore stw %l1, [%l0 + CSA_STATE] - /* - * Wait till its our turn to bootstrap. - */ -2: lduw [%l0 + CSA_MID], %l1 - cmp %l1, %o0 - bne %xcc, 2b - nop - #if KTR_COMPILE & KTR_SMP CATR(KTR_SMP, "_mp_start: cpu %d got start signal" , %g1, %g2, %g3, 7, 8, 9) stx %o0, [%g1 + KTR_PARM1] 9: #endif - - add %l0, CSA_TTES, %l1 - clr %l2 - +2: + ld [%l0 + CSA_CPUID], %l1 + cmp %l1, %o0 + bne %xcc, 2b + nop + + PUTCHAR(0x2e) /* - * Map the per-cpu pages. - */ -3: sllx %l2, TTE_SHIFT, %l3 - add %l1, %l3, %l3 - - ldx [%l3 + TTE_VPN], %l4 - ldx [%l3 + TTE_DATA], %l5 - - wr %g0, ASI_DMMU, %asi - srlx %l4, TV_SIZE_BITS, %l4 - sllx %l4, PAGE_SHIFT_8K, %l4 - stxa %l4, [%g0 + AA_DMMU_TAR] %asi - stxa %l5, [%g0] ASI_DTLB_DATA_IN_REG - membar #Sync - - add %l2, 1, %l2 - cmp %l2, PCPU_PAGES - bne %xcc, 3b - nop - - /* * Get onto our per-cpu panic stack, which precedes the struct pcpu * in the per-cpu page. */ ldx [%l0 + CSA_PCPU], %l1 + PUTCHAR(0x2e) set PCPU_PAGES * PAGE_SIZE - PC_SIZEOF, %l2 add %l1, %l2, %l1 sub %l1, SPOFF + CCFSZ, %sp - - /* - * Enable interrupts. - */ + PUTCHAR(0x2e) wrpr %g0, PSTATE_KERNEL, %pstate - + PUTCHAR(0x2e) #if KTR_COMPILE & KTR_SMP CATR(KTR_SMP, "_mp_start: bootstrap cpuid=%d mid=%d pcpu=%#lx data=%#lx sp=%#lx" ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_machdep.c#2 (text+ko) ==== @@ -85,19 +85,21 @@ #include #include #include +#include #include #include - -static ih_func_t cpu_ipi_ast; -static ih_func_t cpu_ipi_stop; +#include +#include +#include +#include +#include /* * Argument area used to pass data to non-boot processors as they start up. - * This must be statically initialized with a known invalid upa module id, - * since the other processors will use it before the boot cpu enters the - * kernel. + * This must be statically initialized with a known invalid cpuid, + * */ -struct cpu_start_args cpu_start_args = { 0, -1, -1, 0, 0 }; +struct cpu_start_args cpu_start_args = { 0, -1, 0, -1 }; struct ipi_cache_args ipi_cache_args; struct ipi_tlb_args ipi_tlb_args; struct pcb stoppcbs[MAXCPU]; @@ -116,7 +118,6 @@ vm_offset_t mp_tramp_alloc(void) { - struct tte *tp; char *v; int i; @@ -124,19 +125,33 @@ if (v == NULL) panic("mp_tramp_alloc"); bcopy(mp_tramp_code, v, mp_tramp_code_len); - *(u_long *)(v + mp_tramp_tlb_slots) = kernel_tlb_slots; + *(u_long *)(v + mp_tramp_func) = (u_long)mp_startup; - tp = (struct tte *)(v + mp_tramp_code_len); - for (i = 0; i < kernel_tlb_slots; i++) { - tp[i].tte_vpn = TV_VPN(kernel_tlbs[i].te_va, TS_4M); - tp[i].tte_data = TD_V | TD_4M | TD_PA(kernel_tlbs[i].te_pa) | - TD_L | TD_CP | TD_CV | TD_P | TD_W; - } - for (i = 0; i < PAGE_SIZE; i += sizeof(long)) + + for (i = 0; i < PAGE_SIZE; i += sizeof(long)*4 /* XXX L1 cacheline size */) flush(v + i); return (vm_offset_t)v; } +void +mp_set_tsb_desc_ra(vm_paddr_t tsb_desc_ra) +{ + *(u_long *)(mp_tramp + mp_tramp_tsb_desc_ra) = tsb_desc_ra; +} + +void +mp_add_nucleus_mapping(vm_offset_t va, tte_t tte_data) +{ + static int slot; + uint64_t *entry; + + entry = (uint64_t *)(mp_tramp + mp_tramp_code_len + slot*sizeof(*entry)*2); + *(entry) = va; + *(entry + 1) = tte_data; + *(uint64_t *)(mp_tramp + mp_tramp_tte_slots) = slot + 1; + slot++; +} + /* * Probe for other cpus. */ @@ -160,17 +175,17 @@ cpus++; } mp_maxid = cpus - 1; + } int cpu_mp_probe(void) { - return (mp_maxid > 0); } - +#if 0 static void -sun4u_startcpu(phandle_t cpu, void *func, u_long arg) +start_ap(phandle_t cpu, void *func, u_long arg) { static struct { cell_t name; @@ -193,13 +208,43 @@ args.arg = (cell_t)arg; openfirmware(&args); } +#else +static int +start_ap_bycpuid(int cpuid, void *func, u_long arg) +{ + static struct { + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t cpuid; + cell_t func; + cell_t arg; + cell_t result; + } args = { + (cell_t)"SUNW,start-cpu-by-cpuid", + 3, + 1, + 0, + 0, + 0, + 0 + }; + args.cpuid = cpuid; + args.func = (cell_t)func; + args.arg = (cell_t)arg; + openfirmware(&args); + return (int)args.result; + +} +#endif /* * Stop the calling CPU. */ static void sun4u_stopself(void) { +#if 0 static struct { cell_t name; cell_t nargs; @@ -211,6 +256,7 @@ }; openfirmware_exit(&args); +#endif panic("sun4u_stopself: failed."); } @@ -227,55 +273,53 @@ vm_offset_t va; char buf[128]; u_int clock; - int cpuid; - u_int mid; + int cpuid, bp_skipped; u_long s; - + printf("cpu_mp_start\n"); mtx_init(&ipi_mtx, "ipi", NULL, MTX_SPIN); - intr_setup(PIL_AST, cpu_ipi_ast, -1, NULL, NULL); - intr_setup(PIL_RENDEZVOUS, (ih_func_t *)smp_rendezvous_action, - -1, NULL, NULL); - intr_setup(PIL_STOP, cpu_ipi_stop, -1, NULL, NULL); - root = OF_peer(0); csa = &cpu_start_args; + cpuid = bp_skipped = 0; for (child = OF_child(root); child != 0; child = OF_peer(child)) { if (OF_getprop(child, "device_type", buf, sizeof(buf)) <= 0 || strcmp(buf, "cpu") != 0) continue; - if (OF_getprop(child, "upa-portid", &mid, sizeof(mid)) <= 0 && - OF_getprop(child, "portid", &mid, sizeof(mid)) <= 0) - panic("cpu_mp_start: can't get module id"); - if (mid == mp_boot_mid) + /* skip boot processor */ + if (!bp_skipped) { + bp_skipped = 1; continue; + } + cpuid++; + if (OF_getprop(child, "clock-frequency", &clock, sizeof(clock)) <= 0) panic("cpu_mp_start: can't get clock"); csa->csa_state = 0; - sun4u_startcpu(child, (void *)mp_tramp, 0); + start_ap_bycpuid(cpuid, (void *)mp_tramp, (uint64_t)cpuid); s = intr_disable(); - while (csa->csa_state != CPU_CLKSYNC) - ; - membar(StoreLoad); - csa->csa_tick = rd(tick); while (csa->csa_state != CPU_INIT) ; - csa->csa_tick = 0; intr_restore(s); - cpuid = mp_ncpus++; - cpu_identify(csa->csa_ver, clock, cpuid); + mp_ncpus = cpuid + 1; +#if 0 + cpu_identify(0, clock, cpuid); +#else + printf("cpu%d: UltraSparc T1 Processor (%d.%02d MHz CPU)\n", cpuid, + (clock + 4999) / 1000000, ((clock + 4999) / 10000) % 100); +#endif va = kmem_alloc(kernel_map, PCPU_PAGES * PAGE_SIZE); pc = (struct pcpu *)(va + (PCPU_PAGES * PAGE_SIZE)) - 1; pcpu_init(pc, cpuid, sizeof(*pc)); pc->pc_addr = va; - pc->pc_mid = mid; pc->pc_node = child; all_cpus |= 1 << cpuid; + if (mp_ncpus == 8) + break; } PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid))); smp_active = 1; @@ -291,41 +335,26 @@ { volatile struct cpu_start_args *csa; struct pcpu *pc; - vm_offset_t va; - vm_paddr_t pa; - u_int ctx_min; - u_int ctx_inc; u_long s; - int i; - ctx_min = TLB_CTX_USER_MIN; - ctx_inc = (TLB_CTX_USER_MAX - 1) / mp_ncpus; csa = &cpu_start_args; csa->csa_count = mp_ncpus; + printf("mp_ncpus=%d\n", mp_ncpus); SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { - pc->pc_tlb_ctx = ctx_min; - pc->pc_tlb_ctx_min = ctx_min; - pc->pc_tlb_ctx_max = ctx_min + ctx_inc; - ctx_min += ctx_inc; + if (pc->pc_cpuid == PCPU_GET(cpuid)) + continue; - if (pc->pc_cpuid == PCPU_GET(cpuid)) - continue; KASSERT(pc->pc_idlethread != NULL, - ("cpu_mp_unleash: idlethread")); + ("cpu_mp_unleash: idlethread is NULL")); pc->pc_curthread = pc->pc_idlethread; pc->pc_curpcb = pc->pc_curthread->td_pcb; - for (i = 0; i < PCPU_PAGES; i++) { - va = pc->pc_addr + i * PAGE_SIZE; - pa = pmap_kextract(va); - if (pa == 0) - panic("cpu_mp_unleash: pmap_kextract\n"); - csa->csa_ttes[i].tte_vpn = TV_VPN(va, TS_8K); - csa->csa_ttes[i].tte_data = TD_V | TD_8K | TD_PA(pa) | - TD_L | TD_CP | TD_CV | TD_P | TD_W; - } + pc->pc_curpmap = kernel_pmap; csa->csa_state = 0; - csa->csa_pcpu = pc->pc_addr; - csa->csa_mid = pc->pc_mid; +#if 1 + printf("unleashing cpuid=%d\n", pc->pc_cpuid); +#endif + csa->csa_cpuid = pc->pc_cpuid; + csa->csa_pcpu = TLB_PHYS_TO_DIRECT(vtophys(pc->pc_addr)); s = intr_disable(); while (csa->csa_state != CPU_BOOTSTRAP) ; @@ -343,8 +372,11 @@ volatile struct cpu_start_args *csa; csa = &cpu_start_args; - pmap_map_tsb(); cpu_setregs(pc); + tsb_set_scratchpad_kernel(&kernel_pmap->pm_tsb); + tte_hash_set_scratchpad_kernel(kernel_pmap->pm_hash); + trap_init(); + cpu_intrq_init(); tick_start(); smp_cpus++; @@ -357,12 +389,20 @@ csa->csa_state = CPU_BOOTSTRAP; while (csa->csa_count != 0) ; - +#ifdef SIMULATOR + DELAY(300000*PCPU_GET(cpuid)); +#else + DELAY(300*PCPU_GET(cpuid)); +#endif /* ok, now grab sched_lock and enter the scheduler */ +#if 0 + printf("entering scheduler\n"); +#endif mtx_lock_spin(&sched_lock); spinlock_exit(); PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); + cpu_throw(NULL, choosethread()); /* doesn't return */ } @@ -387,12 +427,12 @@ critical_exit(); } -static void +void cpu_ipi_ast(struct trapframe *tf) { } -static void +void cpu_ipi_stop(struct trapframe *tf) { @@ -411,60 +451,58 @@ } void -cpu_ipi_selected(u_int cpus, u_long d0, u_long d1, u_long d2) +cpu_ipi_selected(u_int icpus, u_long d0, u_long d1, u_long d2) { - struct pcpu *pc; - u_int cpu; + + int i, cpu_count, retries; + uint16_t *cpulist; + u_int cpus; - while (cpus) { - cpu = ffs(cpus) - 1; - cpus &= ~(1 << cpu); - pc = pcpu_find(cpu); - cpu_ipi_send(pc->pc_mid, d0, d1, d2); - } -} + cpulist = PCPU_GET(cpulist); + init_mondo(d0, d1, d2); -void -cpu_ipi_send(u_int mid, u_long d0, u_long d1, u_long d2) -{ - u_long s; - int i; + for (cpu_count = 0, i = 0, cpus = icpus & ~PCPU_GET(cpumask); i < 32 && cpus; + cpus = cpus >> 1, i++) { + if (!(cpus & 0x1)) + continue; - KASSERT((ldxa(0, ASI_INTR_DISPATCH_STATUS) & IDR_BUSY) == 0, - ("cpu_ipi_send: outstanding dispatch")); - for (i = 0; i < IPI_RETRIES; i++) { - s = intr_disable(); - stxa(AA_SDB_INTR_D0, ASI_SDB_INTR_W, d0); - stxa(AA_SDB_INTR_D1, ASI_SDB_INTR_W, d1); - stxa(AA_SDB_INTR_D2, ASI_SDB_INTR_W, d2); - stxa(AA_INTR_SEND | (mid << 14), ASI_SDB_INTR_W, 0); - membar(Sync); - while (ldxa(0, ASI_INTR_DISPATCH_STATUS) & IDR_BUSY) - ; - intr_restore(s); - if ((ldxa(0, ASI_INTR_DISPATCH_STATUS) & IDR_NACK) == 0) - return; + cpulist[cpu_count] = (uint16_t)i; + cpu_count++; + } + retries = 0; +retry: + if (cpu_count) { + int error, new_cpu_count; + vm_paddr_t cpulist_ra; + cpulist_ra = TLB_DIRECT_TO_PHYS((vm_offset_t)cpulist); + if ((error = hv_cpu_mondo_send(cpu_count, cpulist_ra)) == H_EWOULDBLOCK) { + new_cpu_count = 0; + for (i = 0; i < cpu_count; i++) { + if (cpulist[i] != 0xffff) + cpulist[new_cpu_count++] = cpulist[i]; + } + cpu_count = new_cpu_count; + retries++; + if (cpu_count == 0) { + printf("no more cpus to send to but mondo_send returned EWOULDBLOCK\n"); + return; + } + if (retries < 5000) + goto retry; + } + if (error == H_ENOCPU) + printf("cpuid==%d not considered valid - cpus=0x%x\n", cpulist[0], icpus); + if (error) + panic("can't handle error %d from cpu_mondo_send\n", error); } - if ( -#ifdef KDB - kdb_active || -#endif - panicstr != NULL) - printf("cpu_ipi_send: couldn't send ipi to module %u\n", mid); - else - panic("cpu_ipi_send: couldn't send ipi"); + } + void ipi_selected(u_int cpus, u_int ipi) { - cpu_ipi_selected(cpus, 0, (u_long)tl_ipi_level, ipi); -} - -void -ipi_all(u_int ipi) -{ - panic("ipi_all"); + cpu_ipi_selected(cpus, (u_long)tl_ipi_level, ipi, 0); } void From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:19:57 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 9B90316A46C; Mon, 3 Apr 2006 07:19:57 +0000 (UTC) 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 4F83016A400 for ; Mon, 3 Apr 2006 07:19:57 +0000 (UTC) (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 E5ABA43D49 for ; Mon, 3 Apr 2006 07:19:56 +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 k337Ju2d058172 for ; Mon, 3 Apr 2006 07:19:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337JuqR058169 for perforce@freebsd.org; Mon, 3 Apr 2006 07:19:56 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:19:56 GMT Message-Id: <200604030719.k337JuqR058169@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 94515 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, 03 Apr 2006 07:19:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=94515 Change 94515 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:19:54 make safer by using %g2 instead of %g1 for storing PCPU Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#9 (text+ko) ==== @@ -108,8 +108,8 @@ * 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_PCPU, %g2 + stxa PCPU_REG, [%g2]ASI_SCRATCHPAD retl nop From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:23:21 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 0338416A422; Mon, 3 Apr 2006 07:23:21 +0000 (UTC) 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 B397016A41F for ; Mon, 3 Apr 2006 07:23:20 +0000 (UTC) (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 77BC343D45 for ; Mon, 3 Apr 2006 07:23:20 +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 k337NJmh058396 for ; Mon, 3 Apr 2006 07:23:20 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337NJsJ058392 for perforce@freebsd.org; Mon, 3 Apr 2006 07:23:19 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:23:19 GMT Message-Id: <200604030723.k337NJsJ058392@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 94516 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, 03 Apr 2006 07:23:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=94516 Change 94516 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:22:38 create separate intrq_alloc function so that per-cpu queues are pre-allocated before cpu_mp_bootstrap initialize IPIs locally Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#5 (text+ko) ==== @@ -74,12 +74,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include @@ -119,14 +121,25 @@ int cpu_q_entries = 128; int dev_q_entries = 128; +static vm_offset_t *mondo_data_array; +static vm_offset_t *cpu_list_array; +static vm_offset_t *cpu_q_array; +static vm_offset_t *dev_q_array; +static vm_offset_t *rq_array; +static vm_offset_t *nrq_array; +static int cpu_list_size; + + + /* protect the intr_vectors table */ static struct mtx intr_table_lock; static void intr_execute_handlers(void *); static void intr_stray_level(struct trapframe *); static void intr_stray_vector(void *); -static int intrcnt_setname(const char *, int); +static int intrcnt_setname(const char *, int); static void intrcnt_updatename(int, const char *, int); +static void cpu_intrq_alloc(void); /* * not MPSAFE @@ -207,7 +220,7 @@ intr_stray_level(struct trapframe *tf) { - printf("stray level interrupt\n"); + printf("stray level interrupt - pil=%ld\n", tf->tf_pil); } static void @@ -240,8 +253,14 @@ intr_vectors[i].iv_vec = i; } intr_handlers[PIL_LOW] = intr_fast; + +#ifdef SMP + intr_handlers[PIL_AST] = cpu_ipi_ast; + intr_handlers[PIL_RENDEZVOUS] = (ih_func_t *)smp_rendezvous_action; + intr_handlers[PIL_STOP]= cpu_ipi_stop; +#endif mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); - + cpu_intrq_alloc(); cpu_intrq_init(); } @@ -365,42 +384,64 @@ /* * Allocate and register intrq fields */ +static void +cpu_intrq_alloc(void) +{ + + + + mondo_data_array = malloc(INTR_REPORT_SIZE*MAXCPU, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(mondo_data_array == NULL); + + cpu_list_size = CPU_LIST_SIZE > INTR_REPORT_SIZE ? CPU_LIST_SIZE : INTR_REPORT_SIZE; + cpu_list_array = malloc(cpu_list_size*MAXCPU, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(cpu_list_array == NULL); + + cpu_q_array = malloc(INTR_CPU_Q_SIZE*MAXCPU, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(cpu_q_array == NULL); + + dev_q_array = malloc(INTR_DEV_Q_SIZE*MAXCPU, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(dev_q_array == NULL); + + rq_array = malloc(2*CPU_RQ_SIZE*MAXCPU, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(rq_array == NULL); + + nrq_array = malloc(2*CPU_NRQ_SIZE*MAXCPU, M_DEVBUF, M_WAITOK | M_ZERO); + PANIC_IF(nrq_array == NULL); + +} + 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 = mondo_data_array + curcpu*INTR_REPORT_SIZE; 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 = cpu_list_array + curcpu*cpu_list_size; + 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 = cpu_q_array + curcpu*INTR_CPU_Q_SIZE; + 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 = dev_q_array + curcpu*INTR_DEV_Q_SIZE; 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 = rq_array + curcpu*2*CPU_RQ_SIZE; 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 = nrq_array + curcpu*2*CPU_NRQ_SIZE; 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); @@ -417,5 +458,4 @@ if (error != H_EOK) panic("non-resumable error queue configuration failed: %lu", error); - } From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:24: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 C1FE316A425; Mon, 3 Apr 2006 07:24:22 +0000 (UTC) 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 A196B16A400 for ; Mon, 3 Apr 2006 07:24:22 +0000 (UTC) (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 5AC2243D46 for ; Mon, 3 Apr 2006 07:24: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 k337OMWT058430 for ; Mon, 3 Apr 2006 07:24:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337OMhj058427 for perforce@freebsd.org; Mon, 3 Apr 2006 07:24:22 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:24:22 GMT Message-Id: <200604030724.k337OMhj058427@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 94517 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, 03 Apr 2006 07:24:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=94517 Change 94517 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:23:18 fix panic message Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vnex.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vnex.c#4 (text+ko) ==== @@ -146,7 +146,7 @@ node = ofw_bus_get_node(dev); if (node == -1) - panic("%s: OF_peer failed.", __func__); + panic("%s: ofw_bus_get_node failed.", __func__); sc = device_get_softc(dev); sc->sc_intr_rman.rm_type = RMAN_ARRAY; From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:25: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 8CD0016A41F; Mon, 3 Apr 2006 07:25:24 +0000 (UTC) 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 366FD16A400 for ; Mon, 3 Apr 2006 07:25:24 +0000 (UTC) (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 03F9A43D45 for ; Mon, 3 Apr 2006 07:25: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 k337PNhX058528 for ; Mon, 3 Apr 2006 07:25:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337PNjK058525 for perforce@freebsd.org; Mon, 3 Apr 2006 07:25:23 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:25:23 GMT Message-Id: <200604030725.k337PNjK058525@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 94518 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, 03 Apr 2006 07:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=94518 Change 94518 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:25:05 update prom address range to be the same as solaris Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/vmparam.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/vmparam.h#4 (text+ko) ==== @@ -143,7 +143,7 @@ #define VM_MAX_KERNEL_ADDRESS (vm_max_kernel_address) #define VM_MIN_PROM_ADDRESS (0x00000000f0000000UL) -#define VM_MAX_PROM_ADDRESS (0x00000000ffffe000UL) +#define VM_MAX_PROM_ADDRESS (0x00000000ffffffffUL) #define VM_MIN_USER_ADDRESS (0x0000000000002000UL) #define VM_MAX_USER_ADDRESS (0x000007fe00000000UL) From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:28: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 8C4D816A424; Mon, 3 Apr 2006 07:28:30 +0000 (UTC) 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 6480216A400 for ; Mon, 3 Apr 2006 07:28:30 +0000 (UTC) (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 2F1DE43D46 for ; Mon, 3 Apr 2006 07:28:30 +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 k337SUFo058696 for ; Mon, 3 Apr 2006 07:28:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337STAx058693 for perforce@freebsd.org; Mon, 3 Apr 2006 07:28:29 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:28:29 GMT Message-Id: <200604030728.k337STAx058693@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 94519 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, 03 Apr 2006 07:28:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=94519 Change 94519 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:27:28 add new fields needed for SMP and OFW trap handling Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#17 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#17 (text+ko) ==== @@ -123,12 +123,13 @@ ASSYM(CPU_CLKSYNC, CPU_CLKSYNC); ASSYM(CPU_INIT, CPU_INIT); -ASSYM(CSA_MID, offsetof(struct cpu_start_args, csa_mid)); ASSYM(CSA_PCPU, offsetof(struct cpu_start_args, csa_pcpu)); ASSYM(CSA_STATE, offsetof(struct cpu_start_args, csa_state)); +ASSYM(CSA_CPUID, offsetof(struct cpu_start_args, csa_cpuid)); +#ifndef SUN4V ASSYM(CSA_TICK, offsetof(struct cpu_start_args, csa_tick)); ASSYM(CSA_VER, offsetof(struct cpu_start_args, csa_ver)); -#ifndef SUN4V +ASSYM(CSA_MID, offsetof(struct cpu_start_args, csa_mid)); ASSYM(CSA_TTES, offsetof(struct cpu_start_args, csa_ttes)); #endif ASSYM(DC_TAG_SHIFT, DC_TAG_SHIFT); @@ -189,6 +190,7 @@ ASSYM(PM_HASHSCRATCH, offsetof(struct pmap, pm_hashscratch)); ASSYM(PM_TSBSCRATCH, offsetof(struct pmap, pm_tsbscratch)); ASSYM(PM_TSB_RA, offsetof(struct pmap, pm_tsb_ra)); +ASSYM(PM_TLBACTIVE, offsetof(struct pmap, pm_tlbactive)); #endif ASSYM(V_INTR, offsetof(struct vmmeter, v_intr)); @@ -214,6 +216,8 @@ 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)); +ASSYM(PC_MONDO_DATA, offsetof(struct pcpu, pc_mondo_data)); +ASSYM(PC_MONDO_DATA_RA, offsetof(struct pcpu, pc_mondo_data_ra)); ASSYM(PC_KWBUF_FULL, offsetof(struct pcpu, pc_kwbuf_full)); ASSYM(PC_KWBUF_SP, offsetof(struct pcpu, pc_kwbuf_sp)); @@ -346,3 +350,5 @@ ASSYM(UT_MAX, UT_MAX); ASSYM(VM_MIN_DIRECT_ADDRESS, VM_MIN_DIRECT_ADDRESS); +ASSYM(VM_MIN_PROM_ADDRESS, VM_MIN_PROM_ADDRESS); +ASSYM(VM_MAX_PROM_ADDRESS, VM_MAX_PROM_ADDRESS); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:31:57 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 A0B0B16A422; Mon, 3 Apr 2006 07:31:57 +0000 (UTC) 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 6AA3F16A400 for ; Mon, 3 Apr 2006 07:31:57 +0000 (UTC) (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 3861B43D49 for ; Mon, 3 Apr 2006 07:31:57 +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 k337VvED058861 for ; Mon, 3 Apr 2006 07:31:57 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337VuXb058848 for perforce@freebsd.org; Mon, 3 Apr 2006 07:31:56 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:31:56 GMT Message-Id: <200604030731.k337VuXb058848@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 94520 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, 03 Apr 2006 07:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=94520 Change 94520 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:29:50 update current options Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#8 (text+ko) ==== @@ -62,8 +62,9 @@ # Debugging for use in -current options KDB # Enable kernel debugger support. -#options DDB # Support DDB. -options GDB # Support remote GDB. +options KDB_TRACE +options DDB # Support DDB. +#options GDB # Support remote GDB. options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles @@ -72,8 +73,10 @@ # To make an SMP kernel, the next line is needed #options SMP # Symmetric MultiProcessor Kernel +# Standard busses device pci + # Floppy drives #device fdc @@ -194,7 +197,6 @@ #device sbp # SCSI over FireWire (Requires scbus and da) #device fwe # Ethernet over FireWire (non-standard!) -options SIMULATOR # compile for ISA simulator +#options SIMULATOR # compile for ISA simulator #options KTR #options KTR_MASK=(KTR_TRAP) -#options DDB From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:32: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 7B76116A420; Mon, 3 Apr 2006 07:32:59 +0000 (UTC) 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 424C416A41F for ; Mon, 3 Apr 2006 07:32:59 +0000 (UTC) (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 ED3F543D67 for ; Mon, 3 Apr 2006 07:32:58 +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 k337WwpS058925 for ; Mon, 3 Apr 2006 07:32:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337Ww9u058922 for perforce@freebsd.org; Mon, 3 Apr 2006 07:32:58 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:32:58 GMT Message-Id: <200604030732.k337Ww9u058922@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 94521 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, 03 Apr 2006 07:32:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=94521 Change 94521 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:31:57 make idle hv_cpu_yield SMP only for now Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#19 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#19 (text+ko) ==== @@ -735,8 +735,11 @@ void cpu_idle(void) { - /* Insert code to halt (until next interrupt) for the idle loop */ + /* shouldn't be needed - but.. */ wrpr(pil, 0, 0); +#ifdef SMP + hv_cpu_yield(); +#endif } int From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:34:01 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 235A116A422; Mon, 3 Apr 2006 07:34:01 +0000 (UTC) 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 DEBFC16A401 for ; Mon, 3 Apr 2006 07:34:00 +0000 (UTC) (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 AB92143D45 for ; Mon, 3 Apr 2006 07:34: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 k337Y0KD058985 for ; Mon, 3 Apr 2006 07:34:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337Y0AX058982 for perforce@freebsd.org; Mon, 3 Apr 2006 07:34:00 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:34:00 GMT Message-Id: <200604030734.k337Y0AX058982@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 94522 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, 03 Apr 2006 07:34:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=94522 Change 94522 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:33:04 update csa Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/smp.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/smp.h#3 (text+ko) ==== @@ -49,14 +49,9 @@ struct cpu_start_args { u_int csa_count; - u_int csa_mid; u_int csa_state; vm_offset_t csa_pcpu; - u_long csa_tick; - u_long csa_ver; -#ifdef notyet - struct tte csa_ttes[PCPU_PAGES]; -#endif + u_int csa_cpuid; }; struct ipi_cache_args { @@ -82,12 +77,16 @@ void cpu_ipi_selected(u_int cpus, u_long d0, u_long d1, u_long d2); void cpu_ipi_send(u_int mid, u_long d0, u_long d1, u_long d2); +void cpu_ipi_ast(struct trapframe *tf); +void cpu_ipi_stop(struct trapframe *tf); + void ipi_selected(u_int cpus, u_int ipi); void ipi_all(u_int ipi); void ipi_all_but_self(u_int ipi); vm_offset_t mp_tramp_alloc(void); - +void mp_set_tsb_desc_ra(vm_paddr_t); +void mp_add_nucleus_mapping(vm_offset_t, uint64_t); extern struct mtx ipi_mtx; extern struct ipi_cache_args ipi_cache_args; extern struct ipi_tlb_args ipi_tlb_args; @@ -95,7 +94,8 @@ extern vm_offset_t mp_tramp; extern char *mp_tramp_code; extern u_long mp_tramp_code_len; -extern u_long mp_tramp_tlb_slots; +extern u_long mp_tramp_tte_slots; +extern u_long mp_tramp_tsb_desc_ra; extern u_long mp_tramp_func; extern void mp_startup(void); @@ -105,6 +105,9 @@ extern char tl_ipi_spitfire_icache_page_inval[]; extern char tl_ipi_level[]; +extern char tl_invltlb[]; +extern char tl_invlctx[]; +extern char tl_invlpg[]; extern char tl_ipi_tlb_context_demap[]; extern char tl_ipi_tlb_page_demap[]; extern char tl_ipi_tlb_range_demap[]; From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:34:01 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 7E13F16A47F; Mon, 3 Apr 2006 07:34:01 +0000 (UTC) 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 4154516A45D for ; Mon, 3 Apr 2006 07:34:01 +0000 (UTC) (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 0848143D45 for ; Mon, 3 Apr 2006 07:34: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 k337Y0eV058993 for ; Mon, 3 Apr 2006 07:34:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337Y01m058988 for perforce@freebsd.org; Mon, 3 Apr 2006 07:34:00 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:34:00 GMT Message-Id: <200604030734.k337Y01m058988@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 94523 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, 03 Apr 2006 07:34:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=94523 Change 94523 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:33:58 add pmap IPI handlers Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#5 (text+ko) ==== @@ -138,7 +138,6 @@ * */ ENTRY(cpu_mondo) - MAGIC_TRAP_ON ! ! Register Usage:- ! %g5 PC for fasttrap TL>0 handler @@ -345,3 +344,64 @@ END(dev_mondo) #endif /* lint */ +ENTRY(tl_invlctx) + mov %o0, %g3 + mov %o1, %g4 + mov %o2, %g5 + mov %o3, %g6 + mov %o5, %g7 + mov %g0, %o0 + mov %g0, %o1 + mov %g1, %o2 + mov MAP_ITLB|MAP_DTLB, %o3 + mov MMU_DEMAP_CTX, %o5 + ta FAST_TRAP + brz,pt %o0, 1f + nop + ba panic_bad_hcall + mov MMU_DEMAP_CTX, %o1 +1: + mov %g3, %o0 + mov %g4, %o1 + mov %g5, %o2 + mov %g6, %o3 + mov %g7, %o5 + retry +END(tl_invlctx) + +ENTRY(tl_invltlb) + mov %o0, %g1 + mov %o1, %g2 + mov %o2, %g3 + mov %o5, %g4 + + mov %g0, %o0 + mov %g0, %o1 + mov MAP_ITLB | MAP_DTLB, %o2 + mov MMU_DEMAP_ALL, %o5 + ta FAST_TRAP + brz,pt %o0, 1f + nop + ba panic_bad_hcall +1: + mov %g1, %o0 + mov %g2, %o1 + mov %g3, %o2 + mov %g4, %o5 + retry +END(tl_invltlb) + +ENTRY(tl_invlpg) + mov %o0, %g5 + mov %o1, %g6 + mov %o2, %g7 + mov MAP_ITLB|MAP_DTLB, %o2 + mov %g1, %o0 + mov %g2, %o1 + ta MMU_UNMAP_ADDR + mov %g5, %o0 + mov %g6, %o1 + mov %g7, %o2 + retry +END(tl_invlpg) + From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:36:08 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 CDB0516A42B; Mon, 3 Apr 2006 07:36:08 +0000 (UTC) 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 934D516A400 for ; Mon, 3 Apr 2006 07:36:08 +0000 (UTC) (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 0E3DE43D62 for ; Mon, 3 Apr 2006 07:36: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 k337a3k0059101 for ; Mon, 3 Apr 2006 07:36:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337a36Q059098 for perforce@freebsd.org; Mon, 3 Apr 2006 07:36:03 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:36:03 GMT Message-Id: <200604030736.k337a36Q059098@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 94524 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, 03 Apr 2006 07:36:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=94524 Change 94524 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:35:06 remove duplicate declaration Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#18 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#18 (text+ko) ==== @@ -78,7 +78,6 @@ ASSYM(KERNBASE, KERNBASE); -ASSYM(VM_MIN_PROM_ADDRESS, VM_MIN_PROM_ADDRESS); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:38: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 5FFC116A41F; Mon, 3 Apr 2006 07:38:07 +0000 (UTC) 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 3BE8816A424 for ; Mon, 3 Apr 2006 07:38:07 +0000 (UTC) (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 08BC043D45 for ; Mon, 3 Apr 2006 07:38:07 +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 k337c6NE059231 for ; Mon, 3 Apr 2006 07:38:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337c67u059228 for perforce@freebsd.org; Mon, 3 Apr 2006 07:38:06 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:38:06 GMT Message-Id: <200604030738.k337c67u059228@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 94525 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, 03 Apr 2006 07:38:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=94525 Change 94525 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:37:31 drop cpumask down to 32-bits the rest of freebsd hardcodes the ASSumption move tte_t typedef Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_types.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_types.h#3 (text+ko) ==== @@ -55,7 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ -typedef __uint64_t __cpumask_t; +typedef __uint32_t __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef float __float_t; @@ -108,4 +108,6 @@ typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif +typedef __uint64_t tte_t; + #endif /* !_MACHINE__TYPES_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#7 (text+ko) ==== @@ -228,8 +228,6 @@ struct pmap; -typedef uint64_t tte_t; - void tte_clear_phys_bit(vm_page_t m, uint64_t flags); void tte_set_phys_bit(vm_page_t m, uint64_t flags); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:44: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 77FE016A420; Mon, 3 Apr 2006 07:44:24 +0000 (UTC) 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 4752B16A401 for ; Mon, 3 Apr 2006 07:44:24 +0000 (UTC) (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 1623A43D46 for ; Mon, 3 Apr 2006 07:44: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 k337iNLk059458 for ; Mon, 3 Apr 2006 07:44:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337iNfB059455 for perforce@freebsd.org; Mon, 3 Apr 2006 07:44:23 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:44:23 GMT Message-Id: <200604030744.k337iNfB059455@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 94526 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, 03 Apr 2006 07:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=94526 Change 94526 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:43:22 add cpulist for sending mondos Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#10 (text+ko) ==== @@ -74,7 +74,8 @@ struct rwindow pc_kwbuf; \ u_long pc_kwbuf_sp; \ u_int pc_kwbuf_full; \ - u_int pc_node; + u_int pc_node; \ + uint16_t pc_cpulist[MAXCPU] /* 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 From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:53: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 6E4ED16A420; Mon, 3 Apr 2006 07:53:42 +0000 (UTC) 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 3600D16A400 for ; Mon, 3 Apr 2006 07:53:42 +0000 (UTC) (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 3A9AA43D77 for ; Mon, 3 Apr 2006 07:53: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 k337ra5M059751 for ; Mon, 3 Apr 2006 07:53:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337rahx059748 for perforce@freebsd.org; Mon, 3 Apr 2006 07:53:36 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:53:36 GMT Message-Id: <200604030753.k337rahx059748@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 94527 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, 03 Apr 2006 07:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=94527 Change 94527 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:52:34 include smp.h Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#4 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:55:40 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 A8C1716A425; Mon, 3 Apr 2006 07:55:40 +0000 (UTC) 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 7081016A401 for ; Mon, 3 Apr 2006 07:55:40 +0000 (UTC) (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 E35FB43D55 for ; Mon, 3 Apr 2006 07:55:39 +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 k337td86059903 for ; Mon, 3 Apr 2006 07:55:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337tdMc059900 for perforce@freebsd.org; Mon, 3 Apr 2006 07:55:39 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:55:39 GMT Message-Id: <200604030755.k337tdMc059900@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 94528 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, 03 Apr 2006 07:55:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=94528 Change 94528 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:54:52 convert string mapping for trap numbers remove call to pmap_set_tsbs Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#8 (text+ko) ==== @@ -115,6 +115,8 @@ extern char *syscallnames[]; +static int trap_conversion[256]; + const char *trap_msg[] = { "reserved", "instruction access exception", @@ -237,12 +239,21 @@ trap_init(void) { vm_paddr_t mmfsa; + int i; + mmfsa = mmu_fault_status_area + (MMFSA_SIZE*PCPU_GET(cpuid)); set_wstate(WSTATE_KERN); set_mmfsa_scratchpad(mmfsa); OF_set_mmfsa_traptable(&tl0_base, mmfsa); - pmap_set_tsbs(); + for (i = 0; i < 128; i++) + trap_conversion[i] = i; + for (i = 128; i < 256; i++) + trap_conversion[i] = 0; + trap_conversion[0x31] = 35; + trap_conversion[0x9] = 34; + trap_conversion[0x6c] = 14; + } void @@ -257,7 +268,7 @@ td = PCPU_GET(curthread); CTR4(KTR_TRAP, "trap: %p type=%s (%s) pil=%#lx", td, - trap_msg[type & ~T_KERNEL], + trap_msg[trap_conversion[type & ~T_KERNEL]], (TRAPF_USERMODE(tf) ? "user" : "kernel"), rdpr(pil)); PCPU_LAZY_INC(cnt.v_trap); @@ -365,13 +376,19 @@ UNIMPLEMENTED; error = 1; break; + case T_ILLEGAL_INSTRUCTION: + if (tf->tf_tpc > KERNBASE) { + printf("illinstr: 0x%lx\n", tf->tf_tpc); + printf("illinstr: 0x%x\n", *((uint32_t *)tf->tf_tpc)); + } + default: error = 1; break; } if (error != 0) - panic("trap: %s", trap_msg[type & ~T_KERNEL]); + panic("trap: %s at 0x%lx", trap_msg[trap_conversion[type & ~T_KERNEL]], tf->tf_tpc); } CTR1(KTR_TRAP, "trap: td=%p return", td); } @@ -402,6 +419,11 @@ type = type & ~T_KERNEL; va = TLB_TAR_VA(data); +#if 1 + printf("trap_pfault(type=%ld, data=0x%lx, tpc=0x%lx, ctx=0x%lx)\n", + type, data, tf->tf_tpc, ctx); +#endif + CTR4(KTR_TRAP, "trap_pfault: td=%p pm_ctx=%#lx va=%#lx ctx=%#lx", td, p->p_vmspace->vm_pmap.pm_context[PCPU_GET(cpuid)], va, ctx); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 07:57: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 819E216A422; Mon, 3 Apr 2006 07:57:43 +0000 (UTC) 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 60B0716A41F for ; Mon, 3 Apr 2006 07:57:43 +0000 (UTC) (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 DE3B543D55 for ; Mon, 3 Apr 2006 07:57:42 +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 k337vgOi060001 for ; Mon, 3 Apr 2006 07:57:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k337vgoI059998 for perforce@freebsd.org; Mon, 3 Apr 2006 07:57:42 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 07:57:42 GMT Message-Id: <200604030757.k337vgoI059998@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 94529 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, 03 Apr 2006 07:57:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=94529 Change 94529 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:56:52 declare init_mondo() define cpu_spinwait() Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sun4v_cpufunc.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#4 (text+ko) ==== @@ -45,7 +45,7 @@ #define cpu_getstack(td) ((td)->td_frame->tf_sp) #define cpu_setstack(td, sp) ((td)->td_frame->tf_sp = (sp)) -#define cpu_spinwait() /* nothing */ +#define cpu_spinwait() hv_cpu_yield(); /* * CTL_MACHDEP definitions. ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sun4v_cpufunc.h#4 (text+ko) ==== @@ -37,7 +37,7 @@ void set_tsb_user_scratchpad(uint64_t); void set_hash_kernel_scratchpad(uint64_t); void set_tsb_kernel_scratchpad(uint64_t); - +void init_mondo(uint64_t func, uint64_t arg1, uint64_t arg2); static __inline void * set_tba(void *ntba) From owner-p4-projects@FreeBSD.ORG Mon Apr 3 09:10: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 B2A4C16A424; Mon, 3 Apr 2006 09:10:13 +0000 (UTC) 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 5EE6C16A420 for ; Mon, 3 Apr 2006 09:10:13 +0000 (UTC) (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 921F943D49 for ; Mon, 3 Apr 2006 09:10: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 k339ACfx074012 for ; Mon, 3 Apr 2006 09:10:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k339ACRj074009 for perforce@freebsd.org; Mon, 3 Apr 2006 09:10:12 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Apr 2006 09:10:12 GMT Message-Id: <200604030910.k339ACRj074009@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 94531 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, 03 Apr 2006 09:10:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=94531 Change 94531 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 09:10:02 keep track of what cpus this pmap is running on and which cpus may have entries in the TLB, we really only need to send shootdowns to one of the threads on a core so this can definitely be optimized further Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#16 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#16 (text+ko) ==== @@ -54,9 +54,13 @@ */ ENTRY(cpu_switch) save %sp, -CCFSZ, %sp - GET_PCB(PCB_REG) + ldx [PCPU(CURPCB)], PCB_REG + + MAGIC_TRAP_ON + MAGIC_TRAP_OFF + mov %i1, %i0 - + /* * If the current thread was using floating point in the kernel, save * its context. The userland floating point context has already been @@ -113,19 +117,15 @@ stx %g3, [%g1 + KTR_PARM3] 9: #endif + wrpr %g0, PSTATE_NORMAL, %pstate ldx [%i0 + TD_PCB], %i1 - + stx %i0, [PCPU(CURTHREAD)] stx %i1, [PCPU(CURPCB)] - wrpr %g0, PSTATE_NORMAL, %pstate mov %i1, PCB_REG ! load in new PCB wrpr %g0, PSTATE_KERNEL, %pstate - /* - * End of saving old context - * Start of loading new context - */ ldx [PCB_REG + PCB_SP], %fp ldx [PCB_REG + PCB_PC], %i7 sub %fp, CCFSZ, %sp @@ -155,11 +155,38 @@ be,a,pn %xcc, 5f nop - ldx [%i2 + PM_CONTEXT], %l5 ! new context == kernel? + ldx [%i2 + PM_CONTEXT], %l5 ! new context + ldx [%l2 + PM_CONTEXT], %l3 ! old context cmp %g0, %l5 - be,a,pn %xcc, 5f - nop + be,a,pn %xcc, 5f ! new context == kernel? + lduw [PCPU(CPUMASK)], %l4 + + brz %l3, 10f ! old context == kernel? + nop + /* + * Mark the old pmap as no longer active on this CPU + */ + lduw [%l2 + PM_ACTIVE], %l3 + andn %l3, %l4, %l3 + stw %l3, [%l2 + PM_ACTIVE] + + /* + * Mark the new pmap as active on this CPU + * XXX need to CAS + */ +10: lduw [%i2 + PM_ACTIVE], %l3 + or %l3, %l4, %l3 + stw %l3, [%i2 + PM_ACTIVE] + + /* + * Mark the new pmap as possibly having TLB entries on this CPU + * XXX need to CAS + */ + lduw [%i2 + PM_TLBACTIVE], %l3 + or %l3, %l4, %l3 + stw %l3, [%i2 + PM_TLBACTIVE] + mov SCRATCH_REG_HASH_USER, %l6 mov SCRATCH_REG_TSB_USER, %l7 ldx [%i2 + PM_HASHSCRATCH], %l3 @@ -189,6 +216,8 @@ */ SET_MMU_CONTEXT(%l6, %l5) + + /* * Done. Return and load the new process's window from the stack. */ From owner-p4-projects@FreeBSD.ORG Mon Apr 3 11:16: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 15E4E16A423; Mon, 3 Apr 2006 11:16:04 +0000 (UTC) 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 C5AE716A401 for ; Mon, 3 Apr 2006 11:16:03 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7EA343D67 for ; Mon, 3 Apr 2006 11:15:56 +0000 (GMT) (envelope-from bz@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 k33BFuhl081364 for ; Mon, 3 Apr 2006 11:15:56 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33BFp0l081361 for perforce@freebsd.org; Mon, 3 Apr 2006 11:15:51 GMT (envelope-from bz@freebsd.org) Date: Mon, 3 Apr 2006 11:15:51 GMT Message-Id: <200604031115.k33BFp0l081361@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 94533 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, 03 Apr 2006 11:16:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=94533 Change 94533 by bz@bz_dopt_ah on 2006/04/03 11:15:06 IFC @94532 This is after the Apr 1st rwatson TCP changes. src/sys/netipsec/keydb.h had to be resolved by hand because it differed here in parent branch from what had been in HEAD(cvs) and gnn_fast_ipsec/src/sys/netipsec/keydb.h#3 . Affected files ... .. //depot/projects/fast_ipsec/src/lib/libipsec/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/clock.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/cpu.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_syscall.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysent.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/syscalls.master#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/bus.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/pci/pci_bus.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/smbios.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/Makefile.arm#7 integrate .. //depot/projects/fast_ipsec/src/sys/conf/NOTES#6 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files#9 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.alpha#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options#7 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/pf_norm.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/en/midway.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/md/md.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi_disk.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi_ioctl.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi_pci.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfireg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfivar.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_reg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbbreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_ebus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_bfe.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_bfe_ebus.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_bfe_macio.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_bfe_sbus.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_bus.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_core.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_dev_sab82532.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_dev_z8530.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_if.m#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus_ebus.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus_scc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu_powerpc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/umass.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/gdb/gdb_cons.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gdb/gdb_int.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_io.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3_ctl.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/atomic.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/fast_ipsec/src/sys/isofs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_acct.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_alq.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_environment.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mac.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_tc.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/md5c.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/serdev_if.m#1 branch .. //depot/projects/fast_ipsec/src/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.master#8 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/modules/Makefile#7 integrate .. //depot/projects/fast_ipsec/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/cp/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_gif/Makefile#5 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ipfilter/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/fast_ipsec/src/sys/modules/mfi/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/pf/Makefile#5 integrate .. //depot/projects/fast_ipsec/src/sys/modules/pflog/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/scc/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_media.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_ppp.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_tap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/raw_cb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/route.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/rtsock.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/atm_aal5.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/atm_proto.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/atm_var.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/key.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/key_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/keydb.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/keysock.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/xform.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/README#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/ipx_pcb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/spx_usrreq.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netkey/keysock.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/fast_ipsec/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/fhc/clkbrd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/fhc/clkbrdreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/aio.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ata.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/buf.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/clock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/event.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/gmon.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/linker.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mbuf.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/sys/md5.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mount.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/sys/param.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/sys/pmc.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/proc.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/sys/protosw.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/serial.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/socketvar.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sx.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.mk#7 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sysproto.h#8 integrate .. //depot/projects/fast_ipsec/src/sys/sys/umtx.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_mmap.c#3 integrate Differences ... ==== //depot/projects/fast_ipsec/src/lib/libipsec/Makefile#2 (text+ko) ==== @@ -25,14 +25,17 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libipsec/Makefile,v 1.17 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libipsec/Makefile,v 1.19 2006/03/18 11:01:06 ru Exp $ + +SHLIBDIR?= /lib + +.include LIB= ipsec -SHLIBDIR?= /lib SHLIB_MAJOR= 2 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif ==== //depot/projects/fast_ipsec/src/sys/Makefile#3 (text+ko) ==== @@ -1,7 +1,9 @@ -# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $ +# $FreeBSD: src/sys/Makefile,v 1.35 2006/03/17 18:54:34 ru Exp $ + +.include # The boot loader -.if !defined(NO_BOOT) +.if ${MK_BOOT} != "no" .if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/clock.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.44 2006/03/07 22:12:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.45 2006/03/28 21:20:11 jhb Exp $"); #include "opt_clock.h" @@ -137,7 +137,6 @@ static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); -static uint64_t read_cycle_count(void); void clockattach(device_t dev) ==== //depot/projects/fast_ipsec/src/sys/alpha/include/cpu.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.43 2005/12/22 22:16:04 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.44 2006/03/28 21:20:12 jhb Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /*- @@ -88,11 +88,12 @@ #define cpu_getstack(td) (alpha_pal_rdusp()) #define cpu_spinwait() /* nothing */ -#define get_cyclecount alpha_rpcc +#define get_cyclecount() read_cycle_count() void cpu_halt(void); void cpu_reset(void); void fork_trampoline(void); /* MAGIC */ +uint64_t read_cycle_count(void); void swi_vm(void *); #endif /* _KERNEL */ ==== //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_dummy.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.38 2004/03/29 02:19:43 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.39 2006/03/21 21:08:02 netchild Exp $"); #include #include @@ -72,11 +72,8 @@ DUMMY(pciconfig_read); DUMMY(pciconfig_write); DUMMY(pivot_root); -DUMMY(recvmsg); -DUMMY(sendmsg); DUMMY(sethae); DUMMY(sigaltstack); DUMMY(sigpending); -DUMMY(socketpair); DUMMY(utimes); ==== //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_proto.h#3 (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.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 + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.27 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -170,6 +170,10 @@ struct linux_gethostname_args { register_t dummy; }; +struct linux_sethostname_args { + char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)]; + char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)]; +}; struct linux_getdtablesize_args { register_t dummy; }; @@ -199,10 +203,22 @@ char name_l_[PADL_(struct l_sockaddr *)]; struct l_sockaddr * name; char name_r_[PADR_(struct l_sockaddr *)]; char namelen_l_[PADL_(l_int)]; l_int namelen; char namelen_r_[PADR_(l_int)]; }; +struct linux_accept_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_accept_args *)]; struct linux_accept_args * args; char args_r_[PADR_(struct linux_accept_args *)]; +}; struct linux_getpriority_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; }; +struct linux_send_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_send_args *)]; struct linux_send_args * args; char args_r_[PADR_(struct linux_send_args *)]; +}; +struct linux_recv_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_recv_args *)]; struct linux_recv_args * args; char args_r_[PADR_(struct linux_recv_args *)]; +}; struct osf1_sigreturn_args { char sigcntxp_l_[PADL_(struct osigcontext *)]; struct osigcontext * sigcntxp; char sigcntxp_r_[PADR_(struct osigcontext *)]; }; @@ -223,6 +239,10 @@ char who_l_[PADL_(long)]; long who; char who_r_[PADR_(long)]; char rusage_l_[PADL_(void *)]; void * rusage; char rusage_r_[PADR_(void *)]; }; +struct linux_recvfrom_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_recvfrom_args *)]; struct linux_recvfrom_args * args; char args_r_[PADR_(struct linux_recvfrom_args *)]; +}; struct linux_rename_args { char from_l_[PADL_(char *)]; char * from; char from_r_[PADR_(char *)]; char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)]; @@ -231,6 +251,10 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)]; }; +struct linux_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)]; +}; struct osf1_sendto_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; @@ -249,6 +273,10 @@ struct linux_rmdir_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; }; +struct linux_getpeername_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_getpeername_args *)]; struct linux_getpeername_args * args; char args_r_[PADR_(struct linux_getpeername_args *)]; +}; struct linux_getrlimit_args { char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)]; char rlim_l_[PADL_(struct l_rlimit *)]; struct l_rlimit * rlim; char rlim_r_[PADR_(struct l_rlimit *)]; @@ -260,6 +288,10 @@ struct linux_quotactl_args { register_t dummy; }; +struct linux_getsockname_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_getsockname_args *)]; struct linux_getsockname_args * args; char args_r_[PADR_(struct linux_getsockname_args *)]; +}; struct osf1_sigaction_args { char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; char nsa_l_[PADL_(struct osf1_sigaction *)]; struct osf1_sigaction * nsa; char nsa_r_[PADR_(struct osf1_sigaction *)]; @@ -620,28 +652,36 @@ int linux_getgroups(struct thread *, struct linux_getgroups_args *); int osf1_setitimer(struct thread *, struct osf1_setitimer_args *); int linux_gethostname(struct thread *, struct linux_gethostname_args *); +int linux_sethostname(struct thread *, struct linux_sethostname_args *); int linux_getdtablesize(struct thread *, struct linux_getdtablesize_args *); int linux_newfstat(struct thread *, struct linux_newfstat_args *); int linux_fcntl(struct thread *, struct linux_fcntl_args *); int osf1_select(struct thread *, struct osf1_select_args *); int osf1_socket(struct thread *, struct osf1_socket_args *); int linux_connect(struct thread *, struct linux_connect_args *); +int linux_accept(struct thread *, struct linux_accept_args *); int linux_getpriority(struct thread *, struct linux_getpriority_args *); +int linux_send(struct thread *, struct linux_send_args *); +int linux_recv(struct thread *, struct linux_recv_args *); int osf1_sigreturn(struct thread *, struct osf1_sigreturn_args *); int osf1_sigsuspend(struct thread *, struct osf1_sigsuspend_args *); int linux_recvmsg(struct thread *, struct linux_recvmsg_args *); int linux_sendmsg(struct thread *, struct linux_sendmsg_args *); int osf1_gettimeofday(struct thread *, struct osf1_gettimeofday_args *); int osf1_getrusage(struct thread *, struct osf1_getrusage_args *); +int linux_recvfrom(struct thread *, struct linux_recvfrom_args *); int linux_rename(struct thread *, struct linux_rename_args *); int linux_truncate(struct thread *, struct linux_truncate_args *); +int linux_ftruncate(struct thread *, struct linux_ftruncate_args *); int osf1_sendto(struct thread *, struct osf1_sendto_args *); int linux_socketpair(struct thread *, struct linux_socketpair_args *); int linux_mkdir(struct thread *, struct linux_mkdir_args *); int linux_rmdir(struct thread *, struct linux_rmdir_args *); +int linux_getpeername(struct thread *, struct linux_getpeername_args *); int linux_getrlimit(struct thread *, struct linux_getrlimit_args *); int linux_setrlimit(struct thread *, struct linux_setrlimit_args *); int linux_quotactl(struct thread *, struct linux_quotactl_args *); +int linux_getsockname(struct thread *, struct linux_getsockname_args *); int osf1_sigaction(struct thread *, struct osf1_sigaction_args *); int linux_msgctl(struct thread *, struct linux_msgctl_args *); int linux_msgget(struct thread *, struct linux_msgget_args *); ==== //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_syscall.h#3 (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.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 + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.25 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #define LINUX_SYS_exit 1 @@ -57,7 +57,7 @@ #define LINUX_SYS_linux_getgroups 80 #define LINUX_SYS_osf1_setitimer 83 #define LINUX_SYS_linux_gethostname 87 -#define LINUX_SYS_osethostname 88 +#define LINUX_SYS_linux_sethostname 88 #define LINUX_SYS_linux_getdtablesize 89 #define LINUX_SYS_dup2 90 #define LINUX_SYS_linux_newfstat 91 @@ -68,10 +68,10 @@ #define LINUX_SYS_setpriority 96 #define LINUX_SYS_osf1_socket 97 #define LINUX_SYS_linux_connect 98 -#define LINUX_SYS_accept 99 +#define LINUX_SYS_linux_accept 99 #define LINUX_SYS_linux_getpriority 100 -#define LINUX_SYS_osend 101 -#define LINUX_SYS_orecv 102 +#define LINUX_SYS_linux_send 101 +#define LINUX_SYS_linux_recv 102 #define LINUX_SYS_osf1_sigreturn 103 #define LINUX_SYS_bind 104 #define LINUX_SYS_setsockopt 105 @@ -86,12 +86,12 @@ #define LINUX_SYS_writev 121 #define LINUX_SYS_fchown 123 #define LINUX_SYS_fchmod 124 -#define LINUX_SYS_recvfrom 125 +#define LINUX_SYS_linux_recvfrom 125 #define LINUX_SYS_setreuid 126 #define LINUX_SYS_setregid 127 #define LINUX_SYS_linux_rename 128 #define LINUX_SYS_linux_truncate 129 -#define LINUX_SYS_oftruncate 130 +#define LINUX_SYS_linux_ftruncate 130 #define LINUX_SYS_flock 131 #define LINUX_SYS_setgid 132 #define LINUX_SYS_osf1_sendto 133 @@ -100,12 +100,12 @@ #define LINUX_SYS_linux_mkdir 136 #define LINUX_SYS_linux_rmdir 137 #define LINUX_SYS_utimes 138 -#define LINUX_SYS_ogetpeername 141 +#define LINUX_SYS_linux_getpeername 141 #define LINUX_SYS_linux_getrlimit 144 #define LINUX_SYS_linux_setrlimit 145 #define LINUX_SYS_setsid 147 #define LINUX_SYS_linux_quotactl 148 -#define LINUX_SYS_getsockname 150 +#define LINUX_SYS_linux_getsockname 150 #define LINUX_SYS_osf1_sigaction 156 #define LINUX_SYS_setdomainname 166 #define LINUX_SYS_linux_msgctl 200 ==== //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysent.c#3 (text+ko) ==== @@ -2,12 +2,11 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $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 + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.25 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #include -#include "opt_compat.h" #include #include #include @@ -108,7 +107,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 88 = linux_sethostname */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ @@ -119,10 +118,10 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */ { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */ + { SYF_MPSAFE | AS(linux_accept_args), (sy_call_t *)linux_accept, AUE_ACCEPT }, /* 99 = linux_accept */ { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */ - { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ - { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ + { SYF_MPSAFE | AS(linux_send_args), (sy_call_t *)linux_send, AUE_SEND }, /* 101 = linux_send */ + { SYF_MPSAFE | AS(linux_recv_args), (sy_call_t *)linux_recv, AUE_RECV }, /* 102 = linux_recv */ { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ @@ -145,12 +144,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ - { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(linux_recvfrom_args), (sy_call_t *)linux_recvfrom, AUE_RECVFROM }, /* 125 = linux_recvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */ { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 130 = linux_ftruncate */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */ { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */ @@ -161,7 +160,7 @@ { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */ + { SYF_MPSAFE | AS(linux_getpeername_args), (sy_call_t *)linux_getpeername, AUE_GETPEERNAME }, /* 141 = linux_getpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */ @@ -170,7 +169,7 @@ { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */ + { SYF_MPSAFE | AS(linux_getsockname_args), (sy_call_t *)linux_getsockname, AUE_GETSOCKNAME }, /* 150 = linux_getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ ==== //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#4 (text+ko) ==== @@ -27,14 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.98 2005/12/26 21:23:56 sobomax Exp $"); - -/* XXX we use functions that might not exist. */ -#include "opt_compat.h" - -#ifndef COMPAT_43 -#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!" -#endif +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.99 2006/03/18 18:24:38 netchild Exp $"); #include #include ==== //depot/projects/fast_ipsec/src/sys/alpha/linux/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -11,8 +11,7 @@ ; there is no audit event for the call at this time. For the ; case where the event exists, but we don't want auditing, the ; event should be #defined to AUE_NULL in audit_kevents.h. -; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, -; NODEF, NOARGS, NOPROTO +; type one of STD, OBSOL, UNIMPL, NODEF, NOARGS, NOPROTO ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -22,9 +21,6 @@ ; types: ; STD always included -; COMPAT included on COMPAT #ifdef -; CPT_NOA combines COMPAT with NOARGS -; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h ; NOARGS same as STD except do not create structure in sys/sysproto.h ; NODEF ?? ; NOPROTO same as STD except do not create structure or function in @@ -32,7 +28,6 @@ ; OBSOL obsolete, not included in system, only specifies name ; UNIMPL not implemented, placeholder only -#include "opt_compat.h" #include #include #include @@ -158,9 +153,7 @@ 85 AUE_NULL UNIMPL 86 AUE_GETITIMER UNIMPL osf_getitimer 87 AUE_SYSCTL MSTD { int linux_gethostname(void); } -88 AUE_SYSCTL MNOPROTO { int osethostname(char *hostname, \ - u_int len); } osethostname \ - sethostname_args int +88 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, u_int len); } 89 AUE_GETDTABLESIZE MSTD { int linux_getdtablesize(void); } 90 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } 91 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \ @@ -179,13 +172,13 @@ int protocol); } 98 AUE_CONNECT MSTD { int linux_connect(l_int s, \ struct l_sockaddr *name, l_int namelen); } -99 AUE_ACCEPT MNOPROTO { int oaccept(int s, caddr_t name, \ - int *anamelen); } accept accept_args int +99 AUE_ACCEPT MSTD { int linux_accept(l_int s, \ + struct linux_accept_args *args); } 100 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } -101 AUE_SEND MNOPROTO { int osend(int s, caddr_t buf, int len, \ - int flags); } -102 AUE_RECV MNOPROTO { int orecv(int s, caddr_t buf, int len, \ - int flags); } +101 AUE_SEND MSTD { int linux_send(l_int s, \ + struct linux_send_args *args); } +102 AUE_RECV MSTD { int linux_recv(l_int s, \ + struct linux_recv_args *args); } 103 AUE_NULL MSTD { int osf1_sigreturn( \ struct osigcontext *sigcntxp); } 104 AUE_BIND MNOPROTO { int bind(int s, caddr_t name, \ @@ -217,16 +210,14 @@ 122 AUE_SETTIMEOFDAY UNIMPL osf_settimeofday 123 AUE_FCHOWN NOPROTO { int fchown(int fd, int uid, int gid); } 124 AUE_FCHMOD NOPROTO { int fchmod(int fd, int mode); } -125 AUE_RECVFROM NOPROTO { int orecvfrom(int s, caddr_t buf, \ - size_t len, int flags, caddr_t from, \ - int *fromlenaddr); } recvfrom \ - recvfrom_args int +125 AUE_RECVFROM MSTD { int linux_recvfrom(l_int s, \ + struct linux_recvfrom_args *args); } 126 AUE_SETREUID MNOPROTO { int setreuid(int ruid, int euid); } 127 AUE_SETREGID MNOPROTO { int setregid(int rgid, int egid); } 128 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } 129 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \ l_ulong length); } -130 AUE_FTRUNCATE MNOPROTO { int oftruncate(int fd, long length); } +130 AUE_FTRUNCATE MSTD { int linux_ftruncate(int fd, long length); } 131 AUE_FLOCK MNOPROTO { int flock(int fd, int how); } 132 AUE_SETGID MNOPROTO { int setgid(gid_t gid); } 133 AUE_SENDTO MSTD { int osf1_sendto(int s, caddr_t buf, \ @@ -240,8 +231,8 @@ struct timeval *tptr); } 139 AUE_NULL UNIMPL 140 AUE_NULL UNIMPL -141 AUE_GETPEERNAME MNOPROTO { int ogetpeername(int fdes, caddr_t asa, \ - int *alen); } +141 AUE_GETPEERNAME MSTD { int linux_getpeername(l_int s, \ + struct linux_getpeername_args *args); } 142 AUE_NULL UNIMPL 143 AUE_NULL UNIMPL 144 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ @@ -252,9 +243,8 @@ 147 AUE_SETSID MNOPROTO { int setsid(void); } 148 AUE_QUOTACTL MSTD { int linux_quotactl(void); } 149 AUE_NULL UNIMPL -150 AUE_GETSOCKNAME MNOPROTO { int ogetsockname(int fdec, caddr_t asa, \ - int *alen);} getsockname \ - getsockname_args int +150 AUE_GETSOCKNAME MSTD { int linux_getsockname(l_int s, \ + struct linux_getsockname_args *args);} 151 AUE_NULL UNIMPL 152 AUE_NULL UNIMPL 153 AUE_NULL UNIMPL ==== //depot/projects/fast_ipsec/src/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.19 2005/11/01 22:44:06 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $"); #include #include @@ -219,11 +219,12 @@ } /* - * For ACPI < 2.0, use the RSDT. For ACPI >= 2.0, use the XSDT. - * We map the XSDT and RSDT at page 1 in the crashdump area. - * Page 0 is used to map in the headers of candidate ACPI tables. + * For ACPI >= 2.0, use the XSDT if it is available. + * Otherwise, use the RSDT. We map the XSDT or RSDT at page 1 + * in the crashdump area. Page 0 is used to map in the + * headers of candidate ACPI tables. */ - if (rsdp->Revision >= 2) { + if (rsdp->Revision >= 2 && rsdp->XsdtPhysicalAddress != 0) { /* * AcpiOsGetRootPointer only verifies the checksum for * the version 1.0 portion of the RSDP. Version 2.0 has ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/apic_vector.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.107 2005/12/14 21:47:01 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.108 2006/03/13 23:55:31 peter Exp $ */ /* @@ -188,11 +188,7 @@ jmp doreti /* - * Executed by a CPU when it receives an Xcpustop IPI from another CPU, - * - * - Signals its receipt. - * - Waits for permission to restart. - * - Signals its restart. + * Executed by a CPU when it receives an IPI_STOP from another CPU. */ .text SUPERALIGN_TEXT ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/db_trace.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.73 2005/12/27 23:23:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); #include #include @@ -192,6 +192,7 @@ #define TRAP 1 #define INTERRUPT 2 #define SYSCALL 3 +#define TRAP_INTERRUPT 5 static void db_nextframe(struct amd64_frame **, db_addr_t *, struct thread *); static int db_numargs(struct amd64_frame *); @@ -326,6 +327,12 @@ frame_type = INTERRUPT; else if (strcmp(name, "Xfast_syscall") == 0) frame_type = SYSCALL; + /* XXX: These are interrupts with trap frames. */ + else if (strcmp(name, "Xtimerint") == 0 || + strcmp(name, "Xcpustop") == 0 || + strcmp(name, "Xrendezvous") == 0 || + strcmp(name, "Xipi_intr_bitmap_handler") == 0) + frame_type = TRAP_INTERRUPT; } /* @@ -357,6 +364,7 @@ db_printf("--- syscall"); decode_syscall(tf->tf_rax, td); break; + case TRAP_INTERRUPT: case INTERRUPT: db_printf("--- interrupt"); break; ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/io_apic.c#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 3 16:04: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 E23FE16A425; Mon, 3 Apr 2006 16:04:28 +0000 (UTC) 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 8CF3416A423 for ; Mon, 3 Apr 2006 16:04:28 +0000 (UTC) (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 5173343D45 for ; Mon, 3 Apr 2006 16:04:28 +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 k33G4SlA015120 for ; Mon, 3 Apr 2006 16:04:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33G4Rko015117 for perforce@freebsd.org; Mon, 3 Apr 2006 16:04:27 GMT (envelope-from jhb@freebsd.org) Date: Mon, 3 Apr 2006 16:04:27 GMT Message-Id: <200604031604.k33G4Rko015117@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 94544 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, 03 Apr 2006 16:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=94544 Change 94544 by jhb@jhb_slimer on 2006/04/03 16:04:13 bde@ inspired cleanups. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#105 edit .. //depot/projects/smpng/sys/i386/isa/npx.c#55 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#105 (text+ko) ==== @@ -1234,9 +1234,22 @@ unsigned int cr0; cr0 = rcr0(); + /* - * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the - * BSP. See the comments there about why we set them. + * CR0_MP, CR0_NE and CR0_TS are set for NPX (FPU) support: + * + * Prepare to trap all ESC (i.e., NPX) instructions and all WAIT + * instructions. We must set the CR0_MP bit and use the CR0_TS + * bit to control the trap, because setting the CR0_EM bit does + * not cause WAIT instructions to trap. It's important to trap + * WAIT instructions - otherwise the "wait" variants of no-wait + * control instructions would degenerate to the "no-wait" variants + * after FP context switches but work correctly otherwise. It's + * particularly important to trap WAITs when there is no NPX - + * otherwise the "wait" variants would always degenerate. + * + * Try setting CR0_NE to get correct error reporting on 486DX's. + * Setting it should fail or do nothing on lesser processors. */ cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM; load_cr0(cr0); ==== //depot/projects/smpng/sys/i386/isa/npx.c#55 (text+ko) ==== @@ -234,10 +234,8 @@ } /* - * Probe routine. Initialize cr0 to give correct behaviour for [f]wait - * whether the device exists or not (XXX should be elsewhere). Set flags - * to tell npxattach() what to do. Setup an interrupt handler if npx does - * need to use interrupts. Return 0 if device exists. + * Probe routine. Set flags to tell npxattach() what to do. Set up an + * interrupt handler if npx needs to use interrupts. */ static int npx_probe(dev) @@ -250,9 +248,6 @@ u_short control; u_short status; - KASSERT((rcr0() & (CR0_MP | CR0_NE)) == (CR0_MP | CR0_NE), - ("cr0 busted")); - device_set_desc(dev, "math processor"); /* @@ -294,24 +289,10 @@ outb(IO_NPX, 0); /* - * Prepare to trap all ESC (i.e., NPX) instructions and all WAIT - * instructions. We must set the CR0_MP bit and use the CR0_TS - * bit to control the trap, because setting the CR0_EM bit does - * not cause WAIT instructions to trap. It's important to trap - * WAIT instructions - otherwise the "wait" variants of no-wait - * control instructions would degenerate to the "no-wait" variants - * after FP context switches but work correctly otherwise. It's - * particularly important to trap WAITs when there is no NPX - - * otherwise the "wait" variants would always degenerate. - * - * Try setting CR0_NE to get correct error reporting on 486DX's. - * Setting it should fail or do nothing on lesser processors. - */ - load_cr0(rcr0() | CR0_MP | CR0_NE); - /* - * But don't trap while we're probing. + * Don't trap while we're probing. */ stop_emulating(); + /* * Finish resetting the coprocessor, if any. If there is an error * pending, then we may get a bogus IRQ13, but npx_intr() will handle @@ -419,14 +400,12 @@ flags = device_get_flags(dev); - if (!device_is_quiet(dev) || bootverbose) { - if (npx_irq13) - device_printf(dev, "IRQ 13 interface\n"); - else if (npx_ex16) - device_printf(dev, "INT 16 interface\n"); - else - device_printf(dev, "WARNING: no FPU!\n"); - } + if (npx_irq13) + device_printf(dev, "IRQ 13 interface\n"); + else if (!npx_ex16) + device_printf(dev, "WARNING: no FPU!\n"); + else if (!device_is_quiet(dev) || bootverbose) + device_printf(dev, "INT 16 interface\n"); npxinit(__INITIAL_NPXCW__); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 19:03: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 3761516A420; Mon, 3 Apr 2006 19:03:45 +0000 (UTC) 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 A79BA16A400; Mon, 3 Apr 2006 19:03:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D6A843D45; Mon, 3 Apr 2006 19:03:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k33J3hGe044542; Mon, 3 Apr 2006 15:03:43 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John-Mark Gurney Date: Mon, 3 Apr 2006 15:03:40 -0400 User-Agent: KMail/1.9.1 References: <200604030641.k336f6iG055021@repoman.freebsd.org> In-Reply-To: <200604030641.k336f6iG055021@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200604031503.41288.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1370/Mon Apr 3 13:31:59 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.9 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 94510 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, 03 Apr 2006 19:03:45 -0000 On Monday 03 April 2006 02:41, John-Mark Gurney wrote: > http://perforce.freebsd.org/chv.cgi?CH=94510 > > Change 94510 by jmg@jmg_arlene on 2006/04/03 06:40:19 > > don't force the unit number to match the bus number, this breaks > machines with multiple pci domains... how the alpha worked with > this is beyond me (besides using custom pci bridge drivers?) Alpha has issues with hoses. That said, this might break some things. :( If nothing else, it makes it nearly impossible now for people to get the names of hints to override things like PCI routing via tunables correct. I would prefer a structured solution that preserved the status quo on machines w/o multiple domains. Maybe have the unit number be something like domain * X + bus number, where X is some arbitrary constant like 100 or 1000 (those are better for human parsing). -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Apr 3 19:09:41 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 B79AA16A422; Mon, 3 Apr 2006 19:09:41 +0000 (UTC) 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 56B8816A400; Mon, 3 Apr 2006 19:09:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A1A243D49; Mon, 3 Apr 2006 19:09:40 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k33J9dBw044579; Mon, 3 Apr 2006 15:09:39 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Kip Macy Date: Mon, 3 Apr 2006 15:05:19 -0400 User-Agent: KMail/1.9.1 References: <200604030738.k337c67u059228@repoman.freebsd.org> In-Reply-To: <200604030738.k337c67u059228@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200604031505.20667.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1370/Mon Apr 3 13:31:59 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.9 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 94525 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, 03 Apr 2006 19:09:42 -0000 On Monday 03 April 2006 03:38, Kip Macy wrote: > http://perforce.freebsd.org/chv.cgi?CH=94525 > > Change 94525 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:37:31 > > drop cpumask down to 32-bits the rest of freebsd hardcodes the ASSumption > move tte_t typedef Grr, I'd rather we fix FreeBSD. It should be ok to have cpumask_t be a long on 64-bit architectures. We can do that later of course, but I'm curious what breakage you ran into? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Apr 3 19:31:09 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 AB34216A423; Mon, 3 Apr 2006 19:31:09 +0000 (UTC) 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 825CA16A400 for ; Mon, 3 Apr 2006 19:31:09 +0000 (UTC) (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 3E42E43D48 for ; Mon, 3 Apr 2006 19:31:09 +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 k33JV9He041994 for ; Mon, 3 Apr 2006 19:31:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33JV8X6041991 for perforce@freebsd.org; Mon, 3 Apr 2006 19:31:08 GMT (envelope-from imp@freebsd.org) Date: Mon, 3 Apr 2006 19:31:08 GMT Message-Id: <200604031931.k33JV8X6041991@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 94551 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, 03 Apr 2006 19:31:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=94551 Change 94551 by imp@imp_Speedy on 2006/04/03 19:30:42 Need callback, I think, for request/release bus. If not for this, then for the specialized iicbus bridges that we're going to use in our design. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#9 (text+ko) ==== @@ -42,6 +42,8 @@ #include #include +#include +#include #include "iicbus_if.h" struct at91_twi_softc @@ -455,6 +457,25 @@ return EIO; } +static int +at91_twi_callback(device_t dev, int index, caddr_t *data) +{ + int error = 0; + + switch (index) { + case IIC_REQUEST_BUS: + break; + + case IIC_RELEASE_BUS: + break; + + default: + error = EINVAL; + } + + return (error); +} + static device_method_t at91_twi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_twi_probe), @@ -462,7 +483,7 @@ DEVMETHOD(device_detach, at91_twi_detach), /* iicbus interface */ -// DEVMETHOD(iicbus_callback, iicbus_null_callback), + DEVMETHOD(iicbus_callback, at91_twi_callback), DEVMETHOD(iicbus_repeated_start, at91_twi_repeated_start), DEVMETHOD(iicbus_start, at91_twi_start), DEVMETHOD(iicbus_stop, at91_twi_stop), From owner-p4-projects@FreeBSD.ORG Mon Apr 3 19:42: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 9126616A424; Mon, 3 Apr 2006 19:42:55 +0000 (UTC) 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 5352C16A41F for ; Mon, 3 Apr 2006 19:42:55 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15F4443D48 for ; Mon, 3 Apr 2006 19:42:55 +0000 (GMT) (envelope-from peter@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 k33JgsNq044328 for ; Mon, 3 Apr 2006 19:42:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33JgsbY044325 for perforce@freebsd.org; Mon, 3 Apr 2006 19:42:54 GMT (envelope-from peter@freebsd.org) Date: Mon, 3 Apr 2006 19:42:54 GMT Message-Id: <200604031942.k33JgsbY044325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 94552 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, 03 Apr 2006 19:42:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=94552 Change 94552 by peter@peter_daintree on 2006/04/03 19:41:53 macro-fy the stats instead of adding #ifdefs to make them optional. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#147 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#147 (text+ko) ==== @@ -158,6 +158,13 @@ #define PMAP_INLINE #endif +#define PV_STATS +#ifdef PV_STATS +#define PV_STAT(x) do { x ; } while (0) +#else +#define PV_STAT(x) do { } while (0) +#endif + struct pmap kernel_pmap_store; vm_paddr_t avail_start; /* PA of first available physical page */ @@ -1453,6 +1460,7 @@ static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +#ifdef PV_STATS static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees; SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_count, CTLFLAG_RD, &pc_chunk_count, 0, @@ -1479,6 +1487,8 @@ "Current number times pmap_collect called on inactive queue"); SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_active, CTLFLAG_RD, &pmap_collect_active, 0, "Current number times pmap_collect called on active queue"); +#endif + /* * We are in a serious low memory condition. Resort to * drastic measures to free some pages so we can allocate @@ -1544,9 +1554,9 @@ struct pv_chunk *pc; int idx, field, bit; - pv_entry_frees++; - pv_entry_spare++; - pv_entry_count--; + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); pc = pv_to_chunk(pv); idx = pv - &pc->pc_pventry[0]; field = idx / 64; @@ -1558,9 +1568,9 @@ if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || pc->pc_map[2] != PC_FREE2) return; - pv_entry_spare -= _NPCPV; - pc_chunk_count--; - pc_chunk_frees++; + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); /* entire chunk is free, return it */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); @@ -1586,8 +1596,8 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - pv_entry_allocs++; - pv_entry_count++; + PV_STAT(pv_entry_allocs++); + PV_STAT(pv_entry_count++); if (pv_entry_count > pv_entry_high_water) pagedaemon_wakeup(); pc = TAILQ_FIRST(&pmap->pm_pvchunk); @@ -1607,7 +1617,7 @@ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); } - pv_entry_spare--; + PV_STAT(pv_entry_spare--); return (pv); } } @@ -1623,19 +1633,21 @@ printf("Approaching the limit on PV entries, consider " "increasing sysctl vm.pmap.shpgperproc or " "vm.pmap.pv_entry_max\n"); - pmap_collect_inactive++; + PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); - m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); if (m == NULL) { - pmap_collect_active++; + PV_STAT(pmap_collect_active++); pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); - m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); if (m == NULL) panic("get_pv_entry: increase vm.pmap.shpgperproc"); } } - pc_chunk_count++; - pc_chunk_allocs++; + PV_STAT(pc_chunk_count++); + PV_STAT(pc_chunk_allocs++); colour++; pc = (void *)PHYS_TO_DMAP(m->phys_addr); pc->pc_pmap = pmap; @@ -1644,7 +1656,7 @@ pc->pc_map[2] = PC_FREE2; pv = &pc->pc_pventry[0]; TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); - pv_entry_spare += _NPCPV - 1; + PV_STAT(pv_entry_spare += _NPCPV - 1); return (pv); } @@ -2699,7 +2711,7 @@ struct pv_chunk *pc, *npc; int field, idx; int64_t bit; - uint64_t inuse; + uint64_t inuse, bitmask; int allfree; if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) { @@ -2719,9 +2731,10 @@ inuse = (~(pc->pc_map[field])) & pc_freemask[field]; while (inuse != 0) { bit = bsfq(inuse); + bitmask = 1UL << bit; idx = field * 64 + bit; pv = &pc->pc_pventry[idx]; - inuse &= ~(1UL << bit); + inuse &= ~bitmask; pte = vtopte(pv->pv_va); tpte = *pte; @@ -2762,10 +2775,10 @@ vm_page_dirty(m); /* Mark free */ - pv_entry_frees++; - pv_entry_spare++; - pv_entry_count--; - pc->pc_map[field] |= 1ul << bit; + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc->pc_map[field] |= bitmask; m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) @@ -2775,9 +2788,9 @@ } } if (allfree) { - pv_entry_spare -= _NPCPV; - pc_chunk_count--; - pc_chunk_frees++; + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); vm_page_lock_queues(); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 19:52:54 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 EE79C16A443; Mon, 3 Apr 2006 19:52:53 +0000 (UTC) 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 B362D16A43B; Mon, 3 Apr 2006 19:52:53 +0000 (UTC) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (gate.funkthat.com [69.17.45.168]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B47F43D6E; Mon, 3 Apr 2006 19:52:53 +0000 (GMT) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (ajco3edpvk4f5r6i@localhost.funkthat.com [127.0.0.1]) by hydrogen.funkthat.com (8.13.4/8.13.3) with ESMTP id k33JqqFE053964; Mon, 3 Apr 2006 12:52:52 -0700 (PDT) (envelope-from jmg@hydrogen.funkthat.com) Received: (from jmg@localhost) by hydrogen.funkthat.com (8.13.4/8.13.3/Submit) id k33JqqH7053963; Mon, 3 Apr 2006 12:52:52 -0700 (PDT) (envelope-from jmg) Date: Mon, 3 Apr 2006 12:52:52 -0700 From: John-Mark Gurney To: John Baldwin Message-ID: <20060403195251.GH53811@funkthat.com> References: <200604030641.k336f6iG055021@repoman.freebsd.org> <200604031503.41288.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200604031503.41288.jhb@freebsd.org> User-Agent: Mutt/1.4.2.1i X-Operating-System: FreeBSD 5.4-RELEASE-p6 i386 X-PGP-Fingerprint: B7 EC EF F8 AE ED A7 31 96 7A 22 B3 D8 56 36 F4 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html Cc: Perforce Change Reviews Subject: Re: PERFORCE change 94510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: John-Mark Gurney List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Apr 2006 19:52:54 -0000 John Baldwin wrote this message on Mon, Apr 03, 2006 at 15:03 -0400: > On Monday 03 April 2006 02:41, John-Mark Gurney wrote: > > http://perforce.freebsd.org/chv.cgi?CH=94510 > > > > Change 94510 by jmg@jmg_arlene on 2006/04/03 06:40:19 > > > > don't force the unit number to match the bus number, this breaks > > machines with multiple pci domains... how the alpha worked with > > this is beyond me (besides using custom pci bridge drivers?) > > Alpha has issues with hoses. That said, this might break some things. :( > If nothing else, it makes it nearly impossible now for people to get the > names of hints to override things like PCI routing via tunables correct. just a bit less impossible than booting a multi domain box.. > I would prefer a structured solution that preserved the status quo on > machines w/o multiple domains. Maybe have the unit number be something > like domain * X + bus number, where X is some arbitrary constant like > 100 or 1000 (those are better for human parsing). Isn't this solved by something like wiring down unit numbers? Where when you need to add a hint for interrupt routing you wire down the busses as necessasry? Or maybe the fact that hints have to be wired, can't there be some more descriptive hint that is better than depending upon hard coded unit numbers? As we've gotten away from static allocation for things like this, we now need to invent the next method for supporting hints in a dynamic environment.. Topic for the dev summit: Static hints in a dynamic world? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-p4-projects@FreeBSD.ORG Mon Apr 3 19:54: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 3953316A423; Mon, 3 Apr 2006 19:54:20 +0000 (UTC) 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 1231916A41F for ; Mon, 3 Apr 2006 19:54:20 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D172E43D6E for ; Mon, 3 Apr 2006 19:54:10 +0000 (GMT) (envelope-from peter@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 k33JsAhT044761 for ; Mon, 3 Apr 2006 19:54:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33Js890044758 for perforce@freebsd.org; Mon, 3 Apr 2006 19:54:08 GMT (envelope-from peter@freebsd.org) Date: Mon, 3 Apr 2006 19:54:08 GMT Message-Id: <200604031954.k33Js890044758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 94553 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, 03 Apr 2006 19:54:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=94553 Change 94553 by peter@peter_daintree on 2006/04/03 19:53:30 IFC @94550 Affected files ... .. //depot/projects/hammer/MAINTAINERS#40 integrate .. //depot/projects/hammer/Makefile.inc1#115 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#16 integrate .. //depot/projects/hammer/bin/sh/builtins.def#6 integrate .. //depot/projects/hammer/bin/sh/main.c#5 integrate .. //depot/projects/hammer/bin/sh/mkbuiltins#7 integrate .. //depot/projects/hammer/contrib/hostapd/config.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/config.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.conf#3 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGELOG#4 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGES#4 integrate .. //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#5 integrate .. //depot/projects/hammer/contrib/libreadline/INSTALL#4 integrate .. //depot/projects/hammer/contrib/libreadline/MANIFEST#4 integrate .. //depot/projects/hammer/contrib/libreadline/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/libreadline/NEWS#2 integrate .. //depot/projects/hammer/contrib/libreadline/README#4 integrate .. //depot/projects/hammer/contrib/libreadline/aclocal.m4#4 integrate .. //depot/projects/hammer/contrib/libreadline/bind.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/callback.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/chardefs.h#4 integrate .. //depot/projects/hammer/contrib/libreadline/complete.c#6 integrate .. //depot/projects/hammer/contrib/libreadline/config.h.in#4 integrate .. //depot/projects/hammer/contrib/libreadline/configure#4 integrate .. //depot/projects/hammer/contrib/libreadline/configure.in#4 integrate .. //depot/projects/hammer/contrib/libreadline/display.c#6 integrate .. //depot/projects/hammer/contrib/libreadline/doc/readline.3#6 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/libreadline/examples/histexamp.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rl.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rlcat.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rlfe.c#2 delete .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/ChangeLog#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/Makefile.in#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/README#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/config.h.in#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/configure#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/configure.in#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/extern.h#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/os.h#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/pty.c#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/rlfe.c#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/screen.h#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rlptytest.c#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rltest.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rlversion.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/funmap.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/histexpand.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/history.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/input.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/macro.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/mbutil.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/misc.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/readline.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/readline.h#6 integrate .. //depot/projects/hammer/contrib/libreadline/rldefs.h#4 integrate .. //depot/projects/hammer/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/rlprivate.h#4 integrate .. //depot/projects/hammer/contrib/libreadline/rltty.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/search.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/shell.c#6 integrate .. //depot/projects/hammer/contrib/libreadline/shlib/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/libreadline/signals.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/support/config.guess#4 integrate .. //depot/projects/hammer/contrib/libreadline/support/shlib-install#4 integrate .. //depot/projects/hammer/contrib/libreadline/support/shobj-conf#4 integrate .. //depot/projects/hammer/contrib/libreadline/support/wcwidth.c#2 delete .. //depot/projects/hammer/contrib/libreadline/terminal.c#6 integrate .. //depot/projects/hammer/contrib/libreadline/text.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/tilde.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/tilde.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/undo.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/util.c#6 integrate .. //depot/projects/hammer/contrib/libreadline/vi_keymap.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/vi_mode.c#6 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_warn#2 integrate .. //depot/projects/hammer/contrib/pf/authpf/authpf.8#4 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#48 integrate .. //depot/projects/hammer/etc/rc.d/ike#6 delete .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#9 integrate .. //depot/projects/hammer/gnu/lib/libreadline/config.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdbserver/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/gdbserver/low-fbsd.c#2 delete .. //depot/projects/hammer/include/Makefile#56 integrate .. //depot/projects/hammer/include/malloc_np.h#1 branch .. //depot/projects/hammer/include/res_update.h#1 branch .. //depot/projects/hammer/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libc/gen/tls.c#8 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#10 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#9 integrate .. //depot/projects/hammer/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libc/locale/utf8.c#12 integrate .. //depot/projects/hammer/lib/libc/net/Symbol.map#3 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#28 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.c#6 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#21 integrate .. //depot/projects/hammer/lib/libc/net/res_mkupdate.c#5 integrate .. //depot/projects/hammer/lib/libc/net/res_update.c#4 integrate .. //depot/projects/hammer/lib/libc/net/res_update.h#2 delete .. //depot/projects/hammer/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libc/resolv/res_data.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#21 integrate .. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#14 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#17 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#11 integrate .. //depot/projects/hammer/lib/libc/stdio/xprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#16 integrate .. //depot/projects/hammer/lib/libc/stdlib/Symbol.map#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#10 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#26 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.3#5 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.c#4 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.h#3 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#21 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_barrier.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_getprio.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#35 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sem.c#8 integrate .. //depot/projects/hammer/lib/librt/sigev_thread.c#3 integrate .. //depot/projects/hammer/lib/libthr/Makefile#17 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#21 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#22 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#28 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#30 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#12 integrate .. //depot/projects/hammer/lib/libthread_db/Makefile#7 integrate .. //depot/projects/hammer/lib/libthread_db/Symbol.map#1 branch .. //depot/projects/hammer/lib/msun/Makefile#31 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#1 branch .. //depot/projects/hammer/lib/msun/alpha/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/msun/alpha/Symbol.map#1 branch .. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/msun/amd64/Symbol.map#1 branch .. //depot/projects/hammer/lib/msun/arm/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/msun/arm/Symbol.map#1 branch .. //depot/projects/hammer/lib/msun/i387/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/msun/i387/Symbol.map#1 branch .. //depot/projects/hammer/lib/msun/ia64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/msun/ia64/Symbol.map#1 branch .. //depot/projects/hammer/lib/msun/powerpc/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/msun/powerpc/Symbol.map#1 branch .. //depot/projects/hammer/lib/msun/sparc64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/msun/sparc64/Symbol.map#1 branch .. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#12 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#8 integrate .. //depot/projects/hammer/libexec/rtld-elf/debug.h#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#12 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/rtld_machdep.h#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#10 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#34 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#10 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#86 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#112 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#38 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#9 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#29 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#50 integrate .. //depot/projects/hammer/sbin/mdconfig/Makefile#3 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#24 integrate .. //depot/projects/hammer/share/examples/mdoc/example.4#5 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#6 integrate .. //depot/projects/hammer/share/man/man3/queue.3#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#82 integrate .. //depot/projects/hammer/share/man/man4/amr.4#14 integrate .. //depot/projects/hammer/share/man/man4/firewire.4#8 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#11 integrate .. //depot/projects/hammer/share/man/man4/hifn.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_fujitsu.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#10 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_panasonic.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_sony.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_toshiba.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/hammer/share/man/man4/mfi.4#1 branch .. //depot/projects/hammer/share/man/man4/safe.4#6 integrate .. //depot/projects/hammer/share/man/man4/scc.4#1 branch .. //depot/projects/hammer/share/man/man4/uart.4#5 integrate .. //depot/projects/hammer/share/man/man4/ubsec.4#4 integrate .. //depot/projects/hammer/share/man/man5/libmap.conf.5#11 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#2 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#10 integrate .. //depot/projects/hammer/sys/alpha/alpha/clock.c#14 integrate .. //depot/projects/hammer/sys/alpha/include/cpu.h#12 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#148 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#88 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#32 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#10 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#42 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#42 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#39 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#39 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#39 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#43 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#34 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#25 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#19 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#19 integrate .. //depot/projects/hammer/sys/conf/NOTES#108 integrate .. //depot/projects/hammer/sys/conf/files#141 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#17 integrate .. //depot/projects/hammer/sys/conf/options#95 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_norm.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#15 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#67 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#60 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#40 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#40 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#32 integrate .. //depot/projects/hammer/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#23 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#34 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#20 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#43 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#6 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#14 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#9 integrate .. //depot/projects/hammer/sys/dev/md/md.c#58 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#1 branch .. //depot/projects/hammer/sys/dev/mfi/mfi_disk.c#1 branch .. //depot/projects/hammer/sys/dev/mfi/mfi_ioctl.h#1 branch .. //depot/projects/hammer/sys/dev/mfi/mfi_pci.c#1 branch .. //depot/projects/hammer/sys/dev/mfi/mfireg.h#1 branch .. //depot/projects/hammer/sys/dev/mfi/mfivar.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt.c#14 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#10 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_debug.c#10 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_reg.h#3 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#42 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbreg.h#8 integrate .. //depot/projects/hammer/sys/dev/puc/puc_ebus.c#8 integrate .. //depot/projects/hammer/sys/dev/puc/puc_sbus.c#10 integrate .. //depot/projects/hammer/sys/dev/scc/scc_bfe.h#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_bfe_ebus.c#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_bfe_macio.c#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_bfe_sbus.c#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_bus.h#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_core.c#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_dev_sab82532.c#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_dev_z8530.c#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_if.m#1 branch .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#30 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#28 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#13 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_scc.c#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_core.c#13 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu.h#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_powerpc.c#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#12 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#20 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#43 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#31 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#24 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#16 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#10 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#10 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#13 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#17 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#45 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#82 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#12 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#58 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#71 integrate .. //depot/projects/hammer/sys/kern/md5c.c#8 integrate .. //depot/projects/hammer/sys/kern/serdev_if.m#1 branch .. //depot/projects/hammer/sys/kern/subr_kdb.c#16 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#17 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#20 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#54 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#24 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#66 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#41 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#54 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#41 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#68 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#47 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#21 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#70 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#103 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#59 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#42 integrate .. //depot/projects/hammer/sys/modules/Makefile#98 integrate .. //depot/projects/hammer/sys/modules/ath/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/mfi/Makefile#1 branch .. //depot/projects/hammer/sys/modules/scc/Makefile#1 branch .. //depot/projects/hammer/sys/modules/uart/Makefile#10 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#25 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#27 integrate .. //depot/projects/hammer/sys/net/raw_cb.c#10 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#13 integrate .. //depot/projects/hammer/sys/net/rtsock.c#31 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#29 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#16 integrate .. //depot/projects/hammer/sys/netatm/atm_aal5.c#8 integrate .. //depot/projects/hammer/sys/netatm/atm_proto.c#7 integrate .. //depot/projects/hammer/sys/netatm/atm_socket.c#13 integrate .. //depot/projects/hammer/sys/netatm/atm_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netatm/atm_var.h#9 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#16 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#15 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#15 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#22 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#39 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#26 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#32 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#40 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#60 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#55 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#19 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#36 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#34 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#40 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#15 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#23 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.h#9 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#18 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#23 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#21 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#11 integrate .. //depot/projects/hammer/sys/netipsec/key.c#13 integrate .. //depot/projects/hammer/sys/netipsec/key_var.h#3 integrate .. //depot/projects/hammer/sys/netipsec/keydb.h#6 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#11 integrate .. //depot/projects/hammer/sys/netipsec/xform.h#3 integrate .. //depot/projects/hammer/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#10 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#9 integrate .. //depot/projects/hammer/sys/netipsec/xform_tcp.c#4 integrate .. //depot/projects/hammer/sys/netipx/README#6 integrate .. //depot/projects/hammer/sys/netipx/ipx_input.c#10 integrate .. //depot/projects/hammer/sys/netipx/ipx_pcb.c#8 integrate .. //depot/projects/hammer/sys/netipx/ipx_pcb.h#5 integrate .. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#9 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#18 integrate .. //depot/projects/hammer/sys/netkey/keysock.c#15 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#19 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#43 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#30 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#21 integrate .. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#9 integrate .. //depot/projects/hammer/sys/powerpc/include/bus.h#13 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#46 integrate .. //depot/projects/hammer/sys/sparc64/fhc/clkbrd.c#3 integrate .. //depot/projects/hammer/sys/sparc64/fhc/clkbrdreg.h#2 integrate .. //depot/projects/hammer/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/hammer/sys/sparc64/include/bus.h#20 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#44 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#18 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/tick.c#12 integrate .. //depot/projects/hammer/sys/sys/ata.h#16 integrate .. //depot/projects/hammer/sys/sys/buf.h#28 integrate .. //depot/projects/hammer/sys/sys/gmon.h#5 integrate .. //depot/projects/hammer/sys/sys/linker.h#16 integrate .. //depot/projects/hammer/sys/sys/mount.h#44 integrate .. //depot/projects/hammer/sys/sys/param.h#76 integrate .. //depot/projects/hammer/sys/sys/pmc.h#8 integrate .. //depot/projects/hammer/sys/sys/pmckern.h#6 integrate .. //depot/projects/hammer/sys/sys/pmclog.h#3 integrate .. //depot/projects/hammer/sys/sys/protosw.h#12 integrate .. //depot/projects/hammer/sys/sys/serial.h#4 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#33 integrate .. //depot/projects/hammer/sys/sys/sx.h#6 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#28 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#53 integrate .. //depot/projects/hammer/sys/sys/umtx.h#12 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#43 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#59 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#36 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_MTREE#2 integrate .. //depot/projects/hammer/tools/regression/bin/sh/errors/option-error.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/errors/redirection-error.0#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpdrop/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpdrop/tcpdrop.c#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpsocktimewait/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpsocktimewait/tcpsocktimewait.c#1 branch .. //depot/projects/hammer/tools/regression/netipx/README#1 branch .. //depot/projects/hammer/tools/regression/netipx/ipxdgramloopback/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netipx/ipxdgramloopback/ipxdgramloopback.c#1 branch .. //depot/projects/hammer/tools/regression/netipx/ipxsocket/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netipx/ipxsocket/ipxsocket.c#1 branch .. //depot/projects/hammer/tools/regression/netipx/spxabort/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netipx/spxabort/spxabort.c#1 branch .. //depot/projects/hammer/tools/regression/netipx/spxloopback/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netipx/spxloopback/spxloopback.c#1 branch .. //depot/projects/hammer/tools/tools/build_option_survey/collect_all_make_options.sh#2 delete .. //depot/projects/hammer/tools/tools/build_option_survey/listallopts.sh#1 branch .. //depot/projects/hammer/tools/tools/build_option_survey/mkhtml.sh#3 integrate .. //depot/projects/hammer/tools/tools/build_option_survey/option_survey.sh#3 integrate .. //depot/projects/hammer/tools/tools/build_option_survey/reduce.sh#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/FlashDevice.sub#4 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#29 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#23 integrate .. //depot/projects/hammer/usr.bin/gcore/elfcore.c#6 integrate .. //depot/projects/hammer/usr.bin/login/login.c#9 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#17 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#21 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#7 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#11 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.h#3 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#6 integrate .. //depot/projects/hammer/usr.sbin/rtsold/if.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#19 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#27 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#40 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $ +$FreeBSD: src/MAINTAINERS,v 1.130 2006/04/01 21:19:15 scottl Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -153,7 +153,6 @@ gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch sbin/dhclient/Makefile.inc:MAINTAINER= mbr sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org -sys/dev/asr/MAINTAINER:MAINTAINER = obrien@freebsd, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org ==== //depot/projects/hammer/Makefile.inc1#115 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.543 2006/03/20 14:24:56 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.545 2006/03/31 14:10:35 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -821,6 +821,10 @@ _mklocale= usr.bin/mklocale .endif +.if ${BOOTSTRAPPING} < 700015 +_gensnmptree= usr.sbin/bsnmpd/gensnmptree +.endif + .if ${MK_RESCUE} != "no" && \ ${BOOTSTRAPPING} < 600008 _crunchgen= usr.sbin/crunch/crunchgen @@ -830,10 +834,6 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif -.if ${BOOTSTRAPPING} < 700014 -_gensnmptree= usr.sbin/bsnmpd/gensnmptree -.endif - bootstrap-tools: .for _tool in \ ${_strfile} \ @@ -848,8 +848,8 @@ ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ + ${_gensnmptree} \ usr.sbin/config \ - ${_gensnmptree} \ ${_crunchgen} \ ${_pwd_mkdb} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ ==== //depot/projects/hammer/ObsoleteFiles.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.30 2006/03/13 09:28:46 harti Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.31 2006/03/28 18:28:33 simon Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060328: remove redundant rc.d script +OLD_FILES+=etc/rc.d/ike # 20060127: revert libdisk to static-only OLD_FILES+=usr/lib/libdisk.so # 20051215: rescue/nextboot.sh renamed to rescue/nextboot ==== //depot/projects/hammer/bin/sh/builtins.def#6 (text+ko) ==== @@ -32,17 +32,19 @@ # SUCH DAMAGE. # # @(#)builtins.def 8.4 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/builtins.def,v 1.18 2005/12/04 20:01:48 stefanf Exp $ +# $FreeBSD: src/bin/sh/builtins.def,v 1.19 2006/04/02 18:43:33 stefanf Exp $ # # This file lists all the builtin commands. The first column is the name -# of a C routine. The -j flag, if present, specifies that this command -# is to be excluded from systems without job control, and the -h flag, -# if present specifies that this command is to be excluded from systems -# based on the NO_HISTORY compile-time symbol. The rest of the line -# specifies the command name or names used to run the command. The entry -# for bltincmd, which is run when the user does not specify a command, must -# come first. +# of a C routine. +# The -j flag specifies that this command is to be excluded from systems +# without job control. +# The -h flag specifies that this command is to be excluded from systems +# based on the NO_HISTORY compile-time symbol. +# The -s flag specifies that this is a POSIX 'special built-in' command. +# The rest of the line specifies the command name or names used to run the +# command. The entry for bltincmd, which is run when the user does not specify +# a command, must come first. # # NOTE: bltincmd must come first! @@ -50,16 +52,16 @@ aliascmd alias bgcmd -j bg bindcmd bind -breakcmd break continue +breakcmd -s break -s continue cdcmd cd chdir commandcmd command -dotcmd . +dotcmd -s . echocmd echo -evalcmd eval -execcmd exec -exitcmd exit +evalcmd -s eval +execcmd -s exec +exitcmd -s exit expcmd exp let -exportcmd export readonly +exportcmd -s export -s readonly #exprcmd expr falsecmd false fgcmd -j fg @@ -72,18 +74,18 @@ #printfcmd printf pwdcmd pwd readcmd read -returncmd return -setcmd set +returncmd -s return +setcmd -s set setvarcmd setvar -shiftcmd shift +shiftcmd -s shift testcmd test [ -timescmd times -trapcmd trap -truecmd : true +timescmd -s times +trapcmd -s trap +truecmd -s : true typecmd type ulimitcmd ulimit umaskcmd umask unaliascmd unalias -unsetcmd unset +unsetcmd -s unset waitcmd wait wordexpcmd wordexp ==== //depot/projects/hammer/bin/sh/main.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.27 2006/02/04 14:47:19 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.28 2006/04/02 18:51:32 stefanf Exp $"); #include #include @@ -316,19 +316,21 @@ dotcmd(int argc, char **argv) { struct strlist *sp; + char *fullname; + + if (argc < 2) + error("missing filename"); + exitstatus = 0; for (sp = cmdenviron; sp ; sp = sp->next) setvareq(savestr(sp->text), VSTRFIXED|VTEXTFIXED); - if (argc >= 2) { /* That's what SVR2 does */ - char *fullname = find_dot_file(argv[1]); - - setinputfile(fullname, 1); - commandname = fullname; - cmdloop(0); - popfile(); - } + fullname = find_dot_file(argv[1]); + setinputfile(fullname, 1); + commandname = fullname; + cmdloop(0); + popfile(); return exitstatus; } ==== //depot/projects/hammer/bin/sh/mkbuiltins#7 (text+ko) ==== @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/mkbuiltins,v 1.15 2005/08/13 08:09:22 stefanf Exp $ +# $FreeBSD: src/bin/sh/mkbuiltins,v 1.16 2006/04/02 18:43:33 stefanf Exp $ temp=`/usr/bin/mktemp -t ka` havejobs=0 @@ -66,9 +66,14 @@ const struct builtincmd builtincmd[] = {' awk '{ for (i = 2 ; i <= NF ; i++) { - printf "\t{ \"%s\", %d },\n", $i, NR-1 + if ($i == "-s") { + spc = 1; + } else { + printf "\t{ \"%s\", %d, %d },\n", $i, NR-1, spc + spc = 0; + } }}' $temp -echo ' { NULL, 0 } +echo ' { NULL, 0, 0 } };' exec > ${objdir}/builtins.h @@ -85,6 +90,7 @@ struct builtincmd { char *name; int code; + int special; }; extern int (*const builtinfunc[])(int, char **); ==== //depot/projects/hammer/contrib/hostapd/config.c#4 (text+ko) ==== @@ -29,6 +29,7 @@ #include "sha1.h" #include "eap.h" #include "radius_client.h" +#include "ieee802_1x.h" /* XXX for EAPOL_VERSION */ static struct hostapd_config *hostapd_config_defaults(void) @@ -60,6 +61,7 @@ conf->logger_stdout = (unsigned int) -1; conf->auth_algs = HOSTAPD_AUTH_OPEN | HOSTAPD_AUTH_SHARED_KEY; + conf->eapol_version = EAPOL_VERSION; /* NB: default version */ conf->wpa_group_rekey = 600; conf->wpa_gmk_rekey = 86400; @@ -855,6 +857,17 @@ } } else if (strcmp(buf, "eapol_key_index_workaround") == 0) { conf->eapol_key_index_workaround = atoi(pos); + } else if (strcmp(buf, "eapol_version") == 0) { + conf->eapol_version = atoi(pos); + if (conf->eapol_version < 1 || + conf->eapol_version > 2) { + printf("Line %d: invalid EAPOL " + "version (%d): '%s'.\n", + line, conf->eapol_version, pos); + errors++; + } else + wpa_printf(MSG_DEBUG, "eapol_version=%d", + conf->eapol_version); #ifdef CONFIG_IAPP } else if (strcmp(buf, "iapp_interface") == 0) { conf->ieee802_11f = 1; ==== //depot/projects/hammer/contrib/hostapd/config.h#3 (text+ko) ==== @@ -73,6 +73,7 @@ * EAP Request-Identity */ size_t eap_req_id_text_len; int eapol_key_index_workaround; + int eapol_version; size_t default_wep_key_len; int individual_wep_key_len; ==== //depot/projects/hammer/contrib/hostapd/hostapd.conf#3 (text+ko) ==== @@ -106,6 +106,14 @@ # Require IEEE 802.1X authorization #ieee8021x=1 +# IEEE 802.1X/EAPOL version +# hostapd is implemented based on IEEE Std 802.1X-2004 which defines EAPOL +# version 2. However, there are some clients that do not handle +# the new version number correctly (they seem to drop the frames completely). +# In order to make hostapd interoperate with these clients, the version number +# can be set to the older version (1) with this configuration value. +#eapol_version=2 + # Optional displayable message sent with EAP Request-Identity. The first \0 # in this string will be converted to ASCII-0 (nul). This can be used to # separate network info (comma separated list of attribute=value pairs); see, ==== //depot/projects/hammer/contrib/libreadline/CHANGELOG#4 (text+ko) ==== @@ -808,3 +808,113 @@ - new example from Harold Levy that wraps fgets replacement functions that call readline in a shared library that can be interposed with LD_PRELOAD + + 7/27 + ---- +[readline-5.0 released] + + 11/15 + ----- +examples/rlfe/{ChangeLog,Makefile.in,README,config.h.in,configure,configure.in,extern.h,os.h,pty.c,rlfe.c,screen.h} + - new version of rlfe, rlfe-0.4, from Per Bothner; now a standalone + application + + 11/16 + ----- +shlib/Makefile.in + - substitute TERMCAP_LIB in from configure + +configure.in + - if SHLIB_LIBS doesn't include a termcap library (curses, ncurses, + termcap, termlib), append the value of $TERMCAP_LIB to it + + 11/30 + ----- +configure.in + - take out change from 11/16; it doesn't work for some systems (e.g., + SunOS 4.x and Solaris 2.6) + - add support for --enable-purify configure argument + - pass TERMCAP_LIB in environment when calling shobj-conf + +examples/Makefile.in + - add support for building examples with purify + + 1/23/2005 + --------- +configure.in + - set BUILD_DIR to contain backslashes to escape any spaces in the + directory name -- this is what make will accept in targets and + prerequisites, so it's better than trying to use double quotes + + 2/25 + ---- +configure.in + - change check for sys/ptem.h to include sys/stream.h if present, to + avoid the `present but cannot be compiled' messages on Solaris and + SVR4.2 (does anyone still use SVR4.2?) + + 5/7 + --- +configure.in + - add cross-compiling support from the bash configure.in, which cygwin + and mingw have apparently adopted + - add check for pwd.h, fcntl.h + - add checks for fcntl, kill system calls + - add checks for getpw{ent,nam,uid} C library functions + - pass a compile-time option through to Makefiles if cross-compiling + +config.h.in + - add HAVE_PWD_H for , HAVE_FCNTL_H for + - add HAVE_FCNTL, HAVE_KILL for respective system calls + - add HAVE_GETPW{ENT,NAM,UID} for passwd functions + +Makefile.in,shlib/Makefile.in + - @CROSS_COMPILE@ is substituted into DEFS (equal to -DCROSS_COMPILING + if bash is being cross-compiled) + + 8/2 + --- +examples/Makefile.in + - use $(READLINE_LIB) instead of -lreadline to get around MacOS X 10.4's + preference for (incompatible) shared libraries over static libraries + in the load path + + 8/11 + ---- +support/shobj-conf + - new variable: SHLIB_LIBPREF, prefix for shared library name (defaults + to `lib' + - new variable: SHLIB_DLLVERSION, used on Cygwin to set the library + version number + - new variable: SHLIB_DOT, separator character between library name and + suffix and version information (defaults to `.') + - new stanza for cygwin to generate windows-compatible dll + +support/shlib-install + - add new option `-b bindir' for systems like cygwin/windows that + require it + - new stanza for cygwin that installs a dll into $bindir and an implied + link library into $libdir + +configure.in + - substitute new variables from shobj-conf + +shlib/Makefile.in + - substitute bindir, SHLIB_DOT, SHLIB_LIBPREF, SHLIB_DLLVERSION from + configure + - pass `-b $(bindir)' to shlib-install for install and uninstall targets + - library names now use $SHLIB_LIBPREF and $SHLIB_DOT + +INSTALL,README + - document new SHLIB_DOT, SHLIB_LIBPREF, and SHLIB_DLLVERSION variables + + 10/4 + ---- +[readline-5.1-beta1 frozen] + + 12/1 + ---- +configure.in + - changed release status to `release' + +[readline-5.1 frozen] ==== //depot/projects/hammer/contrib/libreadline/CHANGES#4 (text+ko) ==== @@ -1,3 +1,132 @@ +This document details the changes between this version, readline-5.1, +and the previous version, readline-5.0. + +1. Changes to Readline + +a. Fixed a bug that caused multiliine prompts to be wrapped and displayed + incorrectly. + +b. Fixed a bug that caused ^P/^N in emacs mode to fail to display the current + line correctly. + +c. Fixed a problem in computing the number of invisible characters on the first + line of a prompt whose length exceeds the screen width. + +d. Fixed vi-mode searching so that failure preserves the current line rather + than the last line in the history list. + +e. Fixed the vi-mode `~' command (change-case) to have the correct behavior at + end-of-line when manipulating multibyte characters. + +f. Fixed the vi-mode `r' command (change-char) to have the correct behavior at + end-of-line when manipulating multibyte characters. + +g. Fixed multiple bugs in the redisplay of multibyte characters: displaying + prompts longer than the screen width containing multibyte characters, + +h. Fix the calculation of the number of physical characters in the prompt + string when it contains multibyte characters. + +i. A non-zero value for the `rl_complete_suppress_append' variable now causes + no `/' to be appended to a directory name. + +j. Fixed forward-word and backward-word to work when words contained + multibyte characters. + +k. Fixed a bug in finding the delimiter of a `?' substring when performing + history expansion in a locale that supports multibyte characters. + +l. Fixed a memory leak caused by not freeing the timestamp in a history entry. + +m. Fixed a bug that caused "\M-x" style key bindings to not obey the setting + of the `convert-meta' variable. + +n. Fixed saving and restoring primary prompt when prompting for incremental + and non-incremental searches; search prompts now display multibyte + characters correctly. + +o. Fixed a bug that caused keys originally bound to self-insert but shadowed + by a multi-character key sequence to not be inserted. + +p. Fixed code so rl_prep_term_function and rl_deprep_term_function aren't + dereferenced if NULL (matching the documentation). + +q. Extensive changes to readline to add enough state so that commands + requiring additional characters (searches, multi-key sequences, numeric + arguments, commands requiring an additional specifier character like + vi-mode change-char, etc.) work without synchronously waiting for + additional input. + +r. Lots of changes so readline builds and runs on MinGW. + +s. Readline no longer tries to modify the terminal settings when running in + callback mode. + +t. The Readline display code no longer sets the location of the last invisible + character in the prompt if the \[\] sequence is empty. + +u. The `change-case' command now correctly changes the case of multibyte + characters. + +v. Changes to the shared library construction scripts to deal with Windows + DLL naming conventions for Cygwin. + +w. Fixed the redisplay code to avoid core dumps resulting from a poorly-timed + SIGWINCH. + +x. Fixed the non-incremental search code in vi mode to dispose of any current + undo list when copying a line from the history into the current editing + buffer. + +y. Fixed a bug that caused reversing the incremental search direction to + not work correctly. + +z. Fixed the vi-mode `U' command to only undo up to the first time insert mode + was entered, as Posix specifies. + +aa. Fixed a bug in the vi-mode `r' command that left the cursor in the wrong + place. + +bb. Fixed a redisplay bug caused by moving the cursor vertically to a line + with invisible characters in the prompt in a multibyte locale. + +cc. Fixed a bug that could cause the terminal special chars to be bound in the + wrong keymap in vi mode. + +2. New Features in Readline + +a. The key sequence sent by the keypad `delete' key is now automatically + bound to delete-char. + +b. A negative argument to menu-complete now cycles backward through the + completion list. + +c. A new bindable readline variable: bind-tty-special-chars. If non-zero, + readline will bind the terminal special characters to their readline + equivalents when it's called (on by default). + +d. New bindable command: vi-rubout. Saves deleted text for possible + reinsertion, as with any vi-mode `text modification' command; `X' is bound + to this in vi command mode. + +e. If the rl_completion_query_items is set to a value < 0, readline never + asks the user whether or not to view the possible completions. + +f. The `C-w' binding in incremental search now understands multibyte + characters. + +g. New application-callable auxiliary function, rl_variable_value, returns + a string corresponding to a readline variable's value. + +h. When parsing inputrc files and variable binding commands, the parser + strips trailing whitespace from values assigned to boolean variables + before checking them. + +i. A new external application-controllable variable that allows the LINES >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 3 20:00: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 2A1F116A424; Mon, 3 Apr 2006 20:00:56 +0000 (UTC) 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 E9B9316A422 for ; Mon, 3 Apr 2006 20:00:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 025C943D82 for ; Mon, 3 Apr 2006 20:00:13 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k33K08Rj044970; Mon, 3 Apr 2006 16:00:09 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John-Mark Gurney Date: Mon, 3 Apr 2006 16:00:04 -0400 User-Agent: KMail/1.9.1 References: <200604030641.k336f6iG055021@repoman.freebsd.org> <200604031503.41288.jhb@freebsd.org> <20060403195251.GH53811@funkthat.com> In-Reply-To: <20060403195251.GH53811@funkthat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200604031600.06583.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1370/Mon Apr 3 13:31:59 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.9 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 94510 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, 03 Apr 2006 20:00:56 -0000 On Monday 03 April 2006 15:52, John-Mark Gurney wrote: > John Baldwin wrote this message on Mon, Apr 03, 2006 at 15:03 -0400: > > On Monday 03 April 2006 02:41, John-Mark Gurney wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=94510 > > > > > > Change 94510 by jmg@jmg_arlene on 2006/04/03 06:40:19 > > > > > > don't force the unit number to match the bus number, this breaks > > > machines with multiple pci domains... how the alpha worked with > > > this is beyond me (besides using custom pci bridge drivers?) > > > > Alpha has issues with hoses. That said, this might break some things. :( > > If nothing else, it makes it nearly impossible now for people to get the > > names of hints to override things like PCI routing via tunables correct. > > just a bit less impossible than booting a multi domain box.. > > > I would prefer a structured solution that preserved the status quo on > > machines w/o multiple domains. Maybe have the unit number be something > > like domain * X + bus number, where X is some arbitrary constant like > > 100 or 1000 (those are better for human parsing). > > Isn't this solved by something like wiring down unit numbers? Where when > you need to add a hint for interrupt routing you wire down the busses > as necessasry? Or maybe the fact that hints have to be wired, can't there > be some more descriptive hint that is better than depending upon hard > coded unit numbers? > > As we've gotten away from static allocation for things like this, we > now need to invent the next method for supporting hints in a dynamic > environment.. > > Topic for the dev summit: Static hints in a dynamic world? Not hints in the classic sense. But a tunable like this: hw.pci0.4.INTA.irq=26 Right now the user can see what to use for 'pci0' right now because it is the name of the pci device and it is deterministic (it doesn't change across reboots for the most part, esp. if you have systems with hot-plug pci that layout pci bus numbers sparsely). -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Apr 3 20:06: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 06B1016A428; Mon, 3 Apr 2006 20:06:27 +0000 (UTC) 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 9CA0916A41F for ; Mon, 3 Apr 2006 20:06:26 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A14343D45 for ; Mon, 3 Apr 2006 20:06:26 +0000 (GMT) (envelope-from peter@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 k33K6PbK046926 for ; Mon, 3 Apr 2006 20:06:26 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33K6Pai046923 for perforce@freebsd.org; Mon, 3 Apr 2006 20:06:25 GMT (envelope-from peter@freebsd.org) Date: Mon, 3 Apr 2006 20:06:25 GMT Message-Id: <200604032006.k33K6Pai046923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 94554 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, 03 Apr 2006 20:06:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=94554 Change 94554 by peter@peter_daintree on 2006/04/03 20:05:29 Reimplement alc@'s changes for soft-failing pv entry allocation in things like pmap_copy(). Add a 'try' arg to get_pv_entry() so that it will quietly fail (instead of panicing) and won't call pmap_collect() either. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#149 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#149 (text+ko) ==== @@ -205,7 +205,7 @@ static caddr_t crashdumpmap; static void free_pv_entry(pmap_t pmap, pv_entry_t pv); -static pv_entry_t get_pv_entry(pmap_t locked_pmap); +static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -1463,7 +1463,7 @@ static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; #ifdef PV_STATS -static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees; +static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_count, CTLFLAG_RD, &pc_chunk_count, 0, "Current number of pv entry chunks"); @@ -1471,6 +1471,8 @@ "Current number of pv entry chunks allocated"); SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_frees, CTLFLAG_RD, &pc_chunk_frees, 0, "Current number of pv entry chunks frees"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_tryfail, CTLFLAG_RD, &pc_chunk_tryfail, 0, + "Number of times tried to get a chunk page but failed."); static int pv_entry_frees, pv_entry_allocs, pv_entry_spare; @@ -1586,7 +1588,7 @@ * when needed. */ static pv_entry_t -get_pv_entry(pmap_t pmap) +get_pv_entry(pmap_t pmap, int try) { static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; @@ -1626,6 +1628,10 @@ /* No free items, allocate another chunk */ m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); if (m == NULL) { + if (try) { + PV_STAT(pc_chunk_tryfail++); + return (NULL); + } /* * Reclaim pv entries: At first, destroy mappings to inactive * pages. After that, if a pv chunk entry is still needed, @@ -1690,11 +1696,10 @@ { pv_entry_t pv; - pv = get_pv_entry(pmap); - pv->pv_va = va; - PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); + pv = get_pv_entry(pmap, FALSE); + pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; } @@ -1710,11 +1715,8 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (pv_entry_count < pv_entry_high_water && - (pv = uma_zalloc(pvzone, M_NOWAIT)) != NULL) { - pv_entry_count++; + (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; - pv->pv_pmap = pmap; - TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; return (TRUE); From owner-p4-projects@FreeBSD.ORG Mon Apr 3 21:04: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 A016616A420; Mon, 3 Apr 2006 21:04:39 +0000 (UTC) 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 6212016A400 for ; Mon, 3 Apr 2006 21:04:39 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEA1F43D5A for ; Mon, 3 Apr 2006 21:04:38 +0000 (GMT) (envelope-from peter@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 k33L4cKw060465 for ; Mon, 3 Apr 2006 21:04:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33L4cux060462 for perforce@freebsd.org; Mon, 3 Apr 2006 21:04:38 GMT (envelope-from peter@freebsd.org) Date: Mon, 3 Apr 2006 21:04:38 GMT Message-Id: <200604032104.k33L4cux060462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 94559 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, 03 Apr 2006 21:04:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=94559 Change 94559 by peter@peter_melody on 2006/04/03 21:04:11 IFC @94558 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#17 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#17 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#1 branch .. //depot/projects/hammer/usr.bin/find/find.1#17 integrate .. //depot/projects/hammer/usr.bin/find/find.h#3 integrate .. //depot/projects/hammer/usr.bin/find/function.c#9 integrate .. //depot/projects/hammer/usr.bin/find/option.c#8 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.31 2006/03/28 18:28:33 simon Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.32 2006/04/03 18:42:43 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -2877,3 +2877,4 @@ OLD_DIRS+=usr/share/doc/bind/misc OLD_DIRS+=usr/share/doc/bind/ +.include "tools/build/mk/OptionalObsoleteFiles.inc" ==== //depot/projects/hammer/sys/kern/subr_kdb.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.18 2006/04/03 17:48:09 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.19 2006/04/03 20:55:52 marcel Exp $"); #include "opt_kdb.h" @@ -453,10 +453,11 @@ int kdb_trap(int type, int code, struct trapframe *tf) { + register_t intr; #ifdef SMP int did_stop_cpus; #endif - int handled, intr; + int handled; if (kdb_dbbe == NULL || kdb_dbbe->dbbe_trap == NULL) return (0); ==== //depot/projects/hammer/usr.bin/find/find.1#17 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)find.1 8.7 (Berkeley) 5/9/95 -.\" $FreeBSD: src/usr.bin/find/find.1,v 1.73 2005/06/14 11:50:51 ru Exp $ +.\" $FreeBSD: src/usr.bin/find/find.1,v 1.74 2006/04/03 20:36:37 ceri Exp $ .\" .Dd April 2, 2005 .Dt FIND 1 @@ -174,6 +174,35 @@ .El .Sh PRIMARIES .Bl -tag -width indent +.It Ic -Bmin Ar n +True if the difference between the time of a file's inode creation +and the time +.Nm +was started, rounded up to the next full minute, is +.Ar n +minutes. +.It Ic -Bnewer Ar file +Same as +.Ic -newerBm . +.It Ic -Btime Ar n Ns Op Cm smhdw +If no units are specified, this primary evaluates to +true if the difference between the time of a file's inode creation +and the time +.Nm +was started, rounded up to the next full 24-hour period, is +.Ar n +24-hour periods. +.Pp +If units are specified, this primary evaluates to +true if the difference between the time of last change of file status +information and the time +.Nm +was started is exactly +.Ar n +units. +Please refer to the +.Ic -atime +primary description for information on supported time units. .It Ic -acl May be used in conjunction with other options to locate files with extended ACLs. @@ -497,12 +526,16 @@ .It Ic -newer Ns Ar X Ns Ar Y Ar file True if the current file has a more recent last access time .Ar ( X Ns = Ns Cm a ) , +inode creation time +.Ar ( X Ns = Ns Cm B ) , change time .Ar ( X Ns = Ns Cm c ) , or modification time .Ar ( X Ns = Ns Cm m ) than the last access time .Ar ( Y Ns = Ns Cm a ) , +inode creation time +.Ar ( Y Ns = Ns Cm B ) , change time .Ar ( Y Ns = Ns Cm c ) , or modification time ==== //depot/projects/hammer/usr.bin/find/find.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)find.h 8.1 (Berkeley) 6/6/93 - * $FreeBSD: src/usr.bin/find/find.h,v 1.17 2004/05/28 17:17:15 eik Exp $ + * $FreeBSD: src/usr.bin/find/find.h,v 1.18 2006/04/03 20:36:37 ceri Exp $ */ #include @@ -72,6 +72,8 @@ #define F_IGNCASE 0x00010000 /* iname ipath iregex */ #define F_EXACTTIME F_IGNCASE /* -[acm]time units syntax */ #define F_EXECPLUS 0x00020000 /* -exec ... {} + */ +#define F_TIME_B 0x00040000 /* one of -Btime, -Bnewer, -newerB* */ +#define F_TIME2_B 0x00080000 /* one of -newer?B */ /* node definition */ typedef struct _plandata { ==== //depot/projects/hammer/usr.bin/find/function.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.54 2005/08/25 13:44:02 roberto Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.55 2006/04/03 20:36:37 ceri Exp $"); #include #include @@ -234,10 +234,10 @@ } /* nextarg() */ /* - * The value of n for the inode times (atime, ctime, and mtime) is a range, - * i.e. n matches from (n - 1) to n 24 hour periods. This interacts with - * -n, such that "-mtime -1" would be less than 0 days, which isn't what the - * user wanted. Correct so that -1 is "less than 1". + * The value of n for the inode times (atime, birthtime, ctime, mtime) is a + * range, i.e. n matches from (n - 1) to n 24 hour periods. This interacts + * with -n, such that "-mtime -1" would be less than 0 days, which isn't what + * the user wanted. Correct so that -1 is "less than 1". */ #define TIME_CORRECT(p) \ if (((p)->flags & F_ELG_MASK) == F_LESSTHAN) \ @@ -248,6 +248,7 @@ * * True if the difference between the * file access time (-amin) + * file birth time (-Bmin) * last change of file status information (-cmin) * file modification time (-mmin) * and the current time is n min periods. @@ -261,6 +262,9 @@ } else if (plan->flags & F_TIME_A) { COMPARE((now - entry->fts_statp->st_atime + 60 - 1) / 60, plan->t_data); + } else if (plan->flags & F_TIME_B) { + COMPARE((now - entry->fts_statp->st_birthtime + + 60 - 1) / 60, plan->t_data); } else { COMPARE((now - entry->fts_statp->st_mtime + 60 - 1) / 60, plan->t_data); @@ -287,6 +291,7 @@ * * True if the difference between the * file access time (-atime) + * file birth time (-Btime) * last change of file status information (-ctime) * file modification time (-mtime) * and the current time is n 24 hour periods. @@ -299,6 +304,8 @@ if (plan->flags & F_TIME_A) xtime = entry->fts_statp->st_atime; + else if (plan->flags & F_TIME_B) + xtime = entry->fts_statp->st_birthtime; else if (plan->flags & F_TIME_C) xtime = entry->fts_statp->st_ctime; else @@ -1065,6 +1072,8 @@ return entry->fts_statp->st_ctime > plan->t_data; else if (plan->flags & F_TIME_A) return entry->fts_statp->st_atime > plan->t_data; + else if (plan->flags & F_TIME_B) + return entry->fts_statp->st_birthtime > plan->t_data; else return entry->fts_statp->st_mtime > plan->t_data; } ==== //depot/projects/hammer/usr.bin/find/option.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/find/option.c,v 1.23 2004/07/29 03:29:44 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/find/option.c,v 1.24 2006/04/03 20:36:37 ceri Exp $"); #include #include @@ -68,6 +68,9 @@ { "-and", c_and, NULL, 0 }, { "-anewer", c_newer, f_newer, F_TIME_A }, { "-atime", c_Xtime, f_Xtime, F_TIME_A }, + { "-Bmin", c_Xmin, f_Xmin, F_TIME_B }, + { "-Bnewer", c_newer, f_newer, F_TIME_B }, + { "-Btime", c_Xtime, f_Xtime, F_TIME_B }, { "-cmin", c_Xmin, f_Xmin, F_TIME_C }, { "-cnewer", c_newer, f_newer, F_TIME_C }, { "-ctime", c_Xtime, f_Xtime, F_TIME_C }, @@ -95,14 +98,22 @@ { "-name", c_name, f_name, 0 }, { "-newer", c_newer, f_newer, 0 }, { "-neweraa", c_newer, f_newer, F_TIME_A | F_TIME2_A }, + { "-neweraB", c_newer, f_newer, F_TIME_A | F_TIME2_B }, { "-newerac", c_newer, f_newer, F_TIME_A | F_TIME2_C }, { "-neweram", c_newer, f_newer, F_TIME_A }, { "-newerat", c_newer, f_newer, F_TIME_A | F_TIME2_T }, + { "-newerBa", c_newer, f_newer, F_TIME_B | F_TIME2_A }, + { "-newerBB", c_newer, f_newer, F_TIME_B | F_TIME2_B }, + { "-newerBc", c_newer, f_newer, F_TIME_B | F_TIME2_C }, + { "-newerBm", c_newer, f_newer, F_TIME_B }, + { "-newerBt", c_newer, f_newer, F_TIME_B | F_TIME2_T }, { "-newerca", c_newer, f_newer, F_TIME_C | F_TIME2_A }, + { "-newercB", c_newer, f_newer, F_TIME_C | F_TIME2_B }, { "-newercc", c_newer, f_newer, F_TIME_C | F_TIME2_C }, { "-newercm", c_newer, f_newer, F_TIME_C }, { "-newerct", c_newer, f_newer, F_TIME_C | F_TIME2_T }, { "-newerma", c_newer, f_newer, F_TIME2_A }, + { "-newermB", c_newer, f_newer, F_TIME2_B }, { "-newermc", c_newer, f_newer, F_TIME2_C }, { "-newermm", c_newer, f_newer, 0 }, { "-newermt", c_newer, f_newer, F_TIME2_T }, From owner-p4-projects@FreeBSD.ORG Mon Apr 3 21:45: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 D963A16A437; Mon, 3 Apr 2006 21:45:30 +0000 (UTC) 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 AC2C116A434 for ; Mon, 3 Apr 2006 21:45:30 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 566E943D49 for ; Mon, 3 Apr 2006 21:45:30 +0000 (GMT) (envelope-from peter@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 k33LjUx1064618 for ; Mon, 3 Apr 2006 21:45:30 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33LjUtQ064606 for perforce@freebsd.org; Mon, 3 Apr 2006 21:45:30 GMT (envelope-from peter@freebsd.org) Date: Mon, 3 Apr 2006 21:45:30 GMT Message-Id: <200604032145.k33LjUtQ064606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 94563 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, 03 Apr 2006 21:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=94563 Change 94563 by peter@peter_daintree on 2006/04/03 21:44:50 IFC @94562 Affected files ... .. //depot/projects/hammer/share/man/man9/pmap_remove.9#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#51 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#150 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#61 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#33 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#83 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#60 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mmu_if.m#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap_dispatch.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#45 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#41 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#20 integrate .. //depot/projects/hammer/sys/vm/pmap.h#25 integrate .. //depot/projects/hammer/usr.bin/find/find.1#18 integrate Differences ... ==== //depot/projects/hammer/share/man/man9/pmap_remove.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/pmap_remove.9,v 1.2 2004/07/06 07:02:31 ru Exp $ +.\" $FreeBSD: src/share/man/man9/pmap_remove.9,v 1.3 2006/04/03 21:17:36 peter Exp $ .\" .Dd July 21, 2003 .Dt PMAP_REMOVE 9 @@ -42,7 +42,7 @@ .Ft void .Fn pmap_remove_all "vm_page_t m" .Ft void -.Fn pmap_remove_pages "pmap_t pmap" "vm_offset_t sva" "vm_offset_t eva" +.Fn pmap_remove_pages "pmap_t pmap" .Sh DESCRIPTION The .Fn pmap_remove @@ -72,12 +72,8 @@ .Pp The .Fn pmap_remove_pages -function removes all pages from the physical map -.Fa pmap , -within the range of physical addresses bounded by -.Fa sva -and -.Fa eva . +function removes all user pages from the physical map +.Fa pmap . This function is called when a process exits to run down its address space more quickly than would be the case for calling .Fn pmap_remove . ==== //depot/projects/hammer/sys/alpha/alpha/pmap.c#51 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.188 2006/04/03 21:16:07 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#150 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.540 2006/04/02 05:45:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.542 2006/04/03 21:36:00 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/hammer/sys/amd64/include/pmap.h#61 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.129 2006/03/14 00:01:56 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.130 2006/04/03 21:36:01 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/hammer/sys/arm/arm/pmap.c#33 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.45 2006/03/26 22:03:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.46 2006/04/03 21:16:07 peter Exp $"); #include #include #include ==== //depot/projects/hammer/sys/i386/i386/pmap.c#83 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.547 2006/04/02 05:45:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.548 2006/04/03 21:16:07 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/hammer/sys/ia64/ia64/pmap.c#53 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.172 2005/11/20 06:09:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.173 2006/04/03 21:16:08 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/kern/kern_exec.c#63 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.290 2006/03/08 20:21:54 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.291 2006/04/03 21:16:08 peter Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" ==== //depot/projects/hammer/sys/kern/kern_exit.c#60 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.286 2006/03/14 04:00:21 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.287 2006/04/03 21:16:09 peter Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/hammer/sys/powerpc/powerpc/mmu_if.m#4 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.2 2005/11/20 06:09:49 alc Exp $ +# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.3 2006/04/03 21:16:09 peter Exp $ # #include ==== //depot/projects/hammer/sys/powerpc/powerpc/pmap_dispatch.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.3 2005/11/20 06:09:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.4 2006/04/03 21:16:09 peter Exp $"); /* * Dispatch MI pmap calls to the appropriate MMU implementation ==== //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#45 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.128 2006/03/28 20:28:31 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.129 2006/04/03 21:27:01 marius Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -464,14 +464,12 @@ int oonstack; u_long sp; int sig; - int code; oonstack = 0; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); sig = ksi->ksi_signo; - code = ksi->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); tf = td->td_frame; @@ -484,7 +482,7 @@ /* Make sure we have a signal trampoline to return to. */ if (p->p_md.md_sigtramp == NULL) { /* - * No signal tramoline... kill the process. + * No signal trampoline... kill the process. */ CTR0(KTR_SIG, "sendsig: no sigtramp"); printf("sendsig: %s is too old, rebuild it\n", p->p_comm); @@ -518,12 +516,20 @@ /* Build the argument list for the signal handler. */ tf->tf_out[0] = sig; - tf->tf_out[1] = (register_t)&sfp->sf_si; tf->tf_out[2] = (register_t)&sfp->sf_uc; tf->tf_out[4] = (register_t)catcher; - /* Fill siginfo structure. */ - sf.sf_si = ksi->ksi_info; - sf.sf_si.si_addr = (void *)tf->tf_sfar; /* XXX */ + if (SIGISMEMBER(psp->ps_siginfo, sig)) { + /* Signal handler installed with SA_SIGINFO. */ + tf->tf_out[1] = (register_t)&sfp->sf_si; + + /* Fill in POSIX parts. */ + sf.sf_si = ksi->ksi_info; + sf.sf_si.si_signo = sig; /* maybe a translated signal */ + } else { + /* Old FreeBSD-style arguments. */ + tf->tf_out[1] = ksi->ksi_code; + tf->tf_out[3] = (register_t)ksi->ksi_addr; + } /* Copy the sigframe out to the user's stack. */ if (rwindow_save(td) != 0 || copyout(&sf, sfp, sizeof(*sfp)) != 0 || ==== //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#41 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.152 2006/01/01 22:52:21 scottl Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.153 2006/04/03 21:16:09 peter Exp $ */ /* ==== //depot/projects/hammer/sys/sparc64/sparc64/trap.c#20 (text+ko) ==== @@ -37,9 +37,11 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19 - * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.79 2006/02/28 21:25:00 brueffer Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.80 2006/04/03 21:27:01 marius Exp $"); + #include "opt_ddb.h" #include "opt_ktr.h" #include "opt_ktrace.h" @@ -165,7 +167,7 @@ "kernel stack fault", }; -const int trap_sig[] = { +static const int trap_sig[] = { SIGILL, /* reserved */ SIGILL, /* instruction access exception */ SIGILL, /* instruction access error */ @@ -233,6 +235,7 @@ struct proc *p; int error; int sig; + register_t addr; ksiginfo_t ksi; td = PCPU_GET(curthread); @@ -250,12 +253,15 @@ p = td->td_proc; td->td_pticks = 0; td->td_frame = tf; + addr = tf->tf_tpc; if (td->td_ucred != p->p_ucred) cred_update_thread(td); switch (tf->tf_type) { case T_DATA_MISS: case T_DATA_PROTECTION: + addr = tf->tf_sfar; + /* FALLTHROUGH */ case T_INSTRUCTION_MISS: sig = trap_pfault(td, tf); break; @@ -288,7 +294,7 @@ ksiginfo_init_trap(&ksi); ksi.ksi_signo = sig; ksi.ksi_code = (int)tf->tf_type; /* XXX not POSIX */ - /* ksi.ksi_addr = ? */ + ksi.ksi_addr = (void *)addr; ksi.ksi_trapno = (int)tf->tf_type; trapsignal(td, &ksi); } ==== //depot/projects/hammer/sys/vm/pmap.h#25 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/pmap.h,v 1.74 2005/11/20 06:09:49 alc Exp $ + * $FreeBSD: src/sys/vm/pmap.h,v 1.75 2006/04/03 21:16:10 peter Exp $ */ /* ==== //depot/projects/hammer/usr.bin/find/find.1#18 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)find.1 8.7 (Berkeley) 5/9/95 -.\" $FreeBSD: src/usr.bin/find/find.1,v 1.74 2006/04/03 20:36:37 ceri Exp $ +.\" $FreeBSD: src/usr.bin/find/find.1,v 1.75 2006/04/03 20:53:34 ceri Exp $ .\" -.Dd April 2, 2005 +.Dd April 3, 2006 .Dt FIND 1 .Os .Sh NAME From owner-p4-projects@FreeBSD.ORG Mon Apr 3 22:02:14 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 2F99416A424; Mon, 3 Apr 2006 22:02:14 +0000 (UTC) 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 E86BC16A420 for ; Mon, 3 Apr 2006 22:02:13 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFB6943D4C for ; Mon, 3 Apr 2006 22:02:12 +0000 (GMT) (envelope-from peter@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 k33M2Clj065409 for ; Mon, 3 Apr 2006 22:02:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k33M2CJv065406 for perforce@freebsd.org; Mon, 3 Apr 2006 22:02:12 GMT (envelope-from peter@freebsd.org) Date: Mon, 3 Apr 2006 22:02:12 GMT Message-Id: <200604032202.k33M2CJv065406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 94564 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, 03 Apr 2006 22:02:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=94564 Change 94564 by peter@peter_daintree on 2006/04/03 22:01:11 Workaround opteron/athlon64 cpu errata Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/support.S#34 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/support.S#34 (text+ko) ==== @@ -627,6 +627,7 @@ load_gs_load: movl %edi,%gs swapgs + mfence /* CPU errata */ popfq ret From owner-p4-projects@FreeBSD.ORG Mon Apr 3 22:16: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 E330D16A424; Mon, 3 Apr 2006 22:16:25 +0000 (UTC) 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 B084516A41F; Mon, 3 Apr 2006 22:16:25 +0000 (UTC) (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 5131143D48; Mon, 3 Apr 2006 22:16:25 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [IPv6:::1] (may be forged)) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k33MG8et023580; Mon, 3 Apr 2006 16:16:08 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 03 Apr 2006 16:16:08 -0600 (MDT) Message-Id: <20060403.161608.112602678.imp@bsdimp.com> To: gurney_j@resnet.uoregon.edu From: Warner Losh In-Reply-To: <20060403195251.GH53811@funkthat.com> References: <200604030641.k336f6iG055021@repoman.freebsd.org> <200604031503.41288.jhb@freebsd.org> <20060403195251.GH53811@funkthat.com> 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 Cc: perforce@freebsd.org, jhb@freebsd.org Subject: Re: PERFORCE change 94510 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, 03 Apr 2006 22:16:26 -0000 > Isn't this solved by something like wiring down unit numbers? PCI provides no way to wire down unit numbers. > Where when > you need to add a hint for interrupt routing you wire down the busses > as necessasry? Or maybe the fact that hints have to be wired, can't there > be some more descriptive hint that is better than depending upon hard > coded unit numbers? Maybe that would be better, but we should have something in place before we break it. > As we've gotten away from static allocation for things like this, we > now need to invent the next method for supporting hints in a dynamic > environment.. > > Topic for the dev summit: Static hints in a dynamic world? Heh. Warner From owner-p4-projects@FreeBSD.ORG Mon Apr 3 22:16: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 DA60216A51C; Mon, 3 Apr 2006 22:16:27 +0000 (UTC) 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 B368B16A50C; Mon, 3 Apr 2006 22:16:27 +0000 (UTC) (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 4BCAD43D46; Mon, 3 Apr 2006 22:16:27 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [IPv6:::1] (may be forged)) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k33MEkmn023575; Mon, 3 Apr 2006 16:14:46 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 03 Apr 2006 16:14:46 -0600 (MDT) Message-Id: <20060403.161446.78731312.imp@bsdimp.com> To: jhb@freebsd.org From: Warner Losh In-Reply-To: <200604031503.41288.jhb@freebsd.org> References: <200604030641.k336f6iG055021@repoman.freebsd.org> <200604031503.41288.jhb@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 Cc: jmg@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 94510 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, 03 Apr 2006 22:16:28 -0000 From: John Baldwin Subject: Re: PERFORCE change 94510 for review Date: Mon, 3 Apr 2006 15:03:40 -0400 > On Monday 03 April 2006 02:41, John-Mark Gurney wrote: > > http://perforce.freebsd.org/chv.cgi?CH=94510 > > > > Change 94510 by jmg@jmg_arlene on 2006/04/03 06:40:19 > > > > don't force the unit number to match the bus number, this breaks > > machines with multiple pci domains... how the alpha worked with > > this is beyond me (besides using custom pci bridge drivers?) > > Alpha has issues with hoses. That said, this might break some things. :( > If nothing else, it makes it nearly impossible now for people to get the > names of hints to override things like PCI routing via tunables correct. > I would prefer a structured solution that preserved the status quo on > machines w/o multiple domains. Maybe have the unit number be something > like domain * X + bus number, where X is some arbitrary constant like > 100 or 1000 (those are better for human parsing). We override the pci unit number to act as a bus number in passing data into the kernel for pciconf. Warner From owner-p4-projects@FreeBSD.ORG Tue Apr 4 01:07:03 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 C4C1316A423; Tue, 4 Apr 2006 01:07:03 +0000 (UTC) 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 8530616A420 for ; Tue, 4 Apr 2006 01:07:03 +0000 (UTC) (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 16B9543D66 for ; Tue, 4 Apr 2006 01:06:58 +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 k3416wLa085212 for ; Tue, 4 Apr 2006 01:06:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3416wpG085209 for perforce@freebsd.org; Tue, 4 Apr 2006 01:06:58 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 4 Apr 2006 01:06:58 GMT Message-Id: <200604040106.k3416wpG085209@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 94570 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, 04 Apr 2006 01:07:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=94570 Change 94570 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/04 01:06:54 fix MP intrq initialization Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_locore.S#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_machdep.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#9 (text+ko) ==== @@ -71,7 +71,7 @@ #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed # To make an SMP kernel, the next line is needed -#options SMP # Symmetric MultiProcessor Kernel +options SMP # Symmetric MultiProcessor Kernel # Standard busses device pci ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#6 (text+ko) ==== @@ -417,34 +417,31 @@ uint64_t error; - pcpup->pc_mondo_data = mondo_data_array + curcpu*INTR_REPORT_SIZE; + pcpup->pc_mondo_data = (vm_offset_t *) ((char *)mondo_data_array + curcpu*INTR_REPORT_SIZE); pcpup->pc_mondo_data_ra = vtophys(pcpup->pc_mondo_data); - - pcpup->pc_cpu_list = cpu_list_array + curcpu*cpu_list_size; - pcpup->pc_cpu_list_ra = vtophys(pcpup->pc_cpu_list); - - pcpup->pc_cpu_q = cpu_q_array + curcpu*INTR_CPU_Q_SIZE; + pcpup->pc_cpu_q = (vm_offset_t *)((char *)cpu_q_array + curcpu*INTR_CPU_Q_SIZE); pcpup->pc_cpu_q_ra = vtophys(pcpup->pc_cpu_q); pcpup->pc_cpu_q_size = INTR_CPU_Q_SIZE; - pcpup->pc_dev_q = dev_q_array + curcpu*INTR_DEV_Q_SIZE; + pcpup->pc_dev_q = (vm_offset_t *)((char *)dev_q_array + curcpu*INTR_DEV_Q_SIZE); pcpup->pc_dev_q_ra = vtophys(pcpup->pc_dev_q); pcpup->pc_dev_q_size = INTR_DEV_Q_SIZE; - pcpup->pc_rq = rq_array + curcpu*2*CPU_RQ_SIZE; + pcpup->pc_rq = (vm_offset_t *)((char *)rq_array + curcpu*2*CPU_RQ_SIZE); pcpup->pc_rq_ra = vtophys(pcpup->pc_rq); pcpup->pc_rq_size = CPU_RQ_SIZE; - pcpup->pc_nrq = nrq_array + curcpu*2*CPU_NRQ_SIZE; + pcpup->pc_nrq = (vm_offset_t *)((char *)nrq_array + curcpu*2*CPU_NRQ_SIZE); 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); + panic("cpu_mondo queue configuration failed: %lu va=%p ra=0x%lx", error, + pcpup->pc_cpu_q, pcpup->pc_cpu_q_ra); error = hv_cpu_qconf(Q(DEV_MONDO_QUEUE_HEAD), pcpup->pc_dev_q_ra, dev_q_entries); if (error != H_EOK) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_locore.S#3 (text+ko) ==== @@ -139,19 +139,15 @@ bne %xcc, 2b nop - PUTCHAR(0x2e) /* * Get onto our per-cpu panic stack, which precedes the struct pcpu * in the per-cpu page. */ ldx [%l0 + CSA_PCPU], %l1 - PUTCHAR(0x2e) set PCPU_PAGES * PAGE_SIZE - PC_SIZEOF, %l2 add %l1, %l2, %l1 sub %l1, SPOFF + CCFSZ, %sp - PUTCHAR(0x2e) wrpr %g0, PSTATE_KERNEL, %pstate - PUTCHAR(0x2e) #if KTR_COMPILE & KTR_SMP CATR(KTR_SMP, "_mp_start: bootstrap cpuid=%d mid=%d pcpu=%#lx data=%#lx sp=%#lx" ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_machdep.c#3 (text+ko) ==== @@ -275,7 +275,6 @@ u_int clock; int cpuid, bp_skipped; u_long s; - printf("cpu_mp_start\n"); mtx_init(&ipi_mtx, "ipi", NULL, MTX_SPIN); root = OF_peer(0); @@ -318,7 +317,7 @@ pc->pc_node = child; all_cpus |= 1 << cpuid; - if (mp_ncpus == 8) + if (mp_ncpus == MAXCPU) break; } PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid))); @@ -350,11 +349,11 @@ pc->pc_curpcb = pc->pc_curthread->td_pcb; pc->pc_curpmap = kernel_pmap; csa->csa_state = 0; -#if 1 - printf("unleashing cpuid=%d\n", pc->pc_cpuid); -#endif + csa->csa_pcpu = TLB_PHYS_TO_DIRECT(vtophys(pc->pc_addr)); + DELAY(300); + /* allow AP to run */ csa->csa_cpuid = pc->pc_cpuid; - csa->csa_pcpu = TLB_PHYS_TO_DIRECT(vtophys(pc->pc_addr)); + membar(Sync); s = intr_disable(); while (csa->csa_state != CPU_BOOTSTRAP) ; @@ -390,9 +389,9 @@ while (csa->csa_count != 0) ; #ifdef SIMULATOR + DELAY(300*PCPU_GET(cpuid)); +#else DELAY(300000*PCPU_GET(cpuid)); -#else - DELAY(300*PCPU_GET(cpuid)); #endif /* ok, now grab sched_lock and enter the scheduler */ #if 0 From owner-p4-projects@FreeBSD.ORG Tue Apr 4 01:22:19 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 6F89916A420; Tue, 4 Apr 2006 01:22:19 +0000 (UTC) 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 1A45516A400 for ; Tue, 4 Apr 2006 01:22:19 +0000 (UTC) (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 7E7E943D53 for ; Tue, 4 Apr 2006 01:22:18 +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 k341MISR085843 for ; Tue, 4 Apr 2006 01:22:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k341MI1E085840 for perforce@freebsd.org; Tue, 4 Apr 2006 01:22:18 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 4 Apr 2006 01:22:18 GMT Message-Id: <200604040122.k341MI1E085840@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 94573 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, 04 Apr 2006 01:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=94573 Change 94573 by kmacy@kmacy_storage:sun4v_work on 2006/04/04 01:22:05 local HV PCI support changes Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#18 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#18 (text+ko) ==== @@ -138,17 +138,24 @@ int br[2]; int n; + printf("hvpci_attach: dev_name=%s dev_type=%s\n", + ofw_bus_get_name(dev), ofw_bus_get_type(dev)); + node = ofw_bus_get_node(dev); + printf("hvpci_attach: %p, node: %#x\n", dev, node); if (node == -1) panic("%s: ofw_bus_get_node failed.", __func__); sc = device_get_softc(dev); - n = OF_getprop(node, "bus-range", (void *)br, sizeof br); + n = OF_getprop(node, "bus-range", &br[0], 8); + if (n == -1) panic("%s: could not get bus-range", __func__); - if (n != sizeof br) + if (n != sizeof(br)) panic("%s: broken bus-range (%d)", __func__, n); + sc->hs_busnum = br[0]; + #if 0 if (OF_getprop(node, "reg", &cell, sizeof cell) == -1) panic("%s: OF_getprop failed.", __func__); @@ -185,26 +192,37 @@ int width) { struct hvpci_softc *sc; - uint32_t data; - int r; - uint64_t ret; + uint32_t data = -1; + uint64_t r; + uint32_t ret; sc = device_get_softc(dev); r = hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, (pci_cfg_data_t *)&data); - printf("%d = read_config(%#lx, %#x, %d, %d) = %#x\n", r, - sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data); if (r == H_EOK) { switch (width) { case 1: ret = data & 0xff; +#if 0 + printf("%ld = read_config(%#lx, %#x, %d, %d) = %#x\n", r, + sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, ret); +#endif break; case 2: ret = data & 0xffff; +#if 0 + printf("%ld = read_config(%#lx, %#x, %d, %d) = %#x\n", r, + sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, ret); +#endif + break; case 4: ret = data; +#if 0 + printf("%ld = read_config(%#lx, %#x, %d, %d) = %#x\n", r, + sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, ret); +#endif break; default: ret = -1; @@ -225,24 +243,29 @@ uint32_t val, int width) { struct hvpci_softc *sc; - uint32_t data; + pci_cfg_data_t data = { 0 }; + uint64_t r; sc = device_get_softc(dev); switch (width) { case 1: - data = val; + data.qw = (uint8_t)val; break; case 2: - data = val & 0xffff; + data.qw = (uint16_t)(val & 0xffff); break; case 4: - data = val; + data.qw = (uint32_t)val; break; default: panic("unsupported width: %d", width); } - hvio_config_put(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, - width, (pci_cfg_data_t)data); + + r = hvio_config_put(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), + reg, width, (pci_cfg_data_t)data); + + if (r) + printf("put failed with: %ld\n", r); } #ifdef notyet From owner-p4-projects@FreeBSD.ORG Tue Apr 4 01:25: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 3367716A422; Tue, 4 Apr 2006 01:25:23 +0000 (UTC) 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 D22E616A41F for ; Tue, 4 Apr 2006 01:25:22 +0000 (UTC) (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 81C1F43D48 for ; Tue, 4 Apr 2006 01:25:22 +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 k341PMD8085964 for ; Tue, 4 Apr 2006 01:25:22 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k341PMla085961 for perforce@freebsd.org; Tue, 4 Apr 2006 01:25:22 GMT (envelope-from marcel@freebsd.org) Date: Tue, 4 Apr 2006 01:25:22 GMT Message-Id: <200604040125.k341PMla085961@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 94574 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, 04 Apr 2006 01:25:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=94574 Change 94574 by marcel@marcel_nfs on 2006/04/04 01:24:30 IFC @94572 Affected files ... .. //depot/projects/uart/alpha/alpha/pmap.c#18 integrate .. //depot/projects/uart/alpha/include/kdb.h#3 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#29 integrate .. //depot/projects/uart/amd64/include/kdb.h#3 integrate .. //depot/projects/uart/amd64/include/pmap.h#10 integrate .. //depot/projects/uart/arm/arm/pmap.c#13 integrate .. //depot/projects/uart/conf/options#26 integrate .. //depot/projects/uart/dev/ath/if_ath.c#25 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#20 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#30 integrate .. //depot/projects/uart/i386/i386/pmap.c#32 integrate .. //depot/projects/uart/i386/include/kdb.h#3 integrate .. //depot/projects/uart/ia64/ia64/interrupt.c#13 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#20 integrate .. //depot/projects/uart/ia64/include/kdb.h#3 integrate .. //depot/projects/uart/kern/kern_exec.c#17 integrate .. //depot/projects/uart/kern/kern_exit.c#14 integrate .. //depot/projects/uart/kern/subr_kdb.c#6 integrate .. //depot/projects/uart/modules/ath/Makefile#3 integrate .. //depot/projects/uart/netinet/in_pcb.c#13 integrate .. //depot/projects/uart/netinet/in_pcb.h#9 integrate .. //depot/projects/uart/netinet/ip_divert.c#11 integrate .. //depot/projects/uart/netinet/tcp_input.c#20 integrate .. //depot/projects/uart/netinet/tcp_subr.c#17 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/uart/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/uart/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/uart/sparc64/include/kdb.h#3 integrate .. //depot/projects/uart/sparc64/sparc64/machdep.c#16 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#11 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#17 integrate .. //depot/projects/uart/ufs/ufs/ufsmount.h#8 integrate .. //depot/projects/uart/vm/pmap.h#12 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/pmap.c#18 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.188 2006/04/03 21:16:07 peter Exp $"); #include #include @@ -2125,9 +2125,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2146,11 +2144,6 @@ pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else ==== //depot/projects/uart/alpha/include/kdb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.2 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.3 2006/04/03 22:51:46 marcel Exp $ */ #ifndef _MACHINE_KDB_H_ @@ -31,6 +31,8 @@ #include +#define KDB_STOPPEDPCB(pc) &stoppcbs[pc->pc_cpuid] + static __inline void kdb_cpu_clear_singlestep(void) { ==== //depot/projects/uart/amd64/amd64/pmap.c#29 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.540 2006/04/02 05:45:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.542 2006/04/03 21:36:00 peter Exp $"); /* * Manages physical address maps. @@ -158,6 +158,13 @@ #define PMAP_INLINE #endif +#define PV_STATS +#ifdef PV_STATS +#define PV_STAT(x) do { x ; } while (0) +#else +#define PV_STAT(x) do { } while (0) +#endif + struct pmap kernel_pmap_store; vm_paddr_t avail_start; /* PA of first available physical page */ @@ -182,7 +189,6 @@ /* * Data for the pv entry allocation mechanism */ -static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int shpgperproc = PMAP_SHPGPERPROC; @@ -198,8 +204,8 @@ */ static caddr_t crashdumpmap; -static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(pmap_t locked_pmap); +static void free_pv_entry(pmap_t pmap, pv_entry_t pv); +static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -511,7 +517,7 @@ PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); kernel_pmap->pm_active = -1; /* don't allow deactivation */ - TAILQ_INIT(&kernel_pmap->pm_pvlist); + TAILQ_INIT(&kernel_pmap->pm_pvchunk); nkpt = NKPT; /* @@ -571,8 +577,6 @@ * high water mark so that the system can recover from excessive * numbers of pv entries. */ - pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); @@ -1065,7 +1069,7 @@ PMAP_LOCK_INIT(pmap); pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + KPML4phys); pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1102,7 +1106,7 @@ pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | PG_V | PG_RW | PG_A | PG_M; pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1439,61 +1443,78 @@ * page management routines. ***************************************************/ -/* - * free the pv_entry back to the free list - */ -static PMAP_INLINE void -free_pv_entry(pv_entry_t pv) +CTASSERT(sizeof(struct pv_chunk) == PAGE_SIZE); +CTASSERT(_NPCM == 3); +CTASSERT(_NPCPV == 168); + +static __inline struct pv_chunk * +pv_to_chunk(pv_entry_t pv) { - pv_entry_count--; - uma_zfree(pvzone, pv); + + return (struct pv_chunk *)((uintptr_t)pv & ~(uintptr_t)PAGE_MASK); } +#define PV_PMAP(pv) (pv_to_chunk(pv)->pc_pmap) + +#define PC_FREE0 0xfffffffffffffffful +#define PC_FREE1 0xfffffffffffffffful +#define PC_FREE2 0x000000fffffffffful + +static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; + +#ifdef PV_STATS +static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_count, CTLFLAG_RD, &pc_chunk_count, 0, + "Current number of pv entry chunks"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_allocs, CTLFLAG_RD, &pc_chunk_allocs, 0, + "Current number of pv entry chunks allocated"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_frees, CTLFLAG_RD, &pc_chunk_frees, 0, + "Current number of pv entry chunks frees"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_tryfail, CTLFLAG_RD, &pc_chunk_tryfail, 0, + "Number of times tried to get a chunk page but failed."); + +static int pv_entry_frees, pv_entry_allocs, pv_entry_spare; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, + "Current number of pv entry frees"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, + "Current number of pv entry allocs"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_spare, CTLFLAG_RD, &pv_entry_spare, 0, + "Current number of spare pv entries"); + +static int pmap_collect_inactive, pmap_collect_active; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_inactive, CTLFLAG_RD, &pmap_collect_inactive, 0, + "Current number times pmap_collect called on inactive queue"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_active, CTLFLAG_RD, &pmap_collect_active, 0, + "Current number times pmap_collect called on active queue"); +#endif + /* - * get a new pv_entry, allocating a block from the system - * when needed. + * We are in a serious low memory condition. Resort to + * drastic measures to free some pages so we can allocate + * another pv entry chunk. This is normally called to + * unmap inactive pages, and if necessary, active pages. */ -static pv_entry_t -get_pv_entry(pmap_t locked_pmap) +static void +pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) { - static const struct timeval printinterval = { 60, 0 }; - static struct timeval lastprint; - struct vpgqueues *vpq; pd_entry_t ptepde; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t allocated_pv, next_pv, pv; + pv_entry_t next_pv, pv; vm_offset_t va; vm_page_t m; - PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - allocated_pv = uma_zalloc(pvzone, M_NOWAIT); - if (allocated_pv != NULL) { - pv_entry_count++; - if (pv_entry_count > pv_entry_high_water) - pagedaemon_wakeup(); - else - return (allocated_pv); - } - - /* - * Reclaim pv entries: At first, destroy mappings to inactive - * pages. After that, if a pv entry is still needed, destroy - * mappings to active pages. - */ - if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, consider " - "increasing sysctl vm.pmap.shpgperproc or " - "vm.pmap.pv_entry_max\n"); - vpq = &vm_page_queues[PQ_INACTIVE]; -retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; - pmap = pv->pv_pmap; + pmap = PV_PMAP(pv); /* Avoid deadlock and lock recursion. */ if (pmap > locked_pmap) PMAP_LOCK(pmap); @@ -1503,18 +1524,17 @@ pte = pmap_pte_pde(pmap, va, &ptepde); tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, - ("get_pv_entry: wired pte %#lx", tpte)); + ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (tpte & PG_M) { KASSERT((tpte & PG_RW), - ("get_pv_entry: modified page not writable: va: %#lx, pte: %#lx", + ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", va, tpte)); if (pmap_track_modified(va)) vm_page_dirty(m); } pmap_invalidate_page(pmap, va); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); @@ -1522,20 +1542,130 @@ pmap_unuse_pt(pmap, va, ptepde); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); - if (allocated_pv == NULL) - allocated_pv = pv; - else - free_pv_entry(pv); + free_pv_entry(locked_pmap, pv); + } + } +} + + +/* + * free the pv_entry back to the free list + */ +static void +free_pv_entry(pmap_t pmap, pv_entry_t pv) +{ + vm_page_t m; + struct pv_chunk *pc; + int idx, field, bit; + + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc = pv_to_chunk(pv); + idx = pv - &pc->pc_pventry[0]; + field = idx / 64; + bit = idx % 64; + pc->pc_map[field] |= 1ul << bit; + /* move to head of list */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || + pc->pc_map[2] != PC_FREE2) + return; + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); + /* entire chunk is free, return it */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); +} + +/* + * get a new pv_entry, allocating a block from the system + * when needed. + */ +static pv_entry_t +get_pv_entry(pmap_t pmap, int try) +{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + static vm_pindex_t colour; + int bit, field; + pv_entry_t pv; + struct pv_chunk *pc; + vm_page_t m; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PV_STAT(pv_entry_allocs++); + PV_STAT(pv_entry_count++); + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + pc = TAILQ_FIRST(&pmap->pm_pvchunk); + if (pc != NULL) { + for (field = 0; field < _NPCM; field++) { + if (pc->pc_map[field]) { + bit = bsfq(pc->pc_map[field]); + break; + } + } + if (field < _NPCM) { + pv = &pc->pc_pventry[field * 64 + bit]; + pc->pc_map[field] &= ~(1ul << bit); + /* If this was the last item, move it to tail */ + if (pc->pc_map[0] == 0 && pc->pc_map[1] == 0 && + pc->pc_map[2] == 0) { + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); + } + PV_STAT(pv_entry_spare--); + return (pv); } } - if (allocated_pv == NULL) { - if (vpq == &vm_page_queues[PQ_INACTIVE]) { - vpq = &vm_page_queues[PQ_ACTIVE]; - goto retry; + /* No free items, allocate another chunk */ + m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + if (try) { + PV_STAT(pc_chunk_tryfail++); + return (NULL); + } + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv chunk entry is still needed, + * destroy mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, consider " + "increasing sysctl vm.pmap.shpgperproc or " + "vm.pmap.pv_entry_max\n"); + PV_STAT(pmap_collect_inactive++); + pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + PV_STAT(pmap_collect_active++); + pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) + panic("get_pv_entry: increase vm.pmap.shpgperproc"); } - panic("get_pv_entry: increase the vm.pmap.shpgperproc tunable"); } - return (allocated_pv); + PV_STAT(pc_chunk_count++); + PV_STAT(pc_chunk_allocs++); + colour++; + pc = (void *)PHYS_TO_DMAP(m->phys_addr); + pc->pc_pmap = pmap; + pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ + pc->pc_map[1] = PC_FREE1; + pc->pc_map[2] = PC_FREE2; + pv = &pc->pc_pventry[0]; + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + PV_STAT(pv_entry_spare += _NPCPV - 1); + return (pv); } static void @@ -1545,24 +1675,16 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (m->md.pv_list_count < pmap->pm_stats.resident_count) { - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pmap == pv->pv_pmap && va == pv->pv_va) - break; - } - } else { - TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) { - if (va == pv->pv_va) - break; - } + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + if (pmap == PV_PMAP(pv) && va == pv->pv_va) + break; } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - free_pv_entry(pv); + free_pv_entry(pmap, pv); } /* @@ -1574,13 +1696,10 @@ { pv_entry_t pv; - pv = get_pv_entry(pmap); - pv->pv_va = va; - pv->pv_pmap = pmap; - PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); + pv = get_pv_entry(pmap, FALSE); + pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; } @@ -1596,11 +1715,8 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (pv_entry_count < pv_entry_high_water && - (pv = uma_zalloc(pvzone, M_NOWAIT)) != NULL) { - pv_entry_count++; + (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; - pv->pv_pmap = pmap; - TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; return (TRUE); @@ -1791,6 +1907,7 @@ pmap_remove_all(vm_page_t m) { register pv_entry_t pv; + pmap_t pmap; pt_entry_t *pte, tpte; pd_entry_t ptepde; @@ -1805,12 +1922,13 @@ #endif mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { - PMAP_LOCK(pv->pv_pmap); - pv->pv_pmap->pm_stats.resident_count--; - pte = pmap_pte_pde(pv->pv_pmap, pv->pv_va, &ptepde); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pmap->pm_stats.resident_count--; + pte = pmap_pte_pde(pmap, pv->pv_va, &ptepde); tpte = pte_load_clear(pte); if (tpte & PG_W) - pv->pv_pmap->pm_stats.wired_count--; + pmap->pm_stats.wired_count--; if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); @@ -1824,13 +1942,12 @@ if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + pmap_invalidate_page(pmap, pv->pv_va); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, ptepde); - PMAP_UNLOCK(pv->pv_pmap); - free_pv_entry(pv); + pmap_unuse_pt(pmap, pv->pv_va, ptepde); + PMAP_UNLOCK(pmap); + free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2584,7 +2701,7 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pv->pv_pmap == pmap) { + if (PV_PMAP(pv) == pmap) { return TRUE; } loops++; @@ -2594,7 +2711,6 @@ return (FALSE); } -#define PMAP_REMOVE_PAGES_CURPROC_ONLY /* * Remove all pages from specified address space * this aids process exit speeds. Also, this code @@ -2604,79 +2720,95 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; - pv_entry_t pv, npv; + pv_entry_t pv; + struct pv_chunk *pc, *npc; + int field, idx; + int64_t bit; + uint64_t inuse, bitmask; + int allfree; -#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) { printf("warning: pmap_remove_pages called with non-current pmap\n"); return; } -#endif vm_page_lock_queues(); PMAP_LOCK(pmap); - for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { + TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) { + allfree = 1; + for (field = 0; field < _NPCM; field++) { + inuse = (~(pc->pc_map[field])) & pc_freemask[field]; + while (inuse != 0) { + bit = bsfq(inuse); + bitmask = 1UL << bit; + idx = field * 64 + bit; + pv = &pc->pc_pventry[idx]; + inuse &= ~bitmask; - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } + pte = vtopte(pv->pv_va); + tpte = *pte; -#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY - pte = vtopte(pv->pv_va); -#else - pte = pmap_pte(pmap, pv->pv_va); -#endif - tpte = *pte; - - if (tpte == 0) { - printf("TPTE at %p IS ZERO @ VA %08lx\n", - pte, pv->pv_va); - panic("bad pte"); - } + if (tpte == 0) { + printf( + "TPTE at %p IS ZERO @ VA %08lx\n", + pte, pv->pv_va); + panic("bad pte"); + } /* * We cannot remove wired pages from a process' mapping at this time */ - if (tpte & PG_W) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } + if (tpte & PG_W) { + allfree = 0; + continue; + } + + m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); + KASSERT(m->phys_addr == (tpte & PG_FRAME), + ("vm_page_t %p phys_addr mismatch %016jx %016jx", + m, (uintmax_t)m->phys_addr, + (uintmax_t)tpte)); - m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); - KASSERT(m->phys_addr == (tpte & PG_FRAME), - ("vm_page_t %p phys_addr mismatch %016jx %016jx", - m, (uintmax_t)m->phys_addr, (uintmax_t)tpte)); + KASSERT(m < &vm_page_array[vm_page_array_size], + ("pmap_remove_pages: bad tpte %#jx", + (uintmax_t)tpte)); - KASSERT(m < &vm_page_array[vm_page_array_size], - ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); + pmap->pm_stats.resident_count--; - pmap->pm_stats.resident_count--; + pte_clear(pte); - pte_clear(pte); + /* + * Update the vm_page_t clean/reference bits. + */ + if (tpte & PG_M) + vm_page_dirty(m); - /* - * Update the vm_page_t clean and reference bits. - */ - if (tpte & PG_M) { - vm_page_dirty(m); + /* Mark free */ + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc->pc_map[field] |= bitmask; + m->md.pv_list_count--; + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + pmap_unuse_pt(pmap, pv->pv_va, + *vtopde(pv->pv_va)); + } + } + if (allfree) { + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); } - - npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - - m->md.pv_list_count--; - TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_EMPTY(&m->md.pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); - - pmap_unuse_pt(pmap, pv->pv_va, *vtopde(pv->pv_va)); - free_pv_entry(pv); } pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); @@ -2694,6 +2826,7 @@ { pv_entry_t pv; pt_entry_t *pte; + pmap_t pmap; boolean_t rv; rv = FALSE; @@ -2709,10 +2842,11 @@ */ if (!pmap_track_modified(pv->pv_va)) continue; - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); rv = (*pte & PG_M) != 0; - PMAP_UNLOCK(pv->pv_pmap); + PMAP_UNLOCK(pmap); if (rv) break; } @@ -2750,6 +2884,7 @@ pmap_clear_ptes(vm_page_t m, long bit) { register pv_entry_t pv; + pmap_t pmap; pt_entry_t pbits, *pte; if ((m->flags & PG_FICTITIOUS) || @@ -2770,8 +2905,9 @@ continue; } - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); retry: pbits = *pte; if (pbits & bit) { @@ -2785,9 +2921,9 @@ } else { atomic_clear_long(pte, bit); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pmap_invalidate_page(pmap, pv->pv_va); } - PMAP_UNLOCK(pv->pv_pmap); + PMAP_UNLOCK(pmap); } if (bit == PG_RW) vm_page_flag_clear(m, PG_WRITEABLE); @@ -2826,6 +2962,7 @@ pmap_ts_referenced(vm_page_t m) { register pv_entry_t pv, pvf, pvn; + pmap_t pmap; pt_entry_t *pte; pt_entry_t v; int rtval = 0; @@ -2848,20 +2985,21 @@ if (!pmap_track_modified(pv->pv_va)) continue; - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); if (pte && ((v = pte_load(pte)) & PG_A) != 0) { atomic_clear_long(pte, PG_A); - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pmap_invalidate_page(pmap, pv->pv_va); rtval++; if (rtval > 4) { - PMAP_UNLOCK(pv->pv_pmap); + PMAP_UNLOCK(pmap); break; } } - PMAP_UNLOCK(pv->pv_pmap); + PMAP_UNLOCK(pmap); } while ((pv = pvn) != NULL && pv != pvf); } ==== //depot/projects/uart/amd64/include/kdb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/kdb.h,v 1.2 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/kdb.h,v 1.3 2006/04/03 22:51:46 marcel Exp $ */ #ifndef _MACHINE_KDB_H_ @@ -32,6 +32,8 @@ #include #include +#define KDB_STOPPEDPCB(pc) &stoppcbs[pc->pc_cpuid] + static __inline void kdb_cpu_clear_singlestep(void) { ==== //depot/projects/uart/amd64/include/pmap.h#10 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.129 2006/03/14 00:01:56 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.130 2006/04/03 21:36:01 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -222,6 +222,7 @@ * Pmap stuff */ struct pv_entry; +struct pv_chunk; struct md_page { int pv_list_count; @@ -231,7 +232,7 @@ struct pmap { struct mtx pm_mtx; pml4_entry_t *pm_pml4; /* KVA of level 4 page table */ - TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ + TAILQ_HEAD(,pv_chunk) pm_pvchunk; /* list of mappings in pmap */ u_int pm_active; /* active on cpus */ /* spare u_int here due to padding */ struct pmap_statistics pm_stats; /* pmap statistics */ @@ -260,12 +261,24 @@ * mappings of that page. An entry is a pv_entry_t, the list is pv_table. */ typedef struct pv_entry { - pmap_t pv_pmap; /* pmap where mapping lies */ vm_offset_t pv_va; /* virtual address for mapping */ TAILQ_ENTRY(pv_entry) pv_list; - TAILQ_ENTRY(pv_entry) pv_plist; } *pv_entry_t; +/* + * pv_entries are allocated in chunks per-process. This avoids the + * need to track per-pmap assignments. + */ +#define _NPCM 3 +#define _NPCPV 168 +struct pv_chunk { + pmap_t pc_pmap; + TAILQ_ENTRY(pv_chunk) pc_list; + uint64_t pc_map[_NPCM]; /* bitmap; 1 = free */ + uint64_t pc_spare[2]; + struct pv_entry pc_pventry[_NPCPV]; +}; + #ifdef _KERNEL #define NPPROVMTRR 8 ==== //depot/projects/uart/arm/arm/pmap.c#13 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.45 2006/03/26 22:03:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.46 2006/04/03 21:16:07 peter Exp $"); #include #include #include @@ -2811,7 +2811,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +pmap_remove_pages(pmap_t pmap) { struct pv_entry *pv, *npv; struct l2_bucket *l2b = NULL; @@ -2820,10 +2820,6 @@ vm_page_lock_queues(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } if (pv->pv_flags & PVF_WIRED) { /* The page is wired, cannot remove it now. */ npv = TAILQ_NEXT(pv, pv_plist); ==== //depot/projects/uart/conf/options#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.532 2006/03/29 09:57:22 scottl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.533 2006/04/03 18:14:01 sam Exp $ # # On the handling of kernel options # @@ -688,6 +688,13 @@ KBD_RESETDELAY opt_kbd.h KBDIO_DEBUG opt_kbd.h +# options for the Atheros driver +ATH_DEBUG opt_ath.h +ATH_TXBUF opt_ath.h +ATH_RXBUF opt_ath.h +ATH_DIAGAPI opt_ath.h +ATH_TX99_DIAG opt_ath.h + # options for the Atheros HAL (only useful with source code) AH_SUPPORT_AR5210 opt_ah.h AH_SUPPORT_AR5211 opt_ah.h @@ -695,6 +702,7 @@ AH_SUPPORT_5111 opt_ah.h AH_SUPPORT_5112 opt_ah.h AH_SUPPORT_2413 opt_ah.h +AH_SUPPORT_5413 opt_ah.h AH_DEBUG opt_ah.h AH_DEBUG_ALQ opt_ah.h AH_ASSERT opt_ah.h ==== //depot/projects/uart/dev/ath/if_ath.c#25 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.137 2006/02/27 17:20:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.138 2006/04/03 18:14:02 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -45,6 +45,7 @@ */ #include "opt_inet.h" +#include "opt_ath.h" #include #include @@ -82,7 +83,6 @@ #include #endif -#define AR_DEBUG #include #include #include /* XXX for softled */ @@ -216,7 +216,7 @@ 0, "tx buffers allocated"); TUNABLE_INT("hw.ath.txbuf", &ath_txbuf); -#ifdef AR_DEBUG +#ifdef ATH_DEBUG static int ath_debug = 0; SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, 0, "control debugging printfs"); @@ -1316,7 +1316,7 @@ #undef IS_UP } -#ifdef AR_DEBUG +#ifdef ATH_DEBUG static void ath_keyprint(const char *tag, u_int ix, const HAL_KEYVAL *hk, const u_int8_t mac[IEEE80211_ADDR_LEN]) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 4 13:59: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 EAFC916A423; Tue, 4 Apr 2006 13:59:05 +0000 (UTC) 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 AD57116A401 for ; Tue, 4 Apr 2006 13:59:05 +0000 (UTC) (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 6093643D75 for ; Tue, 4 Apr 2006 13:59:03 +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 k34Dx3jr056667 for ; Tue, 4 Apr 2006 13:59:03 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 k34Dx3X0056664 for perforce@freebsd.org; Tue, 4 Apr 2006 13:59:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 4 Apr 2006 13:59:03 GMT Message-Id: <200604041359.k34Dx3X0056664@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 94601 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, 04 Apr 2006 13:59:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=94601 Change 94601 by rwatson@rwatson_zoo on 2006/04/04 13:58:04 Teach auditfilterd to parse BSM records and pass pre-parsed tokens as an array to registered filters, allowing us to avoid the cost of parsing the same BSM multiple times when multiple filters are registered. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#5 $ */ #include @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -49,8 +50,17 @@ #include "auditfilterd.h" +/* + * Global list of registered filters. + */ struct auditfilter_module_list filter_list; -int debug, reread_config, quit; + +/* + * Configuration and signal->main flags. + */ +int debug; /* Debugging mode requested, don't detach. */ +int reread_config; /* SIGHUP has been received. */ +int quit; /* SIGQUIT/TERM/INT has been received. */ static void usage(void) @@ -89,6 +99,9 @@ } } +/* + * Present raw BSM to a set of registered and interested filters. + */ static void present_bsmrecord(struct timespec *ts, u_char *data, u_int len) { @@ -100,25 +113,39 @@ } } +/* + * Parse the BSM into a set of tokens, which will be pased to registered + * and interested filters. + */ +#define MAX_TOKENS 128 /* Maximum tokens we handle per record. */ static void present_tokens(struct timespec *ts, u_char *data, u_int len) { struct auditfilter_module *am; + tokenstr_t tokens[MAX_TOKENS]; u_int bytesread; - tokenstr_t tok; + int tokencount; + tokencount = 0; while (bytesread < len) { - if (au_fetch_tok(&tok, data + bytesread, len - bytesread) - == -1) + if (au_fetch_tok(&tokens[tokencount], data + bytesread, + len - bytesread) == -1) break; - bytesread += tok.len; + bytesread += tokens[tokencount].len; + tokencount++; } + TAILQ_FOREACH(am, &filter_list, am_list) { if (am->am_record != NULL) - (am->am_record)(am->am_instance, ts, 0, NULL); + (am->am_record)(am->am_instance, ts, tokencount, + tokens); } } +/* + * The main loop spins pulling records out of the record source and passing + * them to modules for processing. + */ static void mainloop(const char *conffile, const char *trailfile, FILE *trail_fp) { @@ -172,10 +199,8 @@ int main(int argc, char *argv[]) { - const char *trailfile; - const char *conffile; - FILE *trail_fp; - FILE *conf_fp; + const char *trailfile, *conffile; + FILE *trail_fp, *conf_fp; int ch; conffile = AUDITFILTERD_CONFFILE; From owner-p4-projects@FreeBSD.ORG Tue Apr 4 15:06: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 8389E16A436; Tue, 4 Apr 2006 15:06:28 +0000 (UTC) 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 5AD8916A400 for ; Tue, 4 Apr 2006 15:06:28 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2F2F43D45 for ; Tue, 4 Apr 2006 15:06:27 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k34F6Rjb061850 for ; Tue, 4 Apr 2006 15:06:27 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34F6PVX061847 for perforce@freebsd.org; Tue, 4 Apr 2006 15:06:25 GMT (envelope-from gnn@neville-neil.com) Date: Tue, 4 Apr 2006 15:06:25 GMT Message-Id: <200604041506.k34F6PVX061847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 94604 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, 04 Apr 2006 15:06:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=94604 Change 94604 by gnn@gnn_devbox_fast_ipsec on 2006/04/04 15:05:52 Integrate from HEAD Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/clock.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/cpu.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_syscall.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysent.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/syscalls.master#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/bus.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/NOTES#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.alpha#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/pf_norm.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-fd.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/en/midway.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/md/md.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_disk.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_ioctl.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_pci.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfireg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfivar.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_reg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbbreg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_ebus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_ebus.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_macio.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_sbus.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bus.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_core.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_sab82532.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_z8530.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_if.m#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_ebus.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_scc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_powerpc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/umass.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gdb/gdb_cons.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gdb/gdb_int.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_io.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror_ctl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/isofs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_alq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_exit.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/md5c.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/serdev_if.m#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/Makefile#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ipfilter/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/linux/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/mfi/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/pf/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/scc/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridge.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_media.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_ppp.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_tap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/raw_cb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/route.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/rtsock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_aal5.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_proto.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_var.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/key_var.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keydb.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_tcp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/README#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_pcb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/spx_usrreq.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netkey/keysock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/fhc/clkbrd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/fhc/clkbrdreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/aio.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ata.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/buf.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/clock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/event.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/linker.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mbuf.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/md5.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mount.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/param.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/pmc.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/proc.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/protosw.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/serial.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/socketvar.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sx.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysproto.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/umtx.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_mmap.c#2 integrate Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/Makefile#3 (text+ko) ==== @@ -1,7 +1,9 @@ -# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $ +# $FreeBSD: src/sys/Makefile,v 1.35 2006/03/17 18:54:34 ru Exp $ + +.include # The boot loader -.if !defined(NO_BOOT) +.if ${MK_BOOT} != "no" .if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/clock.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.44 2006/03/07 22:12:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.45 2006/03/28 21:20:11 jhb Exp $"); #include "opt_clock.h" @@ -137,7 +137,6 @@ static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); -static uint64_t read_cycle_count(void); void clockattach(device_t dev) ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/cpu.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.43 2005/12/22 22:16:04 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.44 2006/03/28 21:20:12 jhb Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /*- @@ -88,11 +88,12 @@ #define cpu_getstack(td) (alpha_pal_rdusp()) #define cpu_spinwait() /* nothing */ -#define get_cyclecount alpha_rpcc +#define get_cyclecount() read_cycle_count() void cpu_halt(void); void cpu_reset(void); void fork_trampoline(void); /* MAGIC */ +uint64_t read_cycle_count(void); void swi_vm(void *); #endif /* _KERNEL */ ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_dummy.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.38 2004/03/29 02:19:43 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.39 2006/03/21 21:08:02 netchild Exp $"); #include #include @@ -72,11 +72,8 @@ DUMMY(pciconfig_read); DUMMY(pciconfig_write); DUMMY(pivot_root); -DUMMY(recvmsg); -DUMMY(sendmsg); DUMMY(sethae); DUMMY(sigaltstack); DUMMY(sigpending); -DUMMY(socketpair); DUMMY(utimes); ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_proto.h#3 (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.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 + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.27 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -170,6 +170,10 @@ struct linux_gethostname_args { register_t dummy; }; +struct linux_sethostname_args { + char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)]; + char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)]; +}; struct linux_getdtablesize_args { register_t dummy; }; @@ -199,10 +203,22 @@ char name_l_[PADL_(struct l_sockaddr *)]; struct l_sockaddr * name; char name_r_[PADR_(struct l_sockaddr *)]; char namelen_l_[PADL_(l_int)]; l_int namelen; char namelen_r_[PADR_(l_int)]; }; +struct linux_accept_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_accept_args *)]; struct linux_accept_args * args; char args_r_[PADR_(struct linux_accept_args *)]; +}; struct linux_getpriority_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; }; +struct linux_send_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_send_args *)]; struct linux_send_args * args; char args_r_[PADR_(struct linux_send_args *)]; +}; +struct linux_recv_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_recv_args *)]; struct linux_recv_args * args; char args_r_[PADR_(struct linux_recv_args *)]; +}; struct osf1_sigreturn_args { char sigcntxp_l_[PADL_(struct osigcontext *)]; struct osigcontext * sigcntxp; char sigcntxp_r_[PADR_(struct osigcontext *)]; }; @@ -223,6 +239,10 @@ char who_l_[PADL_(long)]; long who; char who_r_[PADR_(long)]; char rusage_l_[PADL_(void *)]; void * rusage; char rusage_r_[PADR_(void *)]; }; +struct linux_recvfrom_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_recvfrom_args *)]; struct linux_recvfrom_args * args; char args_r_[PADR_(struct linux_recvfrom_args *)]; +}; struct linux_rename_args { char from_l_[PADL_(char *)]; char * from; char from_r_[PADR_(char *)]; char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)]; @@ -231,6 +251,10 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)]; }; +struct linux_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)]; +}; struct osf1_sendto_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; @@ -249,6 +273,10 @@ struct linux_rmdir_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; }; +struct linux_getpeername_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_getpeername_args *)]; struct linux_getpeername_args * args; char args_r_[PADR_(struct linux_getpeername_args *)]; +}; struct linux_getrlimit_args { char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)]; char rlim_l_[PADL_(struct l_rlimit *)]; struct l_rlimit * rlim; char rlim_r_[PADR_(struct l_rlimit *)]; @@ -260,6 +288,10 @@ struct linux_quotactl_args { register_t dummy; }; +struct linux_getsockname_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_getsockname_args *)]; struct linux_getsockname_args * args; char args_r_[PADR_(struct linux_getsockname_args *)]; +}; struct osf1_sigaction_args { char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; char nsa_l_[PADL_(struct osf1_sigaction *)]; struct osf1_sigaction * nsa; char nsa_r_[PADR_(struct osf1_sigaction *)]; @@ -620,28 +652,36 @@ int linux_getgroups(struct thread *, struct linux_getgroups_args *); int osf1_setitimer(struct thread *, struct osf1_setitimer_args *); int linux_gethostname(struct thread *, struct linux_gethostname_args *); +int linux_sethostname(struct thread *, struct linux_sethostname_args *); int linux_getdtablesize(struct thread *, struct linux_getdtablesize_args *); int linux_newfstat(struct thread *, struct linux_newfstat_args *); int linux_fcntl(struct thread *, struct linux_fcntl_args *); int osf1_select(struct thread *, struct osf1_select_args *); int osf1_socket(struct thread *, struct osf1_socket_args *); int linux_connect(struct thread *, struct linux_connect_args *); +int linux_accept(struct thread *, struct linux_accept_args *); int linux_getpriority(struct thread *, struct linux_getpriority_args *); +int linux_send(struct thread *, struct linux_send_args *); +int linux_recv(struct thread *, struct linux_recv_args *); int osf1_sigreturn(struct thread *, struct osf1_sigreturn_args *); int osf1_sigsuspend(struct thread *, struct osf1_sigsuspend_args *); int linux_recvmsg(struct thread *, struct linux_recvmsg_args *); int linux_sendmsg(struct thread *, struct linux_sendmsg_args *); int osf1_gettimeofday(struct thread *, struct osf1_gettimeofday_args *); int osf1_getrusage(struct thread *, struct osf1_getrusage_args *); +int linux_recvfrom(struct thread *, struct linux_recvfrom_args *); int linux_rename(struct thread *, struct linux_rename_args *); int linux_truncate(struct thread *, struct linux_truncate_args *); +int linux_ftruncate(struct thread *, struct linux_ftruncate_args *); int osf1_sendto(struct thread *, struct osf1_sendto_args *); int linux_socketpair(struct thread *, struct linux_socketpair_args *); int linux_mkdir(struct thread *, struct linux_mkdir_args *); int linux_rmdir(struct thread *, struct linux_rmdir_args *); +int linux_getpeername(struct thread *, struct linux_getpeername_args *); int linux_getrlimit(struct thread *, struct linux_getrlimit_args *); int linux_setrlimit(struct thread *, struct linux_setrlimit_args *); int linux_quotactl(struct thread *, struct linux_quotactl_args *); +int linux_getsockname(struct thread *, struct linux_getsockname_args *); int osf1_sigaction(struct thread *, struct osf1_sigaction_args *); int linux_msgctl(struct thread *, struct linux_msgctl_args *); int linux_msgget(struct thread *, struct linux_msgget_args *); ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_syscall.h#3 (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.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 + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.25 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #define LINUX_SYS_exit 1 @@ -57,7 +57,7 @@ #define LINUX_SYS_linux_getgroups 80 #define LINUX_SYS_osf1_setitimer 83 #define LINUX_SYS_linux_gethostname 87 -#define LINUX_SYS_osethostname 88 +#define LINUX_SYS_linux_sethostname 88 #define LINUX_SYS_linux_getdtablesize 89 #define LINUX_SYS_dup2 90 #define LINUX_SYS_linux_newfstat 91 @@ -68,10 +68,10 @@ #define LINUX_SYS_setpriority 96 #define LINUX_SYS_osf1_socket 97 #define LINUX_SYS_linux_connect 98 -#define LINUX_SYS_accept 99 +#define LINUX_SYS_linux_accept 99 #define LINUX_SYS_linux_getpriority 100 -#define LINUX_SYS_osend 101 -#define LINUX_SYS_orecv 102 +#define LINUX_SYS_linux_send 101 +#define LINUX_SYS_linux_recv 102 #define LINUX_SYS_osf1_sigreturn 103 #define LINUX_SYS_bind 104 #define LINUX_SYS_setsockopt 105 @@ -86,12 +86,12 @@ #define LINUX_SYS_writev 121 #define LINUX_SYS_fchown 123 #define LINUX_SYS_fchmod 124 -#define LINUX_SYS_recvfrom 125 +#define LINUX_SYS_linux_recvfrom 125 #define LINUX_SYS_setreuid 126 #define LINUX_SYS_setregid 127 #define LINUX_SYS_linux_rename 128 #define LINUX_SYS_linux_truncate 129 -#define LINUX_SYS_oftruncate 130 +#define LINUX_SYS_linux_ftruncate 130 #define LINUX_SYS_flock 131 #define LINUX_SYS_setgid 132 #define LINUX_SYS_osf1_sendto 133 @@ -100,12 +100,12 @@ #define LINUX_SYS_linux_mkdir 136 #define LINUX_SYS_linux_rmdir 137 #define LINUX_SYS_utimes 138 -#define LINUX_SYS_ogetpeername 141 +#define LINUX_SYS_linux_getpeername 141 #define LINUX_SYS_linux_getrlimit 144 #define LINUX_SYS_linux_setrlimit 145 #define LINUX_SYS_setsid 147 #define LINUX_SYS_linux_quotactl 148 -#define LINUX_SYS_getsockname 150 +#define LINUX_SYS_linux_getsockname 150 #define LINUX_SYS_osf1_sigaction 156 #define LINUX_SYS_setdomainname 166 #define LINUX_SYS_linux_msgctl 200 ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysent.c#3 (text+ko) ==== @@ -2,12 +2,11 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $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 + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.25 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #include -#include "opt_compat.h" #include #include #include @@ -108,7 +107,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 88 = linux_sethostname */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ @@ -119,10 +118,10 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */ { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */ + { SYF_MPSAFE | AS(linux_accept_args), (sy_call_t *)linux_accept, AUE_ACCEPT }, /* 99 = linux_accept */ { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */ - { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ - { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ + { SYF_MPSAFE | AS(linux_send_args), (sy_call_t *)linux_send, AUE_SEND }, /* 101 = linux_send */ + { SYF_MPSAFE | AS(linux_recv_args), (sy_call_t *)linux_recv, AUE_RECV }, /* 102 = linux_recv */ { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ @@ -145,12 +144,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ - { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(linux_recvfrom_args), (sy_call_t *)linux_recvfrom, AUE_RECVFROM }, /* 125 = linux_recvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */ { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 130 = linux_ftruncate */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */ { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */ @@ -161,7 +160,7 @@ { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */ + { SYF_MPSAFE | AS(linux_getpeername_args), (sy_call_t *)linux_getpeername, AUE_GETPEERNAME }, /* 141 = linux_getpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */ @@ -170,7 +169,7 @@ { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */ + { SYF_MPSAFE | AS(linux_getsockname_args), (sy_call_t *)linux_getsockname, AUE_GETSOCKNAME }, /* 150 = linux_getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#3 (text+ko) ==== @@ -27,14 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.98 2005/12/26 21:23:56 sobomax Exp $"); - -/* XXX we use functions that might not exist. */ -#include "opt_compat.h" - -#ifndef COMPAT_43 -#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!" -#endif +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.99 2006/03/18 18:24:38 netchild Exp $"); #include #include ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -11,8 +11,7 @@ ; there is no audit event for the call at this time. For the ; case where the event exists, but we don't want auditing, the ; event should be #defined to AUE_NULL in audit_kevents.h. -; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, -; NODEF, NOARGS, NOPROTO +; type one of STD, OBSOL, UNIMPL, NODEF, NOARGS, NOPROTO ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -22,9 +21,6 @@ ; types: ; STD always included -; COMPAT included on COMPAT #ifdef -; CPT_NOA combines COMPAT with NOARGS -; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h ; NOARGS same as STD except do not create structure in sys/sysproto.h ; NODEF ?? ; NOPROTO same as STD except do not create structure or function in @@ -32,7 +28,6 @@ ; OBSOL obsolete, not included in system, only specifies name ; UNIMPL not implemented, placeholder only -#include "opt_compat.h" #include #include #include @@ -158,9 +153,7 @@ 85 AUE_NULL UNIMPL 86 AUE_GETITIMER UNIMPL osf_getitimer 87 AUE_SYSCTL MSTD { int linux_gethostname(void); } -88 AUE_SYSCTL MNOPROTO { int osethostname(char *hostname, \ - u_int len); } osethostname \ - sethostname_args int +88 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, u_int len); } 89 AUE_GETDTABLESIZE MSTD { int linux_getdtablesize(void); } 90 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } 91 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \ @@ -179,13 +172,13 @@ int protocol); } 98 AUE_CONNECT MSTD { int linux_connect(l_int s, \ struct l_sockaddr *name, l_int namelen); } -99 AUE_ACCEPT MNOPROTO { int oaccept(int s, caddr_t name, \ - int *anamelen); } accept accept_args int +99 AUE_ACCEPT MSTD { int linux_accept(l_int s, \ + struct linux_accept_args *args); } 100 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } -101 AUE_SEND MNOPROTO { int osend(int s, caddr_t buf, int len, \ - int flags); } -102 AUE_RECV MNOPROTO { int orecv(int s, caddr_t buf, int len, \ - int flags); } +101 AUE_SEND MSTD { int linux_send(l_int s, \ + struct linux_send_args *args); } +102 AUE_RECV MSTD { int linux_recv(l_int s, \ + struct linux_recv_args *args); } 103 AUE_NULL MSTD { int osf1_sigreturn( \ struct osigcontext *sigcntxp); } 104 AUE_BIND MNOPROTO { int bind(int s, caddr_t name, \ @@ -217,16 +210,14 @@ 122 AUE_SETTIMEOFDAY UNIMPL osf_settimeofday 123 AUE_FCHOWN NOPROTO { int fchown(int fd, int uid, int gid); } 124 AUE_FCHMOD NOPROTO { int fchmod(int fd, int mode); } -125 AUE_RECVFROM NOPROTO { int orecvfrom(int s, caddr_t buf, \ - size_t len, int flags, caddr_t from, \ - int *fromlenaddr); } recvfrom \ - recvfrom_args int +125 AUE_RECVFROM MSTD { int linux_recvfrom(l_int s, \ + struct linux_recvfrom_args *args); } 126 AUE_SETREUID MNOPROTO { int setreuid(int ruid, int euid); } 127 AUE_SETREGID MNOPROTO { int setregid(int rgid, int egid); } 128 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } 129 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \ l_ulong length); } -130 AUE_FTRUNCATE MNOPROTO { int oftruncate(int fd, long length); } +130 AUE_FTRUNCATE MSTD { int linux_ftruncate(int fd, long length); } 131 AUE_FLOCK MNOPROTO { int flock(int fd, int how); } 132 AUE_SETGID MNOPROTO { int setgid(gid_t gid); } 133 AUE_SENDTO MSTD { int osf1_sendto(int s, caddr_t buf, \ @@ -240,8 +231,8 @@ struct timeval *tptr); } 139 AUE_NULL UNIMPL 140 AUE_NULL UNIMPL -141 AUE_GETPEERNAME MNOPROTO { int ogetpeername(int fdes, caddr_t asa, \ - int *alen); } +141 AUE_GETPEERNAME MSTD { int linux_getpeername(l_int s, \ + struct linux_getpeername_args *args); } 142 AUE_NULL UNIMPL 143 AUE_NULL UNIMPL 144 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ @@ -252,9 +243,8 @@ 147 AUE_SETSID MNOPROTO { int setsid(void); } 148 AUE_QUOTACTL MSTD { int linux_quotactl(void); } 149 AUE_NULL UNIMPL -150 AUE_GETSOCKNAME MNOPROTO { int ogetsockname(int fdec, caddr_t asa, \ - int *alen);} getsockname \ - getsockname_args int +150 AUE_GETSOCKNAME MSTD { int linux_getsockname(l_int s, \ + struct linux_getsockname_args *args);} 151 AUE_NULL UNIMPL 152 AUE_NULL UNIMPL 153 AUE_NULL UNIMPL ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.19 2005/11/01 22:44:06 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $"); #include #include @@ -219,11 +219,12 @@ } /* - * For ACPI < 2.0, use the RSDT. For ACPI >= 2.0, use the XSDT. - * We map the XSDT and RSDT at page 1 in the crashdump area. - * Page 0 is used to map in the headers of candidate ACPI tables. + * For ACPI >= 2.0, use the XSDT if it is available. + * Otherwise, use the RSDT. We map the XSDT or RSDT at page 1 + * in the crashdump area. Page 0 is used to map in the + * headers of candidate ACPI tables. */ - if (rsdp->Revision >= 2) { + if (rsdp->Revision >= 2 && rsdp->XsdtPhysicalAddress != 0) { /* * AcpiOsGetRootPointer only verifies the checksum for * the version 1.0 portion of the RSDP. Version 2.0 has ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/apic_vector.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.107 2005/12/14 21:47:01 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.108 2006/03/13 23:55:31 peter Exp $ */ /* @@ -188,11 +188,7 @@ jmp doreti /* - * Executed by a CPU when it receives an Xcpustop IPI from another CPU, - * - * - Signals its receipt. - * - Waits for permission to restart. - * - Signals its restart. + * Executed by a CPU when it receives an IPI_STOP from another CPU. */ .text SUPERALIGN_TEXT ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/db_trace.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.73 2005/12/27 23:23:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); #include #include @@ -192,6 +192,7 @@ #define TRAP 1 #define INTERRUPT 2 #define SYSCALL 3 +#define TRAP_INTERRUPT 5 static void db_nextframe(struct amd64_frame **, db_addr_t *, struct thread *); static int db_numargs(struct amd64_frame *); @@ -326,6 +327,12 @@ frame_type = INTERRUPT; else if (strcmp(name, "Xfast_syscall") == 0) frame_type = SYSCALL; + /* XXX: These are interrupts with trap frames. */ + else if (strcmp(name, "Xtimerint") == 0 || + strcmp(name, "Xcpustop") == 0 || + strcmp(name, "Xrendezvous") == 0 || + strcmp(name, "Xipi_intr_bitmap_handler") == 0) + frame_type = TRAP_INTERRUPT; } /* @@ -357,6 +364,7 @@ db_printf("--- syscall"); decode_syscall(tf->tf_rax, td); break; + case TRAP_INTERRUPT: case INTERRUPT: db_printf("--- interrupt"); break; ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/io_apic.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.21 2006/02/28 22:24:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -73,6 +73,10 @@ * IRQs behave as PCI IRQs by default. We also assume that the pin for * IRQ 0 is actually an ExtINT pin. The apic enumerators override the * configuration of individual pins as indicated by their tables. + * + * Documentation for the I/O APIC: "82093AA I/O Advanced Programmable + * Interrupt Controller (IOAPIC)", May 1996, Intel Corp. + * ftp://download.intel.com/design/chipsets/datashts/29056601.pdf */ struct ioapic_intsrc { @@ -443,7 +447,7 @@ uint32_t value; /* Map the register window so we can access the device. */ - apic = (ioapic_t *)pmap_mapdev(addr, IOAPIC_MEM_REGION); + apic = pmap_mapdev(addr, IOAPIC_MEM_REGION); mtx_lock_spin(&icu_lock); value = ioapic_read(apic, IOAPIC_VER); mtx_unlock_spin(&icu_lock); ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 4 16:56: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 6328816A420; Tue, 4 Apr 2006 16:56:04 +0000 (UTC) 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 28CC016A401 for ; Tue, 4 Apr 2006 16:56:04 +0000 (UTC) (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 4891243D72 for ; Tue, 4 Apr 2006 16:55:47 +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 k34Gti46075355 for ; Tue, 4 Apr 2006 16:55:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34GthkT075352 for perforce@freebsd.org; Tue, 4 Apr 2006 16:55:43 GMT (envelope-from imp@freebsd.org) Date: Tue, 4 Apr 2006 16:55:43 GMT Message-Id: <200604041655.k34GthkT075352@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 94609 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, 04 Apr 2006 16:56:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=94609 Change 94609 by imp@imp_Speedy on 2006/04/04 16:54:42 Finish integrating to FreeBSD iicbus framework. Eliminate old untested kludge. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#10 (text+ko) ==== @@ -54,13 +54,14 @@ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ int flags; -#define XFER_PENDING 1 /* true when transfer taking place */ #define OPENED 2 /* Device opened */ #define RXRDY 4 -#define TXCOMP 8 +#define STOP_DONE 8 #define TXRDY 0x10 struct cdev *cdev; uint32_t cwgr; + int sc_started; + int twi_addr; }; static inline uint32_t @@ -225,7 +226,7 @@ if (status & TWI_SR_RXRDY) sc->flags |= RXRDY; if (status & TWI_SR_TXCOMP) - sc->flags |= TXCOMP; + sc->flags |= STOP_DONE; if (status & TWI_SR_TXRDY) sc->flags |= TXRDY; AT91_TWI_UNLOCK(sc); @@ -233,6 +234,20 @@ return; } +static int +at91_twi_wait_stop_done(struct at91_twi_softc *sc) +{ + int err = 0; + + while (!(sc->flags & STOP_DONE)) { + err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwsd", 0); + if (err) + break; + } + sc->flags &= ~STOP_DONE; + return (err); +} + static int at91_twi_open(struct cdev *dev, int oflags, int devtype, struct thread *td) { @@ -263,103 +278,7 @@ return (0); } - -static int -at91_twi_read_master(struct at91_twi_softc *sc, struct at91_twi_io *xfr) -{ - uint8_t *walker; - uint8_t buffer[256]; - size_t len; - int err = 0; - - if (xfr->xfer_len > sizeof(buffer)) - return (EINVAL); - walker = buffer; - len = xfr->xfer_len; - RD4(sc, TWI_RHR); - // Master mode, with the right address and interal addr size - WR4(sc, TWI_MMR, TWI_MMR_IADRSZ(xfr->iadrsz) | TWI_MMR_MREAD | - TWI_MMR_DADR(xfr->dadr)); - WR4(sc, TWI_IADR, xfr->iadr); - WR4(sc, TWI_CR, TWI_CR_START); - while (len-- > 1) { - while (!(sc->flags & RXRDY)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird", - 0); - if (err) - return (err); - } - sc->flags &= ~RXRDY; - *walker++ = RD4(sc, TWI_RHR) & 0xff; - } - WR4(sc, TWI_CR, TWI_CR_STOP); - while (!(sc->flags & TXCOMP)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird2", 0); - if (err) - return (err); - } - sc->flags &= ~TXCOMP; - *walker = RD4(sc, TWI_RHR) & 0xff; - if (xfr->xfer_buf) { - AT91_TWI_UNLOCK(sc); - err = copyout(buffer, xfr->xfer_buf, xfr->xfer_len); - AT91_TWI_LOCK(sc); - } - return (err); -} - static int -at91_twi_write_master(struct at91_twi_softc *sc, struct at91_twi_io *xfr) -{ - uint8_t *walker; - uint8_t buffer[256]; - size_t len; - int err; - - if (xfr->xfer_len > sizeof(buffer)) - return (EINVAL); - walker = buffer; - len = xfr->xfer_len; - AT91_TWI_UNLOCK(sc); - err = copyin(xfr->xfer_buf, buffer, xfr->xfer_len); - AT91_TWI_LOCK(sc); - if (err) - return (err); - /* Setup the xfr for later readback */ - xfr->xfer_buf = 0; - xfr->xfer_len = 1; - while (len--) { - WR4(sc, TWI_MMR, TWI_MMR_IADRSZ(xfr->iadrsz) | TWI_MMR_MWRITE | - TWI_MMR_DADR(xfr->dadr)); - WR4(sc, TWI_IADR, xfr->iadr++); - WR4(sc, TWI_THR, *walker++); - WR4(sc, TWI_CR, TWI_CR_START); - /* - * If we get signal while waiting for TXRDY, make sure we - * try to stop this device - */ - while (!(sc->flags & TXRDY)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr", - 0); - if (err) - break; - } - WR4(sc, TWI_CR, TWI_CR_STOP); - if (err) - return (err); - while (!(sc->flags & TXCOMP)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr2", - 0); - if (err) - return (err); - } - /* Readback */ - at91_twi_read_master(sc, xfr); - } - return (err); -} - -static int at91_twi_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td) { @@ -368,36 +287,8 @@ sc = CDEV2SOFTC(dev); AT91_TWI_LOCK(sc); - while (sc->flags & XFER_PENDING) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, - "twiwait", 0); - if (err) { - AT91_TWI_UNLOCK(sc); - return (err); - } - } - sc->flags |= XFER_PENDING; - switch (cmd) { - case TWIIOCXFER: - { - struct at91_twi_io *xfr = (struct at91_twi_io *)data; - switch (xfr->type) - { - case TWI_IO_READ_MASTER: - err = at91_twi_read_master(sc, xfr); - break; - case TWI_IO_WRITE_MASTER: - err = at91_twi_write_master(sc, xfr); - break; - default: - err = EINVAL; - break; - } - break; - } - case TWIIOCSETCLOCK: { struct at91_twi_clock *twick = (struct at91_twi_clock *)data; @@ -414,46 +305,167 @@ err = ENOTTY; break; } - sc->flags &= ~XFER_PENDING; AT91_TWI_UNLOCK(sc); wakeup(sc); return err; } +/* + * Stop the transfer by entering a STOP state on the iic bus. For read + * operations, we've already entered the STOP state, since we need to do + * that to read the last character. For write operations, we need to + * wait for the TXCOMP bit to turn on before returning. + */ static int at91_twi_stop(device_t dev) { - return (EIO); + struct at91_twi_softc *sc; + int err = 0; + + sc = device_get_softc(dev); + if (sc->sc_started) { + WR4(sc, TWI_CR, TWI_CR_STOP); + err = at91_twi_wait_stop_done(sc); + } + return (err); } +/* + * enter a START condition without requiring the device to be in a STOP + * state. + */ static int at91_twi_repeated_start(device_t dev, u_char slave, int timeout) { - return EIO; + struct at91_twi_softc *sc; + + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_DADR(slave)); + WR4(sc, TWI_CR, TWI_CR_START); + sc->sc_started = 1; + return (0); } +/* + * enter a START condition from an idle state. + */ static int at91_twi_start(device_t dev, u_char slave, int timeout) { - return EIO; + struct at91_twi_softc *sc; + + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_DADR(slave)); + WR4(sc, TWI_CR, TWI_CR_START); + sc->sc_started = 1; + return (0); } static int at91_twi_write(device_t dev, char *buf, int len, int *sent, int timeout /* us */) { - return EIO; + struct at91_twi_softc *sc; + uint8_t *walker; + int err = 0; + + walker = buf; + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_MWRITE | RD4(sc, TWI_MMR)); + AT91_TWI_LOCK(sc); + while (len--) { + WR4(sc, TWI_THR, *walker++); + while (!(sc->flags & TXRDY)) { + err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr", + 0); + if (err) + goto errout; + } + } +errout:; + AT91_TWI_UNLOCK(sc); + return (err); } static int at91_twi_read(device_t dev, char *buf, int len, int *read, int last, int delay /* us */) { - return EIO; + struct at91_twi_softc *sc; + char *walker; + int err = 0; + + walker = buf; + sc = device_get_softc(dev); + AT91_TWI_LOCK(sc); + WR4(sc, TWI_MMR, ~TWI_MMR_MWRITE & RD4(sc, TWI_MMR)); + while (len-- > 0) { + err = 0; + while (!(sc->flags & RXRDY)) { + err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird", + 0); + if (err) + goto errout; + } + sc->flags &= ~RXRDY; + *walker++ = RD4(sc, TWI_RHR) & 0xff; + if (len == 1 && last) + break; + } + if (!last) + goto errout; + WR4(sc, TWI_CR, TWI_CR_STOP); + err = at91_twi_wait_stop_done(sc); + *walker = RD4(sc, TWI_RHR) & 0xff; + if (read) + *read = walker - buf; + sc->sc_started = 0; +errout:; + AT91_TWI_UNLOCK(sc); + return (err); } static int at91_twi_rst_card(device_t dev, u_char speed, u_char addr, u_char *oldaddr) { + struct at91_twi_softc *sc; + int ckdiv, rate; + + sc = device_get_softc(dev); + if (oldaddr) + *oldaddr = sc->twi_addr; + if (addr != 0) + sc->twi_addr = 0; + else + sc->twi_addr = addr; + + rate = 1; + + /* + * 8 * is because "rate == 1" -> 4 clocks down, 4 clocks up. The + * speeds are for 1.5kb/s, 45kb/s and 90kb/s. + */ + switch (speed) { + case IIC_SLOW: + ckdiv = 8 * AT91C_MASTER_CLOCK / 1500; + break; + + case IIC_FAST: + ckdiv = 8 * AT91C_MASTER_CLOCK / 45000; + break; + + case IIC_UNKNOWN: + case IIC_FASTEST: + default: + ckdiv = 8 * AT91C_MASTER_CLOCK / 90000; + break; + } + + sc->cwgr = TWI_CWGR_CKDIV(ckdiv) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(rate)) | + TWI_CWGR_CLDIV(TWI_CWGR_DIV(rate)); + WR4(sc, TWI_CR, TWI_CR_SWRST); + WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); + WR4(sc, TWI_CWGR, sc->cwgr); + return EIO; } From owner-p4-projects@FreeBSD.ORG Tue Apr 4 17:06: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 CB0D216A422; Tue, 4 Apr 2006 17:06:58 +0000 (UTC) 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 78BBD16A400 for ; Tue, 4 Apr 2006 17:06:58 +0000 (UTC) (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 3C6F243D68 for ; Tue, 4 Apr 2006 17:06:58 +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 k34H6wAN077208 for ; Tue, 4 Apr 2006 17:06:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34H6v0c077204 for perforce@freebsd.org; Tue, 4 Apr 2006 17:06:57 GMT (envelope-from imp@freebsd.org) Date: Tue, 4 Apr 2006 17:06:57 GMT Message-Id: <200604041706.k34H6v0c077204@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 94610 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, 04 Apr 2006 17:06:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=94610 Change 94610 by imp@imp_Speedy on 2006/04/04 17:06:05 we don't need our custom cdev, so kill it. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#11 edit .. //depot/projects/arm/src/sys/arm/at91/at91_twiio.h#5 delete Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#11 (text+ko) ==== @@ -54,14 +54,13 @@ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ int flags; -#define OPENED 2 /* Device opened */ #define RXRDY 4 #define STOP_DONE 8 #define TXRDY 0x10 - struct cdev *cdev; uint32_t cwgr; int sc_started; int twi_addr; + device_t iicbus; }; static inline uint32_t @@ -84,7 +83,6 @@ #define AT91_TWI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define AT91_TWI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define AT91_TWI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); -#define CDEV2SOFTC(dev) ((dev)->si_drv1) #define TWI_DEF_CLK 100000 static devclass_t at91_twi_devclass; @@ -100,19 +98,6 @@ static int at91_twi_activate(device_t dev); static void at91_twi_deactivate(device_t dev); -/* cdev routines */ -static d_open_t at91_twi_open; -static d_close_t at91_twi_close; -static d_ioctl_t at91_twi_ioctl; - -static struct cdevsw at91_twi_cdevsw = -{ - .d_version = D_VERSION, - .d_open = at91_twi_open, - .d_close = at91_twi_close, - .d_ioctl = at91_twi_ioctl -}; - static int at91_twi_probe(device_t dev) { @@ -142,20 +127,23 @@ AT91_TWI_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_twi_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "twi%d", device_get_unit(dev)); - if (sc->cdev == NULL) { - err = ENOMEM; - goto out; - } - sc->cdev->si_drv1 = sc; - sc->cwgr = TWI_CWGR_CKDIV(1) | + sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); + + WR4(sc, TWI_IER, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | + TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); + + if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) + device_printf(dev, "could not allocate iicbus instance\n"); + + /* probe and attach the iicbus */ + bus_generic_attach(dev); + out:; if (err) at91_twi_deactivate(dev); @@ -165,7 +153,13 @@ static int at91_twi_detach(device_t dev) { - return (EBUSY); /* XXX */ + int rv; + + at91_twi_deactivate(dev); + if (sc->iicbus && (rv = device_delete_child(dev, sc->iicbus)) != 0) + return (rv); + + return (0); } static int @@ -248,68 +242,6 @@ return (err); } -static int -at91_twi_open(struct cdev *dev, int oflags, int devtype, struct thread *td) -{ - struct at91_twi_softc *sc; - - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - if (!(sc->flags & OPENED)) { - sc->flags |= OPENED; - WR4(sc, TWI_IER, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); - } - AT91_TWI_UNLOCK(sc); - return (0); -} - -static int -at91_twi_close(struct cdev *dev, int fflag, int devtype, struct thread *td) -{ - struct at91_twi_softc *sc; - - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - sc->flags &= ~OPENED; - WR4(sc, TWI_IDR, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); - AT91_TWI_UNLOCK(sc); - return (0); -} - -static int -at91_twi_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, - struct thread *td) -{ - int err = 0; - struct at91_twi_softc *sc; - - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - switch (cmd) - { - case TWIIOCSETCLOCK: - { - struct at91_twi_clock *twick = (struct at91_twi_clock *)data; - - sc->cwgr = TWI_CWGR_CKDIV(twick->ckdiv) | - TWI_CWGR_CHDIV(TWI_CWGR_DIV(twick->high_rate)) | - TWI_CWGR_CLDIV(TWI_CWGR_DIV(twick->low_rate)); - WR4(sc, TWI_CR, TWI_CR_SWRST); - WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); - WR4(sc, TWI_CWGR, sc->cwgr); - break; - } - default: - err = ENOTTY; - break; - } - AT91_TWI_UNLOCK(sc); - wakeup(sc); - return err; -} - /* * Stop the transfer by entering a STOP state on the iic bus. For read * operations, we've already entered the STOP state, since we need to do From owner-p4-projects@FreeBSD.ORG Tue Apr 4 17:33: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 8139D16A480; Tue, 4 Apr 2006 17:33:33 +0000 (UTC) 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 613B016A454 for ; Tue, 4 Apr 2006 17:33:33 +0000 (UTC) (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 6A38143D46 for ; Tue, 4 Apr 2006 17:33:32 +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 k34HXWXT078891 for ; Tue, 4 Apr 2006 17:33:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34HXWdJ078888 for perforce@freebsd.org; Tue, 4 Apr 2006 17:33:32 GMT (envelope-from imp@freebsd.org) Date: Tue, 4 Apr 2006 17:33:32 GMT Message-Id: <200604041733.k34HXWdJ078888@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 94615 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, 04 Apr 2006 17:33:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=94615 Change 94615 by imp@imp_Speedy on 2006/04/04 17:32:43 Aarrggghhh. compile nits. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#12 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include -#include #include #include @@ -153,8 +152,10 @@ static int at91_twi_detach(device_t dev) { + struct at91_twi_softc *sc; int rv; + sc = device_get_softc(dev); at91_twi_deactivate(dev); if (sc->iicbus && (rv = device_delete_child(dev, sc->iicbus)) != 0) return (rv); From owner-p4-projects@FreeBSD.ORG Tue Apr 4 17:38:40 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 2DF3316A664; Tue, 4 Apr 2006 17:38:40 +0000 (UTC) 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 E995F16A639 for ; Tue, 4 Apr 2006 17:38:39 +0000 (UTC) (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 995BC43D49 for ; Tue, 4 Apr 2006 17:38: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 k34HcdLl079231 for ; Tue, 4 Apr 2006 17:38:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34HcdUQ079228 for perforce@freebsd.org; Tue, 4 Apr 2006 17:38:39 GMT (envelope-from marcel@freebsd.org) Date: Tue, 4 Apr 2006 17:38:39 GMT Message-Id: <200604041738.k34HcdUQ079228@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 94617 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, 04 Apr 2006 17:38:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=94617 Change 94617 by marcel@marcel_nfs on 2006/04/04 17:38:04 IFC @94616 Affected files ... .. //depot/projects/uart/amd64/amd64/gdb_machdep.c#4 integrate .. //depot/projects/uart/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdHardware.c#9 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/uart/dev/iicbus/iic.c#4 integrate .. //depot/projects/uart/dev/scc/scc_bfe.h#17 integrate .. //depot/projects/uart/dev/scc/scc_core.c#21 integrate .. //depot/projects/uart/i386/i386/exception.s#8 integrate .. //depot/projects/uart/kern/vfs_bio.c#23 integrate .. //depot/projects/uart/kern/vfs_subr.c#27 integrate .. //depot/projects/uart/netinet/in_pcb.c#14 integrate .. //depot/projects/uart/netinet/tcp_input.c#21 integrate .. //depot/projects/uart/netinet/tcp_subr.c#18 integrate .. //depot/projects/uart/netipsec/ipsec.c#10 integrate .. //depot/projects/uart/netipsec/keysock.c#9 integrate .. //depot/projects/uart/sys/umtx.h#8 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/gdb_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.5 2005/09/27 21:10:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.6 2006/04/04 03:00:20 marcel Exp $"); #include #include @@ -91,3 +91,27 @@ kdb_frame->tf_rip = *(register_t *)val; } } + +int +gdb_cpu_signal(int type, int code) +{ + + switch (type & ~T_USER) { + case 0: return (SIGFPE); /* Divide by zero. */ + case 1: return (SIGTRAP); /* Debug exception. */ + case 3: return (SIGTRAP); /* Breakpoint. */ + case 4: return (SIGSEGV); /* into instr. (overflow). */ + case 5: return (SIGURG); /* bound instruction. */ + case 6: return (SIGILL); /* Invalid opcode. */ + case 7: return (SIGFPE); /* Coprocessor not present. */ + case 8: return (SIGEMT); /* Double fault. */ + case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ + case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ + case 11: return (SIGSEGV); /* Segment not present. */ + case 12: return (SIGSEGV); /* Stack exception. */ + case 13: return (SIGSEGV); /* General protection. */ + case 14: return (SIGSEGV); /* Page fault. */ + case 16: return (SIGEMT); /* Coprocessor error. */ + } + return (SIGEMT); +} ==== //depot/projects/uart/amd64/include/gdb_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.3 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.5 2006/04/04 03:00:20 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -31,7 +31,7 @@ #define GDB_BUFSZ 500 #define GDB_NREGS 56 -#define GDB_REG_PC 18 +#define GDB_REG_PC 16 static __inline size_t gdb_cpu_regsz(int regnum) @@ -40,12 +40,6 @@ } static __inline int -gdb_cpu_signal(int type, int code __unused) -{ - return (type); -} - -static __inline int gdb_cpu_query(void) { return (0); @@ -53,5 +47,6 @@ void *gdb_cpu_getreg(int, size_t *); void gdb_cpu_setreg(int, void *); +int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/uart/dev/acpica/Osd/OsdHardware.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.19 2006/03/29 18:47:59 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.20 2006/04/04 02:22:38 njl Exp $"); #include @@ -41,9 +41,9 @@ /* * ACPICA's rather gung-ho approach to hardware resource ownership is a little - * troublesome insofar as there is no easy way for us to know in advance + * troublesome insofar as there is no easy way for us to know in advance * exactly which I/O resources it's going to want to use. - * + * * In order to deal with this, we ignore resource ownership entirely, and simply * use the native I/O space accessor functionality. This is Evil, but it works. * @@ -107,7 +107,7 @@ error = 0; for (port = illegal_bios_ports; *port != -1; port += 2) { if ((addr >= port[0] && addr <= port[1]) || - (addr < port[0] && addr + (width / 8) >= port[0])) { + (addr < port[0] && addr + (width / 8) > port[0])) { if (block_bad_io) error = -1; else @@ -209,7 +209,7 @@ /* debug trap goes here */ break; } - + return (AE_OK); } @@ -256,7 +256,7 @@ status = AcpiGetParent(curr, &parent); if (ACPI_FAILURE(status)) return (bus); - + /* First, recurse up the tree until we find the host bus. */ bus = acpi_bus_number(root, parent, PciId); ==== //depot/projects/uart/dev/hwpmc/hwpmc_x86.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.4 2005/11/18 16:47:24 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.5 2006/04/04 02:36:04 ps Exp $"); #include #include @@ -91,7 +91,7 @@ #if defined(__i386__) || defined(__amd64__) case 0xF00: /* P4 */ model = ((cpu_id & 0xF0000) >> 12) | ((cpu_id & 0xF0) >> 4); - if (model >= 0 && model <= 4) /* known models */ + if (model >= 0 && model <= 6) /* known models */ cputype = PMC_CPU_INTEL_PIV; break; } ==== //depot/projects/uart/dev/iicbus/iic.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.32 2004/06/16 09:46:45 phk Exp $ + * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.33 2006/04/04 17:08:40 imp Exp $ * */ #include @@ -276,7 +276,7 @@ break; case I2CRSTCARD: - error = iicbus_reset(parent, 0, 0, NULL); + error = iicbus_reset(parent, IIC_UNKNOWN, 0, NULL); break; case I2CWRITE: ==== //depot/projects/uart/dev/scc/scc_bfe.h#17 (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/scc/scc_bfe.h,v 1.2 2006/04/01 04:51:56 marcel Exp $ + * $FreeBSD: src/sys/dev/scc/scc_bfe.h,v 1.3 2006/04/04 17:33:08 marcel Exp $ */ #ifndef _DEV_SCC_BFE_H_ @@ -85,6 +85,10 @@ struct resource ch_rres; struct resource_list ch_rlist; + struct resource *ch_ires; /* Interrupt resource. */ + void *ch_icookie; + int ch_irid; + struct scc_mode ch_mode[SCC_NMODES]; u_int ch_nr; @@ -119,9 +123,6 @@ struct resource *sc_rres; /* Register resource. */ int sc_rrid; int sc_rtype; /* SYS_RES_{IOPORT|MEMORY}. */ - struct resource *sc_ires; /* Interrupt resource. */ - void *sc_icookie; - int sc_irid; struct scc_chan *sc_chan; ==== //depot/projects/uart/dev/scc/scc_core.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/scc/scc_core.c,v 1.2 2006/04/01 04:51:56 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/scc/scc_core.c,v 1.3 2006/04/04 17:33:08 marcel Exp $"); #include #include @@ -134,17 +134,24 @@ sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); - sc->sc_irid = 0; - sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, - RF_ACTIVE | RF_SHAREABLE); + /* + * Allocate interrupt resources. There may be a different interrupt + * per channel. We allocate them all... + */ + sc->sc_chan = malloc(sizeof(struct scc_chan) * cl->cl_channels, + M_SCC, M_WAITOK | M_ZERO); + for (c = 0; c < cl->cl_channels; c++) { + ch = &sc->sc_chan[c]; + ch->ch_irid = c; + ch->ch_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &ch->ch_irid, RF_ACTIVE | RF_SHAREABLE); + } /* * Create the control structures for our children. Probe devices * and query them to see if we can reset the hardware. */ sysdev = 0; - 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++) { @@ -163,7 +170,8 @@ 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; + rle->res = (ch->ch_ires != NULL) ? ch->ch_ires : + sc->sc_chan[0].ch_ires; for (mode = 0; mode < SCC_NMODES; mode++) { m = &ch->ch_mode[mode]; @@ -204,27 +212,31 @@ * Of course, if we can't setup a fast handler, we make it MPSAFE * right away. */ - if (sc->sc_ires != NULL) { - error = bus_setup_intr(dev, sc->sc_ires, + for (c = 0; c < cl->cl_channels; c++) { + ch = &sc->sc_chan[c]; + if (ch->ch_ires == NULL) + continue; + error = bus_setup_intr(dev, ch->ch_ires, INTR_TYPE_TTY | INTR_FAST, scc_bfe_intr, sc, - &sc->sc_icookie); + &ch->ch_icookie); if (error) { - error = bus_setup_intr(dev, sc->sc_ires, + error = bus_setup_intr(dev, ch->ch_ires, INTR_TYPE_TTY | INTR_MPSAFE, scc_bfe_intr, sc, - &sc->sc_icookie); + &ch->ch_icookie); } else sc->sc_fastintr = 1; if (error) { device_printf(dev, "could not activate interrupt\n"); - bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, - sc->sc_ires); - sc->sc_ires = NULL; + bus_release_resource(dev, SYS_RES_IRQ, ch->ch_irid, + ch->ch_ires); + ch->ch_ires = NULL; } } - if (sc->sc_ires == NULL) { - /* XXX no interrupt resource. Force polled mode. */ - sc->sc_polled = 1; + sc->sc_polled = 1; + for (c = 0; c < cl->cl_channels; c++) { + if (sc->sc_chan[0].ch_ires != NULL) + sc->sc_polled = 0; } /* @@ -260,10 +272,12 @@ return (0); fail: - if (sc->sc_ires != NULL) { - bus_teardown_intr(dev, sc->sc_ires, sc->sc_icookie); - bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, - sc->sc_ires); + for (c = 0; c < cl->cl_channels; c++) { + ch = &sc->sc_chan[c]; + if (ch->ch_ires == NULL) + continue; + bus_release_resource(dev, SYS_RES_IRQ, ch->ch_irid, + ch->ch_ires); } bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); return (error); @@ -299,10 +313,13 @@ if (error) return (error); - if (sc->sc_ires != NULL) { - bus_teardown_intr(dev, sc->sc_ires, sc->sc_icookie); - bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, - sc->sc_ires); + for (chan = 0; chan < cl->cl_channels; chan++) { + ch = &sc->sc_chan[chan]; + if (ch->ch_ires == NULL) + continue; + bus_teardown_intr(dev, ch->ch_ires, ch->ch_icookie); + bus_release_resource(dev, SYS_RES_IRQ, ch->ch_irid, + ch->ch_ires); } bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); @@ -480,9 +497,10 @@ scc_bus_setup_intr(device_t dev, device_t child, struct resource *r, int flags, void (*ihand)(void *), void *arg, void **cookiep) { + struct scc_chan *ch; struct scc_mode *m; struct scc_softc *sc; - int i, isrc; + int c, i, isrc; if (device_get_parent(child) != dev) return (EINVAL); @@ -497,9 +515,15 @@ if (sc->sc_fastintr && !(flags & INTR_FAST)) { sc->sc_fastintr = 0; - bus_teardown_intr(dev, sc->sc_ires, sc->sc_icookie); - bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE, - scc_bfe_intr, sc, &sc->sc_icookie); + for (c = 0; c < sc->sc_class->cl_channels; c++) { + ch = &sc->sc_chan[c]; + if (ch->ch_ires == NULL) + continue; + bus_teardown_intr(dev, ch->ch_ires, ch->ch_icookie); + bus_setup_intr(dev, ch->ch_ires, + INTR_TYPE_TTY | INTR_MPSAFE, scc_bfe_intr, sc, + &ch->ch_icookie); + } } m = device_get_ivars(child); ==== //depot/projects/uart/i386/i386/exception.s#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.115 2005/12/05 21:44:47 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/exception.s,v 1.116 2006/04/04 02:26:45 jkoshy Exp $ */ #include "opt_apic.h" @@ -118,8 +118,9 @@ /* * alltraps entry point. Interrupts are enabled if this was a trap * gate (TGT), else disabled if this was an interrupt gate (IGT). - * Note that int0x80_syscall is a trap gate. Only page faults - * use an interrupt gate. + * Note that int0x80_syscall is a trap gate. Interrupt gates are + * used by page faults, non-maskable interrupts, debug and breakpoint + * exceptions. */ SUPERALIGN_TEXT ==== //depot/projects/uart/kern/vfs_bio.c#23 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.505 2006/03/31 02:56:30 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.506 2006/04/04 06:44:21 jeff Exp $"); #include #include @@ -1357,7 +1357,8 @@ TAILQ_INSERT_HEAD(&bufqueues[QUEUE_CLEAN], bp, b_freelist); /* remaining buffers */ } else { - if (bp->b_flags & (B_DELWRI|B_NEEDSGIANT)) + if ((bp->b_flags & (B_DELWRI|B_NEEDSGIANT)) == + (B_DELWRI|B_NEEDSGIANT)) bp->b_qindex = QUEUE_DIRTY_GIANT; if (bp->b_flags & B_DELWRI) bp->b_qindex = QUEUE_DIRTY; ==== //depot/projects/uart/kern/vfs_subr.c#27 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.668 2006/03/31 23:39:26 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.669 2006/04/04 06:46:10 jeff Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -640,6 +640,7 @@ vnlru_free(int count) { struct vnode *vp; + int vfslocked; mtx_assert(&vnode_free_list_mtx, MA_OWNED); for (; count > 0; count--) { @@ -667,7 +668,9 @@ vholdl(vp); mtx_unlock(&vnode_free_list_mtx); VI_UNLOCK(vp); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); vtryrecycle(vp); + VFS_UNLOCK_GIANT(vfslocked); /* * If the recycled succeeded this vdrop will actually free * the vnode. If not it will simply place it back on ==== //depot/projects/uart/netinet/in_pcb.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.171 2006/04/03 13:33:55 rwatson Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.172 2006/04/04 12:26:07 rwatson Exp $ */ #include "opt_ipsec.h" @@ -322,6 +322,8 @@ laddr = sin->sin_addr; if (lport) { struct inpcb *t; + struct tcptw *tw; + /* GROSS */ if (ntohs(lport) <= ipport_reservedhigh && ntohs(lport) >= ipport_reservedlow && @@ -355,10 +357,17 @@ t = in_pcblookup_local(pcbinfo, sin->sin_addr, lport, prison ? 0 : wild); if (t && (t->inp_vflag & INP_TIMEWAIT)) { - if ((reuseport & intotw(t)->tw_so_options) == 0) + /* + * XXXRW: If an incpb has had its timewait + * state recycled, we treat the address as + * being in use (for now). This is better + * than a panic, but not desirable. + */ + tw = intotw(inp); + if (tw == NULL || + (reuseport & tw->tw_so_options) == 0) return (EADDRINUSE); - } else - if (t && + } else if (t && (reuseport & t->inp_socket->so_options) == 0) { #if defined(INET6) if (ntohl(sin->sin_addr.s_addr) != @@ -950,7 +959,8 @@ */ if ((inp->inp_vflag & INP_TIMEWAIT) != 0) { tw = intotw(inp); - if (tcp_twrecycleable(tw)) { + if (tw != NULL && + tcp_twrecycleable(tw)) { INP_LOCK(inp); tcp_twclose(tw, 0); match = NULL; ==== //depot/projects/uart/netinet/tcp_input.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.294 2006/04/03 13:33:55 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.295 2006/04/04 12:26:07 rwatson Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -3156,6 +3156,15 @@ const int isipv6 = 0; #endif + /* + * XXXRW: Time wait state for inpcb has been recycled, but inpcb is + * still present. This is undesirable, but temporarily necessary + * until we work out how to handle inpcb's who's timewait state has + * been removed. + */ + if (tw == NULL) + goto drop; + /* tcbinfo lock required for tcp_twclose(), tcp_2msl_reset. */ INP_INFO_WLOCK_ASSERT(&tcbinfo); INP_LOCK_ASSERT(tw->tw_inpcb); ==== //depot/projects/uart/netinet/tcp_subr.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.244 2006/04/03 14:07:50 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.246 2006/04/04 14:31:37 glebius Exp $ */ #include "opt_compat.h" @@ -177,6 +177,10 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW, &tcp_isn_reseed_interval, 0, "Seconds between reseeding of ISN secret"); +static int maxtcptw; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, maxtcptw, CTLFLAG_RDTUN, + &maxtcptw, 0, "Maximum number of compressed TCP TIME_WAIT entries"); + /* * TCP bandwidth limiting sysctls. Note that the default lower bound of * 1024 exists only for debugging. A good production default would be @@ -290,9 +294,12 @@ tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(tcpcb_zone, maxsockets); + TUNABLE_INT_FETCH("net.inet.tcp.maxtcptw", &maxtcptw); + if (maxtcptw == 0) + maxtcptw = maxsockets / 5; tcptw_zone = uma_zcreate("tcptw", sizeof(struct tcptw), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(tcptw_zone, maxsockets / 5); + uma_zone_set_max(tcptw_zone, maxtcptw); tcp_timer_init(); syncache_init(); tcp_hc_init(); @@ -946,10 +953,13 @@ * TCP state changes, is not quite right, but for * now, better than nothing. */ - if (inp->inp_vflag & INP_TIMEWAIT) - error = cr_cansee(req->td->td_ucred, - intotw(inp)->tw_cred); - else + if (inp->inp_vflag & INP_TIMEWAIT) { + if (intotw(inp) != NULL) + error = cr_cansee(req->td->td_ucred, + intotw(inp)->tw_cred); + else + error = EINVAL; /* Skip this inp. */ + } else error = cr_canseesocket(req->td->td_ucred, inp->inp_socket); if (error == 0) @@ -2323,8 +2333,15 @@ if (inp != NULL) { INP_LOCK(inp); if (inp->inp_vflag & INP_TIMEWAIT) { + /* + * XXXRW: There currently exists a state where an + * inpcb is present, but its timewait state has been + * discarded. For now, don't allow dropping of this + * type of inpcb. + */ tw = intotw(inp); - tcp_twclose(tw, 0); + if (tw != NULL) + tcp_twclose(tw, 0); } else if (!(inp->inp_vflag & INP_DROPPED) && !(inp->inp_socket->so_options & SO_ACCEPTCONN)) { tp = intotcpcb(inp); ==== //depot/projects/uart/netipsec/ipsec.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.13 2006/03/25 13:38:52 gnn Exp $ */ +/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.14 2006/04/04 03:12:21 gnn Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /*- @@ -92,7 +92,6 @@ #include -#define IPSEC_DEBUG #ifdef IPSEC_DEBUG int ipsec_debug = 1; #else ==== //depot/projects/uart/netipsec/keysock.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.14 2006/04/01 15:42:01 rwatson Exp $ */ +/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.15 2006/04/04 10:11:15 dd Exp $ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /*- @@ -460,7 +460,6 @@ key_detach(struct socket *so) { struct keycb *kp = (struct keycb *)sotorawcb(so); - int s, error; KASSERT(kp != NULL, ("key_detach: kp == NULL")); if (kp->kp_raw.rcb_proto.sp_protocol ==== //depot/projects/uart/sys/umtx.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/sys/umtx.h,v 1.19 2006/03/28 14:32:38 des Exp $ + * $FreeBSD: src/sys/sys/umtx.h,v 1.20 2006/04/04 02:57:09 davidxu Exp $ * */ @@ -40,7 +40,7 @@ #define UMTX_CONTESTED LONG_MIN struct umtx { - void *u_owner; /* Owner of the mutex. */ + uintptr_t u_owner; /* Owner of the mutex. */ }; /* op code for _umtx_op */ @@ -53,8 +53,13 @@ /* * System call for userland mutex operations. + * Bug: assume sizeof(uintptr_t) == sizeof(long) */ -int _umtx_op(struct umtx *umtx, int op, long id, void *uaddr, void *uaddr2); +int _umtx_wait(struct umtx *umtx, uintptr_t expect, + const struct timespec *timeout); +int _umtx_wake(struct umtx *umtx, int nr_wakeup); +int _umtx_op(struct umtx *umtx, int op, uintptr_t val, + void *uaddr, void *uaddr2); /* * Old (deprecated) userland mutex system calls. @@ -72,36 +77,33 @@ umtx->u_owner = UMTX_UNOWNED; } -static __inline long +static __inline uintptr_t umtx_owner(struct umtx *umtx) { - return ((long)umtx->u_owner & ~LONG_MIN); + return (umtx->u_owner & ~LONG_MIN); } static __inline int -umtx_lock(struct umtx *umtx, long id) +umtx_lock(struct umtx *umtx, uintptr_t id) { - if (atomic_cmpset_acq_ptr(&umtx->u_owner, (void *)UMTX_UNOWNED, - (void *)id) == 0) + if (atomic_cmpset_acq_ptr(&umtx->u_owner, UMTX_UNOWNED, id) == 0) if (_umtx_lock(umtx) == -1) return (errno); return (0); } static __inline int -umtx_trylock(struct umtx *umtx, long id) +umtx_trylock(struct umtx *umtx, uintptr_t id) { - if (atomic_cmpset_acq_ptr(&umtx->u_owner, (void *)UMTX_UNOWNED, - (void *)id) == 0) + if (atomic_cmpset_acq_ptr(&umtx->u_owner, UMTX_UNOWNED, id) == 0) return (EBUSY); return (0); } static __inline int -umtx_timedlock(struct umtx *umtx, long id, const struct timespec *timeout) +umtx_timedlock(struct umtx *umtx, uintptr_t id, const struct timespec *timeout) { - if (atomic_cmpset_acq_ptr(&umtx->u_owner, (void *)UMTX_UNOWNED, - (void *)id) == 0) + if (atomic_cmpset_acq_ptr(&umtx->u_owner, UMTX_UNOWNED, id) == 0) if (_umtx_op(umtx, UMTX_OP_LOCK, id, 0, __DECONST(void *, timeout)) == -1) return (errno); @@ -109,10 +111,9 @@ } static __inline int -umtx_unlock(struct umtx *umtx, long id) +umtx_unlock(struct umtx *umtx, uintptr_t id) { - if (atomic_cmpset_rel_ptr(&umtx->u_owner, (void *)id, - (void *)UMTX_UNOWNED) == 0) + if (atomic_cmpset_rel_ptr(&umtx->u_owner, id, UMTX_UNOWNED) == 0) if (_umtx_unlock(umtx) == -1) return (errno); return (0); From owner-p4-projects@FreeBSD.ORG Tue Apr 4 17:42: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 51C8916A423; Tue, 4 Apr 2006 17:42:52 +0000 (UTC) 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 2C2EC16A429 for ; Tue, 4 Apr 2006 17:42:52 +0000 (UTC) (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 BF2F443D49 for ; Tue, 4 Apr 2006 17:42:45 +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 k34HgjMk079457 for ; Tue, 4 Apr 2006 17:42:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34HgjOc079454 for perforce@freebsd.org; Tue, 4 Apr 2006 17:42:45 GMT (envelope-from imp@freebsd.org) Date: Tue, 4 Apr 2006 17:42:45 GMT Message-Id: <200604041742.k34HgjOc079454@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 94619 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, 04 Apr 2006 17:42:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=94619 Change 94619 by imp@imp_Speedy on 2006/04/04 17:41:55 Can only enable the TXRDY, RXRDY and TXCOMP interrupts while the bus isn't idle... Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#13 (text+ko) ==== @@ -54,7 +54,6 @@ struct mtx sc_mtx; /* basically a perimeter lock */ int flags; #define RXRDY 4 -#define STOP_DONE 8 #define TXRDY 0x10 uint32_t cwgr; int sc_started; @@ -134,8 +133,8 @@ WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); - WR4(sc, TWI_IER, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); + WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | + TWI_SR_NACK); if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); @@ -215,13 +214,12 @@ /* Reading the status also clears the interrupt */ status = RD4(sc, TWI_SR); + printf("status %x\n", status); if (status == 0) return; AT91_TWI_LOCK(sc); if (status & TWI_SR_RXRDY) sc->flags |= RXRDY; - if (status & TWI_SR_TXCOMP) - sc->flags |= STOP_DONE; if (status & TWI_SR_TXRDY) sc->flags |= TXRDY; AT91_TWI_UNLOCK(sc); @@ -234,12 +232,8 @@ { int err = 0; - while (!(sc->flags & STOP_DONE)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwsd", 0); - if (err) - break; - } - sc->flags &= ~STOP_DONE; + while (!(RD4(sc, TWI_SR) & TWI_SR_TXCOMP)) + continue; return (err); } @@ -305,6 +299,7 @@ sc = device_get_softc(dev); WR4(sc, TWI_MMR, TWI_MMR_MWRITE | RD4(sc, TWI_MMR)); AT91_TWI_LOCK(sc); + WR4(sc, TWI_IER, TWI_SR_TXRDY); while (len--) { WR4(sc, TWI_THR, *walker++); while (!(sc->flags & TXRDY)) { @@ -315,6 +310,7 @@ } } errout:; + WR4(sc, TWI_IDR, TWI_SR_TXRDY); AT91_TWI_UNLOCK(sc); return (err); } @@ -331,6 +327,7 @@ sc = device_get_softc(dev); AT91_TWI_LOCK(sc); WR4(sc, TWI_MMR, ~TWI_MMR_MWRITE & RD4(sc, TWI_MMR)); + WR4(sc, TWI_IER, TWI_SR_RXRDY); while (len-- > 0) { err = 0; while (!(sc->flags & RXRDY)) { @@ -353,6 +350,7 @@ *read = walker - buf; sc->sc_started = 0; errout:; + WR4(sc, TWI_IDR, TWI_SR_RXRDY); AT91_TWI_UNLOCK(sc); return (err); } From owner-p4-projects@FreeBSD.ORG Tue Apr 4 21:18: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 3C29F16A400; Tue, 4 Apr 2006 21:18:13 +0000 (UTC) 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 1000916A41F for ; Tue, 4 Apr 2006 21:18:13 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB10243D6D for ; Tue, 4 Apr 2006 21:18:12 +0000 (GMT) (envelope-from peter@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 k34LICmw003780 for ; Tue, 4 Apr 2006 21:18:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34LIC9O003777 for perforce@freebsd.org; Tue, 4 Apr 2006 21:18:12 GMT (envelope-from peter@freebsd.org) Date: Tue, 4 Apr 2006 21:18:12 GMT Message-Id: <200604042118.k34LIC9O003777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 94635 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, 04 Apr 2006 21:18:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=94635 Change 94635 by peter@peter_daintree on 2006/04/04 21:17:47 IFC @94632 Affected files ... .. //depot/projects/hammer/etc/rc.subr#34 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#11 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#27 integrate .. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/hammer/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/pthread_md.c#6 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/include/pthread_md.h#5 integrate .. //depot/projects/hammer/lib/libthr/pthread.map#9 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#14 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_barrier.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_barrierattr.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#11 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_clean.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_concurrency.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_condattr.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#22 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_equal.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#18 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_getprio.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_getschedparam.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_info.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#23 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#14 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kill.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_list.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_main_np.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_multi_np.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#29 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#31 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_self.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setprio.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_single_np.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spec.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#11 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_stack.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_switch_np.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#11 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_yield.c#2 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#10 integrate .. //depot/projects/hammer/share/man/man4/mfi.4#2 integrate .. //depot/projects/hammer/share/man/man8/rc.subr.8#8 integrate .. //depot/projects/hammer/sys/alpha/include/kdb.h#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#151 integrate .. //depot/projects/hammer/sys/amd64/include/gdb_machdep.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/kdb.h#3 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#16 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#5 integrate .. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#12 integrate .. //depot/projects/hammer/sys/dev/iicbus/iic.c#8 integrate .. //depot/projects/hammer/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/hammer/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#13 integrate .. //depot/projects/hammer/sys/i386/include/kdb.h#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#22 integrate .. //depot/projects/hammer/sys/ia64/include/kdb.h#3 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#18 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#69 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#104 integrate .. //depot/projects/hammer/sys/net/if_media.h#15 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#40 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#61 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#56 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#12 integrate .. //depot/projects/hammer/sys/sparc64/include/kdb.h#3 integrate .. //depot/projects/hammer/sys/sys/umtx.h#13 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#36 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufsmount.h#10 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#46 integrate .. //depot/projects/hammer/usr.bin/find/find.1#19 integrate Differences ... ==== //depot/projects/hammer/etc/rc.subr#34 (text+ko) ==== @@ -1,7 +1,7 @@ -# $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.50 2006/03/23 16:48:32 flz Exp $ +# $NetBSD: rc.subr,v 1.65 2004/10/12 14:45:29 lukem Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.51 2006/04/04 10:52:15 flz Exp $ # -# Copyright (c) 1997-2002 The NetBSD Foundation, Inc. +# Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. # # This code is derived from software contributed to The NetBSD Foundation @@ -39,6 +39,8 @@ # functions used by various rc scripts # +: ${rcvar_manpage:='rc.conf(5)'} + # # Operating System dependent/independent variables # @@ -138,12 +140,13 @@ return 1 ;; *) - warn "\$${1} is not set properly - see rc.conf(5)." + warn "\$${1} is not set properly - see ${rcvar_manpage}." return 1 ;; esac } +# # reverse_list list # print the list in reverse order # @@ -598,7 +601,7 @@ start) if [ -z "$rc_fast" -a -n "$rc_pid" ]; then - echo "${name} already running? (pid=$rc_pid)." + echo 1>&2 "${name} already running? (pid=$rc_pid)." return 1 fi @@ -612,7 +615,7 @@ # for _f in $required_vars; do if ! checkyesno $_f; then - warn "\$${_f} is not set." + warn "\$${_f} is not enabled." if [ -z "$rc_force" ]; then return 1 fi @@ -684,10 +687,10 @@ if [ -z "$rc_pid" ]; then [ -n "$rc_fast" ] && return 0 if [ -n "$pidfile" ]; then - echo \ + echo 1>&2 \ "${name} not running? (check $pidfile)." else - echo "${name} not running?" + echo 1>&2 "${name} not running?" fi return 1 fi @@ -729,10 +732,10 @@ reload) if [ -z "$rc_pid" ]; then if [ -n "$pidfile" ]; then - echo \ + echo 1>&2 \ "${name} not running? (check $pidfile)." else - echo "${name} not running?" + echo 1>&2 "${name} not running?" fi return 1 fi @@ -854,7 +857,7 @@ } # -# load_rc_config +# load_rc_config command # Source in the configuration file for a given command. # load_rc_config() @@ -898,6 +901,25 @@ ;; esac } + +# +# load_rc_config_var cmd var +# Read the rc.conf(5) var for cmd and set in the +# current shell, using load_rc_config in a subshell to prevent +# unwanted side effects from other variable assignments. +# +load_rc_config_var() +{ + if [ $# -ne 2 ]; then + err 3 'USAGE: load_rc_config_var cmd var' + fi + eval $(eval '( + load_rc_config '$1' >/dev/null; + if [ -n "${'$2'}" -o "${'$2'-UNSET}" != "UNSET" ]; then + echo '$2'=\'\''${'$2'}\'\''; + fi + )' ) +} # # rc_usage commands @@ -1065,6 +1087,8 @@ fi } +_rc_subr_loaded=: + # make_symlink src link # Make a symbolic link 'link' to src from basedir. If the # directory in which link is to be created does not exist ==== //depot/projects/hammer/lib/libc/stdlib/malloc.3#11 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.68 2006/03/28 22:16:04 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.69 2006/04/04 20:27:53 jasone Exp $ .\" -.Dd March 28, 2006 +.Dd April 4, 2006 .Dt MALLOC 3 .Os .Sh NAME @@ -316,6 +316,11 @@ The .Fn free function returns no value. +.Pp +The +.Fn malloc_usable_size +function returns the usable size of the allocation pointed to by +.Fa ptr . .Sh IMPLEMENTATION NOTES This allocator uses multiple arenas in order to reduce lock contention for threaded programs on multi-processor systems. ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#27 (text+ko) ==== @@ -66,7 +66,7 @@ * | | Sub-page | 1 kB | * | | | 2 kB | * |====================================| - * | Medium | 4 kB | + * | Large | 4 kB | * | | 8 kB | * | | 16 kB | * | | ... | @@ -74,7 +74,7 @@ * | | 512 kB | * | | 1 MB | * |====================================| - * | Large | 2 MB | + * | Huge | 2 MB | * | | 4 MB | * | | 6 MB | * | | ... | @@ -85,11 +85,11 @@ * Small : Each size class is segregated into its own set of runs. Each run * maintains a bitmap of which regions are free/allocated. * - * Medium : Each allocation is backed by a dedicated run. Metadata are stored - * in the associated arena chunk header maps. + * Large : Each allocation is backed by a dedicated run. Metadata are stored + * in the associated arena chunk header maps. * - * Large : Each allocation is backed by a dedicated contiguous set of chunks. - * Metadata are stored in a separate red-black tree. + * Huge : Each allocation is backed by a dedicated contiguous set of chunks. + * Metadata are stored in a separate red-black tree. * ******************************************************************************* */ @@ -143,8 +143,10 @@ (a_qr_b)->a_field.qre_prev = t; \ } while (0) -/* qr_meld() and qr_split() are functionally equivalent, so there's no need to - * have two copies of the code. */ +/* + * qr_meld() and qr_split() are functionally equivalent, so there's no need to + * have two copies of the code. + */ #define qr_split(a_qr_a, a_qr_b, a_type, a_field) \ qr_meld((a_qr_a), (a_qr_b), a_type, a_field) @@ -173,7 +175,7 @@ /* * In order to disable various extra features that may have negative - * performance impacts, (assertions, expanded statistics, redzones), define + * performance impacts, (assertions, expanded statistics), define * NO_MALLOC_EXTRAS. */ /* #define NO_MALLOC_EXTRAS */ @@ -183,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.120 2006/03/30 20:25:52 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.122 2006/04/04 19:46:28 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -348,8 +350,12 @@ spinlock_t lock; } malloc_mutex_t; +/* Set to true once the allocator has been initialized. */ static bool malloc_initialized = false; +/* Used to avoid initialization races. */ +static malloc_mutex_t init_lock = {_SPINLOCK_INITIALIZER}; + /******************************************************************************/ /* * Statistics data structures. @@ -654,7 +660,7 @@ */ /* Used as a special "nil" return value for malloc(0). */ -static int nil; +static const int nil; /* Number of CPUs. */ static unsigned ncpus; @@ -1498,62 +1504,125 @@ /* Generate red-black tree code for arena chunks. */ RB_GENERATE_STATIC(arena_chunk_tree_s, arena_chunk_s, link, arena_chunk_comp); -static inline void -arena_run_mask_free_set(arena_run_t *run, unsigned reg) +static inline void * +arena_run_reg_alloc(arena_run_t *run, arena_bin_t *bin) { - unsigned elm, bit; + void *ret; + unsigned i, mask, bit, regind; assert(run->magic == ARENA_RUN_MAGIC); - assert(reg < run->bin->nregs); + + for (i = run->regs_minelm; i < REGS_MASK_NELMS; i++) { + mask = run->regs_mask[i]; + if (mask != 0) { + /* Usable allocation found. */ + bit = ffs(mask) - 1; + + regind = ((i << (SIZEOF_INT_2POW + 3)) + bit); + ret = (void *)&((char *)run)[bin->reg0_offset + + (bin->reg_size * regind)]; + + /* Clear bit. */ + mask ^= (1 << bit); + run->regs_mask[i] = mask; - elm = reg >> (SIZEOF_INT_2POW + 3); - if (elm < run->regs_minelm) - run->regs_minelm = elm; - bit = reg - (elm << (SIZEOF_INT_2POW + 3)); - assert((run->regs_mask[elm] & (1 << bit)) == 0); - run->regs_mask[elm] |= (1 << bit); + return (ret); + } else { + /* + * Make a note that nothing before this element + * contains a free region. + */ + run->regs_minelm = i + 1; + } + } + /* Not reached. */ + assert(0); } static inline void -arena_run_mask_free_unset(arena_run_t *run, unsigned reg) +arena_run_reg_dalloc(arena_run_t *run, arena_bin_t *bin, void *ptr, size_t size) { - unsigned elm, bit; + unsigned diff, regind, elm, bit; assert(run->magic == ARENA_RUN_MAGIC); - assert(reg < run->bin->nregs); - elm = reg >> (SIZEOF_INT_2POW + 3); - bit = reg - (elm << (SIZEOF_INT_2POW + 3)); - assert((run->regs_mask[elm] & (1 << bit)) != 0); - run->regs_mask[elm] ^= (1 << bit); -} + /* + * Avoid doing division with a variable divisor if possible. This + * single operation can reduce allocator throughput by around 20%! + */ +#define POW2_CASE(p) \ + case (1 << (p)): \ + regind = diff >> (p); \ + break; +#define QUANTUM_CASE(n) \ + case ((n) << QUANTUM_2POW_MIN): \ + regind = diff / ((n) << QUANTUM_2POW_MIN); \ + break; -static inline unsigned -arena_run_search(arena_run_t *run) -{ - unsigned i, mask, bit; + /* + * These assertions make sure that the switch statement matches + * compile-time configuration. + */ + assert(tiny_min_2pow >= 1); + assert(QUANTUM_2POW_MIN >= 3 && QUANTUM_2POW_MIN <= 4); + assert(SMALL_MAX_2POW_DEFAULT == 9); - assert(run->magic == ARENA_RUN_MAGIC); + diff = (unsigned)((uintptr_t)ptr - (uintptr_t)run - bin->reg0_offset); + switch (size) { + POW2_CASE(1) + POW2_CASE(2) +#if (QUANTUM_2POW_MIN > 3) + POW2_CASE(3) +#endif + QUANTUM_CASE(1) + QUANTUM_CASE(2) + QUANTUM_CASE(3) + QUANTUM_CASE(4) + QUANTUM_CASE(5) + QUANTUM_CASE(6) + QUANTUM_CASE(7) + QUANTUM_CASE(8) + QUANTUM_CASE(9) + QUANTUM_CASE(10) + QUANTUM_CASE(11) + QUANTUM_CASE(12) + QUANTUM_CASE(13) + QUANTUM_CASE(14) + QUANTUM_CASE(15) + QUANTUM_CASE(16) + QUANTUM_CASE(17) + QUANTUM_CASE(18) + QUANTUM_CASE(19) + QUANTUM_CASE(20) + QUANTUM_CASE(21) + QUANTUM_CASE(22) + QUANTUM_CASE(23) + QUANTUM_CASE(24) + QUANTUM_CASE(25) + QUANTUM_CASE(26) + QUANTUM_CASE(27) + QUANTUM_CASE(28) + QUANTUM_CASE(29) + QUANTUM_CASE(30) + QUANTUM_CASE(31) + QUANTUM_CASE(32) - for (i = run->regs_minelm; i < REGS_MASK_NELMS; i++) { - mask = run->regs_mask[i]; - if (mask != 0) { - bit = ffs(mask); - if (bit != 0) { - /* Usable allocation found. */ - return ((i << (SIZEOF_INT_2POW + 3)) - + bit - 1); - } - } else { - /* - * Make a note that nothing before this element - * contains a free region. - */ - run->regs_minelm = i + 1; - } + POW2_CASE(10) + POW2_CASE(11) + POW2_CASE(12) /* Handle up to 8 kB pages. */ + default: + regind = diff / size; } +#undef POW2_CASE +#undef QUANTUM_CASE + assert(regind < bin->nregs); - return (UINT_MAX); + elm = regind >> (SIZEOF_INT_2POW + 3); + if (elm < run->regs_minelm) + run->regs_minelm = elm; + bit = regind - (elm << (SIZEOF_INT_2POW + 3)); + assert((run->regs_mask[elm] & (1 << bit)) == 0); + run->regs_mask[elm] |= (1 << bit); } static void @@ -1638,7 +1707,7 @@ header_size += pagesize - (header_size % pagesize); } - header_npages = header_size / pagesize; + header_npages = header_size >> pagesize_2pow; pow2_header_npages = pow2_ceil(header_npages); /* @@ -1665,7 +1734,7 @@ * the beginning of the chunk, which we just took care of by * "allocating" the leading pages. */ - while (map_offset < (chunk_size / pagesize)) { + while (map_offset < (chunk_size >> pagesize_2pow)) { log2_run_pages = ffs(map_offset) - 1; run_pages = (1 << log2_run_pages); for (i = 0; i < run_pages; i++) { @@ -1858,7 +1927,7 @@ * large enough. Look for a precise fit, but do not pass up a chunk * that has a run which is large enough to split. */ - min_ind = ffs(size / pagesize) - 1; + min_ind = ffs(size >> pagesize_2pow) - 1; RB_FOREACH(chunk, arena_chunk_tree_s, &arena->chunks) { for (i = min_ind; i < (opt_chunk_2pow - pagesize_2pow); @@ -2044,18 +2113,12 @@ size_t size) { void *ret; - unsigned regind; assert(run->magic == ARENA_RUN_MAGIC); assert(run->nfree > 0); - regind = arena_run_search(run); - assert(regind != UINT_MAX); - assert(regind < bin->nregs); - - ret = (void *)&((char *)run)[bin->reg0_offset + (bin->reg_size - * regind)]; - arena_run_mask_free_unset(run, regind); + ret = arena_run_reg_alloc(run, bin); + assert(ret != NULL); run->nfree--; if (run->nfree < run->free_min) { /* Promote run to higher fullness quartile. */ @@ -2256,7 +2319,6 @@ if (mapelm.large == false) { arena_run_t *run; arena_bin_t *bin; - unsigned regind; /* Small allocation. */ @@ -2270,10 +2332,8 @@ if (opt_junk) memset(ptr, 0x5a, size); - regind = (unsigned)(((uintptr_t)ptr - (uintptr_t)run - - bin->reg0_offset) / size); malloc_mutex_lock(&arena->mtx); - arena_run_mask_free_set(run, regind); + arena_run_reg_dalloc(run, bin, ptr, size); run->nfree++; if (run->nfree > run->free_max) { /* Demote run to lower fullness quartile. */ @@ -2913,12 +2973,6 @@ malloc_init(void) { - /* - * We always initialize before threads are created, since any thread - * creation first triggers allocations. - */ - assert(__isthreaded == 0 || malloc_initialized); - if (malloc_initialized == false) return (malloc_init_hard()); @@ -2933,6 +2987,16 @@ char buf[PATH_MAX + 1]; const char *opts; + malloc_mutex_lock(&init_lock); + if (malloc_initialized) { + /* + * Another thread initialized the allocator before this one + * acquired init_lock. + */ + malloc_mutex_unlock(&init_lock); + return (false); + } + /* Get number of CPUs. */ { int mib[2]; @@ -3283,8 +3347,10 @@ /* Allocate and initialize arenas. */ arenas = (arena_t **)base_alloc(sizeof(arena_t *) * narenas); - if (arenas == NULL) + if (arenas == NULL) { + malloc_mutex_unlock(&init_lock); return (true); + } /* * Zero the array. In practice, this should always be pre-zeroed, * since it was just mmap()ed, but let's be sure. @@ -3296,12 +3362,15 @@ * arena_choose_hard(). */ arenas_extend(0); - if (arenas[0] == NULL) + if (arenas[0] == NULL) { + malloc_mutex_unlock(&init_lock); return (true); + } malloc_mutex_init(&arenas_mtx); malloc_initialized = true; + malloc_mutex_unlock(&init_lock); return (false); } @@ -3325,7 +3394,7 @@ if (size == 0) { if (opt_sysv == false) - ret = &nil; + ret = (void *)&nil; else ret = NULL; goto RETURN; @@ -3407,11 +3476,17 @@ num_size = num * size; if (num_size == 0) { if (opt_sysv == false) - ret = &nil; + ret = (void *)&nil; else ret = NULL; goto RETURN; - } else if (num_size / size != num) { + /* + * Try to avoid division here. We know that it isn't possible to + * overflow during multiplication if neither operand uses any of the + * most significant half of the bits in a size_t. + */ + } else if (((num | size) & (SIZE_T_MAX << (sizeof(size_t) << 2))) + && (num_size / size != num)) { /* size_t overflow. */ ret = NULL; goto RETURN; @@ -3474,7 +3549,7 @@ if (ptr != &nil && ptr != NULL) idalloc(ptr); - ret = &nil; + ret = (void *)&nil; } UTRACE(ptr, size, ret); ==== //depot/projects/hammer/lib/libthr/arch/amd64/amd64/pthread_md.c#2 (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/lib/libthr/arch/amd64/amd64/pthread_md.c,v 1.1 2005/04/02 01:19:57 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/amd64/amd64/pthread_md.c,v 1.2 2006/04/04 03:26:05 davidxu Exp $ */ #include @@ -38,13 +38,11 @@ _tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; - void *oldtls; if (initial) - __asm __volatile("movq %%fs:0, %0" : "=r" (oldtls)); + __asm __volatile("movq %%fs:0, %0" : "=r" (tcb)); else - oldtls = NULL; - tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); + tcb = _rtld_allocate_tls(NULL, sizeof(struct tcb), 16); if (tcb) tcb->tcb_thread = thread; return (tcb); ==== //depot/projects/hammer/lib/libthr/arch/amd64/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/amd64/include/pthread_md.h,v 1.1 2005/04/02 01:19:57 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/amd64/include/pthread_md.h,v 1.3 2006/04/04 03:35:26 davidxu Exp $ */ /* @@ -91,13 +91,9 @@ return (TCB_GET64(tcb_self)); } -extern struct pthread *_thr_initial; - static __inline struct pthread * _get_curthread(void) { - if (_thr_initial) - return (TCB_GET64(tcb_thread)); - return (NULL); + return (TCB_GET64(tcb_thread)); } #endif ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/pthread_md.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/i386/i386/pthread_md.c,v 1.6 2006/01/07 06:01:43 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/pthread_md.c,v 1.7 2006/04/04 03:26:06 davidxu Exp $ */ #include @@ -39,14 +39,11 @@ _tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; - void *oldtls; if (initial) - __asm __volatile("movl %%gs:0, %0" : "=r" (oldtls)); + __asm __volatile("movl %%gs:0, %0" : "=r" (tcb)); else - oldtls = NULL; - - tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); + tcb = _rtld_allocate_tls(NULL, sizeof(struct tcb), 16); if (tcb) tcb->tcb_thread = thread; return (tcb); ==== //depot/projects/hammer/lib/libthr/arch/i386/include/pthread_md.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/i386/include/pthread_md.h,v 1.5 2005/10/29 03:08:43 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/include/pthread_md.h,v 1.7 2006/04/04 03:35:25 davidxu Exp $ */ /* @@ -94,14 +94,10 @@ return (TCB_GET32(tcb_self)); } -extern struct pthread *_thr_initial; - /* Get the current thread. */ static __inline struct pthread * _get_curthread(void) { - if (_thr_initial) - return (TCB_GET32(tcb_thread)); - return (NULL); + return (TCB_GET32(tcb_thread)); } #endif ==== //depot/projects/hammer/lib/libthr/pthread.map#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/pthread.map,v 1.13 2006/03/08 23:47:04 davidxu Exp $ +# $FreeBSD: src/lib/libthr/pthread.map,v 1.14 2006/04/04 02:57:49 davidxu Exp $ LIBTHREAD_1_0 { global: ___creat; @@ -16,8 +16,8 @@ __pthread_cond_wait; __pthread_mutex_init; __pthread_mutex_lock; + __pthread_mutex_timedlock; __pthread_mutex_trylock; - __pthread_mutex_timedlock; __read; __readv; __recvfrom; @@ -26,6 +26,9 @@ __sendmsg; __sendto; __sigsuspend; + __sigtimedwait; + __sigwait; + __sigwaitinfo; __wait4; __write; __writev; @@ -43,7 +46,6 @@ _pthread_barrierattr_getpshared; _pthread_barrierattr_init; _pthread_barrierattr_setpshared; - _pthread_attr_default; _pthread_attr_destroy; _pthread_attr_get_np; _pthread_attr_getdetachstate; @@ -75,7 +77,6 @@ _pthread_cond_signal; _pthread_cond_timedwait; _pthread_cond_wait; - _pthread_condattr_default; _pthread_condattr_destroy; _pthread_condattr_getclock; _pthread_condattr_getpshared; @@ -104,7 +105,6 @@ _pthread_mutex_timedlock; _pthread_mutex_trylock; _pthread_mutex_unlock; - _pthread_mutexattr_default; _pthread_mutexattr_destroy; _pthread_mutexattr_getkind_np; _pthread_mutexattr_getprioceiling; @@ -156,21 +156,18 @@ _pthread_timedjoin_np; _pthread_yield; _raise; - _sem_close; _sem_destroy; _sem_getvalue; _sem_init; - _sem_open; _sem_post; _sem_timedwait; _sem_trywait; - _sem_unlink; _sem_wait; _sigaction; _sigprocmask; _sigsuspend; + _sigtimedwait; _sigwait; - _sigtimedwait; _sigwaitinfo; _sleep; _spinlock; @@ -181,7 +178,10 @@ _usleep; _vfork; _wait; + _wait4; _waitpid; + _write; + _writev; accept; aio_suspend; close; @@ -320,21 +320,16 @@ recvfrom; recvmsg; select; - sem_close; sem_destroy; sem_getvalue; sem_init; - sem_open; sem_post; sem_timedwait; sem_trywait; - sem_unlink; sem_wait; sendmsg; sendto; sigaction; - sigaltstack; - sigpending; sigprocmask; sigsuspend; sigwait; ==== //depot/projects/hammer/lib/libthr/thread/Makefile.inc#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.15 2006/03/27 23:50:21 davidxu Exp $ +# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.16 2006/04/04 02:57:49 davidxu Exp $ # thr sources .PATH: ${.CURDIR}/thread @@ -39,7 +39,6 @@ thr_rwlockattr.c \ thr_self.c \ thr_sem.c \ - thr_seterrno.c \ thr_setprio.c \ thr_setschedparam.c \ thr_sig.c \ ==== //depot/projects/hammer/lib/libthr/thread/thr_attr.c#5 (text+ko) ==== @@ -93,14 +93,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.4 2006/01/09 03:59:51 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.5 2006/04/04 02:57:49 davidxu Exp $ */ +#include "namespace.h" #include #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/hammer/lib/libthr/thread/thr_barrier.c#5 (text+ko) ==== @@ -23,12 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_barrier.c,v 1.4 2005/04/04 23:43:53 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_barrier.c,v 1.5 2006/04/04 02:57:49 davidxu Exp $ */ +#include "namespace.h" #include #include #include +#include "un-namespace.h" #include "thr_private.h" @@ -54,10 +56,12 @@ int _pthread_barrier_init(pthread_barrier_t *barrier, - const pthread_barrierattr_t *attr, int count) + const pthread_barrierattr_t *attr, unsigned count) { pthread_barrier_t bar; + (void)attr; + if (barrier == NULL || count <= 0) return (EINVAL); ==== //depot/projects/hammer/lib/libthr/thread/thr_barrierattr.c#3 (text+ko) ==== @@ -25,12 +25,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_barrierattr.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_barrierattr.c,v 1.3 2006/04/04 02:57:49 davidxu Exp $ */ +#include "namespace.h" #include #include #include +#include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#11 (text+ko) ==== @@ -23,11 +23,13 @@ * (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/lib/libthr/thread/thr_cancel.c,v 1.12 2006/03/25 07:03:13 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.13 2006/04/04 02:57:49 davidxu Exp $ * */ +#include "namespace.h" #include +#include "un-namespace.h" #include "thr_private.h" @@ -36,8 +38,6 @@ __weak_reference(_pthread_setcanceltype, pthread_setcanceltype); __weak_reference(_pthread_testcancel, pthread_testcancel); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 4 22:52:41 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 3642316A423; Tue, 4 Apr 2006 22:52:41 +0000 (UTC) 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 0B10016A400 for ; Tue, 4 Apr 2006 22:52:41 +0000 (UTC) (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 A49B043D45 for ; Tue, 4 Apr 2006 22:52:40 +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 k34MqeuC013606 for ; Tue, 4 Apr 2006 22:52:40 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34MpwBT013038 for perforce@freebsd.org; Tue, 4 Apr 2006 22:51:58 GMT (envelope-from marcel@freebsd.org) Date: Tue, 4 Apr 2006 22:51:58 GMT Message-Id: <200604042251.k34MpwBT013038@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 94641 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, 04 Apr 2006 22:52:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=94641 Change 94641 by marcel@marcel_nfs on 2006/04/04 22:50:52 IFC @94638 Affected files ... .. //depot/projects/ia64/MAINTAINERS#51 integrate .. //depot/projects/ia64/Makefile#47 integrate .. //depot/projects/ia64/Makefile.inc1#109 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#4 integrate .. //depot/projects/ia64/README#5 integrate .. //depot/projects/ia64/UPDATING#84 integrate .. //depot/projects/ia64/bin/Makefile#9 integrate .. //depot/projects/ia64/bin/Makefile.inc#11 integrate .. //depot/projects/ia64/bin/chflags/chflags.1#10 integrate .. //depot/projects/ia64/bin/csh/Makefile#14 integrate .. //depot/projects/ia64/bin/csh/config.h#5 integrate .. //depot/projects/ia64/bin/csh/iconv.h#1 branch .. //depot/projects/ia64/bin/csh/iconv_stub.c#1 branch .. //depot/projects/ia64/bin/ed/Makefile#12 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.1#8 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.c#8 integrate .. //depot/projects/ia64/bin/ln/ln.1#9 integrate .. //depot/projects/ia64/bin/ln/ln.c#12 integrate .. //depot/projects/ia64/bin/ls/cmp.c#9 integrate .. //depot/projects/ia64/bin/ls/extern.h#10 integrate .. //depot/projects/ia64/bin/ls/ls.1#29 integrate .. //depot/projects/ia64/bin/ls/ls.c#26 integrate .. //depot/projects/ia64/bin/ls/ls.h#9 integrate .. //depot/projects/ia64/bin/ls/print.c#20 integrate .. //depot/projects/ia64/bin/ls/util.c#14 integrate .. //depot/projects/ia64/bin/ps/keyword.c#18 integrate .. //depot/projects/ia64/bin/ps/print.c#16 integrate .. //depot/projects/ia64/bin/sh/builtins.def#9 integrate .. //depot/projects/ia64/bin/sh/error.c#10 integrate .. //depot/projects/ia64/bin/sh/eval.c#14 integrate .. //depot/projects/ia64/bin/sh/expand.c#16 integrate .. //depot/projects/ia64/bin/sh/jobs.c#24 integrate .. //depot/projects/ia64/bin/sh/main.c#7 integrate .. //depot/projects/ia64/bin/sh/miscbltin.c#9 integrate .. //depot/projects/ia64/bin/sh/mkbuiltins#8 integrate .. //depot/projects/ia64/bin/sh/var.c#14 integrate .. //depot/projects/ia64/bin/sh/var.h#6 integrate .. //depot/projects/ia64/contrib/bind9/FREEBSD-Upgrade#7 integrate .. //depot/projects/ia64/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/ia64/contrib/bsnmp/NEWS#8 integrate .. //depot/projects/ia64/contrib/bsnmp/TODO#3 integrate .. //depot/projects/ia64/contrib/bsnmp/VERSION#8 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.c#9 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.c#5 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.h#5 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpclient.c#6 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/oid-list#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.c#10 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#8 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_route.c#6 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/snmp_mibII.h#6 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/bsnmpd.1#7 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/config.c#7 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/main.c#9 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpd.config#7 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpmod.3#8 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/ia64/contrib/csup/GNUmakefile#1 branch .. //depot/projects/ia64/contrib/csup/Makefile#1 branch .. //depot/projects/ia64/contrib/csup/README#1 branch .. //depot/projects/ia64/contrib/csup/TODO#1 branch .. //depot/projects/ia64/contrib/csup/attrstack.c#1 branch .. //depot/projects/ia64/contrib/csup/attrstack.h#1 branch .. //depot/projects/ia64/contrib/csup/config.c#1 branch .. //depot/projects/ia64/contrib/csup/config.h#1 branch .. //depot/projects/ia64/contrib/csup/csup.1#1 branch .. //depot/projects/ia64/contrib/csup/detailer.c#1 branch .. //depot/projects/ia64/contrib/csup/detailer.h#1 branch .. //depot/projects/ia64/contrib/csup/diff.c#1 branch .. //depot/projects/ia64/contrib/csup/diff.h#1 branch .. //depot/projects/ia64/contrib/csup/fattr.c#1 branch .. //depot/projects/ia64/contrib/csup/fattr.h#1 branch .. //depot/projects/ia64/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/ia64/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/ia64/contrib/csup/fixups.c#1 branch .. //depot/projects/ia64/contrib/csup/fixups.h#1 branch .. //depot/projects/ia64/contrib/csup/fnmatch.c#1 branch .. //depot/projects/ia64/contrib/csup/fnmatch.h#1 branch .. //depot/projects/ia64/contrib/csup/globtree.c#1 branch .. //depot/projects/ia64/contrib/csup/globtree.h#1 branch .. //depot/projects/ia64/contrib/csup/idcache.c#1 branch .. //depot/projects/ia64/contrib/csup/idcache.h#1 branch .. //depot/projects/ia64/contrib/csup/keyword.c#1 branch .. //depot/projects/ia64/contrib/csup/keyword.h#1 branch .. //depot/projects/ia64/contrib/csup/lister.c#1 branch .. //depot/projects/ia64/contrib/csup/lister.h#1 branch .. //depot/projects/ia64/contrib/csup/main.c#1 branch .. //depot/projects/ia64/contrib/csup/main.h#1 branch .. //depot/projects/ia64/contrib/csup/misc.c#1 branch .. //depot/projects/ia64/contrib/csup/misc.h#1 branch .. //depot/projects/ia64/contrib/csup/mux.c#1 branch .. //depot/projects/ia64/contrib/csup/mux.h#1 branch .. //depot/projects/ia64/contrib/csup/parse.y#1 branch .. //depot/projects/ia64/contrib/csup/pathcomp.c#1 branch .. //depot/projects/ia64/contrib/csup/pathcomp.h#1 branch .. //depot/projects/ia64/contrib/csup/proto.c#1 branch .. //depot/projects/ia64/contrib/csup/proto.h#1 branch .. //depot/projects/ia64/contrib/csup/queue.h#1 branch .. //depot/projects/ia64/contrib/csup/status.c#1 branch .. //depot/projects/ia64/contrib/csup/status.h#1 branch .. //depot/projects/ia64/contrib/csup/stream.c#1 branch .. //depot/projects/ia64/contrib/csup/stream.h#1 branch .. //depot/projects/ia64/contrib/csup/threads.c#1 branch .. //depot/projects/ia64/contrib/csup/threads.h#1 branch .. //depot/projects/ia64/contrib/csup/token.h#1 branch .. //depot/projects/ia64/contrib/csup/token.l#1 branch .. //depot/projects/ia64/contrib/csup/updater.c#1 branch .. //depot/projects/ia64/contrib/csup/updater.h#1 branch .. //depot/projects/ia64/contrib/hostapd/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/hostapd/Makefile#3 integrate .. //depot/projects/ia64/contrib/hostapd/README#2 integrate .. //depot/projects/ia64/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/aes.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/common.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/common.h#3 integrate .. //depot/projects/ia64/contrib/hostapd/config.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/config.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/config_types.h#1 branch .. //depot/projects/ia64/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/ctrl_iface.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/defconfig#2 integrate .. //depot/projects/ia64/contrib/hostapd/defs.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/driver.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/ia64/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/eapol_sm.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/eapol_sm.h#3 integrate .. //depot/projects/ia64/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/ia64/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/ia64/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/ia64/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/ia64/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/ia64/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/ieee802_1x.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/ia64/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/ia64/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/ia64/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/ia64/contrib/hostapd/md5.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/md5.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/ms_funcs.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/radius.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/radius.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/radius_client.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/radius_server.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/tls.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/tls_openssl.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/version.h#3 integrate .. //depot/projects/ia64/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/ia64/contrib/hostapd/wpa.c#3 integrate .. //depot/projects/ia64/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/ia64/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/ia64/contrib/ipfilter/man/Makefile#4 integrate .. //depot/projects/ia64/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/ia64/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/ia64/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/ia64/contrib/libreadline/CHANGELOG#4 integrate .. //depot/projects/ia64/contrib/libreadline/CHANGES#4 integrate .. //depot/projects/ia64/contrib/libreadline/FREEBSD-upgrade#5 integrate .. //depot/projects/ia64/contrib/libreadline/INSTALL#4 integrate .. //depot/projects/ia64/contrib/libreadline/MANIFEST#4 integrate .. //depot/projects/ia64/contrib/libreadline/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/libreadline/NEWS#2 integrate .. //depot/projects/ia64/contrib/libreadline/README#4 integrate .. //depot/projects/ia64/contrib/libreadline/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/libreadline/bind.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/callback.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/chardefs.h#4 integrate .. //depot/projects/ia64/contrib/libreadline/complete.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/config.h.in#4 integrate .. //depot/projects/ia64/contrib/libreadline/configure#4 integrate .. //depot/projects/ia64/contrib/libreadline/configure.in#4 integrate .. //depot/projects/ia64/contrib/libreadline/display.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/doc/readline.3#5 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/libreadline/examples/histexamp.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/examples/rl.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/examples/rlcat.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/rlfe.c#2 delete .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/ChangeLog#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/Makefile.in#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/README#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/config.h.in#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/configure#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/configure.in#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/extern.h#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/os.h#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/pty.c#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/rlfe.c#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/screen.h#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rlptytest.c#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rltest.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/examples/rlversion.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/funmap.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/histexpand.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/history.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/input.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/macro.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/mbutil.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/misc.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/readline.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/readline.h#6 integrate .. //depot/projects/ia64/contrib/libreadline/rldefs.h#4 integrate .. //depot/projects/ia64/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/ia64/contrib/libreadline/rlprivate.h#4 integrate .. //depot/projects/ia64/contrib/libreadline/rltty.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/search.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/shell.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/shlib/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/libreadline/signals.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/support/config.guess#4 integrate .. //depot/projects/ia64/contrib/libreadline/support/shlib-install#4 integrate .. //depot/projects/ia64/contrib/libreadline/support/shobj-conf#4 integrate .. //depot/projects/ia64/contrib/libreadline/support/wcwidth.c#2 delete .. //depot/projects/ia64/contrib/libreadline/terminal.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/text.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/tilde.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/tilde.h#3 integrate .. //depot/projects/ia64/contrib/libreadline/undo.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/util.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/vi_keymap.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/vi_mode.c#5 integrate .. //depot/projects/ia64/contrib/netcat/nc.1#3 integrate .. //depot/projects/ia64/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/ia64/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/ia64/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/ia64/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/ia64/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/ia64/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/ia64/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/contrib/openbsm/HISTORY#1 branch .. //depot/projects/ia64/contrib/openbsm/LICENSE#1 branch .. //depot/projects/ia64/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/README#1 branch .. //depot/projects/ia64/contrib/openbsm/TODO#1 branch .. //depot/projects/ia64/contrib/openbsm/VERSION#1 branch .. //depot/projects/ia64/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/ia64/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/ia64/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/ia64/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/bsm/audit.h#1 branch .. //depot/projects/ia64/contrib/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/ia64/contrib/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/ia64/contrib/openbsm/bsm/audit_record.h#1 branch .. //depot/projects/ia64/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/ia64/contrib/openbsm/bsm/libbsm.h#1 branch .. //depot/projects/ia64/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/ia64/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/ia64/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/ia64/contrib/openbsm/config/config.h#1 branch .. //depot/projects/ia64/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/ia64/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/ia64/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/ia64/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/ia64/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/ia64/contrib/openbsm/config/missing#1 branch .. //depot/projects/ia64/contrib/openbsm/configure#1 branch .. //depot/projects/ia64/contrib/openbsm/configure.ac#1 branch .. //depot/projects/ia64/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/ia64/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/ia64/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/ia64/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/ia64/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/ia64/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/ia64/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/ia64/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/ia64/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/ia64/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/ia64/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/ia64/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/ia64/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/ia64/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/ia64/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/ia64/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/ia64/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/ia64/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/ia64/contrib/openbsm/man/setauid.2#1 branch .. //depot/projects/ia64/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openbsm/tools/audump.c#1 branch .. //depot/projects/ia64/contrib/opie/opiepasswd.c#3 integrate .. //depot/projects/ia64/contrib/pf/authpf/authpf.8#4 integrate .. //depot/projects/ia64/contrib/pf/pflogd/pflogd.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#21 integrate .. //depot/projects/ia64/contrib/sendmail/PGPKEYS#9 integrate .. //depot/projects/ia64/contrib/sendmail/README#7 integrate .. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#16 integrate .. //depot/projects/ia64/contrib/sendmail/cf/README#15 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/Makefile#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/knecht.mc#6 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#15 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/dnsbl.m4#6 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/enhdnsbl.m4#4 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/mtamark.m4#2 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#15 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#16 integrate .. //depot/projects/ia64/contrib/sendmail/cf/ostype/darwin.m4#6 integrate .. //depot/projects/ia64/contrib/sendmail/cf/sendmail.schema#7 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/dnsblaccess.m4#4 integrate .. //depot/projects/ia64/contrib/sendmail/doc/op/Makefile#6 integrate .. //depot/projects/ia64/contrib/sendmail/doc/op/op.me#15 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/mfdef.h#6 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#14 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/ldap.h#6 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/time.h#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/README#8 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_helo.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/libmilter.h#10 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#15 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/signal.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/smfi.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/Makefile.m4#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/b-strcmp.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/b-strl.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/clock.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/fclose.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/fflush.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/fopen.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/fpos.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/fseek.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/local.h#8 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/memstat.c#1 branch .. //depot/projects/ia64/contrib/sendmail/libsm/refill.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/shm.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/signal.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/stdio.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/strio.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/t-event.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/t-memstat.c#1 branch .. //depot/projects/ia64/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/ungetc.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/vfprintf.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/vfscanf.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/README#15 integrate .. //depot/projects/ia64/contrib/sendmail/src/TRACEFLAGS#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/collect.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.c#18 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.h#11 integrate .. //depot/projects/ia64/contrib/sendmail/src/daemon.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/src/deliver.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/envelope.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/headers.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/src/helpfile#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/main.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/src/map.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/src/mci.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/src/milter.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/mime.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/queue.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/ia64/contrib/sendmail/src/readcf.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/src/savemail.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.h#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/sfsasl.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/sfsasl.h#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/timers.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/tls.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/udb.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/src/util.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/version.c#16 integrate .. //depot/projects/ia64/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/README#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/common.h#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/config.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/ia64/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_mschapv2.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_peap.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tls_common.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_ttls.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eapol_sm.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/ia64/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/ms_funcs.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/tls_openssl.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/version.h#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_ctrl.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate .. //depot/projects/ia64/crypto/openssh/ChangeLog#11 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#9 integrate .. //depot/projects/ia64/crypto/openssh/Makefile.in#10 integrate .. //depot/projects/ia64/crypto/openssh/README#10 integrate .. //depot/projects/ia64/crypto/openssh/README.platform#4 integrate .. //depot/projects/ia64/crypto/openssh/README.tun#1 branch .. //depot/projects/ia64/crypto/openssh/acconfig.h#12 delete .. //depot/projects/ia64/crypto/openssh/aclocal.m4#2 integrate .. //depot/projects/ia64/crypto/openssh/auth-krb5.c#13 integrate .. //depot/projects/ia64/crypto/openssh/auth-options.c#7 integrate .. //depot/projects/ia64/crypto/openssh/auth-options.h#4 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.c#14 integrate .. //depot/projects/ia64/crypto/openssh/auth2-gss.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth2.c#15 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.c#10 integrate .. //depot/projects/ia64/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/ia64/crypto/openssh/canohost.c#13 integrate .. //depot/projects/ia64/crypto/openssh/channels.c#15 integrate .. //depot/projects/ia64/crypto/openssh/channels.h#11 integrate .. //depot/projects/ia64/crypto/openssh/cipher-aes.c#3 integrate .. //depot/projects/ia64/crypto/openssh/cipher-ctr.c#5 integrate .. //depot/projects/ia64/crypto/openssh/cipher.c#13 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.c#12 integrate .. //depot/projects/ia64/crypto/openssh/config.h#10 integrate .. //depot/projects/ia64/crypto/openssh/configure.ac#11 integrate .. //depot/projects/ia64/crypto/openssh/defines.h#11 integrate .. //depot/projects/ia64/crypto/openssh/dns.c#5 integrate .. //depot/projects/ia64/crypto/openssh/dns.h#3 integrate .. //depot/projects/ia64/crypto/openssh/entropy.c#5 integrate .. //depot/projects/ia64/crypto/openssh/entropy.h#2 integrate .. //depot/projects/ia64/crypto/openssh/envpass.sh#2 delete .. //depot/projects/ia64/crypto/openssh/gss-genr.c#4 integrate .. //depot/projects/ia64/crypto/openssh/gss-serv-krb5.c#6 integrate .. //depot/projects/ia64/crypto/openssh/gss-serv.c#4 integrate .. //depot/projects/ia64/crypto/openssh/hostfile.c#10 integrate .. //depot/projects/ia64/crypto/openssh/includes.h#12 integrate .. //depot/projects/ia64/crypto/openssh/kex.c#9 integrate .. //depot/projects/ia64/crypto/openssh/kex.h#8 integrate .. //depot/projects/ia64/crypto/openssh/kexdh.c#5 integrate .. //depot/projects/ia64/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/ia64/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/ia64/crypto/openssh/kexgex.c#5 integrate .. //depot/projects/ia64/crypto/openssh/kexgexc.c#3 integrate .. //depot/projects/ia64/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/ia64/crypto/openssh/loginrec.c#11 integrate .. //depot/projects/ia64/crypto/openssh/misc.c#11 integrate .. //depot/projects/ia64/crypto/openssh/misc.h#8 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#13 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.c#11 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/Makefile.in#8 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/base64.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/basename.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bindresvport.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-asprintf.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-misc.c#9 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-snprintf.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/daemon.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/dirname.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getcwd.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getgrouplist.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getopt.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getrrsetbyname.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/glob.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/glob.h#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_aton.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntoa.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntop.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/mktemp.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/openbsd-compat.h#8 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-tun.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-tun.h#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/readpassphrase.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/readpassphrase.h#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/realpath.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/rresvport.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/setenv.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sigact.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sigact.h#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strlcat.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strlcpy.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strmode.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strsep.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strtoll.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strtoul.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sys-queue.h#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sys-tree.h#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/vis.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/vis.h#4 integrate .. //depot/projects/ia64/crypto/openssh/opensshd.init.in#2 integrate .. //depot/projects/ia64/crypto/openssh/packet.c#13 integrate .. //depot/projects/ia64/crypto/openssh/progressmeter.c#6 integrate .. //depot/projects/ia64/crypto/openssh/readconf.c#14 integrate .. //depot/projects/ia64/crypto/openssh/readconf.h#11 integrate .. //depot/projects/ia64/crypto/openssh/regress/README.regress#5 integrate .. //depot/projects/ia64/crypto/openssh/regress/agent-getpeereid.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/regress/forwarding.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/regress/multiplex.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/regress/reconfigure.sh#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/scp-ssh-wrapper.sh#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/scp.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/regress/test-exec.sh#8 integrate .. //depot/projects/ia64/crypto/openssh/regress/try-ciphers.sh#5 integrate .. //depot/projects/ia64/crypto/openssh/regress/yes-head.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/scp.1#11 integrate .. //depot/projects/ia64/crypto/openssh/scp.c#12 integrate .. //depot/projects/ia64/crypto/openssh/servconf.c#16 integrate .. //depot/projects/ia64/crypto/openssh/servconf.h#10 integrate .. //depot/projects/ia64/crypto/openssh/serverloop.c#12 integrate .. //depot/projects/ia64/crypto/openssh/session.c#24 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.c#13 integrate .. //depot/projects/ia64/crypto/openssh/sftp-common.h#5 integrate .. //depot/projects/ia64/crypto/openssh/sftp-server.c#11 integrate .. //depot/projects/ia64/crypto/openssh/sftp.1#11 integrate .. //depot/projects/ia64/crypto/openssh/sftp.c#13 integrate .. //depot/projects/ia64/crypto/openssh/ssh-add.c#12 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.1#9 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.c#15 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.1#10 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.c#12 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.1#7 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.c#13 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keysign.c#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh.1#13 integrate .. //depot/projects/ia64/crypto/openssh/ssh.c#14 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#19 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#15 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.c#13 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.h#4 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect1.c#9 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect2.c#14 integrate .. //depot/projects/ia64/crypto/openssh/sshd.8#15 integrate .. //depot/projects/ia64/crypto/openssh/sshd.c#17 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#21 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#17 integrate .. //depot/projects/ia64/crypto/openssh/version.h#20 integrate .. //depot/projects/ia64/etc/Makefile#53 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#18 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#67 integrate .. //depot/projects/ia64/etc/devd.conf#23 integrate .. //depot/projects/ia64/etc/etc.sparc64/ttys#12 integrate .. //depot/projects/ia64/etc/group#10 integrate .. //depot/projects/ia64/etc/hosts.allow#4 integrate .. //depot/projects/ia64/etc/inetd.conf#16 integrate .. //depot/projects/ia64/etc/isdn/Makefile#9 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#37 integrate .. //depot/projects/ia64/etc/mtree/BSD.var.dist#15 integrate .. //depot/projects/ia64/etc/mtree/BSD.x11-4.dist#11 integrate .. //depot/projects/ia64/etc/mtree/Makefile#5 integrate .. //depot/projects/ia64/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/ia64/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/ia64/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/ia64/etc/periodic/daily/440.status-mailq#5 integrate .. //depot/projects/ia64/etc/periodic/daily/Makefile#6 integrate .. //depot/projects/ia64/etc/periodic/security/800.loginfail#6 integrate .. //depot/projects/ia64/etc/rc#33 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#38 integrate .. //depot/projects/ia64/etc/rc.d/SERVERS#6 integrate .. //depot/projects/ia64/etc/rc.d/abi#6 integrate .. //depot/projects/ia64/etc/rc.d/archdep#9 integrate .. //depot/projects/ia64/etc/rc.d/auditd#1 branch .. //depot/projects/ia64/etc/rc.d/hostapd#1 branch .. //depot/projects/ia64/etc/rc.d/ike#6 delete .. //depot/projects/ia64/etc/rc.d/ipfw#11 integrate .. //depot/projects/ia64/etc/rc.d/jail#17 integrate .. //depot/projects/ia64/etc/rc.d/kernel#1 branch .. //depot/projects/ia64/etc/rc.d/localpkg#6 integrate .. //depot/projects/ia64/etc/rc.d/named#16 integrate .. //depot/projects/ia64/etc/rc.d/netif#13 integrate .. //depot/projects/ia64/etc/rc.d/nsswitch#5 integrate .. //depot/projects/ia64/etc/rc.d/pccard#7 delete .. //depot/projects/ia64/etc/rc.d/pflog#7 integrate .. //depot/projects/ia64/etc/rc.d/root#11 integrate .. //depot/projects/ia64/etc/rc.d/serial#9 integrate .. //depot/projects/ia64/etc/rc.d/syscons#10 integrate .. //depot/projects/ia64/etc/rc.subr#27 integrate .. //depot/projects/ia64/etc/snmpd.config#3 integrate .. //depot/projects/ia64/games/factor/Makefile#8 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#54 integrate .. //depot/projects/ia64/gnu/lib/Makefile#11 integrate .. //depot/projects/ia64/gnu/lib/libdialog/Makefile#11 integrate .. //depot/projects/ia64/gnu/lib/libg2c/Makefile#9 integrate .. //depot/projects/ia64/gnu/lib/libgcc/Makefile#22 integrate .. //depot/projects/ia64/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/ia64/gnu/lib/libobjc/Makefile#15 integrate .. //depot/projects/ia64/gnu/lib/libreadline/Makefile.inc#8 integrate .. //depot/projects/ia64/gnu/lib/libreadline/config.h#4 integrate .. //depot/projects/ia64/gnu/usr.bin/Makefile#28 integrate .. //depot/projects/ia64/gnu/usr.bin/bc/Makefile#9 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdbserver/Makefile#4 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdbserver/low-fbsd.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/cc/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#21 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#13 integrate .. //depot/projects/ia64/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/ia64/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#8 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/search.c#8 integrate .. //depot/projects/ia64/include/Makefile#53 integrate .. //depot/projects/ia64/include/arpa/inet.h#10 integrate .. //depot/projects/ia64/include/arpa/nameser.h#3 integrate .. //depot/projects/ia64/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/ia64/include/malloc_np.h#1 branch .. //depot/projects/ia64/include/netdb.h#12 integrate .. //depot/projects/ia64/include/printf.h#2 integrate .. //depot/projects/ia64/include/proc_service.h#3 integrate .. //depot/projects/ia64/include/res_update.h#1 branch .. //depot/projects/ia64/include/resolv.h#9 integrate .. //depot/projects/ia64/include/rpc/auth.h#5 integrate .. //depot/projects/ia64/include/stdlib.h#29 integrate .. //depot/projects/ia64/kerberos5/Makefile#9 integrate .. //depot/projects/ia64/kerberos5/lib/libgssapi/Makefile#9 integrate .. //depot/projects/ia64/lib/Makefile#57 integrate .. //depot/projects/ia64/lib/bind/bind/Makefile#4 integrate .. //depot/projects/ia64/lib/bind/bind9/Makefile#4 integrate .. //depot/projects/ia64/lib/bind/config.mk#8 integrate .. //depot/projects/ia64/lib/bind/dns/Makefile#5 integrate .. //depot/projects/ia64/lib/bind/isc/Makefile#5 integrate .. //depot/projects/ia64/lib/bind/isccc/Makefile#4 integrate .. //depot/projects/ia64/lib/bind/isccfg/Makefile#4 integrate .. //depot/projects/ia64/lib/bind/lwres/Makefile#6 integrate .. //depot/projects/ia64/lib/libarchive/INSTALL#2 delete .. //depot/projects/ia64/lib/libarchive/Makefile#19 integrate .. //depot/projects/ia64/lib/libarchive/Makefile.am#4 delete .. //depot/projects/ia64/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#15 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#13 integrate .. //depot/projects/ia64/lib/libarchive/configure.ac.in#8 delete .. //depot/projects/ia64/lib/libarchive/tar.5#10 integrate .. //depot/projects/ia64/lib/libbsm/Makefile#1 branch .. //depot/projects/ia64/lib/libc/Makefile#21 integrate .. //depot/projects/ia64/lib/libc/Versions.def#1 branch .. //depot/projects/ia64/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/arm/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/compat-43/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/db/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/db/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/gdtoa/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#36 integrate .. //depot/projects/ia64/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/gen/_pthread_stubs.c#8 integrate .. //depot/projects/ia64/lib/libc/gen/_spinlock_stub.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/tls.c#6 integrate .. //depot/projects/ia64/lib/libc/gmon/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/include/isc/eventlib.h#1 branch .. //depot/projects/ia64/lib/libc/include/libc_private.h#9 integrate .. //depot/projects/ia64/lib/libc/include/namespace.h#13 integrate .. //depot/projects/ia64/lib/libc/include/port_after.h#1 branch .. //depot/projects/ia64/lib/libc/include/port_before.h#1 branch .. //depot/projects/ia64/lib/libc/include/resolv_mt.h#1 branch .. //depot/projects/ia64/lib/libc/include/un-namespace.h#11 integrate .. //depot/projects/ia64/lib/libc/inet/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/inet/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_addr.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_cidr_pton.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_lnaof.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_makeaddr.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_net_ntop.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_net_pton.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_neta.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_netof.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_network.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_ntoa.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_ntop.c#1 branch .. //depot/projects/ia64/lib/libc/inet/inet_pton.c#1 branch .. //depot/projects/ia64/lib/libc/inet/nsap_addr.c#1 branch .. //depot/projects/ia64/lib/libc/isc/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/isc/ev_streams.c#1 branch .. //depot/projects/ia64/lib/libc/isc/ev_timers.c#1 branch .. //depot/projects/ia64/lib/libc/isc/eventlib_p.h#1 branch .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#22 integrate .. //depot/projects/ia64/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/locale/utf8.c#8 integrate .. //depot/projects/ia64/lib/libc/nameser/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/nameser/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/nameser/ns_name.c#1 branch .. //depot/projects/ia64/lib/libc/nameser/ns_netint.c#1 branch .. //depot/projects/ia64/lib/libc/nameser/ns_parse.c#1 branch .. //depot/projects/ia64/lib/libc/nameser/ns_print.c#1 branch .. //depot/projects/ia64/lib/libc/nameser/ns_samedomain.c#1 branch .. //depot/projects/ia64/lib/libc/nameser/ns_ttl.c#1 branch .. //depot/projects/ia64/lib/libc/net/Makefile.inc#12 integrate .. //depot/projects/ia64/lib/libc/net/Symbol.map#1 branch .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#25 integrate .. //depot/projects/ia64/lib/libc/net/gethostbydns.c#14 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyht.c#5 integrate .. //depot/projects/ia64/lib/libc/net/gethostbynis.c#6 integrate .. //depot/projects/ia64/lib/libc/net/gethostnamadr.c#6 integrate .. //depot/projects/ia64/lib/libc/net/getnameinfo.c#9 integrate .. //depot/projects/ia64/lib/libc/net/getnetbydns.c#9 integrate .. //depot/projects/ia64/lib/libc/net/getnetbyht.c#6 integrate .. //depot/projects/ia64/lib/libc/net/getnetbynis.c#5 integrate .. //depot/projects/ia64/lib/libc/net/herror.c#4 delete .. //depot/projects/ia64/lib/libc/net/inet_addr.c#4 delete .. //depot/projects/ia64/lib/libc/net/inet_lnaof.c#3 delete .. //depot/projects/ia64/lib/libc/net/inet_makeaddr.c#3 delete .. //depot/projects/ia64/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/ia64/lib/libc/net/inet_net_ntop.c#3 delete .. //depot/projects/ia64/lib/libc/net/inet_net_pton.c#4 delete .. //depot/projects/ia64/lib/libc/net/inet_neta.c#4 delete .. //depot/projects/ia64/lib/libc/net/inet_netof.c#3 delete .. //depot/projects/ia64/lib/libc/net/inet_network.c#3 delete .. //depot/projects/ia64/lib/libc/net/inet_ntoa.c#3 delete .. //depot/projects/ia64/lib/libc/net/inet_ntop.c#7 delete .. //depot/projects/ia64/lib/libc/net/inet_pton.c#7 delete .. //depot/projects/ia64/lib/libc/net/name6.c#20 integrate .. //depot/projects/ia64/lib/libc/net/netdb_private.h#4 integrate .. //depot/projects/ia64/lib/libc/net/ns_name.c#5 delete .. //depot/projects/ia64/lib/libc/net/ns_netint.c#3 delete .. //depot/projects/ia64/lib/libc/net/ns_parse.c#3 delete .. //depot/projects/ia64/lib/libc/net/ns_print.c#3 delete .. //depot/projects/ia64/lib/libc/net/ns_ttl.c#4 delete .. //depot/projects/ia64/lib/libc/net/nsap_addr.c#3 delete .. //depot/projects/ia64/lib/libc/net/res_comp.c#4 delete .. //depot/projects/ia64/lib/libc/net/res_config.h#3 integrate .. //depot/projects/ia64/lib/libc/net/res_data.c#3 delete .. //depot/projects/ia64/lib/libc/net/res_debug.c#4 delete .. //depot/projects/ia64/lib/libc/net/res_init.c#8 delete .. //depot/projects/ia64/lib/libc/net/res_mkquery.c#4 delete .. //depot/projects/ia64/lib/libc/net/res_mkupdate.c#5 integrate .. //depot/projects/ia64/lib/libc/net/res_query.c#9 delete .. //depot/projects/ia64/lib/libc/net/res_send.c#10 delete .. //depot/projects/ia64/lib/libc/net/res_send_private.h#2 delete .. //depot/projects/ia64/lib/libc/net/res_update.c#4 integrate .. //depot/projects/ia64/lib/libc/nls/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/nls/Symbol.map#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 4 23:59: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 296BD16A420; Tue, 4 Apr 2006 23:59:05 +0000 (UTC) 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 052F116A400 for ; Tue, 4 Apr 2006 23:59:05 +0000 (UTC) (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 A5C7643D64 for ; Tue, 4 Apr 2006 23:59:03 +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 k34Nx3Dx053101 for ; Tue, 4 Apr 2006 23:59:03 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34Nx32a053095 for perforce@freebsd.org; Tue, 4 Apr 2006 23:59:03 GMT (envelope-from imp@freebsd.org) Date: Tue, 4 Apr 2006 23:59:03 GMT Message-Id: <200604042359.k34Nx32a053095@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 94647 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, 04 Apr 2006 23:59:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=94647 Change 94647 by imp@imp_Speedy on 2006/04/04 23:58:13 Attaching the iic device causes problems, for reasons as yet unknown. Affected files ... .. //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#2 (text+ko) ==== @@ -81,8 +81,8 @@ static int iicbus_probe(device_t dev) { + device_set_desc(dev, "Philips I2C bus"); - return (0); } @@ -139,54 +139,56 @@ printf("\n"); #endif + device_add_child(dev, "ic", -1); + device_add_child(dev, "iicsmb", -1); +#if 0 /* attach any known device */ - device_add_child(dev, "ic", -1); device_add_child(dev, "iic", -1); - device_add_child(dev, "iicsmb", -1); - +#endif bus_generic_attach(dev); - return (0); } static int iicbus_detach(device_t dev) { + iicbus_reset(dev, IIC_FASTEST, 0, NULL); - bus_generic_detach(dev); - return (0); } static int iicbus_add_child(device_t dev, int order, const char *name, int unit) { + device_add_child_ordered(dev, order, name, unit); - bus_generic_attach(dev); - return (0); } int iicbus_generic_intr(device_t dev, int event, char *buf) { + return (0); } int iicbus_null_callback(device_t dev, int index, caddr_t data) { + return (0); } int iicbus_null_repeated_start(device_t dev, u_char addr) { + return (IIC_ENOTSUPP); } +DRIVER_MODULE(iicbus, at91_twi, iicbus_driver, iicbus_devclass, 0, 0); DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0); DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0); DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Wed Apr 5 00:01: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 2AAFE16A423; Wed, 5 Apr 2006 00:01:07 +0000 (UTC) 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 E65CE16A420 for ; Wed, 5 Apr 2006 00:01:06 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CD7043D48 for ; Wed, 5 Apr 2006 00:01:06 +0000 (GMT) (envelope-from jmg@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 k350161J054481 for ; Wed, 5 Apr 2006 00:01:06 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k35016Zu054475 for perforce@freebsd.org; Wed, 5 Apr 2006 00:01:06 GMT (envelope-from jmg@freebsd.org) Date: Wed, 5 Apr 2006 00:01:06 GMT Message-Id: <200604050001.k35016Zu054475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94648 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, 05 Apr 2006 00:01:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=94648 Change 94648 by jmg@jmg_carbon-60 on 2006/04/05 00:00:28 fix prototype, and add prototype for poke.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#10 (text+ko) ==== @@ -101,7 +101,10 @@ extern uint64_t hvio_intr_gettarget(uint64_t sysino, uint32_t *cpuid); extern uint64_t hvio_intr_settarget(uint64_t sysino, uint32_t cpuid); extern uint64_t hvio_peek(devhandle_t dev_hdl, uint64_t r_addr, uint64_t size, - uint64_t *err_flag, uint64_t *data); + uint32_t *err_flag, uint64_t *data); +extern uint64_t hvio_poke(devhandle_t dev_hdl, uint64_t r_addr, uint64_t size, + uint64_t data, uint64_t pcidev, uint32_t *err_flag); + extern uint64_t hvio_config_get(devhandle_t dev_hdl, pci_device_t pci_device, pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t *data); extern uint64_t hvio_config_put(devhandle_t dev_hdl, pci_device_t pci_device, From owner-p4-projects@FreeBSD.ORG Wed Apr 5 00:06: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 AE7A116A422; Wed, 5 Apr 2006 00:06:13 +0000 (UTC) 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 7403D16A41F for ; Wed, 5 Apr 2006 00:06:13 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4222143D4C for ; Wed, 5 Apr 2006 00:06:13 +0000 (GMT) (envelope-from jmg@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 k3506DhO058119 for ; Wed, 5 Apr 2006 00:06:13 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3506CfW058116 for perforce@freebsd.org; Wed, 5 Apr 2006 00:06:12 GMT (envelope-from jmg@freebsd.org) Date: Wed, 5 Apr 2006 00:06:12 GMT Message-Id: <200604050006.k3506CfW058116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94649 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, 05 Apr 2006 00:06:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=94649 Change 94649 by jmg@jmg_arlene on 2006/04/05 00:05:20 match the calls to the prototype.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#4 (text+ko) ==== @@ -838,7 +838,7 @@ { int error; - uint64_t error_flag; + uint32_t error_flag; __BUS_DEBUG_ACCESS(h, o, "peek", 1); error = hvio_peek(h, o, 1, &error_flag, (uint64_t *)a); @@ -852,7 +852,7 @@ { int error; - uint64_t error_flag; + uint32_t error_flag; __BUS_DEBUG_ACCESS(h, o, "peek", 2); error = hvio_peek(h, o, 2, &error_flag, (uint64_t *)a); @@ -865,7 +865,7 @@ { int error; - uint64_t error_flag; + uint32_t error_flag; __BUS_DEBUG_ACCESS(h, o, "peek", 4); error = hvio_peek(h, o, 4, &error_flag, (uint64_t *)a); From owner-p4-projects@FreeBSD.ORG Wed Apr 5 00:13: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 8F29D16A427; Wed, 5 Apr 2006 00:13:23 +0000 (UTC) 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 45D7E16A425 for ; Wed, 5 Apr 2006 00:13:23 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 531C243D55 for ; Wed, 5 Apr 2006 00:13:22 +0000 (GMT) (envelope-from jmg@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 k350DMCi060885 for ; Wed, 5 Apr 2006 00:13:22 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k350DMaI060879 for perforce@freebsd.org; Wed, 5 Apr 2006 00:13:22 GMT (envelope-from jmg@freebsd.org) Date: Wed, 5 Apr 2006 00:13:22 GMT Message-Id: <200604050013.k350DMaI060879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94650 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, 05 Apr 2006 00:13:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=94650 Change 94650 by jmg@jmg_carbon-60 on 2006/04/05 00:13:19 first crack at getting pci resource allocation working.. no interrupts yet, and this is just to move code to a machine I can compile on... buildable submit to come later.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#19 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#5 (text+ko) ==== @@ -216,36 +216,32 @@ 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 (0); + return (lduba_nc((caddr_t)(h + o), bus_type_asi[t->bst_type])); } 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 (0); + return (lduha_nc((caddr_t)(h + o), bus_type_asi[t->bst_type])); } 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 (0); + return (lduwa_nc((caddr_t)(h + o), bus_type_asi[t->bst_type])); } 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 (0); + return (ldxa_nc((caddr_t)(h + o), bus_type_asi[t->bst_type])); } static __inline void @@ -289,8 +285,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 @@ -298,8 +294,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 @@ -307,8 +303,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 @@ -316,8 +312,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 @@ -524,7 +520,6 @@ 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 (0); } @@ -533,7 +528,6 @@ 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 (0); } @@ -542,7 +536,6 @@ 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 (0); } @@ -551,7 +544,6 @@ 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 (0); } @@ -597,7 +589,6 @@ uint8_t v) { - __BUS_DEBUG_ACCESS(h, o, "write stream", 1); stba_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type], v); } @@ -607,7 +598,6 @@ uint16_t v) { - __BUS_DEBUG_ACCESS(h, o, "write stream", 2); } @@ -616,7 +606,6 @@ uint32_t v) { - __BUS_DEBUG_ACCESS(h, o, "write stream", 4); } @@ -625,7 +614,6 @@ uint64_t v) { - __BUS_DEBUG_ACCESS(h, o, "write stream", 8); } @@ -705,6 +693,7 @@ bus_space_read_region_stream_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, u_int8_t *a, bus_size_t c) { + for (; c; a++, c--, o++) *a = bus_space_read_stream_1(t, h, o); } @@ -713,6 +702,7 @@ bus_space_read_region_stream_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, u_int16_t *a, bus_size_t c) { + for (; c; a++, c--, o+=2) *a = bus_space_read_stream_2(t, h, o); } @@ -721,6 +711,7 @@ bus_space_read_region_stream_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, u_int32_t *a, bus_size_t c) { + for (; c; a++, c--, o+=4) *a = bus_space_read_stream_4(t, h, o); } @@ -729,6 +720,7 @@ bus_space_read_region_stream_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, u_int64_t *a, bus_size_t c) { + for (; c; a++, c--, o+=8) *a = bus_space_read_stream_8(t, h, o); } @@ -737,6 +729,7 @@ bus_space_write_region_stream_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, bus_size_t c) { + for (; c; a++, c--, o++) bus_space_write_stream_1(t, h, o, *a); } @@ -745,6 +738,7 @@ bus_space_write_region_stream_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, bus_size_t c) { + for (; c; a++, c--, o+=2) bus_space_write_stream_2(t, h, o, *a); } @@ -753,6 +747,7 @@ bus_space_write_region_stream_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, bus_size_t c) { + for (; c; a++, c--, o+=4) bus_space_write_stream_4(t, h, o, *a); } @@ -761,6 +756,7 @@ bus_space_write_region_stream_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, bus_size_t c) { + for (; c; a++, c--, o+=8) bus_space_write_stream_8(t, h, o, *a); } @@ -769,6 +765,7 @@ bus_space_set_region_stream_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, const u_int8_t v, bus_size_t c) { + for (; c; c--, o++) bus_space_write_stream_1(t, h, o, v); } @@ -777,6 +774,7 @@ bus_space_set_region_stream_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, const u_int16_t v, bus_size_t c) { + for (; c; c--, o+=2) bus_space_write_stream_2(t, h, o, v); } @@ -785,6 +783,7 @@ bus_space_set_region_stream_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, const u_int32_t v, bus_size_t c) { + for (; c; c--, o+=4) bus_space_write_stream_4(t, h, o, v); } @@ -793,6 +792,7 @@ bus_space_set_region_stream_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, const u_int64_t v, bus_size_t c) { + for (; c; c--, o+=8) bus_space_write_stream_8(t, h, o, v); } @@ -801,6 +801,7 @@ bus_space_copy_region_stream_1(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { + for (; c; c--, o1++, o2++) bus_space_write_stream_1(t, h1, o1, bus_space_read_stream_1(t, h2, o2)); @@ -810,6 +811,7 @@ bus_space_copy_region_stream_2(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { + for (; c; c--, o1+=2, o2+=2) bus_space_write_stream_2(t, h1, o1, bus_space_read_stream_2(t, h2, o2)); @@ -819,6 +821,7 @@ bus_space_copy_region_stream_4(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { + for (; c; c--, o1+=4, o2+=4) bus_space_write_stream_4(t, h1, o1, bus_space_read_stream_4(t, h2, o2)); @@ -828,59 +831,18 @@ bus_space_copy_region_stream_8(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { + for (; c; c--, o1+=8, o2+=8) bus_space_write_stream_8(t, h1, o1, bus_space_read_8(t, h2, o2)); } -static __inline int -bus_space_peek_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - u_int8_t *a) -{ - - int error; - uint32_t error_flag; - - __BUS_DEBUG_ACCESS(h, o, "peek", 1); - error = hvio_peek(h, o, 1, &error_flag, (uint64_t *)a); - /* XXX map HV errors to BSD errors */ - return (error); -} - -static __inline int -bus_space_peek_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - u_int16_t *a) -{ - - int error; - uint32_t error_flag; - - __BUS_DEBUG_ACCESS(h, o, "peek", 2); - error = hvio_peek(h, o, 2, &error_flag, (uint64_t *)a); - return (error); -} - -static __inline int -bus_space_peek_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - u_int32_t *a) -{ - - int error; - uint32_t error_flag; - - __BUS_DEBUG_ACCESS(h, o, "peek", 4); - error = hvio_peek(h, o, 4, &error_flag, (uint64_t *)a); - return (error); - - return (0); -} - /* Back-compat functions for old ISA drivers */ extern bus_space_tag_t isa_io_bt; extern bus_space_handle_t isa_io_hdl; 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/hv_pcivar.h#3 (text+ko) ==== @@ -33,6 +33,14 @@ struct hvpci_softc { devhandle_t hs_devhandle; uint8_t hs_busnum; + + struct rman hs_pci_mem_rman; + bus_space_tag_t hs_pci_memt; + bus_space_handle_t hs_pci_memh; + + struct rman hs_pci_io_rman; + bus_space_tag_t hs_pci_iot; + bus_space_handle_t hs_pci_ioh; }; #endif /* _HV_PCIVAR_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#4 (text+ko) ==== @@ -129,6 +129,16 @@ 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_REAL_IO, /* UPA */ + ASI_REAL_IO, /* SBUS */ + ASI_REAL_IO_L, /* PCI configuration space */ + ASI_REAL_IO_L, /* PCI memory space */ + ASI_REAL_IO_L, /* 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/hv_pci.c#19 (text+ko) ==== @@ -43,6 +43,7 @@ #include +#include #include #include @@ -56,6 +57,11 @@ #include #define SUN4V_REG_SPEC2CFG_HDL(x) ((x >> 32) & ~(0xfull << 28)) /* + * XXX - should get this through the bus, but Sun overloaded the reg OFW + * property, so there isn't normal resources associated w/ this device. + */ +extern struct bus_space_tag nexus_bustag; +/* * Methods */ static device_probe_t hvpci_probe; @@ -129,34 +135,35 @@ static int hvpci_attach(device_t dev) { + struct ofw_pci_ranges *range; + struct rman *rmanp; struct hvpci_softc *sc; + bus_space_tag_t *btp; phandle_t node; #if 0 uint32_t cell; #endif uint64_t reg, nreg; int br[2]; - int n; + int n, type; + int i, nrange, rid; - printf("hvpci_attach: dev_name=%s dev_type=%s\n", - ofw_bus_get_name(dev), ofw_bus_get_type(dev)); + sc = device_get_softc(dev); node = ofw_bus_get_node(dev); - printf("hvpci_attach: %p, node: %#x\n", dev, node); if (node == -1) panic("%s: ofw_bus_get_node failed.", __func__); - sc = device_get_softc(dev); - n = OF_getprop(node, "bus-range", &br[0], 8); - + /* Setup the root bus number for this bus */ + n = OF_getprop(node, "bus-range", &br[0], sizeof br); if (n == -1) panic("%s: could not get bus-range", __func__); - if (n != sizeof(br)) + if (n != sizeof br) panic("%s: broken bus-range (%d)", __func__, n); - sc->hs_busnum = br[0]; -#if 0 + /* Setup the HyperVisor devhandle for this bus */ +#if 1 if (OF_getprop(node, "reg", &cell, sizeof cell) == -1) panic("%s: OF_getprop failed.", __func__); sc->hs_devhandle = cell & 0xfffffff; @@ -165,8 +172,51 @@ sc->hs_devhandle = SUN4V_REG_SPEC2CFG_HDL(reg); #endif - printf("%s, devhandle=0x%lx, busnum: %hhu\n", __func__, - sc->hs_devhandle, sc->hs_busnum); + /* Pull in the ra addresses out of OFW */ + nrange = OF_getprop_alloc(node, "ranges", sizeof *range, + (void **)&range); + + /* Initialize memory and I/O rmans. */ + for (i = 0; i < nrange; i++) { +/* XXX - from sun4v/io/px/px_lib4v.c: px_ranges_phi_mask */ +#define PHYS_MASK ((1ll << (28 + 32)) - 1) + switch (OFW_PCI_RANGE_CS(&range[i])) { + case OFW_PCI_CS_IO: + rmanp = &sc->hs_pci_io_rman; + rmanp->rm_descr = "HyperVisor PCI I/O Ports"; + btp = &sc->hs_pci_iot; + sc->hs_pci_ioh = OFW_PCI_RANGE_PHYS(&range[i]) & + PHYS_MASK; + type = PCI_IO_BUS_SPACE; + break; + + case OFW_PCI_CS_MEM32: + continue; + + case OFW_PCI_CS_MEM64: + rmanp = &sc->hs_pci_mem_rman; + rmanp->rm_descr = "HyperVisor PCI Memory"; + btp = &sc->hs_pci_memt; + sc->hs_pci_memh = OFW_PCI_RANGE_PHYS(&range[i]) & + PHYS_MASK; + type = PCI_MEMORY_BUS_SPACE; + break; + + default: + panic("%s: unknown range type: %d", __func__, + OFW_PCI_RANGE_CS(&range[i])); + } + rmanp->rm_type = RMAN_ARRAY; + if (rman_init(rmanp) != 0 || rman_manage_region(rmanp, 0, + OFW_PCI_RANGE_SIZE(&range[i])) != 0) + panic("%s: failed to set up rman type: %d", __func__, + OFW_PCI_RANGE_CS(&range[i])); + + *btp = (bus_space_tag_t)malloc(sizeof **btp, M_DEVBUF, + M_WAITOK|M_ZERO); + btp->bst_parent = &nexus_bustag; + btp->bst_type = type; + } device_add_child(dev, "pci", -1); @@ -326,16 +376,70 @@ hvpci_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct hvpci_softc *sc; + struct resource *rv; + struct rman *rm; + bus_space_tag_t bt; + bus_space_handle_t bh; + int needactivate; + + sc = device_get_softc(dev); + + needactivate = flags & RF_ACTIVE; + flags &= ~RF_ACTIVE; + + switch (type) { + case SYS_RES_MEMORY: + rm = &sc->sc_pci_mem_rman; + bt = sc->sc_pci_memt; + bh = sc->sc_pci_memh; + break; + case SYS_RES_IOPORT: + rm = &sc->sc_pci_io_rman; + bt = sc->sc_pci_iot; + bh = sc->sc_pci_ioh; + break; + default: + return (NULL); + } + + rv = rman_reserve_resource(rm, start, end, count, flags, child); + if (rv == NULL) + return (NULL); + + bh += rman_get_start(rv); + rman_set_bustag(rv, bt); + rman_set_bushandle(rv, bh); - return (NULL); + if (needactivate) { + if (bus_activate_resource(child, type, *rid, rv)) { + rman_release_resource(rv); + return (NULL); + } + } + + return (rv); } static int hvpci_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + void *p; + int error; - return (0); + if (type == SYS_RES_MEMORY) { + /* + * Need to memory-map the device space, as some drivers depend + * on the virtual address being set and useable. + */ + error = sparc64_bus_mem_map(rman_get_bustag(r), + rman_get_bushandle(r), rman_get_size(r), 0, 0, &p); + if (error != 0) + return (error); + rman_set_virtual(r, p); + } + return (rman_activate_resource(r)); } static int From owner-p4-projects@FreeBSD.ORG Wed Apr 5 00:37: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 0F32516A423; Wed, 5 Apr 2006 00:37:56 +0000 (UTC) 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 A487516A401 for ; Wed, 5 Apr 2006 00:37:55 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A897043D62 for ; Wed, 5 Apr 2006 00:37:52 +0000 (GMT) (envelope-from jmg@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 k350bqag075376 for ; Wed, 5 Apr 2006 00:37:52 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k350bq17075367 for perforce@freebsd.org; Wed, 5 Apr 2006 00:37:52 GMT (envelope-from jmg@freebsd.org) Date: Wed, 5 Apr 2006 00:37:52 GMT Message-Id: <200604050037.k350bq17075367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94652 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, 05 Apr 2006 00:37:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=94652 Change 94652 by jmg@jmg_arlene on 2006/04/05 00:37:00 make compile.. pulling in ofw_pci_if.m for a define for ranges... make asi fetch/store work make hv_pci.c compile... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#11 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#20 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#11 (text+ko) ==== @@ -52,6 +52,7 @@ eeprom sbus sun4v/sun4v/gdb_machdep.c optional gdb sun4v/sun4v/hv_pci.c optional pci +sparc64/pci/ofw_pci_if.m optional pci # XXX hvcons should be optional sun4v/sun4v/hvcons.c standard sun4v/sun4v/hcall.S standard ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#6 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#6 (text+ko) ==== @@ -116,7 +116,7 @@ #define lduwa(va, asi) LD_GENERIC(va, asi, lduwa, u_int) #define ldxa(va, asi) LD_GENERIC(va, asi, ldxa, u_long) -#if 1 +#if 0 #define STNC_GEN(tp, o) \ static __inline void \ o ## _nc(caddr_t va, int asi, tp val) \ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#20 (text+ko) ==== @@ -38,23 +38,23 @@ #include #include #include +#include #include #include #include -#include #include #include #include #include +#include #include #include "pcib_if.h" -#include #define SUN4V_REG_SPEC2CFG_HDL(x) ((x >> 32) & ~(0xfull << 28)) /* * XXX - should get this through the bus, but Sun overloaded the reg OFW @@ -146,7 +146,7 @@ uint64_t reg, nreg; int br[2]; int n, type; - int i, nrange, rid; + int i, nrange; sc = device_get_softc(dev); @@ -163,7 +163,7 @@ sc->hs_busnum = br[0]; /* Setup the HyperVisor devhandle for this bus */ -#if 1 +#if 0 if (OF_getprop(node, "reg", &cell, sizeof cell) == -1) panic("%s: OF_getprop failed.", __func__); sc->hs_devhandle = cell & 0xfffffff; @@ -214,8 +214,8 @@ *btp = (bus_space_tag_t)malloc(sizeof **btp, M_DEVBUF, M_WAITOK|M_ZERO); - btp->bst_parent = &nexus_bustag; - btp->bst_type = type; + (*btp)->bst_parent = &nexus_bustag; + (*btp)->bst_type = type; } device_add_child(dev, "pci", -1); @@ -383,21 +383,21 @@ bus_space_handle_t bh; int needactivate; - sc = device_get_softc(dev); + sc = device_get_softc(bus); needactivate = flags & RF_ACTIVE; flags &= ~RF_ACTIVE; switch (type) { case SYS_RES_MEMORY: - rm = &sc->sc_pci_mem_rman; - bt = sc->sc_pci_memt; - bh = sc->sc_pci_memh; + rm = &sc->hs_pci_mem_rman; + bt = sc->hs_pci_memt; + bh = sc->hs_pci_memh; break; case SYS_RES_IOPORT: - rm = &sc->sc_pci_io_rman; - bt = sc->sc_pci_iot; - bh = sc->sc_pci_ioh; + rm = &sc->hs_pci_io_rman; + bt = sc->hs_pci_iot; + bh = sc->hs_pci_ioh; break; default: return (NULL); @@ -425,6 +425,7 @@ hvpci_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { +#if 0 void *p; int error; @@ -440,6 +441,9 @@ rman_set_virtual(r, p); } return (rman_activate_resource(r)); +#else + return (ENXIO); +#endif } static int From owner-p4-projects@FreeBSD.ORG Wed Apr 5 00:52:11 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 6448316A41F; Wed, 5 Apr 2006 00:52:11 +0000 (UTC) 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 29AFF16A401 for ; Wed, 5 Apr 2006 00:52:11 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBC8343D49 for ; Wed, 5 Apr 2006 00:52:10 +0000 (GMT) (envelope-from jmg@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 k350qA6e088837 for ; Wed, 5 Apr 2006 00:52:10 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k350qAws088834 for perforce@freebsd.org; Wed, 5 Apr 2006 00:52:10 GMT (envelope-from jmg@freebsd.org) Date: Wed, 5 Apr 2006 00:52:10 GMT Message-Id: <200604050052.k350qAws088834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94654 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, 05 Apr 2006 00:52:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=94654 Change 94654 by jmg@jmg_arlene on 2006/04/05 00:52:01 try to make activate_resource work.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#21 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#21 (text+ko) ==== @@ -52,6 +52,8 @@ #include #include +#include +#include #include "pcib_if.h" @@ -425,25 +427,14 @@ hvpci_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { -#if 0 void *p; - int error; if (type == SYS_RES_MEMORY) { - /* - * Need to memory-map the device space, as some drivers depend - * on the virtual address being set and useable. - */ - error = sparc64_bus_mem_map(rman_get_bustag(r), - rman_get_bushandle(r), rman_get_size(r), 0, 0, &p); - if (error != 0) - return (error); + /* XXX - we may still need to set the IE bit on the mapping */ + p = (void *)TLB_PHYS_TO_DIRECT(rman_get_bushandle(r)); rman_set_virtual(r, p); } return (rman_activate_resource(r)); -#else - return (ENXIO); -#endif } static int From owner-p4-projects@FreeBSD.ORG Wed Apr 5 01:35: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 807AB16A422; Wed, 5 Apr 2006 01:35:06 +0000 (UTC) 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 5F07616A401 for ; Wed, 5 Apr 2006 01:35:06 +0000 (UTC) (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 E541E43D48 for ; Wed, 5 Apr 2006 01:35:05 +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 k351Z5e9014905 for ; Wed, 5 Apr 2006 01:35:05 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k351Z4kX014887 for perforce@freebsd.org; Wed, 5 Apr 2006 01:35:04 GMT (envelope-from imp@freebsd.org) Date: Wed, 5 Apr 2006 01:35:04 GMT Message-Id: <200604050135.k351Z4kX014887@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 94658 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, 05 Apr 2006 01:35:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=94658 Change 94658 by imp@imp_harmony on 2006/04/05 01:34:09 IFC Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/clock.c#7 integrate .. //depot/projects/arm/src/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/arm/src/sys/alpha/include/cpu.h#3 integrate .. //depot/projects/arm/src/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/arm/src/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/arm/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/arm/src/sys/arm/at91/files.at91#6 integrate .. //depot/projects/arm/src/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#10 integrate .. //depot/projects/arm/src/sys/conf/NOTES#18 integrate .. //depot/projects/arm/src/sys/conf/files#23 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/arm/src/sys/conf/options#16 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_norm.c#6 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/arm/src/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#11 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/arm/src/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/arm/src/sys/dev/md/md.c#6 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#1 branch .. //depot/projects/arm/src/sys/dev/mfi/mfi_disk.c#1 branch .. //depot/projects/arm/src/sys/dev/mfi/mfi_ioctl.h#1 branch .. //depot/projects/arm/src/sys/dev/mfi/mfi_pci.c#1 branch .. //depot/projects/arm/src/sys/dev/mfi/mfireg.h#1 branch .. //depot/projects/arm/src/sys/dev/mfi/mfivar.h#1 branch .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_reg.h#3 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbbreg.h#4 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_ebus.c#4 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_sbus.c#4 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_bfe.h#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_bfe_ebus.c#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_bfe_macio.c#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_bfe_sbus.c#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_bus.h#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_core.c#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_dev_sab82532.c#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_dev_z8530.c#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_if.m#1 branch .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus_ebus.c#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus_scc.c#1 branch .. //depot/projects/arm/src/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_powerpc.c#1 branch .. //depot/projects/arm/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#8 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/arm/src/sys/gdb/gdb_cons.c#1 branch .. //depot/projects/arm/src/sys/gdb/gdb_int.h#2 integrate .. //depot/projects/arm/src/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#13 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum.c#6 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/arm/src/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/arm/src/sys/i386/i386/exception.s#4 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/arm/src/sys/i386/include/atomic.h#4 integrate .. //depot/projects/arm/src/sys/i386/include/kdb.h#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/arm/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/arm/src/sys/ia64/include/kdb.h#2 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_alq.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#11 integrate .. //depot/projects/arm/src/sys/kern/md5c.c#3 integrate .. //depot/projects/arm/src/sys/kern/serdev_if.m#1 branch .. //depot/projects/arm/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/arm/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#12 integrate .. //depot/projects/arm/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/arm/src/sys/kern/vfs_default.c#8 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/arm/src/sys/modules/Makefile#17 integrate .. //depot/projects/arm/src/sys/modules/ath/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/mfi/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/scc/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#11 integrate .. //depot/projects/arm/src/sys/net/if_media.h#5 integrate .. //depot/projects/arm/src/sys/net/if_ppp.c#5 integrate .. //depot/projects/arm/src/sys/net/raw_cb.c#2 integrate .. //depot/projects/arm/src/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/arm/src/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/arm/src/sys/netatm/atm_aal5.c#3 integrate .. //depot/projects/arm/src/sys/netatm/atm_proto.c#3 integrate .. //depot/projects/arm/src/sys/netatm/atm_socket.c#4 integrate .. //depot/projects/arm/src/sys/netatm/atm_usrreq.c#3 integrate .. //depot/projects/arm/src/sys/netatm/atm_var.h#4 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#7 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/in6.h#4 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/arm/src/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/arm/src/sys/netipsec/key.c#2 integrate .. //depot/projects/arm/src/sys/netipsec/key_var.h#2 integrate .. //depot/projects/arm/src/sys/netipsec/keydb.h#2 integrate .. //depot/projects/arm/src/sys/netipsec/keysock.c#4 integrate .. //depot/projects/arm/src/sys/netipsec/xform.h#2 integrate .. //depot/projects/arm/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/arm/src/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/arm/src/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/arm/src/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/arm/src/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/arm/src/sys/netipx/README#4 integrate .. //depot/projects/arm/src/sys/netipx/ipx_input.c#4 integrate .. //depot/projects/arm/src/sys/netipx/ipx_ip.c#4 integrate .. //depot/projects/arm/src/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/arm/src/sys/netipx/ipx_pcb.h#2 integrate .. //depot/projects/arm/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/arm/src/sys/netipx/spx_usrreq.c#5 integrate .. //depot/projects/arm/src/sys/netkey/keysock.c#4 integrate .. //depot/projects/arm/src/sys/netnatm/natm.c#4 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/bus.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#11 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/clkbrd.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/clkbrdreg.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/bus.h#4 integrate .. //depot/projects/arm/src/sys/sparc64/include/kdb.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/tick.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/arm/src/sys/sys/ata.h#5 integrate .. //depot/projects/arm/src/sys/sys/buf.h#4 integrate .. //depot/projects/arm/src/sys/sys/clock.h#2 integrate .. //depot/projects/arm/src/sys/sys/gmon.h#2 integrate .. //depot/projects/arm/src/sys/sys/linker.h#3 integrate .. //depot/projects/arm/src/sys/sys/mount.h#10 integrate .. //depot/projects/arm/src/sys/sys/param.h#11 integrate .. //depot/projects/arm/src/sys/sys/pmc.h#3 integrate .. //depot/projects/arm/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/arm/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/arm/src/sys/sys/protosw.h#4 integrate .. //depot/projects/arm/src/sys/sys/serial.h#3 integrate .. //depot/projects/arm/src/sys/sys/socketvar.h#7 integrate .. //depot/projects/arm/src/sys/sys/sx.h#3 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#6 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#11 integrate .. //depot/projects/arm/src/sys/sys/umtx.h#4 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#9 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufsmount.h#4 integrate .. //depot/projects/arm/src/sys/vm/pmap.h#4 integrate .. //depot/projects/arm/src/sys/vm/vm_mmap.c#3 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/clock.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.44 2006/03/07 22:12:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.45 2006/03/28 21:20:11 jhb Exp $"); #include "opt_clock.h" @@ -137,7 +137,6 @@ static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); -static uint64_t read_cycle_count(void); void clockattach(device_t dev) ==== //depot/projects/arm/src/sys/alpha/alpha/pmap.c#5 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.188 2006/04/03 21:16:07 peter Exp $"); #include #include @@ -2125,9 +2125,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2146,11 +2144,6 @@ pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else ==== //depot/projects/arm/src/sys/alpha/include/cpu.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.43 2005/12/22 22:16:04 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.44 2006/03/28 21:20:12 jhb Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /*- @@ -88,11 +88,12 @@ #define cpu_getstack(td) (alpha_pal_rdusp()) #define cpu_spinwait() /* nothing */ -#define get_cyclecount alpha_rpcc +#define get_cyclecount() read_cycle_count() void cpu_halt(void); void cpu_reset(void); void fork_trampoline(void); /* MAGIC */ +uint64_t read_cycle_count(void); void swi_vm(void *); #endif /* _KERNEL */ ==== //depot/projects/arm/src/sys/alpha/include/kdb.h#2 (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/alpha/include/kdb.h,v 1.2 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.3 2006/04/03 22:51:46 marcel Exp $ */ #ifndef _MACHINE_KDB_H_ @@ -31,6 +31,8 @@ #include +#define KDB_STOPPEDPCB(pc) &stoppcbs[pc->pc_cpuid] + static __inline void kdb_cpu_clear_singlestep(void) { ==== //depot/projects/arm/src/sys/amd64/acpica/madt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.19 2005/11/01 22:44:06 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $"); #include #include @@ -219,11 +219,12 @@ } /* - * For ACPI < 2.0, use the RSDT. For ACPI >= 2.0, use the XSDT. - * We map the XSDT and RSDT at page 1 in the crashdump area. - * Page 0 is used to map in the headers of candidate ACPI tables. + * For ACPI >= 2.0, use the XSDT if it is available. + * Otherwise, use the RSDT. We map the XSDT or RSDT at page 1 + * in the crashdump area. Page 0 is used to map in the + * headers of candidate ACPI tables. */ - if (rsdp->Revision >= 2) { + if (rsdp->Revision >= 2 && rsdp->XsdtPhysicalAddress != 0) { /* * AcpiOsGetRootPointer only verifies the checksum for * the version 1.0 portion of the RSDP. Version 2.0 has ==== //depot/projects/arm/src/sys/amd64/amd64/gdb_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.5 2005/09/27 21:10:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.6 2006/04/04 03:00:20 marcel Exp $"); #include #include @@ -91,3 +91,27 @@ kdb_frame->tf_rip = *(register_t *)val; } } + +int +gdb_cpu_signal(int type, int code) +{ + + switch (type & ~T_USER) { + case 0: return (SIGFPE); /* Divide by zero. */ + case 1: return (SIGTRAP); /* Debug exception. */ + case 3: return (SIGTRAP); /* Breakpoint. */ + case 4: return (SIGSEGV); /* into instr. (overflow). */ + case 5: return (SIGURG); /* bound instruction. */ + case 6: return (SIGILL); /* Invalid opcode. */ + case 7: return (SIGFPE); /* Coprocessor not present. */ + case 8: return (SIGEMT); /* Double fault. */ + case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ + case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ + case 11: return (SIGSEGV); /* Segment not present. */ + case 12: return (SIGSEGV); /* Stack exception. */ + case 13: return (SIGSEGV); /* General protection. */ + case 14: return (SIGSEGV); /* Page fault. */ + case 16: return (SIGEMT); /* Coprocessor error. */ + } + return (SIGEMT); +} ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.539 2006/03/21 18:07:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.543 2006/04/04 20:17:35 peter Exp $"); /* * Manages physical address maps. @@ -158,6 +158,13 @@ #define PMAP_INLINE #endif +#define PV_STATS +#ifdef PV_STATS +#define PV_STAT(x) do { x ; } while (0) +#else +#define PV_STAT(x) do { } while (0) +#endif + struct pmap kernel_pmap_store; vm_paddr_t avail_start; /* PA of first available physical page */ @@ -182,7 +189,6 @@ /* * Data for the pv entry allocation mechanism */ -static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int shpgperproc = PMAP_SHPGPERPROC; @@ -198,8 +204,8 @@ */ static caddr_t crashdumpmap; -static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(pmap_t locked_pmap); +static void free_pv_entry(pmap_t pmap, pv_entry_t pv); +static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -208,6 +214,8 @@ static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); +static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, + vm_page_t m); static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, int flags); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); @@ -509,7 +517,7 @@ PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); kernel_pmap->pm_active = -1; /* don't allow deactivation */ - TAILQ_INIT(&kernel_pmap->pm_pvlist); + TAILQ_INIT(&kernel_pmap->pm_pvchunk); nkpt = NKPT; /* @@ -569,8 +577,6 @@ * high water mark so that the system can recover from excessive * numbers of pv entries. */ - pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); @@ -1063,7 +1069,7 @@ PMAP_LOCK_INIT(pmap); pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + KPML4phys); pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1100,7 +1106,7 @@ pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | PG_V | PG_RW | PG_A | PG_M; pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1437,61 +1443,79 @@ * page management routines. ***************************************************/ -/* - * free the pv_entry back to the free list - */ -static PMAP_INLINE void -free_pv_entry(pv_entry_t pv) +CTASSERT(sizeof(struct pv_chunk) == PAGE_SIZE); +CTASSERT(_NPCM == 3); +CTASSERT(_NPCPV == 168); + +static __inline struct pv_chunk * +pv_to_chunk(pv_entry_t pv) { - pv_entry_count--; - uma_zfree(pvzone, pv); + + return (struct pv_chunk *)((uintptr_t)pv & ~(uintptr_t)PAGE_MASK); } +#define PV_PMAP(pv) (pv_to_chunk(pv)->pc_pmap) + +#define PC_FREE0 0xfffffffffffffffful +#define PC_FREE1 0xfffffffffffffffful +#define PC_FREE2 0x000000fffffffffful + +static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; + +#ifdef PV_STATS +static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_count, CTLFLAG_RD, &pc_chunk_count, 0, + "Current number of pv entry chunks"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_allocs, CTLFLAG_RD, &pc_chunk_allocs, 0, + "Current number of pv entry chunks allocated"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_frees, CTLFLAG_RD, &pc_chunk_frees, 0, + "Current number of pv entry chunks frees"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_tryfail, CTLFLAG_RD, &pc_chunk_tryfail, 0, + "Number of times tried to get a chunk page but failed."); + +static long pv_entry_frees, pv_entry_allocs; +static int pv_entry_spare; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, + "Current number of pv entry frees"); +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, + "Current number of pv entry allocs"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_spare, CTLFLAG_RD, &pv_entry_spare, 0, + "Current number of spare pv entries"); + +static int pmap_collect_inactive, pmap_collect_active; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_inactive, CTLFLAG_RD, &pmap_collect_inactive, 0, + "Current number times pmap_collect called on inactive queue"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_active, CTLFLAG_RD, &pmap_collect_active, 0, + "Current number times pmap_collect called on active queue"); +#endif + /* - * get a new pv_entry, allocating a block from the system - * when needed. + * We are in a serious low memory condition. Resort to + * drastic measures to free some pages so we can allocate + * another pv entry chunk. This is normally called to + * unmap inactive pages, and if necessary, active pages. */ -static pv_entry_t -get_pv_entry(pmap_t locked_pmap) +static void +pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) { - static const struct timeval printinterval = { 60, 0 }; - static struct timeval lastprint; - struct vpgqueues *vpq; pd_entry_t ptepde; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t allocated_pv, next_pv, pv; + pv_entry_t next_pv, pv; vm_offset_t va; vm_page_t m; - PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - allocated_pv = uma_zalloc(pvzone, M_NOWAIT); - if (allocated_pv != NULL) { - pv_entry_count++; - if (pv_entry_count > pv_entry_high_water) - pagedaemon_wakeup(); - else - return (allocated_pv); - } - - /* - * Reclaim pv entries: At first, destroy mappings to inactive - * pages. After that, if a pv entry is still needed, destroy - * mappings to active pages. - */ - if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, consider " - "increasing sysctl vm.pmap.shpgperproc or " - "vm.pmap.pv_entry_max\n"); - vpq = &vm_page_queues[PQ_INACTIVE]; -retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; - pmap = pv->pv_pmap; + pmap = PV_PMAP(pv); /* Avoid deadlock and lock recursion. */ if (pmap > locked_pmap) PMAP_LOCK(pmap); @@ -1501,18 +1525,17 @@ pte = pmap_pte_pde(pmap, va, &ptepde); tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, - ("get_pv_entry: wired pte %#lx", tpte)); + ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (tpte & PG_M) { KASSERT((tpte & PG_RW), - ("get_pv_entry: modified page not writable: va: %#lx, pte: %#lx", + ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", va, tpte)); if (pmap_track_modified(va)) vm_page_dirty(m); } pmap_invalidate_page(pmap, va); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); @@ -1520,20 +1543,130 @@ pmap_unuse_pt(pmap, va, ptepde); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); - if (allocated_pv == NULL) - allocated_pv = pv; - else - free_pv_entry(pv); + free_pv_entry(locked_pmap, pv); + } + } +} + + +/* + * free the pv_entry back to the free list + */ +static void +free_pv_entry(pmap_t pmap, pv_entry_t pv) +{ + vm_page_t m; + struct pv_chunk *pc; + int idx, field, bit; + + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc = pv_to_chunk(pv); + idx = pv - &pc->pc_pventry[0]; + field = idx / 64; + bit = idx % 64; + pc->pc_map[field] |= 1ul << bit; + /* move to head of list */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || + pc->pc_map[2] != PC_FREE2) + return; + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); + /* entire chunk is free, return it */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); +} + +/* + * get a new pv_entry, allocating a block from the system + * when needed. + */ +static pv_entry_t +get_pv_entry(pmap_t pmap, int try) +{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + static vm_pindex_t colour; + int bit, field; + pv_entry_t pv; + struct pv_chunk *pc; + vm_page_t m; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PV_STAT(pv_entry_allocs++); + PV_STAT(pv_entry_count++); + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + pc = TAILQ_FIRST(&pmap->pm_pvchunk); + if (pc != NULL) { + for (field = 0; field < _NPCM; field++) { + if (pc->pc_map[field]) { + bit = bsfq(pc->pc_map[field]); + break; + } + } + if (field < _NPCM) { + pv = &pc->pc_pventry[field * 64 + bit]; + pc->pc_map[field] &= ~(1ul << bit); + /* If this was the last item, move it to tail */ + if (pc->pc_map[0] == 0 && pc->pc_map[1] == 0 && + pc->pc_map[2] == 0) { + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); + } + PV_STAT(pv_entry_spare--); + return (pv); } } - if (allocated_pv == NULL) { - if (vpq == &vm_page_queues[PQ_INACTIVE]) { - vpq = &vm_page_queues[PQ_ACTIVE]; - goto retry; + /* No free items, allocate another chunk */ + m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + if (try) { + PV_STAT(pc_chunk_tryfail++); + return (NULL); + } + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv chunk entry is still needed, + * destroy mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, consider " + "increasing sysctl vm.pmap.shpgperproc or " + "vm.pmap.pv_entry_max\n"); + PV_STAT(pmap_collect_inactive++); + pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + PV_STAT(pmap_collect_active++); + pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) + panic("get_pv_entry: increase vm.pmap.shpgperproc"); } - panic("get_pv_entry: increase the vm.pmap.shpgperproc tunable"); } - return (allocated_pv); + PV_STAT(pc_chunk_count++); + PV_STAT(pc_chunk_allocs++); + colour++; + pc = (void *)PHYS_TO_DMAP(m->phys_addr); + pc->pc_pmap = pmap; + pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ + pc->pc_map[1] = PC_FREE1; + pc->pc_map[2] = PC_FREE2; + pv = &pc->pc_pventry[0]; + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + PV_STAT(pv_entry_spare += _NPCPV - 1); + return (pv); } static void @@ -1543,24 +1676,16 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (m->md.pv_list_count < pmap->pm_stats.resident_count) { - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pmap == pv->pv_pmap && va == pv->pv_va) - break; - } - } else { - TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) { - if (va == pv->pv_va) - break; - } + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + if (pmap == PV_PMAP(pv) && va == pv->pv_va) + break; } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - free_pv_entry(pv); + free_pv_entry(pmap, pv); } /* @@ -1572,15 +1697,32 @@ { pv_entry_t pv; - pv = get_pv_entry(pmap); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; - pv->pv_pmap = pmap; + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count++; +} + +/* + * Conditionally create a pv entry. + */ +static boolean_t +pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) +{ + pv_entry_t pv; PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); - TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; + if (pv_entry_count < pv_entry_high_water && + (pv = get_pv_entry(pmap, TRUE)) != NULL) { + pv->pv_va = va; + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count++; + return (TRUE); + } else + return (FALSE); } /* @@ -1766,6 +1908,7 @@ pmap_remove_all(vm_page_t m) { register pv_entry_t pv; + pmap_t pmap; pt_entry_t *pte, tpte; pd_entry_t ptepde; @@ -1780,12 +1923,13 @@ #endif mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { - PMAP_LOCK(pv->pv_pmap); - pv->pv_pmap->pm_stats.resident_count--; - pte = pmap_pte_pde(pv->pv_pmap, pv->pv_va, &ptepde); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pmap->pm_stats.resident_count--; + pte = pmap_pte_pde(pmap, pv->pv_va, &ptepde); tpte = pte_load_clear(pte); if (tpte & PG_W) - pv->pv_pmap->pm_stats.wired_count--; + pmap->pm_stats.wired_count--; if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); @@ -1799,13 +1943,12 @@ if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + pmap_invalidate_page(pmap, pv->pv_va); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, ptepde); - PMAP_UNLOCK(pv->pv_pmap); - free_pv_entry(pv); + pmap_unuse_pt(pmap, pv->pv_va, ptepde); + PMAP_UNLOCK(pmap); + free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2370,7 +2513,6 @@ vm_offset_t addr; vm_offset_t end_addr = src_addr + len; vm_offset_t va_next; - vm_page_t m; if (dst_addr != src_addr) return; @@ -2396,15 +2538,6 @@ if (addr >= UPT_MIN_ADDRESS) panic("pmap_copy: invalid to pmap_copy page tables"); - /* - * Don't let optional prefaulting of pages make us go - * way below the low water mark of free pages or way - * above high water mark of used pv entries. - */ - if (cnt.v_free_count < cnt.v_free_reserved || - pv_entry_count > pv_entry_high_water) - break; - pml4e = pmap_pml4e(src_pmap, addr); if ((*pml4e & PG_V) == 0) { va_next = (addr + NBPML4) & ~PML4MASK; @@ -2467,16 +2600,16 @@ dst_pte = (pt_entry_t *) PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpte)); dst_pte = &dst_pte[pmap_pte_index(addr)]; - if (*dst_pte == 0) { + if (*dst_pte == 0 && + pmap_try_insert_pv_entry(dst_pmap, addr, + PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* * Clear the modified and * accessed (referenced) bits * during the copy. */ - m = PHYS_TO_VM_PAGE(ptetemp & PG_FRAME); *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; - pmap_insert_entry(dst_pmap, addr, m); } else pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) @@ -2569,7 +2702,7 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pv->pv_pmap == pmap) { + if (PV_PMAP(pv) == pmap) { return TRUE; } loops++; @@ -2579,7 +2712,6 @@ return (FALSE); } -#define PMAP_REMOVE_PAGES_CURPROC_ONLY /* * Remove all pages from specified address space * this aids process exit speeds. Also, this code @@ -2589,79 +2721,95 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; - pv_entry_t pv, npv; + pv_entry_t pv; + struct pv_chunk *pc, *npc; + int field, idx; + int64_t bit; + uint64_t inuse, bitmask; + int allfree; -#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) { printf("warning: pmap_remove_pages called with non-current pmap\n"); return; } -#endif vm_page_lock_queues(); PMAP_LOCK(pmap); - for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { + TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) { + allfree = 1; + for (field = 0; field < _NPCM; field++) { + inuse = (~(pc->pc_map[field])) & pc_freemask[field]; + while (inuse != 0) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 5 14:23: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 5DFB816A423; Wed, 5 Apr 2006 14:23:55 +0000 (UTC) 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 3B8AF16A420 for ; Wed, 5 Apr 2006 14:23:55 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA90743D45 for ; Wed, 5 Apr 2006 14:23:54 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k35ENsPF072345 for ; Wed, 5 Apr 2006 14:23:54 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k35ENsqD072339 for perforce@freebsd.org; Wed, 5 Apr 2006 14:23:54 GMT (envelope-from gnn@neville-neil.com) Date: Wed, 5 Apr 2006 14:23:54 GMT Message-Id: <200604051423.k35ENsqD072339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 94678 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, 05 Apr 2006 14:23:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=94678 Change 94678 by gnn@gnn_devbox_fast_ipsec on 2006/04/05 14:23:36 Finish submitting integrations. Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pio.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pioreg.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmc.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmcreg.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmcvar.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_rtc.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_rtcreg.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_ssc.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_sscreg.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/ohci_atmelarm.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_disk.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_ioctl.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_pci.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfireg.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfivar.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_ebus.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_macio.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_sbus.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bus.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_core.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_sab82532.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_z8530.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_if.m#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_scc.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_powerpc.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/gdb/gdb_cons.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/kern/serdev_if.m#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/modules/mfi/Makefile#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/modules/scc/Makefile#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_ioctl.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_worker.c#2 edit Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pio.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pioreg.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmc.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmcreg.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmcvar.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_rtc.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_rtcreg.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_ssc.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_sscreg.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/ohci_atmelarm.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_disk.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_ioctl.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_pci.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfireg.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfivar.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_ebus.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_macio.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_sbus.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bus.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_core.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_sab82532.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_z8530.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_if.m#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_scc.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_powerpc.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/gdb/gdb_cons.c#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/kern/serdev_if.m#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/modules/mfi/Makefile#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/modules/scc/Makefile#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_ioctl.h#2 (text) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_worker.c#2 (text) ==== From owner-p4-projects@FreeBSD.ORG Wed Apr 5 14:42: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 C8B7516A424; Wed, 5 Apr 2006 14:42:20 +0000 (UTC) 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 9E98416A401 for ; Wed, 5 Apr 2006 14:42:20 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A43C543D6E for ; Wed, 5 Apr 2006 14:42:18 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k35EgIMn082081 for ; Wed, 5 Apr 2006 14:42:18 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k35EgIKJ082070 for perforce@freebsd.org; Wed, 5 Apr 2006 14:42:18 GMT (envelope-from gnn@neville-neil.com) Date: Wed, 5 Apr 2006 14:42:18 GMT Message-Id: <200604051442.k35EgIKJ082070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 94680 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, 05 Apr 2006 14:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=94680 Change 94680 by gnn@gnn_devbox_fast_ipsec on 2006/04/05 14:41:52 Integrate some more bits from rwatsons stuff Affected files ... .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keysock.c#4 edit Differences ... ==== //depot/projects/gnn_fast_ipsec/src/lib/libipsec/Makefile#2 (text+ko) ==== @@ -25,14 +25,17 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libipsec/Makefile,v 1.17 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libipsec/Makefile,v 1.19 2006/03/18 11:01:06 ru Exp $ + +SHLIBDIR?= /lib + +.include LIB= ipsec -SHLIBDIR?= /lib SHLIB_MAJOR= 2 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif ==== //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keysock.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.12 2006/01/21 10:44:34 bz Exp $ */ +/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.14 2006/04/01 15:42:01 rwatson Exp $ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /*- @@ -369,14 +369,11 @@ * key_abort() * derived from net/rtsock.c:rts_abort() */ -static int +static void key_abort(struct socket *so) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_abort(so); - splx(s); - return error; + + raw_usrreqs.pru_abort(so); } /* @@ -459,24 +456,20 @@ * key_detach() * derived from net/rtsock.c:rts_detach() */ -static int +static void key_detach(struct socket *so) { struct keycb *kp = (struct keycb *)sotorawcb(so); int s, error; - s = splnet(); - if (kp != 0) { - if (kp->kp_raw.rcb_proto.sp_protocol - == PF_KEY) /* XXX: AF_KEY */ - key_cb.key_count--; - key_cb.any_count--; + KASSERT(kp != NULL, ("key_detach: kp == NULL")); + if (kp->kp_raw.rcb_proto.sp_protocol + == PF_KEY) /* XXX: AF_KEY */ + key_cb.key_count--; + key_cb.any_count--; - key_freereg(so); - } - error = raw_usrreqs.pru_detach(so); - splx(s); - return error; + key_freereg(so); + raw_usrreqs.pru_detach(so); } /* From owner-p4-projects@FreeBSD.ORG Wed Apr 5 18:48: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 A30AF16A425; Wed, 5 Apr 2006 18:48:26 +0000 (UTC) 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 5EA4316A420 for ; Wed, 5 Apr 2006 18:48:26 +0000 (UTC) (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 BC6B543D5E for ; Wed, 5 Apr 2006 18:48:15 +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 k35ImFK4025704 for ; Wed, 5 Apr 2006 18:48:15 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 k35Ilgk0025697 for perforce@freebsd.org; Wed, 5 Apr 2006 18:47:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Apr 2006 18:47:42 GMT Message-Id: <200604051847.k35Ilgk0025697@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 94689 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, 05 Apr 2006 18:48:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=94689 Change 94689 by rwatson@rwatson_peppercorn on 2006/04/05 18:46:51 Integrate trustedbsd_acl_nfsv4, an NFSv4 ACL implementation for FreeBSD. Affected files ... .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/_types.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/smp.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/bus.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/param.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/help.common#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/module.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/coda/coda.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.alpha#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.arm#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.i386#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.ia64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.pc98#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/ldscript.arm#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.amd64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.arm#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.i386#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.pc98#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/systags.sh#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/ddb/db_access.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amrio.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbusreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cy/cy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/de/if_de.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/de/if_devar.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/README#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/boot_font.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/gfb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/tga.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/00README#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ic/i8259.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ic/via6522reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ieee488/upd7210.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_inline.h#2 delete .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ixgb/README#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/joy/joy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am7990.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am79900.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am79900var.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am7990var.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 6 00:45: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 05B9316A423; Thu, 6 Apr 2006 00:45:55 +0000 (UTC) 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 B781216A401 for ; Thu, 6 Apr 2006 00:45:54 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2794943D46 for ; Thu, 6 Apr 2006 00:45:54 +0000 (GMT) (envelope-from peter@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 k360jrfV052907 for ; Thu, 6 Apr 2006 00:45:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k360jrVj052901 for perforce@freebsd.org; Thu, 6 Apr 2006 00:45:53 GMT (envelope-from peter@freebsd.org) Date: Thu, 6 Apr 2006 00:45:53 GMT Message-Id: <200604060045.k360jrVj052901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 94709 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, 06 Apr 2006 00:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=94709 Change 94709 by peter@peter_daintree on 2006/04/06 00:45:38 IFC @94708 Affected files ... .. //depot/projects/hammer/bin/ps/keyword.c#16 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#28 integrate .. //depot/projects/hammer/sbin/ping/ping.8#10 integrate .. //depot/projects/hammer/sbin/ping/ping.c#19 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#11 integrate .. //depot/projects/hammer/share/man/man4/ng_fec.4#3 integrate .. //depot/projects/hammer/share/man/man9/Makefile#62 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#51 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#24 integrate .. //depot/projects/hammer/sys/dev/iicbus/iic.c#9 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbb.c#4 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicsmb.c#3 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#21 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#62 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#24 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#21 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#47 integrate .. //depot/projects/hammer/usr.bin/find/option.c#9 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#7 integrate Differences ... ==== //depot/projects/hammer/bin/ps/keyword.c#16 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.74 2006/03/08 09:15:20 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.75 2006/04/05 17:40:46 gad Exp $"); #include #include @@ -302,6 +302,8 @@ hp = strchr(p, '='); if (hp) *hp++ = '\0'; + else + hp = p; key.name = p; v = bsearch(&key, var, sizeof(var)/sizeof(VAR) - 1, sizeof(VAR), vcmp); ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#28 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.122 2006/04/04 19:46:28 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.124 2006/04/05 18:46:24 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1537,6 +1537,7 @@ } /* Not reached. */ assert(0); + return (NULL); } static inline void @@ -1639,14 +1640,9 @@ total_pages = chunk->map[run_ind].npages; need_pages = (size >> pagesize_2pow); -#ifdef MALLOC_DEBUG - for (i = 0; i < total_pages; i++) { - assert(chunk->map[run_ind + i].free); - assert(chunk->map[run_ind + i].large == false); - assert(chunk->map[run_ind + i].npages == total_pages); - assert(chunk->map[run_ind + i].pos == i); - } -#endif + assert(chunk->map[run_ind].free); + assert(chunk->map[run_ind].large == false); + assert(chunk->map[run_ind].npages == total_pages); /* Split enough pages from the front of run to fit allocation size. */ map_offset = run_ind; @@ -1662,12 +1658,10 @@ while (map_offset < run_ind + total_pages) { log2_run_pages = ffs(map_offset) - 1; run_pages = (1 << log2_run_pages); - for (i = 0; i < run_pages; i++) { - chunk->map[map_offset + i].free = true; - chunk->map[map_offset + i].large = false; - chunk->map[map_offset + i].npages = run_pages; - chunk->map[map_offset + i].pos = i; - } + + chunk->map[map_offset].free = true; + chunk->map[map_offset].large = false; + chunk->map[map_offset].npages = run_pages; chunk->nfree_runs[log2_run_pages]++; @@ -1737,12 +1731,10 @@ while (map_offset < (chunk_size >> pagesize_2pow)) { log2_run_pages = ffs(map_offset) - 1; run_pages = (1 << log2_run_pages); - for (i = 0; i < run_pages; i++) { - chunk->map[map_offset + i].free = true; - chunk->map[map_offset + i].large = false; - chunk->map[map_offset + i].npages = run_pages; - chunk->map[map_offset + i].pos = i; - } + + chunk->map[map_offset].free = true; + chunk->map[map_offset].large = false; + chunk->map[map_offset].npages = run_pages; chunk->nfree_runs[log2_run_pages]++; @@ -1970,7 +1962,7 @@ arena_run_dalloc(arena_t *arena, arena_run_t *run, size_t size) { arena_chunk_t *chunk; - unsigned i, run_ind, buddy_ind, base_run_ind, run_pages, log2_run_pages; + unsigned run_ind, buddy_ind, base_run_ind, run_pages, log2_run_pages; chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk) @@ -1983,12 +1975,9 @@ chunk->pages_used -= run_pages; /* Mark run as deallocated. */ - for (i = 0; i < run_pages; i++) { - chunk->map[run_ind + i].free = true; - chunk->map[run_ind + i].large = false; - chunk->map[run_ind + i].npages = run_pages; - chunk->map[run_ind + i].pos = i; - } + chunk->map[run_ind].free = true; + chunk->map[run_ind].large = false; + chunk->map[run_ind].npages = run_pages; /* * Tell the kernel that we don't need the data in this run, but only if @@ -2029,10 +2018,7 @@ chunk->nfree_runs[log2_run_pages]--; /* Coalesce. */ - for (i = 0; i < (run_pages << 1); i++) { - chunk->map[base_run_ind + i].npages = (run_pages << 1); - chunk->map[base_run_ind + i].pos = i; - } + chunk->map[base_run_ind].npages = (run_pages << 1); /* Update run_ind to be the beginning of the coalesced run. */ run_ind = base_run_ind; ==== //depot/projects/hammer/sbin/ping/ping.8#10 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ping.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/ping/ping.8,v 1.53 2005/11/18 10:32:11 ru Exp $ +.\" $FreeBSD: src/sbin/ping/ping.8,v 1.54 2006/04/05 12:30:42 glebius Exp $ .\" -.Dd August 15, 2005 +.Dd April 4, 2006 .Dt PING 8 .Os .Sh NAME @@ -52,6 +52,7 @@ .Op Fl S Ar src_addr .Op Fl s Ar packetsize .Op Fl t Ar timeout +.Op Fl W Ar waittime .Op Fl z Ar tos .Ar host .Nm @@ -68,6 +69,7 @@ .Op Fl s Ar packetsize .Op Fl T Ar ttl .Op Fl t Ar timeout +.Op Fl W Ar waittime .Op Fl z Ar tos .Ar mcast-group .Sh DESCRIPTION @@ -306,6 +308,10 @@ packets other than .Tn ECHO_RESPONSE that are received are listed. +.It Fl W Ar waittime +Time in milliseconds to wait for a reply for each packet sent. +If a reply arrives later, the packet is not printed as replied, but +considered as replied when calculating statistics. .It Fl z Ar tos Use the specified type of service. .El ==== //depot/projects/hammer/sbin/ping/ping.c#19 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.108 2005/12/01 22:03:34 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.109 2006/04/05 12:30:42 glebius Exp $"); /* * P I N G . C @@ -100,7 +100,7 @@ /* runs out of buffer space */ #define MAXIPLEN (sizeof(struct ip) + MAX_IPOPTLEN) #define MAXICMPLEN (ICMP_ADVLENMIN + MAX_IPOPTLEN) -#define MAXWAIT 10 /* max seconds to wait for response */ +#define MAXWAIT 10000 /* max ms to wait for response */ #define MAXALARM (60 * 60) /* max seconds for alarm timeout */ #define MAXTOS 255 @@ -143,6 +143,7 @@ #define F_MASK 0x80000 #define F_TIME 0x100000 #define F_SWEEP 0x200000 +#define F_WAITTIME 0x400000 /* * MAX_DUP_CHK is the number of bits in received table, i.e. the maximum @@ -183,6 +184,8 @@ int sweepmin = 0; /* start value of payload in sweep */ int sweepincr = 1; /* payload increment in sweep */ int interval = 1000; /* interval between packets, ms */ +int waittime = MAXWAIT; /* timeout for each packet */ +long nrcvtimeout = 0; /* # of packets we got back after waittime */ /* timing */ int timing; /* flag to do timing */ @@ -261,7 +264,7 @@ outpack = outpackhdr + sizeof(struct ip); while ((ch = getopt(argc, argv, - "Aac:DdfG:g:h:I:i:Ll:M:m:nop:QqRrS:s:T:t:vz:" + "Aac:DdfG:g:h:I:i:Ll:M:m:nop:QqRrS:s:T:t:vW:z:" #ifdef IPSEC #ifdef IPSEC_POLICY_IPSEC "P:" @@ -469,6 +472,14 @@ case 'v': options |= F_VERBOSE; break; + case 'W': /* wait ms for answer */ + t = strtod(optarg, &ep); + if (*ep || ep == optarg || t > (double)INT_MAX) + errx(EX_USAGE, "invalid timing interval: `%s'", + optarg); + options |= F_WAITTIME; + waittime = (int)t; + break; case 'z': options |= F_HDRINCL; ultmp = strtoul(optarg, &ep, 0); @@ -880,8 +891,10 @@ intvl.tv_sec = 2 * tmax / 1000; if (!intvl.tv_sec) intvl.tv_sec = 1; - } else - intvl.tv_sec = MAXWAIT; + } else { + intvl.tv_sec = waittime / 1000; + intvl.tv_usec = waittime % 1000 * 1000; + } } (void)gettimeofday(&last, NULL); if (ntransmitted - nreceived - 1 > nmissedmax) { @@ -1075,6 +1088,11 @@ if (options & F_QUIET) return; + + if (options & F_WAITTIME && triptime > waittime) { + ++nrcvtimeout; + return; + } if (options & F_FLOOD) (void)write(STDOUT_FILENO, &BSPACE, 1); @@ -1373,6 +1391,8 @@ (int)(((ntransmitted - nreceived) * 100) / ntransmitted)); } + if (nrcvtimeout) + (void)printf(", %ld packets out of wait time", nrcvtimeout); (void)putchar('\n'); if (nreceived && timing) { double n = nreceived + nrepeats; @@ -1686,13 +1706,14 @@ usage() { - (void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", + (void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", "usage: ping [-AaDdfnoQqRrv] [-c count] [-G sweepmaxsize] [-g sweepminsize]", " [-h sweepincrsize] [-i wait] [-l preload] [-M mask | time] [-m ttl]", " " SECOPT " [-p pattern] [-S src_addr] [-s packetsize] [-t timeout]", -" [-z tos] host", +" [-W waittime] [-z tos] host", " ping [-AaDdfLnoQqRrv] [-c count] [-I iface] [-i wait] [-l preload]", " [-M mask | time] [-m ttl]" SECOPT " [-p pattern] [-S src_addr]", -" [-s packetsize] [-T ttl] [-t timeout] [-z tos] mcast-group"); +" [-s packetsize] [-T ttl] [-t timeout] [-W waittime]", +" [-z tos] mcast-group"); exit(EX_USAGE); } ==== //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#11 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_ibm.4,v 1.12 2006/04/01 11:21:00 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_ibm.4,v 1.14 2006/04/05 21:51:40 brueffer Exp $ .\" .Dd January 14, 2006 .Dt ACPI_IBM 4 i386 ==== //depot/projects/hammer/share/man/man4/ng_fec.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_fec.4,v 1.3 2006/03/05 15:56:22 keramida Exp $ +.\" $FreeBSD: src/share/man/man4/ng_fec.4,v 1.4 2006/04/06 00:32:28 dd Exp $ .\" .Dd July 22, 2004 .Dt NG_FEC 4 @@ -68,9 +68,9 @@ .Pp The following control messages define the forwarding method for a node: .Bl -tag -width indent -.It Dv NGM_FEC_MODE_INET Pq Dq Li set_mode_mac +.It Dv NGM_FEC_MODE_MAC Pq Dq Li set_mode_mac Forwarding decisions will be based on the link-layer MAC address of the destination. -.It Dv NGM_FEC_MODE_MAC Pq Dq Li set_mode_inet +.It Dv NGM_FEC_MODE_INET Pq Dq Li set_mode_inet Forwarding decisions will be based on the IP address of the destination. .El .Sh SHUTDOWN ==== //depot/projects/hammer/share/man/man9/Makefile#62 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.270 2006/02/01 19:39:25 glebius Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.271 2006/04/04 22:56:08 jmg Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -382,6 +382,47 @@ MLINKS+=BUS_SETUP_INTR.9 bus_setup_intr.9 \ BUS_SETUP_INTR.9 BUS_TEARDOWN_INTR.9 \ BUS_SETUP_INTR.9 bus_teardown_intr.9 +MLINKS+=bus_space.9 bus_space_barrier.9 \ + bus_space.9 bus_space_copy_region_1.9 \ + bus_space.9 bus_space_copy_region_2.9 \ + bus_space.9 bus_space_copy_region_4.9 \ + bus_space.9 bus_space_copy_region_8.9 \ + bus_space.9 bus_space_free.9 \ + bus_space.9 bus_space_map.9 \ + bus_space.9 bus_space_read_1.9 \ + bus_space.9 bus_space_read_2.9 \ + bus_space.9 bus_space_read_4.9 \ + bus_space.9 bus_space_read_8.9 \ + bus_space.9 bus_space_read_multi_1.9 \ + bus_space.9 bus_space_read_multi_2.9 \ + bus_space.9 bus_space_read_multi_4.9 \ + bus_space.9 bus_space_read_multi_8.9 \ + bus_space.9 bus_space_read_region_1.9 \ + bus_space.9 bus_space_read_region_2.9 \ + bus_space.9 bus_space_read_region_4.9 \ + bus_space.9 bus_space_read_region_8.9 \ + bus_space.9 bus_space_set_multi_1.9 \ + bus_space.9 bus_space_set_multi_2.9 \ + bus_space.9 bus_space_set_multi_4.9 \ + bus_space.9 bus_space_set_multi_8.9 \ + bus_space.9 bus_space_set_region_1.9 \ + bus_space.9 bus_space_set_region_2.9 \ + bus_space.9 bus_space_set_region_4.9 \ + bus_space.9 bus_space_set_region_8.9 \ + bus_space.9 bus_space_subregion.9 \ + bus_space.9 bus_space_unmap.9 \ + bus_space.9 bus_space_write_1.9 \ + bus_space.9 bus_space_write_2.9 \ + bus_space.9 bus_space_write_4.9 \ + bus_space.9 bus_space_write_8.9 \ + bus_space.9 bus_space_write_multi_1.9 \ + bus_space.9 bus_space_write_multi_2.9 \ + bus_space.9 bus_space_write_multi_4.9 \ + bus_space.9 bus_space_write_multi_8.9 \ + bus_space.9 bus_space_write_region_1.9 \ + bus_space.9 bus_space_write_region_2.9 \ + bus_space.9 bus_space_write_region_4.9 \ + bus_space.9 bus_space_write_region_8.9 MLINKS+=byteorder.9 be16dec.9 \ byteorder.9 be16enc.9 \ byteorder.9 be16toh.9 \ ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#51 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -89,6 +89,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -207,9 +208,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -226,9 +225,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -313,6 +310,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/hammer/sys/dev/bfe/if_bfe.c#24 (text+ko) ==== @@ -26,7 +26,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.31 2006/02/14 12:44:54 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.32 2006/04/04 22:30:12 pjd Exp $"); #include #include @@ -366,7 +366,6 @@ if (bfe_dma_alloc(dev)) { printf("bfe%d: failed to allocate DMA resources\n", sc->bfe_unit); - bfe_release_resources(sc); error = ENXIO; goto fail; } @@ -421,7 +420,6 @@ bfe_intr, sc, &sc->bfe_intrhand); if (error) { - bfe_release_resources(sc); printf("bfe%d: couldn't set up irq\n", unit); goto fail; } ==== //depot/projects/hammer/sys/dev/iicbus/iic.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.33 2006/04/04 17:08:40 imp Exp $ + * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.34 2006/04/04 23:29:17 imp Exp $ * */ #include @@ -122,15 +122,9 @@ { struct iic_softc *sc = (struct iic_softc *)device_get_softc(dev); - if (!sc) - return (ENOMEM); - - bzero(sc, sizeof(struct iic_softc)); - sc->sc_devnode = make_dev(&iic_cdevsw, device_get_unit(dev), UID_ROOT, GID_WHEEL, 0600, "iic%d", device_get_unit(dev)); - return (0); } @@ -146,7 +140,7 @@ } static int -iicopen (struct cdev *dev, int flags, int fmt, struct thread *td) +iicopen(struct cdev *dev, int flags, int fmt, struct thread *td) { struct iic_softc *sc = IIC_SOFTC(minor(dev)); ==== //depot/projects/hammer/sys/dev/iicbus/iicbb.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbb.c,v 1.13 2003/08/24 17:49:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbb.c,v 1.14 2006/04/04 23:29:17 imp Exp $"); /* * Generic I2C bit-banging code @@ -115,13 +115,9 @@ { struct iicbb_softc *sc = (struct iicbb_softc *)device_get_softc(dev); - bzero(sc, sizeof(struct iicbb_softc)); - sc->iicbus = device_add_child(dev, "iicbus", -1); - if (!sc->iicbus) return (ENXIO); - bus_generic_attach(dev); return (0); ==== //depot/projects/hammer/sys/dev/iicbus/iicsmb.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/iicsmb.c,v 1.12 2003/08/10 14:28:24 ticso Exp $ + * $FreeBSD: src/sys/dev/iicbus/iicsmb.c,v 1.13 2006/04/04 23:29:17 imp Exp $ * */ @@ -153,8 +153,6 @@ { struct iicsmb_softc *sc = (struct iicsmb_softc *)device_get_softc(dev); - bzero(sc, sizeof(*sc)); - sc->smbus = device_add_child(dev, "smbus", -1); /* probe and attach the smbus */ ==== //depot/projects/hammer/sys/geom/eli/g_eli.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.20 2006/02/11 13:08:24 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.21 2006/04/05 22:07:31 pjd Exp $"); #include #include @@ -466,7 +466,7 @@ * Calculate how much memory do we need. * We need separate crypto operation for every single sector. * It is much faster to calculate total amount of needed memory here and - * do the allocation once insteaf of allocate memory in pieces (many, + * do the allocation once instead of allocating memory in pieces (many, * many pieces). */ size = sizeof(*crp) * nsec; ==== //depot/projects/hammer/sys/i386/i386/io_apic.c#21 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.27 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.28 2006/04/05 20:43:19 jhb Exp $"); #include "opt_isa.h" @@ -88,6 +88,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -206,9 +207,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -225,9 +224,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -312,6 +309,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/hammer/sys/netinet/tcp_input.c#62 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.295 2006/04/04 12:26:07 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.296 2006/04/05 08:45:59 rwatson Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -3272,7 +3272,8 @@ return (0); drop: - INP_UNLOCK(tw->tw_inpcb); + if (tw != NULL) + INP_UNLOCK(tw->tw_inpcb); m_freem(m); return (0); } ==== //depot/projects/hammer/sys/netinet/tcp_sack.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_sack.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_sack.c,v 1.29 2006/02/18 17:05:00 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_sack.c,v 1.30 2006/04/05 00:11:04 mohans Exp $ */ /*- @@ -392,6 +392,8 @@ if (SEQ_GT(sack.end, sack.start) && SEQ_GT(sack.start, tp->snd_una) && SEQ_GT(sack.start, th_ack) && + SEQ_LT(sack.start, tp->snd_max) && + SEQ_GT(sack.end, tp->snd_una) && SEQ_LEQ(sack.end, tp->snd_max)) sack_blocks[num_sack_blks++] = sack; } ==== //depot/projects/hammer/sys/sparc64/sparc64/trap.c#21 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.80 2006/04/03 21:27:01 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.81 2006/04/04 21:00:44 marius Exp $"); #include "opt_ddb.h" #include "opt_ktr.h" @@ -354,14 +354,13 @@ break; case T_DATA_ERROR: /* - * handle PCI poke/peek as per UltraSPARC IIi - * User's Manual 16.2.1. + * Handle PCI poke/peek as per UltraSPARC IIi + * User's Manual 16.2.1, modulo checking the + * TPC as USIII CPUs generate a precise trap + * instead of a special deferred one. */ -#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) { + tf->tf_tpc < (u_long)fas_nofault_end) { cache_flush(); cache_enable(); tf->tf_tpc = (u_long)fas_fault; @@ -369,7 +368,6 @@ error = 0; break; } -#undef MEMBARSYNC_INST error = 1; break; default: ==== //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#47 (text+ko) ==== @@ -1,7 +1,7 @@ /* * FreeBSD * - * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.176 2006/04/04 13:06:21 jmelo Exp $ + * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.177 2006/04/04 22:32:14 alepulver Exp $ */ #ifndef _calendar_freebsd_ @@ -231,6 +231,7 @@ 12/18 Dag-Erling Smorgrav born in Brussels, Belgium, 1977 12/18 Semen Ustimenko born in Novosibirsk, Russian Federation, 1979 12/22 Maxim Sobolev born in Dnepropetrovsk, Ukraine, 1976 +12/23 Alejandro Pulver born in Buenos Aires, Argentina, 1989 12/23 Sean Chittenden born in Seattle, Washington, United States, 1979 12/28 Soren Schmidt born in Maribo, Denmark, 1960 12/28 Ade Lovett born in London, England, 1969 ==== //depot/projects/hammer/usr.bin/find/option.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/find/option.c,v 1.24 2006/04/03 20:36:37 ceri Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/find/option.c,v 1.25 2006/04/05 23:06:11 ceri Exp $"); #include #include @@ -62,15 +62,15 @@ { "!", c_simple, f_not, 0 }, { "(", c_simple, f_openparen, 0 }, { ")", c_simple, f_closeparen, 0 }, + { "-Bmin", c_Xmin, f_Xmin, F_TIME_B }, + { "-Bnewer", c_newer, f_newer, F_TIME_B }, + { "-Btime", c_Xtime, f_Xtime, F_TIME_B }, { "-a", c_and, NULL, 0 }, { "-acl", c_acl, f_acl, 0 }, { "-amin", c_Xmin, f_Xmin, F_TIME_A }, { "-and", c_and, NULL, 0 }, { "-anewer", c_newer, f_newer, F_TIME_A }, { "-atime", c_Xtime, f_Xtime, F_TIME_A }, - { "-Bmin", c_Xmin, f_Xmin, F_TIME_B }, - { "-Bnewer", c_newer, f_newer, F_TIME_B }, - { "-Btime", c_Xtime, f_Xtime, F_TIME_B }, { "-cmin", c_Xmin, f_Xmin, F_TIME_C }, { "-cnewer", c_newer, f_newer, F_TIME_C }, { "-ctime", c_Xtime, f_Xtime, F_TIME_C }, @@ -97,23 +97,23 @@ { "-mtime", c_Xtime, f_Xtime, 0 }, { "-name", c_name, f_name, 0 }, { "-newer", c_newer, f_newer, 0 }, + { "-newerBB", c_newer, f_newer, F_TIME_B | F_TIME2_B }, + { "-newerBa", c_newer, f_newer, F_TIME_B | F_TIME2_A }, + { "-newerBc", c_newer, f_newer, F_TIME_B | F_TIME2_C }, + { "-newerBm", c_newer, f_newer, F_TIME_B }, + { "-newerBt", c_newer, f_newer, F_TIME_B | F_TIME2_T }, + { "-neweraB", c_newer, f_newer, F_TIME_A | F_TIME2_B }, { "-neweraa", c_newer, f_newer, F_TIME_A | F_TIME2_A }, - { "-neweraB", c_newer, f_newer, F_TIME_A | F_TIME2_B }, { "-newerac", c_newer, f_newer, F_TIME_A | F_TIME2_C }, { "-neweram", c_newer, f_newer, F_TIME_A }, { "-newerat", c_newer, f_newer, F_TIME_A | F_TIME2_T }, - { "-newerBa", c_newer, f_newer, F_TIME_B | F_TIME2_A }, - { "-newerBB", c_newer, f_newer, F_TIME_B | F_TIME2_B }, - { "-newerBc", c_newer, f_newer, F_TIME_B | F_TIME2_C }, - { "-newerBm", c_newer, f_newer, F_TIME_B }, - { "-newerBt", c_newer, f_newer, F_TIME_B | F_TIME2_T }, + { "-newercB", c_newer, f_newer, F_TIME_C | F_TIME2_B }, { "-newerca", c_newer, f_newer, F_TIME_C | F_TIME2_A }, - { "-newercB", c_newer, f_newer, F_TIME_C | F_TIME2_B }, { "-newercc", c_newer, f_newer, F_TIME_C | F_TIME2_C }, { "-newercm", c_newer, f_newer, F_TIME_C }, { "-newerct", c_newer, f_newer, F_TIME_C | F_TIME2_T }, + { "-newermB", c_newer, f_newer, F_TIME2_B }, { "-newerma", c_newer, f_newer, F_TIME2_A }, - { "-newermB", c_newer, f_newer, F_TIME2_B }, { "-newermc", c_newer, f_newer, F_TIME2_C }, { "-newermm", c_newer, f_newer, 0 }, { "-newermt", c_newer, f_newer, F_TIME2_T }, ==== //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pmcstat/pmcstat_log.c,v 1.9 2006/04/02 12:52:16 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pmcstat/pmcstat_log.c,v 1.10 2006/04/05 15:12:25 jkoshy Exp $"); #include #include @@ -135,6 +135,7 @@ int pgf_overflow; /* whether a count overflowed */ pmc_id_t pgf_pmcid; /* id of the associated pmc */ size_t pgf_nbuckets; /* #buckets in this gmon.out */ + unsigned int pgf_nsamples; /* #samples in this gmon.out */ pmcstat_interned_string pgf_name; /* pathname of gmon.out file */ size_t pgf_ndatabytes; /* number of bytes mapped */ void *pgf_gmondata; /* pointer to mmap'ed data */ @@ -910,6 +911,7 @@ FUNCTION_ALIGNMENT; /* see */ pgf->pgf_ndatabytes = sizeof(struct gmonhdr) + pgf->pgf_nbuckets * sizeof(HISTCOUNTER); + pgf->pgf_nsamples = 0; pmcstat_gmon_create_file(pgf, image); @@ -941,6 +943,8 @@ hc[bucket]++; else /* mark that an overflow occurred */ pgf->pgf_overflow = 1; + + pgf->pgf_nsamples++; } /* @@ -1796,22 +1800,31 @@ for (i = 0; i < PMCSTAT_NHASH; i++) { LIST_FOREACH_SAFE(pi, &pmcstat_image_hash[i], pi_next, pitmp) { + + if (mf) + (void) fprintf(mf, " \"%s\" => \"%s\"", + pmcstat_string_unintern(pi->pi_execpath), + pmcstat_string_unintern(pi->pi_samplename)); + /* flush gmon.out data to disk */ LIST_FOREACH_SAFE(pgf, &pi->pi_gmlist, pgf_next, pgftmp) { pmcstat_gmon_unmap_file(pgf); LIST_REMOVE(pgf, pgf_next); - + if (mf) + (void) fprintf(mf, " %s/%d", + pmcstat_pmcid_to_name(pgf->pgf_pmcid), + pgf->pgf_nsamples); if (pgf->pgf_overflow && a->pa_verbosity >= 1) warnx("WARNING: profile \"%s\" " "overflowed.", - pmcstat_string_unintern(pgf->pgf_name)); + pmcstat_string_unintern( + pgf->pgf_name)); free(pgf); } + if (mf) - (void) fprintf(mf, " \"%s\" -> \"%s\"\n", - pmcstat_string_unintern(pi->pi_execpath), - pmcstat_string_unintern(pi->pi_samplename)); + (void) fprintf(mf, "\n"); LIST_REMOVE(pi, pi_next); free(pi); From owner-p4-projects@FreeBSD.ORG Thu Apr 6 01:29:48 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 1206016A41F; Thu, 6 Apr 2006 01:29:48 +0000 (UTC) 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 DFA5F16A400 for ; Thu, 6 Apr 2006 01:29:47 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9030743D4C for ; Thu, 6 Apr 2006 01:29:47 +0000 (GMT) (envelope-from jmg@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 k361Tl2c082983 for ; Thu, 6 Apr 2006 01:29:47 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k361TlQK082980 for perforce@freebsd.org; Thu, 6 Apr 2006 01:29:47 GMT (envelope-from jmg@freebsd.org) Date: Thu, 6 Apr 2006 01:29:47 GMT Message-Id: <200604060129.k361TlQK082980@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94711 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, 06 Apr 2006 01:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=94711 Change 94711 by jmg@jmg_carbon-60 on 2006/04/06 01:29:40 push first pass of interrupt code to machine for compile testing.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#22 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#4 (text+ko) ==== @@ -34,6 +34,9 @@ devhandle_t hs_devhandle; uint8_t hs_busnum; + struct resource *hs_intr; + void *hs_intrcookie; + struct rman hs_pci_mem_rman; bus_space_tag_t hs_pci_memt; bus_space_handle_t hs_pci_memh; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#22 (text+ko) ==== @@ -123,6 +123,16 @@ DRIVER_MODULE(hvpci, nexus, hvpci_driver, hvpci_devclass, 0, 0); +static void +hvpci_intr(void *v) +{ + struct hvpci_softc *sc; + + sc = (struct hvpci_softc *)v; + + printf("%s: intr, sc: %p\n", __func__, sc); +} + static int hvpci_probe(device_t dev) { @@ -147,7 +157,7 @@ #endif uint64_t reg, nreg; int br[2]; - int n, type; + int n, type, error; int i, nrange; sc = device_get_softc(dev); @@ -174,6 +184,30 @@ sc->hs_devhandle = SUN4V_REG_SPEC2CFG_HDL(reg); #endif + rid = 0; + if ((sc->hs_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE)) = NULL) { + device_printf(dev, "couldn't map interrupt\n"); + return ENXIO; + } + + error = bus_setup_intr(dev, hvpci_intr, INTR_MPSAFE, hvpci_intr, sc, + &sc->hs_intrcookie); + if (error) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->hs_irq), sc->hs_irq); + device_printf(dev, "bus_setup_intr: %d\n", error); + return error; + } + + /* initalize intr resources */ + sc->hs_intr_rman.rm_type = RMAN_ARRAY; + sc->hs_intr_rman.rm_type = "HyperVisor PCI Interrupts"; + if (rman_init(&sc->hs_intr_rman) != 0 || rman_manage_region(rmanp, 0, + /* XXX - no clue where this should start or end */ + 10) != 0) + panic("%s: failed to set up intr rman", __func__); + /* Pull in the ra addresses out of OFW */ nrange = OF_getprop_alloc(node, "ranges", sizeof *range, (void **)&range); @@ -363,6 +397,8 @@ int flags, driver_intr_t *intr, void *arg, void **cookiep) { + device_printf(dev, "attempted setup_intr: child: %p, ires: %p, flags: %#x, intr: %p, arg: %p, cookiep: %p\n", + child, ireq, flags, intr, arg, cookiep); return (0); } @@ -391,16 +427,25 @@ flags &= ~RF_ACTIVE; switch (type) { + case SYS_RES_IRQ: + if (end - start != 0) + return NULL; + rm = &sc->sc_pci_intr_rman; + bt = bh = NULL; + break; + case SYS_RES_MEMORY: rm = &sc->hs_pci_mem_rman; bt = sc->hs_pci_memt; bh = sc->hs_pci_memh; break; + case SYS_RES_IOPORT: rm = &sc->hs_pci_io_rman; bt = sc->hs_pci_iot; bh = sc->hs_pci_ioh; break; + default: return (NULL); } From owner-p4-projects@FreeBSD.ORG Thu Apr 6 01:39: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 C0B4516A427; Thu, 6 Apr 2006 01:39:00 +0000 (UTC) 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 9BC8216A424 for ; Thu, 6 Apr 2006 01:39:00 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E94243D5F for ; Thu, 6 Apr 2006 01:38:59 +0000 (GMT) (envelope-from jmg@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 k361cwXo090171 for ; Thu, 6 Apr 2006 01:38:58 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k361cwcU090163 for perforce@freebsd.org; Thu, 6 Apr 2006 01:38:58 GMT (envelope-from jmg@freebsd.org) Date: Thu, 6 Apr 2006 01:38:58 GMT Message-Id: <200604060138.k361cwcU090163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94712 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, 06 Apr 2006 01:39:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=94712 Change 94712 by jmg@jmg_arlene on 2006/04/06 01:38:29 make first pass of intr code compile.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#23 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#5 (text+ko) ==== @@ -37,6 +37,8 @@ struct resource *hs_intr; void *hs_intrcookie; + struct rman hs_pci_intr_rman; + struct rman hs_pci_mem_rman; bus_space_tag_t hs_pci_memt; bus_space_handle_t hs_pci_memh; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#23 (text+ko) ==== @@ -158,7 +158,7 @@ uint64_t reg, nreg; int br[2]; int n, type, error; - int i, nrange; + int i, nrange, rid; sc = device_get_softc(dev); @@ -185,27 +185,27 @@ #endif rid = 0; - if ((sc->hs_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE)) = NULL) { + if ((sc->hs_intr = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "couldn't map interrupt\n"); return ENXIO; } - error = bus_setup_intr(dev, hvpci_intr, INTR_MPSAFE, hvpci_intr, sc, + error = bus_setup_intr(dev, sc->hs_intr, INTR_MPSAFE, hvpci_intr, sc, &sc->hs_intrcookie); if (error) { bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_irq), sc->hs_irq); + rman_get_rid(sc->hs_intr), sc->hs_intr); device_printf(dev, "bus_setup_intr: %d\n", error); return error; } /* initalize intr resources */ - sc->hs_intr_rman.rm_type = RMAN_ARRAY; - sc->hs_intr_rman.rm_type = "HyperVisor PCI Interrupts"; - if (rman_init(&sc->hs_intr_rman) != 0 || rman_manage_region(rmanp, 0, - /* XXX - no clue where this should start or end */ - 10) != 0) + sc->hs_pci_intr_rman.rm_type = RMAN_ARRAY; + sc->hs_pci_intr_rman.rm_descr = "HyperVisor PCI Interrupts"; + if (rman_init(&sc->hs_pci_intr_rman) != 0 || + /* XXX - no clue where this should start or end */ + rman_manage_region(&sc->hs_pci_intr_rman, 0, 10) != 0) panic("%s: failed to set up intr rman", __func__); /* Pull in the ra addresses out of OFW */ @@ -398,7 +398,7 @@ { device_printf(dev, "attempted setup_intr: child: %p, ires: %p, flags: %#x, intr: %p, arg: %p, cookiep: %p\n", - child, ireq, flags, intr, arg, cookiep); + child, ires, flags, intr, arg, cookiep); return (0); } @@ -430,8 +430,9 @@ case SYS_RES_IRQ: if (end - start != 0) return NULL; - rm = &sc->sc_pci_intr_rman; - bt = bh = NULL; + rm = &sc->hs_pci_intr_rman; + bt = NULL; + bh = 0; break; case SYS_RES_MEMORY: From owner-p4-projects@FreeBSD.ORG Thu Apr 6 02:50: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 2C9E616A425; Thu, 6 Apr 2006 02:50:39 +0000 (UTC) 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 D7D9B16A424 for ; Thu, 6 Apr 2006 02:50:38 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from xproxy.gmail.com (xproxy.gmail.com [66.249.82.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CAD043D4C for ; Thu, 6 Apr 2006 02:50:35 +0000 (GMT) (envelope-from kip.macy@gmail.com) Received: by xproxy.gmail.com with SMTP id s9so34484wxc for ; Wed, 05 Apr 2006 19:50:34 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=g0LPKwDMPgseYWm8SYnPrD2w4tuarvnCRbqMN/h2awJZUJUBzq57FkL8WsJAZN4YuAIHCV8O2ANcXru8qu70D3+NOUIKZAOhp3uaHbtEqVabsuBLH6tKaX3AW7EfD1fgmsMPx6m5seSE7DK3qDOoXwcoEN5tzVCQV+SjgeWLEfg= Received: by 10.70.125.20 with SMTP id x20mr266898wxc; Wed, 05 Apr 2006 19:50:34 -0700 (PDT) Received: by 10.70.72.19 with HTTP; Wed, 5 Apr 2006 19:50:34 -0700 (PDT) Message-ID: Date: Wed, 5 Apr 2006 19:50:34 -0700 From: "Kip Macy" To: "John Baldwin" In-Reply-To: <200604031505.20667.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline References: <200604030738.k337c67u059228@repoman.freebsd.org> <200604031505.20667.jhb@freebsd.org> Cc: Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 94525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: kmacy@fsmware.com List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Apr 2006 02:50:39 -0000 A few printfs, and some comparisons against ints, I'll switch it back again to see what happens. -Kip On 4/3/06, John Baldwin wrote: > On Monday 03 April 2006 03:38, Kip Macy wrote: > > http://perforce.freebsd.org/chv.cgi?CH=3D94525 > > > > Change 94525 by kmacy@kmacy_storage:sun4v_work on 2006/04/03 07:37:31 > > > > drop cpumask down to 32-bits the rest of freebsd hardcodes the AS= Sumption > > move tte_t typedef > > Grr, I'd rather we fix FreeBSD. It should be ok to have cpumask_t be a l= ong > on 64-bit architectures. We can do that later of course, but I'm curious > what breakage you ran into? > > -- > John Baldwin <>< http://www.FreeBSD.org/~jhb/ > "Power Users Use the Power to Serve" =3D http://www.FreeBSD.org > From owner-p4-projects@FreeBSD.ORG Thu Apr 6 03:24: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 5E15B16A420; Thu, 6 Apr 2006 03:24:07 +0000 (UTC) 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 1AD3E16A401 for ; Thu, 6 Apr 2006 03:24:07 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CBA443D49 for ; Thu, 6 Apr 2006 03:24:06 +0000 (GMT) (envelope-from alc@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 k363O6oM060247 for ; Thu, 6 Apr 2006 03:24:06 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k363O6oG060239 for perforce@freebsd.org; Thu, 6 Apr 2006 03:24:06 GMT (envelope-from alc@freebsd.org) Date: Thu, 6 Apr 2006 03:24:06 GMT Message-Id: <200604060324.k363O6oG060239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 94715 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, 06 Apr 2006 03:24:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=94715 Change 94715 by alc@alc_home on 2006/04/06 03:23:39 Reintroduce a needed variable that was removed by an IFC. Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#13 edit Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#13 (text+ko) ==== @@ -2555,6 +2555,7 @@ vm_offset_t addr; vm_offset_t end_addr = src_addr + len; vm_offset_t va_next; + vm_page_t m; if (dst_addr != src_addr) return; From owner-p4-projects@FreeBSD.ORG Thu Apr 6 03:35: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 518DD16A423; Thu, 6 Apr 2006 03:35:22 +0000 (UTC) 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 0F35116A420 for ; Thu, 6 Apr 2006 03:35:22 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E320143D5F for ; Thu, 6 Apr 2006 03:35:20 +0000 (GMT) (envelope-from jmg@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 k363ZKEF064894 for ; Thu, 6 Apr 2006 03:35:20 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k363ZK1W064886 for perforce@freebsd.org; Thu, 6 Apr 2006 03:35:20 GMT (envelope-from jmg@freebsd.org) Date: Thu, 6 Apr 2006 03:35:20 GMT Message-Id: <200604060335.k363ZK1W064886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94716 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, 06 Apr 2006 03:35:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=94716 Change 94716 by jmg@jmg_arlene on 2006/04/06 03:35:01 add a type.. should we just make MISC the default instead of panicing? is it really that necessary now w/ MP? Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#24 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#24 (text+ko) ==== @@ -191,8 +191,9 @@ return ENXIO; } - error = bus_setup_intr(dev, sc->hs_intr, INTR_MPSAFE, hvpci_intr, sc, - &sc->hs_intrcookie); + /* XXX - Should this be _CLK since we are redistributing intrs? */ + error = bus_setup_intr(dev, sc->hs_intr, INTR_MPSAFE|INTR_TYPE_MISC, + hvpci_intr, sc, &sc->hs_intrcookie); if (error) { bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->hs_intr), sc->hs_intr); From owner-p4-projects@FreeBSD.ORG Thu Apr 6 04:05:11 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 0F36C16A435; Thu, 6 Apr 2006 04:05:11 +0000 (UTC) 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 BCB5516A42B for ; Thu, 6 Apr 2006 04:05:10 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEDD443D53 for ; Thu, 6 Apr 2006 04:05:09 +0000 (GMT) (envelope-from alc@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 k36459FS094986 for ; Thu, 6 Apr 2006 04:05:09 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k36459WX094983 for perforce@freebsd.org; Thu, 6 Apr 2006 04:05:09 GMT (envelope-from alc@freebsd.org) Date: Thu, 6 Apr 2006 04:05:09 GMT Message-Id: <200604060405.k36459WX094983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 94719 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, 06 Apr 2006 04:05:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=94719 Change 94719 by alc@alc_home on 2006/04/06 04:04:09 Reintroduce a needed variable that was removed by an IFC. Affected files ... .. //depot/projects/superpages/src/sys/i386/i386/pmap.c#9 edit Differences ... ==== //depot/projects/superpages/src/sys/i386/i386/pmap.c#9 (text+ko) ==== @@ -2524,6 +2524,7 @@ vm_offset_t addr; vm_offset_t end_addr = src_addr + len; vm_offset_t pdnxt; + vm_page_t m; if (dst_addr != src_addr) return; From owner-p4-projects@FreeBSD.ORG Thu Apr 6 20:26:40 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 0E9B816A428; Thu, 6 Apr 2006 20:26:40 +0000 (UTC) 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 A87ED16A404 for ; Thu, 6 Apr 2006 20:26:39 +0000 (UTC) (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 D374543D79 for ; Thu, 6 Apr 2006 20:26:38 +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 k36KQc5I072797 for ; Thu, 6 Apr 2006 20:26:38 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k36KQcPw072794 for perforce@freebsd.org; Thu, 6 Apr 2006 20:26:38 GMT (envelope-from cognet@freebsd.org) Date: Thu, 6 Apr 2006 20:26:38 GMT Message-Id: <200604062026.k36KQcPw072794@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 94741 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, 06 Apr 2006 20:26:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=94741 Change 94741 by cognet@cognet on 2006/04/06 20:26:03 Catchup with recent Marcel's changes to UART. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#21 edit .. //depot/projects/arm/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#21 (text+ko) ==== @@ -80,7 +80,7 @@ static void at91_usart_term(struct uart_bas *bas); static void at91_usart_putc(struct uart_bas *bas, int); static int at91_usart_poll(struct uart_bas *bas); -static int at91_usart_getc(struct uart_bas *bas); +static int at91_usart_getc(struct uart_bas *bas, struct mtx *mtx); extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; @@ -248,7 +248,7 @@ * Block waiting for a character. */ static int -at91_usart_getc(struct uart_bas *bas) +at91_usart_getc(struct uart_bas *bas, struct mtx *mtx) { int c; @@ -343,7 +343,7 @@ return (EAGAIN); bus_dmamap_sync(atsc->dmatag, atsc->tx_map, BUS_DMASYNC_PREWRITE); - mtx_lock_spin(&sc->sc_hwmtx); + uart_lock(sc->sc_hwmtx); sc->sc_txbusy = 1; /* * Setup the PDC to transfer the data and interrupt us when it @@ -352,7 +352,7 @@ WR4(&sc->sc_bas, PDC_TPR, addr); WR4(&sc->sc_bas, PDC_TCR, sc->sc_txdatasz); WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_TXTEN); - mtx_unlock_spin(&sc->sc_hwmtx); + uart_unlock(sc->sc_hwmtx); #ifdef USART0_CONSOLE /* * XXX: Gross hack : Skyeye doesn't raise an interrupt once the @@ -377,7 +377,7 @@ SIGCHG(sig & SER_RTS, new, SER_RTS, SER_DRTS); } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); bas = &sc->sc_bas; - mtx_lock_spin(&sc->sc_hwmtx); + uart_lock(sc->sc_hwmtx); cr = RD4(bas, USART_CR); cr &= ~(USART_CR_DTREN | USART_CR_DTRDIS | USART_CR_RTSEN | USART_CR_RTSDIS); @@ -390,16 +390,16 @@ else cr |= USART_CR_RTSDIS; WR4(bas, USART_CR, cr); - mtx_unlock_spin(&sc->sc_hwmtx); + uart_unlock(sc->sc_hwmtx); return (0); } static int at91_usart_bus_receive(struct uart_softc *sc) { - mtx_lock_spin(&sc->sc_hwmtx); - uart_rx_put(sc, at91_usart_getc(&sc->sc_bas)); - mtx_unlock_spin(&sc->sc_hwmtx); + uart_lock(sc->sc_hwmtx); + uart_rx_put(sc, at91_usart_getc(&sc->sc_bas, NULL)); + uart_unlock(sc->sc_hwmtx); return (0); } static int @@ -431,7 +431,7 @@ BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(atsc->dmatag, atsc->tx_map); } - mtx_lock_spin(&sc->sc_hwmtx); + uart_lock(sc->sc_hwmtx); if (csr & USART_CSR_TXRDY && sc->sc_txbusy) ipend |= SER_INT_TXIDLE; if (csr & USART_CSR_ENDTX && sc->sc_txbusy) @@ -444,7 +444,7 @@ ipend |= SER_INT_BREAK; WR4(&sc->sc_bas, USART_CR, cr); } - mtx_unlock_spin(&sc->sc_hwmtx); + uart_unlock(sc->sc_hwmtx); return (ipend); } static int @@ -459,7 +459,7 @@ uint32_t new, sig; uint8_t csr; - mtx_lock_spin(&sc->sc_hwmtx); + uart_lock(sc->sc_hwmtx); csr = RD4(&sc->sc_bas, USART_CSR); sig = 0; if (csr & USART_CSR_CTS) @@ -472,7 +472,7 @@ sig |= SER_RI; new = sig & ~SER_MASK_DELTA; sc->sc_hwsig = new; - mtx_unlock_spin(&sc->sc_hwmtx); + uart_unlock(sc->sc_hwmtx); return (sig); } ==== //depot/projects/arm/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ static void sa1110_term(struct uart_bas *bas); static void sa1110_putc(struct uart_bas *bas, int); static int sa1110_poll(struct uart_bas *bas); -static int sa1110_getc(struct uart_bas *bas); +static int sa1110_getc(struct uart_bas *bas, struct mtx *mtx); int did_mmu = 0; @@ -132,7 +132,7 @@ } static int -sa1110_getc(struct uart_bas *bas) +sa1110_getc(struct uart_bas *bas, struct mtx *mtx) { int c; /* XXX: sigh. */ From owner-p4-projects@FreeBSD.ORG Thu Apr 6 21:43: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 2FB5016A407; Thu, 6 Apr 2006 21:43:15 +0000 (UTC) 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 E5A2516A405 for ; Thu, 6 Apr 2006 21:43:14 +0000 (UTC) (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 B027243D46 for ; Thu, 6 Apr 2006 21:43:14 +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 k36LhEZD024534 for ; Thu, 6 Apr 2006 21:43:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k36LhEiE024531 for perforce@freebsd.org; Thu, 6 Apr 2006 21:43:14 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 6 Apr 2006 21:43:14 GMT Message-Id: <200604062143.k36LhEiE024531@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 94744 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, 06 Apr 2006 21:43:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=94744 Change 94744 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/06 21:42:41 no frobbing interrupts during context switch Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#17 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#17 (text+ko) ==== @@ -117,14 +117,12 @@ stx %g3, [%g1 + KTR_PARM3] 9: #endif - wrpr %g0, PSTATE_NORMAL, %pstate ldx [%i0 + TD_PCB], %i1 stx %i0, [PCPU(CURTHREAD)] stx %i1, [PCPU(CURPCB)] mov %i1, PCB_REG ! load in new PCB - wrpr %g0, PSTATE_KERNEL, %pstate ldx [PCB_REG + PCB_SP], %fp ldx [PCB_REG + PCB_PC], %i7 @@ -158,7 +156,7 @@ ldx [%i2 + PM_CONTEXT], %l5 ! new context ldx [%l2 + PM_CONTEXT], %l3 ! old context cmp %g0, %l5 - be,a,pn %xcc, 5f ! new context == kernel? + be,pn %xcc, 5f ! new context == kernel? lduw [PCPU(CPUMASK)], %l4 brz %l3, 10f ! old context == kernel? @@ -217,7 +215,6 @@ SET_MMU_CONTEXT(%l6, %l5) - /* * Done. Return and load the new process's window from the stack. */ From owner-p4-projects@FreeBSD.ORG Fri Apr 7 05:02: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 4BC9416A407; Fri, 7 Apr 2006 05:02:06 +0000 (UTC) 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 2688016A401 for ; Fri, 7 Apr 2006 05:02:06 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D38743D48 for ; Fri, 7 Apr 2006 05:02:05 +0000 (GMT) (envelope-from jmg@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 k37525ol079624 for ; Fri, 7 Apr 2006 05:02:05 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k37525Fr079616 for perforce@freebsd.org; Fri, 7 Apr 2006 05:02:05 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Apr 2006 05:02:05 GMT Message-Id: <200604070502.k37525Fr079616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94751 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, 07 Apr 2006 05:02:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=94751 Change 94751 by jmg@jmg_carbon-60 on 2006/04/07 05:01:44 clean up pci bridge code a bit.. enable 64bit mode by default... make sure we are using 64bit addressing before using the bits.. don't print wierd addresses when it's really not valid... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcireg.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcivar.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#4 (text+ko) ==== @@ -107,6 +107,7 @@ { struct pcib_softc *sc; uint8_t iolow; + uint32_t memlow; sc = device_get_softc(dev); sc->dev = dev; @@ -128,17 +129,17 @@ iolow = pci_read_config(dev, PCIR_IOBASEL_1, 1); if ((iolow & PCIM_BRIO_MASK) == PCIM_BRIO_32) { sc->iobase = PCI_PPBIOBASE(pci_read_config(dev, PCIR_IOBASEH_1, 2), - pci_read_config(dev, PCIR_IOBASEL_1, 1)); + iolow); } else { - sc->iobase = PCI_PPBIOBASE(0, pci_read_config(dev, PCIR_IOBASEL_1, 1)); + sc->iobase = PCI_PPBIOBASE(0, iolow); } iolow = pci_read_config(dev, PCIR_IOLIMITL_1, 1); if ((iolow & PCIM_BRIO_MASK) == PCIM_BRIO_32) { sc->iolimit = PCI_PPBIOLIMIT(pci_read_config(dev, PCIR_IOLIMITH_1, 2), - pci_read_config(dev, PCIR_IOLIMITL_1, 1)); + iolow); } else { - sc->iolimit = PCI_PPBIOLIMIT(0, pci_read_config(dev, PCIR_IOLIMITL_1, 1)); + sc->iolimit = PCI_PPBIOLIMIT(0, iolow); } } @@ -146,12 +147,24 @@ * Determine current memory decode. */ if (sc->command & PCIM_CMD_MEMEN) { - sc->membase = PCI_PPBMEMBASE(0, pci_read_config(dev, PCIR_MEMBASE_1, 2)); - sc->memlimit = PCI_PPBMEMLIMIT(0, pci_read_config(dev, PCIR_MEMLIMIT_1, 2)); - sc->pmembase = PCI_PPBMEMBASE((pci_addr_t)pci_read_config(dev, PCIR_PMBASEH_1, 4), - pci_read_config(dev, PCIR_PMBASEL_1, 2)); - sc->pmemlimit = PCI_PPBMEMLIMIT((pci_addr_t)pci_read_config(dev, PCIR_PMLIMITH_1, 4), - pci_read_config(dev, PCIR_PMLIMITL_1, 2)); + sc->membase = PCI_PPBMEMBASE(0, pci_read_config(dev, + PCIR_MEMBASE_1, 2)); + sc->memlimit = PCI_PPBMEMLIMIT(0, pci_read_config(dev, + PCIR_MEMLIMIT_1, 2)); + memlow = pci_read_config(dev, PCIR_PMEMBASEL_1, 2); + if ((memlow & PCIM_BRMEM_MASK) == PCIM_BRMEM_64) { + sc->pmembase = PCI_PPBMEMBASE(pci_read_config(dev, PCIR_PMBASEH_1, + 4), memlow); + } else { + sc->pmembase = PCI_PPBMEMBASE(0, memlow); + } + memhigh = pci_read_config(dev, PCIR_PMLIMITL_1, 4); + if ((memlow & PCIM_BRMEM_MASK) == PCIM_BRMEM_64) { + sc->pmemlimit = PCI_PPBMEMBASE(pci_read_config(dev, PCIR_PMLIMITH_1, + 4), memlow); + } else { + sc->pmemlimit = PCI_PPBMEMBASE(0, memlow); + } } /* @@ -216,9 +229,21 @@ if (bootverbose) { device_printf(dev, " secondary bus %d\n", sc->secbus); device_printf(dev, " subordinate bus %d\n", sc->subbus); - device_printf(dev, " I/O decode 0x%x-0x%x\n", sc->iobase, sc->iolimit); - device_printf(dev, " memory decode 0x%x-0x%x\n", sc->membase, sc->memlimit); - device_printf(dev, " prefetched decode 0x%x-0x%x\n", sc->pmembase, sc->pmemlimit); + if (pcib_is_io_open(sc)) + device_printf(dev, " I/O decode 0x%x-0x%x\n", sc->iobase, + sc->iolimit); + else + device_printf(dev, " I/O decode disabled.\n"); + if (pcib_is_nonprefetch_open(sc)) + device_printf(dev, " memory decode 0x%x-0x%x\n", sc->membase, + sc->memlimit); + else + device_printf(dev, " memory decode disabled.\n"); + if (pcib_is_prefetch_open(sc)) + device_printf(dev, " prefetched decode 0x%x-0x%x\n", sc->pmembase, + sc->pmemlimit); + else + device_printf(dev, " prefetched decode disabled.\n"); if (sc->flags & PCIB_SUBTRACTIVE) device_printf(dev, " Subtractively decoded bridge.\n"); } ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcireg.h#3 (text+ko) ==== @@ -164,6 +164,9 @@ #define PCIR_PMLIMITL_1 0x26 #define PCIR_PMBASEH_1 0x28 #define PCIR_PMLIMITH_1 0x2c +#define PCIM_BRMEM_32 0x0 +#define PCIM_BRMEM_64 0x1 +#define PCIM_BRMEM_MASK 0xf #define PCIR_BRIDGECTL_1 0x3e ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcivar.h#3 (text+ko) ==== @@ -45,11 +45,7 @@ /* pci_addr_t covers this system's PCI bus address space: 32 or 64 bit */ -#ifdef PCI_A64 typedef uint64_t pci_addr_t; /* uint64_t for system with 64bit addresses */ -#else -typedef uint32_t pci_addr_t; /* uint64_t for system with 64bit addresses */ -#endif /* Interesting values for PCI power management */ struct pcicfg_pp { @@ -108,13 +104,8 @@ /* additional type 1 device config header information (PCI to PCI bridge) */ -#ifdef PCI_A64 #define PCI_PPBMEMBASE(h,l) ((((pci_addr_t)(h) << 32) + ((l)<<16)) & ~0xfffff) #define PCI_PPBMEMLIMIT(h,l) ((((pci_addr_t)(h) << 32) + ((l)<<16)) | 0xfffff) -#else -#define PCI_PPBMEMBASE(h,l) (((l)<<16) & ~0xfffff) -#define PCI_PPBMEMLIMIT(h,l) (((l)<<16) | 0xfffff) -#endif /* PCI_A64 */ #define PCI_PPBIOBASE(h,l) ((((h)<<16) + ((l)<<8)) & ~0xfff) #define PCI_PPBIOLIMIT(h,l) ((((h)<<16) + ((l)<<8)) | 0xfff) From owner-p4-projects@FreeBSD.ORG Fri Apr 7 05:08:14 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 EA37616A402; Fri, 7 Apr 2006 05:08:13 +0000 (UTC) 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 AAF4216A400 for ; Fri, 7 Apr 2006 05:08:13 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DD7143D49 for ; Fri, 7 Apr 2006 05:08:13 +0000 (GMT) (envelope-from jmg@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 k3758DpA082238 for ; Fri, 7 Apr 2006 05:08:13 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3758DWq082235 for perforce@freebsd.org; Fri, 7 Apr 2006 05:08:13 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Apr 2006 05:08:13 GMT Message-Id: <200604070508.k3758DWq082235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94752 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, 07 Apr 2006 05:08:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=94752 Change 94752 by jmg@jmg_arlene on 2006/04/07 05:07:14 fix misspelling, make printfs work (probably needs work for other arches), add prototypes.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#5 (text+ko) ==== @@ -53,6 +53,9 @@ #include "pcib_if.h" static int pcib_probe(device_t dev); +static int pcib_is_prefetch_open(struct pcib_softc *sc); +static int pcib_is_nonprefetch_open(struct pcib_softc *sc); +static int pcib_is_io_open(struct pcib_softc *sc); static device_method_t pcib_methods[] = { /* Device interface */ @@ -151,14 +154,14 @@ PCIR_MEMBASE_1, 2)); sc->memlimit = PCI_PPBMEMLIMIT(0, pci_read_config(dev, PCIR_MEMLIMIT_1, 2)); - memlow = pci_read_config(dev, PCIR_PMEMBASEL_1, 2); + memlow = pci_read_config(dev, PCIR_PMBASEL_1, 2); if ((memlow & PCIM_BRMEM_MASK) == PCIM_BRMEM_64) { sc->pmembase = PCI_PPBMEMBASE(pci_read_config(dev, PCIR_PMBASEH_1, 4), memlow); } else { sc->pmembase = PCI_PPBMEMBASE(0, memlow); } - memhigh = pci_read_config(dev, PCIR_PMLIMITL_1, 4); + memlow = pci_read_config(dev, PCIR_PMLIMITL_1, 4); if ((memlow & PCIM_BRMEM_MASK) == PCIM_BRMEM_64) { sc->pmemlimit = PCI_PPBMEMBASE(pci_read_config(dev, PCIR_PMLIMITH_1, 4), memlow); @@ -235,12 +238,12 @@ else device_printf(dev, " I/O decode disabled.\n"); if (pcib_is_nonprefetch_open(sc)) - device_printf(dev, " memory decode 0x%x-0x%x\n", sc->membase, + device_printf(dev, " memory decode 0x%lx-0x%lx\n", sc->membase, sc->memlimit); else device_printf(dev, " memory decode disabled.\n"); if (pcib_is_prefetch_open(sc)) - device_printf(dev, " prefetched decode 0x%x-0x%x\n", sc->pmembase, + device_printf(dev, " prefetched decode 0x%lx-0x%lx\n", sc->pmembase, sc->pmemlimit); else device_printf(dev, " prefetched decode disabled.\n"); @@ -462,7 +465,7 @@ if (!ok && bootverbose) device_printf(dev, "%s requested unsupported memory range " - "0x%lx-0x%lx (decoding 0x%x-0x%x, 0x%x-0x%x)\n", + "0x%lx-0x%lx (decoding 0x%lx-0x%lx, 0x%lx-0x%lx)\n", device_get_nameunit(child), start, end, sc->membase, sc->memlimit, sc->pmembase, sc->pmemlimit); From owner-p4-projects@FreeBSD.ORG Fri Apr 7 05:44: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 9CC2F16A404; Fri, 7 Apr 2006 05:44:15 +0000 (UTC) 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 735B616A402 for ; Fri, 7 Apr 2006 05:44:15 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4128843D46 for ; Fri, 7 Apr 2006 05:44:15 +0000 (GMT) (envelope-from jmg@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 k375iF5T003334 for ; Fri, 7 Apr 2006 05:44:15 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k375iEci003331 for perforce@freebsd.org; Fri, 7 Apr 2006 05:44:14 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Apr 2006 05:44:14 GMT Message-Id: <200604070544.k375iEci003331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94754 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, 07 Apr 2006 05:44:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=94754 Change 94754 by jmg@jmg_arlene on 2006/04/07 05:43:37 use 32bit address instead of 64bit.. sun4v doesn't like to address 32bit addresses in the 64bit range, this gets hvio_peek no longer setting the error flag! Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#25 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#25 (text+ko) ==== @@ -228,9 +228,6 @@ break; case OFW_PCI_CS_MEM32: - continue; - - case OFW_PCI_CS_MEM64: rmanp = &sc->hs_pci_mem_rman; rmanp->rm_descr = "HyperVisor PCI Memory"; btp = &sc->hs_pci_memt; @@ -239,6 +236,9 @@ type = PCI_MEMORY_BUS_SPACE; break; + case OFW_PCI_CS_MEM64: + continue; + default: panic("%s: unknown range type: %d", __func__, OFW_PCI_RANGE_CS(&range[i])); From owner-p4-projects@FreeBSD.ORG Fri Apr 7 19: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 3CBC616A403; Fri, 7 Apr 2006 19:21:59 +0000 (UTC) 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 DDCFC16A400; Fri, 7 Apr 2006 19:21:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3090543D48; Fri, 7 Apr 2006 19:21:57 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k37JLut5081465; Fri, 7 Apr 2006 15:21:56 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John-Mark Gurney Date: Fri, 7 Apr 2006 12:05:52 -0400 User-Agent: KMail/1.9.1 References: <200604070508.k3758DWq082235@repoman.freebsd.org> In-Reply-To: <200604070508.k3758DWq082235@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200604071205.53282.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1381/Fri Apr 7 08:54:35 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.0 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 94752 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, 07 Apr 2006 19:21:59 -0000 On Friday 07 April 2006 01:08, John-Mark Gurney wrote: > http://perforce.freebsd.org/chv.cgi?CH=94752 > > Change 94752 by jmg@jmg_arlene on 2006/04/07 05:07:14 > > fix misspelling, make printfs work (probably needs work for other > arches), add prototypes.. The normal way to print uint64_t in FreeBSD in MI code is to cast to uintmax_t and use %j. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Fri Apr 7 19:38: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 8C7A516A409; Fri, 7 Apr 2006 19:38:34 +0000 (UTC) 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 4F96516A406; Fri, 7 Apr 2006 19:38:34 +0000 (UTC) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (gate.funkthat.com [69.17.45.168]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8F6243D46; Fri, 7 Apr 2006 19:38:33 +0000 (GMT) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (ehyl0wu8glo9a82l@localhost.funkthat.com [127.0.0.1]) by hydrogen.funkthat.com (8.13.4/8.13.3) with ESMTP id k37JcXQv090895; Fri, 7 Apr 2006 12:38:33 -0700 (PDT) (envelope-from jmg@hydrogen.funkthat.com) Received: (from jmg@localhost) by hydrogen.funkthat.com (8.13.4/8.13.3/Submit) id k37JcXHJ090894; Fri, 7 Apr 2006 12:38:33 -0700 (PDT) (envelope-from jmg) Date: Fri, 7 Apr 2006 12:38:33 -0700 From: John-Mark Gurney To: John Baldwin Message-ID: <20060407193833.GD72485@funkthat.com> References: <200604070508.k3758DWq082235@repoman.freebsd.org> <200604071205.53282.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200604071205.53282.jhb@freebsd.org> User-Agent: Mutt/1.4.2.1i X-Operating-System: FreeBSD 5.4-RELEASE-p6 i386 X-PGP-Fingerprint: B7 EC EF F8 AE ED A7 31 96 7A 22 B3 D8 56 36 F4 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html Cc: Perforce Change Reviews Subject: Re: PERFORCE change 94752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: John-Mark Gurney List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Apr 2006 19:38:34 -0000 John Baldwin wrote this message on Fri, Apr 07, 2006 at 12:05 -0400: > On Friday 07 April 2006 01:08, John-Mark Gurney wrote: > > http://perforce.freebsd.org/chv.cgi?CH=94752 > > > > Change 94752 by jmg@jmg_arlene on 2006/04/07 05:07:14 > > > > fix misspelling, make printfs work (probably needs work for other > > arches), add prototypes.. > > The normal way to print uint64_t in FreeBSD in MI code is to cast to > uintmax_t and use %j. Thanks, I was going to do that work once started looking at the other archs, but might as well do that now.. :) -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-p4-projects@FreeBSD.ORG Fri Apr 7 19:43: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 7517A16A40D; Fri, 7 Apr 2006 19:43:00 +0000 (UTC) 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 5206716A40A for ; Fri, 7 Apr 2006 19:43:00 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1169243D60 for ; Fri, 7 Apr 2006 19:43:00 +0000 (GMT) (envelope-from jmg@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 k37JgxqC041666 for ; Fri, 7 Apr 2006 19:42:59 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k37JgxK6041663 for perforce@freebsd.org; Fri, 7 Apr 2006 19:42:59 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Apr 2006 19:42:59 GMT Message-Id: <200604071942.k37JgxK6041663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94773 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, 07 Apr 2006 19:43:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=94773 Change 94773 by jmg@jmg_carbon-60 on 2006/04/07 19:42:46 make this MI by suggestion from jhb... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#6 (text+ko) ==== @@ -238,13 +238,13 @@ else device_printf(dev, " I/O decode disabled.\n"); if (pcib_is_nonprefetch_open(sc)) - device_printf(dev, " memory decode 0x%lx-0x%lx\n", sc->membase, - sc->memlimit); + device_printf(dev, " memory decode 0x%jx-0x%jx\n", + (uintmax_t)sc->membase, (uintmax_t)sc->memlimit); else device_printf(dev, " memory decode disabled.\n"); if (pcib_is_prefetch_open(sc)) - device_printf(dev, " prefetched decode 0x%lx-0x%lx\n", sc->pmembase, - sc->pmemlimit); + device_printf(dev, " prefetched decode 0x%jx-0x%jx\n", + (uintmax_t)sc->pmembase, (uintmax_t)c->pmemlimit); else device_printf(dev, " prefetched decode disabled.\n"); if (sc->flags & PCIB_SUBTRACTIVE) @@ -465,10 +465,10 @@ if (!ok && bootverbose) device_printf(dev, "%s requested unsupported memory range " - "0x%lx-0x%lx (decoding 0x%lx-0x%lx, 0x%lx-0x%lx)\n", + "0x%lx-0x%lx (decoding 0x%jx-0x%jx, 0x%jx-0x%jx)\n", device_get_nameunit(child), start, end, - sc->membase, sc->memlimit, sc->pmembase, - sc->pmemlimit); + (uintmax_t)sc->membase, (uintmax_t)sc->memlimit, + (uintmax_t)sc->pmembase, (uintmax_t)sc->pmemlimit); if (!ok) return (NULL); if (bootverbose) From owner-p4-projects@FreeBSD.ORG Fri Apr 7 20:06: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 DB8B916A402; Fri, 7 Apr 2006 20:06:29 +0000 (UTC) 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 9E04D16A400 for ; Fri, 7 Apr 2006 20:06:29 +0000 (UTC) (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 6A1CC43D55 for ; Fri, 7 Apr 2006 20:06:29 +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 k37K6TEs054670 for ; Fri, 7 Apr 2006 20:06:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k37K6Tv4054666 for perforce@freebsd.org; Fri, 7 Apr 2006 20:06:29 GMT (envelope-from imp@freebsd.org) Date: Fri, 7 Apr 2006 20:06:29 GMT Message-Id: <200604072006.k37K6Tv4054666@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 94774 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, 07 Apr 2006 20:06:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=94774 Change 94774 by imp@imp_Speedy on 2006/04/07 20:05:35 Tweak output a little. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#14 (text+ko) ==== @@ -332,12 +332,11 @@ mckr = RD4(sc, PMC_MCKR); mck.parent = clock_list[mckr & 0x3]; mck.parent->refcnt++; - freq = mck.parent->hz; - freq /= 1 << ((mckr >> 2) & 3); + freq = mck.parent->hz / (1 << ((mckr >> 2) & 3)); mck.hz = freq / (1 + ((mckr >> 8) & 3)); device_printf(sc->dev, - "main clock: %d Hz PLLA: %d MHz CPU: %d MHz main %d MHz\n", + "Primary: %d Hz PLLA: %d MHz CPU: %d MHz MCK: %d MHz\n", sc->main_clock_hz, at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0) / 1000000, freq / 1000000, mck.hz / 1000000); From owner-p4-projects@FreeBSD.ORG Fri Apr 7 21: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 08C1316A406; Fri, 7 Apr 2006 21:38:23 +0000 (UTC) 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 D5DA916A401 for ; Fri, 7 Apr 2006 21:38:22 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EE0843D49 for ; Fri, 7 Apr 2006 21:38:22 +0000 (GMT) (envelope-from jmg@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 k37LcMo3012768 for ; Fri, 7 Apr 2006 21:38:22 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k37LcM93012762 for perforce@freebsd.org; Fri, 7 Apr 2006 21:38:22 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Apr 2006 21:38:22 GMT Message-Id: <200604072138.k37LcM93012762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94777 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, 07 Apr 2006 21:38:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=94777 Change 94777 by jmg@jmg_carbon-60 on 2006/04/07 21:37:31 first cut at hviommu support, this doesn't really build the iotte as I need to confirm w/ kmacy on what it really looks like... This also implements the long awaited, get the bus_dma_tag_t for the parent from your parent bus instead of using NULL... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#12 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/bus_if.m#3 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_bus.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hviommu.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#11 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#26 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sys/bus.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#12 (text+ko) ==== @@ -56,6 +56,7 @@ # XXX hvcons should be optional sun4v/sun4v/hvcons.c standard sun4v/sun4v/hcall.S standard +sun4v/sun4v/hviommu.c standard sun4v/sun4v/identcpu.c standard sun4v/sun4v/in_cksum.c optional inet sun4v/sun4v/interrupt.S standard no-obj ==== //depot/projects/kmacy_sun4v/src/sys/kern/bus_if.m#3 (text+ko) ==== @@ -507,3 +507,14 @@ enum intr_trigger _trig; enum intr_polarity _pol; } DEFAULT bus_generic_config_intr; + +/** + * @brief Returns bus_dma_tag_t for use w/ devices on the bus. + * + * @param _dev the parent device of @p _child + * @param _child the device to which the tag will belong + */ +METHOD bus_dma_tag_t get_dma_tag { + device_t _dev; + device_t _child; +} DEFAULT bus_generic_get_dma_tag; ==== //depot/projects/kmacy_sun4v/src/sys/kern/subr_bus.c#3 (text+ko) ==== @@ -3199,6 +3199,22 @@ } /** + * @brief Helper function for implementing BUS_GET_DMA_TAG(). + * + * This simple implementation of BUS_GET_DMA_TAG() simply calls the + * BUS_GET_DMA_TAG() method of the parent of @p dev. + */ +bus_dma_tag_t +bus_generic_get_dma_tag(device_t dev) +{ + + /* Propagate up the bus hierarchy until someone handles it. */ + if (dev->parent != NULL) + return (BUS_GET_DMA_TAG(dev->parent, dev)); + return (NULL); +} + +/** * @brief Helper function for implementing BUS_GET_RESOURCE(). * * This implementation of BUS_GET_RESOURCE() uses the @@ -3597,6 +3613,21 @@ return (BUS_CHILD_LOCATION_STR(parent, child, buf, buflen)); } +/** + * @brief Wrapper function for BUS_GET_DMA_TAG(). + * + * This function simply calls the BUS_GET_DMA_TAG() method of the + * parent of @p dev. + */ +bus_dma_tag_t +bus_get_dma_tag(device_t dev) +{ + + if (dev->parent == NULL) + return (NULL); + return (BUS_GET_DMA_TAG(dev->parent, dev)); +} + /* Resume all devices and then notify userland that we're up again. */ static int root_resume(device_t dev) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#6 (text+ko) ==== @@ -34,6 +34,8 @@ devhandle_t hs_devhandle; uint8_t hs_busnum; + struct bus_dma_tag hs_dmatag; + struct resource *hs_intr; void *hs_intrcookie; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#11 (text+ko) ==== @@ -108,8 +108,20 @@ extern uint64_t hvio_config_get(devhandle_t dev_hdl, pci_device_t pci_device, pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t *data); extern uint64_t hvio_config_put(devhandle_t dev_hdl, pci_device_t pci_device, - pci_config_offset_t off, pci_config_size_t size, + pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t data); +extern uint64_t hvio_iommu_map(devhandle_t dev_hdl, tsbid_t tsbid, + pages_t pages, io_attributes_t io_attributes, + io_page_list_t *io_page_list_p, + pages_t *pages_mapped); +extern uint64_t hvio_iommu_demap(devhandle_t dev_hdl, tsbid_t tsbid, + pages_t pages, pages_t *pages_demapped); +extern uint64_t hvio_iommu_getmap(devhandle_t dev_hdl, tsbid_t tsbid, + io_attributes_t *attributes_p, + r_addr_t *r_addr_p); +extern uint64_t hvio_iommu_getbypass(devhandle_t dev_hdl, r_addr_t ra, + io_attributes_t io_attributes, + io_addr_t *io_addr_p); extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#26 (text+ko) ==== @@ -52,6 +52,7 @@ #include #include +#include #include #include @@ -76,6 +77,7 @@ static bus_activate_resource_t hvpci_activate_resource; static bus_deactivate_resource_t hvpci_deactivate_resource; static bus_release_resource_t hvpci_release_resource; +static bus_get_dma_tag_t hvpci_get_dma_tag; static pcib_maxslots_t hvpci_maxslots; static pcib_read_config_t hvpci_read_config; static pcib_write_config_t hvpci_write_config; @@ -101,6 +103,7 @@ DEVMETHOD(bus_activate_resource, hvpci_activate_resource), DEVMETHOD(bus_deactivate_resource, hvpci_deactivate_resource), DEVMETHOD(bus_release_resource, hvpci_release_resource), + DEVMETHOD(bus_get_dma_tag, hvpci_get_dma_tag), /* pcib interface */ DEVMETHOD(pcib_maxslots, hvpci_maxslots), @@ -150,6 +153,7 @@ struct ofw_pci_ranges *range; struct rman *rmanp; struct hvpci_softc *sc; + struct hviommu *himp; bus_space_tag_t *btp; phandle_t node; #if 0 @@ -255,6 +259,11 @@ (*btp)->bst_type = type; } + /* Setup bus_dma_tag */ + himp = hviommu_init(sc->hs_devhandle); + sc->hs_dt_cookie = himp; + sc->hs_dt_mt = &hviommu_dma_methods; + device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); @@ -499,3 +508,13 @@ return (0); } + +static bus_dma_tag_t +hvpci_get_dma_tag(device_t bus, device_t child) +{ + struct hvpci_softc *sc; + + sc = device_get_softc(bus); + + return &sc->hs_dmatag; +} ==== //depot/projects/kmacy_sun4v/src/sys/sys/bus.h#3 (text+ko) ==== @@ -252,6 +252,8 @@ int rid, struct resource *r); int bus_generic_detach(device_t dev); void bus_generic_driver_added(device_t dev, driver_t *driver); +bus_dma_tag_t + bus_generic_get_dma_tag(device_t dev); struct resource_list * bus_generic_get_resource_list (device_t, device_t); int bus_print_child_header(device_t dev, device_t child); @@ -306,6 +308,7 @@ struct resource *r); int bus_deactivate_resource(device_t dev, int type, int rid, struct resource *r); +bus_dma_tag_t bus_get_dma_tag(device_t dev); int bus_release_resource(device_t dev, int type, int rid, struct resource *r); int bus_free_resource(device_t dev, int type, struct resource *r); From owner-p4-projects@FreeBSD.ORG Fri Apr 7 21:45: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 4CA8D16A404; Fri, 7 Apr 2006 21:45:32 +0000 (UTC) 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 0E1D216A401 for ; Fri, 7 Apr 2006 21:45:32 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF76543D45 for ; Fri, 7 Apr 2006 21:45:31 +0000 (GMT) (envelope-from jmg@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 k37LjVcT016455 for ; Fri, 7 Apr 2006 21:45:31 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k37LjVHU016452 for perforce@freebsd.org; Fri, 7 Apr 2006 21:45:31 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Apr 2006 21:45:31 GMT Message-Id: <200604072145.k37LjVHU016452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94778 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, 07 Apr 2006 21:45:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=94778 Change 94778 by jmg@jmg_arlene on 2006/04/07 21:45:24 add necessary typedefs along with the dma_sync call.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#12 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#12 (text+ko) ==== @@ -48,6 +48,19 @@ uint32_t dw; uint64_t qw; } pci_cfg_data_t; +typedef uint64_t tsbid_t; +typedef uint32_t pages_t; +typedef enum io_attributes { + PCI_MAP_ATTR_READ = (uint32_t)0x01, + PCI_MAP_ATTR_WRITE = (uint32_t)0x02 +} io_attributes_t; +typedef enum io_sync_direction { + IO_SYNC_DEVICE = (uint32_t)0x01, + IO_SYNC_CPU = (uint32_t)0x02 +} io_sync_direction_t; +typedef uint64_t io_page_list_t; +typedef uint64_t r_addr_t; +typedef uint64_t io_addr_t; extern uint64_t hv_mmu_map_perm_addr(void *, int, uint64_t, int); extern uint64_t hv_mmu_unmap_perm_addr(void *, int, int); @@ -122,6 +135,9 @@ extern uint64_t hvio_iommu_getbypass(devhandle_t dev_hdl, r_addr_t ra, io_attributes_t io_attributes, io_addr_t *io_addr_p); +extern uint64_t hvio_dma_sync(devhandle_t dev_hdl, r_addr_t ra, + size_t num_bytes, int io_sync_direction, + size_t *bytes_synched); extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); From owner-p4-projects@FreeBSD.ORG Fri Apr 7 22:43: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 6CFB116A404; Fri, 7 Apr 2006 22:43:44 +0000 (UTC) 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 42FE716A402 for ; Fri, 7 Apr 2006 22:43:44 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA7A343D4C for ; Fri, 7 Apr 2006 22:43:43 +0000 (GMT) (envelope-from jmg@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 k37Mhhii049240 for ; Fri, 7 Apr 2006 22:43:43 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k37MhhOL049237 for perforce@freebsd.org; Fri, 7 Apr 2006 22:43:43 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Apr 2006 22:43:43 GMT Message-Id: <200604072243.k37MhhOL049237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94782 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, 07 Apr 2006 22:43:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=94782 Change 94782 by jmg@jmg_arlene on 2006/04/07 22:42:42 make compile and link... include machine/bus.h in sys/bus.h so we get bus_dma_tag_t defined... pull dvma out of OFW for initalization... other minor fixes.. this still isn't complete as we don't enter pages into the iommu yet, (nor unmap them) Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hviommu.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#27 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/bus.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#7 (text+ko) ==== @@ -244,7 +244,7 @@ device_printf(dev, " memory decode disabled.\n"); if (pcib_is_prefetch_open(sc)) device_printf(dev, " prefetched decode 0x%jx-0x%jx\n", - (uintmax_t)sc->pmembase, (uintmax_t)c->pmemlimit); + (uintmax_t)sc->pmembase, (uintmax_t)sc->pmemlimit); else device_printf(dev, " prefetched decode disabled.\n"); if (sc->flags & PCIB_SUBTRACTIVE) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hviommu.h#2 (text+ko) ==== @@ -5,6 +5,6 @@ extern struct bus_dma_methods hviommu_dma_methods; -struct hviommu *hviommu_init(devhandle_t dh); +struct hviommu *hviommu_init(devhandle_t dh, u_long dvmabase, u_long dvmasize); #endif /* _HVIOMMU_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#27 (text+ko) ==== @@ -160,6 +160,7 @@ uint32_t cell; #endif uint64_t reg, nreg; + uint32_t *dvma; int br[2]; int n, type, error; int i, nrange, rid; @@ -258,11 +259,18 @@ (*btp)->bst_parent = &nexus_bustag; (*btp)->bst_type = type; } + free(range, M_OFWPROP); + nrange = OF_getprop_alloc(node, "virtual-dma", sizeof *dvma, + (void **)&dvma); + KASSERT(nrange == 2, ("virtual-dma propery invalid")); + /* Setup bus_dma_tag */ - himp = hviommu_init(sc->hs_devhandle); - sc->hs_dt_cookie = himp; - sc->hs_dt_mt = &hviommu_dma_methods; + himp = hviommu_init(sc->hs_devhandle, dvma[0], dvma[1]); + sc->hs_dmatag.dt_cookie = himp; + sc->hs_dmatag.dt_mt = &hviommu_dma_methods; + + free(dvma, M_OFWPROP); device_add_child(dev, "pci", -1); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#2 (text+ko) ==== @@ -101,22 +101,42 @@ */ #include +#include +#include #include #include #include +#include #include +#include +#include +#include + #include #include #include +#include #include #include -#define IO_PAGE_SHIFT PAGE_SHIFT_8K +/* + * Tuning constants. + */ +#define IOMMU_MAX_PRE (32 * 1024) +#define IOMMU_MAX_PRE_SEG 3 + +#define IO_PAGE_SIZE PAGE_SIZE_8K +#define IO_PAGE_MASK PAGE_MASK_8K +#define IO_PAGE_SHIFT PAGE_SHIFT_8K +#define round_io_page(x) round_page(x) +#define trunc_io_page(x) trunc_page(x) MALLOC_DEFINE(M_HVIOMMU, "hviommu", "HyperVisor IOMMU"); +TAILQ_HEAD(hviommu_maplruq_head, bus_dmamap); + struct hviommu { struct mtx him_mtx; @@ -124,11 +144,19 @@ u_long him_dvmabase; u_long him_dvmasize; + struct hviommu_maplruq_head him_maplruq; struct rman him_rman; }; #define VA_TO_TSBID(him, va) ((va - (him)->him_dvmabase) >> IO_PAGE_SHIFT) +/* + * Always overallocate one page; this is needed to handle alignment of the + * buffer, so it makes sense using a lazy allocation scheme. + */ +#define IOMMU_SIZE_ROUNDUP(sz) \ + (round_io_page(sz) + IO_PAGE_SIZE) + /* Resource helpers */ #define IOMMU_RES_TO(v) ((v) >> IO_PAGE_SHIFT) #define IOMMU_RES_START(res) \ @@ -138,28 +166,45 @@ #define IOMMU_RES_SIZE(res) \ ((bus_size_t)rman_get_size(res) << IO_PAGE_SHIFT) +/* Helpers for struct bus_dmamap_res */ +#define BDR_START(r) IOMMU_RES_START((r)->dr_res) +#define BDR_END(r) IOMMU_RES_END((r)->dr_res) +#define BDR_SIZE(r) IOMMU_RES_SIZE((r)->dr_res) + /* Locking macros. */ #define HIM_LOCK(him) mtx_lock(&him->him_mtx) #define HIM_LOCK_ASSERT(him) mtx_assert(&him->him_mtx, MA_OWNED) #define HIM_UNLOCK(him) mtx_unlock(&him->him_mtx) -struct bus_dma_methods hviommu_dma_methods = { - .dm_dmamap_create = hviommu_dvmamap_create, - .dm_dmamap_destroy = hviommu_dvmamap_destroy, - .dm_dmamap_load = hviommu_dvmamap_load, - .dm_dmamap_load_mbuf = hviommu_dvmamap_load_mbuf, - .dm_dmamap_load_mbuf_sg = hviommu_dvmamap_load_mbuf_sg, - .dm_dmamap_load_uio = hviommu_dvmamap_load_uio, - .dm_dmamap_unload = hviommu_dvmamap_unload, - .dm_dmamap_sync = hviommu_dvmamap_sync, - .dm_dmamap_alloc = hviommu_dvmamem_alloc, - .dm_dmamap_free = hviommu_dvmamem_free, -}; +/* LRU queue handling for lazy resource allocation. */ +static __inline void +hviommu_map_insq(struct hviommu *him, bus_dmamap_t map) +{ + + HIM_LOCK_ASSERT(him); + if (!SLIST_EMPTY(&map->dm_reslist)) { + if (map->dm_onq) + TAILQ_REMOVE(&him->him_maplruq, map, dm_maplruq); + TAILQ_INSERT_TAIL(&him->him_maplruq, map, dm_maplruq); + map->dm_onq = 1; + } +} + +static __inline void +hviommu_map_remq(struct hviommu *him, bus_dmamap_t map) +{ + + HIM_LOCK_ASSERT(him); + if (map->dm_onq) + TAILQ_REMOVE(&him->him_maplruq, map, dm_maplruq); + map->dm_onq = 0; +} struct hviommu * hviommu_init(devhandle_t dh, u_long dvmabase, u_long dvmasize) { struct hviommu *him; + u_long end; him = malloc(sizeof *him, M_HVIOMMU, M_WAITOK); @@ -168,8 +213,9 @@ him->him_dvmabase = dvmabase; him->him_dvmasize = dvmasize; + TAILQ_INIT(&him->him_maplruq); him->him_rman.rm_type = RMAN_ARRAY; - him->him_rman.rm_desc = "HyperVisor IOMMU Memory"; + him->him_rman.rm_descr = "HyperVisor IOMMU Memory"; end = him->him_dvmabase + him->him_dvmasize - 1; if (rman_init(&him->him_rman) != 0 || rman_manage_region(&him->him_rman, him->him_dvmabase >> @@ -181,7 +227,7 @@ /* XXX - vm_stat_t better be signed */ static void -hviommu_remove(struct hviommu *him, vm_offset_t va, vm_stat_t len) +hviommu_remove(struct hviommu *him, vm_offset_t va, vm_size_t len) { uint64_t error; pages_t demapped; @@ -194,7 +240,7 @@ while (len >= 0) { if ((error = hvio_iommu_demap(him->him_handle, VA_TO_TSBID(him, va), len >> IO_PAGE_SHIFT, &demapped))) { - printf("%s: demap: va: %#lx, npages: %#lx, err: %d\n", + printf("%s: demap: va: %#lx, npages: %#lx, err: %ld\n", __func__, va, len >> IO_PAGE_SHIFT, error); demapped = 1; } @@ -229,12 +275,12 @@ sgsize = IOMMU_RES_TO(round_io_page(size)); if (t->dt_boundary > 0 && t->dt_boundary < IO_PAGE_SIZE) panic("hviommu_dvmamap_load: illegal boundary specified"); - res = rman_reserve_resource_bound(&hviommu_dvma_rman, 0L, + res = rman_reserve_resource_bound(&him->him_rman, 0L, IOMMU_RES_TO(t->dt_lowaddr), sgsize, IOMMU_RES_TO(t->dt_boundary), RF_ACTIVE | rman_make_alignment_flags(align), NULL); if (res == NULL) { - free(bdr, M_IOMMU); + free(bdr, M_HVIOMMU); return (ENOMEM); } @@ -354,9 +400,9 @@ */ HIM_LOCK(him); freed = 0; - last = TAILQ_LAST(&hviommu_maplruq, hviommu_maplruq_head); + last = TAILQ_LAST(&him->him_maplruq, hviommu_maplruq_head); do { - tm = TAILQ_FIRST(&hviommu_maplruq); + tm = TAILQ_FIRST(&him->him_maplruq); complete = tm == last; if (tm == NULL) break; @@ -397,7 +443,7 @@ if ((flags & BUS_DMA_ZERO) != 0) mflags |= M_ZERO; - if ((*vaddr = malloc(dt->dt_maxsize, M_IOMMU, mflags)) == NULL) { + if ((*vaddr = malloc(dt->dt_maxsize, M_HVIOMMU, mflags)) == NULL) { error = ENOMEM; sparc64_dma_free_map(dt, *mapp); return (error); @@ -422,7 +468,7 @@ hviommu_dvma_vfree(him, map); sparc64_dma_free_map(dt, map); - free(vaddr, M_IOMMU); + free(vaddr, M_HVIOMMU); } static int @@ -534,8 +580,12 @@ buflen -= sgsize; vaddr += sgsize; - hviommu_enter(is, trunc_io_page(dvmaddr), trunc_io_page(curaddr), +#if 0 + hviommu_enter(him, trunc_io_page(dvmaddr), trunc_io_page(curaddr), flags); +#else + panic("enter page into iommu"); +#endif /* * Chop the chunk up into segments of at most maxsegsz, but try @@ -599,7 +649,7 @@ error = hviommu_dvmamap_load_buffer(dt, him, map, buf, buflen, NULL, flags, dt->dt_segments, &seg, 1); - HIM_LOCK(is); + HIM_LOCK(him); hviommu_map_insq(him, map); if (error != 0) { hviommu_dvmamap_vunload(him, map); @@ -639,7 +689,7 @@ for (m = m0; m != NULL && error == 0; m = m->m_next) { if (m->m_len == 0) continue; - error = hviommu_dvmamap_load_buffer(dt, is, map, + error = hviommu_dvmamap_load_buffer(dt, him, map, m->m_data, m->m_len, NULL, flags, dt->dt_segments, &nsegs, first); first = 0; @@ -648,7 +698,7 @@ error = EINVAL; HIM_LOCK(him); - hviommu_map_insq(is, map); + hviommu_map_insq(him, map); if (error != 0) { hviommu_dvmamap_vunload(him, map); HIM_UNLOCK(him); @@ -747,7 +797,7 @@ if (minlen == 0) continue; - error = hviommu_dvmamap_load_buffer(dt, is, map, + error = hviommu_dvmamap_load_buffer(dt, him, map, iov[i].iov_base, minlen, td, flags, dt->dt_segments, &nsegs, first); first = 0; @@ -778,8 +828,8 @@ if ((map->dm_flags & DMF_LOADED) == 0) return; HIM_LOCK(him); - hviommu_dvmamap_vunload(is, map); - hviommu_map_insq(is, map); + hviommu_dvmamap_vunload(him, map); + hviommu_map_insq(him, map); HIM_UNLOCK(him); map->dm_flags &= ~DMF_LOADED; } @@ -791,10 +841,50 @@ struct bus_dmamap_res *r; vm_offset_t va; vm_size_t len; + size_t synced; + uint64_t err; + io_sync_direction_t iodir; if ((map->dm_flags & DMF_LOADED) == 0) return; /* XXX This is probably bogus. */ - if ((op & BUS_DMASYNC_PREREAD) != 0 || (op & BUS_DMASYNC_PREWRITE) != 0) + iodir = 0; + if (op & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_POSTREAD)) + iodir |= IO_SYNC_CPU; + if (op & (BUS_DMASYNC_PREWRITE|BUS_DMASYNC_POSTWRITE)) + iodir |= IO_SYNC_DEVICE; + + if ((op & BUS_DMASYNC_PREREAD) != 0) + membar(Sync); + HIM_LOCK(him); + SLIST_FOREACH(r, &map->dm_reslist, dr_link) { + va = (vm_offset_t)BDR_START(r); + len = r->dr_used; + while (len > 0) { + if ((err = hvio_dma_sync(him->him_handle, va, len, iodir, + &synced))) { + printf("failed to dma_sync: err: %ld, handle: %#lx, va: %#lx, len: %#lx, dir: %d\n", + err, him->him_handle, va, len, iodir); + synced = 1; + } + va += synced; + len -= synced; + } + } + HIM_UNLOCK(him); + if ((op & BUS_DMASYNC_PREWRITE) != 0) membar(Sync); } + +struct bus_dma_methods hviommu_dma_methods = { + .dm_dmamap_create = hviommu_dvmamap_create, + .dm_dmamap_destroy = hviommu_dvmamap_destroy, + .dm_dmamap_load = hviommu_dvmamap_load, + .dm_dmamap_load_mbuf = hviommu_dvmamap_load_mbuf, + .dm_dmamap_load_mbuf_sg = hviommu_dvmamap_load_mbuf_sg, + .dm_dmamap_load_uio = hviommu_dvmamap_load_uio, + .dm_dmamap_unload = hviommu_dvmamap_unload, + .dm_dmamap_sync = hviommu_dvmamap_sync, + .dm_dmamem_alloc = hviommu_dvmamem_alloc, + .dm_dmamem_free = hviommu_dvmamem_free, +}; ==== //depot/projects/kmacy_sun4v/src/sys/sys/bus.h#4 (text+ko) ==== @@ -29,6 +29,8 @@ #ifndef _SYS_BUS_H_ #define _SYS_BUS_H_ +#include + /** * @defgroup NEWBUS newbus - a generic framework for managing devices * @{ From owner-p4-projects@FreeBSD.ORG Fri Apr 7 23:25:35 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 C48FE16A401; Fri, 7 Apr 2006 23:25:35 +0000 (UTC) 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 9BF2416A406 for ; Fri, 7 Apr 2006 23:25:35 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D636943D6E for ; Fri, 7 Apr 2006 23:25:34 +0000 (GMT) (envelope-from alc@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 k37NPY7S071643 for ; Fri, 7 Apr 2006 23:25:34 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k37NPYAb071640 for perforce@freebsd.org; Fri, 7 Apr 2006 23:25:34 GMT (envelope-from alc@freebsd.org) Date: Fri, 7 Apr 2006 23:25:34 GMT Message-Id: <200604072325.k37NPYAb071640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 94783 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, 07 Apr 2006 23:25:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=94783 Change 94783 by alc@alc_home on 2006/04/07 23:24:52 Promotion of kernel pmap pages requires that the corresponding pde in every pmap is updated. Affected files ... .. //depot/projects/superpages/src/sys/i386/i386/pmap.c#10 integrate Differences ... ==== //depot/projects/superpages/src/sys/i386/i386/pmap.c#10 (text+ko) ==== @@ -3302,6 +3302,7 @@ mach_promote(pmap_t pmap, vm_offset_t va, reservation_t reserv) { vm_paddr_t pa; + pmap_t allpmaps_entry; pd_entry_t *pde = pmap_pde(pmap, va); pt_entry_t *pte, *first_pte, flags; vm_page_t page_pa; @@ -3331,7 +3332,15 @@ } /* Create a superpage: add PG_PS bit to the pde */ - *pde = PG_PS | flags; + if (pmap == kernel_pmap) { + mtx_lock_spin(&allpmaps_lock); + LIST_FOREACH(allpmaps_entry, &allpmaps, pm_list) { + pde = pmap_pde(allpmaps_entry, va); + pde_store(pde, PG_PS | flags); + } + mtx_unlock_spin(&allpmaps_lock); + } else + *pde = PG_PS | flags; if (pmap != kernel_pmap) pmap->pm_stats.resident_count--; From owner-p4-projects@FreeBSD.ORG Sat Apr 8 05:18: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 D60FA16A402; Sat, 8 Apr 2006 05:18:42 +0000 (UTC) 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 9C98716A400 for ; Sat, 8 Apr 2006 05:18:42 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6440143D53 for ; Sat, 8 Apr 2006 05:18:42 +0000 (GMT) (envelope-from jmg@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 k385Igqi081748 for ; Sat, 8 Apr 2006 05:18:42 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k385IgN3081745 for perforce@freebsd.org; Sat, 8 Apr 2006 05:18:42 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 05:18:42 GMT Message-Id: <200604080518.k385IgN3081745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94788 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, 08 Apr 2006 05:18:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=94788 Change 94788 by jmg@jmg_carbon-60 on 2006/04/08 05:18:33 add ability to enter mappings into the iotte... we'll see if this works.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#3 (text+ko) ==== @@ -225,7 +225,7 @@ return him; } -/* XXX - vm_stat_t better be signed */ +/* XXX - vm_size_t better be signed */ static void hviommu_remove(struct hviommu *him, vm_offset_t va, vm_size_t len) { @@ -233,11 +233,11 @@ pages_t demapped; KASSERT(va >= him->him_dvmabase, - ("hviommu_remove: va 0x%lx not in DVMA space", (u_long)va)); + ("%s: va 0x%lx not in DVMA space", __func__, (u_long)va)); KASSERT(va + len >= va, - ("hviommu_remove: va 0x%lx + len 0x%lx wraps", (long)va, (long)len)); + ("%s: va 0x%lx + len 0x%lx wraps", __func__, (long)va, (long)len)); va = trunc_io_page(va); - while (len >= 0) { + while (len > 0) { if ((error = hvio_iommu_demap(him->him_handle, VA_TO_TSBID(him, va), len >> IO_PAGE_SHIFT, &demapped))) { printf("%s: demap: va: %#lx, npages: %#lx, err: %ld\n", @@ -527,6 +527,35 @@ return (0); } +#define IOTTE_CNT 64 +#define HVIOMMU_TSBID(him, dvmaddr) \ + (((dvmaddr) - (him)->him_dvmabase) >> IO_PAGE_SHIFT) + +static void +hviommu_map_pages(struct hviommu *him, bus_addr_t dvmaddr, uint64_t *iottes, pages_t iottecnt) +{ + uint64_t iotteaddr[IOTTE_CNT]; + uint64_t err; + pages_t mapcnt; + int cntdone; + int i; + + for (i = 0; i < cnt; i++) + iotteaddr[i] = pmap_kextract(&iottes[i]); + + /* push tte's */ + cntdone = 0; + while (cntdone < iottecnt) { + if ((err = hvio_iommu_map(him->him_handle, HVIOMMU_TSBID(him, + dvmaddr), iottecnt, PCI_MAP_ATTR_READ | PCI_MAP_ATTR_WRITE, + pmap_kextract(&iotteaddr[0]), &mapcnt))) { + printf("iommu_map: err: %ld\n", err); + mapcnt = 1; + } + cntdone += mapcnt; + } +} + /* * IOMMU DVMA operations, common to SBUS and PCI. */ @@ -535,12 +564,14 @@ bus_dmamap_t map, void *buf, bus_size_t buflen, struct thread *td, int flags, bus_dma_segment_t *segs, int *segp, int align) { - bus_addr_t amask, dvmaddr; + uint64_t iottes[IOTTE_CNT]; + bus_addr_t amask, dvmaddr, iottebase; bus_size_t sgsize, esize; vm_offset_t vaddr, voffs; vm_paddr_t curaddr; int error, sgcnt, firstpg; pmap_t pmap = NULL; + pages_t iottecnt; KASSERT(buflen != 0, ("hviommu_dvmamap_load_buffer: buflen == 0!")); if (buflen > dt->dt_maxsize) @@ -561,6 +592,7 @@ sgcnt = *segp; firstpg = 1; + iottecnt = 0; for (; buflen > 0; ) { /* * Get the physical address for this page. @@ -584,7 +616,13 @@ hviommu_enter(him, trunc_io_page(dvmaddr), trunc_io_page(curaddr), flags); #else - panic("enter page into iommu"); + if (iottecnt == 0) + iottebase = trunc_io_page(dvmaddr); + iottes[iottecnt] = MAKEIOTTE(trunc_io_page(curaddr) + if (iottecnt >= IOTTE_CNT) { + hviommu_map_pages(him, dvmaddr, iottes, iottecnt); + iottecnt = 0; + } #endif /* @@ -618,6 +656,7 @@ firstpg = 0; } + hviommu_map_pages(him, dvmaddr, iottes, iottecnt); *segp = sgcnt; return (0); } From owner-p4-projects@FreeBSD.ORG Sat Apr 8 05:19: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 7F0CE16A404; Sat, 8 Apr 2006 05:19:44 +0000 (UTC) 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 5BC9616A401 for ; Sat, 8 Apr 2006 05:19:44 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A11943D4C for ; Sat, 8 Apr 2006 05:19:44 +0000 (GMT) (envelope-from jmg@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 k385Jigv082760 for ; Sat, 8 Apr 2006 05:19:44 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k385JhLg082754 for perforce@freebsd.org; Sat, 8 Apr 2006 05:19:43 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 05:19:43 GMT Message-Id: <200604080519.k385JhLg082754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94789 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, 08 Apr 2006 05:19:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=94789 Change 94789 by jmg@jmg_carbon-60 on 2006/04/08 05:18:49 use tabs instead of spaces.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#13 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#13 (text+ko) ==== @@ -51,12 +51,12 @@ typedef uint64_t tsbid_t; typedef uint32_t pages_t; typedef enum io_attributes { - PCI_MAP_ATTR_READ = (uint32_t)0x01, - PCI_MAP_ATTR_WRITE = (uint32_t)0x02 + PCI_MAP_ATTR_READ = (uint32_t)0x01, + PCI_MAP_ATTR_WRITE = (uint32_t)0x02, } io_attributes_t; typedef enum io_sync_direction { - IO_SYNC_DEVICE = (uint32_t)0x01, - IO_SYNC_CPU = (uint32_t)0x02 + IO_SYNC_DEVICE = (uint32_t)0x01, + IO_SYNC_CPU = (uint32_t)0x02, } io_sync_direction_t; typedef uint64_t io_page_list_t; typedef uint64_t r_addr_t; From owner-p4-projects@FreeBSD.ORG Sat Apr 8 06:02: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 6FCCA16A404; Sat, 8 Apr 2006 06:02:02 +0000 (UTC) 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 4AF0816A402 for ; Sat, 8 Apr 2006 06:02:02 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 94E1F43D46 for ; Sat, 8 Apr 2006 06:02:01 +0000 (GMT) (envelope-from jmg@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 k38621uO097307 for ; Sat, 8 Apr 2006 06:02:01 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k38621Xg097298 for perforce@freebsd.org; Sat, 8 Apr 2006 06:02:01 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 06:02:01 GMT Message-Id: <200604080602.k38621Xg097298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94790 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, 08 Apr 2006 06:02:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=94790 Change 94790 by jmg@jmg_arlene on 2006/04/08 06:01:00 make compile. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#4 (text+ko) ==== @@ -116,6 +116,7 @@ #include #include #include +#include #include #include @@ -540,15 +541,16 @@ int cntdone; int i; - for (i = 0; i < cnt; i++) - iotteaddr[i] = pmap_kextract(&iottes[i]); + for (i = 0; i < iottecnt; i++) + iotteaddr[i] = pmap_kextract((vm_offset_t)&iottes[i]); /* push tte's */ cntdone = 0; while (cntdone < iottecnt) { if ((err = hvio_iommu_map(him->him_handle, HVIOMMU_TSBID(him, dvmaddr), iottecnt, PCI_MAP_ATTR_READ | PCI_MAP_ATTR_WRITE, - pmap_kextract(&iotteaddr[0]), &mapcnt))) { + (io_page_list_t *)pmap_kextract((vm_offset_t)&iotteaddr[0]), + &mapcnt))) { printf("iommu_map: err: %ld\n", err); mapcnt = 1; } @@ -618,7 +620,7 @@ #else if (iottecnt == 0) iottebase = trunc_io_page(dvmaddr); - iottes[iottecnt] = MAKEIOTTE(trunc_io_page(curaddr) + iottes[iottecnt] = MAKEIOTTE(trunc_io_page(curaddr), 1, 0, 0); if (iottecnt >= IOTTE_CNT) { hviommu_map_pages(him, dvmaddr, iottes, iottecnt); iottecnt = 0; From owner-p4-projects@FreeBSD.ORG Sat Apr 8 06:17:21 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 5F02B16A405; Sat, 8 Apr 2006 06:17:21 +0000 (UTC) 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 3AD6316A402 for ; Sat, 8 Apr 2006 06:17:21 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF23A43D55 for ; Sat, 8 Apr 2006 06:17:20 +0000 (GMT) (envelope-from jmg@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 k386HK6a008330 for ; Sat, 8 Apr 2006 06:17:20 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k386HKPW008327 for perforce@freebsd.org; Sat, 8 Apr 2006 06:17:20 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 06:17:20 GMT Message-Id: <200604080617.k386HKPW008327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94792 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, 08 Apr 2006 06:17:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=94792 Change 94792 by jmg@jmg_carbon-60 on 2006/04/08 06:16:58 teach ata and em about new parent tags.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/ata/ata-dma.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/ata/ata-dma.c#3 (text+ko) ==== @@ -96,7 +96,7 @@ struct ata_channel *ch = device_get_softc(dev); struct ata_dc_cb_args ccba; - if (bus_dma_tag_create(NULL, ch->dma->alignment, 0, + if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, ch->dma->max_iosize, ATA_DMA_ENTRIES, ch->dma->segsize, ==== //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#3 (text+ko) ==== @@ -2242,7 +2242,7 @@ { int error; - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), /* parent */ E1000_DBA_ALIGN, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2346,7 +2346,7 @@ * Setup DMA descriptor areas. */ size = roundup2(sc->hw.max_frame_size, MCLBYTES); - if ((error = bus_dma_tag_create(NULL, /* parent */ + if ((error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2732,7 +2732,7 @@ bzero(sc->rx_buffer_area, sizeof(struct em_buffer) * sc->num_rx_desc); - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ From owner-p4-projects@FreeBSD.ORG Sat Apr 8 06:23: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 6A5D816A408; Sat, 8 Apr 2006 06:23:29 +0000 (UTC) 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 4961D16A405 for ; Sat, 8 Apr 2006 06:23:29 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A752243D6A for ; Sat, 8 Apr 2006 06:23:28 +0000 (GMT) (envelope-from jmg@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 k386NS0p011185 for ; Sat, 8 Apr 2006 06:23:28 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k386NS9B011179 for perforce@freebsd.org; Sat, 8 Apr 2006 06:23:28 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 06:23:28 GMT Message-Id: <200604080623.k386NS9B011179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94793 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, 08 Apr 2006 06:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=94793 Change 94793 by jmg@jmg_arlene on 2006/04/08 06:22:45 enable em Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#10 (text+ko) ==== @@ -143,7 +143,7 @@ # PCI Ethernet NICs. #device de # DEC/Intel DC21x4x (``Tulip'') -#device em # Intel PRO/1000 adapter Gigabit Ethernet Card +device em # Intel PRO/1000 adapter Gigabit Ethernet Card #device ixgb # Intel PRO/10GbE Ethernet Card #device le # AMD Am7900 LANCE and Am79C9xx PCnet #device txp # 3Com 3cR990 (``Typhoon'') From owner-p4-projects@FreeBSD.ORG Sat Apr 8 06:27: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 90F3816A405; Sat, 8 Apr 2006 06:27:34 +0000 (UTC) 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 58C4516A403 for ; Sat, 8 Apr 2006 06:27:34 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12A3E43D45 for ; Sat, 8 Apr 2006 06:27:34 +0000 (GMT) (envelope-from jmg@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 k386RXlM014526 for ; Sat, 8 Apr 2006 06:27:33 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k386RX9c014520 for perforce@freebsd.org; Sat, 8 Apr 2006 06:27:33 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 06:27:33 GMT Message-Id: <200604080627.k386RX9c014520@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94794 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, 08 Apr 2006 06:27:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=94794 Change 94794 by jmg@jmg_arlene on 2006/04/08 06:27:00 use param instead of types since we need NULL... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em_osdep.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em_osdep.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ #ifndef _FREEBSD_OS_H_ #define _FREEBSD_OS_H_ -#include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Apr 8 06:41: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 81E5016A422; Sat, 8 Apr 2006 06:41:52 +0000 (UTC) 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 4180E16A41F for ; Sat, 8 Apr 2006 06:41:52 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C01B943D48 for ; Sat, 8 Apr 2006 06:41:51 +0000 (GMT) (envelope-from jmg@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 k386fppT020503 for ; Sat, 8 Apr 2006 06:41:51 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k386fpGm020495 for perforce@freebsd.org; Sat, 8 Apr 2006 06:41:51 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 06:41:51 GMT Message-Id: <200604080641.k386fpGm020495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94795 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, 08 Apr 2006 06:41:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=94795 Change 94795 by jmg@jmg_arlene on 2006/04/08 06:41:23 zero memory, mtx_init can fail thinking it's already initalized even though it isn't... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#5 (text+ko) ==== @@ -207,7 +207,7 @@ struct hviommu *him; u_long end; - him = malloc(sizeof *him, M_HVIOMMU, M_WAITOK); + him = malloc(sizeof *him, M_HVIOMMU, M_WAITOK|M_ZERO); mtx_init(&him->him_mtx, "hviommu", NULL, MTX_DEF); him->him_handle = dh; From owner-p4-projects@FreeBSD.ORG Sat Apr 8 07:26: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 8EF1416A405; Sat, 8 Apr 2006 07:26:46 +0000 (UTC) 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 6417816A400 for ; Sat, 8 Apr 2006 07:26:46 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E600843D46 for ; Sat, 8 Apr 2006 07:26:45 +0000 (GMT) (envelope-from jmg@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 k387Qj7b037680 for ; Sat, 8 Apr 2006 07:26:45 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k387QjLf037664 for perforce@freebsd.org; Sat, 8 Apr 2006 07:26:45 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 07:26:45 GMT Message-Id: <200604080726.k387QjLf037664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94800 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, 08 Apr 2006 07:26:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=94800 Change 94800 by jmg@jmg_carbon-60 on 2006/04/08 07:26:11 setup a few more parameters that need to be setup.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#28 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#28 (text+ko) ==== @@ -269,6 +269,9 @@ himp = hviommu_init(sc->hs_devhandle, dvma[0], dvma[1]); sc->hs_dmatag.dt_cookie = himp; sc->hs_dmatag.dt_mt = &hviommu_dma_methods; + sc->hs_dmatag.dt_lowaddr = 0; + sc->hs_dmatag.dt_highaddr = ~0; + sc->hs_dmatag.dt_boundary = BUS_SPACE_MAXADDR_32BIT + 1; free(dvma, M_OFWPROP); From owner-p4-projects@FreeBSD.ORG Sat Apr 8 07:49: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 0F23916A405; Sat, 8 Apr 2006 07:49:15 +0000 (UTC) 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 CBA0016A400 for ; Sat, 8 Apr 2006 07:49:14 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 866E243D49 for ; Sat, 8 Apr 2006 07:49:14 +0000 (GMT) (envelope-from jmg@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 k387nEgH048845 for ; Sat, 8 Apr 2006 07:49:14 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k387nE7b048834 for perforce@freebsd.org; Sat, 8 Apr 2006 07:49:14 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 07:49:14 GMT Message-Id: <200604080749.k387nE7b048834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94801 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, 08 Apr 2006 07:49:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=94801 Change 94801 by jmg@jmg_carbon-60 on 2006/04/08 07:48:54 make ohci pull a parent tag... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ohci_pci.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/usb/ohci_pci.c#3 (text+ko) ==== @@ -303,6 +303,7 @@ ohci_pci_detach(self); return ENXIO; } + sc->sc_bus.dmatag = bus_get_dma_tag(self); err = ohci_init(sc); if (!err) { sc->sc_flags |= OHCI_SCFLG_DONEINIT; From owner-p4-projects@FreeBSD.ORG Sat Apr 8 08:19: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 48C2716A405; Sat, 8 Apr 2006 08:19:12 +0000 (UTC) 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 2457516A402 for ; Sat, 8 Apr 2006 08:19:12 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A2F843D45 for ; Sat, 8 Apr 2006 08:19:06 +0000 (GMT) (envelope-from jmg@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 k388J6O1064856 for ; Sat, 8 Apr 2006 08:19:06 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k388J66J064853 for perforce@freebsd.org; Sat, 8 Apr 2006 08:19:06 GMT (envelope-from jmg@freebsd.org) Date: Sat, 8 Apr 2006 08:19:06 GMT Message-Id: <200604080819.k388J66J064853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94805 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, 08 Apr 2006 08:19:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=94805 Change 94805 by jmg@jmg_carbon-60 on 2006/04/08 08:18:52 properly set lowaddr.. This gets things a bit farther along.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#29 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#29 (text+ko) ==== @@ -269,7 +269,7 @@ himp = hviommu_init(sc->hs_devhandle, dvma[0], dvma[1]); sc->hs_dmatag.dt_cookie = himp; sc->hs_dmatag.dt_mt = &hviommu_dma_methods; - sc->hs_dmatag.dt_lowaddr = 0; + sc->hs_dmatag.dt_lowaddr = ~0; sc->hs_dmatag.dt_highaddr = ~0; sc->hs_dmatag.dt_boundary = BUS_SPACE_MAXADDR_32BIT + 1;