From owner-p4-projects@FreeBSD.ORG Sun Dec 10 00:31: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 F29C616A416; Sun, 10 Dec 2006 00:31:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CD66816A403; Sun, 10 Dec 2006 00:31:28 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C5C943C9F; Sun, 10 Dec 2006 00:30:20 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 0893E487FD; Sun, 10 Dec 2006 01:31:26 +0100 (CET) Received: from localhost (dlv121.neoplus.adsl.tpnet.pl [83.24.51.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 26EB0487FE; Sun, 10 Dec 2006 01:31:19 +0100 (CET) Date: Sun, 10 Dec 2006 01:31:12 +0100 From: Pawel Jakub Dawidek To: Sam Leffler Message-ID: <20061210003112.GC12193@garage.freebsd.pl> References: <200612082124.kB8LOI9Q065465@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="UFHRwCdBEJvubb2X" Content-Disposition: inline In-Reply-To: <200612082124.kB8LOI9Q065465@repoman.freebsd.org> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r804 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.5 required=3.0 tests=BAYES_00,RCVD_IN_NJABL_DUL, RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111299 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, 10 Dec 2006 00:31:29 -0000 --UFHRwCdBEJvubb2X Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 08, 2006 at 09:24:18PM +0000, Sam Leffler wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D111299 >=20 > Change 111299 by sam@sam_ebb on 2006/12/08 21:23:36 >=20 > o check for device existence before attaching so we don't > get duplicates > o use device_set_desc_copy instead of a static buffer; > from jhb This fixes the issues I was seeing. --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --UFHRwCdBEJvubb2X Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (FreeBSD) iD8DBQFFe1VQForvXbEpPzQRApU2AKCPogHKTaLZlBCcy6DijN7Ztm+ikQCePHfN 6fvB8OSmO/zhU8Mh88Omv74= =Qro1 -----END PGP SIGNATURE----- --UFHRwCdBEJvubb2X-- From owner-p4-projects@FreeBSD.ORG Sun Dec 10 01:56: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 CC7D616A4CA; Sun, 10 Dec 2006 01:56:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9301816A4C8 for ; Sun, 10 Dec 2006 01:56:58 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2026A43C9E for ; Sun, 10 Dec 2006 01:55:51 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA1uwbQ039564 for ; Sun, 10 Dec 2006 01:56:58 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA1uw4J039561 for perforce@freebsd.org; Sun, 10 Dec 2006 01:56:58 GMT (envelope-from ticso@freebsd.org) Date: Sun, 10 Dec 2006 01:56:58 GMT Message-Id: <200612100156.kBA1uw4J039561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111353 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, 10 Dec 2006 01:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=111353 Change 111353 by ticso@ticso on 2006/12/10 01:56:31 add basic driver for RTL8305SC switch Just probing and locking spped to 100BaseTX/FDX so far Affected files ... .. //depot/projects/arm/src/sys/arm/conf/BWCT#2 edit .. //depot/projects/arm/src/sys/conf/files#57 edit .. //depot/projects/arm/src/sys/dev/mii/miidevs#8 edit .. //depot/projects/arm/src/sys/dev/mii/rlswitch.c#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/conf/BWCT#2 (text+ko) ==== @@ -78,7 +78,7 @@ device uart device ate device mii -#device rlswitch +device rlswitch # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking ==== //depot/projects/arm/src/sys/conf/files#57 (text+ko) ==== @@ -742,6 +742,7 @@ dev/mii/rgephy.c optional miibus | rgephy # XXX rl and re only? dev/mii/rlphy.c optional miibus | rlphy +dev/mii/rlswitch.c optional miibus | rlswitch # XXX rue only? dev/mii/ruephy.c optional miibus | ruephy dev/mii/tdkphy.c optional miibus | tdkphy ==== //depot/projects/arm/src/sys/dev/mii/miidevs#8 (text+ko) ==== @@ -169,6 +169,7 @@ /* RealTek Semiconductor PHYs */ model REALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface +model xxREALTEK RTL8305SC 0x0005 RTL8305SC 10/100 802.1q switch model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S media interface /* Seeq PHYs */ From owner-p4-projects@FreeBSD.ORG Sun Dec 10 02:17: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 A8BF216A47B; Sun, 10 Dec 2006 02:17:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2C24E16A415 for ; Sun, 10 Dec 2006 02:17:24 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7267243C9F for ; Sun, 10 Dec 2006 02:16:16 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA2HNmm044014 for ; Sun, 10 Dec 2006 02:17:23 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA2HNvC044011 for perforce@freebsd.org; Sun, 10 Dec 2006 02:17:23 GMT (envelope-from ticso@freebsd.org) Date: Sun, 10 Dec 2006 02:17:23 GMT Message-Id: <200612100217.kBA2HNvC044011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111354 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, 10 Dec 2006 02:17:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=111354 Change 111354 by ticso@ticso on 2006/12/10 02:17:14 style fix: remove excessive tab. Affected files ... .. //depot/projects/arm/src/sys/dev/mii/miidevs#9 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mii/miidevs#9 (text+ko) ==== @@ -169,7 +169,7 @@ /* RealTek Semiconductor PHYs */ model REALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface -model xxREALTEK RTL8305SC 0x0005 RTL8305SC 10/100 802.1q switch +model xxREALTEK RTL8305SC 0x0005 RTL8305SC 10/100 802.1q switch model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S media interface /* Seeq PHYs */ From owner-p4-projects@FreeBSD.ORG Sun Dec 10 02:38: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 BB2FD16A415; Sun, 10 Dec 2006 02:38:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F7E816A403 for ; Sun, 10 Dec 2006 02:38:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCF1E43C9F for ; Sun, 10 Dec 2006 02:37:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA2cqV1047110 for ; Sun, 10 Dec 2006 02:38:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA2cp6h047107 for perforce@freebsd.org; Sun, 10 Dec 2006 02:38:51 GMT (envelope-from imp@freebsd.org) Date: Sun, 10 Dec 2006 02:38:51 GMT Message-Id: <200612100238.kBA2cp6h047107@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 111356 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, 10 Dec 2006 02:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111356 Change 111356 by imp@imp_lighthouse on 2006/12/10 02:38:29 Move from 6-0 addressing to 7-1 addressing, like the other iic drivers. Submitted by: tisco Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twireg.h#7 edit .. //depot/projects/arm/src/sys/arm/conf/KB920X.hints#2 edit .. //depot/projects/arm/src/sys/arm/conf/TSC4370.hints#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twireg.h#7 (text+ko) ==== @@ -56,7 +56,7 @@ #define TWI_MMR_IADRSZ(n) ((n) << 8) /* Set size of transfer */ #define TWI_MMR_MWRITE 0U /* Master Read Direction */ #define TWI_MMR_MREAD (1U << 12) /* Master Read Direction */ -#define TWI_MMR_DADR(n) ((n) << 16) /* Device Address */ +#define TWI_MMR_DADR(n) ((n) << 15) /* Device Address */ /* TWI_CWGR */ #define TWI_CWGR_CKDIV(x) ((x) << 16) /* Clock Divider */ ==== //depot/projects/arm/src/sys/arm/conf/KB920X.hints#2 (text+ko) ==== @@ -2,7 +2,7 @@ # $TSC$ # boot Eeprom hint.icee.0.at="iicbus0" -hint.icee.0.addr=0x50 +hint.icee.0.addr=0xa0 hint.icee.0.type=16 hint.icee.0.size=16384 hint.icee.0.rd_sz=256 ==== //depot/projects/arm/src/sys/arm/conf/TSC4370.hints#5 (text+ko) ==== @@ -4,51 +4,51 @@ hint.at45d.0.cs=0 # ID Eeprom hint.icee.0.at="iicbus0" -hint.icee.0.addr=0x40 +hint.icee.0.addr=0x80 hint.icee.0.type=8 hint.icee.0.size=2048 hint.icee.0.rd_sz=256 hint.icee.0.wr_sz=16 # Config Eeprom hint.icee.1.at="iicbus0" -hint.icee.1.addr=0x48 +hint.icee.1.addr=0x90 hint.icee.1.type=8 hint.icee.1.size=2048 hint.icee.1.rd_sz=256 hint.icee.1.wr_sz=16 # spf eeprom hint.icee.2.at="iicbus0" -hint.icee.2.addr=0x50 +hint.icee.2.addr=0xa0 hint.icee.2.type=8 hint.icee.2.size=128 hint.icee.2.rd_sz=128 hint.icee.2.wr_sz=8 -# input card ltc4305: 0x58 -# daughter card ltc4305: 0x59 +# input card ltc4305: 0xb0 +# daughter card ltc4305: 0xb1 # ps eeprom hint.icee.3.at="iicbus0" -hint.icee.3.addr=0x60 +hint.icee.3.addr=0xc0 hint.icee.3.type=8 hint.icee.3.size=2048 hint.icee.3.rd_sz=256 hint.icee.3.wr_sz=16 # daughter ID eeprom hint.icee.4.at="iicbus0" -hint.icee.4.addr=0x68 +hint.icee.4.addr=0xd0 hint.icee.4.type=8 hint.icee.4.size=2048 hint.icee.4.rd_sz=256 hint.icee.4.wr_sz=16 # RU/GPS board ID eeprom hint.icee.5.at="iicbus0" -hint.icee.5.addr=0x70 +hint.icee.5.addr=0xe0 hint.icee.5.type=8 hint.icee.5.size=2048 hint.icee.5.rd_sz=256 hint.icee.5.wr_sz=16 # Input Card ID eeprom hint.icee.6.at="iicbus0" -hint.icee.6.addr=0x78 +hint.icee.6.addr=0xf0 hint.icee.6.type=8 hint.icee.6.size=2048 hint.icee.6.rd_sz=256 From owner-p4-projects@FreeBSD.ORG Sun Dec 10 04:27:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8E3F16A415; Sun, 10 Dec 2006 04:27:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8F09316A40F for ; Sun, 10 Dec 2006 04:27:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E01043C9E for ; Sun, 10 Dec 2006 04:26:09 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA4RHFO066586 for ; Sun, 10 Dec 2006 04:27:17 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA4RGAx066583 for perforce@freebsd.org; Sun, 10 Dec 2006 04:27:16 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 10 Dec 2006 04:27:16 GMT Message-Id: <200612100427.kBA4RGAx066583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111362 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, 10 Dec 2006 04:27:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=111362 Change 111362 by mjacob@newisp on 2006/12/10 04:26:34 IFC1. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#34 integrate .. //depot/projects/newisp/dev/isp/isp_pci.c#21 integrate .. //depot/projects/newisp/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/newisp/dev/isp/ispmbox.h#16 integrate .. //depot/projects/newisp/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/newisp/dev/mpt/mpt_cam.c#22 integrate .. //depot/projects/newisp/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/newisp/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/newisp/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/newisp/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/newisp/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/newisp/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/newisp/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/newisp/sun4v/sun4v/pmap.c#7 integrate Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#34 (text+ko) ==== @@ -29,7 +29,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.129 2006/12/05 07:50:23 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.130 2006/12/09 01:30:05 mjacob Exp $"); #include #include #include ==== //depot/projects/newisp/dev/isp/isp_pci.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.127 2006/11/18 03:53:16 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.128 2006/12/10 03:41:48 mjacob Exp $"); #include #include @@ -352,10 +352,7 @@ }; static devclass_t isp_devclass; DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0); -#if __FreeBSD_version >= 700000 -MODULE_DEPEND(isp, ispfw, 1, 1, 1); -MODULE_DEPEND(isp, firmware, 1, 1, 1); -#else +#if __FreeBSD_version < 700000 extern ispfwfunc *isp_get_firmware_p; #endif ==== //depot/projects/newisp/dev/isp/isp_sbus.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.23 2006/11/02 03:21:31 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.24 2006/12/10 03:41:48 mjacob Exp $"); #include #include @@ -113,9 +113,7 @@ }; static devclass_t isp_devclass; DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0); -#if __FreeBSD_version >= 700000 -MODULE_DEPEND(isp, firmware, 1, 1, 1); -#else +#if __FreeBSD_version < 700000 extern ispfwfunc *isp_get_firmware_p; #endif ==== //depot/projects/newisp/dev/isp/ispmbox.h#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.55 2006/11/18 03:53:16 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.56 2006/12/09 01:33:55 mjacob Exp $ */ /*- * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters. * @@ -638,7 +638,7 @@ typedef struct { isphdr_t ms_header; uint32_t ms_handle; - uint16_t ms_nphdl; /* XXX: Note, this is for 2K Logins only */ + uint16_t ms_nphdl; /* handle in high byte for !2k f/w */ uint16_t ms_status; uint16_t ms_flags; uint16_t ms_reserved1; /* low 8 bits */ ==== //depot/projects/newisp/dev/ispfw/ispfw.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.18 2006/08/26 18:39:18 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.19 2006/12/10 03:42:57 mjacob Exp $"); #include #include @@ -52,7 +52,7 @@ #ifdef __sparc64__ #define ISP_1000 1 #endif -#define MODULE_NAME "isp" +#define MODULE_NAME "ispfw" #endif #if defined(ISP_1040) || defined(ISP_1040_IT) ==== //depot/projects/newisp/dev/mpt/mpt_cam.c#22 (text+ko) ==== @@ -94,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.45 2006/12/07 22:02:28 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.46 2006/12/10 01:13:56 mjacob Exp $"); #include #include @@ -179,6 +179,7 @@ }; DECLARE_MPT_PERSONALITY(mpt_cam, SI_ORDER_SECOND); +MODULE_DEPEND(mpt_cam, cam, 1, 1, 1); int mpt_cam_probe(struct mpt_softc *mpt) ==== //depot/projects/newisp/dev/mpt/mpt_pci.c#7 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.44 2006/11/19 23:24:52 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.45 2006/12/10 01:13:56 mjacob Exp $"); #include #include @@ -210,6 +210,7 @@ }; static devclass_t mpt_devclass; DRIVER_MODULE(mpt, pci, mpt_driver, mpt_devclass, 0, 0); +MODULE_DEPEND(mpt, pci, 1, 1, 1); MODULE_VERSION(mpt, 1); static int ==== //depot/projects/newisp/dev/sound/pci/hda/hdac.c#6 (text+ko) ==== @@ -80,10 +80,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20061203_0035" +#define HDA_DRV_TEST_REV "20061210_0036" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.12 2006/12/02 17:12:24 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.13 2006/12/09 17:52:54 ariff Exp $"); #undef HDA_DEBUG_ENABLED #define HDA_DEBUG_ENABLED 1 @@ -242,10 +242,11 @@ #define HDA_QUIRK_GPIO0 (1 << 0) #define HDA_QUIRK_GPIO1 (1 << 1) #define HDA_QUIRK_GPIO2 (1 << 2) -#define HDA_QUIRK_SOFTPCMVOL (1 << 15) -#define HDA_QUIRK_FIXEDRATE (1 << 16) -#define HDA_QUIRK_FORCESTEREO (1 << 17) -#define HDA_QUIRK_EAPDINV (1 << 18) +#define HDA_QUIRK_GPIOFLUSH (1 << 15) +#define HDA_QUIRK_SOFTPCMVOL (1 << 16) +#define HDA_QUIRK_FIXEDRATE (1 << 17) +#define HDA_QUIRK_FORCESTEREO (1 << 18) +#define HDA_QUIRK_EAPDINV (1 << 19) static const struct { char *key; @@ -254,6 +255,7 @@ { "gpio0", HDA_QUIRK_GPIO0 }, { "gpio1", HDA_QUIRK_GPIO1 }, { "gpio2", HDA_QUIRK_GPIO2 }, + { "gpioflush", HDA_QUIRK_GPIOFLUSH }, { "softpcmvol", HDA_QUIRK_SOFTPCMVOL }, { "fixedrate", HDA_QUIRK_FIXEDRATE }, { "forcestereo", HDA_QUIRK_FORCESTEREO }, @@ -448,33 +450,38 @@ uint32_t model; uint32_t id; int type; + int inverted; nid_t hpnid; nid_t spkrnid[8]; nid_t eapdnid; } hdac_hp_switch[] = { /* Specific OEM models */ - { HP_V3000_SUBVENDOR, HDA_CODEC_CXVENICE, HDAC_HP_SWITCH_CTL, + { HP_V3000_SUBVENDOR, HDA_CODEC_CXVENICE, HDAC_HP_SWITCH_CTL, 0, 17, { 16, -1 }, 16 }, - { HP_NX7400_SUBVENDOR, HDA_CODEC_AD1981HD, HDAC_HP_SWITCH_CTL, + { HP_NX7400_SUBVENDOR, HDA_CODEC_AD1981HD, HDAC_HP_SWITCH_CTL, 0, 6, { 5, -1 }, 5 }, - { HP_NX6310_SUBVENDOR, HDA_CODEC_AD1981HD, HDAC_HP_SWITCH_CTL, + { HP_NX6310_SUBVENDOR, HDA_CODEC_AD1981HD, HDAC_HP_SWITCH_CTL, 0, 6, { 5, -1 }, 5 }, - { DELL_D820_SUBVENDOR, HDA_CODEC_STAC9220, HDAC_HP_SWITCH_CTRL, + { DELL_D820_SUBVENDOR, HDA_CODEC_STAC9220, HDAC_HP_SWITCH_CTRL, 0, 13, { 14, -1 }, -1 }, - { DELL_I1300_SUBVENDOR, HDA_CODEC_STAC9220, HDAC_HP_SWITCH_CTRL, + { DELL_I1300_SUBVENDOR, HDA_CODEC_STAC9220, HDAC_HP_SWITCH_CTRL, 0, 13, { 14, -1 }, -1 }, - { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDAC_HP_SWITCH_CTRL, + { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDAC_HP_SWITCH_CTRL, 0, 10, { 13, -1 }, -1 }, + { LENOVO_3KN100_SUBVENDOR, HDA_CODEC_AD1986A, HDAC_HP_SWITCH_CTL, 1, + 26, { 27, -1 }, -1 }, /* * All models that at least come from the same vendor with * simmilar codec. */ - { HP_ALL_SUBVENDOR, HDA_CODEC_CXVENICE, HDAC_HP_SWITCH_CTL, + { HP_ALL_SUBVENDOR, HDA_CODEC_CXVENICE, HDAC_HP_SWITCH_CTL, 0, 17, { 16, -1 }, 16 }, - { HP_ALL_SUBVENDOR, HDA_CODEC_AD1981HD, HDAC_HP_SWITCH_CTL, + { HP_ALL_SUBVENDOR, HDA_CODEC_AD1981HD, HDAC_HP_SWITCH_CTL, 0, 6, { 5, -1 }, 5 }, - { DELL_ALL_SUBVENDOR, HDA_CODEC_STAC9220, HDAC_HP_SWITCH_CTRL, + { DELL_ALL_SUBVENDOR, HDA_CODEC_STAC9220, HDAC_HP_SWITCH_CTRL, 0, 13, { 14, -1 }, -1 }, + { LENOVO_ALL_SUBVENDOR, HDA_CODEC_AD1986A, HDAC_HP_SWITCH_CTL, 1, + 26, { 27, -1 }, -1 }, }; #define HDAC_HP_SWITCH_LEN \ (sizeof(hdac_hp_switch) / sizeof(hdac_hp_switch[0])) @@ -683,6 +690,7 @@ hdac_hp_switch[i].hpnid, res); ); res >>= 31; + res ^= hdac_hp_switch[i].inverted; switch (hdac_hp_switch[i].type) { case HDAC_HP_SWITCH_CTL: @@ -3457,11 +3465,11 @@ { HDA_MATCH_ALL, HDA_MATCH_ALL, HDA_QUIRK_FORCESTEREO, 0 }, { ACER_ALL_SUBVENDOR, HDA_MATCH_ALL, - HDA_QUIRK_GPIO1, 0 }, + HDA_QUIRK_GPIO0, 0 }, { ASUS_M5200_SUBVENDOR, HDA_CODEC_ALC880, + HDA_QUIRK_GPIO0, 0 }, + { MEDION_MD95257_SUBVENDOR, HDA_CODEC_ALC880, HDA_QUIRK_GPIO1, 0 }, - { MEDION_MD95257_SUBVENDOR, HDA_CODEC_ALC880, - HDA_QUIRK_GPIO2, 0 }, { ASUS_U5F_SUBVENDOR, HDA_CODEC_AD1986A, HDA_QUIRK_EAPDINV, 0 }, { ASUS_A8JC_SUBVENDOR, HDA_CODEC_AD1986A, @@ -3470,6 +3478,8 @@ HDA_QUIRK_EAPDINV, 0 }, { SAMSUNG_Q1_SUBVENDOR, HDA_CODEC_AD1986A, HDA_QUIRK_EAPDINV, 0 }, + { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, + HDA_QUIRK_GPIO0 | HDA_QUIRK_GPIO1, 0 }, { HDA_MATCH_ALL, HDA_CODEC_CXVENICE, 0, HDA_QUIRK_FORCESTEREO }, { HDA_MATCH_ALL, HDA_CODEC_STACXXXX, @@ -4096,23 +4106,55 @@ cad = devinfo->codec->cad; if (cfl & HDA_COMMIT_GPIO) { - if (sc->pci_subvendor == APPLE_INTEL_MAC) { - uint32_t gdata, gmask, gdir; + uint32_t gdata, gmask, gdir; + int commitgpio = 0; - gdata = hdac_command(sc, - HDA_CMD_GET_GPIO_DATA(cad, devinfo->nid), - cad); - gmask = hdac_command(sc, - HDA_CMD_GET_GPIO_ENABLE_MASK(cad, devinfo->nid), - cad); - gdir = hdac_command(sc, - HDA_CMD_GET_GPIO_DIRECTION(cad, devinfo->nid), - cad); - gdata |= 0x03; - gmask |= 0x03; - gdir |= 0x03; + gdata = 0; + gmask = 0; + gdir = 0; + + if (sc->pci_subvendor == APPLE_INTEL_MAC) hdac_command(sc, HDA_CMD_12BIT(cad, devinfo->nid, 0x7e7, 0), cad); + + if (devinfo->function.audio.quirks & HDA_QUIRK_GPIOFLUSH) + commitgpio = 1; + else { + for (i = 0; i < HDA_GPIO_MAX; i++) { + if (!(devinfo->function.audio.quirks & + (1 << i))) + continue; + if (commitgpio == 0) { + commitgpio = 1; + gdata = hdac_command(sc, + HDA_CMD_GET_GPIO_DATA(cad, + devinfo->nid), cad); + gmask = hdac_command(sc, + HDA_CMD_GET_GPIO_ENABLE_MASK(cad, + devinfo->nid), cad); + gdir = hdac_command(sc, + HDA_CMD_GET_GPIO_DIRECTION(cad, + devinfo->nid), cad); + HDA_BOOTVERBOSE( + device_printf(sc->dev, + "GPIO init: data=0x%08x " + "mask=0x%08x dir=0x%08x\n", + gdata, gmask, gdir); + ); + } + gdata |= 1 << i; + gmask |= 1 << i; + gdir |= 1 << i; + } + } + + if (commitgpio != 0) { + HDA_BOOTVERBOSE( + device_printf(sc->dev, + "GPIO commit: data=0x%08x mask=0x%08x " + "dir=0x%08x\n", + gdata, gmask, gdir); + ); hdac_command(sc, HDA_CMD_SET_GPIO_ENABLE_MASK(cad, devinfo->nid, gmask), cad); @@ -4122,21 +4164,6 @@ hdac_command(sc, HDA_CMD_SET_GPIO_DATA(cad, devinfo->nid, gdata), cad); - } else { - for (i = 0; i < HDA_GPIO_MAX; i++) { - if (!(devinfo->function.audio.quirks & - (1 << i))) - continue; - hdac_command(sc, - HDA_CMD_SET_GPIO_ENABLE_MASK(cad, - devinfo->nid, i), cad); - hdac_command(sc, - HDA_CMD_SET_GPIO_DIRECTION(cad, - devinfo->nid, i), cad); - hdac_command(sc, - HDA_CMD_SET_GPIO_DATA(cad, devinfo->nid, - i), cad); - } } } ==== //depot/projects/newisp/fs/msdosfs/msdosfs_vfsops.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.154 2006/11/06 13:41:57 rwatson Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.155 2006/12/09 01:49:19 rodrigc Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -262,11 +262,15 @@ pmp = VFSTOMSDOSFS(mp); if (vfs_flagopt(mp->mnt_optnew, "export", NULL, 0)) { - /* Process export requests. */ - if ((pmp->pm_flags & MSDOSFS_LARGEFS) != 0) + /* + * Forbid export requests if filesystem has + * MSDOSFS_LARGEFS flag set. + */ + if ((pmp->pm_flags & MSDOSFS_LARGEFS) != 0) { + vfs_mount_error(mp, + "MSDOSFS_LARGEFS flag set, cannot export"); return (EOPNOTSUPP); - else - return (0); + } } if (!(pmp->pm_flags & MSDOSFSMNT_RONLY) && vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0)) { ==== //depot/projects/newisp/fs/unionfs/union_subr.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.87 2006/12/02 19:35:56 rodrigc Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.88 2006/12/09 16:27:50 rodrigc Exp $ */ #include @@ -317,7 +317,7 @@ { int vfslocked; struct unionfs_node *unp; - struct unionfs_node_status *unsp; + struct unionfs_node_status *unsp, *unsp_tmp; struct vnode *lvp; struct vnode *uvp; @@ -367,7 +367,8 @@ free(unp->un_path, M_UNIONFSPATH); unp->un_path = NULL; } - while ((unsp = LIST_FIRST(&(unp->un_unshead))), NULL != unsp) { + + LIST_FOREACH_SAFE(unsp, &(unp->un_unshead), uns_list, unsp_tmp) { LIST_REMOVE(unsp, uns_list); free(unsp, M_TEMP); } ==== //depot/projects/newisp/fs/unionfs/union_vfsops.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.79 2006/12/02 19:35:56 rodrigc Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.81 2006/12/09 17:24:18 rodrigc Exp $ */ #include @@ -139,14 +139,18 @@ copymode = UNIONFS_TRADITIONAL; /* default */ ndp = &nd; - if (mp->mnt_flag & MNT_ROOTFS) + if (mp->mnt_flag & MNT_ROOTFS) { + vfs_mount_error(mp, "Cannot union mount root filesystem"); return (EOPNOTSUPP); + } /* * Update is a no operation. */ - if (mp->mnt_flag & MNT_UPDATE) + if (mp->mnt_flag & MNT_UPDATE) { + vfs_mount_error(mp, "unionfs does not support mount update"); return (EOPNOTSUPP); + } /* * Get argument @@ -394,12 +398,10 @@ unionfs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td) { struct unionfs_mount *ump; - struct unionfs_node *unp; struct vnode *vp; ump = MOUNTTOUNIONFSMOUNT(mp); vp = ump->um_rootvp; - unp = VTOUNIONFS(vp); UNIONFSDEBUG("unionfs_root: rootvp=%p locked=%x\n", vp, VOP_ISLOCKED(vp, td)); ==== //depot/projects/newisp/fs/unionfs/union_vnops.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.136 2006/12/02 22:30:30 rodrigc Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.138 2006/12/09 16:51:09 rodrigc Exp $ * */ @@ -872,9 +872,11 @@ UNIONFS_INTERNAL_DEBUG("unionfs_ioctl: enter\n"); + vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td); unp = VTOUNIONFS(ap->a_vp); unionfs_get_node_status(unp, ap->a_td, &unsp); ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp); + VOP_UNLOCK(ap->a_vp, 0, ap->a_td); if (ovp == NULLVP) return (EBADF); @@ -894,9 +896,11 @@ struct unionfs_node_status *unsp; struct vnode *ovp; + vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td); unp = VTOUNIONFS(ap->a_vp); unionfs_get_node_status(unp, ap->a_td, &unsp); ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp); + VOP_UNLOCK(ap->a_vp, 0, ap->a_td); if (ovp == NULLVP) return (EBADF); @@ -1462,6 +1466,10 @@ uio->uio_offset = 0; } + if (lvp == NULLVP) { + error = EBADF; + goto unionfs_readdir_exit; + } /* read lower */ error = VOP_READDIR(lvp, uio, ap->a_cred, ap->a_eofflag, ap->a_ncookies, ap->a_cookies); ==== //depot/projects/newisp/sparc64/sparc64/elf_machdep.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * from: NetBSD: mdreloc.c,v 1.5 2001/04/25 12:24:51 kleink Exp - * $FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.21 2005/12/26 21:23:55 sobomax Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.22 2006/12/10 04:18:03 kmacy Exp $ */ #include @@ -310,7 +310,7 @@ return (0); if (rtype == R_SPARC_JMP_SLOT || rtype == R_SPARC_COPY || - rtype > R_SPARC_UA16) + rtype >= (sizeof(reloc_target_bitmask)/sizeof(long))) return (-1); if (RELOC_UNALIGNED(rtype)) ==== //depot/projects/newisp/sun4v/sun4v/pmap.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.18 2006/12/04 19:35:40 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.22 2006/12/10 04:14:29 kmacy Exp $"); #include "opt_kstack_pages.h" #include "opt_msgbuf.h" @@ -134,7 +134,8 @@ static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; int pmap_debug = 0; -int pmap_debug_range = 0; +static int pmap_debug_range = 1; +static int use_256M_pages = 1; static struct mtx pmap_ctx_lock; static uint16_t ctx_stack[PMAP_CONTEXT_MAX]; @@ -443,12 +444,12 @@ { struct pmap *pm; vm_offset_t off, va; - vm_paddr_t pa, kernel_hash_pa, nucleus_memory_start; + vm_paddr_t pa, tsb_8k_pa, tsb_4m_pa, kernel_hash_pa, nucleus_memory_start; vm_size_t physsz, virtsz, kernel_hash_shift; ihandle_t pmem, vmem; - int i, sz, j; - uint64_t tsb_8k_size, tsb_4m_size, error, physmem_tunable; - vm_paddr_t real_phys_avail[128]; + int i, j, k, sz; + uint64_t tsb_8k_size, tsb_4m_size, error, physmem_tunable, physmemstart_tunable; + vm_paddr_t real_phys_avail[128], tmp_phys_avail[128]; if ((vmem = OF_finddevice("/virtual-memory")) == -1) panic("pmap_bootstrap: finddevice /virtual-memory"); @@ -469,24 +470,26 @@ KDPRINTF("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_size == PAGE_SIZE_4M && - (translations[i].om_start >= KERNBASE && - translations[i].om_start <= KERNBASE + 3*PAGE_SIZE_4M)) { - KDPRINTF("mapping permanent translation\n"); - pa = TTE_GET_PA(translations[i].om_tte); - error = hv_mmu_map_perm_addr(translations[i].om_start, - KCONTEXT, pa | TTE_KERNEL | VTD_4M, MAP_ITLB | MAP_DTLB); - if (error != H_EOK) - panic("map_perm_addr returned error=%ld", error); - - if ((nucleus_memory_start == 0) || (pa < nucleus_memory_start)) - nucleus_memory_start = pa; - nucleus_mappings[permanent_mappings++] = pa; - nucleus_memory += PAGE_SIZE_4M; + if ((translations[i].om_start >= KERNBASE) && + (translations[i].om_start <= KERNBASE + 3*PAGE_SIZE_4M)) { + for (j = 0; j < translations[i].om_size; j += PAGE_SIZE_4M) { + KDPRINTF("mapping permanent translation\n"); + pa = TTE_GET_PA(translations[i].om_tte) + j; + va = translations[i].om_start + j; + error = hv_mmu_map_perm_addr(va, KCONTEXT, + pa | TTE_KERNEL | VTD_4M, MAP_ITLB | MAP_DTLB); + if (error != H_EOK) + panic("map_perm_addr returned error=%ld", error); + + if ((nucleus_memory_start == 0) || (pa < nucleus_memory_start)) + nucleus_memory_start = pa; + printf("nucleus_mappings[%d] = 0x%lx\n", permanent_mappings, pa); + 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); + mp_add_nucleus_mapping(va, pa|TTE_KERNEL|VTD_4M); #endif + } } } @@ -511,15 +514,20 @@ CTR0(KTR_PMAP, "pmap_bootstrap: physical memory"); qsort(mra, sz, sizeof (*mra), mr_cmp); - physmem_tunable = physmem = physsz = 0; + physmemstart_tunable = physmem_tunable = physmem = physsz = 0; + if (TUNABLE_ULONG_FETCH("hw.physmemstart", &physmemstart_tunable)) { + KDPRINTF("desired physmemstart=0x%lx\n", physmemstart_tunable); + } if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) { physmem = atop(physmem_tunable); KDPRINTF("desired physmem=0x%lx\n", physmem_tunable); } - - for (i = 0; i < 128; i++) - real_phys_avail[i] = 0; + if ((physmem_tunable != 0) && (physmemstart_tunable != 0)) + physmem_tunable += physmemstart_tunable; + + bzero(real_phys_avail, sizeof(real_phys_avail)); + bzero(tmp_phys_avail, sizeof(tmp_phys_avail)); for (i = 0, j = 0; i < sz; i++) { uint64_t size; @@ -531,12 +539,11 @@ uint64_t newstart, roundup; newstart = ((mra[i].mr_start + (PAGE_SIZE_4M-1)) & ~PAGE_MASK_4M); roundup = newstart - mra[i].mr_start; - size = mra[i].mr_size - roundup; + size = (mra[i].mr_size - roundup) & ~PAGE_MASK_4M; + mra[i].mr_start = newstart; if (size < PAGE_SIZE_4M) continue; - size = (size & ~PAGE_MASK_4M); mra[i].mr_size = size; - mra[i].mr_start = newstart; } real_phys_avail[j] = mra[i].mr_start; if (physmem_tunable != 0 && ((physsz + mra[i].mr_size) >= physmem_tunable)) { @@ -549,67 +556,96 @@ real_phys_avail[j + 1] = mra[i].mr_start + mra[i].mr_size; j += 2; } - physmem = btoc(physsz); - for (i = 0; real_phys_avail[i] != 0; i += 2) { - if (real_phys_avail[i] == (nucleus_memory_start + nucleus_memory)) - real_phys_avail[i] -= nucleus_memory; - if (real_phys_avail[i + 1] == nucleus_memory_start) - real_phys_avail[i + 1] += nucleus_memory; - - if (real_phys_avail[i + 1] == real_phys_avail[i + 2]) { - real_phys_avail[i + 1] = real_phys_avail[i + 3]; - for (j = i + 2; real_phys_avail[j] != 0; j += 2) { - real_phys_avail[j] = real_phys_avail[j + 2]; - real_phys_avail[j + 1] = real_phys_avail[j + 3]; - } - } - } - - + physmem = btoc(physsz - physmemstart_tunable); /* - * This is for versions of OFW that would allocate us memory + * This is needed for versions of OFW that would allocate us memory * and then forget to remove it from the available ranges ... + * as well as for compensating for the above move of nucleus pages */ - - for (i = 0, j = 0; i < sz; i++) { - vm_paddr_t start = mra[i].mr_start; - uint64_t size = mra[i].mr_size; - CTR2(KTR_PMAP, "start=%#lx size=%#lx\n", mra[i].mr_start, mra[i].mr_size); - KDPRINTF("start=%#lx size=%#lx\n", mra[i].mr_start, mra[i].mr_size); - - if (mra[i].mr_size < PAGE_SIZE_4M) - continue; + for (i = 0, j = 0; real_phys_avail[i] != 0; i += 2) { + vm_paddr_t start = real_phys_avail[i]; + uint64_t size = real_phys_avail[i + 1] - real_phys_avail[i]; + CTR2(KTR_PMAP, "start=%#lx size=%#lx\n", start,size); + KDPRINTF("real_phys start=%#lx size=%#lx\n", start, size); /* * Is kernel memory at the beginning of range? */ - if (nucleus_memory_start == mra[i].mr_start) { - mra[i].mr_start += nucleus_memory; - mra[i].mr_size -= nucleus_memory; + if (nucleus_memory_start == start) { + start = start + nucleus_memory; } /* * Is kernel memory at the end of range? */ if (nucleus_memory_start == (start + size - nucleus_memory)) - mra[i].mr_size -= nucleus_memory; + size -= nucleus_memory; + + if (physmemstart_tunable != 0 && + ((mra[i].mr_start + mra[i].mr_size) < physmemstart_tunable)) + continue; + if (physmemstart_tunable != 0 && + ((start < physmemstart_tunable))) { + size -= (physmemstart_tunable - start); + start = physmemstart_tunable; + } /* * Is kernel memory in the middle somewhere? */ - if ((nucleus_memory_start > start) && (nucleus_memory_start < (start + size))) { + if ((nucleus_memory_start > start) && + (nucleus_memory_start < (start + size))) { uint64_t firstsize = (nucleus_memory_start - start); phys_avail[j] = start; phys_avail[j+1] = nucleus_memory_start; + start = nucleus_memory_start + nucleus_memory; size = size - firstsize - nucleus_memory; - mra[i].mr_start = nucleus_memory_start + nucleus_memory; - mra[i].mr_size = size; j += 2; } - phys_avail[j] = mra[i].mr_start; - phys_avail[j + 1] = mra[i].mr_start + mra[i].mr_size; + phys_avail[j] = start; + phys_avail[j + 1] = start + size; j += 2; } + + /* + * Merge nucleus memory in to real_phys_avail + * + */ + for (i = 0; real_phys_avail[i] != 0; i += 2) { + if (real_phys_avail[i] == nucleus_memory_start + nucleus_memory) + real_phys_avail[i] -= nucleus_memory; + + if (real_phys_avail[i + 1] == nucleus_memory_start) + real_phys_avail[i + 1] += nucleus_memory; + + if (real_phys_avail[i + 1] == real_phys_avail[i + 2]) { + real_phys_avail[i + 1] = real_phys_avail[i + 3]; + for (k = i + 2; real_phys_avail[k] != 0; k += 2) { + real_phys_avail[k] = real_phys_avail[k + 2]; + real_phys_avail[k + 1] = real_phys_avail[k + 3]; + } + } + } + for (i = 0; phys_avail[i] != 0; i += 2) + if (pmap_debug_range || pmap_debug) + printf("phys_avail[%d]=0x%lx phys_avail[%d]=0x%lx\n", + i, phys_avail[i], i+1, phys_avail[i+1]); + /* + * Shuffle the memory range containing the 256MB page with + * nucleus_memory to the beginning of the phys_avail array + * so that physical memory from that page is preferentially + * allocated first + */ + for (j = 0; phys_avail[j] != 0; j += 2) + if (nucleus_memory_start < phys_avail[j]) + break; + for (i = j, k = 0; phys_avail[i] != 0; k++, i++) + tmp_phys_avail[k] = phys_avail[i]; + for (i = 0; i < j; i++) + tmp_phys_avail[k + i] = phys_avail[i]; + for (i = 0; i < 128; i++) + phys_avail[i] = tmp_phys_avail[i]; + for (i = 0; real_phys_avail[i] != 0; i += 2) if (pmap_debug_range || pmap_debug) printf("real_phys_avail[%d]=0x%lx real_phys_avail[%d]=0x%lx\n", @@ -658,17 +694,21 @@ tsb_8k_size = PAGE_SIZE_4M; #endif - pa = pmap_bootstrap_alloc(tsb_8k_size); - if (pa & PAGE_MASK_4M) + tsb_8k_pa = pmap_bootstrap_alloc(tsb_8k_size); + if (tsb_8k_pa & PAGE_MASK_4M) panic("pmap_bootstrap: tsb unaligned\n"); - KDPRINTF("tsb_8k_size is 0x%lx, tsb_8k_pa is 0x%lx\n", tsb_8k_size, pa); + KDPRINTF("tsb_8k_size is 0x%lx, tsb_8k_pa is 0x%lx\n", tsb_8k_size, tsb_8k_pa); + + tsb_4m_size = (virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT)) << 3; + tsb_4m_pa = pmap_bootstrap_alloc(tsb_4m_size); + kernel_td[TSB8K_INDEX].hti_idxpgsz = TTE8K; kernel_td[TSB8K_INDEX].hti_assoc = 1; kernel_td[TSB8K_INDEX].hti_ntte = (tsb_8k_size >> TTE_SHIFT); kernel_td[TSB8K_INDEX].hti_ctx_index = 0; kernel_td[TSB8K_INDEX].hti_pgszs = TSB8K; kernel_td[TSB8K_INDEX].hti_rsvd = 0; - kernel_td[TSB8K_INDEX].hti_ra = pa; + kernel_td[TSB8K_INDEX].hti_ra = tsb_8k_pa; /* * Initialize kernel's private TSB from 8K page TSB @@ -680,7 +720,7 @@ kernel_pmap->pm_tsb.hti_ctx_index = 0; kernel_pmap->pm_tsb.hti_pgszs = TSB8K; kernel_pmap->pm_tsb.hti_rsvd = 0; - kernel_pmap->pm_tsb.hti_ra = pa; + kernel_pmap->pm_tsb.hti_ra = tsb_8k_pa; kernel_pmap->pm_tsb_ra = vtophys((vm_offset_t)&kernel_pmap->pm_tsb); tsb_set_scratchpad_kernel(&kernel_pmap->pm_tsb); @@ -690,18 +730,15 @@ * currently (not by design) used for permanent mappings */ - tsb_4m_size = (virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT)) << 3; - pa = pmap_bootstrap_alloc(tsb_4m_size); - KDPRINTF("tsb_4m_pa is 0x%lx tsb_4m_size is 0x%lx\n", pa, tsb_4m_size); + KDPRINTF("tsb_4m_pa is 0x%lx tsb_4m_size is 0x%lx\n", tsb_4m_pa, tsb_4m_size); kernel_td[TSB4M_INDEX].hti_idxpgsz = TTE4M; kernel_td[TSB4M_INDEX].hti_assoc = 1; kernel_td[TSB4M_INDEX].hti_ntte = (tsb_4m_size >> TTE_SHIFT); kernel_td[TSB4M_INDEX].hti_ctx_index = 0; - kernel_td[TSB4M_INDEX].hti_pgszs = TSB4M; + kernel_td[TSB4M_INDEX].hti_pgszs = TSB4M|TSB256M; kernel_td[TSB4M_INDEX].hti_rsvd = 0; - kernel_td[TSB4M_INDEX].hti_ra = pa; - + kernel_td[TSB4M_INDEX].hti_ra = tsb_4m_pa; /* * allocate MMU fault status areas for all CPUS */ @@ -765,8 +802,8 @@ } } - error = hv_mmu_tsb_ctx0(MAX_TSB_INFO, vtophys((vm_offset_t)&kernel_td)); - if (error != H_EOK) + if ((error = hv_mmu_tsb_ctx0(MAX_TSB_INFO, + vtophys((vm_offset_t)kernel_td))) != H_EOK) panic("failed to set ctx0 TSBs error: %ld", error); #ifdef SMP @@ -777,10 +814,23 @@ * */ for (i = 0, pa = real_phys_avail[i]; pa != 0; i += 2, pa = real_phys_avail[i]) { + vm_paddr_t tag_pa = 0, next_pa = 0; + uint64_t size_bits = VTD_4M; while (pa < real_phys_avail[i + 1]) { + if (use_256M_pages && + (pa & PAGE_MASK_256M) == 0 && + ((pa + PAGE_SIZE_256M) <= real_phys_avail[i + 1])) { + tag_pa = pa; + size_bits = VTD_256M; + next_pa = pa + PAGE_SIZE_256M; + } else if (next_pa <= pa) { + tag_pa = pa; + size_bits = VTD_4M; + } tsb_assert_invalid(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa)); tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), - TLB_PHYS_TO_DIRECT(pa), pa | TTE_KERNEL | VTD_4M, 0); + TLB_PHYS_TO_DIRECT(pa), + tag_pa | TTE_KERNEL | size_bits, 0); pa += PAGE_SIZE_4M; } } @@ -848,11 +898,6 @@ tte_hash_insert(pm->pm_hash, TLB_PHYS_TO_DIRECT(pa), pa | TTE_KERNEL | VTD_4M); #endif - /* XXX relies on the fact that memory ranges only get smaller */ - for (i = 0; phys_avail[i + 2] != 0; i += 2) - if (phys_avail[i + 1] - phys_avail[i] < PAGE_SIZE_4M) - phys_avail[i] = phys_avail[i+1] = 0; - } @@ -1231,14 +1276,19 @@ void *ptr; m = NULL; - while (m == NULL) { - m = vm_page_alloc_contig(npages, phys_avail[0], - phys_avail[1], alignment, (1UL<<34)); + while (m == NULL) { + for (i = 0; phys_avail[i + 1] != 0; i += 2) { + m = vm_page_alloc_contig(npages, phys_avail[i], + phys_avail[i + 1], alignment, (1UL<<34)); + if (m) + goto found; + } if (m == NULL) { printf("vm_page_alloc_contig failed - waiting to retry\n"); VM_WAIT; } } +found: for (i = 0, tm = m; i < npages; i++, tm++) { tm->wire_count++; if ((tm->flags & PG_ZERO) == 0) From owner-p4-projects@FreeBSD.ORG Sun Dec 10 04:31: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 1139E16A416; Sun, 10 Dec 2006 04:31:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DCAF916A403 for ; Sun, 10 Dec 2006 04:31:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A485C43C9D for ; Sun, 10 Dec 2006 04:30:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA4VNqe067401 for ; Sun, 10 Dec 2006 04:31:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA4VNgZ067398 for perforce@freebsd.org; Sun, 10 Dec 2006 04:31:23 GMT (envelope-from imp@freebsd.org) Date: Sun, 10 Dec 2006 04:31:23 GMT Message-Id: <200612100431.kBA4VNgZ067398@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 111364 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, 10 Dec 2006 04:31:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=111364 Change 111364 by imp@imp_lighthouse on 2006/12/10 04:30:40 ${SHELL} instead of sh Affected files ... .. //depot/projects/arm/src/Makefile.inc1#20 edit Differences ... ==== //depot/projects/arm/src/Makefile.inc1#20 (text+ko) ==== @@ -517,7 +517,7 @@ buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} sh || true + @cd ${.CURDIR} && env ${WMAKEENV} ${SHELL} || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} From owner-p4-projects@FreeBSD.ORG Sun Dec 10 04:35: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 949CB16A412; Sun, 10 Dec 2006 04:35:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6FF2916A403 for ; Sun, 10 Dec 2006 04:35:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B9A043C9E for ; Sun, 10 Dec 2006 04:34:21 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA4ZTRf068171 for ; Sun, 10 Dec 2006 04:35:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA4ZSA2068168 for perforce@freebsd.org; Sun, 10 Dec 2006 04:35:28 GMT (envelope-from imp@freebsd.org) Date: Sun, 10 Dec 2006 04:35:28 GMT Message-Id: <200612100435.kBA4ZSA2068168@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 111365 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, 10 Dec 2006 04:35:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=111365 Change 111365 by imp@imp_lighthouse on 2006/12/10 04:35:08 We don't need the check against phy == 0. This appears to be a remant of a time when things were either borked, or a cut-n-paste job. It is unclear, but also unnecessary. Remove DELAY. It is also unnecessary. This should help in network performance a little, since this steals about ~4 * 30us each second. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#63 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#63 (text+ko) ==== @@ -988,11 +988,7 @@ * XXX if we implement agressive power savings, then we need * XXX to make sure that the clock to the emac is on here */ - - if (phy != 0) - return (0xffff); sc = device_get_softc(dev); - DELAY(1); /* Hangs w/o this delay really 30.5us atm */ WR4(sc, ETH_MAN, ETH_MAN_REG_RD(phy, reg)); while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0) continue; From owner-p4-projects@FreeBSD.ORG Sun Dec 10 04:41:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E46B16A412; Sun, 10 Dec 2006 04:41:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7909A16A40F for ; Sun, 10 Dec 2006 04:41:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36D8B43C9D for ; Sun, 10 Dec 2006 04:40:29 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA4fbA9069142 for ; Sun, 10 Dec 2006 04:41:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA4faGE069138 for perforce@freebsd.org; Sun, 10 Dec 2006 04:41:36 GMT (envelope-from imp@freebsd.org) Date: Sun, 10 Dec 2006 04:41:36 GMT Message-Id: <200612100441.kBA4faGE069138@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 111366 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, 10 Dec 2006 04:41:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=111366 Change 111366 by imp@imp_lighthouse on 2006/12/10 04:41:02 Fixes for writing a single byte to IIC as well as robust detection of NACK bit in SR indicating no ACK from the transfer. This is useful when probing the bus. Many of these changes were from tisco based on his experience with the Atmel sample code and the AT91SAM7 processors he's used in the past. These tweaks are somewhat underdocumented in the AT91RM9200 processor manual, but also appear to be hinted at in the errata. As far as I can tell, nothing breaks when we do this, but I've only tested on my KB9202 board. Submitted by: tisco Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#38 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#38 (text+ko) ==== @@ -226,7 +226,8 @@ int counter = 100000; uint32_t sr; - while (!((sr = RD4(sc, TWI_SR)) & bit) && counter-- > 0) + while (!((sr = RD4(sc, TWI_SR)) & bit) && counter-- > 0 && + !(sr & TWI_SR_NACK)) continue; if (counter <= 0) err = EBUSY; @@ -300,6 +301,7 @@ int i, len, err; uint32_t rdwr; uint8_t *buf; + uint32_t sr; sc = device_get_softc(dev); err = 0; @@ -318,24 +320,35 @@ WR4(sc, TWI_MMR, TWI_MMR_DADR(msgs[i].slave) | rdwr); len = msgs[i].len; buf = msgs[i].buf; - if (len != 0 && buf == NULL) + /* zero byte transfers aren't allowed */ + if (len == 0 || buf == NULL) return (EINVAL); - WR4(sc, TWI_CR, TWI_CR_START); + if (len == 1) + WR4(sc, TWI_CR, TWI_CR_START | TWI_CR_STOP); + else + WR4(sc, TWI_CR, TWI_CR_START); if (msgs[i].flags & IIC_M_RD) { - while (len--) { - if (len == 0) - WR4(sc, TWI_CR, TWI_CR_STOP); - if ((err = at91_twi_wait(sc, TWI_SR_RXRDY))) - goto out; - *buf++ = RD4(sc, TWI_RHR) & 0xff; + sr = RD4(sc, TWI_SR); + while (!(sr & TWI_SR_TXCOMP)) { + sr = RD4(sc, TWI_SR); + if ((sr = RD4(sc, TWI_SR)) & TWI_SR_RXRDY) { + len--; + *buf++ = RD4(sc, TWI_RHR) & 0xff; + if (len == 0 && msgs[i].len != 1) + WR4(sc, TWI_CR, TWI_CR_STOP); + } + } + if (sr & TWI_SR_NACK) { + err = EADDRNOTAVAIL; + goto out; } } else { while (len--) { - WR4(sc, TWI_THR, *buf++); - if (len == 0) + if (len == 0 && msgs[i].len != 1) WR4(sc, TWI_CR, TWI_CR_STOP); if ((err = at91_twi_wait(sc, TWI_SR_TXRDY))) goto out; + WR4(sc, TWI_THR, *buf++); } } if ((err = at91_twi_wait(sc, TWI_SR_TXCOMP))) From owner-p4-projects@FreeBSD.ORG Sun Dec 10 05:06: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 2F83316A494; Sun, 10 Dec 2006 05:06:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A7F2416A4B3 for ; Sun, 10 Dec 2006 05:06:19 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3588643CAF for ; Sun, 10 Dec 2006 05:05:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA569ox082014 for ; Sun, 10 Dec 2006 05:06:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5689e082011 for perforce@freebsd.org; Sun, 10 Dec 2006 05:06:08 GMT (envelope-from imp@freebsd.org) Date: Sun, 10 Dec 2006 05:06:08 GMT Message-Id: <200612100506.kBA5689e082011@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 111367 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, 10 Dec 2006 05:06:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=111367 Change 111367 by imp@imp_lighthouse on 2006/12/10 05:05:14 First attempt to apply Daan Vreeken's usb patches to get my KB9202 working. They didn't succeed. Neither do they cause any real ill effect except for a slight delay in booting when usb is in the kernel. Committed to facilitate coordination. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#20 edit .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#41 edit .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#13 edit .. //depot/projects/arm/src/sys/arm/conf/KB920X#42 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#20 (text+ko) ==== @@ -336,7 +336,8 @@ #define AT91RM92_TC1C1_BASE 0xffa4040 #define AT91RM92_TC1C2_BASE 0xffa4080 -#define AT91RM92_OHCI_BASE 0x00300000 +#define AT91RM92_OHCI_BASE 0xdfe00000 +#define AT91RM92_OHCI_PA_BASE 0x00300000 #define AT91RM92_OHCI_SIZE 0x00100000 #define AT91C_MASTER_CLOCK 60000000 ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#41 (text+ko) ==== @@ -167,14 +167,14 @@ * initialization is done. However, the AT91 resource allocation * system doesn't know how to use pmap_mapdev() yet. */ -#if 0 +#if 1 { /* * Add the ohci controller, and anything else that might be * on this chip select for a VA/PA mapping. */ AT91RM92_OHCI_BASE, - AT91RM92_OHCI_BASE, + AT91RM92_OHCI_PA_BASE, AT91RM92_OHCI_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#13 (text+ko) ==== @@ -28,7 +28,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -99,6 +101,30 @@ } device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); + /* Allocate a parent dma tag for DMA maps */ + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, + NULL, NULL, &sc->sc_ohci.sc_bus.parent_dmatag); + if (err) { + device_printf(dev, "Could not allocate parent DMA tag (%d)\n", + err); + err = ENXIO; + goto error; + } + + /* Allocate a dma tag for transfer buffers */ + err = bus_dma_tag_create(sc->sc_ohci.sc_bus.parent_dmatag, 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, + busdma_lock_mutex, &Giant, &sc->sc_ohci.sc_bus.buffer_dmatag); + if (err) { + device_printf(dev, "Could not allocate transfer tag (%d)\n", + err); + err = ENXIO; + goto error; + } + err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, ohci_intr, sc, &sc->sc_ohci.ih); if (err) { @@ -158,6 +184,12 @@ bus_teardown_intr(dev, sc->sc_ohci.irq_res, sc->sc_ohci.ih); sc->sc_ohci.ih = NULL; } + + if (sc->sc_ohci.sc_bus.parent_dmatag != NULL) + bus_dma_tag_destroy(sc->sc_ohci.sc_bus.parent_dmatag); + if (sc->sc_ohci.sc_bus.buffer_dmatag != NULL) + bus_dma_tag_destroy(sc->sc_ohci.sc_bus.buffer_dmatag); + if (sc->sc_ohci.sc_bus.bdev) { device_delete_child(dev, sc->sc_ohci.sc_bus.bdev); sc->sc_ohci.sc_bus.bdev = NULL; ==== //depot/projects/arm/src/sys/arm/conf/KB920X#42 (text+ko) ==== @@ -105,3 +105,13 @@ device at91_mci device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards +# USB +device usb +device ohci +device ugen +device scbus +device da +device umass +device axe + +#device bpf From owner-p4-projects@FreeBSD.ORG Sun Dec 10 05:34: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 0545816A415; Sun, 10 Dec 2006 05:34:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D65B716A40F for ; Sun, 10 Dec 2006 05:34:45 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7317D43C9D for ; Sun, 10 Dec 2006 05:33:37 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA5Yjhx086555 for ; Sun, 10 Dec 2006 05:34:45 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5YjkD086552 for perforce@freebsd.org; Sun, 10 Dec 2006 05:34:45 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 10 Dec 2006 05:34:45 GMT Message-Id: <200612100534.kBA5YjkD086552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111368 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, 10 Dec 2006 05:34:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=111368 Change 111368 by mjacob@newisp on 2006/12/10 05:34:27 IFC2 Affected files ... .. //depot/projects/newisp/conf/NOTES#17 integrate .. //depot/projects/newisp/conf/options#11 integrate Differences ... ==== //depot/projects/newisp/conf/NOTES#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1400 2006/11/15 09:13:24 maxim Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1401 2006/12/10 04:23:23 mjacob Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -110,6 +110,21 @@ # options BLKDEV_IOSIZE=8192 +# +# MAXPHYS and DFLTPHYS +# +# These are the max and default 'raw' I/O block device access sizes. +# Reads and writes will be split into DFLTPHYS chunks. Some applications +# have better performance with larger raw I/O access sizes. Typically +# MAXPHYS should be twice the size of DFLTPHYS. Note that certain VM +# parameters are derived from these values and making them too large +# can make an an unbootable kernel. +# +# The defaults are 64K and 128K respectively. +options DFLTPHYS=(64*1024) +options MAXPHYS=(128*1024) + + # Options for the VM subsystem # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring ==== //depot/projects/newisp/conf/options#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.566 2006/11/30 04:17:04 jb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.567 2006/12/10 04:23:23 mjacob Exp $ # # On the handling of kernel options # @@ -535,6 +535,8 @@ # These cause changes all over the kernel BLKDEV_IOSIZE opt_global.h +MAXPHYS opt_global.h +DFLTPHYS opt_global.h BURN_BRIDGES opt_global.h DEBUG opt_global.h DEBUG_LOCKS opt_global.h From owner-p4-projects@FreeBSD.ORG Sun Dec 10 05:38: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 36F5116A416; Sun, 10 Dec 2006 05:38:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC5B716A412 for ; Sun, 10 Dec 2006 05:38:57 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CB3443CA0 for ; Sun, 10 Dec 2006 05:37:49 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA5cvDR086734 for ; Sun, 10 Dec 2006 05:38:57 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5co3O086731 for perforce@freebsd.org; Sun, 10 Dec 2006 05:38:50 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 10 Dec 2006 05:38:50 GMT Message-Id: <200612100538.kBA5co3O086731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111369 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, 10 Dec 2006 05:38:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111369 Change 111369 by mjacob@mjexp on 2006/12/10 05:38:12 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#5 integrate .. //depot/projects/mjexp/UPDATING#3 integrate .. //depot/projects/mjexp/bin/hostname/hostname.1#2 integrate .. //depot/projects/mjexp/bin/hostname/hostname.c#2 integrate .. //depot/projects/mjexp/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/mjexp/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/mjexp/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/mjexp/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/mjexp/contrib/top/sigconv.awk#2 integrate .. //depot/projects/mjexp/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/mjexp/etc/pccard_ether#2 integrate .. //depot/projects/mjexp/etc/rc.d/auto_linklocal#3 integrate .. //depot/projects/mjexp/etc/rc.initdiskless#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/mjexp/games/fortune/datfiles/freebsd-tips#3 integrate .. //depot/projects/mjexp/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/config_freebsd.h#1 branch .. //depot/projects/mjexp/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/mjexp/lib/libc/gen/err.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/mjexp/lib/libc/sys/chmod.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/chown.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/close.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/link.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/rename.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_errmsg.c#2 integrate .. //depot/projects/mjexp/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_barrier.c#2 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_cancel.c#3 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/mjexp/release/Makefile#4 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/share/examples/Makefile.relnotesng#2 integrate .. //depot/projects/mjexp/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/mjexp/sbin/fdisk/fdisk.8#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/mjexp/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/mjexp/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/mjexp/sbin/mount_unionfs/mount_unionfs.8#2 integrate .. //depot/projects/mjexp/sbin/mount_unionfs/mount_unionfs.c#2 integrate .. //depot/projects/mjexp/sbin/restore/main.c#2 integrate .. //depot/projects/mjexp/sbin/restore/restore.8#3 integrate .. //depot/projects/mjexp/sbin/restore/restore.c#2 integrate .. //depot/projects/mjexp/sbin/restore/restore.h#2 integrate .. //depot/projects/mjexp/sbin/restore/tape.c#2 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#4 integrate .. //depot/projects/mjexp/share/man/man4/altq.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ata.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ath.4#2 integrate .. //depot/projects/mjexp/share/man/man4/bce.4#2 integrate .. //depot/projects/mjexp/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/mjexp/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/mjexp/share/man/man4/man4.i386/acpi_ibm.4#2 integrate .. //depot/projects/mjexp/share/man/man4/pcm.4#4 integrate .. //depot/projects/mjexp/share/man/man4/polling.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_atiixp.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_es137x.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_via8233.4#2 integrate .. //depot/projects/mjexp/share/man/man9/LOCK_PROFILING.9#2 integrate .. //depot/projects/mjexp/share/man/man9/mbuf.9#2 integrate .. //depot/projects/mjexp/share/man/man9/uio.9#2 integrate .. //depot/projects/mjexp/share/misc/pci_vendors#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/mjexp/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/mjexp/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/mjexp/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/mjexp/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/mjexp/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/mjexp/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/mjexp/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/mjexp/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/mjexp/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/mjexp/sys/arm/xscale/i80321/i80321_space.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate .. //depot/projects/mjexp/sys/boot/common/loader.8#3 integrate .. //depot/projects/mjexp/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/mjexp/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/mjexp/sys/cam/cam_periph.c#3 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/mjexp/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/mjexp/sys/conf/NOTES#5 integrate .. //depot/projects/mjexp/sys/conf/files#6 integrate .. //depot/projects/mjexp/sys/conf/files.arm#3 integrate .. //depot/projects/mjexp/sys/conf/options#4 integrate .. //depot/projects/mjexp/sys/ddb/db_ps.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/mjexp/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/mjexp/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/mjexp/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/mjexp/sys/dev/flash/at45d.c#1 branch .. //depot/projects/mjexp/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/mjexp/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/mjexp/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/mjexp/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/mjexp/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/mjexp/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/mjexp/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/mjexp/sys/dev/iicbus/iiconf.h#3 integrate .. //depot/projects/mjexp/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/mjexp/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/mjexp/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/mjexp/sys/dev/le/am7990.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/am79900.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/lance.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/mjexp/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/lxtphy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/miidevs#2 integrate .. //depot/projects/mjexp/sys/dev/mii/miivar.h#3 integrate .. //depot/projects/mjexp/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/nsgphy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/nsphy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/qsphy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/mjexp/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/mjexp/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/mjexp/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/mjexp/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/mjexp/sys/i386/isa/clock.c#3 integrate .. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/mjexp/sys/kern/init_main.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_clock.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_idle.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_kse.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_poll.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_proc.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_resource.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_subr.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_switch.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_synch.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_thr.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_thread.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/mjexp/sys/kern/ksched.c#2 integrate .. //depot/projects/mjexp/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#4 integrate .. //depot/projects/mjexp/sys/kern/subr_lock.c#3 integrate .. //depot/projects/mjexp/sys/kern/subr_prf.c#3 integrate .. //depot/projects/mjexp/sys/kern/subr_rman.c#2 integrate .. //depot/projects/mjexp/sys/kern/subr_trap.c#5 integrate .. //depot/projects/mjexp/sys/kern/tty.c#4 integrate .. //depot/projects/mjexp/sys/kern/vfs_export.c#2 integrate .. //depot/projects/mjexp/sys/modules/Makefile#3 integrate .. //depot/projects/mjexp/sys/net/bridgestp.c#3 integrate .. //depot/projects/mjexp/sys/net/bridgestp.h#3 integrate .. //depot/projects/mjexp/sys/net/ethernet.h#3 integrate .. //depot/projects/mjexp/sys/net/if.c#4 integrate .. //depot/projects/mjexp/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/mjexp/sys/net/if_bridge.c#4 integrate .. //depot/projects/mjexp/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/mjexp/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/mjexp/sys/net/if_llc.h#2 integrate .. //depot/projects/mjexp/sys/net/if_ppp.c#4 integrate .. //depot/projects/mjexp/sys/net/if_pppvar.h#3 integrate .. //depot/projects/mjexp/sys/net/ppp_tty.c#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/mjexp/sys/netinet/igmp.c#3 integrate .. //depot/projects/mjexp/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/mjexp/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/mjexp/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/mjexp/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/mjexp/sys/pci/if_rl.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/mjexp/sys/pci/if_xl.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/mjexp/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/mjexp/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/tsb.h#3 integrate .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/exception.S#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/mjexp/sys/sys/param.h#5 integrate .. //depot/projects/mjexp/sys/sys/pcpu.h#3 integrate .. //depot/projects/mjexp/sys/sys/proc.h#5 integrate .. //depot/projects/mjexp/sys/sys/rtprio.h#3 integrate .. //depot/projects/mjexp/sys/sys/runq.h#2 integrate .. //depot/projects/mjexp/sys/sys/sched.h#4 integrate .. //depot/projects/mjexp/sys/sys/uio.h#2 integrate .. //depot/projects/mjexp/sys/sys/umtx.h#4 integrate .. //depot/projects/mjexp/sys/vm/vm_glue.c#4 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#4 integrate .. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#3 integrate .. //depot/projects/mjexp/tools/regression/pthread/cv_cancel1/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/pthread/cv_cancel1/cv_cancel1.c#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.sh#3 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wX.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wXl.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wc.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wdl.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wdn.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.we.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wf.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wg.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wgd.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wo.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp1.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp2.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp3.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp4.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp5.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp6.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wu.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wwe.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wx.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wxn.out#1 branch .. //depot/projects/mjexp/usr.bin/bsdiff/bsdiff/bsdiff.c#2 integrate .. //depot/projects/mjexp/usr.bin/bsdiff/bspatch/bspatch.c#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/mjexp/usr.bin/getconf/getconf.c#2 integrate .. //depot/projects/mjexp/usr.bin/id/id.c#2 integrate .. //depot/projects/mjexp/usr.bin/jot/jot.c#3 integrate .. //depot/projects/mjexp/usr.bin/setchannel/Makefile#1 branch .. //depot/projects/mjexp/usr.bin/setchannel/setchannel.1#1 branch .. //depot/projects/mjexp/usr.bin/setchannel/setchannel.c#1 branch .. //depot/projects/mjexp/usr.bin/top/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/top/sigdesc.h#2 delete .. //depot/projects/mjexp/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/mjexp/usr.sbin/adduser/rmuser.8#2 integrate .. //depot/projects/mjexp/usr.sbin/asf/asf.8#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt#1 branch .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/mjexp/usr.sbin/eeprom/eeprom.8#2 integrate .. //depot/projects/mjexp/usr.sbin/rpcbind/rpcbind.8#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/menus.c#2 integrate Differences ... ==== //depot/projects/mjexp/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.65 2006/11/26 15:04:30 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.67 2006/12/07 01:24:38 avatar 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,24 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20061201: remove symlink to *.so.4 libalias modules +OLD_FILES+=usr/lib/libalias_cuseeme.so +OLD_FILES+=usr/lib/libalias_dummy.so +OLD_FILES+=usr/lib/libalias_ftp.so +OLD_FILES+=usr/lib/libalias_irc.so +OLD_FILES+=usr/lib/libalias_nbt.so +OLD_FILES+=usr/lib/libalias_pptp.so +OLD_FILES+=usr/lib/libalias_skinny.so +OLD_FILES+=usr/lib/libalias_smedia.so +# 20061201: remove old *.so.4 liablias modules +OLD_FILES+=lib/libalias_cuseeme.so.4 +OLD_FILES+=lib/libalias_dummy.so.4 +OLD_FILES+=lib/libalias_ftp.so.4 +OLD_FILES+=lib/libalias_irc.so.4 +OLD_FILES+=lib/libalias_nbt.so.4 +OLD_FILES+=lib/libalias_pptp.so.4 +OLD_FILES+=lib/libalias_skinny.so.4 +OLD_FILES+=lib/libalias_smedia.so.4 # 20061125: remove old man page OLD_FILES+=usr/share/man/man9/devsw.9.gz # 20061122: remove obsolete mount programs @@ -717,6 +735,31 @@ OLD_FILES+=usr/sbin/stlstty OLD_FILES+=usr/sbin/ispppcontrol OLD_FILES+=usr/sbin/rndcontrol +# 20011001: UUCP migration to ports +OLD_FILES+=usr/bin/uucp +OLD_FILES+=usr/bin/uulog +OLD_FILES+=usr/bin/uuname +OLD_FILES+=usr/bin/uupick +OLD_FILES+=usr/bin/uusched +OLD_FILES+=usr/bin/uustat +OLD_FILES+=usr/bin/uuto +OLD_FILES+=usr/bin/uux +OLD_FILES+=usr/libexec/uucp/uucico +OLD_FILES+=usr/libexec/uucp/uuxqt +OLD_FILES+=usr/libexec/uucpd +OLD_FILES+=usr/share/man/man1/uuconv.1.gz +OLD_FILES+=usr/share/man/man1/uucp.1.gz +OLD_FILES+=usr/share/man/man1/uulog.1.gz +OLD_FILES+=usr/share/man/man1/uuname.1.gz +OLD_FILES+=usr/share/man/man1/uupick.1.gz +OLD_FILES+=usr/share/man/man1/uustat.1.gz +OLD_FILES+=usr/share/man/man1/uuto.1.gz +OLD_FILES+=usr/share/man/man1/uux.1.gz +OLD_FILES+=usr/share/man/man8/uuchk.8.gz +OLD_FILES+=usr/share/man/man8/uucico.8.gz +OLD_FILES+=usr/share/man/man8/uucpd.8.gz +OLD_FILES+=usr/share/man/man8/uusched.8.gz +OLD_FILES+=usr/share/man/man8/uuxqt.8.gz # 20010523 mount_portal -> mount_portalfs OLD_FILES+=sbin/mount_portal OLD_FILES+=usr/share/man/man8/mount_portal.8.gz @@ -3527,6 +3570,8 @@ OLD_DIRS+=usr/include/ntfs OLD_DIRS+=usr/include/nwfs OLD_DIRS+=usr/include/ufs/mfs +# 20011001: UUCP migration to ports +OLD_DIRS+=usr/libexec/uucp .include "tools/build/mk/OptionalObsoleteFiles.inc" ==== //depot/projects/mjexp/UPDATING#3 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20061205: + The removal of several facets of the experimental Threading + system from the kernel means that the proc and thread structures + have changed quite a bit. I suggest all kernel modules that might + reference these structures be recompiled.. Especially the + linux module. + 20061126: Sound infrastructure has been updated with various fixes and improvements. Most of the changes are pretty much transparent, @@ -675,4 +682,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.466 2006/11/26 12:24:04 ariff Exp $ +$FreeBSD: src/UPDATING,v 1.467 2006/12/06 06:39:47 julian Exp $ ==== //depot/projects/mjexp/bin/hostname/hostname.1#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.21 2006/12/08 07:47:08 kientzle Exp $ .\" -.Dd April 18, 2005 +.Dd December 7, 2006 .Dt HOSTNAME 1 .Os .Sh NAME @@ -37,7 +37,7 @@ .Nd set or print name of current host system .Sh SYNOPSIS .Nm -.Op Fl s +.Op Fl fs .Op Ar name-of-host .Sh DESCRIPTION The @@ -45,7 +45,7 @@ utility prints the name of the current host. The super-user can set the hostname by supplying an argument; this is usually done in the -network initialization script +initialization script .Pa /etc/rc.d/hostname , normally run at boot time. @@ -56,6 +56,9 @@ .Pp Options: .Bl -tag -width flag +.It Fl f +Include domain information in the printed name. +This is the default behavior. .It Fl s Trim off any domain information from the printed name. ==== //depot/projects/mjexp/bin/hostname/hostname.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.17 2005/01/10 08:39:22 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.19 2006/12/08 07:47:08 kientzle Exp $"); #include @@ -58,8 +58,15 @@ char *p, hostname[MAXHOSTNAMELEN]; sflag = 0; - while ((ch = getopt(argc, argv, "s")) != -1) + while ((ch = getopt(argc, argv, "fs")) != -1) switch (ch) { + case 'f': + /* + * On Linux, "hostname -f" prints FQDN. + * BSD "hostname" always prints FQDN by + * default, so we accept but ignore -f. + */ + break; case 's': sflag = 1; break; @@ -93,6 +100,6 @@ usage(void) { - (void)fprintf(stderr, "usage: hostname [-s] [name-of-host]\n"); + (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n"); exit(1); } ==== //depot/projects/mjexp/contrib/libbegemot/rpoll.c#2 (text+ko) ==== @@ -101,16 +101,16 @@ # endif -typedef signed long long tval_t; +typedef int64_t tval_t; -static inline tval_t GETMSECS(void); +static inline tval_t GETUSECS(void); static inline tval_t -GETMSECS(void) { +GETUSECS(void) { struct timeval tval; (void)gettimeofday(&tval, NULL); - return (tval_t)tval.tv_sec*1000+tval.tv_usec/1000; + return (tval_t)tval.tv_sec * 1000000 + tval.tv_usec; } /* @@ -170,11 +170,11 @@ * Now for timers */ typedef struct { - u_int msecs; /* millisecond value of the timer */ + uint64_t usecs; /* microsecond value of the timer */ int repeat; /* one shot or repeat? */ void *arg; /* client arg */ timer_f func; /* handler, 0 means disfunct */ - tval_t when; /* next time to trigger in msecs! */ + tval_t when; /* next time to trigger in usecs! */ } PollTim_t; /* how many records should our table grow at once? */ @@ -296,8 +296,8 @@ poll_unblocksig(); if(rpoll_trace) - fprintf(stderr, "poll_register(%d, %#lx, %#lx, %#x)->%d", - fd, (u_long)func, (u_long)arg, mask, p - regs); + fprintf(stderr, "poll_register(%d, %p, %p, %#x)->%tu", + fd, (void *)func, (void *)arg, mask, p - regs); return p - regs; } @@ -373,6 +373,13 @@ int poll_start_timer(u_int msecs, int repeat, timer_f func, void *arg) { + return (poll_start_utimer((unsigned long long)msecs * 1000, + repeat, func, arg)); +} + +int +poll_start_utimer(unsigned long long usecs, int repeat, timer_f func, void *arg) +{ PollTim_t *p; /* find unused entry */ @@ -392,19 +399,19 @@ } /* create entry */ - p->msecs = msecs; + p->usecs = usecs; p->repeat = repeat; p->arg = arg; p->func = func; - p->when = GETMSECS() + msecs; + p->when = GETUSECS() + usecs; tims_used++; resort = 1; if(rpoll_trace) - fprintf(stderr, "poll_start_timer(%u, %d, %#lx, %#lx)->%u", - msecs, repeat, (u_long)func, (u_long)arg, p - tims); + fprintf(stderr, "poll_start_utimer(%llu, %d, %p, %p)->%tu", + usecs, repeat, (void *)func, (void *)arg, p - tims); return p - tims; } @@ -497,7 +504,7 @@ u_int i, idx; int ret; tval_t now; - int tout; + tval_t tout; static u_int last_index; # ifdef USE_SELECT @@ -519,12 +526,13 @@ /* in wait mode - compute the timeout */ if(wait) { if(tfd_used) { - now = GETMSECS(); + now = GETUSECS(); # ifdef DEBUG { - fprintf(stderr, "now=%"QUADFMT"u", now); + fprintf(stderr, "now=%llu", now); for(i = 0; i < tims_used; i++) - fprintf(stderr, "timers[%2d] = %"QUADFMT"d", i, tfd[i]->when - now); + fprintf(stderr, "timers[%2d] = %lld", + i, tfd[i]->when - now); } # endif if((tout = tims[tfd[0]].when - now) < 0) @@ -539,7 +547,7 @@ # endif # ifdef USE_POLL - ret = poll(pfd, regs_used, tout); + ret = poll(pfd, regs_used, tout == INFTIM ? INFTIM : (tout / 1000)); # endif # ifdef USE_SELECT @@ -547,13 +555,13 @@ nwset = wset; nxset = xset; if(tout != INFTIM) { - tv.tv_sec = tout / 1000; - tv.tv_usec = (tout % 1000) * 1000; + tv.tv_sec = tout / 1000000; + tv.tv_usec = tout % 1000000; } ret = select(maxfd+1, SELECT_CAST(&nrset), SELECT_CAST(&nwset), - SELECT_CAST(&nxset), (tout==INFTIM) ? 0 : &tv); + SELECT_CAST(&nxset), (tout==INFTIM) ? NULL : &tv); # endif if(ret == -1) { @@ -574,20 +582,26 @@ # ifdef USE_POLL if(regs[idx].pfd) { - if(regs[idx].pfd->revents & poll_in) + if ((regs[idx].mask & POLL_IN) && + (regs[idx].pfd->revents & poll_in)) mask |= POLL_IN; - if(regs[idx].pfd->revents & poll_out) + if ((regs[idx].mask & POLL_OUT) && + (regs[idx].pfd->revents & poll_out)) mask |= POLL_OUT; - if(regs[idx].pfd->revents & poll_except) + if((regs[idx].mask & POLL_EXCEPT) && + (regs[idx].pfd->revents & poll_except)) mask |= POLL_EXCEPT; } # endif # ifdef USE_SELECT - if(FD_ISSET(regs[idx].fd, &nrset)) + if ((regs[idx].mask & POLL_IN) && + FD_ISSET(regs[idx].fd, &nrset)) mask |= POLL_IN; - if(FD_ISSET(regs[idx].fd, &nwset)) + if ((regs[idx].mask & POLL_OUT) && + FD_ISSET(regs[idx].fd, &nwset)) mask |= POLL_OUT; - if(FD_ISSET(regs[idx].fd, &nxset)) + if ((regs[idx].mask & POLL_EXCEPT) && + FD_ISSET(regs[idx].fd, &nxset)) mask |= POLL_EXCEPT; # endif assert(idx < regs_alloc); @@ -595,8 +609,8 @@ if(mask) { if(rpoll_trace) fprintf(stderr, "poll_dispatch() -- " - "file %d/%d", - regs[idx].fd, idx); + "file %d/%d %x", + regs[idx].fd, idx, mask); (*regs[idx].func)(regs[idx].fd, mask, regs[idx].arg); } } @@ -607,7 +621,7 @@ /* dispatch timeouts */ if(tfd_used) { - now = GETMSECS(); + now = GETUSECS(); for(i = 0; i < tfd_used; i++) { if(tfd[i] < 0) continue; @@ -619,7 +633,7 @@ if(tfd[i] < 0) continue; if(tims[tfd[i]].repeat) - tims[tfd[i]].when = now + tims[tfd[i]].msecs; + tims[tfd[i]].when = now + tims[tfd[i]].usecs; else { tims[tfd[i]].func = NULL; tims_used--; @@ -644,8 +658,8 @@ { gettimeofday(&now, NULL); - return (double)(10 * now.tv_sec + now.tv_usec / 100000 - 10 * start.tv_sec - start.tv_usec / 100000) - / 10; + return (double)(10 * now.tv_sec + now.tv_usec / 100000 - + 10 * start.tv_sec - start.tv_usec / 100000) / 10; } void @@ -675,6 +689,14 @@ { printf("%4.1f -- %d: %s\n", elaps(), tid, (char *)arg); } +void +tfunc2(int tid, void *arg) +{ + static u_int count = 0; + + if (++count % 10000 == 0) + printf("%4.1f -- %d\n", elaps(), tid); +} void first(int tid, void *arg); void second(int tid, void *arg); @@ -683,7 +705,7 @@ second(int tid, void *arg) { printf("%4.1f -- %d: %s\n", elaps(), tid, (char *)arg); - poll_start_timer(5500, 0, first, "first"); + poll_start_utimer(5500000, 0, first, "first"); poll_stop_timer(t1); t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); } @@ -699,12 +721,16 @@ int main(int argc, char *argv[]) { - argc = argc; argv = argv; gettimeofday(&start, NULL); poll_register(0, infunc, NULL, POLL_IN); - t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); - poll_start_timer(2500, 0, first, "first"); + + if (argc < 2) { + t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); + poll_start_timer(2500, 0, first, "first"); + } else { + t0 = poll_start_utimer(300, 1, tfunc2, NULL); + } while(1) poll_dispatch(1); ==== //depot/projects/mjexp/contrib/libbegemot/rpoll.h#2 (text+ko) ==== @@ -43,6 +43,8 @@ void poll_unregister(int); void poll_dispatch(int wait); int poll_start_timer(u_int msecs, int repeat, timer_f func, void *arg); +int poll_start_utimer(unsigned long long usecs, int repeat, timer_f func, + void *arg); void poll_stop_timer(int); # if defined(POLL_IN) ==== //depot/projects/mjexp/contrib/libbegemot/rpoll.man#2 (text+ko) ==== @@ -1,8 +1,8 @@ '\" -'\" Copyright (c)1996-2002 by Hartmut Brandt +'\" Copyright (c)1996-2006 by Hartmut Brandt '\" All rights reserved. '\" -'\" Author: Hartmut Brandt +'\" Author: harti@freebsd.org '\" '\" Redistribution of this software and documentation and use in source and '\" binary forms, with or without modification, are permitted provided that @@ -28,28 +28,32 @@ '\" '\" $Begemot: libbegemot/rpoll.man,v 1.4 2004/09/21 15:59:00 brandt Exp $ '\" -.TH rpoll 3 "21 Oct 1996" "BEGEMOT" "BEGEMOT Library" +.TH rpoll 3 "8 Dec 2006" "BEGEMOT" "BEGEMOT Library" .SH NAME rpoll - callback functions for file descriptors and timers .SH SYNOPSIS .LP .B "# include " .LP -.BR "typedef void (*poll_f)(int " "fd" ", int " "mask" ", void *" "arg);" +.BR "typedef void (*poll_f)(int " "fd" ", int " "mask" ", void *" "arg" ");" .br -.BR "typedef void (*timer_f)(int " "tid" ", void *" "arg);" +.BR "typedef void (*timer_f)(int " "tid" ", void *" "arg" ");" .LP .BR "int poll_register(int " "fd" ", poll_f " .RB "func" ", void *" "arg" ", int " "mask" ");" .LP .BR "void poll_unregister(int " "handle" ");" .LP -.BR "int poll_start_timer(u_int " "msecs" ", int " "repeat" ", timer_f " "func," +.BR "int poll_start_timer(u_int " "msecs" ", int " "repeat" ", timer_f " "func" "," .if n .ti +.5i -.BR "void *" "arg);" +.BR "void *" "arg" ");" .LP .BR "void poll_stop_timer(int " "handle" ");" .LP +.BR "int poll_start_utimer(unsigned long long " "usecs" ", int " "repeat" ", +.if n .ti +.5i +.BR "timer_f " "func" ", void *" "arg" ");" +.LP .BR "void poll_dispatch(int " "wait" ");" .SH DESCRIPTION Many programs need to read from several file descriptors at the same time. @@ -113,9 +117,24 @@ .BR poll_register . .LP A timer is created with -.BR poll_start_timer . +.BR poll_start_timer +or +.BR poll_start_utimer . .I msecs -is the number of milliseconds, after which the timer event will be generated. +is the number of milliseconds in +.BR poll_start_timer +while +.I usecs +is the number of microseconds in +.BR poll_start_utimer , +after which the timer event will be generated. +If the functions use the +.BR poll (2) +system call, then +.I usecs +is rounded to milliseconds and +.BR poll_start_timer +is called. .I repeat selects one-short behavior (if 0) or a repeatable timer (if not 0). A one-short timer will automatically unregistered after expiry. @@ -123,7 +142,9 @@ is the user function which will be called with a timer id and the user supplied .IR arg . .B poll_start_timer -returnes a timer id, which may be used to cancel the timer with +and +.B poll_start_utimer +return a timer id, which may be used to cancel the timer with .BR poll_stop_timer . A one-short timer should be canceled only if it has not yet fired. .LP @@ -151,10 +172,12 @@ .SH "SEE ALSO" .BR poll (2), select (3C) .SH "RETURN VALUES" -.B poll_register +.B poll_register , +.B poll_start_timer and -.B poll_start_timer -return a handle which may be used to unregister the file descriptor or cancel the timer. +.B poll_start_utimer +return a handle which may be used to unregister the file descriptor or +cancel the timer. .LP Both functions and .B poll_dispatch ==== //depot/projects/mjexp/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: pfctl_altq.c,v 1.86 2005/02/28 14:04:51 henning Exp $ */ +/* add: $OpenBSD: pfctl_altq.c,v 1.91 2006/11/28 00:08:50 henning Exp $ */ /* * Copyright (c) 2002 @@ -19,7 +20,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.7 2005/05/03 16:55:20 mlaier Exp $"); +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.8 2006/11/30 18:55:36 mlaier Exp $"); #include #include @@ -709,8 +710,8 @@ } if ((opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0) || - (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0) || - (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0)) { + (opts->lssc_m1 < opts->lssc_m2 && opts->lssc_m1 != 0) || + (opts->ulsc_m1 < opts->ulsc_m2 && opts->ulsc_m1 != 0)) { warnx("m1 must be zero for convex curve: %s", pa->qname); return (-1); } ==== //depot/projects/mjexp/contrib/top/sigconv.awk#2 (text+ko) ==== @@ -1,3 +1,5 @@ +# $FreeBSD: src/contrib/top/sigconv.awk,v 1.2 2006/12/01 07:01:18 keramida Exp $ + BEGIN { nsig = 0; j = 0; @@ -10,7 +12,7 @@ print "struct sigdesc sigdesc[] = {" } -/^#define[ \t][ \t]*SIG[A-Z]/ { +/^#define[ \t][ \t]*SIG[A-Z]+[0-9]*[ \t]/ { j = sprintf("%d", $3); str = $2; @@ -18,10 +20,10 @@ if (nsig < j) nsig = j; - siglist[j] = sprintf("\"%s\",\t%2d,", \ + siglist[j] = sprintf("{ \"%s\",\t%2d },", \ substr(str, 4), j); } -/^#[ \t]*define[ \t][ \t]*SIG[A-Z]/ { +/^#[ \t]*define[ \t][ \t]*SIG[A-Z]+[0-9]*[ \t]/ { j = sprintf("%d", $4); str = $3; @@ -29,10 +31,10 @@ if (nsig < j) nsig = j; - siglist[j] = sprintf("\"%s\",\t%2d,", \ + siglist[j] = sprintf("{ \"%s\",\t%2d },", \ substr(str, 4), j); } -/^#[ \t]*define[ \t][ \t]*_SIG[A-Z]/ { +/^#[ \t]*define[ \t][ \t]*_SIG[A-Z]+[0-9]*[ \t]/ { j = sprintf("%d", $4); str = $3; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 10 05:41: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 5350A16A47C; Sun, 10 Dec 2006 05:41:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2280716A416 for ; Sun, 10 Dec 2006 05:41:01 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A06E943C9E for ; Sun, 10 Dec 2006 05:39:52 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA5f0Wm086916 for ; Sun, 10 Dec 2006 05:41:00 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5f078086910 for perforce@freebsd.org; Sun, 10 Dec 2006 05:41:00 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 10 Dec 2006 05:41:00 GMT Message-Id: <200612100541.kBA5f078086910@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111370 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, 10 Dec 2006 05:41:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=111370 Change 111370 by mjacob@mjexp on 2006/12/10 05:40:24 Merge a working (for my AMD box) copy of bge into this tree. Affected files ... .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#5 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/bge/if_bge.c#5 (text+ko) ==== @@ -2484,12 +2484,6 @@ } } - /* - * Write the magic number to the firmware mailbox at 0xb50 - * so that the driver can synchronize with the firmware. - */ - bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER); - /* Issue global reset */ bge_writereg_ind(sc, BGE_MISC_CFG, reset); @@ -2526,6 +2520,11 @@ CSR_WRITE_4(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE); /* + * Prevent PXE restart: write a magic number to the + * general communications memory at 0xB50. + */ + bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER); + /* * Poll the value location we just wrote until * we see the 1's complement of the magic number. * This indicates that the firmware initialization From owner-p4-projects@FreeBSD.ORG Sun Dec 10 05:53:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17C0316A47C; Sun, 10 Dec 2006 05:53:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EA08B16A403 for ; Sun, 10 Dec 2006 05:53:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59E6343C9F for ; Sun, 10 Dec 2006 05:52:09 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA5rHlt089543 for ; Sun, 10 Dec 2006 05:53:17 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5rHJ2089539 for perforce@freebsd.org; Sun, 10 Dec 2006 05:53:17 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 10 Dec 2006 05:53:17 GMT Message-Id: <200612100553.kBA5rHJ2089539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111373 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, 10 Dec 2006 05:53:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=111373 Change 111373 by mjacob@newisp on 2006/12/10 05:52:19 Fix isp modulization. Affected files ... .. //depot/projects/newisp/modules/isp/Makefile#2 edit Differences ... ==== //depot/projects/newisp/modules/isp/Makefile#2 (text+ko) ==== @@ -5,7 +5,7 @@ KMOD= isp SRCS= bus_if.h device_if.h pci_if.h \ opt_cam.h opt_ddb.h opt_isp.h \ - isp.c isp_target.c isp_freebsd.c isp_pci.c + isp.c isp_library.c isp_target.c isp_freebsd.c isp_pci.c .if ${MACHINE_ARCH} == sparc64 SRCS+= isp_sbus.c ofw_bus_if.h From owner-p4-projects@FreeBSD.ORG Sun Dec 10 05:53:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A53516A560; Sun, 10 Dec 2006 05:53:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3409116A50D for ; Sun, 10 Dec 2006 05:53:18 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9569843CA0 for ; Sun, 10 Dec 2006 05:52:09 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA5rHWC089551 for ; Sun, 10 Dec 2006 05:53:17 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5rH6r089547 for perforce@freebsd.org; Sun, 10 Dec 2006 05:53:17 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 10 Dec 2006 05:53:17 GMT Message-Id: <200612100553.kBA5rH6r089547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111374 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, 10 Dec 2006 05:53:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=111374 Change 111374 by mjacob@mjexp on 2006/12/10 05:52:49 Fix isp modulization. Affected files ... .. //depot/projects/mjexp/sys/modules/isp/Makefile#2 edit Differences ... ==== //depot/projects/mjexp/sys/modules/isp/Makefile#2 (text+ko) ==== @@ -5,7 +5,7 @@ KMOD= isp SRCS= bus_if.h device_if.h pci_if.h \ opt_cam.h opt_ddb.h opt_isp.h \ - isp.c isp_target.c isp_freebsd.c isp_pci.c + isp.c isp_library.c isp_target.c isp_freebsd.c isp_pci.c .if ${MACHINE_ARCH} == sparc64 SRCS+= isp_sbus.c ofw_bus_if.h From owner-p4-projects@FreeBSD.ORG Sun Dec 10 05: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 4B89416A416; Sun, 10 Dec 2006 05:54:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1E40416A412 for ; Sun, 10 Dec 2006 05:54:20 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99FC543CA3 for ; Sun, 10 Dec 2006 05:53:11 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA5sJrK089777 for ; Sun, 10 Dec 2006 05:54:19 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5sJpn089774 for perforce@freebsd.org; Sun, 10 Dec 2006 05:54:19 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 10 Dec 2006 05:54:19 GMT Message-Id: <200612100554.kBA5sJpn089774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111375 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, 10 Dec 2006 05:54:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=111375 Change 111375 by mjacob@mjexp on 2006/12/10 05:53:25 Just to get it down... very first baby steps cut at the start of a multipath geometry class. Affected files ... .. //depot/projects/mjexp/sbin/geom/class/Makefile#4 edit .. //depot/projects/mjexp/sbin/geom/class/multipath/Makefile#1 add .. //depot/projects/mjexp/sbin/geom/class/multipath/geom_multipath.c#1 add .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#1 add .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.h#1 add .. //depot/projects/mjexp/sys/modules/geom/Makefile#4 edit .. //depot/projects/mjexp/sys/modules/geom/geom_multipath/Makefile#1 add Differences ... ==== //depot/projects/mjexp/sbin/geom/class/Makefile#4 (text+ko) ==== @@ -10,6 +10,7 @@ SUBDIR+=journal SUBDIR+=label SUBDIR+=mirror +SUBDIR+=multipath SUBDIR+=nop SUBDIR+=raid3 SUBDIR+=shsec ==== //depot/projects/mjexp/sys/modules/geom/Makefile#4 (text+ko) ==== @@ -14,6 +14,7 @@ geom_label \ geom_mbr \ geom_mirror \ + geom_multipath \ geom_nop \ geom_pc98 \ geom_raid3 \ From owner-p4-projects@FreeBSD.ORG Sun Dec 10 05:54: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 392C216A501; Sun, 10 Dec 2006 05:54:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F264A16A407 for ; Sun, 10 Dec 2006 05:54:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C71143CA4 for ; Sun, 10 Dec 2006 05:53:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA5sKJh089784 for ; Sun, 10 Dec 2006 05:54:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5sJUj089780 for perforce@freebsd.org; Sun, 10 Dec 2006 05:54:19 GMT (envelope-from imp@freebsd.org) Date: Sun, 10 Dec 2006 05:54:19 GMT Message-Id: <200612100554.kBA5sJUj089780@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 111376 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, 10 Dec 2006 05:54:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=111376 Change 111376 by imp@imp_lighthouse on 2006/12/10 05:54:18 MF FreeBSD-tsc-6 (by Patrick Schweiger) o Add support for reading/writing the registers via sysctl to facilitate debugging o Make rx_buf __aligned(32) for strength! well, to make its work. I'm unsure why this is necessary. o Fix initialization sequence to properly reflect ordering constraints. o tweak setup o fix math error in calculating length (maybe the comment here could be better) o Simplify sc->rx_ptr computation o Move PREREAD dma sync into setup of RPR/RNPR rather than doing it unconditionally for all buffers at startup. o minor locking tweak to avoid a lock leak o Return the data we have when we get it, rather than waiting for the buffer to fill (well, and some other bogus things) Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#19 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#19 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -58,7 +59,7 @@ bus_dma_tag_t tag; /* bus dma tag */ bus_dmamap_t tx_map; int txdone; - uint8_t rx_buf[MAX_BUF]; + uint8_t __aligned(32) rx_buf[MAX_BUF]; uint8_t *rx_ptr; bus_dmamap_t rx_map[NRX_BUF]; bus_addr_t rx_pa[NRX_BUF]; @@ -68,10 +69,37 @@ uint8_t *rd_end; }; +struct ssc_sysctl_register_list +{ + char *nodename; + uint32_t offset; + char *comment; +}; + +static struct ssc_sysctl_register_list ssc_register_oids[] = +{ + { "0x00", 0x00, "Control Register" }, + { "0x04", 0x04, "Clock Mode Register" }, + { "0x10", 0x10, "Receive Clock Mode Register" }, + { "0x14", 0x14, "Receive Frame Mode Register" }, + { "0x18", 0x18, "Transmit Clock Mode Register" }, + { "0x1C", 0x1C, "Transmit Frame Mode Register" }, + { "0x20", 0x20, "Receive Holding Register" }, + { "0x24", 0x24, "Transmit Holding Register" }, + { "0x30", 0x30, "Receive Sync. Holding Register" }, + { "0x34", 0x34, "Transmit Sync. Holding Register" }, + { "0x40", 0x40, "Status Register" }, + { "0x44", 0x44, "Interrupt Enable Register" }, + { "0x48", 0x48, "Interrupt Disable Register" }, + { "0x4C", 0x4C, "Interrupt Mask Register" }, + { NULL, 0xFF, NULL } +}; + static void at91_ssc_loadread(void *arg, bus_dma_segment_t *segs, int nsegs, int error); static void at91_ssc_loadwrite(void *arg, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int error); +static int sysctl_ssc_gen_handler(SYSCTL_HANDLER_ARGS); static inline uint32_t RD4(struct at91_ssc_softc *sc, bus_size_t off) @@ -144,15 +172,23 @@ AT91_SSC_LOCK_INIT(sc); /* - * Activate the interrupt + * Register the sysctl handler. */ - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_ssc_intr, sc, &sc->intrhand); - if (err) { - AT91_SSC_LOCK_DESTROY(sc); - goto out; + for (i = 0 ; ssc_register_oids[i].nodename != NULL; i++) + { + const struct ssc_sysctl_register_list *oid = &ssc_register_oids[i]; + + SYSCTL_ADD_PROC( + device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + i, oid->nodename, CTLTYPE_UINT | CTLFLAG_RW, + sc, oid->offset, sysctl_ssc_gen_handler, "I", + oid->comment); } + // perform software reset before DMA read buffer setup + WR4(sc, SSC_CR, SSC_CR_SWRST); + /* * Allocate DMA tags and maps */ @@ -165,7 +201,7 @@ if (err != 0) goto out; for (i = 0; i < NRX_BUF; i++) { - err = bus_dmamap_create(sc->tag, 0, &sc->rx_map[i]); + err = bus_dmamap_create(sc->tag, 0, &sc->rx_map[i]); if (err != 0) goto out; err = bus_dmamap_load(sc->tag, sc->rx_map[i], sc->rx_buf + @@ -173,6 +209,17 @@ if (err != 0) goto out; } + + /* + * Activate the interrupt + */ + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + at91_ssc_intr, sc, &sc->intrhand); + if (err) { + AT91_SSC_LOCK_DESTROY(sc); + goto out; + } + // We use two buffers for read, and we bounce between them. @@ -186,16 +233,19 @@ sc->rd_end = sc->rd_buf; // Init for TSC needs - WR4(sc, SSC_CR, SSC_CR_SWRST); WR4(sc, SSC_CMR, 0); // clock divider unused WR4(sc, SSC_RCMR, - SSC_RCMR_CKS_RK | SSC_RCMR_CKO_NONE | SSC_RCMR_START_FALL_EDGE_RF); + SSC_RCMR_CKS_RK | SSC_RCMR_CKO_NONE | + SSC_RCMR_START_FALL_EDGE_RF | SSC_RCMR_CKI); + WR4(sc, SSC_RFMR, - 0x1f | SSC_RFMR_MSFBF | SSC_RFMR_FSOS_NONE); + 0x1f | SSC_RFMR_MSFBF | SSC_RFMR_FSOS_NONE); // input only + WR4(sc, SSC_TCMR, SSC_TCMR_CKS_TK | SSC_TCMR_CKO_NONE | SSC_TCMR_START_CONT); + WR4(sc, SSC_TFMR, - 0x1f | SSC_TFMR_DATDEF | SSC_TFMR_MSFBF | SSC_TFMR_FSOS_NEG_PULSE); + 0x1f | SSC_TFMR_DATDEF | SSC_TFMR_MSFBF | SSC_TFMR_FSOS_LOW); out: if (err) @@ -280,7 +330,12 @@ bus_dmamap_sync(sc->tag, sc->rx_map[sc->rxcur], BUS_DMASYNC_POSTREAD); WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS); - len = ONE_BUF - RD4(sc, PDC_RCR) * 4 + 4; + + // PDC_RNCR value has been moved to PDC_RCR at the time the + // ENDRX interrupt was triggered, its original value already + // accounted for the fact that RCR would receive one datum + len = ONE_BUF - RD4(sc, PDC_RCR) * 4; + sc->rxcur = (sc->rxcur + 1) % NRX_BUF; WR4(sc, PDC_RPR, sc->rx_pa[sc->rxcur]); WR4(sc, PDC_RCR, 1); @@ -293,9 +348,7 @@ memcpy(sc->rd_end, sc->rx_ptr, len); sc->rd_end += len; } - sc->rx_ptr += ONE_BUF; - if (sc->rx_ptr >= sc->rx_buf + sizeof(sc->rx_buf)) - sc->rx_ptr = sc->rx_buf; + sc->rx_ptr = sc->rx_buf + ONE_BUF * sc->rxcur; sc->rxdone++; wakeup(&sc->rxdone); } @@ -338,17 +391,17 @@ sc = arg; if (error != 0) return; - bus_dmamap_sync(sc->tag, sc->rx_map[sc->rxcur], BUS_DMASYNC_PREREAD); sc->rx_pa[sc->rxcur] = segs[0].ds_addr; if (sc->rx_ptr == NULL) { WR4(sc, PDC_RPR, sc->rx_pa[sc->rxcur]); WR4(sc, PDC_RCR, 1); WR4(sc, PDC_RNPR, sc->rx_pa[sc->rxcur] + 4); WR4(sc, PDC_RNCR, ONE_BUF / 4 - 1); + bus_dmamap_sync(sc->tag, sc->rx_map[sc->rxcur], BUS_DMASYNC_PREREAD); WR4(sc, SSC_IER, SSC_SR_ENDRX); WR4(sc, SSC_CR, SSC_CR_RXEN); WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - sc->rx_ptr = sc->rx_buf; + sc->rx_ptr = sc->rx_buf + ONE_BUF * sc->rxcur; } sc->rxcur = (sc->rxcur + 1) % NRX_BUF; } @@ -377,10 +430,10 @@ int err, ret, len; sc = CDEV2SOFTC(dev); - AT91_SSC_LOCK(sc); // must read a multiple of 4 bytes if ((uio->uio_resid & 0x3) != 0) return (EINVAL); + AT91_SSC_LOCK(sc); err = 0; ret = 0; while (uio->uio_resid) { @@ -388,8 +441,12 @@ // some data, then go ahead and return what we have now. if (sc->rd_end == sc->rd_buf && ret != 0) break; - err = msleep(&sc->rxdone, &sc->sc_mtx, PCATCH | PZERO, - "sscrd", 0); + + if (sc->rd_end != sc->rd_buf) + err = 0; + else + err = msleep(&sc->rxdone, &sc->sc_mtx, PCATCH | PZERO, + "sscrd", 0); if (err != 0) break; if (sc->rd_end == sc->rd_buf) @@ -466,4 +523,27 @@ sizeof(struct at91_ssc_softc), }; +static int +sysctl_ssc_gen_handler(SYSCTL_HANDLER_ARGS) +{ + struct at91_ssc_softc *sc = arg1; + int err; + + uint32_t val, newval = 0; + val = RD4(sc, arg2); + + if (req->newptr) + { + if ((err = SYSCTL_IN(req, &newval, sizeof(newval))) != 0) + return err; + WR4(sc, arg2, newval); + } + else + { + return SYSCTL_OUT(req, &val, sizeof(val)); + } + + return 0; +} + DRIVER_MODULE(at91_ssc, atmelarm, at91_ssc_driver, at91_ssc_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Sun Dec 10 06:38:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E68916A47B; Sun, 10 Dec 2006 06:38:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1989516A40F for ; Sun, 10 Dec 2006 06:38:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 513FC43CA3 for ; Sun, 10 Dec 2006 06:37:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA6cHC8097650 for ; Sun, 10 Dec 2006 06:38:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA6cH7i097647 for perforce@freebsd.org; Sun, 10 Dec 2006 06:38:17 GMT (envelope-from imp@freebsd.org) Date: Sun, 10 Dec 2006 06:38:17 GMT Message-Id: <200612100638.kBA6cH7i097647@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 111380 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, 10 Dec 2006 06:38:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=111380 Change 111380 by imp@imp_lighthouse on 2006/12/10 06:38:13 hex format for sysctl Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#20 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#20 (text+ko) ==== @@ -182,7 +182,7 @@ device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), i, oid->nodename, CTLTYPE_UINT | CTLFLAG_RW, - sc, oid->offset, sysctl_ssc_gen_handler, "I", + sc, oid->offset, sysctl_ssc_gen_handler, "IX", oid->comment); } From owner-p4-projects@FreeBSD.ORG Sun Dec 10 06:42: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 A5ABA16A416; Sun, 10 Dec 2006 06:42:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F8FD16A412 for ; Sun, 10 Dec 2006 06:42:24 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B931643C9F for ; Sun, 10 Dec 2006 06:41:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA6gOXU098707 for ; Sun, 10 Dec 2006 06:42:24 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA6gNCq098702 for perforce@freebsd.org; Sun, 10 Dec 2006 06:42:23 GMT (envelope-from imp@freebsd.org) Date: Sun, 10 Dec 2006 06:42:23 GMT Message-Id: <200612100642.kBA6gNCq098702@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 111382 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, 10 Dec 2006 06:42:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=111382 Change 111382 by imp@imp_lighthouse on 2006/12/10 06:42:15 Remove watchdog that we weren't using anyway. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#64 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#64 (text+ko) ==== @@ -132,7 +132,6 @@ static void ateinit(void *); static void atestart(struct ifnet *); static void atestop(struct ate_softc *); -static void atewatchdog(struct ifnet *); static int ateioctl(struct ifnet * ifp, u_long, caddr_t); /* bus entry points */ @@ -208,7 +207,6 @@ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = atestart; ifp->if_ioctl = ateioctl; - ifp->if_watchdog = atewatchdog; ifp->if_init = ateinit; ifp->if_baudrate = 10000000; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); @@ -910,18 +908,6 @@ */ } -static void -atewatchdog(struct ifnet *ifp) -{ - struct ate_softc *sc = ifp->if_softc; - - ATE_LOCK(sc); - device_printf(sc->dev, "Device timeout\n"); - ifp->if_oerrors++; - ateinit_locked(sc); - ATE_UNLOCK(sc); -} - static int ateioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { From owner-p4-projects@FreeBSD.ORG Sun Dec 10 13:30: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 AB58B16A415; Sun, 10 Dec 2006 13:30:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7D00E16A407; Sun, 10 Dec 2006 13:30:49 +0000 (UTC) (envelope-from ticso@cicely12.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F26043C9E; Sun, 10 Dec 2006 13:29:37 +0000 (GMT) (envelope-from ticso@cicely12.cicely.de) Received: from cicely5.cicely.de ([10.1.1.7]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id kBADUkZn093826; Sun, 10 Dec 2006 14:30:46 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (cicely12.cicely.de [10.1.1.14]) by cicely5.cicely.de (8.13.4/8.13.4) with ESMTP id kBADUcN2012999 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 10 Dec 2006 14:30:39 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (localhost [127.0.0.1]) by cicely12.cicely.de (8.13.4/8.13.3) with ESMTP id kBADUcZr066283; Sun, 10 Dec 2006 14:30:38 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: (from ticso@localhost) by cicely12.cicely.de (8.13.4/8.13.3/Submit) id kBADUcqj066282; Sun, 10 Dec 2006 14:30:38 +0100 (CET) (envelope-from ticso) Date: Sun, 10 Dec 2006 14:30:38 +0100 From: Bernd Walter To: Warner Losh Message-ID: <20061210133037.GU54209@cicely12.cicely.de> References: <200612100506.kBA5689e082011@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200612100506.kBA5689e082011@repoman.freebsd.org> X-Operating-System: FreeBSD cicely12.cicely.de 5.4-STABLE alpha User-Agent: Mutt/1.5.9i X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED=-1.8, BAYES_00=-2.599 autolearn=ham version=3.1.7 X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on cicely12.cicely.de Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Dec 2006 13:30:49 -0000 On Sun, Dec 10, 2006 at 05:06:08AM +0000, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=111367 > > Change 111367 by imp@imp_lighthouse on 2006/12/10 05:05:14 > > First attempt to apply Daan Vreeken's usb patches to get my > KB9202 working. They didn't succeed. Neither do they cause > any real ill effect except for a slight delay in booting when > usb is in the kernel. Committed to facilitate coordination. I tested it yesterday - with the same result. Do we have the DMA workaround commited? -- B.Walter http://www.bwct.de http://www.fizon.de bernd@bwct.de info@bwct.de support@fizon.de From owner-p4-projects@FreeBSD.ORG Sun Dec 10 22:57:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89CF116A500; Sun, 10 Dec 2006 22:57:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4572A16A4AB for ; Sun, 10 Dec 2006 22:57:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5087343D46 for ; Sun, 10 Dec 2006 22:55:03 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBAMuFfd062990 for ; Sun, 10 Dec 2006 22:56:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBAMuFgP062987 for perforce@freebsd.org; Sun, 10 Dec 2006 22:56:15 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 22:56:15 GMT Message-Id: <200612102256.kBAMuFgP062987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111406 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, 10 Dec 2006 22:57:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=111406 Change 111406 by sam@sam_ebb on 2006/12/10 22:56:08 generate opt_ddb.h after addition of ddb commands Affected files ... .. //depot/projects/crypto/sys/modules/crypto/Makefile#5 edit Differences ... ==== //depot/projects/crypto/sys/modules/crypto/Makefile#5 (text+ko) ==== @@ -15,5 +15,6 @@ SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha2.c SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h +SRCS += opt_ddb.h .include From owner-p4-projects@FreeBSD.ORG Sun Dec 10 22:57:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBE6C16A55C; Sun, 10 Dec 2006 22:57:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 606E016A4CA for ; Sun, 10 Dec 2006 22:57:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1CD443D2F for ; Sun, 10 Dec 2006 22:55:02 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBAMuF3X062984 for ; Sun, 10 Dec 2006 22:56:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBAMuF62062981 for perforce@freebsd.org; Sun, 10 Dec 2006 22:56:15 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 22:56:15 GMT Message-Id: <200612102256.kBAMuF62062981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111405 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, 10 Dec 2006 22:57:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=111405 Change 111405 by sam@sam_ebb on 2006/12/10 22:55:46 add ddb commands to show crypto driver and q status: show crypto # driver and sym q status show kcrypto # driver and asym q status Affected files ... .. //depot/projects/crypto/sys/opencrypto/crypto.c#8 edit Differences ... ==== //depot/projects/crypto/sys/opencrypto/crypto.c#8 (text+ko) ==== @@ -56,6 +56,8 @@ #define CRYPTO_TIMING /* enable timing support */ +#include "opt_ddb.h" + #include #include #include @@ -68,6 +70,8 @@ #include #include +#include + #include #include #include /* XXX for M_XDATA */ @@ -1431,6 +1435,103 @@ crypto_finis(&crp_ret_q); } +#ifdef DDB +static void +db_show_drivers(void) +{ + int hid; + + db_printf("%12s %4s %4s %8s %2s %2s\n" + , "Device" + , "Ses" + , "Kops" + , "Flags" + , "QB" + , "KB" + ); + for (hid = 0; hid < crypto_drivers_num; hid++) { + const struct cryptocap *cap = &crypto_drivers[hid]; + if (cap->cc_dev == NULL) + continue; + db_printf("%-12s %4u %4u %08x %2u %2u\n" + , device_get_nameunit(cap->cc_dev) + , cap->cc_sessions + , cap->cc_koperations + , cap->cc_flags + , cap->cc_qblocked + , cap->cc_kqblocked + ); + } +} + +DB_SHOW_COMMAND(crypto, db_show_crypto) +{ + struct cryptop *crp; + + db_show_drivers(); + db_printf("\n"); + + db_printf("%4s %8s %4s %4s %4s %4s %8s %8s\n", + "HID", "Caps", "Ilen", "Olen", "Etype", "Flags", + "Desc", "Callback"); + TAILQ_FOREACH(crp, &crp_q, crp_next) { + db_printf("%4u %08x %4u %4u %4u %04x %8p %8p\n" + , (int) CRYPTO_SESID2HID(crp->crp_sid) + , (int) CRYPTO_SESID2CAPS(crp->crp_sid) + , crp->crp_ilen, crp->crp_olen + , crp->crp_etype + , crp->crp_flags + , crp->crp_desc + , crp->crp_callback + ); + } + if (!TAILQ_EMPTY(&crp_ret_q)) { + db_printf("\n%4s %4s %4s %8s\n", + "HID", "Etype", "Flags", "Callback"); + TAILQ_FOREACH(crp, &crp_ret_q, crp_next) { + db_printf("%4u %4u %04x %8p\n" + , (int) CRYPTO_SESID2HID(crp->crp_sid) + , crp->crp_etype + , crp->crp_flags + , crp->crp_callback + ); + } + } +} + +DB_SHOW_COMMAND(kcrypto, db_show_kcrypto) +{ + struct cryptkop *krp; + + db_show_drivers(); + db_printf("\n"); + + db_printf("%4s %5s %4s %4s %8s %4s %8s\n", + "Op", "Status", "#IP", "#OP", "CRID", "HID", "Callback"); + TAILQ_FOREACH(krp, &crp_kq, krp_next) { + db_printf("%4u %5u %4u %4u %08x %4u %8p\n" + , krp->krp_op + , krp->krp_status + , krp->krp_iparams, krp->krp_oparams + , krp->krp_crid, krp->krp_hid + , krp->krp_callback + ); + } + if (!TAILQ_EMPTY(&crp_ret_q)) { + db_printf("%4s %5s %8s %4s %8s\n", + "Op", "Status", "CRID", "HID", "Callback"); + TAILQ_FOREACH(krp, &crp_ret_kq, krp_next) { + db_printf("%4u %5u %08x %4u %8p\n" + , krp->krp_op + , krp->krp_status + , krp->krp_crid, krp->krp_hid + , krp->krp_callback + ); + } + } +} +#endif + int crypto_modevent(module_t mod, int type, void *unused); /* From owner-p4-projects@FreeBSD.ORG Sun Dec 10 22:58: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 EF68616A4FC; Sun, 10 Dec 2006 22:58:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CD06316A4D8 for ; Sun, 10 Dec 2006 22:58:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E030743C9D for ; Sun, 10 Dec 2006 22:57:06 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBAMwJvP063108 for ; Sun, 10 Dec 2006 22:58:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBAMwJoo063105 for perforce@freebsd.org; Sun, 10 Dec 2006 22:58:19 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 22:58:19 GMT Message-Id: <200612102258.kBAMwJoo063105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111408 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, 10 Dec 2006 22:58:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=111408 Change 111408 by sam@sam_ebb on 2006/12/10 22:57:32 guard against crypto_dispatch returning an error when re-submitted a symmetric op in the callback routine; previously we assumed it always worked Affected files ... .. //depot/projects/crypto/sys/opencrypto/cryptodev.c#8 edit Differences ... ==== //depot/projects/crypto/sys/opencrypto/cryptodev.c#8 (text+ko) ==== @@ -526,12 +526,16 @@ { struct cryptop *crp = (struct cryptop *) op; struct csession *cse = (struct csession *)crp->crp_opaque; + int error; - cse->error = crp->crp_etype; - if (crp->crp_etype == EAGAIN) - return crypto_dispatch(crp); + error = crp->crp_etype; + if (error == EAGAIN) + error = crypto_dispatch(crp); mtx_lock(&cse->lock); - wakeup_one(crp); + if (error != 0 || (crp->crp_flags & CRYPTO_F_DONE)) { + cse->error = error; + wakeup_one(crp); + } mtx_unlock(&cse->lock); return (0); } From owner-p4-projects@FreeBSD.ORG Sun Dec 10 22:59: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 3923516A416; Sun, 10 Dec 2006 22:59:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D597B16A403 for ; Sun, 10 Dec 2006 22:59:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C520C43CB3 for ; Sun, 10 Dec 2006 22:58:13 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBAMxMhK063174 for ; Sun, 10 Dec 2006 22:59:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBAMxLcx063171 for perforce@freebsd.org; Sun, 10 Dec 2006 22:59:21 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 22:59:21 GMT Message-Id: <200612102259.kBAMxLcx063171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111409 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, 10 Dec 2006 22:59:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=111409 Change 111409 by sam@sam_ebb on 2006/12/10 22:58:22 IFC near 111408 Affected files ... .. //depot/projects/crypto/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/crypto/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/crypto/sys/conf/NOTES#2 integrate .. //depot/projects/crypto/sys/conf/files#6 integrate .. //depot/projects/crypto/sys/conf/options#3 integrate .. //depot/projects/crypto/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/crypto/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/crypto/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/crypto/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/crypto/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/crypto/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/crypto/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/crypto/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/crypto/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/crypto/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/crypto/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/crypto/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/crypto/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/crypto/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/crypto/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/crypto/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/crypto/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/crypto/sys/kern/vfs_export.c#2 integrate .. //depot/projects/crypto/sys/modules/isp/Makefile#2 integrate .. //depot/projects/crypto/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/crypto/sys/netinet/ip_output.c#2 integrate .. //depot/projects/crypto/sys/pci/if_xl.c#3 integrate .. //depot/projects/crypto/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/crypto/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/crypto/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/crypto/sys/vm/vm_page.c#2 integrate Differences ... ==== //depot/projects/crypto/sys/arm/at91/uart_dev_at91usart.c#2 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.9 2006/07/20 21:03:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 00:24:15 cognet Exp $"); #include "opt_comconsole.h" @@ -323,7 +323,10 @@ static int at91_usart_bus_attach(struct uart_softc *sc) { - int err, i; +#ifndef SKYEYE_WORKAROUNDS + int err; + int i; +#endif uint32_t cr; struct at91_usart_softc *atsc; @@ -345,6 +348,7 @@ sc->sc_rxfifosz = USART_BUFFER_SIZE; sc->sc_hwiflow = 0; +#ifndef SKYEYE_WORKAROUNDS /* * Allocate DMA tags and maps */ @@ -374,6 +378,7 @@ atsc->ping = &atsc->ping_pong[0]; atsc->pong = &atsc->ping_pong[1]; } +#endif /* * Prime the pump with the RX buffer. We use two 64 byte bounce @@ -407,9 +412,13 @@ WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); } WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK); +#ifndef SKYEYE_WORKAROUNDS errout:; // XXX bad return (err); +#else + return (0); +#endif } static int ==== //depot/projects/crypto/sys/arm/xscale/ixp425/files.ixp425#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.1 2006/11/19 23:55:23 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2 2006/12/07 00:49:33 sam Exp $ arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard arm/xscale/ixp425/ixp425.c standard @@ -18,7 +18,11 @@ # # NPE-based Ethernet support (requires qmgr also). Note the # firmware images must be downloaded from the Intel web site. +# The URL seems to change frequently; try this as a starting +# place: # +# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm +# arm/xscale/ixp425/if_npe.c optional npe arm/xscale/ixp425/ixp425_npe.c optional npe ixp425_npe_fw.c optional npe_fw \ @@ -31,10 +35,15 @@ # get known values for reference in the _fw.c file. # IxNpeMicrocode.fwo optional npe_fw \ - dependency "$S/arm/xscale/ixp425/IxNpeMicrocode.dat" \ - compile-with "ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat ${.OBJDIR}; ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ + dependency "IxNpeMicrocode.dat" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ no-implicit-rule \ - clean "IxNpeMicrocode.dat IxNpeMicrocode.fwo" + clean "IxNpeMicrocode.fwo" +IxNpeMicrocode.dat optional npe_fw \ + dependency ".PHONY" \ + compile-with "if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \ + no-obj no-implicit-rule \ + clean "IxNpeMicrocode.dat" # # Q-Manager support # ==== //depot/projects/crypto/sys/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.170 2006/12/05 07:45:27 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.171 2006/12/10 05:37:48 mjacob Exp $"); #include #include @@ -1697,7 +1697,7 @@ if (path->device->inq_flags & SID_CmdQue || path->device->flags & CAM_DEV_TAG_AFTER_COUNT) { - printf("\n%s%d: Tagged Queueing Enabled", + printf("\n%s%d: Command Queueing Enabled", periph->periph_name, periph->unit_number); } printf("\n"); ==== //depot/projects/crypto/sys/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1400 2006/11/15 09:13:24 maxim Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1401 2006/12/10 04:23:23 mjacob Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -110,6 +110,21 @@ # options BLKDEV_IOSIZE=8192 +# +# MAXPHYS and DFLTPHYS +# +# These are the max and default 'raw' I/O block device access sizes. +# Reads and writes will be split into DFLTPHYS chunks. Some applications +# have better performance with larger raw I/O access sizes. Typically +# MAXPHYS should be twice the size of DFLTPHYS. Note that certain VM +# parameters are derived from these values and making them too large +# can make an an unbootable kernel. +# +# The defaults are 64K and 128K respectively. +options DFLTPHYS=(64*1024) +options MAXPHYS=(128*1024) + + # Options for the VM subsystem # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring ==== //depot/projects/crypto/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1165 2006/11/29 08:08:30 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1166 2006/12/10 01:10:08 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -739,7 +739,6 @@ dev/mii/pnaphy.c optional miibus | pnaphy dev/mii/qsphy.c optional miibus | qsphy dev/mii/rgephy.c optional miibus | rgephy -# XXX rl and re only? dev/mii/rlphy.c optional miibus | rlphy # XXX rue only? dev/mii/ruephy.c optional miibus | ruephy ==== //depot/projects/crypto/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.566 2006/11/30 04:17:04 jb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.567 2006/12/10 04:23:23 mjacob Exp $ # # On the handling of kernel options # @@ -535,6 +535,8 @@ # These cause changes all over the kernel BLKDEV_IOSIZE opt_global.h +MAXPHYS opt_global.h +DFLTPHYS opt_global.h BURN_BRIDGES opt_global.h DEBUG opt_global.h DEBUG_LOCKS opt_global.h ==== //depot/projects/crypto/sys/dev/bce/if_bce.c#2 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.21 2006/11/16 06:28:54 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.22 2006/12/06 22:53:22 jhb Exp $"); /* * The following controllers are supported by this driver: @@ -4566,7 +4566,7 @@ /* Try to defrag the mbuf if there are too many segments. */ DBPRINT(sc, BCE_WARN, "%s(): fragmented mbuf (%d pieces)\n", - __FUNCTION__, map_arg.maxsegs); + __FUNCTION__, nsegs); m0 = m_defrag(*m_head, M_DONTWAIT); if (m0 == NULL) { @@ -4619,7 +4619,7 @@ DBPRINT(sc, BCE_INFO_SEND, "%s(): Start: prod = 0x%04X, chain_prod = %04X, " "prod_bseq = 0x%08X\n", - __FUNCTION__, *prod, chain_prod, prod_bseq); + __FUNCTION__, prod, chain_prod, prod_bseq); /* * Cycle through each mbuf segment that makes up @@ -4646,7 +4646,7 @@ /* Set the END flag on the last TX buffer descriptor. */ txbd->tx_bd_flags |= htole16(TX_BD_FLAGS_END); - DBRUN(BCE_INFO_SEND, bce_dump_tx_chain(sc, debug_prod, nseg)); + DBRUN(BCE_INFO_SEND, bce_dump_tx_chain(sc, debug_prod, nsegs)); DBPRINT(sc, BCE_INFO_SEND, "%s(): End: prod = 0x%04X, chain_prod = %04X, " @@ -6163,7 +6163,7 @@ else /* Normal tx_bd entry. */ BCE_PRINTF(sc, "tx_bd[0x%04X]: haddr = 0x%08X:%08X, nbytes = 0x%08X, " - "vlan tag= 0x%4X, "flags = 0x%04X\n", idx, + "vlan tag= 0x%4X, flags = 0x%04X\n", idx, txbd->tx_bd_haddr_hi, txbd->tx_bd_haddr_lo, txbd->tx_bd_mss_nbytes, txbd->tx_bd_vlan_tag, txbd->tx_bd_flags); ==== //depot/projects/crypto/sys/dev/isp/isp_freebsd.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.129 2006/12/05 07:50:23 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.130 2006/12/09 01:30:05 mjacob Exp $"); #include #include #include @@ -2744,6 +2744,8 @@ CAMLOCK_2_ISPLOCK(isp); if (IS_FC(isp)) { fcparam *fcp = isp->isp_param; + struct ccb_trans_settings_scsi *scsi = + &cts->proto_specific.scsi; struct ccb_trans_settings_fc *fc = &cts->xport_specific.fc; @@ -2752,11 +2754,14 @@ cts->transport = XPORT_FC; cts->transport_version = 0; + scsi->valid = CTS_SCSI_VALID_TQ; + scsi->flags = CTS_SCSI_FLAGS_TAG_ENB; fc->valid = CTS_FC_VALID_SPEED; - if (fcp->isp_gbspeed == 2) + if (fcp->isp_gbspeed == 2) { fc->bitrate = 200000; - else + } else { fc->bitrate = 100000; + } if (tgt > 0 && tgt < MAX_FC_TARG) { fcportdb_t *lp = &fcp->portdb[tgt]; fc->wwnn = lp->node_wwn; ==== //depot/projects/crypto/sys/dev/isp/isp_pci.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.127 2006/11/18 03:53:16 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.128 2006/12/10 03:41:48 mjacob Exp $"); #include #include @@ -352,10 +352,7 @@ }; static devclass_t isp_devclass; DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0); -#if __FreeBSD_version >= 700000 -MODULE_DEPEND(isp, ispfw, 1, 1, 1); -MODULE_DEPEND(isp, firmware, 1, 1, 1); -#else +#if __FreeBSD_version < 700000 extern ispfwfunc *isp_get_firmware_p; #endif ==== //depot/projects/crypto/sys/dev/isp/isp_sbus.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.23 2006/11/02 03:21:31 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.24 2006/12/10 03:41:48 mjacob Exp $"); #include #include @@ -113,9 +113,7 @@ }; static devclass_t isp_devclass; DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0); -#if __FreeBSD_version >= 700000 -MODULE_DEPEND(isp, firmware, 1, 1, 1); -#else +#if __FreeBSD_version < 700000 extern ispfwfunc *isp_get_firmware_p; #endif ==== //depot/projects/crypto/sys/dev/isp/ispmbox.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.55 2006/11/18 03:53:16 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.56 2006/12/09 01:33:55 mjacob Exp $ */ /*- * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters. * @@ -638,7 +638,7 @@ typedef struct { isphdr_t ms_header; uint32_t ms_handle; - uint16_t ms_nphdl; /* XXX: Note, this is for 2K Logins only */ + uint16_t ms_nphdl; /* handle in high byte for !2k f/w */ uint16_t ms_status; uint16_t ms_flags; uint16_t ms_reserved1; /* low 8 bits */ ==== //depot/projects/crypto/sys/dev/ispfw/ispfw.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.18 2006/08/26 18:39:18 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.19 2006/12/10 03:42:57 mjacob Exp $"); #include #include @@ -52,7 +52,7 @@ #ifdef __sparc64__ #define ISP_1000 1 #endif -#define MODULE_NAME "isp" +#define MODULE_NAME "ispfw" #endif #if defined(ISP_1040) || defined(ISP_1040_IT) ==== //depot/projects/crypto/sys/dev/iwi/if_iwi.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.42 2006/11/07 19:03:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.44 2006/12/07 15:24:38 kevlo Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include #include #include @@ -1230,6 +1232,7 @@ struct mbuf *mnew, *m; struct ieee80211_node *ni; int type, error, framelen; + IWI_LOCK_DECL; framelen = le16toh(frame->len); if (framelen < IEEE80211_MIN_LEN || framelen > MCLBYTES) { @@ -1310,6 +1313,7 @@ bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); } + IWI_UNLOCK(sc); ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); @@ -1319,6 +1323,7 @@ /* node is no longer needed */ ieee80211_free_node(ni); + IWI_LOCK(sc); if (sc->sc_softled) { /* * Blink for any data frame. Otherwise do a ==== //depot/projects/crypto/sys/dev/mpt/mpt.c#3 (text+ko) ==== @@ -96,7 +96,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.37 2006/12/03 00:28:10 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.39 2006/12/07 23:51:00 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -128,7 +128,7 @@ static int mpt_send_event_request(struct mpt_softc *mpt, int onoff); static int mpt_soft_reset(struct mpt_softc *mpt); static void mpt_hard_reset(struct mpt_softc *mpt); -static int mpt_configure_ioc(struct mpt_softc *mpt); +static int mpt_configure_ioc(struct mpt_softc *mpt, int, int); static int mpt_enable_ioc(struct mpt_softc *mpt, int); /************************* Personality Module Support *************************/ @@ -1484,25 +1484,27 @@ f_req.Function = MPI_FUNCTION_IOC_FACTS; f_req.MsgContext = htole32(MPT_REPLY_HANDLER_HANDSHAKE); error = mpt_send_handshake_cmd(mpt, sizeof f_req, &f_req); - if (error) + if (error) { return(error); + } error = mpt_recv_handshake_reply(mpt, sizeof (*freplp), freplp); return (error); } static int -mpt_get_portfacts(struct mpt_softc *mpt, MSG_PORT_FACTS_REPLY *freplp) +mpt_get_portfacts(struct mpt_softc *mpt, U8 port, MSG_PORT_FACTS_REPLY *freplp) { MSG_PORT_FACTS f_req; int error; - /* XXX: Only getting PORT FACTS for Port 0 */ memset(&f_req, 0, sizeof f_req); f_req.Function = MPI_FUNCTION_PORT_FACTS; + f_req.PortNumber = port; f_req.MsgContext = htole32(MPT_REPLY_HANDLER_HANDSHAKE); error = mpt_send_handshake_cmd(mpt, sizeof f_req, &f_req); - if (error) + if (error) { return(error); + } error = mpt_recv_handshake_reply(mpt, sizeof (*freplp), freplp); return (error); } @@ -1523,8 +1525,8 @@ memset(&init, 0, sizeof init); init.WhoInit = who; init.Function = MPI_FUNCTION_IOC_INIT; - init.MaxDevices = mpt->mpt_max_devices; - init.MaxBuses = 1; + init.MaxDevices = 0; /* at least 256 devices per bus */ + init.MaxBuses = 16; /* at least 16 busses */ init.MsgVersion = htole16(MPI_VERSION); init.HeaderVersion = htole16(MPI_HEADER_VERSION); @@ -1759,17 +1761,10 @@ return (rv); } -#if __FreeBSD_version >= 500000 - mpt_lprt(mpt, MPT_PRT_DEBUG, "IOC Page 2 Header: ver %x, len %zx, " - "num %x, type %x\n", hdr.PageVersion, - hdr.PageLength * sizeof(uint32_t), - hdr.PageNumber, hdr.PageType); -#else - mpt_lprt(mpt, MPT_PRT_DEBUG, "IOC Page 2 Header: ver %x, len %z, " - "num %x, type %x\n", hdr.PageVersion, - hdr.PageLength * sizeof(uint32_t), - hdr.PageNumber, hdr.PageType); -#endif + mpt_lprt(mpt, MPT_PRT_DEBUG, + "IOC Page 2 Header: Version %x len %x PageNumber %x PageType %x\n", + hdr.PageVersion, hdr.PageLength << 2, + hdr.PageNumber, hdr.PageType); len = hdr.PageLength * sizeof(uint32_t); mpt->ioc_page2 = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); @@ -1786,6 +1781,7 @@ mpt_raid_free_mem(mpt); return (EIO); } + mpt2host_config_page_ioc2(mpt->ioc_page2); if (mpt->ioc_page2->CapabilitiesFlags != 0) { uint32_t mask; @@ -2107,11 +2103,8 @@ mpt_core_attach(struct mpt_softc *mpt) { int val; - int error; - LIST_INIT(&mpt->ack_frames); - /* Put all request buffers on the free list */ TAILQ_INIT(&mpt->request_pending_list); TAILQ_INIT(&mpt->request_free_list); @@ -2121,24 +2114,17 @@ req->state = REQ_STATE_ALLOCATED; mpt_free_request(mpt, req); } - for (val = 0; val < MPT_MAX_LUNS; val++) { STAILQ_INIT(&mpt->trt[val].atios); STAILQ_INIT(&mpt->trt[val].inots); } STAILQ_INIT(&mpt->trt_wildcard.atios); STAILQ_INIT(&mpt->trt_wildcard.inots); - mpt->scsi_tgt_handler_id = MPT_HANDLER_ID_NONE; - mpt_sysctl_attach(mpt); - mpt_lprt(mpt, MPT_PRT_DEBUG, "doorbell req = %s\n", mpt_ioc_diag(mpt_read(mpt, MPT_OFFSET_DOORBELL))); - - error = mpt_configure_ioc(mpt); - - return (error); + return (mpt_configure_ioc(mpt, 0, 0)); } int @@ -2197,6 +2183,9 @@ void mpt_core_detach(struct mpt_softc *mpt) { + /* + * XXX: FREE MEMORY + */ mpt_disable_ints(mpt); } @@ -2337,226 +2326,229 @@ * once at instance startup. */ static int -mpt_configure_ioc(struct mpt_softc *mpt) +mpt_configure_ioc(struct mpt_softc *mpt, int tn, int needreset) { - MSG_PORT_FACTS_REPLY pfp; - MSG_IOC_FACTS_REPLY facts; - int try; - int needreset; - uint32_t max_chain_depth; + PTR_MSG_PORT_FACTS_REPLY pfp; + int error, port; + size_t len; - needreset = 0; - for (try = 0; try < MPT_MAX_TRYS; try++) { + if (tn == MPT_MAX_TRYS) { + return (-1); + } - /* - * No need to reset if the IOC is already in the READY state. - * - * Force reset if initialization failed previously. - * Note that a hard_reset of the second channel of a '929 - * will stop operation of the first channel. Hopefully, if the - * first channel is ok, the second will not require a hard - * reset. - */ - if (needreset || MPT_STATE(mpt_rd_db(mpt)) != - MPT_DB_STATE_READY) { - if (mpt_reset(mpt, FALSE) != MPT_OK) { - continue; - } + /* + * No need to reset if the IOC is already in the READY state. + * + * Force reset if initialization failed previously. + * Note that a hard_reset of the second channel of a '929 + * will stop operation of the first channel. Hopefully, if the + * first channel is ok, the second will not require a hard + * reset. + */ + if (needreset || MPT_STATE(mpt_rd_db(mpt)) != MPT_DB_STATE_READY) { + if (mpt_reset(mpt, FALSE) != MPT_OK) { + return (mpt_configure_ioc(mpt, tn++, 1)); } needreset = 0; + } - if (mpt_get_iocfacts(mpt, &facts) != MPT_OK) { - mpt_prt(mpt, "mpt_get_iocfacts failed\n"); - needreset = 1; - continue; - } + if (mpt_get_iocfacts(mpt, &mpt->ioc_facts) != MPT_OK) { + mpt_prt(mpt, "mpt_get_iocfacts failed\n"); + return (mpt_configure_ioc(mpt, tn++, 1)); + } + mpt2host_iocfacts_reply(&mpt->ioc_facts); - mpt->mpt_global_credits = le16toh(facts.GlobalCredits); - mpt->request_frame_size = le16toh(facts.RequestFrameSize); - mpt->ioc_facts_flags = facts.Flags; - mpt_prt(mpt, "MPI Version=%d.%d.%d.%d\n", - le16toh(facts.MsgVersion) >> 8, - le16toh(facts.MsgVersion) & 0xFF, - le16toh(facts.HeaderVersion) >> 8, - le16toh(facts.HeaderVersion) & 0xFF); + mpt_prt(mpt, "MPI Version=%d.%d.%d.%d\n", + mpt->ioc_facts.MsgVersion >> 8, + mpt->ioc_facts.MsgVersion & 0xFF, + mpt->ioc_facts.HeaderVersion >> 8, + mpt->ioc_facts.HeaderVersion & 0xFF); - /* - * Now that we know request frame size, we can calculate - * the actual (reasonable) segment limit for read/write I/O. - * - * This limit is constrained by: - * - * + The size of each area we allocate per command (and how - * many chain segments we can fit into it). - * + The total number of areas we've set up. - * + The actual chain depth the card will allow. - * - * The first area's segment count is limited by the I/O request - * at the head of it. We cannot allocate realistically more - * than MPT_MAX_REQUESTS areas. Therefore, to account for both - * conditions, we'll just start out with MPT_MAX_REQUESTS-2. - * - */ - max_chain_depth = facts.MaxChainDepth; + /* + * Now that we know request frame size, we can calculate + * the actual (reasonable) segment limit for read/write I/O. + * + * This limit is constrained by: + * + * + The size of each area we allocate per command (and how + * many chain segments we can fit into it). + * + The total number of areas we've set up. + * + The actual chain depth the card will allow. + * + * The first area's segment count is limited by the I/O request + * at the head of it. We cannot allocate realistically more + * than MPT_MAX_REQUESTS areas. Therefore, to account for both + * conditions, we'll just start out with MPT_MAX_REQUESTS-2. + * + */ + /* total number of request areas we (can) allocate */ + mpt->max_seg_cnt = MPT_MAX_REQUESTS(mpt) - 2; - /* total number of request areas we (can) allocate */ - mpt->max_seg_cnt = MPT_MAX_REQUESTS(mpt) - 2; + /* converted to the number of chain areas possible */ + mpt->max_seg_cnt *= MPT_NRFM(mpt); - /* converted to the number of chain areas possible */ - mpt->max_seg_cnt *= MPT_NRFM(mpt); + /* limited by the number of chain areas the card will support */ + if (mpt->max_seg_cnt > mpt->ioc_facts.MaxChainDepth) { + mpt_lprt(mpt, MPT_PRT_DEBUG, + "chain depth limited to %u (from %u)\n", + mpt->ioc_facts.MaxChainDepth, mpt->max_seg_cnt); + mpt->max_seg_cnt = mpt->ioc_facts.MaxChainDepth; + } - /* limited by the number of chain areas the card will support */ - if (mpt->max_seg_cnt > max_chain_depth) { - mpt_lprt(mpt, MPT_PRT_DEBUG, - "chain depth limited to %u (from %u)\n", - max_chain_depth, mpt->max_seg_cnt); - mpt->max_seg_cnt = max_chain_depth; - } + /* converted to the number of simple sges in chain segments. */ + mpt->max_seg_cnt *= (MPT_NSGL(mpt) - 1); - /* converted to the number of simple sges in chain segments. */ - mpt->max_seg_cnt *= (MPT_NSGL(mpt) - 1); + mpt_lprt(mpt, MPT_PRT_DEBUG, "Maximum Segment Count: %u\n", + mpt->max_seg_cnt); + mpt_lprt(mpt, MPT_PRT_DEBUG, "MsgLength=%u IOCNumber = %d\n", + mpt->ioc_facts.MsgLength, mpt->ioc_facts.IOCNumber); + mpt_lprt(mpt, MPT_PRT_DEBUG, + "IOCFACTS: GlobalCredits=%d BlockSize=%u bytes " + "Request Frame Size %u bytes Max Chain Depth %u\n", + mpt->ioc_facts.GlobalCredits, mpt->ioc_facts.BlockSize, + mpt->ioc_facts.RequestFrameSize << 2, + mpt->ioc_facts.MaxChainDepth); + mpt_lprt(mpt, MPT_PRT_DEBUG, "IOCFACTS: Num Ports %d, FWImageSize %d, " + "Flags=%#x\n", mpt->ioc_facts.NumberOfPorts, + mpt->ioc_facts.FWImageSize, mpt->ioc_facts.Flags); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "Maximum Segment Count: %u\n", mpt->max_seg_cnt); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "MsgLength=%u IOCNumber = %d\n", - facts.MsgLength, facts.IOCNumber); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "IOCFACTS: GlobalCredits=%d BlockSize=%u bytes " - "Request Frame Size %u bytes Max Chain Depth %u\n", - mpt->mpt_global_credits, facts.BlockSize, - mpt->request_frame_size << 2, max_chain_depth); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "IOCFACTS: Num Ports %d, FWImageSize %d, " - "Flags=%#x\n", facts.NumberOfPorts, - le32toh(facts.FWImageSize), facts.Flags); + len = mpt->ioc_facts.NumberOfPorts * sizeof (MSG_PORT_FACTS_REPLY); + mpt->port_facts = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); + if (mpt->port_facts == NULL) { + mpt_prt(mpt, "unable to allocate memory for port facts\n"); + return (ENOMEM); + } - if ((facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) != 0) { - struct mpt_map_info mi; - int error; + if ((mpt->ioc_facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) && + (mpt->fw_uploaded == 0)) { + struct mpt_map_info mi; - /* - * In some configurations, the IOC's firmware is - * stored in a shared piece of system NVRAM that - * is only accessable via the BIOS. In this - * case, the firmware keeps a copy of firmware in - * RAM until the OS driver retrieves it. Once - * retrieved, we are responsible for re-downloading - * the firmware after any hard-reset. - */ - mpt->fw_image_size = le32toh(facts.FWImageSize); - error = mpt_dma_tag_create(mpt, mpt->parent_dmat, - /*alignment*/1, /*boundary*/0, - /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, - /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, - /*filterarg*/NULL, mpt->fw_image_size, - /*nsegments*/1, /*maxsegsz*/mpt->fw_image_size, - /*flags*/0, &mpt->fw_dmat); - if (error != 0) { - mpt_prt(mpt, "cannot create fw dma tag\n"); - return (ENOMEM); - } - error = bus_dmamem_alloc(mpt->fw_dmat, - (void **)&mpt->fw_image, BUS_DMA_NOWAIT, - &mpt->fw_dmap); - if (error != 0) { - mpt_prt(mpt, "cannot allocate fw mem.\n"); - bus_dma_tag_destroy(mpt->fw_dmat); - return (ENOMEM); - } - mi.mpt = mpt; - mi.error = 0; - bus_dmamap_load(mpt->fw_dmat, mpt->fw_dmap, - mpt->fw_image, mpt->fw_image_size, mpt_map_rquest, - &mi, 0); - mpt->fw_phys = mi.phys; - - error = mpt_upload_fw(mpt); - if (error != 0) { - mpt_prt(mpt, "fw upload failed.\n"); - bus_dmamap_unload(mpt->fw_dmat, mpt->fw_dmap); - bus_dmamem_free(mpt->fw_dmat, mpt->fw_image, - mpt->fw_dmap); - bus_dma_tag_destroy(mpt->fw_dmat); - mpt->fw_image = NULL; - return (EIO); - } + /* + * In some configurations, the IOC's firmware is + * stored in a shared piece of system NVRAM that + * is only accessable via the BIOS. In this + * case, the firmware keeps a copy of firmware in + * RAM until the OS driver retrieves it. Once + * retrieved, we are responsible for re-downloading + * the firmware after any hard-reset. + */ + mpt->fw_image_size = mpt->ioc_facts.FWImageSize; + error = mpt_dma_tag_create(mpt, mpt->parent_dmat, 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + mpt->fw_image_size, 1, mpt->fw_image_size, 0, + &mpt->fw_dmat); + if (error != 0) { + mpt_prt(mpt, "cannot create firmwarew dma tag\n"); + return (ENOMEM); + } + error = bus_dmamem_alloc(mpt->fw_dmat, + (void **)&mpt->fw_image, BUS_DMA_NOWAIT, &mpt->fw_dmap); + if (error != 0) { + mpt_prt(mpt, "cannot allocate firmware memory\n"); + bus_dma_tag_destroy(mpt->fw_dmat); + return (ENOMEM); } + mi.mpt = mpt; + mi.error = 0; + bus_dmamap_load(mpt->fw_dmat, mpt->fw_dmap, + mpt->fw_image, mpt->fw_image_size, mpt_map_rquest, &mi, 0); + mpt->fw_phys = mi.phys; - if (mpt_get_portfacts(mpt, &pfp) != MPT_OK) { - mpt_prt(mpt, "mpt_get_portfacts failed\n"); - needreset = 1; - continue; + error = mpt_upload_fw(mpt); + if (error != 0) { + mpt_prt(mpt, "firmware upload failed.\n"); + bus_dmamap_unload(mpt->fw_dmat, mpt->fw_dmap); + bus_dmamem_free(mpt->fw_dmat, mpt->fw_image, + mpt->fw_dmap); + bus_dma_tag_destroy(mpt->fw_dmat); + mpt->fw_image = NULL; + return (EIO); } + mpt->fw_uploaded = 1; + } - mpt_lprt(mpt, MPT_PRT_DEBUG, - "PORTFACTS: Type %x PFlags %x IID %d MaxDev %d\n", - pfp.PortType, pfp.ProtocolFlags, pfp.PortSCSIID, - pfp.MaxDevices); - - mpt->mpt_port_type = pfp.PortType; - mpt->mpt_proto_flags = le16toh(pfp.ProtocolFlags); - if (pfp.PortType != MPI_PORTFACTS_PORTTYPE_SCSI && - pfp.PortType != MPI_PORTFACTS_PORTTYPE_SAS && - pfp.PortType != MPI_PORTFACTS_PORTTYPE_FC) { - mpt_prt(mpt, "Unsupported Port Type (%x)\n", - pfp.PortType); - return (ENXIO); + for (port = 0; port < mpt->ioc_facts.NumberOfPorts; port++) { + pfp = &mpt->port_facts[port]; + error = mpt_get_portfacts(mpt, 0, pfp); + if (error != MPT_OK) { + mpt_prt(mpt, + "mpt_get_portfacts on port %d failed\n", port); + free(mpt->port_facts, M_DEVBUF); + mpt->port_facts = NULL; + return (mpt_configure_ioc(mpt, tn++, 1)); } - mpt->mpt_max_tgtcmds = le16toh(pfp.MaxPostedCmdBuffers); + mpt2host_portfacts_reply(pfp); - if (pfp.PortType == MPI_PORTFACTS_PORTTYPE_FC) { - mpt->is_fc = 1; - mpt->is_sas = 0; - mpt->is_spi = 0; - } else if (pfp.PortType == MPI_PORTFACTS_PORTTYPE_SAS) { - mpt->is_fc = 0; - mpt->is_sas = 1; - mpt->is_spi = 0; + if (port > 0) { + error = MPT_PRT_INFO; } else { - mpt->is_fc = 0; - mpt->is_sas = 0; - mpt->is_spi = 1; + error = MPT_PRT_DEBUG; } - mpt->mpt_ini_id = pfp.PortSCSIID; - mpt->mpt_max_devices = pfp.MaxDevices; + mpt_lprt(mpt, error, + "PORTFACTS[%d]: Type %x PFlags %x IID %d MaxDev %d\n", + port, pfp->PortType, pfp->ProtocolFlags, pfp->PortSCSIID, + pfp->MaxDevices); - /* - * Set our role with what this port supports. - * - * Note this might be changed later in different modules - * if this is different from what is wanted. - */ - mpt->role = MPT_ROLE_NONE; - if (mpt->mpt_proto_flags & MPI_PORTFACTS_PROTOCOL_INITIATOR) { - mpt->role |= MPT_ROLE_INITIATOR; - } - if (mpt->mpt_proto_flags & MPI_PORTFACTS_PROTOCOL_TARGET) { - mpt->role |= MPT_ROLE_TARGET; - } - if (mpt_enable_ioc(mpt, 0) != MPT_OK) { - mpt_prt(mpt, "unable to initialize IOC\n"); - return (ENXIO); - } + } - /* - * Read IOC configuration information. - * - * We need this to determine whether or not we have certain - * settings for Integrated Mirroring (e.g.). - */ - mpt_read_config_info_ioc(mpt); + /* + * XXX: Not yet supporting more than port 0 + */ + pfp = &mpt->port_facts[0]; + if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_FC) { + mpt->is_fc = 1; + mpt->is_sas = 0; + mpt->is_spi = 0; + } else if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_SAS) { + mpt->is_fc = 0; + mpt->is_sas = 1; + mpt->is_spi = 0; + } else if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_SCSI) { + mpt->is_fc = 0; + mpt->is_sas = 0; + mpt->is_spi = 1; + } else if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_ISCSI) { + mpt_prt(mpt, "iSCSI not supported yet\n"); + return (ENXIO); + } else if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_INACTIVE) { + mpt_prt(mpt, "Inactive Port\n"); + return (ENXIO); + } else { + mpt_prt(mpt, "unknown Port Type %#x\n", pfp->PortType); + return (ENXIO); + } - /* Everything worked */ - break; + /* + * Set our role with what this port supports. + * + * Note this might be changed later in different modules + * if this is different from what is wanted. + */ + mpt->role = MPT_ROLE_NONE; + if (pfp->ProtocolFlags & MPI_PORTFACTS_PROTOCOL_INITIATOR) { + mpt->role |= MPT_ROLE_INITIATOR; + } + if (pfp->ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) { + mpt->role |= MPT_ROLE_TARGET; } - if (try >= MPT_MAX_TRYS) { - mpt_prt(mpt, "failed to initialize IOC"); - return (EIO); + /* + * Enable the IOC + */ + if (mpt_enable_ioc(mpt, 0) != MPT_OK) { + mpt_prt(mpt, "unable to initialize IOC\n"); + return (ENXIO); } + /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:10: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 1A0F516A575; Sun, 10 Dec 2006 23:10:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8DC9816A572 for ; Sun, 10 Dec 2006 23:10:21 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1518343D92 for ; Sun, 10 Dec 2006 23:08:33 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBAN9jcn064816 for ; Sun, 10 Dec 2006 23:09:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBAN9eKs064725 for perforce@freebsd.org; Sun, 10 Dec 2006 23:09:40 GMT (envelope-from marcel@freebsd.org) Date: Sun, 10 Dec 2006 23:09:40 GMT Message-Id: <200612102309.kBAN9eKs064725@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 111410 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, 10 Dec 2006 23:10:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=111410 Change 111410 by marcel@marcel_cluster on 2006/12/10 23:00:16 IFC @111401 Affected files ... .. //depot/projects/powerpc/COPYRIGHT#1 branch .. //depot/projects/powerpc/LOCKS#1 branch .. //depot/projects/powerpc/MAINTAINERS#1 branch .. //depot/projects/powerpc/Makefile#1 branch .. //depot/projects/powerpc/Makefile.inc1#1 branch .. //depot/projects/powerpc/ObsoleteFiles.inc#1 branch .. //depot/projects/powerpc/README#1 branch .. //depot/projects/powerpc/UPDATING#1 branch .. //depot/projects/powerpc/bin/Makefile#1 branch .. //depot/projects/powerpc/bin/Makefile.inc#1 branch .. //depot/projects/powerpc/bin/cat/Makefile#1 branch .. //depot/projects/powerpc/bin/cat/cat.1#1 branch .. //depot/projects/powerpc/bin/cat/cat.c#1 branch .. //depot/projects/powerpc/bin/chflags/Makefile#1 branch .. //depot/projects/powerpc/bin/chflags/chflags.1#1 branch .. //depot/projects/powerpc/bin/chflags/chflags.c#1 branch .. //depot/projects/powerpc/bin/chio/Makefile#1 branch .. //depot/projects/powerpc/bin/chio/chio.1#1 branch .. //depot/projects/powerpc/bin/chio/chio.c#1 branch .. //depot/projects/powerpc/bin/chio/defs.h#1 branch .. //depot/projects/powerpc/bin/chio/pathnames.h#1 branch .. //depot/projects/powerpc/bin/chmod/Makefile#1 branch .. //depot/projects/powerpc/bin/chmod/chmod.1#1 branch .. //depot/projects/powerpc/bin/chmod/chmod.c#1 branch .. //depot/projects/powerpc/bin/cp/Makefile#1 branch .. //depot/projects/powerpc/bin/cp/cp.1#1 branch .. //depot/projects/powerpc/bin/cp/cp.c#1 branch .. //depot/projects/powerpc/bin/cp/extern.h#1 branch .. //depot/projects/powerpc/bin/cp/utils.c#1 branch .. //depot/projects/powerpc/bin/csh/Makefile#1 branch .. //depot/projects/powerpc/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/powerpc/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/powerpc/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/powerpc/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/powerpc/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/powerpc/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/powerpc/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/powerpc/bin/csh/config.h#1 branch .. //depot/projects/powerpc/bin/csh/config_p.h#1 branch .. //depot/projects/powerpc/bin/csh/host.defs#1 branch .. //depot/projects/powerpc/bin/csh/iconv.h#1 branch .. //depot/projects/powerpc/bin/csh/iconv_stub.c#1 branch .. //depot/projects/powerpc/bin/date/Makefile#1 branch .. //depot/projects/powerpc/bin/date/date.1#1 branch .. //depot/projects/powerpc/bin/date/date.c#1 branch .. //depot/projects/powerpc/bin/date/extern.h#1 branch .. //depot/projects/powerpc/bin/date/netdate.c#1 branch .. //depot/projects/powerpc/bin/date/vary.c#1 branch .. //depot/projects/powerpc/bin/date/vary.h#1 branch .. //depot/projects/powerpc/bin/dd/Makefile#1 branch .. //depot/projects/powerpc/bin/dd/args.c#1 branch .. //depot/projects/powerpc/bin/dd/conv.c#1 branch .. //depot/projects/powerpc/bin/dd/conv_tab.c#1 branch .. //depot/projects/powerpc/bin/dd/dd.1#1 branch .. //depot/projects/powerpc/bin/dd/dd.c#1 branch .. //depot/projects/powerpc/bin/dd/dd.h#1 branch .. //depot/projects/powerpc/bin/dd/extern.h#1 branch .. //depot/projects/powerpc/bin/dd/gen.c#1 branch .. //depot/projects/powerpc/bin/dd/misc.c#1 branch .. //depot/projects/powerpc/bin/dd/position.c#1 branch .. //depot/projects/powerpc/bin/dd/ref.ascii#1 branch .. //depot/projects/powerpc/bin/dd/ref.ebcdic#1 branch .. //depot/projects/powerpc/bin/dd/ref.ibm#1 branch .. //depot/projects/powerpc/bin/dd/ref.lcase#1 branch .. //depot/projects/powerpc/bin/dd/ref.oldascii#1 branch .. //depot/projects/powerpc/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/powerpc/bin/dd/ref.oldibm#1 branch .. //depot/projects/powerpc/bin/dd/ref.pareven#1 branch .. //depot/projects/powerpc/bin/dd/ref.parnone#1 branch .. //depot/projects/powerpc/bin/dd/ref.parodd#1 branch .. //depot/projects/powerpc/bin/dd/ref.parset#1 branch .. //depot/projects/powerpc/bin/dd/ref.swab#1 branch .. //depot/projects/powerpc/bin/dd/ref.ucase#1 branch .. //depot/projects/powerpc/bin/df/Makefile#1 branch .. //depot/projects/powerpc/bin/df/df.1#1 branch .. //depot/projects/powerpc/bin/df/df.c#1 branch .. //depot/projects/powerpc/bin/domainname/Makefile#1 branch .. //depot/projects/powerpc/bin/domainname/domainname.1#1 branch .. //depot/projects/powerpc/bin/domainname/domainname.c#1 branch .. //depot/projects/powerpc/bin/echo/Makefile#1 branch .. //depot/projects/powerpc/bin/echo/echo.1#1 branch .. //depot/projects/powerpc/bin/echo/echo.c#1 branch .. //depot/projects/powerpc/bin/ed/Makefile#1 branch .. //depot/projects/powerpc/bin/ed/POSIX#1 branch .. //depot/projects/powerpc/bin/ed/README#1 branch .. //depot/projects/powerpc/bin/ed/buf.c#1 branch .. //depot/projects/powerpc/bin/ed/cbc.c#1 branch .. //depot/projects/powerpc/bin/ed/ed.1#1 branch .. //depot/projects/powerpc/bin/ed/ed.h#1 branch .. //depot/projects/powerpc/bin/ed/glbl.c#1 branch .. //depot/projects/powerpc/bin/ed/io.c#1 branch .. //depot/projects/powerpc/bin/ed/main.c#1 branch .. //depot/projects/powerpc/bin/ed/re.c#1 branch .. //depot/projects/powerpc/bin/ed/sub.c#1 branch .. //depot/projects/powerpc/bin/ed/test/=.err#1 branch .. //depot/projects/powerpc/bin/ed/test/Makefile#1 branch .. //depot/projects/powerpc/bin/ed/test/README#1 branch .. //depot/projects/powerpc/bin/ed/test/TODO#1 branch .. //depot/projects/powerpc/bin/ed/test/a.d#1 branch .. //depot/projects/powerpc/bin/ed/test/a.r#1 branch .. //depot/projects/powerpc/bin/ed/test/a.t#1 branch .. //depot/projects/powerpc/bin/ed/test/a1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/a2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/addr.d#1 branch .. //depot/projects/powerpc/bin/ed/test/addr.r#1 branch .. //depot/projects/powerpc/bin/ed/test/addr.t#1 branch .. //depot/projects/powerpc/bin/ed/test/addr1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/addr2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/powerpc/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/powerpc/bin/ed/test/ascii.t#1 branch .. //depot/projects/powerpc/bin/ed/test/bang1.d#1 branch .. //depot/projects/powerpc/bin/ed/test/bang1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/bang1.r#1 branch .. //depot/projects/powerpc/bin/ed/test/bang1.t#1 branch .. //depot/projects/powerpc/bin/ed/test/bang2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/c.d#1 branch .. //depot/projects/powerpc/bin/ed/test/c.r#1 branch .. //depot/projects/powerpc/bin/ed/test/c.t#1 branch .. //depot/projects/powerpc/bin/ed/test/c1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/c2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/powerpc/bin/ed/test/d.d#1 branch .. //depot/projects/powerpc/bin/ed/test/d.err#1 branch .. //depot/projects/powerpc/bin/ed/test/d.r#1 branch .. //depot/projects/powerpc/bin/ed/test/d.t#1 branch .. //depot/projects/powerpc/bin/ed/test/e1.d#1 branch .. //depot/projects/powerpc/bin/ed/test/e1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/e1.r#1 branch .. //depot/projects/powerpc/bin/ed/test/e1.t#1 branch .. //depot/projects/powerpc/bin/ed/test/e2.d#1 branch .. //depot/projects/powerpc/bin/ed/test/e2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/e2.r#1 branch .. //depot/projects/powerpc/bin/ed/test/e2.t#1 branch .. //depot/projects/powerpc/bin/ed/test/e3.d#1 branch .. //depot/projects/powerpc/bin/ed/test/e3.err#1 branch .. //depot/projects/powerpc/bin/ed/test/e3.r#1 branch .. //depot/projects/powerpc/bin/ed/test/e3.t#1 branch .. //depot/projects/powerpc/bin/ed/test/e4.d#1 branch .. //depot/projects/powerpc/bin/ed/test/e4.r#1 branch .. //depot/projects/powerpc/bin/ed/test/e4.t#1 branch .. //depot/projects/powerpc/bin/ed/test/f1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/f2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/g1.d#1 branch .. //depot/projects/powerpc/bin/ed/test/g1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/g1.r#1 branch .. //depot/projects/powerpc/bin/ed/test/g1.t#1 branch .. //depot/projects/powerpc/bin/ed/test/g2.d#1 branch .. //depot/projects/powerpc/bin/ed/test/g2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/g2.r#1 branch .. //depot/projects/powerpc/bin/ed/test/g2.t#1 branch .. //depot/projects/powerpc/bin/ed/test/g3.d#1 branch .. //depot/projects/powerpc/bin/ed/test/g3.err#1 branch .. //depot/projects/powerpc/bin/ed/test/g3.r#1 branch .. //depot/projects/powerpc/bin/ed/test/g3.t#1 branch .. //depot/projects/powerpc/bin/ed/test/g4.d#1 branch .. //depot/projects/powerpc/bin/ed/test/g4.r#1 branch .. //depot/projects/powerpc/bin/ed/test/g4.t#1 branch .. //depot/projects/powerpc/bin/ed/test/g5.d#1 branch .. //depot/projects/powerpc/bin/ed/test/g5.r#1 branch .. //depot/projects/powerpc/bin/ed/test/g5.t#1 branch .. //depot/projects/powerpc/bin/ed/test/h.err#1 branch .. //depot/projects/powerpc/bin/ed/test/i.d#1 branch .. //depot/projects/powerpc/bin/ed/test/i.r#1 branch .. //depot/projects/powerpc/bin/ed/test/i.t#1 branch .. //depot/projects/powerpc/bin/ed/test/i1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/i2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/i3.err#1 branch .. //depot/projects/powerpc/bin/ed/test/j.d#1 branch .. //depot/projects/powerpc/bin/ed/test/j.r#1 branch .. //depot/projects/powerpc/bin/ed/test/j.t#1 branch .. //depot/projects/powerpc/bin/ed/test/k.d#1 branch .. //depot/projects/powerpc/bin/ed/test/k.r#1 branch .. //depot/projects/powerpc/bin/ed/test/k.t#1 branch .. //depot/projects/powerpc/bin/ed/test/k1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/k2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/k3.err#1 branch .. //depot/projects/powerpc/bin/ed/test/k4.err#1 branch .. //depot/projects/powerpc/bin/ed/test/l.d#1 branch .. //depot/projects/powerpc/bin/ed/test/l.r#1 branch .. //depot/projects/powerpc/bin/ed/test/l.t#1 branch .. //depot/projects/powerpc/bin/ed/test/m.d#1 branch .. //depot/projects/powerpc/bin/ed/test/m.err#1 branch .. //depot/projects/powerpc/bin/ed/test/m.r#1 branch .. //depot/projects/powerpc/bin/ed/test/m.t#1 branch .. //depot/projects/powerpc/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/powerpc/bin/ed/test/n.d#1 branch .. //depot/projects/powerpc/bin/ed/test/n.r#1 branch .. //depot/projects/powerpc/bin/ed/test/n.t#1 branch .. //depot/projects/powerpc/bin/ed/test/nl.err#1 branch .. //depot/projects/powerpc/bin/ed/test/nl1.d#1 branch .. //depot/projects/powerpc/bin/ed/test/nl1.r#1 branch .. //depot/projects/powerpc/bin/ed/test/nl1.t#1 branch .. //depot/projects/powerpc/bin/ed/test/nl2.d#1 branch .. //depot/projects/powerpc/bin/ed/test/nl2.r#1 branch .. //depot/projects/powerpc/bin/ed/test/nl2.t#1 branch .. //depot/projects/powerpc/bin/ed/test/p.d#1 branch .. //depot/projects/powerpc/bin/ed/test/p.r#1 branch .. //depot/projects/powerpc/bin/ed/test/p.t#1 branch .. //depot/projects/powerpc/bin/ed/test/q.d#1 branch .. //depot/projects/powerpc/bin/ed/test/q.r#1 branch .. //depot/projects/powerpc/bin/ed/test/q.t#1 branch .. //depot/projects/powerpc/bin/ed/test/q1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/r1.d#1 branch .. //depot/projects/powerpc/bin/ed/test/r1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/r1.r#1 branch .. //depot/projects/powerpc/bin/ed/test/r1.t#1 branch .. //depot/projects/powerpc/bin/ed/test/r2.d#1 branch .. //depot/projects/powerpc/bin/ed/test/r2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/r2.r#1 branch .. //depot/projects/powerpc/bin/ed/test/r2.t#1 branch .. //depot/projects/powerpc/bin/ed/test/r3.d#1 branch .. //depot/projects/powerpc/bin/ed/test/r3.r#1 branch .. //depot/projects/powerpc/bin/ed/test/r3.t#1 branch .. //depot/projects/powerpc/bin/ed/test/s1.d#1 branch .. //depot/projects/powerpc/bin/ed/test/s1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s1.r#1 branch .. //depot/projects/powerpc/bin/ed/test/s1.t#1 branch .. //depot/projects/powerpc/bin/ed/test/s10.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s2.d#1 branch .. //depot/projects/powerpc/bin/ed/test/s2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s2.r#1 branch .. //depot/projects/powerpc/bin/ed/test/s2.t#1 branch .. //depot/projects/powerpc/bin/ed/test/s3.d#1 branch .. //depot/projects/powerpc/bin/ed/test/s3.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s3.r#1 branch .. //depot/projects/powerpc/bin/ed/test/s3.t#1 branch .. //depot/projects/powerpc/bin/ed/test/s4.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s5.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s6.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s7.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s8.err#1 branch .. //depot/projects/powerpc/bin/ed/test/s9.err#1 branch .. //depot/projects/powerpc/bin/ed/test/t.d#1 branch .. //depot/projects/powerpc/bin/ed/test/t.r#1 branch .. //depot/projects/powerpc/bin/ed/test/t1.d#1 branch .. //depot/projects/powerpc/bin/ed/test/t1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/t1.r#1 branch .. //depot/projects/powerpc/bin/ed/test/t1.t#1 branch .. //depot/projects/powerpc/bin/ed/test/t2.d#1 branch .. //depot/projects/powerpc/bin/ed/test/t2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/t2.r#1 branch .. //depot/projects/powerpc/bin/ed/test/t2.t#1 branch .. //depot/projects/powerpc/bin/ed/test/u.d#1 branch .. //depot/projects/powerpc/bin/ed/test/u.err#1 branch .. //depot/projects/powerpc/bin/ed/test/u.r#1 branch .. //depot/projects/powerpc/bin/ed/test/u.t#1 branch .. //depot/projects/powerpc/bin/ed/test/v.d#1 branch .. //depot/projects/powerpc/bin/ed/test/v.r#1 branch .. //depot/projects/powerpc/bin/ed/test/v.t#1 branch .. //depot/projects/powerpc/bin/ed/test/w.d#1 branch .. //depot/projects/powerpc/bin/ed/test/w.r#1 branch .. //depot/projects/powerpc/bin/ed/test/w.t#1 branch .. //depot/projects/powerpc/bin/ed/test/w1.err#1 branch .. //depot/projects/powerpc/bin/ed/test/w2.err#1 branch .. //depot/projects/powerpc/bin/ed/test/w3.err#1 branch .. //depot/projects/powerpc/bin/ed/test/x.err#1 branch .. //depot/projects/powerpc/bin/ed/test/z.err#1 branch .. //depot/projects/powerpc/bin/ed/undo.c#1 branch .. //depot/projects/powerpc/bin/expr/Makefile#1 branch .. //depot/projects/powerpc/bin/expr/expr.1#1 branch .. //depot/projects/powerpc/bin/expr/expr.y#1 branch .. //depot/projects/powerpc/bin/getfacl/Makefile#1 branch .. //depot/projects/powerpc/bin/getfacl/getfacl.1#1 branch .. //depot/projects/powerpc/bin/getfacl/getfacl.c#1 branch .. //depot/projects/powerpc/bin/hostname/Makefile#1 branch .. //depot/projects/powerpc/bin/hostname/hostname.1#1 branch .. //depot/projects/powerpc/bin/hostname/hostname.c#1 branch .. //depot/projects/powerpc/bin/kenv/Makefile#1 branch .. //depot/projects/powerpc/bin/kenv/kenv.1#1 branch .. //depot/projects/powerpc/bin/kenv/kenv.c#1 branch .. //depot/projects/powerpc/bin/kill/Makefile#1 branch .. //depot/projects/powerpc/bin/kill/kill.1#1 branch .. //depot/projects/powerpc/bin/kill/kill.c#1 branch .. //depot/projects/powerpc/bin/ln/Makefile#1 branch .. //depot/projects/powerpc/bin/ln/ln.1#1 branch .. //depot/projects/powerpc/bin/ln/ln.c#1 branch .. //depot/projects/powerpc/bin/ln/symlink.7#1 branch .. //depot/projects/powerpc/bin/ls/Makefile#1 branch .. //depot/projects/powerpc/bin/ls/cmp.c#1 branch .. //depot/projects/powerpc/bin/ls/extern.h#1 branch .. //depot/projects/powerpc/bin/ls/ls.1#1 branch .. //depot/projects/powerpc/bin/ls/ls.c#1 branch .. //depot/projects/powerpc/bin/ls/ls.h#1 branch .. //depot/projects/powerpc/bin/ls/print.c#1 branch .. //depot/projects/powerpc/bin/ls/util.c#1 branch .. //depot/projects/powerpc/bin/mkdir/Makefile#1 branch .. //depot/projects/powerpc/bin/mkdir/mkdir.1#1 branch .. //depot/projects/powerpc/bin/mkdir/mkdir.c#1 branch .. //depot/projects/powerpc/bin/mv/Makefile#1 branch .. //depot/projects/powerpc/bin/mv/mv.1#1 branch .. //depot/projects/powerpc/bin/mv/mv.c#1 branch .. //depot/projects/powerpc/bin/pax/Makefile#1 branch .. //depot/projects/powerpc/bin/pax/ar_io.c#1 branch .. //depot/projects/powerpc/bin/pax/ar_subs.c#1 branch .. //depot/projects/powerpc/bin/pax/buf_subs.c#1 branch .. //depot/projects/powerpc/bin/pax/cache.c#1 branch .. //depot/projects/powerpc/bin/pax/cache.h#1 branch .. //depot/projects/powerpc/bin/pax/cpio.1#1 branch .. //depot/projects/powerpc/bin/pax/cpio.c#1 branch .. //depot/projects/powerpc/bin/pax/cpio.h#1 branch .. //depot/projects/powerpc/bin/pax/extern.h#1 branch .. //depot/projects/powerpc/bin/pax/file_subs.c#1 branch .. //depot/projects/powerpc/bin/pax/ftree.c#1 branch .. //depot/projects/powerpc/bin/pax/ftree.h#1 branch .. //depot/projects/powerpc/bin/pax/gen_subs.c#1 branch .. //depot/projects/powerpc/bin/pax/getoldopt.c#1 branch .. //depot/projects/powerpc/bin/pax/options.c#1 branch .. //depot/projects/powerpc/bin/pax/options.h#1 branch .. //depot/projects/powerpc/bin/pax/pat_rep.c#1 branch .. //depot/projects/powerpc/bin/pax/pat_rep.h#1 branch .. //depot/projects/powerpc/bin/pax/pax.1#1 branch .. //depot/projects/powerpc/bin/pax/pax.c#1 branch .. //depot/projects/powerpc/bin/pax/pax.h#1 branch .. //depot/projects/powerpc/bin/pax/sel_subs.c#1 branch .. //depot/projects/powerpc/bin/pax/sel_subs.h#1 branch .. //depot/projects/powerpc/bin/pax/tables.c#1 branch .. //depot/projects/powerpc/bin/pax/tables.h#1 branch .. //depot/projects/powerpc/bin/pax/tar.1#1 branch .. //depot/projects/powerpc/bin/pax/tar.c#1 branch .. //depot/projects/powerpc/bin/pax/tar.h#1 branch .. //depot/projects/powerpc/bin/pax/tty_subs.c#1 branch .. //depot/projects/powerpc/bin/ps/Makefile#1 branch .. //depot/projects/powerpc/bin/ps/extern.h#1 branch .. //depot/projects/powerpc/bin/ps/fmt.c#1 branch .. //depot/projects/powerpc/bin/ps/keyword.c#1 branch .. //depot/projects/powerpc/bin/ps/nlist.c#1 branch .. //depot/projects/powerpc/bin/ps/print.c#1 branch .. //depot/projects/powerpc/bin/ps/ps.1#1 branch .. //depot/projects/powerpc/bin/ps/ps.c#1 branch .. //depot/projects/powerpc/bin/ps/ps.h#1 branch .. //depot/projects/powerpc/bin/pwd/Makefile#1 branch .. //depot/projects/powerpc/bin/pwd/pwd.1#1 branch .. //depot/projects/powerpc/bin/pwd/pwd.c#1 branch .. //depot/projects/powerpc/bin/rcp/Makefile#1 branch .. //depot/projects/powerpc/bin/rcp/extern.h#1 branch .. //depot/projects/powerpc/bin/rcp/rcp.1#1 branch .. //depot/projects/powerpc/bin/rcp/rcp.c#1 branch .. //depot/projects/powerpc/bin/rcp/util.c#1 branch .. //depot/projects/powerpc/bin/realpath/Makefile#1 branch .. //depot/projects/powerpc/bin/realpath/realpath.1#1 branch .. //depot/projects/powerpc/bin/realpath/realpath.c#1 branch .. //depot/projects/powerpc/bin/rm/Makefile#1 branch .. //depot/projects/powerpc/bin/rm/rm.1#1 branch .. //depot/projects/powerpc/bin/rm/rm.c#1 branch .. //depot/projects/powerpc/bin/rmail/Makefile#1 branch .. //depot/projects/powerpc/bin/rmdir/Makefile#1 branch .. //depot/projects/powerpc/bin/rmdir/rmdir.1#1 branch .. //depot/projects/powerpc/bin/rmdir/rmdir.c#1 branch .. //depot/projects/powerpc/bin/setfacl/Makefile#1 branch .. //depot/projects/powerpc/bin/setfacl/file.c#1 branch .. //depot/projects/powerpc/bin/setfacl/mask.c#1 branch .. //depot/projects/powerpc/bin/setfacl/merge.c#1 branch .. //depot/projects/powerpc/bin/setfacl/remove.c#1 branch .. //depot/projects/powerpc/bin/setfacl/setfacl.1#1 branch .. //depot/projects/powerpc/bin/setfacl/setfacl.c#1 branch .. //depot/projects/powerpc/bin/setfacl/setfacl.h#1 branch .. //depot/projects/powerpc/bin/setfacl/util.c#1 branch .. //depot/projects/powerpc/bin/sh/Makefile#1 branch .. //depot/projects/powerpc/bin/sh/TOUR#1 branch .. //depot/projects/powerpc/bin/sh/alias.c#1 branch .. //depot/projects/powerpc/bin/sh/alias.h#1 branch .. //depot/projects/powerpc/bin/sh/arith.h#1 branch .. //depot/projects/powerpc/bin/sh/arith.y#1 branch .. //depot/projects/powerpc/bin/sh/arith_lex.l#1 branch .. //depot/projects/powerpc/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/powerpc/bin/sh/bltin/echo.1#1 branch .. //depot/projects/powerpc/bin/sh/bltin/echo.c#1 branch .. //depot/projects/powerpc/bin/sh/builtins.def#1 branch .. //depot/projects/powerpc/bin/sh/cd.c#1 branch .. //depot/projects/powerpc/bin/sh/cd.h#1 branch .. //depot/projects/powerpc/bin/sh/error.c#1 branch .. //depot/projects/powerpc/bin/sh/error.h#1 branch .. //depot/projects/powerpc/bin/sh/eval.c#1 branch .. //depot/projects/powerpc/bin/sh/eval.h#1 branch .. //depot/projects/powerpc/bin/sh/exec.c#1 branch .. //depot/projects/powerpc/bin/sh/exec.h#1 branch .. //depot/projects/powerpc/bin/sh/expand.c#1 branch .. //depot/projects/powerpc/bin/sh/expand.h#1 branch .. //depot/projects/powerpc/bin/sh/funcs/cmv#1 branch .. //depot/projects/powerpc/bin/sh/funcs/dirs#1 branch .. //depot/projects/powerpc/bin/sh/funcs/kill#1 branch .. //depot/projects/powerpc/bin/sh/funcs/login#1 branch .. //depot/projects/powerpc/bin/sh/funcs/newgrp#1 branch .. //depot/projects/powerpc/bin/sh/funcs/popd#1 branch .. //depot/projects/powerpc/bin/sh/funcs/pushd#1 branch .. //depot/projects/powerpc/bin/sh/funcs/suspend#1 branch .. //depot/projects/powerpc/bin/sh/histedit.c#1 branch .. //depot/projects/powerpc/bin/sh/init.h#1 branch .. //depot/projects/powerpc/bin/sh/input.c#1 branch .. //depot/projects/powerpc/bin/sh/input.h#1 branch .. //depot/projects/powerpc/bin/sh/jobs.c#1 branch .. //depot/projects/powerpc/bin/sh/jobs.h#1 branch .. //depot/projects/powerpc/bin/sh/mail.c#1 branch .. //depot/projects/powerpc/bin/sh/mail.h#1 branch .. //depot/projects/powerpc/bin/sh/main.c#1 branch .. //depot/projects/powerpc/bin/sh/main.h#1 branch .. //depot/projects/powerpc/bin/sh/memalloc.c#1 branch .. //depot/projects/powerpc/bin/sh/memalloc.h#1 branch .. //depot/projects/powerpc/bin/sh/miscbltin.c#1 branch .. //depot/projects/powerpc/bin/sh/mkbuiltins#1 branch .. //depot/projects/powerpc/bin/sh/mkinit.c#1 branch .. //depot/projects/powerpc/bin/sh/mknodes.c#1 branch .. //depot/projects/powerpc/bin/sh/mksyntax.c#1 branch .. //depot/projects/powerpc/bin/sh/mktokens#1 branch .. //depot/projects/powerpc/bin/sh/myhistedit.h#1 branch .. //depot/projects/powerpc/bin/sh/mystring.c#1 branch .. //depot/projects/powerpc/bin/sh/mystring.h#1 branch .. //depot/projects/powerpc/bin/sh/nodes.c.pat#1 branch .. //depot/projects/powerpc/bin/sh/nodetypes#1 branch .. //depot/projects/powerpc/bin/sh/options.c#1 branch .. //depot/projects/powerpc/bin/sh/options.h#1 branch .. //depot/projects/powerpc/bin/sh/output.c#1 branch .. //depot/projects/powerpc/bin/sh/output.h#1 branch .. //depot/projects/powerpc/bin/sh/parser.c#1 branch .. //depot/projects/powerpc/bin/sh/parser.h#1 branch .. //depot/projects/powerpc/bin/sh/redir.c#1 branch .. //depot/projects/powerpc/bin/sh/redir.h#1 branch .. //depot/projects/powerpc/bin/sh/sh.1#1 branch .. //depot/projects/powerpc/bin/sh/shell.h#1 branch .. //depot/projects/powerpc/bin/sh/show.c#1 branch .. //depot/projects/powerpc/bin/sh/show.h#1 branch .. //depot/projects/powerpc/bin/sh/trap.c#1 branch .. //depot/projects/powerpc/bin/sh/trap.h#1 branch .. //depot/projects/powerpc/bin/sh/var.c#1 branch .. //depot/projects/powerpc/bin/sh/var.h#1 branch .. //depot/projects/powerpc/bin/sleep/Makefile#1 branch .. //depot/projects/powerpc/bin/sleep/sleep.1#1 branch .. //depot/projects/powerpc/bin/sleep/sleep.c#1 branch .. //depot/projects/powerpc/bin/stty/Makefile#1 branch .. //depot/projects/powerpc/bin/stty/cchar.c#1 branch .. //depot/projects/powerpc/bin/stty/extern.h#1 branch .. //depot/projects/powerpc/bin/stty/gfmt.c#1 branch .. //depot/projects/powerpc/bin/stty/key.c#1 branch .. //depot/projects/powerpc/bin/stty/modes.c#1 branch .. //depot/projects/powerpc/bin/stty/print.c#1 branch .. //depot/projects/powerpc/bin/stty/stty.1#1 branch .. //depot/projects/powerpc/bin/stty/stty.c#1 branch .. //depot/projects/powerpc/bin/stty/stty.h#1 branch .. //depot/projects/powerpc/bin/stty/util.c#1 branch .. //depot/projects/powerpc/bin/sync/Makefile#1 branch .. //depot/projects/powerpc/bin/sync/sync.8#1 branch .. //depot/projects/powerpc/bin/sync/sync.c#1 branch .. //depot/projects/powerpc/bin/test/Makefile#1 branch .. //depot/projects/powerpc/bin/test/TEST.README#1 branch .. //depot/projects/powerpc/bin/test/TEST.csh#1 branch .. //depot/projects/powerpc/bin/test/TEST.sh#1 branch .. //depot/projects/powerpc/bin/test/test.1#1 branch .. //depot/projects/powerpc/bin/test/test.c#1 branch .. //depot/projects/powerpc/contrib/amd/AUTHORS#1 branch .. //depot/projects/powerpc/contrib/amd/BUGS#1 branch .. //depot/projects/powerpc/contrib/amd/COPYING#1 branch .. //depot/projects/powerpc/contrib/amd/ChangeLog#1 branch .. //depot/projects/powerpc/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/powerpc/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/powerpc/contrib/amd/INSTALL#1 branch .. //depot/projects/powerpc/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/powerpc/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/powerpc/contrib/amd/NEWS#1 branch .. //depot/projects/powerpc/contrib/amd/README#1 branch .. //depot/projects/powerpc/contrib/amd/README.ldap#1 branch .. //depot/projects/powerpc/contrib/amd/README.y2k#1 branch .. //depot/projects/powerpc/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amd.8#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amd.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amd.h#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/autil.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/clock.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/conf.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/powerpc/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/powerpc/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/map.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/opts.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/restart.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/sched.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/amq/amq.8#1 branch .. //depot/projects/powerpc/contrib/amd/amq/amq.c#1 branch .. //depot/projects/powerpc/contrib/amd/amq/amq.h#1 branch .. //depot/projects/powerpc/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/powerpc/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/powerpc/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/powerpc/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/powerpc/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/powerpc/contrib/amd/bootstrap#1 branch .. //depot/projects/powerpc/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/powerpc/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/powerpc/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/powerpc/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/powerpc/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/powerpc/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/powerpc/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/powerpc/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/powerpc/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/powerpc/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/powerpc/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/powerpc/contrib/amd/doc/version.texi#1 branch .. //depot/projects/powerpc/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/powerpc/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/powerpc/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/powerpc/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/powerpc/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/powerpc/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/powerpc/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/powerpc/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/powerpc/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/powerpc/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/powerpc/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/powerpc/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/powerpc/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/powerpc/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/powerpc/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/powerpc/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/powerpc/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/util.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/powerpc/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/powerpc/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/powerpc/contrib/amd/m4/amindent#1 branch .. //depot/projects/powerpc/contrib/amd/m4/autopat#1 branch .. //depot/projects/powerpc/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/powerpc/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/powerpc/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/powerpc/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/powerpc/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/powerpc/contrib/amd/m4/mkconf#1 branch .. //depot/projects/powerpc/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/powerpc/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/powerpc/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/powerpc/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/powerpc/contrib/amd/tasks#1 branch .. //depot/projects/powerpc/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/powerpc/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/powerpc/contrib/bc/AUTHORS#1 branch .. //depot/projects/powerpc/contrib/bc/ChangeLog#1 branch .. //depot/projects/powerpc/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/powerpc/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/powerpc/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/powerpc/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/powerpc/contrib/bc/FAQ#1 branch .. //depot/projects/powerpc/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/powerpc/contrib/bc/INSTALL#1 branch .. //depot/projects/powerpc/contrib/bc/Makefile.am#1 branch .. //depot/projects/powerpc/contrib/bc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bc/NEWS#1 branch .. //depot/projects/powerpc/contrib/bc/README#1 branch .. //depot/projects/powerpc/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/powerpc/contrib/bc/Test/array.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/atan.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/div.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/exp.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/fact.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/jn.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/ln.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/mul.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/raise.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/signum#1 branch .. //depot/projects/powerpc/contrib/bc/Test/sine.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/powerpc/contrib/bc/Test/timetest#1 branch .. //depot/projects/powerpc/contrib/bc/acconfig.h#1 branch .. //depot/projects/powerpc/contrib/bc/aclocal.m4#1 branch .. //depot/projects/powerpc/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/powerpc/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bc/bc/bc.y#1 branch .. //depot/projects/powerpc/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/powerpc/contrib/bc/bc/const.h#1 branch .. //depot/projects/powerpc/contrib/bc/bc/execute.c#1 branch .. //depot/projects/powerpc/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/powerpc/contrib/bc/bc/global.c#1 branch .. //depot/projects/powerpc/contrib/bc/bc/global.h#1 branch .. //depot/projects/powerpc/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/powerpc/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/powerpc/contrib/bc/bc/load.c#1 branch .. //depot/projects/powerpc/contrib/bc/bc/main.c#1 branch .. //depot/projects/powerpc/contrib/bc/bc/proto.h#1 branch .. //depot/projects/powerpc/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/powerpc/contrib/bc/bc/scan.l#1 branch .. //depot/projects/powerpc/contrib/bc/bc/storage.c#1 branch .. //depot/projects/powerpc/contrib/bc/bc/util.c#1 branch .. //depot/projects/powerpc/contrib/bc/config.h.in#1 branch .. //depot/projects/powerpc/contrib/bc/configure#1 branch .. //depot/projects/powerpc/contrib/bc/configure.in#1 branch .. //depot/projects/powerpc/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/powerpc/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bc/dc/array.c#1 branch .. //depot/projects/powerpc/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/powerpc/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/powerpc/contrib/bc/dc/dc.c#1 branch .. //depot/projects/powerpc/contrib/bc/dc/dc.h#1 branch .. //depot/projects/powerpc/contrib/bc/dc/eval.c#1 branch .. //depot/projects/powerpc/contrib/bc/dc/misc.c#1 branch .. //depot/projects/powerpc/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/powerpc/contrib/bc/dc/stack.c#1 branch .. //depot/projects/powerpc/contrib/bc/dc/string.c#1 branch .. //depot/projects/powerpc/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/powerpc/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bc/doc/bc.1#1 branch .. //depot/projects/powerpc/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/powerpc/contrib/bc/doc/dc.1#1 branch .. //depot/projects/powerpc/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/powerpc/contrib/bc/h/number.h#1 branch .. //depot/projects/powerpc/contrib/bc/install-sh#1 branch .. //depot/projects/powerpc/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/powerpc/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bc/lib/number.c#1 branch .. //depot/projects/powerpc/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/powerpc/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/powerpc/contrib/bc/missing#1 branch .. //depot/projects/powerpc/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/powerpc/contrib/bc/stamp-h.in#1 branch .. //depot/projects/powerpc/contrib/bind9/CHANGES#1 branch .. //depot/projects/powerpc/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/powerpc/contrib/bind9/FAQ#1 branch .. //depot/projects/powerpc/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/powerpc/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/powerpc/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/powerpc/contrib/bind9/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/README#1 branch .. //depot/projects/powerpc/contrib/bind9/acconfig.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/powerpc/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/powerpc/contrib/bind9/config.guess#1 branch .. //depot/projects/powerpc/contrib/bind9/config.sub#1 branch .. //depot/projects/powerpc/contrib/bind9/config.threads.in#1 branch .. //depot/projects/powerpc/contrib/bind9/configure.in#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23: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 A6F8116A4D2; Sun, 10 Dec 2006 23:16:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6895916A492 for ; Sun, 10 Dec 2006 23:16:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3656843CF5 for ; Sun, 10 Dec 2006 23:14:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBANFsYW066504 for ; Sun, 10 Dec 2006 23:15:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBANFsrL066501 for perforce@freebsd.org; Sun, 10 Dec 2006 23:15:54 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 23:15:54 GMT Message-Id: <200612102315.kBANFsrL066501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111413 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, 10 Dec 2006 23:16:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111413 Change 111413 by sam@sam_ebb on 2006/12/10 23:15:30 import patch 3 from mcr Affected files ... .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#3 edit .. //depot/projects/crypto/sys/dev/hifn/hifn7751reg.h#2 edit .. //depot/projects/crypto/sys/dev/hifn/hifn7751var.h#2 edit Differences ... ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#3 (text+ko) ==== @@ -49,6 +49,7 @@ #include "opt_hifn.h" #include +#include #include #include #include @@ -60,6 +61,8 @@ #include #include +#include + #include #include @@ -92,6 +95,7 @@ static int hifn_suspend(device_t); static int hifn_resume(device_t); static void hifn_shutdown(device_t); +static struct cdevsw vulcanpk_cdevsw; /* forward declaration */ static int hifn_newsession(device_t, u_int32_t *, struct cryptoini *); static int hifn_freesession(device_t, u_int64_t); @@ -166,7 +170,11 @@ sc->sc_bar0_lastreg = (bus_size_t) -1; return (v); } +#ifdef HIFN_DEBUG +#define WRITE_REG_0(sc, reg, val) ( device_printf(sc->sc_dev, "write-0 %04x %08x\n", reg, val), hifn_write_reg_0(sc, reg, val)) +#else #define WRITE_REG_0(sc, reg, val) hifn_write_reg_0(sc, reg, val) +#endif static __inline u_int32_t READ_REG_1(struct hifn_softc *sc, bus_size_t reg) @@ -175,7 +183,11 @@ sc->sc_bar1_lastreg = (bus_size_t) -1; return (v); } +#ifdef HIFN_DEBUG +#define WRITE_REG_1(sc, reg, val) ( device_printf(sc->sc_dev, "write-1 %04x %08x\n", reg, val), hifn_write_reg_1(sc, reg, val)) +#else #define WRITE_REG_1(sc, reg, val) hifn_write_reg_1(sc, reg, val) +#endif SYSCTL_NODE(_hw, OID_AUTO, hifn, CTLFLAG_RD, 0, "Hifn driver parameters"); @@ -288,6 +300,20 @@ * always will allow the card to work. If a card is using the PCI * bus clock and in a 33MHz slot then it will be operating at half * speed until the correct information is provided. + * + * According Mike Ham of HiFn, almost every board in existence has + * an external crystal populated at 66Mhz. Using PCI can be a problem + * on modern motherboards, because PCI33 can have clocks from 0 to 33Mhz, + * and some have non-PCI-compliant spread-spectrum clocks, which can confuse + * the pll. + * + * On Linux, there is no way to set pllconfig except on the boot + * command line for static kernels. Even though the string can get adjusted + * afterwards, the device will not be reconfigured. + * + * On FreeBSD, you can edit the device hints by editing /boot/device.hints, + * and this too, is loaded only at boot time. See device.hints(5). + * */ static void hifn_getpllconfig(device_t dev, u_int *pll) @@ -299,7 +325,7 @@ if (resource_string_value("hifn", device_get_unit(dev), "pllconfig", &pllspec)) - pllspec = "pci66"; + pllspec = "ext66"; fl = 33, fh = 66; pllconfig = 0; if (strncmp(pllspec, "ext", 3) == 0) { @@ -435,6 +461,11 @@ sc->sc_sh1 = rman_get_bushandle(sc->sc_bar1res); sc->sc_bar1_lastreg = (bus_size_t) -1; +#if 0 + sc->sc_bar1fake = malloc(4096, M_DEVBUF, M_NOWAIT); + memset(sc->sc_bar1fake, 'X', 4096); +#endif + hifn_set_retry(sc); /* @@ -561,11 +592,16 @@ device_printf(sc->sc_dev, "%s, rev %u, %d%cB %cram", hifn_partname(sc), rev, rseg, rbase, sc->sc_drammodel ? 'd' : 's'); - if (sc->sc_flags & HIFN_IS_7956) + if (sc->sc_flags & HIFN_IS_7956) { +#if 0 printf(", pll=0x%x<%s clk, %ux mult>", sc->sc_pllconfig, sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci", 2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11)); +#else + printf(", pll=defaulting"); +#endif + } printf("\n"); sc->sc_cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE); @@ -781,6 +817,7 @@ sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; + device_printf(sc->sc_dev, "enabling entropy gathering\n"); callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); } @@ -790,6 +827,11 @@ WRITE_REG_1(sc, HIFN_1_PUB_IEN, HIFN_PUBIEN_DONE); sc->sc_dmaier |= HIFN_DMAIER_PUBDONE; WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier); + + sc->sc_pkdev = make_dev(&vulcanpk_cdevsw, 0, + UID_ROOT, GID_WHEEL, 0666, + "vulcanpk"); + sc->sc_pkdev->si_drv1 = sc; } return (0); @@ -804,6 +846,7 @@ int i; if (sc->sc_flags & HIFN_IS_7811) { + /* ONLY VALID ON 7811!!!! */ for (i = 0; i < 5; i++) { sts = READ_REG_1(sc, HIFN_1_7811_RNGSTS); if (sts & HIFN_7811_RNGSTS_UFL) { @@ -846,10 +889,15 @@ hifn_puc_wait(struct hifn_softc *sc) { int i; + int reg = HIFN_0_PUCTRL; + + if (sc->sc_flags & HIFN_IS_7956) { + reg = HIFN_0_PUCTRL2; + } for (i = 5000; i > 0; i--) { DELAY(1); - if (!(READ_REG_0(sc, HIFN_0_PUCTRL) & HIFN_PUCTRL_RESET)) + if (!(READ_REG_0(sc, reg) & HIFN_PUCTRL_RESET)) break; } if (!i) @@ -863,7 +911,13 @@ hifn_reset_puc(struct hifn_softc *sc) { /* Reset processing unit */ - WRITE_REG_0(sc, HIFN_0_PUCTRL, HIFN_PUCTRL_DMAENA); + int reg = HIFN_0_PUCTRL; + + if (sc->sc_flags & HIFN_IS_7956) { + reg = HIFN_0_PUCTRL2; + } + WRITE_REG_0(sc, reg, HIFN_PUCTRL_DMAENA); + hifn_puc_wait(sc); } @@ -932,7 +986,16 @@ } if (reg == 1000) printf(": cram init timeout\n"); + } else { + /* set up DMA configuration register #2 */ + /* turn off all PK and BAR0 swaps */ + WRITE_REG_1(sc, HIFN_1_DMA_CNFG2, + (3 << HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT)| + (3 << HIFN_DMACNFG2_INIT_READ_BURST_SHIFT)| + (2 << HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT)| + (2 << HIFN_DMACNFG2_TGT_READ_BURST_SHIFT)); } + } static u_int32_t @@ -1170,13 +1233,15 @@ /* turn off the clocks and insure bypass is set */ pll = READ_REG_1(sc, HIFN_1_PLL); pll = (pll &~ (HIFN_PLL_PK_CLK_SEL | HIFN_PLL_PE_CLK_SEL)) - | HIFN_PLL_BP; + | HIFN_PLL_BP | HIFN_PLL_MBSET; WRITE_REG_1(sc, HIFN_1_PLL, pll); DELAY(10*1000); /* 10ms */ + /* change configuration */ pll = (pll &~ HIFN_PLL_CONFIG) | sc->sc_pllconfig; WRITE_REG_1(sc, HIFN_1_PLL, pll); DELAY(10*1000); /* 10ms */ + /* disable bypass */ pll &= ~HIFN_PLL_BP; WRITE_REG_1(sc, HIFN_1_PLL, pll); @@ -2858,3 +2923,46 @@ } bus_space_write_4(sc->sc_st1, sc->sc_sh1, reg, val); } + + +/* + * this code provides support for mapping the PK engine's register + * into a userspace program. + * + */ +static int +vulcanpk_mmap(struct cdev *dev, vm_offset_t offset, + vm_paddr_t *paddr, int nprot) +{ + struct hifn_softc *sc; + vm_paddr_t pd; + void *b; + + sc = dev->si_drv1; + +#if 0 + b = sc->sc_bar1fake; + pd = vtophys(b); +#else + pd = rman_get_start(sc->sc_bar1res); + b = rman_get_virtual(sc->sc_bar1res); +#endif + +#if 0 + printf("vpk mmap: %p(%08x) offset=%d\n", b, pd, offset); + hexdump(b, HIFN_1_PUB_MEMEND, "vpk", 0); +#endif + + if (offset == 0) { + *paddr = pd; + return (0); + } + return (-1); +} + +static struct cdevsw vulcanpk_cdevsw = { + .d_version = D_VERSION, + .d_mmap = vulcanpk_mmap, + .d_name = "vulcanpk", +}; + ==== //depot/projects/crypto/sys/dev/hifn/hifn7751reg.h#2 (text+ko) ==== @@ -118,7 +118,10 @@ #define HIFN_0_PUSTAT 0x14 /* Processing Unit Status/Chip ID */ #define HIFN_0_FIFOSTAT 0x18 /* FIFO Status */ #define HIFN_0_FIFOCNFG 0x1c /* FIFO Configuration */ -#define HIFN_0_SPACESIZE 0x20 /* Register space size */ +#define HIFN_0_PUCTRL2 0x28 /* Processing Unit Control -- second mapping */ +#define HIFN_0_MUTE1 0x80 +#define HIFN_0_MUTE2 0x90 +#define HIFN_0_SPACESIZE 0x100 /* Register space size */ /* Processing Unit Control Register (HIFN_0_PUCTRL) */ #define HIFN_PUCTRL_CLRSRCFIFO 0x0010 /* clear source fifo */ @@ -200,7 +203,7 @@ #define HIFN_FIFOSTAT_DST 0x007f /* Destination FIFO available */ /* FIFO Configuration Register (HIFN_0_FIFOCNFG) */ -#define HIFN_FIFOCNFG_THRESHOLD 0x0400 /* must be written as 1 */ +#define HIFN_FIFOCNFG_THRESHOLD 0x0400 /* must be written as this value */ /* * DMA Interface Registers (offset from BASEREG1) @@ -217,17 +220,21 @@ #define HIFN_1_7811_RNGCFG 0x64 /* 7811: rng config */ #define HIFN_1_7811_RNGDAT 0x68 /* 7811: rng data */ #define HIFN_1_7811_RNGSTS 0x6c /* 7811: rng status */ +#define HIFN_1_DMA_CNFG2 0x6c /* 7955/7956: dma config #2 */ #define HIFN_1_7811_MIPSRST 0x94 /* 7811: MIPS reset */ #define HIFN_1_REVID 0x98 /* Revision ID */ #define HIFN_1_PUB_RESET 0x204 /* Public/RNG Reset */ #define HIFN_1_PUB_BASE 0x300 /* Public Base Address */ -#define HIFN_1_PUB_OPLEN 0x304 /* Public Operand Length */ -#define HIFN_1_PUB_OP 0x308 /* Public Operand */ -#define HIFN_1_PUB_STATUS 0x30c /* Public Status */ -#define HIFN_1_PUB_IEN 0x310 /* Public Interrupt nable */ +#define HIFN_1_PUB_OPLEN 0x304 /* 7951-compat Public Operand Length */ +#define HIFN_1_PUB_OP 0x308 /* 7951-compat Public Operand */ +#define HIFN_1_PUB_STATUS 0x30c /* 7951-compat Public Status */ +#define HIFN_1_PUB_IEN 0x310 /* Public Interrupt enable */ #define HIFN_1_RNG_CONFIG 0x314 /* RNG config */ #define HIFN_1_RNG_DATA 0x318 /* RNG data */ +#define HIFN_1_PUB_MODE 0x320 /* PK mode */ +#define HIFN_1_PUB_FIFO_OPLEN 0x380 /* first element of oplen fifo */ +#define HIFN_1_PUB_FIFO_OP 0x384 /* first element of op fifo */ #define HIFN_1_PUB_MEM 0x400 /* start of Public key memory */ #define HIFN_1_PUB_MEMEND 0xbff /* end of Public key memory */ @@ -305,6 +312,16 @@ #define HIFN_DMACNFG_DMARESET 0x00000002 /* DMA Reset # */ #define HIFN_DMACNFG_MSTRESET 0x00000001 /* Master Reset # */ +/* DMA Configuration Register (HIFN_1_DMA_CNFG2) */ +#define HIFN_DMACNFG2_PKSWAP32 (1 << 19) /* swap the OPLEN/OP reg */ +#define HIFN_DMACNFG2_PKSWAP8 (1 << 18) /* swap the bits of OPLEN/OP */ +#define HIFN_DMACNFG2_BAR0_SWAP32 (1<<17) /* swap the bytes of BAR0 */ +#define HIFN_DMACNFG2_BAR1_SWAP8 (1<<16) /* swap the bits of BAR0 */ +#define HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT 12 +#define HIFN_DMACNFG2_INIT_READ_BURST_SHIFT 8 +#define HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT 4 +#define HIFN_DMACNFG2_TGT_READ_BURST_SHIFT 0 + /* 7811 RNG Enable Register (HIFN_1_7811_RNGENA) */ #define HIFN_7811_RNGENA_ENA 0x00000001 /* enable RNG */ @@ -358,6 +375,11 @@ /* Public status register (HIFN_1_PUB_STATUS) */ #define HIFN_PUBSTS_DONE 0x00000001 /* operation done */ #define HIFN_PUBSTS_CARRY 0x00000002 /* carry */ +#define HIFN_PUBSTS_FIFO_EMPTY 0x00000100 /* fifo empty */ +#define HIFN_PUBSTS_FIFO_FULL 0x00000200 /* fifo full */ +#define HIFN_PUBSTS_FIFO_OVFL 0x00000400 /* fifo overflow */ +#define HIFN_PUBSTS_FIFO_WRITE 0x000f0000 /* fifo write */ +#define HIFN_PUBSTS_FIFO_READ 0x0f000000 /* fifo read */ /* Public interrupt enable register (HIFN_1_PUB_IEN) */ #define HIFN_PUBIEN_DONE 0x00000001 /* operation done interrupt */ @@ -407,6 +429,13 @@ */ #define HIFN_PLL_CONFIG (HIFN_PLL_IS|HIFN_PLL_ND|HIFN_PLL_REF_SEL) +/* + * Public Key Engine Mode Register + */ +#define HIFN_PKMODE_HOSTINVERT (1 << 0) /* HOST INVERT */ +#define HIFN_PKMODE_ENHANCED (1 << 1) /* Enable enhanced mode */ + + /********************************************************************* * Structs for board commands * ==== //depot/projects/crypto/sys/dev/hifn/hifn7751var.h#2 (text+ko) ==== @@ -183,6 +183,10 @@ int sc_needwakeup; /* ops q'd wating on resources */ int sc_curbatch; /* # ops submitted w/o int */ int sc_suspended; + struct cdev *sc_pkdev; + + void *sc_bar1fake; + }; #define HIFN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:19: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 B316E16A417; Sun, 10 Dec 2006 23:19:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7585B16A40F; Sun, 10 Dec 2006 23:19:07 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B0AC43CA3; Sun, 10 Dec 2006 23:17:51 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 06FC4487F4; Mon, 11 Dec 2006 00:19:03 +0100 (CET) Received: from localhost (dkh96.neoplus.adsl.tpnet.pl [83.24.11.96]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 65825487F0; Mon, 11 Dec 2006 00:18:50 +0100 (CET) Date: Mon, 11 Dec 2006 00:18:39 +0100 From: Pawel Jakub Dawidek To: Matt Jacob Message-ID: <20061210231839.GE12193@garage.freebsd.pl> References: <200612100554.kBA5sJpn089774@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mrJd9p1Ce66CJMxE" Content-Disposition: inline In-Reply-To: <200612100554.kBA5sJpn089774@repoman.freebsd.org> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r804 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.5 required=3.0 tests=BAYES_00,RCVD_IN_NJABL_DUL, RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111375 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, 10 Dec 2006 23:19:07 -0000 --mrJd9p1Ce66CJMxE Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 10, 2006 at 05:54:19AM +0000, Matt Jacob wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D111375 >=20 > Change 111375 by mjacob@mjexp on 2006/12/10 05:53:25 >=20 > Just to get it down... very first baby steps cut at the > start of a multipath geometry class. Hmm, you are doing multipath GEOM class? I already has a GEOM class which does dynamic multipathing and failover at GEOM level. I thought this is incorrect way of implementing multipathing. I think Scott was talking about doing it at the CAM level AFAIR. Anyway, my code is in: //depot/user/pjd/geom_classes/sys/geom/rome/... --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --mrJd9p1Ce66CJMxE Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (FreeBSD) iD8DBQFFfJXPForvXbEpPzQRAnYQAJ97F1w3Lo6+QXNA1CI4X2LulnhN5ACfUJL3 H/8RgeUXuN56kPrxVSAS2HQ= =fihZ -----END PGP SIGNATURE----- --mrJd9p1Ce66CJMxE-- From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:42: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 E9AAE16A4CA; Sun, 10 Dec 2006 23:42:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 697AC16A494 for ; Sun, 10 Dec 2006 23:42:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6326743CA5 for ; Sun, 10 Dec 2006 23:41:37 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBANgT2v070921 for ; Sun, 10 Dec 2006 23:42:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBANgTCf070918 for perforce@freebsd.org; Sun, 10 Dec 2006 23:42:29 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 23:42:29 GMT Message-Id: <200612102342.kBANgTCf070918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111415 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, 10 Dec 2006 23:42:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=111415 Change 111415 by sam@sam_ebb on 2006/12/10 23:42:21 whitespace; maintain prevailing style Affected files ... .. //depot/projects/crypto/sys/dev/hifn/hifn7751reg.h#3 edit Differences ... ==== //depot/projects/crypto/sys/dev/hifn/hifn7751reg.h#3 (text+ko) ==== @@ -118,9 +118,9 @@ #define HIFN_0_PUSTAT 0x14 /* Processing Unit Status/Chip ID */ #define HIFN_0_FIFOSTAT 0x18 /* FIFO Status */ #define HIFN_0_FIFOCNFG 0x1c /* FIFO Configuration */ -#define HIFN_0_PUCTRL2 0x28 /* Processing Unit Control -- second mapping */ -#define HIFN_0_MUTE1 0x80 -#define HIFN_0_MUTE2 0x90 +#define HIFN_0_PUCTRL2 0x28 /* Processing Unit Control (2nd map) */ +#define HIFN_0_MUTE1 0x80 +#define HIFN_0_MUTE2 0x90 #define HIFN_0_SPACESIZE 0x100 /* Register space size */ /* Processing Unit Control Register (HIFN_0_PUCTRL) */ @@ -220,7 +220,7 @@ #define HIFN_1_7811_RNGCFG 0x64 /* 7811: rng config */ #define HIFN_1_7811_RNGDAT 0x68 /* 7811: rng data */ #define HIFN_1_7811_RNGSTS 0x6c /* 7811: rng status */ -#define HIFN_1_DMA_CNFG2 0x6c /* 7955/7956: dma config #2 */ +#define HIFN_1_DMA_CNFG2 0x6c /* 7955/7956: dma config #2 */ #define HIFN_1_7811_MIPSRST 0x94 /* 7811: MIPS reset */ #define HIFN_1_REVID 0x98 /* Revision ID */ @@ -232,9 +232,9 @@ #define HIFN_1_PUB_IEN 0x310 /* Public Interrupt enable */ #define HIFN_1_RNG_CONFIG 0x314 /* RNG config */ #define HIFN_1_RNG_DATA 0x318 /* RNG data */ -#define HIFN_1_PUB_MODE 0x320 /* PK mode */ -#define HIFN_1_PUB_FIFO_OPLEN 0x380 /* first element of oplen fifo */ -#define HIFN_1_PUB_FIFO_OP 0x384 /* first element of op fifo */ +#define HIFN_1_PUB_MODE 0x320 /* PK mode */ +#define HIFN_1_PUB_FIFO_OPLEN 0x380 /* first element of oplen fifo */ +#define HIFN_1_PUB_FIFO_OP 0x384 /* first element of op fifo */ #define HIFN_1_PUB_MEM 0x400 /* start of Public key memory */ #define HIFN_1_PUB_MEMEND 0xbff /* end of Public key memory */ @@ -313,14 +313,14 @@ #define HIFN_DMACNFG_MSTRESET 0x00000001 /* Master Reset # */ /* DMA Configuration Register (HIFN_1_DMA_CNFG2) */ -#define HIFN_DMACNFG2_PKSWAP32 (1 << 19) /* swap the OPLEN/OP reg */ -#define HIFN_DMACNFG2_PKSWAP8 (1 << 18) /* swap the bits of OPLEN/OP */ -#define HIFN_DMACNFG2_BAR0_SWAP32 (1<<17) /* swap the bytes of BAR0 */ -#define HIFN_DMACNFG2_BAR1_SWAP8 (1<<16) /* swap the bits of BAR0 */ -#define HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT 12 -#define HIFN_DMACNFG2_INIT_READ_BURST_SHIFT 8 -#define HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT 4 -#define HIFN_DMACNFG2_TGT_READ_BURST_SHIFT 0 +#define HIFN_DMACNFG2_PKSWAP32 (1 << 19) /* swap the OPLEN/OP reg */ +#define HIFN_DMACNFG2_PKSWAP8 (1 << 18) /* swap the bits of OPLEN/OP */ +#define HIFN_DMACNFG2_BAR0_SWAP32 (1<<17) /* swap the bytes of BAR0 */ +#define HIFN_DMACNFG2_BAR1_SWAP8 (1<<16) /* swap the bits of BAR0 */ +#define HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT 12 +#define HIFN_DMACNFG2_INIT_READ_BURST_SHIFT 8 +#define HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT 4 +#define HIFN_DMACNFG2_TGT_READ_BURST_SHIFT 0 /* 7811 RNG Enable Register (HIFN_1_7811_RNGENA) */ #define HIFN_7811_RNGENA_ENA 0x00000001 /* enable RNG */ @@ -375,11 +375,11 @@ /* Public status register (HIFN_1_PUB_STATUS) */ #define HIFN_PUBSTS_DONE 0x00000001 /* operation done */ #define HIFN_PUBSTS_CARRY 0x00000002 /* carry */ -#define HIFN_PUBSTS_FIFO_EMPTY 0x00000100 /* fifo empty */ -#define HIFN_PUBSTS_FIFO_FULL 0x00000200 /* fifo full */ -#define HIFN_PUBSTS_FIFO_OVFL 0x00000400 /* fifo overflow */ -#define HIFN_PUBSTS_FIFO_WRITE 0x000f0000 /* fifo write */ -#define HIFN_PUBSTS_FIFO_READ 0x0f000000 /* fifo read */ +#define HIFN_PUBSTS_FIFO_EMPTY 0x00000100 /* fifo empty */ +#define HIFN_PUBSTS_FIFO_FULL 0x00000200 /* fifo full */ +#define HIFN_PUBSTS_FIFO_OVFL 0x00000400 /* fifo overflow */ +#define HIFN_PUBSTS_FIFO_WRITE 0x000f0000 /* fifo write */ +#define HIFN_PUBSTS_FIFO_READ 0x0f000000 /* fifo read */ /* Public interrupt enable register (HIFN_1_PUB_IEN) */ #define HIFN_PUBIEN_DONE 0x00000001 /* operation done interrupt */ @@ -432,8 +432,8 @@ /* * Public Key Engine Mode Register */ -#define HIFN_PKMODE_HOSTINVERT (1 << 0) /* HOST INVERT */ -#define HIFN_PKMODE_ENHANCED (1 << 1) /* Enable enhanced mode */ +#define HIFN_PKMODE_HOSTINVERT (1 << 0) /* HOST INVERT */ +#define HIFN_PKMODE_ENHANCED (1 << 1) /* Enable enhanced mode */ /********************************************************************* From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:43: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 35FC916A416; Sun, 10 Dec 2006 23:43:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 14C5A16A415 for ; Sun, 10 Dec 2006 23:43:57 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DF5943CC0 for ; Sun, 10 Dec 2006 23:42:27 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBANhVEc071173 for ; Sun, 10 Dec 2006 23:43:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBANhV6J071170 for perforce@freebsd.org; Sun, 10 Dec 2006 23:43:31 GMT (envelope-from marcel@freebsd.org) Date: Sun, 10 Dec 2006 23:43:31 GMT Message-Id: <200612102343.kBANhV6J071170@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 111416 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, 10 Dec 2006 23:43:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=111416 Change 111416 by marcel@marcel_nfs on 2006/12/10 23:42:45 Save local changes to mkisoimages.sh. With these changes we avoid overflowing the live file system ISO. I don't know if they break booting or recognition by Mac OS X. That needs investigation. Affected files ... .. //depot/projects/powerpc/release/powerpc/mkisoimages.sh#2 edit Differences ... ==== //depot/projects/powerpc/release/powerpc/mkisoimages.sh#2 (text+ko) ==== @@ -54,4 +54,4 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -hfs -part -no-desktop -hfs-volid $LABEL -l -J -L -o $NAME $* +mkisofs $bootable -apple -no-desktop -r -V $LABEL -publisher "$publisher" -o $NAME $* From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:52: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 A2BBF16A524; Sun, 10 Dec 2006 23:52:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5FB8916A510 for ; Sun, 10 Dec 2006 23:52:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3578D43CC8 for ; Sun, 10 Dec 2006 23:50:33 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBANpgW7072177 for ; Sun, 10 Dec 2006 23:51:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBANpgs6072173 for perforce@freebsd.org; Sun, 10 Dec 2006 23:51:42 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 23:51:42 GMT Message-Id: <200612102351.kBANpgs6072173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111417 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, 10 Dec 2006 23:52:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=111417 Change 111417 by sam@sam_ebb on 2006/12/10 23:51:09 o move /dev/vulcanpk support under a HIFN_VULCANDEV option o nuke bar1fake stuff; #if 0 test code doesn't belong Affected files ... .. //depot/projects/crypto/sys/conf/options#4 edit .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#4 edit .. //depot/projects/crypto/sys/dev/hifn/hifn7751var.h#3 edit Differences ... ==== //depot/projects/crypto/sys/conf/options#4 (text+ko) ==== @@ -681,6 +681,7 @@ # options for hifn driver HIFN_DEBUG opt_hifn.h HIFN_RNDTEST opt_hifn.h +HIFN_VULCANDEV opt_hifn.h # options for safenet driver SAFE_DEBUG opt_safe.h ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#4 (text+ko) ==== @@ -49,7 +49,6 @@ #include "opt_hifn.h" #include -#include #include #include #include @@ -61,8 +60,6 @@ #include #include -#include - #include #include @@ -86,6 +83,13 @@ #include #include +#ifdef HIFN_VULCANDEV +#include +#include + +static struct cdevsw vulcanpk_cdevsw; /* forward declaration */ +#endif + /* * Prototypes and count for the pci_device structure */ @@ -95,7 +99,6 @@ static int hifn_suspend(device_t); static int hifn_resume(device_t); static void hifn_shutdown(device_t); -static struct cdevsw vulcanpk_cdevsw; /* forward declaration */ static int hifn_newsession(device_t, u_int32_t *, struct cryptoini *); static int hifn_freesession(device_t, u_int64_t); @@ -461,11 +464,6 @@ sc->sc_sh1 = rman_get_bushandle(sc->sc_bar1res); sc->sc_bar1_lastreg = (bus_size_t) -1; -#if 0 - sc->sc_bar1fake = malloc(4096, M_DEVBUF, M_NOWAIT); - memset(sc->sc_bar1fake, 'X', 4096); -#endif - hifn_set_retry(sc); /* @@ -827,11 +825,12 @@ WRITE_REG_1(sc, HIFN_1_PUB_IEN, HIFN_PUBIEN_DONE); sc->sc_dmaier |= HIFN_DMAIER_PUBDONE; WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier); - +#ifdef HIFN_VULCANDEV sc->sc_pkdev = make_dev(&vulcanpk_cdevsw, 0, UID_ROOT, GID_WHEEL, 0666, "vulcanpk"); sc->sc_pkdev->si_drv1 = sc; +#endif } return (0); @@ -2924,7 +2923,7 @@ bus_space_write_4(sc->sc_st1, sc->sc_sh1, reg, val); } - +#ifdef HIFN_VULCANDEV /* * this code provides support for mapping the PK engine's register * into a userspace program. @@ -2940,13 +2939,8 @@ sc = dev->si_drv1; -#if 0 - b = sc->sc_bar1fake; - pd = vtophys(b); -#else pd = rman_get_start(sc->sc_bar1res); b = rman_get_virtual(sc->sc_bar1res); -#endif #if 0 printf("vpk mmap: %p(%08x) offset=%d\n", b, pd, offset); @@ -2965,4 +2959,4 @@ .d_mmap = vulcanpk_mmap, .d_name = "vulcanpk", }; - +#endif /* HIFN_VULCANDEV */ ==== //depot/projects/crypto/sys/dev/hifn/hifn7751var.h#3 (text+ko) ==== @@ -183,10 +183,9 @@ int sc_needwakeup; /* ops q'd wating on resources */ int sc_curbatch; /* # ops submitted w/o int */ int sc_suspended; +#ifdef HIFN_VULCANDEV struct cdev *sc_pkdev; - - void *sc_bar1fake; - +#endif }; #define HIFN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:55: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 8B7A316A40F; Sun, 10 Dec 2006 23:55:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C7A9016A407 for ; Sun, 10 Dec 2006 23:55:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F16143CA8 for ; Sun, 10 Dec 2006 23:53:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBANslEI072915 for ; Sun, 10 Dec 2006 23:54:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBANsljn072912 for perforce@freebsd.org; Sun, 10 Dec 2006 23:54:47 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 23:54:47 GMT Message-Id: <200612102354.kBANsljn072912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111418 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, 10 Dec 2006 23:55:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=111418 Change 111418 by sam@sam_ebb on 2006/12/10 23:54:23 nuke debug printf on every reg write; if this is needed it belongs under a separate option or controlled by a higher level of verbosity on the debug sysctl knob Affected files ... .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#5 edit Differences ... ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#5 (text+ko) ==== @@ -173,11 +173,7 @@ sc->sc_bar0_lastreg = (bus_size_t) -1; return (v); } -#ifdef HIFN_DEBUG -#define WRITE_REG_0(sc, reg, val) ( device_printf(sc->sc_dev, "write-0 %04x %08x\n", reg, val), hifn_write_reg_0(sc, reg, val)) -#else #define WRITE_REG_0(sc, reg, val) hifn_write_reg_0(sc, reg, val) -#endif static __inline u_int32_t READ_REG_1(struct hifn_softc *sc, bus_size_t reg) @@ -186,11 +182,7 @@ sc->sc_bar1_lastreg = (bus_size_t) -1; return (v); } -#ifdef HIFN_DEBUG -#define WRITE_REG_1(sc, reg, val) ( device_printf(sc->sc_dev, "write-1 %04x %08x\n", reg, val), hifn_write_reg_1(sc, reg, val)) -#else #define WRITE_REG_1(sc, reg, val) hifn_write_reg_1(sc, reg, val) -#endif SYSCTL_NODE(_hw, OID_AUTO, hifn, CTLFLAG_RD, 0, "Hifn driver parameters"); From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:58: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 5C50516A4C2; Sun, 10 Dec 2006 23:58:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0D40B16A47E for ; Sun, 10 Dec 2006 23:58:01 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 630BC43CB0 for ; Sun, 10 Dec 2006 23:54:36 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBANtn7h073038 for ; Sun, 10 Dec 2006 23:55:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBANtmX2073035 for perforce@freebsd.org; Sun, 10 Dec 2006 23:55:48 GMT (envelope-from marcel@freebsd.org) Date: Sun, 10 Dec 2006 23:55:48 GMT Message-Id: <200612102355.kBANtmX2073035@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 111419 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, 10 Dec 2006 23:58:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=111419 Change 111419 by marcel@marcel_nfs on 2006/12/10 23:55:03 The Xserve G4 has a gigabit ethernet interface known to bge(4). Affected files ... .. //depot/projects/powerpc/sys/powerpc/conf/GENERIC#5 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/conf/GENERIC#5 (text+ko) ==== @@ -98,6 +98,7 @@ # PCI Ethernet NICs that use the common MII bus controller code. device miibus # MII bus support device gem # Sun GEM/Sun ERI/Apple GMAC +device bge device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:59: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 9B54616A4A0; Sun, 10 Dec 2006 23:59:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 691E716A4FF for ; Sun, 10 Dec 2006 23:59:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 091A643CAC for ; Sun, 10 Dec 2006 23:57:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBANwrnk073163 for ; Sun, 10 Dec 2006 23:58:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBANwrrV073160 for perforce@freebsd.org; Sun, 10 Dec 2006 23:58:53 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 23:58:53 GMT Message-Id: <200612102358.kBANwrrV073160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111420 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, 10 Dec 2006 23:59:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=111420 Change 111420 by sam@sam_ebb on 2006/12/10 23:58:11 cleanup (and correct) comments about why the default pllconfig is ext66 Affected files ... .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#6 edit Differences ... ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#6 (text+ko) ==== @@ -296,19 +296,11 @@ * bus clock and in a 33MHz slot then it will be operating at half * speed until the correct information is provided. * - * According Mike Ham of HiFn, almost every board in existence has - * an external crystal populated at 66Mhz. Using PCI can be a problem - * on modern motherboards, because PCI33 can have clocks from 0 to 33Mhz, - * and some have non-PCI-compliant spread-spectrum clocks, which can confuse - * the pll. - * - * On Linux, there is no way to set pllconfig except on the boot - * command line for static kernels. Even though the string can get adjusted - * afterwards, the device will not be reconfigured. - * - * On FreeBSD, you can edit the device hints by editing /boot/device.hints, - * and this too, is loaded only at boot time. See device.hints(5). - * + * We use a default setting of "ext66" because according to Mike Ham + * of HiFn, almost every board in existence has an external crystal + * populated at 66Mhz. Using PCI can be a problem on modern motherboards, + * because PCI33 can have clocks from 0 to 33Mhz, and some have + * non-PCI-compliant spread-spectrum clocks, which can confuse the pll. */ static void hifn_getpllconfig(device_t dev, u_int *pll) From owner-p4-projects@FreeBSD.ORG Sun Dec 10 23:59: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 32D0F16A4B3; Sun, 10 Dec 2006 23:59:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1081716A494 for ; Sun, 10 Dec 2006 23:59:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC80D43C9F for ; Sun, 10 Dec 2006 23:58:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBANxtIw073225 for ; Sun, 10 Dec 2006 23:59:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBANxt0n073222 for perforce@freebsd.org; Sun, 10 Dec 2006 23:59:55 GMT (envelope-from sam@freebsd.org) Date: Sun, 10 Dec 2006 23:59:55 GMT Message-Id: <200612102359.kBANxt0n073222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111421 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, 10 Dec 2006 23:59:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111421 Change 111421 by sam@sam_ebb on 2006/12/10 23:59:28 revert #if 0 of pllconfig printout Affected files ... .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#7 edit Differences ... ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#7 (text+ko) ==== @@ -575,14 +575,10 @@ hifn_partname(sc), rev, rseg, rbase, sc->sc_drammodel ? 'd' : 's'); if (sc->sc_flags & HIFN_IS_7956) { -#if 0 printf(", pll=0x%x<%s clk, %ux mult>", sc->sc_pllconfig, sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci", 2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11)); -#else - printf(", pll=defaulting"); -#endif } printf("\n"); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 00:02: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 38AE616A4CA; Mon, 11 Dec 2006 00:02:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1113616A47C for ; Mon, 11 Dec 2006 00:02:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5511943CEC for ; Sun, 10 Dec 2006 23:59:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBB00wF7073392 for ; Mon, 11 Dec 2006 00:00:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBB00ved073389 for perforce@freebsd.org; Mon, 11 Dec 2006 00:00:58 GMT (envelope-from sam@freebsd.org) Date: Mon, 11 Dec 2006 00:00:58 GMT Message-Id: <200612110000.kBB00ved073389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111424 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, 11 Dec 2006 00:02:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=111424 Change 111424 by sam@sam_ebb on 2006/12/11 00:00:56 revert noisy printf Affected files ... .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#9 edit Differences ... ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#9 (text+ko) ==== @@ -794,7 +794,6 @@ sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - device_printf(sc->sc_dev, "enabling entropy gathering\n"); callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); } From owner-p4-projects@FreeBSD.ORG Mon Dec 11 00:02: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 7584916A542; Mon, 11 Dec 2006 00:02:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2CDD316A4B3 for ; Mon, 11 Dec 2006 00:02:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id D154943CFC for ; Sun, 10 Dec 2006 23:59:46 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBB00vnP073380 for ; Mon, 11 Dec 2006 00:00:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBB00vNs073377 for perforce@freebsd.org; Mon, 11 Dec 2006 00:00:57 GMT (envelope-from sam@freebsd.org) Date: Mon, 11 Dec 2006 00:00:57 GMT Message-Id: <200612110000.kBB00vNs073377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111422 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, 11 Dec 2006 00:02:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=111422 Change 111422 by sam@sam_ebb on 2006/12/11 00:00:24 revert {'s change too Affected files ... .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#8 edit Differences ... ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#8 (text+ko) ==== @@ -574,12 +574,11 @@ device_printf(sc->sc_dev, "%s, rev %u, %d%cB %cram", hifn_partname(sc), rev, rseg, rbase, sc->sc_drammodel ? 'd' : 's'); - if (sc->sc_flags & HIFN_IS_7956) { + if (sc->sc_flags & HIFN_IS_7956) printf(", pll=0x%x<%s clk, %ux mult>", sc->sc_pllconfig, sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci", 2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11)); - } printf("\n"); sc->sc_cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 00:02: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 DA8A516A40F; Mon, 11 Dec 2006 00:02:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 972AC16A5F5 for ; Mon, 11 Dec 2006 00:02:04 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3373243D2D for ; Sun, 10 Dec 2006 23:59:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBB00vJ4073386 for ; Mon, 11 Dec 2006 00:00:57 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBB00v8l073383 for perforce@freebsd.org; Mon, 11 Dec 2006 00:00:57 GMT (envelope-from marcel@freebsd.org) Date: Mon, 11 Dec 2006 00:00:57 GMT Message-Id: <200612110000.kBB00v8l073383@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 111423 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, 11 Dec 2006 00:02:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=111423 Change 111423 by marcel@marcel_nfs on 2006/12/11 00:00:38 Add support for making EFI applications. Affected files ... .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.i386#5 edit Differences ... ==== //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.i386#5 (text+ko) ==== @@ -2,11 +2,18 @@ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c \ +SRCS+= cofflink.c \ + cpu-i386.c \ + efi-app-ia32.c \ elf32-i386.c \ elf32-target.h \ elf32.c \ - elflink.c + elflink.c \ + peigen.c VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_i386_vec + bfd_elf32_i386_vec \ + bfd_efi_app_ia32_vec + +peigen.c: peXXigen.c + sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET} From owner-p4-projects@FreeBSD.ORG Mon Dec 11 00:06:10 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 1892F16A47B; Mon, 11 Dec 2006 00:06:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CFC1D16A416 for ; Mon, 11 Dec 2006 00:06:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3414243CA0 for ; Mon, 11 Dec 2006 00:04:51 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBB064hk076002 for ; Mon, 11 Dec 2006 00:06:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBB064hY075999 for perforce@freebsd.org; Mon, 11 Dec 2006 00:06:04 GMT (envelope-from marcel@freebsd.org) Date: Mon, 11 Dec 2006 00:06:04 GMT Message-Id: <200612110006.kBB064hY075999@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 111425 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, 11 Dec 2006 00:06:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=111425 Change 111425 by marcel@marcel_nfs on 2006/12/11 00:05:26 Implement bus_space_map(). Used by uart(4) and OF_decode_addr(). Affected files ... .. //depot/projects/powerpc/sys/powerpc/include/bus.h#4 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/include/bus.h#4 (text+ko) ==== @@ -116,7 +116,8 @@ bus_space_handle_t *bshp) { - return (ENXIO); + *bshp = addr; + return (0); } /* From owner-p4-projects@FreeBSD.ORG Mon Dec 11 00:12: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 BCC3916A417; Mon, 11 Dec 2006 00:12:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 801E516A415 for ; Mon, 11 Dec 2006 00:12:13 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45AE643C9E for ; Mon, 11 Dec 2006 00:11:00 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBB0CD2t077125 for ; Mon, 11 Dec 2006 00:12:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBB0CCht077119 for perforce@freebsd.org; Mon, 11 Dec 2006 00:12:12 GMT (envelope-from marcel@freebsd.org) Date: Mon, 11 Dec 2006 00:12:12 GMT Message-Id: <200612110012.kBB0CCht077119@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 111426 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, 11 Dec 2006 00:12:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=111426 Change 111426 by marcel@marcel_nfs on 2006/12/11 00:12:01 Save local changes. Affected files ... .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/atomic_ops.h#2 edit .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#12 edit Differences ... ==== //depot/projects/ia64/lib/libpthread/arch/ia64/include/atomic_ops.h#2 (text+ko) ==== @@ -32,13 +32,13 @@ static inline void atomic_swap_int(int *dst, int val, int *res) { - __asm("xchg4 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); + __asm __volatile("xchg4 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); } static inline void atomic_swap_long(long *dst, long val, long *res) { - __asm("xchg8 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); + __asm __volatile("xchg8 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); } #define atomic_swap_ptr(d,v,r) \ ==== //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#12 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include -#define KSE_STACKSIZE 16384 +#define KSE_STACKSIZE (1024*1024) #define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_dtv) #define THR_GETCONTEXT(ucp) _ia64_save_context(&(ucp)->uc_mcontext) From owner-p4-projects@FreeBSD.ORG Mon Dec 11 00:51:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52AD016A47E; Mon, 11 Dec 2006 00:51:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 22CA216A403; Mon, 11 Dec 2006 00:51:38 +0000 (UTC) (envelope-from mj@feral.com) Received: from ns1.feral.com (ns1.feral.com [192.67.166.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9495043D88; Mon, 11 Dec 2006 00:48:00 +0000 (GMT) (envelope-from mj@feral.com) Received: from ns1.feral.com (localhost [127.0.0.1]) by ns1.feral.com (8.13.8/8.13.8) with ESMTP id kBB0n3QQ058971; Sun, 10 Dec 2006 16:49:13 -0800 (PST) (envelope-from mj@feral.com) Received: from localhost (mjacob@localhost) by ns1.feral.com (8.13.8/8.13.8/Submit) with ESMTP id kBB0n3hM058968; Sun, 10 Dec 2006 16:49:03 -0800 (PST) (envelope-from mj@feral.com) X-Authentication-Warning: ns1.feral.com: mjacob owned process doing -bs Date: Sun, 10 Dec 2006 16:49:03 -0800 (PST) From: Matthew Jacob X-X-Sender: mjacob@ns1.feral.com To: Pawel Jakub Dawidek In-Reply-To: <20061210231839.GE12193@garage.freebsd.pl> Message-ID: <20061210164745.R58958@ns1.feral.com> References: <200612100554.kBA5sJpn089774@repoman.freebsd.org> <20061210231839.GE12193@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews , Matt Jacob Subject: Re: PERFORCE change 111375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Matthew Jacob List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2006 00:51:38 -0000 This was discussed at length some months back and the consensus with PHK and others was to do this at the GEOM level. If you don't mind, I'll look at yours. > On Sun, Dec 10, 2006 at 05:54:19AM +0000, Matt Jacob wrote: >> http://perforce.freebsd.org/chv.cgi?CH=111375 >> >> Change 111375 by mjacob@mjexp on 2006/12/10 05:53:25 >> >> Just to get it down... very first baby steps cut at the >> start of a multipath geometry class. > > Hmm, you are doing multipath GEOM class? > I already has a GEOM class which does dynamic multipathing and failover > at GEOM level. I thought this is incorrect way of implementing > multipathing. I think Scott was talking about doing it at the CAM > level AFAIR. > > Anyway, my code is in: > > //depot/user/pjd/geom_classes/sys/geom/rome/... > > -- > Pawel Jakub Dawidek http://www.wheel.pl > pjd@FreeBSD.org http://www.FreeBSD.org > FreeBSD committer Am I Evil? Yes, I Am! > From owner-p4-projects@FreeBSD.ORG Mon Dec 11 01:02: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 D33CB16A54F; Mon, 11 Dec 2006 01:02:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9292B16A403 for ; Mon, 11 Dec 2006 01:02:33 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E602243CB2 for ; Mon, 11 Dec 2006 01:01:05 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBB12Jpp093195 for ; Mon, 11 Dec 2006 01:02:19 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBB12IjP093190 for perforce@freebsd.org; Mon, 11 Dec 2006 01:02:18 GMT (envelope-from marcel@freebsd.org) Date: Mon, 11 Dec 2006 01:02:18 GMT Message-Id: <200612110102.kBB12IjP093190@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 111430 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, 11 Dec 2006 01:02:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=111430 Change 111430 by marcel@marcel_nfs on 2006/12/11 01:01:22 Implement OF_decode_addr(). Affected files ... .. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#5 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#5 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include @@ -287,19 +288,138 @@ } /* - * Return the physical address and the bus space to use for a node - * referenced by its package handle and the index of the register bank - * to decode. Intended to be used by console drivers in early boot only. - * Works by mapping the address of the node's bank given in the address - * space of its parent upward in the device tree at each bridge along the - * path. + * Return a bus handle and bus tag that corresponds to the register + * numbered regno for the device referenced by the package handle + * dev. This function is intended to be used by console drivers in + * early boot only. It works by mapping the address of the device's + * register in the address space of its parent and recursively walk + * the device tree upward this way. */ +static void +OF_get_addr_props(phandle_t node, uint32_t *addrp, uint32_t *sizep, int *pcip) +{ + char name[16]; + uint32_t addr, size; + int pci, res; + + res = OF_getprop(node, "#address-cells", &addr, sizeof(addr)); + if (res == -1) + addr = 2; + res = OF_getprop(node, "#size-cells", &size, sizeof(size)); + if (res == -1) + size = 1; + pci = 0; + if (addr == 3 && size == 2) { + res = OF_getprop(node, "name", name, sizeof(name)); + if (res != -1) { + name[sizeof(name) - 1] = '\0'; + pci = (strcmp(name, "pci") == 0) ? 1 : 0; + } + } + if (addrp != NULL) + *addrp = addr; + if (sizep != NULL) + *sizep = size; + if (pcip != NULL) + *pcip = pci; +} + int -OF_decode_addr(phandle_t node, int bank, bus_space_tag_t *tag, +OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag, bus_space_handle_t *handle) { + uint32_t cell[32]; + bus_addr_t addr, raddr, baddr; + bus_size_t size, rsize; + uint32_t c, nbridge, naddr, nsize; + phandle_t bridge, parent; + u_int spc, rspc; + int pci, pcib, res; + + /* Sanity checking. */ + if (dev == 0) + return (EINVAL); + bridge = OF_parent(dev); + if (bridge == 0) + return (EINVAL); + if (regno < 0) + return (EINVAL); + if (tag == NULL || handle == NULL) + return (EINVAL); + + /* Get the requested register. */ + OF_get_addr_props(bridge, &naddr, &nsize, &pci); + res = OF_getprop(dev, (pci) ? "assigned-addresses" : "reg", + cell, sizeof(cell)); + if (res == -1) + return (ENXIO); + if (res % sizeof(cell[0])) + return (ENXIO); + res /= sizeof(cell[0]); + regno *= naddr + nsize; + if (regno + naddr + nsize > res) + return (EINVAL); + spc = (pci) ? cell[regno] & OFW_PCI_PHYS_HI_SPACEMASK : ~0; + addr = 0; + for (c = 0; c < naddr; c++) + addr = ((uint64_t)addr << 32) | cell[regno++]; + size = 0; + for (c = 0; c < nsize; c++) + size = ((uint64_t)size << 32) | cell[regno++]; + + /* + * Map the address range in the bridge's decoding window as given + * by the "ranges" property. If a node doesn't have such property + * then no mapping is done. + */ + parent = OF_parent(bridge); + while (parent != 0) { + OF_get_addr_props(parent, &nbridge, NULL, &pcib); + res = OF_getprop(bridge, "ranges", cell, sizeof(cell)); + if (res == -1) + goto next; + if (res % sizeof(cell[0])) + return (ENXIO); + res /= sizeof(cell[0]); + regno = 0; + while (regno < res) { + rspc = (pci) + ? cell[regno] & OFW_PCI_PHYS_HI_SPACEMASK + : ~0; + if (rspc != spc) { + regno += naddr + nbridge + nsize; + continue; + } + raddr = 0; + for (c = 0; c < naddr; c++) + raddr = ((uint64_t)raddr << 32) | cell[regno++]; + rspc = (pcib) + ? cell[regno] & OFW_PCI_PHYS_HI_SPACEMASK + : ~0; + baddr = 0; + for (c = 0; c < nbridge; c++) + baddr = ((uint64_t)baddr << 32) | cell[regno++]; + rsize = 0; + for (c = 0; c < nsize; c++) + rsize = ((uint64_t)rsize << 32) | cell[regno++]; + if (addr < raddr || addr >= raddr + rsize) + continue; + addr = addr - raddr + baddr; + if (rspc != ~0) + spc = rspc; + } - return (ENXIO); + next: + bridge = parent; + parent = OF_parent(bridge); + OF_get_addr_props(bridge, &naddr, &nsize, &pci); + } + + /* Default to memory mapped I/O. */ + *tag = PPC_BUS_SPACE_MEM; + if (spc == OFW_PCI_PHYS_HI_SPACE_IO) + *tag = PPC_BUS_SPACE_IO; + return (bus_space_map(*tag, addr, size, 0, handle)); } int From owner-p4-projects@FreeBSD.ORG Mon Dec 11 03:00: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 BC7BC16A417; Mon, 11 Dec 2006 03:00:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9752A16A412 for ; Mon, 11 Dec 2006 03:00:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E73343CAE for ; Mon, 11 Dec 2006 02:59:38 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBB30qEY013684 for ; Mon, 11 Dec 2006 03:00:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBB30qTW013681 for perforce@freebsd.org; Mon, 11 Dec 2006 03:00:52 GMT (envelope-from sam@freebsd.org) Date: Mon, 11 Dec 2006 03:00:52 GMT Message-Id: <200612110300.kBB30qTW013681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111432 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, 11 Dec 2006 03:00:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111432 Change 111432 by sam@sam_ebb on 2006/12/11 03:00:00 err, it helps to lock this stuff Affected files ... .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#10 edit Differences ... ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#10 (text+ko) ==== @@ -2345,11 +2345,14 @@ if (sidp == NULL || cri == NULL || sc == NULL) return (EINVAL); + HIFN_LOCK(sc); if (sc->sc_sessions == NULL) { ses = sc->sc_sessions = (struct hifn_session *)malloc( sizeof(*ses), M_DEVBUF, M_NOWAIT); - if (ses == NULL) + if (ses == NULL) { + HIFN_UNLOCK(sc); return (ENOMEM); + } sesn = 0; sc->sc_nsessions = 1; } else { @@ -2364,8 +2367,10 @@ sesn = sc->sc_nsessions; ses = (struct hifn_session *)malloc((sesn + 1) * sizeof(*ses), M_DEVBUF, M_NOWAIT); - if (ses == NULL) + if (ses == NULL) { + HIFN_UNLOCK(sc); return (ENOMEM); + } bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses)); bzero(sc->sc_sessions, sesn * sizeof(*ses)); free(sc->sc_sessions, M_DEVBUF); @@ -2374,6 +2379,8 @@ sc->sc_nsessions++; } } + HIFN_UNLOCK(sc); + bzero(ses, sizeof(*ses)); ses->hs_used = 1; @@ -2434,19 +2441,23 @@ hifn_freesession(device_t dev, u_int64_t tid) { struct hifn_softc *sc = device_get_softc(dev); - int session; + int session, error; u_int32_t sid = CRYPTO_SESID2LID(tid); KASSERT(sc != NULL, ("hifn_freesession: null softc")); if (sc == NULL) return (EINVAL); + HIFN_LOCK(sc); session = HIFN_SESSION(sid); - if (session >= sc->sc_nsessions) - return (EINVAL); + if (session < sc->sc_nsessions) { + bzero(&sc->sc_sessions[session], sizeof(struct hifn_session)); + error = 0; + } else + error = EINVAL; + HIFN_UNLOCK(sc); - bzero(&sc->sc_sessions[session], sizeof(sc->sc_sessions[session])); - return (0); + return (error); } static int From owner-p4-projects@FreeBSD.ORG Mon Dec 11 08:35: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 4FDD316A40F; Mon, 11 Dec 2006 08:35:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A62216A417; Mon, 11 Dec 2006 08:35:48 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id E90C343CA1; Mon, 11 Dec 2006 08:34:31 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 0D02946DA5; Mon, 11 Dec 2006 09:35:45 +0100 (CET) Received: from localhost (dkh96.neoplus.adsl.tpnet.pl [83.24.11.96]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 20EEB45CD9; Mon, 11 Dec 2006 09:35:36 +0100 (CET) Date: Mon, 11 Dec 2006 09:35:22 +0100 From: Pawel Jakub Dawidek To: Matthew Jacob Message-ID: <20061211083522.GF12193@garage.freebsd.pl> References: <200612100554.kBA5sJpn089774@repoman.freebsd.org> <20061210231839.GE12193@garage.freebsd.pl> <20061210164745.R58958@ns1.feral.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="m0vRWufqUC70IDnR" Content-Disposition: inline In-Reply-To: <20061210164745.R58958@ns1.feral.com> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r804 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.5 required=3.0 tests=BAYES_00,RCVD_IN_NJABL_DUL, RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: Perforce Change Reviews , Matt Jacob Subject: Re: PERFORCE change 111375 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, 11 Dec 2006 08:35:48 -0000 --m0vRWufqUC70IDnR Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 10, 2006 at 04:49:03PM -0800, Matthew Jacob wrote: >=20 > This was discussed at length some months back and the consensus with PHK = and others was to do this at the GEOM level. If you=20 > don't mind, I'll look at yours. I didn't committed it because of I was sure the consensus is exactly opposite... The code is quite old, but I can get it into shape in few days, I think. --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --m0vRWufqUC70IDnR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (FreeBSD) iD8DBQFFfRhKForvXbEpPzQRAmJlAKChPijGGnO235eh/tyg3kIw662zmwCgijVj PtOqZ4HLKysausNA0BFzULo= =0zWg -----END PGP SIGNATURE----- --m0vRWufqUC70IDnR-- From owner-p4-projects@FreeBSD.ORG Mon Dec 11 12:19: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 7FE5916A417; Mon, 11 Dec 2006 12:19:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5A88116A403 for ; Mon, 11 Dec 2006 12:19:53 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECBED43C9F for ; Mon, 11 Dec 2006 12:18:36 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBCJrCt048840 for ; Mon, 11 Dec 2006 12:19:53 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBCJqUp048837 for perforce@freebsd.org; Mon, 11 Dec 2006 12:19:52 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 11 Dec 2006 12:19:52 GMT Message-Id: <200612111219.kBBCJqUp048837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111450 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, 11 Dec 2006 12:19:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111450 Change 111450 by zec@zec_tca51 on 2006/12/11 12:19:51 At vnet creation time allow vnet modules to be initialized either before or after initializing protocol domains. Modules that have have declared "attach" methods must have their flags set either to VNET_MFLAG_ORDER_1ST or VNET_MFLAG_ORDER_2ND. In particular, this change ensures that the "net" module is attached, i.e. has its memory allocated, before protocol domains are initialized, while rtable_init() and loif attach are called afterwards. This seems to be the most tricky part of the stack virtualization process to be done right, and needs much more thought. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#8 edit .. //depot/projects/vimage/src/sys/net/if.c#7 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#6 edit .. //depot/projects/vimage/src/sys/net/route.c#3 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#7 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#8 (text+ko) ==== @@ -80,7 +80,7 @@ static struct vnet_modlink vnet_modules[VNET_MOD_MAX]; static TAILQ_HEAD(, vnet_modlink) vnet_modlink_head; -int vnet_mod_register(modinfo) +void vnet_mod_register(modinfo) struct vnet_modinfo *modinfo; { /* @@ -89,11 +89,8 @@ * an ID at registration time. */ - if (modinfo->id < 0 || modinfo->id >= VNET_MOD_MAX) - return EFAULT; - - if (vnet_modules[modinfo->id].modinfo != NULL) - return EEXIST; + VNET_ASSERT(modinfo->id > 0 || modinfo->id < VNET_MOD_MAX) + VNET_ASSERT(vnet_modules[modinfo->id].modinfo == NULL) vnet_modules[modinfo->id].modinfo = modinfo; TAILQ_INSERT_TAIL(&vnet_modlink_head, @@ -104,30 +101,20 @@ modinfo->i_attach(); VNETB_ITERLOOP_END(); } - - return 0; } -int vnet_mod_deregister(modinfo) +void vnet_mod_deregister(modinfo) struct vnet_modinfo *modinfo; { - if (modinfo->id < 0 || modinfo->id >= VNET_MOD_MAX) - return EFAULT; + VNET_ASSERT(vnet_modules[modinfo->id].modinfo == modinfo) - if (vnet_modules[modinfo->id].modinfo != modinfo) - return EFAULT; - if (modinfo->i_detach) { VNETB_ITERLOOP_BEGIN(); modinfo->i_detach(); VNETB_ITERLOOP_END(); } - return 0; - vnet_modules[modinfo->id].modinfo = NULL; - - return 0; } struct vimage *vnetb2vimage(vnetb) @@ -454,31 +441,45 @@ LIST_INSERT_HEAD(&vcpu_head, vcpu, vcpu_le); CURVNETB_SET(vnetb); + /* + * Initialize modules with ORDER_1ST flag set + */ + struct vnet_modlink *modlnk_i; + TAILQ_FOREACH(modlnk_i, &vnet_modlink_head, mod_le) + if (modlnk_i->modinfo->i_attach != NULL && + modlnk_i->modinfo->flags & VNET_MFLAG_ORDER_1ST) { + VNET_ASSERT(!(modlnk_i->modinfo->flags & \ + VNET_MFLAG_ORDER_2ND)); + modlnk_i->modinfo->i_attach(); + } + + /* + * Initialize domains. + */ for (dp = domains; dp; dp = dp->dom_next) { printf("initializing domain: %s\n", dp->dom_name); struct protosw *pr; - for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++){ + for (pr = dp->dom_protosw; + pr < dp->dom_protoswNPROTOSW; pr++) { if (pr->pr_usrreqs == 0) panic("domaininit: %ssw[%d] has no usrreqs!", - dp->dom_name, - (int)(pr - dp->dom_protosw)); - if (pr->pr_init) { - printf(" proto %d\n", pr->pr_protocol); + dp->dom_name, + (int)(pr - dp->dom_protosw)); + if (pr->pr_init) pr->pr_init(); - } } } - struct vnet_modlink *modlnk_i; + /* + * Initialize modules with ORDER_2ND flag set + */ TAILQ_FOREACH(modlnk_i, &vnet_modlink_head, mod_le) - if (modlnk_i->modinfo->i_attach != NULL) { - printf(" module %s\n", - modlnk_i->modinfo->name); + if (modlnk_i->modinfo->i_attach != NULL && + modlnk_i->modinfo->flags & VNET_MFLAG_ORDER_2ND) { + VNET_ASSERT(!(modlnk_i->modinfo->flags & \ + VNET_MFLAG_ORDER_1ST)); modlnk_i->modinfo->i_attach(); } -#if 0 - rtable_init((void **)vnetb->rt_tables); -#endif CURVNETB_RESTORE(); printf("done.\n"); ==== //depot/projects/vimage/src/sys/net/if.c#7 (text+ko) ==== @@ -163,6 +163,7 @@ static struct vnet_modinfo vnet_net_modinfo = { .id = VNET_MOD_NET, + .flags = VNET_MFLAG_ORDER_1ST, .name = "net", .symmap = vnet_net_symmap, .i_attach = vnet_net_iattach, @@ -340,7 +341,6 @@ struct vnet_net *vnet_net; if (curvnetb == &vnetb_0) { - vnet_mod_register(&vnet_net_modinfo); vnet_net = &vnet_net_0; } else { vnet_net = malloc(sizeof(struct vnet_net), ==== //depot/projects/vimage/src/sys/net/if_loop.c#6 (text+ko) ==== @@ -182,6 +182,7 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_loif_modinfo = { .id = VNET_MOD_LOIF, + .flags = VNET_MFLAG_ORDER_2ND, .name = "loif", .symmap = NULL, .i_attach = vnet_loif_iattach, ==== //depot/projects/vimage/src/sys/net/route.c#3 (text+ko) ==== @@ -80,6 +80,7 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_rtable_modinfo = { .id = VNET_MOD_RTABLE, + .flags = VNET_MFLAG_ORDER_2ND, .name = "rtable", .i_attach = rtable_init }; ==== //depot/projects/vimage/src/sys/sys/vimage.h#7 (text+ko) ==== @@ -99,8 +99,12 @@ typedef int vnet_start_t(void); typedef int vnet_stop_t(void); +#define VNET_MFLAG_ORDER_1ST 0x0001 +#define VNET_MFLAG_ORDER_2ND 0x0002 + struct vnet_modinfo { int id; + int flags; char *name; struct vnet_symmap *symmap; /* Per-instance method hooks */ @@ -182,8 +186,8 @@ #endif /* !VIMAGE */ #ifdef VIMAGE -int vnet_mod_register(struct vnet_modinfo *); -int vnet_mod_deregister(struct vnet_modinfo *); +void vnet_mod_register(struct vnet_modinfo *); +void vnet_mod_deregister(struct vnet_modinfo *); void printcpuinfo(struct vprocg *); struct vimage *vi_alloc(char *, int, int, int); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 12:21: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 0145C16A416; Mon, 11 Dec 2006 12:21:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 99CCE16A40F for ; Mon, 11 Dec 2006 12:21:57 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38ECC43C9E for ; Mon, 11 Dec 2006 12:20:41 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBCLvVk049749 for ; Mon, 11 Dec 2006 12:21:57 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBCLuJa049739 for perforce@freebsd.org; Mon, 11 Dec 2006 12:21:56 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 11 Dec 2006 12:21:56 GMT Message-Id: <200612111221.kBBCLuJa049739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111452 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, 11 Dec 2006 12:21:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111452 Change 111452 by zec@zec_tca51 on 2006/12/11 12:21:41 Attempt to virtualize raw sockets. Affected files ... .. //depot/projects/vimage/src/sys/net/raw_cb.c#2 edit .. //depot/projects/vimage/src/sys/net/raw_cb.h#2 edit .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#2 edit .. //depot/projects/vimage/src/sys/net/vnet.h#3 edit Differences ... ==== //depot/projects/vimage/src/sys/net/raw_cb.c#2 (text+ko) ==== @@ -30,6 +30,8 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.34 2006/06/02 08:27:15 rwatson Exp $ */ +#include "opt_vimage.h" + #include #include #include @@ -39,7 +41,9 @@ #include #include #include +#include +#include #include /* @@ -52,7 +56,9 @@ */ struct mtx rawcb_mtx; +#ifndef VIMAGE struct rawcb_list_head rawcb_list; +#endif const static u_long raw_sendspace = RAWSNDQ; const static u_long raw_recvspace = RAWRCVQ; @@ -66,6 +72,7 @@ register struct socket *so; int proto; { + INIT_VNET_NET(so->so_vnetb); register struct rawcb *rp = sotorawcb(so); int error; @@ -83,7 +90,7 @@ rp->rcb_proto.sp_family = so->so_proto->pr_domain->dom_family; rp->rcb_proto.sp_protocol = proto; mtx_lock(&rawcb_mtx); - LIST_INSERT_HEAD(&rawcb_list, rp, list); + LIST_INSERT_HEAD(&V_rawcb_list, rp, list); mtx_unlock(&rawcb_mtx); return (0); } ==== //depot/projects/vimage/src/sys/net/raw_cb.h#2 (text+ko) ==== @@ -56,7 +56,11 @@ #define RAWRCVQ 8192 #ifdef _KERNEL + +#ifndef VIMAGE extern LIST_HEAD(rawcb_list_head, rawcb) rawcb_list; +#endif + extern struct mtx rawcb_mtx; /* protosw entries */ ==== //depot/projects/vimage/src/sys/net/raw_usrreq.c#2 (text+ko) ==== @@ -30,6 +30,8 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.44 2006/11/06 13:42:02 rwatson Exp $ */ +#include "opt_vimage.h" + #include #include #include @@ -43,7 +45,9 @@ #include #include #include +#include +#include #include MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF); @@ -54,8 +58,11 @@ void raw_init() { +#ifndef VIMAGE + INIT_VNET_NET(curvnetb); - LIST_INIT(&rawcb_list); + LIST_INIT(&V_rawcb_list); +#endif } @@ -73,13 +80,14 @@ register struct sockproto *proto; struct sockaddr *src, *dst; { + INIT_VNET_NET(curvnetb); register struct rawcb *rp; register struct mbuf *m = m0; struct socket *last; last = 0; mtx_lock(&rawcb_mtx); - LIST_FOREACH(rp, &rawcb_list, list) { + LIST_FOREACH(rp, &V_rawcb_list, list) { if (rp->rcb_proto.sp_family != proto->sp_family) continue; if (rp->rcb_proto.sp_protocol && ==== //depot/projects/vimage/src/sys/net/vnet.h#3 (text+ko) ==== @@ -36,11 +36,13 @@ #ifdef VIMAGE #include +#include #include #include #include #include +#include struct vnet_net { struct vnet_base *parent_vnetb; @@ -58,7 +60,9 @@ int _rttrash; struct ifnet *_loif; - LIST_HEAD(lo_list, lo_softc) _lo_list; + LIST_HEAD(, lo_softc) _lo_list; + + LIST_HEAD(, rawcb) _rawcb_list; }; extern struct vnet_net vnet_net_0; @@ -84,5 +88,6 @@ #define V_rttrash VNET_NET(rttrash) #define V_loif VNET_NET(loif) #define V_lo_list VNET_NET(lo_list) +#define V_rawcb_list VNET_NET(rawcb_list) #endif /* !_NET_VNET_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Dec 11 13:08: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 BED6B16A415; Mon, 11 Dec 2006 13:08:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 82C5916A403 for ; Mon, 11 Dec 2006 13:08:59 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B477A43CA8 for ; Mon, 11 Dec 2006 13:07:42 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBD8xIM066048 for ; Mon, 11 Dec 2006 13:08:59 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBD8w8b066045 for perforce@freebsd.org; Mon, 11 Dec 2006 13:08:58 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 11 Dec 2006 13:08:58 GMT Message-Id: <200612111308.kBBD8w8b066045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111455 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, 11 Dec 2006 13:09:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=111455 Change 111455 by zec@zec_tca51 on 2006/12/11 13:08:33 Add an assert catching vnet modules that have exported an attach interface but have not set their initialization ordering priority flag. The first catch of the day is netgraph. Additionally, fix a bug where vnet_netgraph_iattach was recursively calling itself. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#9 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#9 (text+ko) ==== @@ -85,12 +85,15 @@ { /* * XXX we support only statically assigned module IDs at the time. - * In principle modules should be able to be dynamically assigned - * an ID at registration time. + * In principle modules should be able to get a dynamically + * assigned ID at registration time. */ - VNET_ASSERT(modinfo->id > 0 || modinfo->id < VNET_MOD_MAX) - VNET_ASSERT(vnet_modules[modinfo->id].modinfo == NULL) + VNET_ASSERT(modinfo->id > 0 || modinfo->id < VNET_MOD_MAX); + VNET_ASSERT(vnet_modules[modinfo->id].modinfo == NULL); + VNET_ASSERT(modinfo->i_attach == NULL || (modinfo->i_attach && + ((modinfo->flags & VNET_MFLAG_ORDER_1ST) || + (modinfo->flags & VNET_MFLAG_ORDER_2ND)))); vnet_modules[modinfo->id].modinfo = modinfo; TAILQ_INSERT_TAIL(&vnet_modlink_head, ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#3 (text+ko) ==== @@ -243,6 +243,7 @@ static struct vnet_modinfo vnet_netgraph_modinfo = { .id = VNET_MOD_NETGRAPH, + .flags = VNET_MFLAG_ORDER_2ND, .name = "netgraph", .symmap = NULL, .i_attach = vnet_netgraph_iattach, @@ -3131,7 +3132,6 @@ struct vnet_netgraph *vnet_netgraph; if (curvnetb == &vnetb_0) { - vnet_mod_register(&vnet_netgraph_modinfo); vnet_netgraph = &vnet_netgraph_0; } else { vnet_netgraph = malloc(sizeof(struct vnet_netgraph), From owner-p4-projects@FreeBSD.ORG Mon Dec 11 15:40: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 E1D9F16A560; Mon, 11 Dec 2006 15:40:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9D4DF16A559 for ; Mon, 11 Dec 2006 15:40:24 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABE8543CF2 for ; Mon, 11 Dec 2006 15:38:55 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBFeCX0014374 for ; Mon, 11 Dec 2006 15:40:12 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBFeCC8014327 for perforce@freebsd.org; Mon, 11 Dec 2006 15:40:12 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 11 Dec 2006 15:40:12 GMT Message-Id: <200612111540.kBBFeCC8014327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111463 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, 11 Dec 2006 15:40:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=111463 Change 111463 by zec@zec_tca51 on 2006/12/11 15:40:09 Set curvnetb in kern_getsockopt(). Affected files ... .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#3 (text+ko) ==== @@ -1500,7 +1500,9 @@ error = getsock(td->td_proc->p_fd, s, &fp, NULL); if (error == 0) { so = fp->f_data; + CURVNETB_SET(so->so_vnetb); error = sogetopt(so, &sopt); + CURVNETB_RESTORE(); *valsize = sopt.sopt_valsize; fdrop(fp, td); } From owner-p4-projects@FreeBSD.ORG Mon Dec 11 21:19: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 1A69E16A505; Mon, 11 Dec 2006 21:19:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C62B016A4FB for ; Mon, 11 Dec 2006 21:19:30 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4FD844697 for ; Mon, 11 Dec 2006 20:43:58 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBKj6Tc078503 for ; Mon, 11 Dec 2006 20:45:06 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBKj6vj078500 for perforce@freebsd.org; Mon, 11 Dec 2006 20:45:06 GMT (envelope-from piso@freebsd.org) Date: Mon, 11 Dec 2006 20:45:06 GMT Message-Id: <200612112045.kBBKj6vj078500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111478 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, 11 Dec 2006 21:19:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=111478 Change 111478 by piso@piso_newluxor on 2006/12/11 20:44:50 I mean UNLOCK()... Found out by: glebius Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#27 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#27 (text+ko) ==== @@ -1226,7 +1226,7 @@ LIBALIAS_LOCK(la); res = LibAliasInLocked(la, ptr, maxpacketsize); - LIBALIAS_LOCK(la); + LIBALIAS_UNLOCK(la); return (res); } From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:00: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 5E05716A4FC; Mon, 11 Dec 2006 22:00:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2F66F16A4C9 for ; Mon, 11 Dec 2006 22:00:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE3524462E for ; Mon, 11 Dec 2006 21:36:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLcEBJ095627 for ; Mon, 11 Dec 2006 21:38:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLcD0d095622 for perforce@freebsd.org; Mon, 11 Dec 2006 21:38:13 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:38:13 GMT Message-Id: <200612112138.kBBLcD0d095622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111479 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, 11 Dec 2006 22:00:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=111479 Change 111479 by millert@millert_g5tower on 2006/12/11 21:37:35 Fix comment. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#15 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#15 (text+ko) ==== @@ -267,7 +267,7 @@ avc_lck_attr = lck_attr_alloc_init(); lck_attr_setdefault(avc_lck_attr); /* no lock debugging */ - /* allocate avc mutexes */ + /* allocate avc locks */ avc_log_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); notif_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:01: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 DF0DE16A605; Mon, 11 Dec 2006 22:01:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B5A5416A601 for ; Mon, 11 Dec 2006 22:01:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A26344665 for ; Mon, 11 Dec 2006 21:37:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLdGKd095777 for ; Mon, 11 Dec 2006 21:39:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLdGEp095774 for perforce@freebsd.org; Mon, 11 Dec 2006 21:39:16 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:39:16 GMT Message-Id: <200612112139.kBBLdGEp095774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111481 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, 11 Dec 2006 22:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=111481 Change 111481 by millert@millert_g5tower on 2006/12/11 21:38:42 Fix 4 compiler warnings. Pass in the fileglob not the fileproc into mac_check_[sg]et_fd(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#27 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#27 (text+ko) ==== @@ -291,9 +291,11 @@ case MLJ_TYPE_TASK: if (mlj->ops & MLJ_TASK_OP_INIT) MAC_PERFORM(task_label_init, mlj->l); +#if 0 /* Not enough context to replay. */ if (mlj->ops & MLJ_TASK_OP_CREATE_K) ; +#endif break; default: break; @@ -697,7 +699,7 @@ mac_policy_fixup_mmd_list(struct mac_module_data *new) { struct mac_module_data *old; - struct mac_module_data_element *ele, *aele, *dele; + struct mac_module_data_element *ele, *aele; struct mac_module_data_list *arr, *dict; unsigned int i, j, k; @@ -1604,7 +1606,8 @@ return (error); } - error = mac_file_check_get(p->p_ucred, fp, elements, mac.m_buflen); + error = mac_file_check_get(p->p_ucred, fp->f_fglob, elements, + mac.m_buflen); if (error) { fp_drop(p, uap->fd, fp, 0); FREE(buffer, M_MACTEMP); @@ -1777,7 +1780,8 @@ return (error); } - error = mac_file_check_set(p->p_ucred, fp, buffer, mac.m_buflen); + error = mac_file_check_set(p->p_ucred, fp->f_fglob, buffer, + mac.m_buflen); if (error) { fp_drop(p, uap->fd, fp, 0); FREE(buffer, M_MACTEMP); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:01: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 9487016A510; Mon, 11 Dec 2006 22:01:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 59DB416A4FD for ; Mon, 11 Dec 2006 22:01:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C15AC43DF7 for ; Mon, 11 Dec 2006 21:37:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLdGNI095771 for ; Mon, 11 Dec 2006 21:39:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLdF1U095768 for perforce@freebsd.org; Mon, 11 Dec 2006 21:39:15 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:39:15 GMT Message-Id: <200612112139.kBBLdF1U095768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111480 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, 11 Dec 2006 22:01:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=111480 Change 111480 by millert@millert_g5tower on 2006/12/11 21:38:20 Convert to tiger-style mutexes. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_condvar.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/condvar.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#26 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_condvar.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include @@ -70,26 +70,26 @@ } void -cv_wait(struct cv *cvp, mutex_t *mp) +cv_wait(struct cv *cvp, lck_mtx_t *mp) { int ret; - mutex_unlock(mp); + lck_mtx_lock(mp); ret = wait_queue_assert_wait(cvp->cv_wait_queue, 0, THREAD_UNINT, 0); if (ret != THREAD_WAITING) panic("cv_wait: wait_queue_assert_wait failed"); ret = thread_block(THREAD_CONTINUE_NULL); if (ret != THREAD_AWAKENED) panic("cv_wait: thread_block failed"); - mutex_lock(mp); + lck_mtx_unlock(mp); } int -cv_wait_sig(struct cv *cvp, mutex_t *mp) +cv_wait_sig(struct cv *cvp, lck_mtx_t *mp) { int ret; - mutex_unlock(mp); + lck_mtx_unlock(mp); ret = wait_queue_assert_wait(cvp->cv_wait_queue, 0, THREAD_INTERRUPTIBLE, 0); if (ret != THREAD_WAITING) @@ -97,14 +97,14 @@ ret = thread_block(THREAD_CONTINUE_NULL); if (ret != THREAD_AWAKENED) panic("cv_wait: thread_block failed"); - mutex_lock(mp); + lck_mtx_lock(mp); } /* * Not supported in Darwin right now. */ int -cv_timedwait(struct cv *cvp __unused, mutex_t *mp __unused, int timo __unused) +cv_timedwait(struct cv *cvp __unused, lck_mtx_t *mp __unused, int timo __unused) { panic("cv_timedwait: not currently supported"); @@ -114,7 +114,7 @@ * Not supported in Darwin right now. */ int -cv_timedwait_sig(struct cv *cvp __unused, mutex_t *mp __unused, int timo __unused) +cv_timedwait_sig(struct cv *cvp __unused, lck_mtx_t *mp __unused, int timo __unused) { panic("cv_timedwait: not currently supported"); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/condvar.h#2 (text+ko) ==== @@ -34,22 +34,22 @@ * Implement BSD-layer condition variables using Mach-layer wait queues. */ -#include +#include #include struct cv { wait_queue_t cv_wait_queue; - mutex_t *cv_mutex; /* Debugging only. */ + lck_mtx_t *cv_mutex; /* Debugging only. */ const char *cv_description; }; struct uthread; void cv_init(struct cv *cvp, const char *desc); void cv_destroy(struct cv *cvp); -void cv_wait(struct cv *cvp, mutex_t *mp); -int cv_wait_sig(struct cv *cvp, mutex_t *mp); -int cv_timedwait(struct cv *cvp, mutex_t *mp, int timo); -int cv_timedwait_sig(struct cv *cvp, mutex_t *mp, int timo); +void cv_wait(struct cv *cvp, lck_mtx_t *mp); +int cv_wait_sig(struct cv *cvp, lck_mtx_t *mp); +int cv_timedwait(struct cv *cvp, lck_mtx_t *mp, int timo); +int cv_timedwait_sig(struct cv *cvp, lck_mtx_t *mp, int timo); void cv_signal(struct cv *cvp); void cv_broadcast(struct cv *cvp); void cv_waitq_remove(struct uthread *td); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#26 (text+ko) ==== @@ -174,7 +174,7 @@ * that they should try to acquire the lock if a first attempt at * exclusive access fails. */ -static mutex_t *mac_policy_mtx; +static lck_mtx_t *mac_policy_mtx; static struct cv mac_policy_cv; /* @@ -312,7 +312,7 @@ static __inline void mac_policy_grab_exclusive(void) { - mutex_lock(mac_policy_mtx); + lck_mtx_lock(mac_policy_mtx); while (mac_policy_busy != 0) cv_wait(&mac_policy_cv, mac_policy_mtx); } @@ -331,16 +331,16 @@ KASSERT(mac_policy_busy == 0, ("mac_policy_release_exclusive(): not exclusive")); - mutex_unlock(mac_policy_mtx); + lck_mtx_unlock(mac_policy_mtx); cv_signal(&mac_policy_cv); } void mac_policy_list_busy(void) { - mutex_lock(mac_policy_mtx); + lck_mtx_lock(mac_policy_mtx); mac_policy_busy++; - mutex_unlock(mac_policy_mtx); + lck_mtx_unlock(mac_policy_mtx); } int @@ -348,7 +348,7 @@ { int ret; - if (!mutex_try(mac_policy_mtx)) + if (!lck_mtx_try_lock(mac_policy_mtx)) return (-1); if (mac_policy_list.numloaded > mac_policy_list.staticmax) { @@ -356,7 +356,7 @@ ret = 1; } else ret = 0; - mutex_unlock(mac_policy_mtx); + lck_mtx_unlock(mac_policy_mtx); return (ret); } @@ -365,25 +365,25 @@ { int ret; - mutex_lock(mac_policy_mtx); + lck_mtx_lock(mac_policy_mtx); if (mac_policy_list.numloaded > mac_policy_list.staticmax) { mac_policy_busy++; ret = 1; } else ret = 0; - mutex_unlock(mac_policy_mtx); + lck_mtx_unlock(mac_policy_mtx); return (ret); } void mac_policy_list_unbusy(void) { - mutex_lock(mac_policy_mtx); + lck_mtx_lock(mac_policy_mtx); mac_policy_busy--; KASSERT(mac_policy_busy >= 0, ("MAC_POLICY_LIST_LOCK")); if (mac_policy_busy == 0) cv_signal(&mac_policy_cv); - mutex_unlock(mac_policy_mtx); + lck_mtx_unlock(mac_policy_mtx); } /* @@ -392,6 +392,9 @@ void mac_policy_init(void) { + lck_grp_attr_t *mac_lck_grp_attr; + lck_attr_t *mac_lck_attr; + lck_grp_t *mac_lck_grp; mac_policy_list.numloaded = 0; mac_policy_list.max = MAC_POLICY_LIST_CHUNKSIZE; @@ -407,7 +410,16 @@ LIST_INIT(&mac_static_label_element_list); TAILQ_INIT(&mac_label_journal_list); - mac_policy_mtx = mutex_alloc(ETAP_NO_TRACE); + mac_lck_grp_attr = lck_grp_attr_alloc_init(); + lck_grp_attr_setstat(mac_lck_grp_attr); + mac_lck_grp = lck_grp_alloc_init("MAC lock", mac_lck_grp_attr); + mac_lck_attr = lck_attr_alloc_init(); + lck_attr_setdefault(mac_lck_attr); + mac_policy_mtx = lck_mtx_alloc_init(mac_lck_grp, mac_lck_attr); + lck_attr_free(mac_lck_attr); + lck_grp_attr_free(mac_lck_grp_attr); + lck_grp_free(mac_lck_grp); + mac_labelzone_init(); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#10 (text+ko) ==== @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:01: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 F1A5816A58F; Mon, 11 Dec 2006 22:01:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AEA7D16A50A for ; Mon, 11 Dec 2006 22:01:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FA6E4466B for ; Mon, 11 Dec 2006 21:37:58 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLdGdv095783 for ; Mon, 11 Dec 2006 21:39:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLdGZV095780 for perforce@freebsd.org; Mon, 11 Dec 2006 21:39:16 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:39:16 GMT Message-Id: <200612112139.kBBLdGZV095780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111482 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, 11 Dec 2006 22:01:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=111482 Change 111482 by millert@millert_g5tower on 2006/12/11 21:38:59 Remove unused variable. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_data.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_data.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ { struct mac_policy_conf *mpc; int error = ENOENT; - unsigned int i; if ((mpc = mac_get_mpc(handle)) != NULL) error = mac_find_module_data(mpc->mpc_data, key, valp, sizep); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:01: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 CB87616A5BA; Mon, 11 Dec 2006 22:01:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A7BE216A607 for ; Mon, 11 Dec 2006 22:01:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id F392B44138 for ; Mon, 11 Dec 2006 21:39:00 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLeIEW096018 for ; Mon, 11 Dec 2006 21:40:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLeIR5096015 for perforce@freebsd.org; Mon, 11 Dec 2006 21:40:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:40:18 GMT Message-Id: <200612112140.kBBLeIR5096015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111483 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, 11 Dec 2006 22:01:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=111483 Change 111483 by millert@millert_g5tower on 2006/12/11 21:39:20 Include kern/task.h to get get_bsdtask_info() prototype. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#8 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include void mac_port_label_init(struct label *l) From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:01: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 E347116A737; Mon, 11 Dec 2006 22:01:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A6ED416A734 for ; Mon, 11 Dec 2006 22:01:34 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 688D94435F for ; Mon, 11 Dec 2006 21:39:00 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLeIrd096024 for ; Mon, 11 Dec 2006 21:40:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLeI3b096021 for perforce@freebsd.org; Mon, 11 Dec 2006 21:40:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:40:18 GMT Message-Id: <200612112140.kBBLeI3b096021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111484 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, 11 Dec 2006 22:01:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=111484 Change 111484 by millert@millert_g5tower on 2006/12/11 21:39:58 Make the type of the cmd parameter of the ioctl/fsctl entry points consistent. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#10 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#25 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#33 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#23 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#51 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#10 (text+ko) ==== @@ -116,7 +116,7 @@ } int -mac_file_check_ioctl(struct ucred *cred, struct fileglob *fg, u_long cmd) +mac_file_check_ioctl(struct ucred *cred, struct fileglob *fg, u_int cmd) { int error; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#25 (text+ko) ==== @@ -132,7 +132,7 @@ int mac_file_check_get_offset(struct ucred *cred, struct fileglob *fg); int mac_file_check_inherit(struct ucred *cred, struct fileglob *fg); int mac_file_check_ioctl(struct ucred *cred, struct fileglob *fg, - u_long cmd); + unsigned int cmd); int mac_file_check_lock(struct ucred *cred, struct fileglob *fg, int op, struct flock *fl); int mac_file_check_mmap(struct ucred *cred, struct fileglob *fg, @@ -161,7 +161,8 @@ void mac_mbuf_tag_copy(struct m_tag *m, struct m_tag *mtag); void mac_mbuf_tag_destroy(struct m_tag *mtag); int mac_mbuf_tag_init(struct m_tag *, int how); -int mac_mount_check_fsctl(struct ucred *cred, struct mount *mp, int com); +int mac_mount_check_fsctl(struct ucred *cred, struct mount *mp, + unsigned int cmd); int mac_mount_check_getattr(struct ucred *cred, struct mount *mp, struct vfs_attr *vfa); int mac_mount_check_label_update(struct ucred *cred, struct mount *mp); @@ -180,7 +181,7 @@ void mac_mount_label_init(struct mount *); int mac_mount_label_internalize(struct label *, char *string); int mac_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, - unsigned long cmd); + unsigned int cmd); int mac_pipe_check_kqfilter(struct ucred *cred, struct knote *kn, struct pipe *cpipe); int mac_pipe_check_read(struct ucred *cred, struct pipe *cpipe); @@ -342,7 +343,8 @@ struct attrlist *alist); int mac_vnode_check_getextattr(struct ucred *cred, struct vnode *vp, const char *name, struct uio *uio); -int mac_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, int com); +int mac_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, + unsigned int cmd); int mac_vnode_check_kqfilter(struct ucred *active_cred, struct ucred *file_cred, struct knote *kn, struct vnode *vp); int mac_vnode_check_label_update(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#9 (text+ko) ==== @@ -122,7 +122,7 @@ return (error); } int -mac_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, unsigned long cmd) +mac_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, u_int cmd) { int error; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#33 (text+ko) ==== @@ -726,7 +726,7 @@ struct ucred *cred, struct fileglob *fg, struct label *label, - unsigned long cmd + unsigned int cmd ); /** @brief Access control check for file locking @@ -1128,7 +1128,7 @@ struct ucred *cred, struct mount *mp, struct label *label, - int com + unsigned int cmd ); /** @brief Access control check for the retrieval of file system attributes @@ -1375,7 +1375,7 @@ struct ucred *cred, struct pipe *cpipe, struct label *pipelabel, - unsigned long cmd + unsigned int cmd ); /** @brief Access control check for pipe kqfilter @@ -4116,7 +4116,7 @@ struct ucred *cred, struct vnode *vp, struct label *label, - int com + unsigned int cmd ); /** @brief Access control check for vnode kqfilter ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#23 (text+ko) ==== @@ -504,11 +504,11 @@ } int -mac_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, int com) +mac_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, u_int cmd) { int error; - MAC_CHECK(vnode_check_ioctl, cred, vp, vp->v_label, com); + MAC_CHECK(vnode_check_ioctl, cred, vp, vp->v_label, cmd); return (error); } @@ -875,11 +875,11 @@ } int -mac_mount_check_fsctl(struct ucred *cred, struct mount *mp, int com) +mac_mount_check_fsctl(struct ucred *cred, struct mount *mp, u_int cmd) { int error; - MAC_CHECK(mount_check_fsctl, cred, mp, mp->mnt_mntlabel, com); + MAC_CHECK(mount_check_fsctl, cred, mp, mp->mnt_mntlabel, cmd); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#51 (text+ko) ==== @@ -1603,7 +1603,7 @@ static int sebsd_pipe_check_ioctl(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) + struct label *pipelabel, unsigned int cmd) { return (pipe_has_perm(cred, pipe, FIFO_FILE__IOCTL)); @@ -3082,7 +3082,7 @@ */ static int sebsd_file_check_ioctl(struct ucred *cred, struct fileglob *fg, - struct label *fglabel, u_long com) + struct label *fglabel, unsigned int cmd) { return (file_has_perm(cred, fg, fglabel, 0)); @@ -3090,7 +3090,7 @@ static int sebsd_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, - struct label *label, int com, caddr_t data) + struct label *label, unsigned int cmd) { return (vnode_has_perm(cred, vp, NULL, FILE__IOCTL)); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:03:10 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 4F84516A509; Mon, 11 Dec 2006 22:03:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DAFE816A50E for ; Mon, 11 Dec 2006 22:03:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4892B444ED for ; Mon, 11 Dec 2006 21:40:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLfKgt096807 for ; Mon, 11 Dec 2006 21:41:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLfKlM096804 for perforce@freebsd.org; Mon, 11 Dec 2006 21:41:20 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:41:20 GMT Message-Id: <200612112141.kBBLfKlM096804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111486 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, 11 Dec 2006 22:03:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=111486 Change 111486 by millert@millert_g5tower on 2006/12/11 21:41:00 Sync with ioctl/fsctl cmd arg type change. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#25 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#25 (text+ko) ==== @@ -2056,12 +2056,12 @@ static int mac_mls_file_check_ioctl(struct ucred *cred, struct fileglob *fg, - struct label *fdlabel, unsigned long com) + struct label *fdlabel, unsigned int cmd) { if (!mac_mls_enabled) return (0); - MLS_MESSAGE("file_check_ioctl: fp %p com %d(%x)\n", fp, com); + MLS_MESSAGE("file_check_ioctl: fp %p cmd %u(%x)\n", fp, cmd); #warning Implement mac_mls_file_check_ioctl() return (0); } @@ -2767,12 +2767,12 @@ static int mac_mls_mount_check_fsctl(struct ucred *cred, struct mount *mp, - struct label *mntlabel, int com) + struct label *mntlabel, unsigned int cmd) { if (!mac_mls_enabled) return (0); - MLS_MESSAGE("file_check_fsctl: mp %p com %d(%x)\n", mp, com, data); + MLS_MESSAGE("file_check_fsctl: mp %p cmd %u(%x)\n", mp, cmd, cmd); #warning Implement mac_mls_file_check_fsctl() return (0); } @@ -2855,7 +2855,7 @@ static int mac_mls_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, - struct label *pipelabel, unsigned long cmd) + struct label *pipelabel, unsigned int cmd) { struct mac_mls *subj, *obj; @@ -3446,12 +3446,12 @@ static int mac_mls_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, - struct label *label, int com) + struct label *label, unsigned int cmd) { if (!mac_mls_enabled) return (0); - MLS_MESSAGE("vnode_check_ioctl: vp %p com %d(%x)\n", vp, com, com); + MLS_MESSAGE("vnode_check_ioctl: vp %p cmd %u(%x)\n", vp, cmd, cmd); #warning Implement mac_mls_vnode_check_ioctl() return (0); } From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:03: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 C8BF516A5B3; Mon, 11 Dec 2006 22:03:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A54CC16A5AC for ; Mon, 11 Dec 2006 22:03:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7B0C444F9 for ; Mon, 11 Dec 2006 21:40:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLfKC8096801 for ; Mon, 11 Dec 2006 21:41:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLfKuU096794 for perforce@freebsd.org; Mon, 11 Dec 2006 21:41:20 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:41:20 GMT Message-Id: <200612112141.kBBLfKuU096794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111485 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, 11 Dec 2006 22:03:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=111485 Change 111485 by millert@millert_g5tower on 2006/12/11 21:40:34 mac_iokit_check_device() needs to be in mac_framework too. While there, fix its prototype. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#11 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#26 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#11 (text+ko) ==== @@ -118,7 +118,7 @@ * I/O Kit device access control. * Note that this routine is called from a C++ I/O Kit driver. */ -int mac_iokit_check_device(char *devtype, struct module_data *mdata); +int mac_iokit_check_device(char *devtype, struct mac_module_data *mdata); __END_DECLS #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#26 (text+ko) ==== @@ -62,6 +62,7 @@ struct ifnet; struct lctx; struct mac; +struct mac_module_data; struct mount; struct pseminfo; struct pshminfo; @@ -145,6 +146,7 @@ void mac_file_label_associate(struct ucred *cred, struct fileglob *fg); void mac_file_label_destroy(struct fileglob *fg); void mac_file_label_init(struct fileglob *fg); +int mac_iokit_check_device(char *devtype, struct mac_module_data *mdata); int mac_lctx_check_label_update(struct lctx *l, struct label *newlabel); struct label *mac_lctx_label_alloc(void); void mac_lctx_label_free(struct label *label); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:03: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 C00FB16A59C; Mon, 11 Dec 2006 22:03:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9D00C16A58D for ; Mon, 11 Dec 2006 22:03:20 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAB9243FFF for ; Mon, 11 Dec 2006 21:41:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLgRde097131 for ; Mon, 11 Dec 2006 21:42:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLgMJS097115 for perforce@freebsd.org; Mon, 11 Dec 2006 21:42:22 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:42:22 GMT Message-Id: <200612112142.kBBLgMJS097115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111487 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, 11 Dec 2006 22:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=111487 Change 111487 by millert@millert_g5tower on 2006/12/11 21:41:21 Undummy mtx_assert; tiger locking provides one. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#28 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#11 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#28 (text+ko) ==== @@ -322,7 +322,7 @@ static __inline void mac_policy_assert_exclusive(void) { - mtx_assert(&mac_policy_mtx, MA_OWNED); + lck_mtx_assert(mac_policy_mtx, LCK_MTX_ASSERT_OWNED); KASSERT(mac_policy_busy == 0, ("mac_policy_assert_exclusive(): not exclusive")); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#11 (text+ko) ==== @@ -381,10 +381,6 @@ error = -1; \ } while (0) -/* Darwin */ -#define mtx_assert(x, y) -#define MA_OWNED - struct __mac_get_pid_args; struct __mac_get_proc_args; struct __mac_set_proc_args; From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:03: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 26EE816A66C; Mon, 11 Dec 2006 22:03:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E02B716A594 for ; Mon, 11 Dec 2006 22:03:20 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C559C43D82 for ; Mon, 11 Dec 2006 21:41:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLgSAb097145 for ; Mon, 11 Dec 2006 21:42:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLgS0s097136 for perforce@freebsd.org; Mon, 11 Dec 2006 21:42:28 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:42:28 GMT Message-Id: <200612112142.kBBLgS0s097136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111488 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, 11 Dec 2006 22:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=111488 Change 111488 by millert@millert_g5tower on 2006/12/11 21:41:42 Free the right amount of memory when we have to expand the policy array. Also fix some whitespace. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#29 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#29 (text+ko) ==== @@ -781,19 +781,22 @@ if (mac_policy_list.numloaded >= mac_policy_list.max) { /* allocate new policy list array, zero new chunk */ - tmac_policy_list_element = kalloc((sizeof(struct mac_policy_list_element) * + tmac_policy_list_element = + kalloc((sizeof(struct mac_policy_list_element) * MAC_POLICY_LIST_CHUNKSIZE) * (mac_policy_list.chunks + 1)); bzero(&tmac_policy_list_element[mac_policy_list.max], - sizeof(struct mac_policy_list_element) * MAC_POLICY_LIST_CHUNKSIZE); + sizeof(struct mac_policy_list_element) * + MAC_POLICY_LIST_CHUNKSIZE); /* copy old entries into new list */ memcpy(tmac_policy_list_element, mac_policy_list.entries, - sizeof(struct mac_policy_list_element) * MAC_POLICY_LIST_CHUNKSIZE * - mac_policy_list.chunks); + sizeof(struct mac_policy_list_element) * + MAC_POLICY_LIST_CHUNKSIZE * mac_policy_list.chunks); /* free old array */ kfree(mac_policy_list.entries, - sizeof(mac_policy_list_t) * mac_policy_busy); + sizeof(struct mac_policy_list_element) * + MAC_POLICY_LIST_CHUNKSIZE * mac_policy_list.chunks); mac_policy_list.entries = tmac_policy_list_element; From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:03: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 DEA5616A582; Mon, 11 Dec 2006 22:03:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33DE116A680 for ; Mon, 11 Dec 2006 22:03:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01F3244682 for ; Mon, 11 Dec 2006 21:41:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLgSJh097157 for ; Mon, 11 Dec 2006 21:42:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLgSWf097148 for perforce@freebsd.org; Mon, 11 Dec 2006 21:42:28 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:42:28 GMT Message-Id: <200612112142.kBBLgSWf097148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111489 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, 11 Dec 2006 22:03:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=111489 Change 111489 by millert@millert_g5tower on 2006/12/11 21:42:02 The mach_kernel file should be boot_t not kernel_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#4 (text+ko) ==== @@ -32,4 +32,4 @@ /Library/Keychains.* gen_context(system_u:object_r:darwin_keychain_t,s0) # Kernel -/mach_kernel -- gen_context(system_u:object_r:kernel_t,s0) +/mach_kernel -- gen_context(system_u:object_r:boot_t,s0) From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22: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 028E816A4CA; Mon, 11 Dec 2006 22:04:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7B96F16A416 for ; Mon, 11 Dec 2006 22:04:38 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A107C43E38 for ; Mon, 11 Dec 2006 21:42:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLhUJj097479 for ; Mon, 11 Dec 2006 21:43:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLhUQC097476 for perforce@freebsd.org; Mon, 11 Dec 2006 21:43:30 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:43:30 GMT Message-Id: <200612112143.kBBLhUQC097476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111490 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, 11 Dec 2006 22:04:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=111490 Change 111490 by millert@millert_g5tower on 2006/12/11 21:43:09 Remove mac_policy_list_conditional_busy_noblock() and the MAC_CHECK_NOBLOCK and MAC_PERFORM_NOBLOCK macros. They are not used. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#30 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#30 (text+ko) ==== @@ -346,23 +346,6 @@ } int -mac_policy_list_conditional_busy_noblock(void) -{ - int ret; - - if (!lck_mtx_try_lock(mac_policy_mtx)) - return (-1); - - if (mac_policy_list.numloaded > mac_policy_list.staticmax) { - mac_policy_busy++; - ret = 1; - } else - ret = 0; - lck_mtx_unlock(mac_policy_mtx); - return (ret); -} - -int mac_policy_list_conditional_busy(void) { int ret; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#12 (text+ko) ==== @@ -170,7 +170,6 @@ void mac_policy_list_busy(void); int mac_policy_list_conditional_busy(void); -int mac_policy_list_conditional_busy_noblock(void); void mac_policy_list_unbusy(void); void mac_labelzone_init(void); @@ -238,45 +237,6 @@ } while (0) /* - * MAC_CHECK_NOBLOCK has the same semantics as MAC_CHECK, - * except that it will not block for the policy lock. It sets check_failed to - * 1 if it could not get the lock. This function should only be called - * on policy entry points that support the waitok flag, or which are - * guaranteed not to block. - */ -#define MAC_CHECK_NOBLOCK(check, args...) do { \ - struct mac_policy_conf *mpc; \ - int busy; \ - u_int i; \ - \ - error = 0; \ - for (i = 0; i < mac_policy_list.staticmax; i++) { \ - mpc = mac_policy_list_entries[i].mpc; \ - if (mpc == NULL) \ - continue; \ - \ - if (mpc->mpc_ops->mpo_ ## check != NULL) \ - error = mac_error_select( \ - mpc->mpc_ops->mpo_ ## check (args), \ - error); \ - } \ - if ((busy = mac_policy_list_conditional_busy_noblock()) > 0) { \ - for (; i <= mac_policy_list.maxindex; i++) { \ - mpc = mac_policy_list.entries[i].mpc; \ - if (mpc == NULL) \ - continue; \ - \ - if (mpc->mpc_ops->mpo_ ## check != NULL) \ - error = mac_error_select( \ - mpc->mpc_ops->mpo_ ## check (args), \ - error); \ - } \ - mac_policy_list_unbusy(); \ - } else if (busy < 0) \ - check_failed = 1; \ -} while (0) - -/* * MAC_BOOLEAN performs the designated boolean composition by walking * the module list, invoking each instance of the operation, and * combining the results using the passed C operator. Note that it @@ -351,36 +311,6 @@ } \ } while (0) -/* - * MAC_PERFORM_NOBLOCK differs from MAC_PERFORM in that it will not block. - * If it cannot grab the policy mutex, it will set error to -1. Otherwise, it - * it is the same. - */ -#define MAC_PERFORM_NOBLOCK(operation, args...) do { \ - struct mac_policy_conf *mpc; \ - int busy; \ - u_int i; \ - \ - for (i = 0; i < mac_policy_list.staticmax; i++) { \ - mpc = mac_policy_list.entries[i].mpc; \ - if (mpc == NULL) \ - continue; \ - if (mpc->mpc_ops->mpo_ ## operation != NULL) \ - mpc->mpc_ops->mpo_ ## operation (args); \ - } \ - if ((busy = mac_policy_list_conditional_busy_noblock()) > 0) { \ - for (; i <= mac_policy_list.maxindex; i++) { \ - mpc = mac_policy_list.entries[i].mpc; \ - if (mpc == NULL) \ - continue; \ - if (mpc->mpc_ops->mpo_ ## operation != NULL) \ - mpc->mpc_ops->mpo_ ## operation (args); \ - } \ - mac_policy_list_unbusy(); \ - } else if (busy < 0) \ - error = -1; \ -} while (0) - struct __mac_get_pid_args; struct __mac_get_proc_args; struct __mac_set_proc_args; From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:06: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 1AE8C16A407; Mon, 11 Dec 2006 22:06:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A919B16A4D2 for ; Mon, 11 Dec 2006 22:06:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1613244574 for ; Mon, 11 Dec 2006 21:44:33 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLjYuC097793 for ; Mon, 11 Dec 2006 21:45:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLjYgX097790 for perforce@freebsd.org; Mon, 11 Dec 2006 21:45:34 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:45:34 GMT Message-Id: <200612112145.kBBLjYgX097790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111492 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, 11 Dec 2006 22:06:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=111492 Change 111492 by millert@millert_g5tower on 2006/12/11 21:45:22 Comment out vnode_getattr() call for now as it leads to deadlock. This means we can no longer report the inode in avc log messages. The path info still remains (for now). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#16 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#16 (text+ko) ==== @@ -639,6 +639,7 @@ char *path = a->u.fs.path; int pathlen = a->u.fs.pathlen; struct vnode *vp = a->u.fs.vp; +#if 0 struct vnode_attr va; struct vfs_context vfs_ctx = { tsk, tsk->p_ucred }; @@ -648,6 +649,11 @@ audit_log_format(ab, " inode=%llu, " "mountpoint=%s,", va.va_fileid, vp->v_mount->mnt_vfsstat.f_mntonname); +#else + if (vp != NULL) { + audit_log_format(ab, "mountpoint=%s,", + vp->v_mount->mnt_vfsstat.f_mntonname); +#endif if (path == NULL) { pathlen = MAXPATHLEN; pbuf = sebsd_malloc(MAXPATHLEN, From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:06: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 E23B316A57F; Mon, 11 Dec 2006 22:06:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A813216A500 for ; Mon, 11 Dec 2006 22:06:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A28B44562 for ; Mon, 11 Dec 2006 21:44:35 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLjY2m097787 for ; Mon, 11 Dec 2006 21:45:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLjYZT097784 for perforce@freebsd.org; Mon, 11 Dec 2006 21:45:34 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:45:34 GMT Message-Id: <200612112145.kBBLjYZT097784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111491 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, 11 Dec 2006 22:06:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=111491 Change 111491 by millert@millert_g5tower on 2006/12/11 21:45:10 Disable call to mac_thread_userret() at the end of Mach syscalls until we can be sure it is correct. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/hw_exception.s#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/hw_exception.s#4 (text+ko) ==== @@ -625,7 +625,7 @@ stw r0, saver3(r30) ; stash the high part of the return code stw r3,saver3+4(r30) ; Stash the low part of the return code beq-- cr0,.L_mach_invalid_ret ; otherwise fall through into the normal return path -#ifdef MAC +#ifdef MACXXX mr r3,r31 bl EXT(mac_thread_userret) #endif From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:06: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 1B42E16A40F; Mon, 11 Dec 2006 22:06:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ECF9C16A494 for ; Mon, 11 Dec 2006 22:06:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E633F43F6A for ; Mon, 11 Dec 2006 21:45:27 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLkavM097838 for ; Mon, 11 Dec 2006 21:46:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLkaZO097834 for perforce@freebsd.org; Mon, 11 Dec 2006 21:46:36 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:46:36 GMT Message-Id: <200612112146.kBBLkaZO097834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111493 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, 11 Dec 2006 22:06:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=111493 Change 111493 by millert@millert_g5tower on 2006/12/11 21:46:25 Rip out base policy support; it doesn't really add security. The only real way to guarantee that a module is loaded is to link it statically. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/Makeconfig.in#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#31 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#34 edit .. //depot/projects/trustedbsd/sedarwin8/policies/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/Makeconfig.in#3 (text+ko) ==== @@ -1,6 +1,6 @@ # List the security modules you want to use -SECURITY_MODULES ?= basetest sedarwin +SECURITY_MODULES ?= sedarwin # # You shouldn't have to edit anything else ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#31 (text+ko) ==== @@ -148,13 +148,6 @@ */ extern zone_t mac_audit_data_zone; -/* - * mac_static_base_mpc holds a pointer to the single instance of the base - * policy MAC configuration structure. This pointer must be set at boot, - * before the BSD init function is called. - */ -struct mac_policy_conf *mac_static_base_mpc = NULL; - /* * mac_policy_list holds the list of policy modules. Modules with a * handle lower than staticmax are considered "static" and cannot be @@ -438,11 +431,6 @@ struct mac_policy_conf *mpc; u_int i; - if (mac_static_base_mpc == NULL) - panic("Base MAC policy is not registered"); - else - mac_static_base_mpc->mpc_ops->mpo_base_notify_finalize(); - mac_audit_data_zone = zinit(MAC_AUDIT_DATA_LIMIT, AQ_HIWATER * MAC_AUDIT_DATA_LIMIT, 8192, "mac_audit_data_zone"); @@ -644,40 +632,6 @@ #endif } -static void -mac_base_policy_register(struct mac_policy_conf *mpc) -{ - int error; - u_int i; - struct mac_policy_conf *lmpc; - - if (mac_static_base_mpc != NULL) - panic("Attempt to load second MAC base policy"); - - mac_static_base_mpc = mpc; - - /* - * Tell the base policy about the static already-loaded modules. - * This code is executed at boot time. The base policy is - * responsible for halting the system, if desired. Otherwise - * the previously loaded module will stay in place. - */ - for (i = 0; i < mac_policy_list.staticmax; i++) { - lmpc = mac_get_mpc(i); - if (lmpc == NULL) - continue; - /* For now we'll check every policy regardless of dynamic flag. - If by some freak occurance a dynamic policy is loaded at - this point it needs to be approved as well. - */ - error = - mac_static_base_mpc->mpc_ops->mpo_base_check_module_load(lmpc); - if (error != 0) - printf("Module %s is not approved for loading.\n", - lmpc->mpc_name); - } -} - static __inline void mac_policy_fixup_mmd_list(struct mac_module_data *new) { @@ -751,17 +705,6 @@ mac_policy_grab_exclusive(); } - /* Call the base module to approve the loading of this MAC module. */ - if (mac_static_base_mpc != NULL) { - error = - mac_static_base_mpc->mpc_ops->mpo_base_check_module_load(mpc); - if (error != 0) { - printf("Module %s is not approved for loading.\n", - mpc->mpc_name); - goto out; - } - } - if (mac_policy_list.numloaded >= mac_policy_list.max) { /* allocate new policy list array, zero new chunk */ tmac_policy_list_element = @@ -867,9 +810,6 @@ mac_policy_updateflags(); - if ((mpc->mpc_loadtime_flags & MPC_LOADTIME_BASE_POLICY) != 0) - mac_base_policy_register(mpc); - if (mac_late) mac_policy_release_exclusive(); @@ -905,17 +845,6 @@ return (0); } - /* Call the base module to approve the unloading of this MAC module. */ - if (mac_static_base_mpc != NULL) { - error = - mac_static_base_mpc->mpc_ops->mpo_base_check_module_unload(mpc); - if (error != 0) { - printf("Module %s is not approved for unloading.\n", - mpc->mpc_name); - mac_policy_release_exclusive(); - return (EBUSY); - } - } #if 0 /* * Don't allow unloading modules with private data. ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#34 (text+ko) ==== @@ -185,48 +185,6 @@ void *args ); /** - @brief Base Policy approve MAC module load event - @param mpc MAC policy configuration - - This function is called when a MAC policy is loaded. The Base policy - can perform a series of checks on the MAC policy, and return 0 - if the MAC policy load is approved, non-zero otherwise. In the non-zero - case, the MAC framework will not incorporate the policy, and the failure - will be logged. - - @return On success, 0, otherwise, an appropriate errno return value. -*/ -typedef int mpo_base_check_module_load_t( - struct mac_policy_conf *mpc -); -/** - @brief Base Policy approve MAC module unload event - @param mpc MAC policy configuration - - This function is called when a MAC policy is unloaded. The Base policy - can perform a series of checks on the MAC policy, and return 0 - if the MAC policy unload is approved, non-zero otherwise. In the non-zero - case, the MAC framework will not unload the policy, and the failure - will be logged. - - @return On success, 0, otherwise, an appropriate errno return value. -*/ -typedef int mpo_base_check_module_unload_t( - struct mac_policy_conf *mpc -); -/** - @brief Base Policy finalize event - - This function is called when the MAC framework is finishing its setup - during BSD subsystem initilization. The Base policy can perform a final - check on MAC policy registrations, and panic the system if so desired. - A return from this function means that the MAC framework is ready to go. - As an example, the Base policy can check a list of required - MAC policies, and if not all are present, panic. - -*/ -typedef void mpo_base_notify_finalize_t(void); -/** @brief Indicate desire to change the process label at exec time @param old Existing subject credential @param vp File being executed @@ -5028,9 +4986,6 @@ struct mac_policy_ops { mpo_audit_check_postselect_t *mpo_audit_check_postselect; mpo_audit_check_preselect_t *mpo_audit_check_preselect; - mpo_base_check_module_load_t *mpo_base_check_module_load; - mpo_base_check_module_unload_t *mpo_base_check_module_unload; - mpo_base_notify_finalize_t *mpo_base_notify_finalize; mpo_cred_check_label_update_execve_t *mpo_cred_check_label_update_execve; mpo_cred_check_label_update_t *mpo_cred_check_label_update; mpo_cred_check_visible_t *mpo_cred_check_visible; ==== //depot/projects/trustedbsd/sedarwin8/policies/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ -SUBDIR= basetest color console count device_access extattr_test \ - fwinteg ipctrace mls multilabel none readonly stacktrace \ +SUBDIR= color console count device_access extattr_test \ + ipctrace mls multilabel none readonly stacktrace \ stub test vanity xattr SUBDIR+= sedarwin From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:07: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 6DA0016A515; Mon, 11 Dec 2006 22:07:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2C6C416A49E for ; Mon, 11 Dec 2006 22:07:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4272944061 for ; Mon, 11 Dec 2006 21:46:30 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLlc6W097987 for ; Mon, 11 Dec 2006 21:47:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLlcA9097984 for perforce@freebsd.org; Mon, 11 Dec 2006 21:47:38 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:47:38 GMT Message-Id: <200612112147.kBBLlcA9097984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111495 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, 11 Dec 2006 22:07:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=111495 Change 111495 by millert@millert_g5tower on 2006/12/11 21:47:12 Update to new mac_thread_userret() API. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#52 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#52 (text+ko) ==== @@ -3503,7 +3503,7 @@ } static void -sebsd_thread_userret(struct thread *thread) +sebsd_thread_userret(int code, int error, struct thread *thread) { /* Process any pending audit log records at syscall exit. */ From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:07: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 C502C16A58C; Mon, 11 Dec 2006 22:07:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33C6416A501 for ; Mon, 11 Dec 2006 22:07:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BA424405D for ; Mon, 11 Dec 2006 21:46:30 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLlcqt097981 for ; Mon, 11 Dec 2006 21:47:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLlcJX097978 for perforce@freebsd.org; Mon, 11 Dec 2006 21:47:38 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:47:38 GMT Message-Id: <200612112147.kBBLlcJX097978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111494 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, 11 Dec 2006 22:07:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=111494 Change 111494 by millert@millert_g5tower on 2006/12/11 21:46:49 Add code and error fields to mac_thread_userret() and move it to mac_process.c where it belongs. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/dev/ppc/systemcalls.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#32 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#27 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#35 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/dev/ppc/systemcalls.c#4 (text+ko) ==== @@ -221,7 +221,7 @@ error = (*(callp->sy_call))(proc, (void *)uthread->uu_arg, &(uthread->uu_rval[0])); #ifdef MAC AUDIT_SYSCALL_EXIT(code, error, proc, uthread); - mac_thread_userret(thread_act); + mac_thread_userret(code, error, thread_act); #else AUDIT_SYSCALL_EXIT(error, proc, uthread); #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#32 (text+ko) ==== @@ -1162,14 +1162,6 @@ return (error); } -void -mac_thread_userret(struct thread *thread) -{ - - if (mac_late) - MAC_PERFORM(thread_userret, thread); -} - /* system calls */ int ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#27 (text+ko) ==== @@ -328,7 +328,7 @@ void mac_sysvshm_label_init(struct shmid_kernel* shmsegptr); void mac_sysvshm_label_recycle(struct shmid_kernel *shmsegptr); int mac_task_check_get_port(struct ucred *cred, struct task *task); -void mac_thread_userret(struct thread *thread); +void mac_thread_userret(int code, int error, struct thread *thread); int mac_vnode_check_access(struct ucred *cred, struct vnode *vp, int acc_mode); int mac_vnode_check_chdir(struct ucred *cred, struct vnode *dvp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#35 (text+ko) ==== @@ -3844,13 +3844,17 @@ ); /** @brief Perform MAC-related events when a thread returns to user space - @param thread Mach thread that is returning + @param code The number of the syscall/trap that has finished + @param error The error code that will be returned to user space + @param thread Mach (not BSD) thread that is returning This entry point permits policy modules to perform MAC-related events when a thread returns to user space, via a system call return, trap return, or otherwise. */ typedef void mpo_thread_userret_t( + int code, + int error, struct thread *thread ); /** ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#13 (text+ko) ==== @@ -398,3 +398,10 @@ return (error); } +void +mac_thread_userret(int code, int error, struct thread *thread) +{ + + if (mac_late) + MAC_PERFORM(thread_userret, code, error, thread); +} From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:09:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60A8C16A415; Mon, 11 Dec 2006 22:09:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 36DD216A403 for ; Mon, 11 Dec 2006 22:09:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65BA844220 for ; Mon, 11 Dec 2006 21:49:37 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLohJ8098248 for ; Mon, 11 Dec 2006 21:50:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLohDX098245 for perforce@freebsd.org; Mon, 11 Dec 2006 21:50:43 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:50:43 GMT Message-Id: <200612112150.kBBLohDX098245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111496 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, 11 Dec 2006 22:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=111496 Change 111496 by millert@millert_macbook on 2006/12/11 21:50:25 Add a new test module to log file access and exec. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/filewatch/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/filewatch/mac_filewatch.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -SUBDIR= color console count device_access extattr_test \ +SUBDIR= color console count device_access extattr_test filewatch \ ipctrace mls multilabel none readonly stacktrace \ stub test vanity xattr SUBDIR+= sedarwin From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:12: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 B520916A4AB; Mon, 11 Dec 2006 22:12:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7766416A412 for ; Mon, 11 Dec 2006 22:12:35 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 106F0442F7 for ; Mon, 11 Dec 2006 21:53:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLsmF9099537 for ; Mon, 11 Dec 2006 21:54:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLsmq9099532 for perforce@freebsd.org; Mon, 11 Dec 2006 21:54:48 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:54:48 GMT Message-Id: <200612112154.kBBLsmq9099532@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111497 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, 11 Dec 2006 22:12:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=111497 Change 111497 by millert@millert_macbook on 2006/12/11 21:54:33 Update policy. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules.conf#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.fc#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mds.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mds.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mds.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.if#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/authlogin.fc#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.if#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules.conf#6 (text+ko) ==== @@ -1631,6 +1631,7 @@ KernelEventAgent = module kextd = module lookupd = module +mds = module ATconfig = module ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.fc#5 (text+ko) ==== @@ -3,6 +3,8 @@ # MLS sensitivity: s0 # MCS categories: +/private/var/log/windowserver.log -- gen_context(system_u:object_r:WindowServer_var_log_t,s0) + /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/WindowServer -- gen_context(system_u:object_r:WindowServer_exec_t,s0) /System/Library/Displays.* gen_context(system_u:object_r:WindowServer_resource_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#8 (text+ko) ==== @@ -11,6 +11,9 @@ domain_type(WindowServer_t) init_domain(WindowServer_t, WindowServer_exec_t) +type WindowServer_var_log_t; +logging_log_file(WindowServer_var_log_t) + ######################################## # # WindowServer local policy @@ -26,6 +29,12 @@ allow WindowServer_t self:fifo_file { read write }; allow WindowServer_t self:unix_stream_socket create_stream_socket_perms; +# log files +allow WindowServer_t WindowServer_var_log_t:file create_file_perms; +allow WindowServer_t WindowServer_var_log_t:sock_file create_file_perms; +allow WindowServer_t WindowServer_var_log_t:dir { rw_dir_perms setattr }; +logging_log_filetrans(WindowServer_t,WindowServer_var_log_t,{ sock_file file dir }) + # Allow WindowServer to re-exec itself allow WindowServer_t WindowServer_exec_t:file execute_no_trans; @@ -124,3 +133,5 @@ userdom_search_all_users_home_content(WindowServer_t) userdom_read_all_users_home_content_files(WindowServer_t) +# Read files in /tmp +files_read_generic_tmp_files(WindowServer_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#9 (text+ko) ==== @@ -157,8 +157,15 @@ # Read CoreServices libs, etc darwin_allow_CoreServices_read(configd_t) -# Read /private/var +# Read/write /private/var +files_rw_var_files(configd_t) +# Add files_read_var_files() since it allows reading of symlinks where +# files_rw_var_files does not. files_read_var_files(configd_t) +files_search_var(configd_t) +# Not sure why it wants to search this dir, it should know what it wants +allow configd_t var_log_t:dir search; + # Read /private darwin_allow_private_read(configd_t) @@ -169,3 +176,28 @@ # I'm certain there's a "proper" way to do this... allow configd_t port_t:tcp_socket name_connect; +# Read securityd temp files +securityd_tmp_rw(configd_t) + +# Read darwin_security_t files +darwin_allow_security_read(configd_t) + +# Read/write/manage keychain files +darwin_allow_keychain_rw(configd_t) +darwin_allow_keychain_manage(configd_t) + +# Read files in /tmp +files_getattr_tmp_dirs(configd_t) +files_search_tmp(configd_t) +files_read_generic_tmp_files(configd_t) +files_manage_generic_tmp_files(configd_t) + +# Read keychain files +darwin_allow_keychain_search(configd_t) +darwin_allow_keychain_read(configd_t) + +# Read user home dirs +userdom_search_all_users_home_content(configd_t) +userdom_read_all_users_home_content_files(configd_t) +userdom_manage_all_users_home_content_files(configd_t) + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.fc#2 (text+ko) ==== @@ -3,4 +3,4 @@ # MLS sensitivity: s0 # MCS categories: -/System/Library/CoreServices/coreservicesd -- gen_context(system_u:object_r:coreservicesd_exec_t,s0) +/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd -- gen_context(system_u:object_r:coreservicesd_exec_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#2 (text+ko) ==== @@ -24,3 +24,59 @@ ## internal communication is often done using fifo and unix sockets. allow coreservicesd_t self:fifo_file { read write }; allow coreservicesd_t self:unix_stream_socket create_stream_socket_perms; + +# Talk to self +mach_allow_message(coreservicesd_t, coreservicesd_t) +allow coreservicesd_t self:mach_task set_special_port; +allow coreservicesd_t self:process signal; +allow coreservicesd_t self:shm { create read setattr write }; +allow coreservicesd_t self:udp_socket create; + +# Talk to launchd +init_allow_ipc(coreservicesd_t) + +# Talk to kernel +kernel_allow_ipc(coreservicesd_t) + +# Talk to WindowServer +WindowServer_allow_ipc(coreservicesd_t) + +# Talk to configd +configd_allow_ipc(coreservicesd_t) + +# Use CoreServices +darwin_allow_CoreServices_read(coreservicesd_t) +darwin_allow_CoreServices_execute(coreservicesd_t) + +# Use caches +darwin_allow_cache_read(coreservicesd_t) + +# Read prefs +darwin_allow_global_pref_read(coreservicesd_t) +darwin_allow_host_pref_read(coreservicesd_t) + +# Read /private +darwin_allow_private_read(coreservicesd_t) + +# Talk to diskarbitrationd +diskarbitrationd_allow_ipc(coreservicesd_t) + +# Use frameworks +frameworks_read(coreservicesd_t) + +# Talk to loginwindow +loginwindow_allow_ipc(coreservicesd_t) +# An interface should be defined for this. +allow coreservicesd_t loginwindow_t:process taskforpid; + +# Read user home dirs +userdom_search_all_users_home_content(coreservicesd_t) +userdom_read_all_users_home_content_files(coreservicesd_t) + +# Read var files +files_read_var_files(coreservicesd_t) +files_read_var_symlinks(coreservicesd_t) + + + + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#5 (text+ko) ==== @@ -27,6 +27,7 @@ # Misc allow kextd_t self:fd use; +allow kextd_t fs_t:filesystem getattr; allow kextd_t self:mach_port { copy_send make_send_once send }; allow kextd_t random_device_t:chr_file read; allow kextd_t nfs_t:filesystem getattr; @@ -76,6 +77,8 @@ # Use tmp files files_tmp_file(kextd_t) +files_manage_generic_tmp_files(kextd_t) +files_manage_generic_tmp_files(kextd_t) # Read /private/var files_read_var_files(kextd_t) @@ -87,6 +90,8 @@ # Read the kernel kernel_read_kernel(kextd_t) - # Use CoreServices darwin_allow_CoreServices_read(kextd_t) + +# Read modules +modutils_read_module_deps(kextd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#6 (text+ko) ==== @@ -82,7 +82,7 @@ darwin_allow_CoreServices_execute(loginwindow_t) # Read prefs -darwin_allow_global_pref_read(loginwindow_t) +darwin_allow_global_pref_rw(loginwindow_t) darwin_allow_host_pref_read(loginwindow_t) # Read /private @@ -117,6 +117,7 @@ # Read/Write utmp init_rw_utmp(loginwindow_t) +init_manage_utmp(loginwindow_t) # Use login plugins darwin_allow_loginplugin_read(loginwindow_t) @@ -131,3 +132,16 @@ # Read services files darwin_allow_services_read(loginwindow_t) +# Access tmp files +files_read_generic_tmp_files(loginwindow_t) +files_manage_generic_tmp_files(loginwindow_t) + +# /var file operations +files_rw_var_files(loginwindow_t) +files_read_var_symlinks(loginwindow_t) +files_search_var(loginwindow_t) +files_read_var_symlinks(loginwindow_t) + +# Write to WTMP +auth_write_login_records(loginwindow_t) + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.if#4 (text+ko) ==== @@ -53,3 +53,34 @@ allow $1 securityd_tmp_t:dir search_dir_perms; ') +######################################## +## +## Allow read/write of securityd tmp files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`securityd_tmp_rw',` + + allow $1 securityd_tmp_t:file rw_file_perms; + allow $1 securityd_tmp_t:dir search_dir_perms; +') + +######################################## +## +## Allow managing of securityd tmp files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`securityd_tmp_manage',` + + allow $1 securityd_tmp_t:file manage_file_perms; + allow $1 securityd_tmp_t:dir manage_dir_perms; +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#5 (text+ko) ==== @@ -96,9 +96,17 @@ # Read/Write temp files, etc files_read_generic_tmp_files(securityd_t) -securityd_tmp_read(securityd_t) +files_read_generic_tmp_symlinks(securityd_t) +files_manage_generic_tmp_files(securityd_t) +# Aind since there's not interface to write tmp files... +allow securityd_t tmp_t:file { create unlink write }; + +securityd_tmp_rw(securityd_t) +securityd_tmp_manage(securityd_t) # Read user home dirs userdom_search_all_users_home_content(securityd_t) userdom_read_all_users_home_content_files(securityd_t) +# Allow reading of security_t files +darwin_allow_security_read(securityd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/authlogin.fc#4 (text+ko) ==== @@ -12,7 +12,6 @@ /private/var/log/asl.log -- gen_context(system_u:object_r:var_log_t,s0) /private/var/log/netinfo.log -- gen_context(system_u:object_r:var_log_t,s0) /private/var/log/install.log -- gen_context(system_u:object_r:var_log_t,s0) -/private/var/log/windowserver.log -- gen_context(system_u:object_r:var_log_t,s0) /private/var/log/wtmp.* -- gen_context(system_u:object_r:wtmp_t,s0) /private/var/run/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.if#4 (text+ko) ==== @@ -255,6 +255,7 @@ allow $1 darwin_loginplugin_t:file read_file_perms; allow $1 darwin_loginplugin_t:dir r_dir_perms; + allow $1 darwin_loginplugin_t:lnk_file r_file_perms; ') @@ -500,7 +501,7 @@ ') allow $1 darwin_security_t:file read_file_perms; - allow $1 darwin_security_t:file r_dir_perms; + allow $1 darwin_security_t:dir r_dir_perms; ') ######################################## @@ -556,7 +557,25 @@ ') allow $1 darwin_keychain_t:file read_file_perms; - allow $1 darwin_keychain_t:file r_dir_perms; + allow $1 darwin_keychain_t:dir r_dir_perms; +') + +######################################## +## +## Allow searching of keychain files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_keychain_search',` + gen_require(` + type darwin_keychain_t; + ') + + allow $1 darwin_keychain_t:dir search_dir_perms; ') ######################################## ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#7 (text+ko) ==== @@ -672,3 +672,8 @@ darwin_allow_private_manage(init_t) darwin_allow_private_rw(init_t) +# Allow keychain access +darwin_allow_keychain_read(init_t) + +# Allow access to security files +darwin_allow_security_read(init_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.te#5 (text+ko) ==== @@ -134,6 +134,13 @@ userdom_dontaudit_use_unpriv_user_fds(syslogd_t) userdom_dontaudit_search_sysadm_home_dirs(syslogd_t) +# Talk to launchd +init_allow_ipc(syslogd_t) +init_allow_bootstrap(syslogd_t) + +# Talk to kernel +kernel_allow_ipc(syslogd_t) + # Talk to self allow syslogd_t self:socket read; From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22:21: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 29D6316A5AD; Mon, 11 Dec 2006 22:21:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF47F16A5AA for ; Mon, 11 Dec 2006 22:21:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA20943CA1 for ; Mon, 11 Dec 2006 22:20:06 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBMLPFi006676 for ; Mon, 11 Dec 2006 22:21:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBMLPSo006673 for perforce@freebsd.org; Mon, 11 Dec 2006 22:21:25 GMT (envelope-from imp@freebsd.org) Date: Mon, 11 Dec 2006 22:21:25 GMT Message-Id: <200612112221.kBBMLPSo006673@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 111503 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, 11 Dec 2006 22:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=111503 Change 111503 by imp@imp_lighthouse on 2006/12/11 22:21:17 Learn how to shift left one. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370.hints#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370.hints#6 (text+ko) ==== @@ -24,7 +24,7 @@ hint.icee.2.rd_sz=128 hint.icee.2.wr_sz=8 # input card ltc4305: 0xb0 -# daughter card ltc4305: 0xb1 +# daughter card ltc4305: 0xb2 # ps eeprom hint.icee.3.at="iicbus0" hint.icee.3.addr=0xc0 From owner-p4-projects@FreeBSD.ORG Mon Dec 11 22: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 4EB9616A47C; Mon, 11 Dec 2006 22:24:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2778816A412 for ; Mon, 11 Dec 2006 22:24:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31D1E43D49 for ; Mon, 11 Dec 2006 22:21:22 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBMMeaD007002 for ; Mon, 11 Dec 2006 22:22:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBMMQgf006917 for perforce@freebsd.org; Mon, 11 Dec 2006 22:22:26 GMT (envelope-from jhb@freebsd.org) Date: Mon, 11 Dec 2006 22:22:26 GMT Message-Id: <200612112222.kBBMMQgf006917@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 111504 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, 11 Dec 2006 22:24:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=111504 Change 111504 by jhb@jhb_mutex on 2006/12/11 22:22:17 IFC @111476. Affected files ... .. //depot/projects/smpng/sys/Makefile#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#62 integrate .. //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#70 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#56 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#53 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#26 integrate .. //depot/projects/smpng/sys/amd64/include/reg.h#8 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#19 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#22 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/genassym.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/nexus_io.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#37 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#7 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pio.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#13 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#9 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#1 branch .. //depot/projects/smpng/sys/arm/include/bus.h#8 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#8 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#14 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#8 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_space.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#23 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/obio_space.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/smpng/sys/boot/common/loader.8#42 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/smpng/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/hcall.S#2 delete .. //depot/projects/smpng/sys/cam/cam_ccb.h#10 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#23 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#39 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#30 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#14 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#72 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#13 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#26 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#14 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#22 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#52 integrate .. //depot/projects/smpng/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#23 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#76 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#35 integrate .. //depot/projects/smpng/sys/conf/NOTES#132 integrate .. //depot/projects/smpng/sys/conf/files#192 integrate .. //depot/projects/smpng/sys/conf/files.arm#11 integrate .. //depot/projects/smpng/sys/conf/files.sun4v#3 integrate .. //depot/projects/smpng/sys/conf/kern.mk#18 integrate .. //depot/projects/smpng/sys/conf/options#130 integrate .. //depot/projects/smpng/sys/conf/options.arm#12 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#38 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#44 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#11 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#14 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#15 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#19 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#16 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#11 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#16 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#18 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#35 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#45 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#25 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#81 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#46 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#16 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_mca.c#8 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#49 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#12 integrate .. //depot/projects/smpng/sys/dev/dc/if_dcreg.h#6 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#8 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#78 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#39 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#28 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#22 integrate .. //depot/projects/smpng/sys/dev/flash/at45d.c#1 branch .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#78 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#19 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#30 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#12 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#33 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#10 integrate .. //depot/projects/smpng/sys/dev/iicbus/ad7418.c#1 branch .. //depot/projects/smpng/sys/dev/iicbus/ds1672.c#1 branch .. //depot/projects/smpng/sys/dev/iicbus/iic.c#13 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.h#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbb.c#7 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#9 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus_if.m#4 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.c#5 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.h#5 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#48 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#49 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.c#8 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.h#4 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#44 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#18 integrate .. //depot/projects/smpng/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#22 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#24 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#34 integrate .. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#15 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#22 integrate .. //depot/projects/smpng/sys/dev/le/am7990.c#4 integrate .. //depot/projects/smpng/sys/dev/le/am79900.c#4 integrate .. //depot/projects/smpng/sys/dev/le/lance.c#3 integrate .. //depot/projects/smpng/sys/dev/le/lancevar.h#3 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/acphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/amphy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/bmtphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#34 integrate .. //depot/projects/smpng/sys/dev/mii/ciphy.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/smpng/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/smpng/sys/dev/mii/inphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/smpng/sys/dev/mii/lxtphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#20 integrate .. //depot/projects/smpng/sys/dev/mii/miivar.h#8 integrate .. //depot/projects/smpng/sys/dev/mii/mlphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphy.c#17 integrate .. //depot/projects/smpng/sys/dev/mii/nsphy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/pnaphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/qsphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#18 integrate .. //depot/projects/smpng/sys/dev/mii/tdkphy.c#17 integrate .. //depot/projects/smpng/sys/dev/mii/tlphy.c#16 integrate .. //depot/projects/smpng/sys/dev/mii/xmphy.c#16 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#29 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#21 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#18 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#17 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#15 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/smpng/sys/dev/nve/if_nvereg.h#5 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#78 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpo.c#10 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#46 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#23 integrate .. //depot/projects/smpng/sys/dev/rp/rpreg.h#4 integrate .. //depot/projects/smpng/sys/dev/rp/rpvar.h#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#46 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#34 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.h#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.h#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#38 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#14 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#40 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/fake.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.h#8 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#26 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#35 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#28 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#14 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/FILES#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#44 integrate .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#98 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#24 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#17 integrate .. //depot/projects/smpng/sys/dev/wds/wd7000.c#8 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#83 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#24 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#17 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#50 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#37 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#24 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.h#5 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#27 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#26 integrate .. //depot/projects/smpng/sys/fs/unionfs/union.h#13 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#26 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#30 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#32 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#34 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#27 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#121 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#111 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#33 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#50 integrate .. //depot/projects/smpng/sys/ia64/ia64/genassym.c#29 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#36 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#107 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#34 integrate .. //depot/projects/smpng/sys/ia64/include/kdb.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/pcpu.h#6 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#9 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#53 integrate .. //depot/projects/smpng/sys/kern/init_main.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#104 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#88 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#96 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#29 integrate .. //depot/projects/smpng/sys/kern/ksched.c#2 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#16 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#64 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#71 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#50 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#31 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#82 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#33 integrate .. //depot/projects/smpng/sys/kern/tty.c#68 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#96 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#23 integrate .. //depot/projects/smpng/sys/modules/Makefile#131 integrate .. //depot/projects/smpng/sys/modules/isp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/smpng/sys/net/bridgestp.c#16 integrate .. //depot/projects/smpng/sys/net/bridgestp.h#6 integrate .. //depot/projects/smpng/sys/net/ethernet.h#10 integrate .. //depot/projects/smpng/sys/net/if.c#89 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#23 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#41 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#15 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#77 integrate .. //depot/projects/smpng/sys/net/if_llc.h#7 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#45 integrate .. //depot/projects/smpng/sys/net/if_pppvar.h#12 integrate .. //depot/projects/smpng/sys/net/netisr.c#11 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#23 integrate .. //depot/projects/smpng/sys/net/route.c#31 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#33 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#19 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#70 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.h#3 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#89 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#54 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#37 integrate .. //depot/projects/smpng/sys/nfs/nfsproto.h#6 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#5 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vn_subs.c#5 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#33 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#28 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#26 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#48 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#57 integrate .. //depot/projects/smpng/sys/nfsclient/nfsdiskless.h#8 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#19 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#49 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#35 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#19 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#42 integrate .. //depot/projects/smpng/sys/pci/if_pcnreg.h#9 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#66 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#34 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#70 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#20 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#18 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#27 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#71 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_oea.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/uio_machdep.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/autoconf.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#19 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#40 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#83 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#15 integrate .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_diff.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_findname.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_fini.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/t1_copy.S#1 branch .. //depot/projects/smpng/sys/sun4v/conf/DEFAULTS#4 integrate .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/smpng/sys/sun4v/conf/NOTES#3 integrate .. //depot/projects/smpng/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/cache.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/hv_api.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/hypervisor_api.h#3 delete .. //depot/projects/smpng/sys/sun4v/include/hypervisorvar.h#4 integrate .. //depot/projects/smpng/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/pmap.h#3 integrate .. //depot/projects/smpng/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/tte_hash.h#4 integrate .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_diff.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_findname.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_findnodeprop.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_fini.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getbinsize.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getgen.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropdata.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropstr.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropval.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_init_intern.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_nodecount.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_rootnode.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_scandag.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/autoconf.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/clock.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/counter.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/db_disasm.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/eeprom.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/elf_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/gdb_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/identcpu.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/in_cksum.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/iommu.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mem.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/ofw_bus.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/ofw_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/prof_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/rtc.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/rwindow.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/support.S#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/sys_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/t1_copy.S#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/tlb.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/smpng/sys/sys/param.h#107 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#17 integrate .. //depot/projects/smpng/sys/sys/proc.h#174 integrate .. //depot/projects/smpng/sys/sys/rtprio.h#7 integrate .. //depot/projects/smpng/sys/sys/runq.h#7 integrate .. //depot/projects/smpng/sys/sys/sched.h#25 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#13 integrate .. //depot/projects/smpng/sys/sys/uio.h#23 integrate .. //depot/projects/smpng/sys/sys/umtx.h#19 integrate .. //depot/projects/smpng/sys/sys/vmmeter.h#6 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#59 integrate .. //depot/projects/smpng/sys/vm/vm_kern.h#7 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#31 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#87 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#32 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.39 2006/11/11 16:26:55 trhodes Exp $ +# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ .include @@ -8,8 +8,8 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ - isofs kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ + isa isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.79 2006/11/17 19:20:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.80 2006/11/17 20:27:00 jhb Exp $"); #include #include @@ -562,7 +562,7 @@ } /* - * we can watch a 1, 2, or 4 byte sized location + * we can watch a 1, 2, 4, or 8 byte sized location */ switch (size) { case 1: @@ -574,6 +574,9 @@ case 4: len = DBREG_DR7_LEN_4; break; + case 8: + len = DBREG_DR7_LEN_8; + break; default: return (-1); } @@ -624,12 +627,14 @@ avail++; } - if (avail * 4 < size) + if (avail * 8 < size) return (-1); for (i = 0; i < 4 && (size > 0); i++) { if (!DBREG_DR7_ENABLED(d.dr[7], i)) { - if (size > 2) + if (size >= 8 || (avail == 1 && size > 4)) + wsize = 8; + else if (size > 2) wsize = 4; else wsize = size; @@ -637,6 +642,7 @@ DBREG_DR7_WRONLY, &d); addr += wsize; size -= wsize; + avail--; } } @@ -699,8 +705,12 @@ if (DBREG_DR7_ENABLED(d.dr[7], i)) { type = DBREG_DR7_ACCESS(d.dr[7], i); len = DBREG_DR7_LEN(d.dr[7], i); + if (len == DBREG_DR7_LEN_8) + len = 8; + else + len++; db_printf(" %-5d %-8s %10s %3d ", - i, "enabled", watchtype_str(type), len + 1); + i, "enabled", watchtype_str(type), len); db_printsym((db_addr_t)DBREG_DRX((&d), i), DB_STGY_ANY); db_printf("\n"); } else { ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#17 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.159 2006/11/30 04:17:04 jb Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -185,7 +185,6 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#62 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.662 2006/11/17 19:20:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -833,7 +834,7 @@ static void getmemsize(caddr_t kmdp, u_int64_t first) { - int i, physmap_idx, pa_indx, da_indx; + int i, off, physmap_idx, pa_indx, da_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; u_long physmem_tunable; pt_entry_t *pte; @@ -1096,14 +1097,17 @@ /* Trim off space for the message buffer. */ phys_avail[pa_indx] -= round_page(MSGBUF_SIZE); - avail_end = phys_avail[pa_indx]; + /* Map the message buffer. */ + for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) + pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + + off); } u_int64_t hammer_time(u_int64_t modulep, u_int64_t physfree) { caddr_t kmdp; - int gsel_tss, off, x; + int gsel_tss, x; struct pcpu *pc; u_int64_t msr; char *env; @@ -1118,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); @@ -1270,10 +1270,6 @@ /* now running on new page tables, configured,and u/iom is accessible */ - /* Map the message buffer. */ - for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) - pmap_kenter((vm_offset_t)msgbufp + off, avail_end + off); - msgbufinit(msgbufp, MSGBUF_SIZE); fpuinit(); @@ -1711,7 +1707,8 @@ for (i = 0; i < 4; i++) { if (DBREG_DR7_ACCESS(dbregs->dr[7], i) == 0x02) return (EINVAL); - if (DBREG_DR7_LEN(dbregs->dr[7], i) == 0x02) + if (td->td_frame->tf_cs == _ucode32sel && + DBREG_DR7_LEN(dbregs->dr[7], i) == DBREG_DR7_LEN_8) return (EINVAL); } if ((dbregs->dr[6] & 0xffffffff00000000ul) != 0 || ==== //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include #include @@ -215,7 +215,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is an entire 2M page. */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { if (is_dumpable(pa)) dump_add_page(pa); @@ -326,7 +326,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is a single 2M block. Generate a fake PTP */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { fakept[k] = (pa + (k * PAGE_SIZE)) | PG_V | PG_RW | PG_A | PG_M; } ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#70 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.573 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); /* * Manages physical address maps. @@ -168,8 +168,7 @@ struct pmap kernel_pmap_store; -vm_paddr_t avail_start; /* PA of first available physical page */ -vm_paddr_t avail_end; /* PA of last available physical page */ +static vm_paddr_t avail_start; /* PA of first available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ @@ -948,9 +947,7 @@ pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract: bad pde")); - rtval = (pde & PG_FRAME) | (va & PDRMASK); + rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); PMAP_UNLOCK(pmap); return rtval; } @@ -983,9 +980,7 @@ if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract_and_hold: bad pde")); - m = PHYS_TO_VM_PAGE((pde & PG_FRAME) | + m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); vm_page_hold(m); } @@ -1014,7 +1009,7 @@ } else { pde = vtopde(va); if (*pde & PG_PS) { - pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); } else { pa = *vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); @@ -1613,7 +1608,7 @@ #define PC_FREE1 0xfffffffffffffffful #define PC_FREE2 0x000000fffffffffful -static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +static uint64_t pc_freemask[_NPCM] = { PC_FREE0, PC_FREE1, PC_FREE2 }; SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, "Current number of pv entries"); @@ -2127,7 +2122,8 @@ return; } - if (prot & VM_PROT_WRITE) + if ((prot & (VM_PROT_WRITE|VM_PROT_EXECUTE)) == + (VM_PROT_WRITE|VM_PROT_EXECUTE)) return; anychanged = 0; @@ -2163,7 +2159,10 @@ * Check for large page. */ if ((ptpaddr & PG_PS) != 0) { - *pde &= ~(PG_M|PG_RW); + if ((prot & VM_PROT_WRITE) == 0) + *pde &= ~(PG_M|PG_RW); + if ((prot & VM_PROT_EXECUTE) == 0) + *pde |= pg_nx; anychanged = 1; continue; } @@ -2178,6 +2177,8 @@ retry: obits = pbits = *pte; + if ((pbits & PG_V) == 0) + continue; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { @@ -2193,7 +2194,10 @@ } } - pbits &= ~(PG_RW | PG_M); + if ((prot & VM_PROT_WRITE) == 0) + pbits &= ~(PG_RW | PG_M); + if ((prot & VM_PROT_EXECUTE) == 0) + pbits |= pg_nx; if (pbits != obits) { if (!atomic_cmpset_long(pte, obits, pbits)) ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#56 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.311 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.312 2006/11/28 20:04:00 ru Exp $"); /* * AMD64 Trap and System call handling @@ -646,9 +646,10 @@ #endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%lx\n", eva); - printf("fault code = %s %s, %s\n", + printf("fault code = %s %s %s, %s\n", code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", + code & PGEX_I ? "instruction" : "data", code & PGEX_P ? "protection violation" : "page not present"); } printf("instruction pointer = 0x%lx:0x%lx\n", ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#53 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.468 2006/10/26 22:11:34 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ cpu HAMMER ident GENERIC @@ -71,11 +71,6 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Linux 32-bit ABI support -options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS # Cannot be a module yet. -options LINSYSFS - # Bus support. device acpi device pci ==== //depot/projects/smpng/sys/amd64/include/pmap.h#26 (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.136 2006/11/13 20:33:54 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -71,6 +71,7 @@ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 #define PG_FRAME (0x000ffffffffff000ul) +#define PG_PS_FRAME (0x000fffffffe00000ul) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ @@ -296,7 +297,6 @@ extern caddr_t CADDR1; extern pt_entry_t *CMAP1; -extern vm_paddr_t avail_end; extern vm_paddr_t phys_avail[]; extern vm_paddr_t dump_avail[]; extern vm_offset_t virtual_avail; ==== //depot/projects/smpng/sys/amd64/include/reg.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/reg.h,v 1.37 2006/11/17 19:20:31 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/reg.h,v 1.38 2006/11/17 20:27:01 jhb Exp $ */ #ifndef _MACHINE_REG_H_ @@ -97,6 +97,7 @@ #define DBREG_DR7_LEN_1 0x00 /* 1 byte length */ #define DBREG_DR7_LEN_2 0x01 #define DBREG_DR7_LEN_4 0x03 +#define DBREG_DR7_LEN_8 0x02 #define DBREG_DR7_EXEC 0x00 /* break on execute */ #define DBREG_DR7_WRONLY 0x01 /* break on write */ #define DBREG_DR7_RDWR 0x03 /* break on read or write */ ==== //depot/projects/smpng/sys/amd64/isa/clock.c#19 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); /* * Routines to handle clock hardware. @@ -115,6 +115,7 @@ static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; +static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -421,24 +422,30 @@ u_char val; RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } val = inb(IO_RTC + 1); - inb(0x84); RTC_UNLOCK; return (val); } -static __inline void -writertc(u_char reg, u_char val) +static void +writertc(int reg, u_char val) { RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } + outb(IO_RTC + 1, val); inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ RTC_UNLOCK; } ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1118,7 +1118,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: - break; + return EOPNOTSUPP; } return error; } ==== //depot/projects/smpng/sys/arm/arm/cpufunc.c#13 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 11 23:21: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 23B6616A415; Mon, 11 Dec 2006 23:21:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F1A4016A40F for ; Mon, 11 Dec 2006 23:21:54 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43C5843CD4 for ; Mon, 11 Dec 2006 23:19:59 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBNLCLI027412 for ; Mon, 11 Dec 2006 23:21:12 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBNLBdW027393 for perforce@freebsd.org; Mon, 11 Dec 2006 23:21:11 GMT (envelope-from ticso@freebsd.org) Date: Mon, 11 Dec 2006 23:21:11 GMT Message-Id: <200612112321.kBBNLBdW027393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111509 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, 11 Dec 2006 23:21:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=111509 Change 111509 by ticso@ticso on 2006/12/11 23:20:33 add VLAN_MTU support Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#65 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#65 (text+ko) ==== @@ -205,6 +205,8 @@ if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_capabilities |= IFCAP_VLAN_MTU; + ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */ ifp->if_start = atestart; ifp->if_ioctl = ateioctl; ifp->if_init = ateinit; @@ -306,6 +308,9 @@ } IF_ADDR_UNLOCK(sc->ifp); + /* enable big packets */ + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); + /* * Write the hash to the hash register. This card can also * accept unicast packets as well as multicast packets using this @@ -822,7 +827,7 @@ */ WR4(sc, ETH_TAR, segs[0].ds_addr); WR4(sc, ETH_TCR, segs[0].ds_len); - + /* * Tap off here if there is a bpf listener. */ @@ -914,7 +919,7 @@ struct ate_softc *sc = ifp->if_softc; struct mii_data *mii; struct ifreq *ifr = (struct ifreq *)data; - int error = 0; + int mask, error = 0; switch (cmd) { case SIOCSIFFLAGS: @@ -944,6 +949,13 @@ mii = device_get_softc(sc->miibus); error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd); break; + case SIOCSIFCAP: + mask = ifp->if_capenable ^ ifr->ifr_reqcap; + if (mask & IFCAP_VLAN_MTU) { + ATE_LOCK(sc); + ifp->if_capenable ^= IFCAP_VLAN_MTU; + ATE_UNLOCK(sc); + } default: error = ether_ioctl(ifp, cmd, data); break; From owner-p4-projects@FreeBSD.ORG Mon Dec 11 23:24: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 464F516A500; Mon, 11 Dec 2006 23:24:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 063E216A509 for ; Mon, 11 Dec 2006 23:24:21 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DC4443CC2 for ; Mon, 11 Dec 2006 23:22:52 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBNNGXQ028033 for ; Mon, 11 Dec 2006 23:23:16 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBNNFnF028026 for perforce@freebsd.org; Mon, 11 Dec 2006 23:23:15 GMT (envelope-from ticso@freebsd.org) Date: Mon, 11 Dec 2006 23:23:15 GMT Message-Id: <200612112323.kBBNNFnF028026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111512 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, 11 Dec 2006 23:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=111512 Change 111512 by ticso@ticso on 2006/12/11 23:22:36 setup BWCT boot flavour with IO multiplexing for MCI Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#19 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#19 (text+ko) ==== @@ -36,6 +36,7 @@ #include "env_vars.h" #include "at91rm9200.h" +#include "lib_AT91RM9200.h" #include "at91rm9200_lowlevel.h" #include "loader_prompt.h" #include "emac.h" @@ -52,6 +53,10 @@ #ifdef TSC_FPGA fpga_load(); #endif +#ifdef BOOT_BWCT + AT91F_MCI_CfgPIO(); + AT91F_MCI_CfgPMC(); +#endif EMAC_Init(); LoadBootCommands(); if (getc(1) == -1) { From owner-p4-projects@FreeBSD.ORG Mon Dec 11 23:24:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA06116A579; Mon, 11 Dec 2006 23:24:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B88F416A575 for ; Mon, 11 Dec 2006 23:24:37 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58E5043CAA for ; Mon, 11 Dec 2006 23:23:18 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBNOH5U028246 for ; Mon, 11 Dec 2006 23:24:17 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBNOHHk028243 for perforce@freebsd.org; Mon, 11 Dec 2006 23:24:17 GMT (envelope-from ticso@freebsd.org) Date: Mon, 11 Dec 2006 23:24:17 GMT Message-Id: <200612112324.kBBNOHHk028243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111513 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, 11 Dec 2006 23:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111513 Change 111513 by ticso@ticso on 2006/12/11 23:23:21 No need to #ifdef other boards in this file Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/bwct_board.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/bwct_board.c#2 (text+ko) ==== @@ -9,28 +9,14 @@ #include "board.h" #include "sd-card.h" -unsigned char mac[6] = { 0x00, 0x0e, 0x42, 02, 0, 21 }; - -#define KLUDGE_STRAP +unsigned char mac[6]; static void MacFromEE() { #if 0 uint32_t sig; -#ifdef KLUDGE_STRAP - uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20, - 0x00, 0x00, 0x00, 0x03 }; -#endif -#ifdef KLUDGE_STRAP - printf("writing...\n"); - sig = 0xaa55aa55; - EEWrite(0, (uint8_t *)&sig, sizeof(sig)); - printf("euid64\n"); - EEWrite(48, euid64, sizeof(euid64)); - printf("done\n"); -#endif sig = 0; EERead(0, (uint8_t *)&sig, sizeof(sig)); if (sig != 0xaa55aa55) @@ -38,21 +24,12 @@ EERead(48, mac, 3); EERead(48+5, mac+3, 3); #else -#ifdef BOOT_BWCT mac[0] = 0x00; mac[1] = 0x0e; mac[2] = 0x42; mac[3] = 0x02; mac[4] = 0x00; mac[5] = 0x21; -#else - mac[0] = 0; - mac[1] = 0x30; - mac[2] = 0x96; - mac[3] = 0; - mac[4] = 0; - mac[5] = 3; -#endif #endif printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); From owner-p4-projects@FreeBSD.ORG Mon Dec 11 23:25: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 C5D3616A47E; Mon, 11 Dec 2006 23:25:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A486816A47B for ; Mon, 11 Dec 2006 23:25:30 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 630FE43CB4 for ; Mon, 11 Dec 2006 23:24:11 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBNPJUb028317 for ; Mon, 11 Dec 2006 23:25:19 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBNPJgw028314 for perforce@freebsd.org; Mon, 11 Dec 2006 23:25:19 GMT (envelope-from ticso@freebsd.org) Date: Mon, 11 Dec 2006 23:25:19 GMT Message-Id: <200612112325.kBBNPJgw028314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111514 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, 11 Dec 2006 23:25:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=111514 Change 111514 by ticso@ticso on 2006/12/11 23:24:21 update with recent feature changes Affected files ... .. //depot/projects/arm/src/sys/arm/conf/BWCT#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/BWCT#3 (text+ko) ==== @@ -46,13 +46,13 @@ #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:md0\" -#options ROOTDEVNAME=\"ufs:mmcsd0s1a\" +options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" #options ROOTDEVNAME=\"ufs:at91_qdmmc0a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP_NFSROOT -options BOOTP +#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +#options BOOTP_NFSROOT +#options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -73,6 +73,7 @@ device loop device random device ether +device vlan device pty device nexus device uart @@ -91,7 +92,7 @@ device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: -device at91_ssc +#device at91_ssc device at91_mci device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards From owner-p4-projects@FreeBSD.ORG Mon Dec 11 23:40: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 CEBF116A53C; Mon, 11 Dec 2006 23:40:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 962F416A52B for ; Mon, 11 Dec 2006 23:40:32 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E377B43CAF for ; Mon, 11 Dec 2006 23:39:06 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBNMDah027723 for ; Mon, 11 Dec 2006 23:22:13 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBNMDFL027718 for perforce@freebsd.org; Mon, 11 Dec 2006 23:22:13 GMT (envelope-from ticso@freebsd.org) Date: Mon, 11 Dec 2006 23:22:13 GMT Message-Id: <200612112322.kBBNMDFL027718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111510 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, 11 Dec 2006 23:40:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=111510 Change 111510 by ticso@ticso on 2006/12/11 23:21:28 add basic VLAN configuration example Affected files ... .. //depot/projects/arm/src/sys/dev/mii/rlswitch.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mii/rlswitch.c#2 (text+ko) ==== @@ -57,6 +57,9 @@ #include "miibus_if.h" +#define RL_DEBUG +//#define RL_VLAN + static int rlswitch_probe(device_t); static int rlswitch_attach(device_t); @@ -82,6 +85,10 @@ static int rlswitch_service(struct mii_softc *, struct mii_data *, int); static void rlswitch_status(struct mii_softc *); +#ifdef RL_DEBUG +static void rlswitch_phydump(device_t dev); +#endif + static const struct mii_phydesc rlswitches[] = { MII_PHY_DESC(xxREALTEK, RTL8305SC), MII_PHY_END @@ -147,15 +154,212 @@ mii_phy_add_media(sc); printf("\n"); #undef ADD -#if 0 - device_printf(dev, "register_dump\n"); - int phy, reg, val; - for (phy = 0; phy < 5; phy++) { - for (reg = 0; reg < 32; reg++) { - val = MIIBUS_READREG(sc->mii_dev, phy, reg); - printf("PHY%i-REG%i: 0x%x\n", phy, reg, val); - } - } +#ifdef RL_DEBUG + rlswitch_phydump(dev); +#endif + +#ifdef RL_VLAN + int val; + + /* Global Control 0 */ + val = 0; + val |= 0 << 10; /* enable 802.1q VLAN Tag support */ + val |= 0 << 9; /* enable VLAN ingress filtering */ + val |= 1 << 8; /* disable VLAN tag admit control */ + val |= 1 << 6; /* internal use */ + val |= 1 << 5; /* internal use */ + val |= 1 << 4; /* internal use */ + val |= 1 << 3; /* internal use */ + val |= 1 << 1; /* reserved */ + MIIBUS_WRITEREG(sc->mii_dev, 0, 16, val); + + /* Global Control 2 */ + val = 0; + val |= 1 << 15; /* reserved */ + val |= 0 << 14; /* enable 1552 Bytes support */ + val |= 1 << 13; /* enable broadcast input drop */ + val |= 1 << 12; /* forward reserved control frames */ + val |= 1 << 11; /* disable forwarding unicast frames to other VLAN's */ + val |= 1 << 10; /* disable forwarding ARP broadcasts to other VLAN's */ + val |= 1 << 9; /* enable 48 pass 1 */ + val |= 0 << 8; /* enable VLAN */ + val |= 1 << 7; /* reserved */ + val |= 1 << 6; /* enable defer */ + val |= 1 << 5; /* 43ms LED blink time */ + val |= 3 << 3; /* 16:1 queue weight */ + val |= 1 << 2; /* disable broadcast storm control */ + val |= 1 << 1; /* enable power-on LED blinking */ + val |= 1 << 0; /* reserved */ + MIIBUS_WRITEREG(sc->mii_dev, 0, 18, val); + + /* Port 0 Control Register 0 */ + val = 0; + val |= 1 << 15; /* reserved */ + val |= 1 << 11; /* drop received packets with wrong VLAN tag */ + val |= 1 << 10; /* disable 802.1p priority classification */ + val |= 1 << 9; /* disable diffserv priority classification */ + val |= 1 << 6; /* internal use */ + val |= 3 << 4; /* internal use */ + val |= 1 << 3; /* internal use */ + val |= 1 << 2; /* internal use */ + val |= 1 << 0; /* remove VLAN tags on output */ + MIIBUS_WRITEREG(sc->mii_dev, 0, 22, val); + + /* Port 1 Control Register 0 */ + val = 0; + val |= 1 << 15; /* reserved */ + val |= 1 << 11; /* drop received packets with wrong VLAN tag */ + val |= 1 << 10; /* disable 802.1p priority classification */ + val |= 1 << 9; /* disable diffserv priority classification */ + val |= 1 << 6; /* internal use */ + val |= 3 << 4; /* internal use */ + val |= 1 << 3; /* internal use */ + val |= 1 << 2; /* internal use */ + val |= 1 << 0; /* remove VLAN tags on output */ + MIIBUS_WRITEREG(sc->mii_dev, 1, 22, val); + + /* Port 2 Control Register 0 */ + val = 0; + val |= 1 << 15; /* reserved */ + val |= 1 << 11; /* drop received packets with wrong VLAN tag */ + val |= 1 << 10; /* disable 802.1p priority classification */ + val |= 1 << 9; /* disable diffserv priority classification */ + val |= 1 << 6; /* internal use */ + val |= 3 << 4; /* internal use */ + val |= 1 << 3; /* internal use */ + val |= 1 << 2; /* internal use */ + val |= 1 << 0; /* remove VLAN tags on output */ + MIIBUS_WRITEREG(sc->mii_dev, 2, 22, val); + + /* Port 3 Control Register 0 */ + val = 0; + val |= 1 << 15; /* reserved */ + val |= 1 << 11; /* drop received packets with wrong VLAN tag */ + val |= 1 << 10; /* disable 802.1p priority classification */ + val |= 1 << 9; /* disable diffserv priority classification */ + val |= 1 << 6; /* internal use */ + val |= 3 << 4; /* internal use */ + val |= 1 << 3; /* internal use */ + val |= 1 << 2; /* internal use */ + val |= 1 << 0; /* remove VLAN tags on output */ + MIIBUS_WRITEREG(sc->mii_dev, 3, 22, val); + + /* Port 4 (system port) Control Register 0 */ + val = 0; + val |= 1 << 15; /* reserved */ + val |= 0 << 11; /* don't drop received packets with wrong VLAN tag */ + val |= 1 << 10; /* disable 802.1p priority classification */ + val |= 1 << 9; /* disable diffserv priority classification */ + val |= 1 << 6; /* internal use */ + val |= 3 << 4; /* internal use */ + val |= 1 << 3; /* internal use */ + val |= 1 << 2; /* internal use */ + val |= 2 << 0; /* add VLAN tags for untagged packets on output */ + MIIBUS_WRITEREG(sc->mii_dev, 4, 22, val); + + /* Port 0 Control Register 1 and VLAN A */ + val = 0; + val |= 0x0 << 12; /* Port 0 VLAN Index */ + val |= 1 << 11; /* internal use */ + val |= 1 << 10; /* internal use */ + val |= 1 << 9; /* internal use */ + val |= 1 << 7; /* internal use */ + val |= 1 << 6; /* internal use */ + val |= 0x11 << 0; /* VLAN A membership */ + MIIBUS_WRITEREG(sc->mii_dev, 0, 24, val); + + /* Port 0 Control Register 2 and VLAN A */ + val = 0; + val |= 1 << 15; /* internal use */ + val |= 1 << 14; /* internal use */ + val |= 1 << 13; /* internal use */ + val |= 1 << 12; /* internal use */ + val |= 0x100 << 0; /* VLAN A ID */ + MIIBUS_WRITEREG(sc->mii_dev, 0, 25, val); + + /* Port 1 Control Register 1 and VLAN B */ + val = 0; + val |= 0x1 << 12; /* Port 1 VLAN Index */ + val |= 1 << 11; /* internal use */ + val |= 1 << 10; /* internal use */ + val |= 1 << 9; /* internal use */ + val |= 1 << 7; /* internal use */ + val |= 1 << 6; /* internal use */ + val |= 0x12 << 0; /* VLAN B membership */ + MIIBUS_WRITEREG(sc->mii_dev, 1, 24, val); + + /* Port 1 Control Register 2 and VLAN B */ + val = 0; + val |= 1 << 15; /* internal use */ + val |= 1 << 14; /* internal use */ + val |= 1 << 13; /* internal use */ + val |= 1 << 12; /* internal use */ + val |= 0x101 << 0; /* VLAN B ID */ + MIIBUS_WRITEREG(sc->mii_dev, 1, 25, val); + + /* Port 2 Control Register 1 and VLAN C */ + val = 0; + val |= 0x2 << 12; /* Port 2 VLAN Index */ + val |= 1 << 11; /* internal use */ + val |= 1 << 10; /* internal use */ + val |= 1 << 9; /* internal use */ + val |= 1 << 7; /* internal use */ + val |= 1 << 6; /* internal use */ + val |= 0x14 << 0; /* VLAN C membership */ + MIIBUS_WRITEREG(sc->mii_dev, 2, 24, val); + + /* Port 2 Control Register 2 and VLAN C */ + val = 0; + val |= 1 << 15; /* internal use */ + val |= 1 << 14; /* internal use */ + val |= 1 << 13; /* internal use */ + val |= 1 << 12; /* internal use */ + val |= 0x102 << 0; /* VLAN C ID */ + MIIBUS_WRITEREG(sc->mii_dev, 2, 25, val); + + /* Port 3 Control Register 1 and VLAN D */ + val = 0; + val |= 0x3 << 12; /* Port 3 VLAN Index */ + val |= 1 << 11; /* internal use */ + val |= 1 << 10; /* internal use */ + val |= 1 << 9; /* internal use */ + val |= 1 << 7; /* internal use */ + val |= 1 << 6; /* internal use */ + val |= 0x18 << 0; /* VLAN D membership */ + MIIBUS_WRITEREG(sc->mii_dev, 3, 24, val); + + /* Port 3 Control Register 2 and VLAN D */ + val = 0; + val |= 1 << 15; /* internal use */ + val |= 1 << 14; /* internal use */ + val |= 1 << 13; /* internal use */ + val |= 1 << 12; /* internal use */ + val |= 0x103 << 0; /* VLAN D ID */ + MIIBUS_WRITEREG(sc->mii_dev, 3, 25, val); + + /* Port 4 Control Register 1 and VLAN E */ + val = 0; + val |= 0x0 << 12; /* Port 4 VLAN Index */ + val |= 1 << 11; /* internal use */ + val |= 1 << 10; /* internal use */ + val |= 1 << 9; /* internal use */ + val |= 1 << 7; /* internal use */ + val |= 1 << 6; /* internal use */ + val |= 0 << 0; /* VLAN E membership */ + MIIBUS_WRITEREG(sc->mii_dev, 4, 24, val); + + /* Port 4 Control Register 2 and VLAN E */ + val = 0; + val |= 1 << 15; /* internal use */ + val |= 1 << 14; /* internal use */ + val |= 1 << 13; /* internal use */ + val |= 1 << 12; /* internal use */ + val |= 0x104 << 0; /* VLAN E ID */ + MIIBUS_WRITEREG(sc->mii_dev, 4, 25, val); +#endif + +#ifdef RL_DEBUG + rlswitch_phydump(dev); #endif MIIBUS_MEDIAINIT(sc->mii_dev); return (0); @@ -199,3 +403,22 @@ mii->mii_media_status |= IFM_ACTIVE; mii->mii_media_active |= IFM_100_TX|IFM_FDX; } + +#ifdef RL_DEBUG +static void +rlswitch_phydump(device_t dev) { + int phy, reg, val; + struct mii_softc *sc; + + sc = device_get_softc(dev); + device_printf(dev, "rlswitchphydump\n"); + for (phy = 0; phy <= 5; phy++) { + printf("PHY%i:", phy); + for (reg = 0; reg <= 31; reg++) { + val = MIIBUS_READREG(sc->mii_dev, phy, reg); + printf(" 0x%x", val); + } + printf("\n"); + } +} +#endif From owner-p4-projects@FreeBSD.ORG Tue Dec 12 01:47: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 4726A16A47B; Tue, 12 Dec 2006 01:47:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1BF0816A412 for ; Tue, 12 Dec 2006 01:47:02 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66D8E43CFA for ; Tue, 12 Dec 2006 01:43:07 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBC1iICO062521 for ; Tue, 12 Dec 2006 01:44:18 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBC1iI7A062518 for perforce@freebsd.org; Tue, 12 Dec 2006 01:44:18 GMT (envelope-from piso@freebsd.org) Date: Tue, 12 Dec 2006 01:44:18 GMT Message-Id: <200612120144.kBC1iI7A062518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111521 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, 12 Dec 2006 01:47:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=111521 Change 111521 by piso@piso_newluxor on 2006/12/12 01:43:55 Turn the main MD interrupt handling function (i.e. for i386 intr_machdep.c::intr_execute_handlers()) into MI code (kern_intr.c::mi_handle_intr()). Compiles for: amd64, i386, ia64, powerpc, sparc64. Tested on: i386. MIA: arm and sun4v. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#11 edit .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#8 edit .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#17 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#10 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#19 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#13 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#11 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#8 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#11 (text+ko) ==== @@ -76,6 +76,10 @@ extern struct callout stray_callout_handle; +static void intr_eoi_src(void *arg); +static void intr_disab_eoi_src(void *arg); +void intr_callout_reset(void); + #ifdef SMP static int assign_cpu; @@ -234,11 +238,20 @@ } void +intr_callout_reset(void) +{ + + mtx_lock_spin(&intr_table_lock); + callout_reset(&stray_callout_handle, hz, &stray_detection, &walk_intr_src); + mtx_unlock_spin(&intr_table_lock); +} + +void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { struct thread *td; struct intr_event *ie; - int error, vector, thread; + int res, vector; td = curthread; @@ -261,11 +274,20 @@ if (vector == 0) clkintr_pending = 1; - /* - * For stray interrupts, mask and EOI the source, bump the - * stray count, and log the condition. - */ - if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) { + res = mi_handle_intr(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc); + switch(res) { + case 0: + /* FALLTHROUGH */ + case ECHILD: + break; + case EFAULT: + panic("Bad stray interrupt\n"); + break; + case EINVAL: + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ isrc->is_pic->pic_disable_source(isrc, PIC_EOI); (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) @@ -274,47 +296,29 @@ log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); - return; + break; + default: + printf("Ouch! Return code from mi_handle_intr()" + "not expected.\n"); } +} - /* - * Execute fast interrupt handlers directly. - * To support clock handlers, if a handler registers - * with a NULL argument, then we pass it a pointer to - * a trapframe as its argument. - */ - td->td_intr_nesting_level++; - thread = 0; - critical_enter(); - thread = intr_filter_loop(ie, frame); +static void +intr_eoi_src(void *arg) +{ + struct intsrc *isrc; - /* - * If the interrupt was fully served, send it an EOI but leave it - * unmasked. Otherwise, if there are any threaded handlers that need - * to run or it was a stray interrupt, mask the source as well as - * sending it an EOI. - */ - if (thread & FILTER_HANDLED) - isrc->is_pic->pic_eoi_source(isrc); - else - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - critical_exit(); + isrc = arg; + isrc->is_pic->pic_eoi_source(isrc); +} - /* Interrupt storm logic */ - if (thread & FILTER_STRAY) { - printf("Interrupt stray detected on \"%s\"; throttling interrupt source\n", ie->ie_name); - ie->ie_count = INT_MAX; - mtx_lock_spin(&intr_table_lock); - callout_reset(&stray_callout_handle, hz, &stray_detection, &walk_intr_src); - mtx_unlock_spin(&intr_table_lock); - } +static void +intr_disab_eoi_src(void *arg) +{ + struct intsrc *isrc; - /* Schedule the ithread if needed. */ - if (thread & FILTER_SCHEDULE_THREAD) { - error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("bad stray interrupt")); - } - td->td_intr_nesting_level--; + isrc = arg; + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); } void ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#8 (text+ko) ==== @@ -102,11 +102,11 @@ /* Stray detection MD code */ static struct intr_event * -walk_intr_events(void) { +walk_intrs_events(void) { struct intr_event *ie; static int i = 0; - for (; itd_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); intrcnt[intrcnt_tab[i]]++; event = intr_events[i]; - if (!event || TAILQ_EMPTY(&event->ie_handlers)) - continue; - - /* Execute fast handlers. */ - thread = intr_filter_loop(event, frame); - - /* Interrupt storm logic */ - if (thread & FILTER_STRAY) { - if (event->ie_enable == NULL || event->ie_pending == NULL) - printf("Interrupt stray detection not ready yet: check ie_enable and ie_pending\n"); - else { - printf("Interrupt stray detected on \"%s\"; throttling interrupt source\n", event->ie_name); - event->ie_count = INT_MAX; - // XXX missing callout_init_mtx(&stray_callout_handle, ...); - callout_reset(&stray_callout_handle, hz, - &stray_detection, &walk_intr_events); - } - } - - // XXX eoi & mask intr not verified. - /* Schedule thread if needed. */ - if (thread & FILTER_SCHEDULE_THREAD) - intr_event_schedule_thread(event); - else + res = mi_handle_intr(event, frame, intr_eoi_src_stub, + intr_disab_eoi_src_stub, NULL); + switch (res) { + case 0: + break; + case ECHILD: arm_unmask_irq(i); + break; + case EFAULT: + /* FALLTHROUGH */ + case EINVAL: + break; + default: + printf("Ouch! Return code from mi_handle_intr()" + "not expected.\n"); + } } - td->td_intr_nesting_level--; +} + +void +intr_callout_reset(void) +{ + + // XXX missing callout_init_mtx(&stray_callout_handle, ...); + callout_reset(&stray_callout_handle, hz, + &stray_detection, &walk_intrs_events); } ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#17 (text+ko) ==== @@ -67,6 +67,10 @@ extern struct callout stray_callout_handle; +static void intr_eoi_src(void *arg); +static void intr_disab_eoi_src(void *arg); +void intr_callout_reset(void); + #ifdef SMP static int assign_cpu; @@ -216,11 +220,11 @@ /* Stray detection MD code */ static struct intr_event * -walk_intr_src(void) { +walk_intrs_src(void) { struct intsrc *isrc; static int i = 0; - for (; iis_event != NULL) @@ -235,8 +239,7 @@ { struct thread *td; struct intr_event *ie; - struct intr_thread *ithd = NULL; - int error, vector, thread; + int res, vector; td = curthread; @@ -259,11 +262,20 @@ if (vector == 0) clkintr_pending = 1; - /* - * For stray interrupts, mask and EOI the source, bump the - * stray count, and log the condition. - */ - if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) { + res = mi_handle_intr(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc); + switch(res) { + case 0: + /* FALLTHROUGH */ + case ECHILD: + break; + case EFAULT: + panic("Bad stray interrupt\n"); + break; + case EINVAL: + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ isrc->is_pic->pic_disable_source(isrc, PIC_EOI); (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) @@ -272,40 +284,39 @@ log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); - return; + break; + default: + printf("Ouch! Return code from mi_handle_intr()" + "not expected.\n"); } +} + +void +intr_callout_reset(void) +{ + + mtx_lock_spin(&intr_table_lock); + callout_reset(&stray_callout_handle, hz, + &stray_detection, &walk_intrs_src); + mtx_unlock_spin(&intr_table_lock); +} - td->td_intr_nesting_level++; - thread = 0; - critical_enter(); - thread = intr_filter_loop(ie, frame, &ithd); - - /* - * If the interrupt was fully served, send it an EOI but leave it - * unmasked. Otherwise, if it was a stray interrupt, mask the source - * as well as sending it an EOI. - */ - if (thread & FILTER_HANDLED) - isrc->is_pic->pic_eoi_source(isrc); - else - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - critical_exit(); - - /* Interrupt storm logic */ - if (thread & FILTER_STRAY) { - printf("Interrupt stray detected on \"%s\"; throttling interrupt source\n", ie->ie_name); - ie->ie_count = INT_MAX; - mtx_lock_spin(&intr_table_lock); - callout_reset(&stray_callout_handle, hz, &stray_detection, &walk_intr_src); - mtx_unlock_spin(&intr_table_lock); - } +static void +intr_eoi_src(void *arg) +{ + struct intsrc *isrc; + + isrc = arg; + isrc->is_pic->pic_eoi_source(isrc); +} + +static void +intr_disab_eoi_src(void *arg) +{ + struct intsrc *isrc; - /* Schedule an ithread if needed. */ - if (thread & FILTER_SCHEDULE_THREAD) { - error = intr_event_schedule_thread(ie, ithd); - KASSERT(error == 0, ("bad stray interrupt")); - } - td->td_intr_nesting_level--; + isrc = arg; + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); } void ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#10 (text+ko) ==== @@ -262,6 +262,8 @@ extern struct callout stray_callout_handle; +void intr_callout_reset(void); + extern struct sapic *ia64_sapics[]; extern int ia64_sapic_count; @@ -358,7 +360,7 @@ struct ia64_intr *ia64_i; static int i = 0; - for (; ievent != NULL) @@ -369,11 +371,20 @@ } void -ia64_dispatch_intr(void *frame __unused, unsigned long vector) +intr_callout_reset(void) +{ + + mtx_lock_spin(&ia64_intrs_lock); + callout_reset(&stray_callout_handle, hz, + &stray_detection, &walk_intr_ia64); + mtx_unlock_spin(&ia64_intrs_lock); +} + +void +ia64_dispatch_intr(void *frame, unsigned long vector) { struct ia64_intr *i; - struct intr_event *ie; /* our interrupt event */ - int error, thread; + int res; /* * Find the interrupt thread for this vector. @@ -385,45 +396,24 @@ if (i->cntp) atomic_add_long(i->cntp, 1); - ie = i->event; - KASSERT(ie != NULL, ("interrupt vector without an event")); - - /* - * As an optimization, if an event has no handlers, don't - * schedule it to run. - */ - if (TAILQ_EMPTY(&ie->ie_handlers)) - return; - - /* - * Execute all fast interrupt handlers directly without Giant. Note - * that this means that any fast interrupt handler must be MP safe. - */ - thread = 0; - critical_enter(); - thread = intr_filter_loop(ie, NULL); - critical_exit(); - - /* Interrupt storm logic */ - if (thread & FILTER_STRAY) { - if (ie->ie_enable == NULL || ie->ie_pending == NULL) - printf("Interrupt stray detection not ready yet: check ie_enable and ie_pending\n"); - else { - printf("Interrupt stray detected on \"%s\"; throttling interrupt source\n", ie->ie_name); - ie->ie_count = INT_MAX; - mtx_lock_spin(&ia64_intrs_lock); - callout_reset(&stray_callout_handle, hz, - &stray_detection, &walk_intr_ia64); - mtx_unlock_spin(&ia64_intrs_lock); - } - } - - // XXX eoi & mask intr not verified. - if (thread & FILTER_SCHEDULE_THREAD) { - error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("got an impossible stray interrupt")); - } else + res = mi_handle_intr(i->event, frame, intr_eoi_src_stub, + intr_disab_eoi_src_stub, NULL); + switch (res) { + case 0: + break; + case ECHILD: ia64_send_eoi(vector); + break; + case EFAULT: + panic("Got an impossible stray interrupt\n"); + break; + case EINVAL: + panic("Interrupt vector without an event\n"); + break; + default: + printf("Ouch! Return code from mi_handle_intr()" + "not expected.\n"); + } } #ifdef DDB ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#19 (text+ko) ==== @@ -62,6 +62,9 @@ struct callout stray_callout_handle; static int backoff = 1; +/* MD function */ +extern void intr_callout_reset(void); + /* * Describe an interrupt thread. There is one of these per interrupt event. */ @@ -877,7 +880,7 @@ } KASSERT(ret != FILTER_SCHEDULE_THREAD, - "intr_filter_loop: FILTER_SCHEDULE_THREAD from filter"); + ("intr_filter_loop: FILTER_SCHEDULE_THREAD from filter")); if (ret & FILTER_STRAY) continue; @@ -939,6 +942,109 @@ } } +/* + * To avoid code duplication across different archs, use these functions + * for interrupt eoiing and disabling when you don't actually need to do + * any real action on the interrupt controller. + */ +void +intr_eoi_src_stub(void *arg __unused) +{ + ; +} + +void +intr_disab_eoi_src_stub(void *arg __unused) +{ + ; +} + +/* + * Main interrupt handling body. + * + * Input: + * o ie: the event connected to this interrupt. + * o frame: some archs (i.e. i386) pass a frame to some. + * handlers as their main argument. + * o intr_eoi_src(): turn off an irq. + * o intr_disab_eoi_src(): mask and turn off an irq. + * o arg: struct intsrc passed to the 2 previous + * intr_*_src() functions or NULL. + * + * NOTA BENE: i386 and amd64 handle their + * interrupt controllers through the + * intr_*_src() functions, so they are + * defined in the MD code for these archs. + * All the other archs (arm, ia64, + * powerpc, sparc64, etcetc) that don't + * use these facilities, will pass a NULL + * pointer for arg, and use the stub + * functions intr_eoi_src_stub() for + * intr_eoi_src() and + * intr_disab_eoi_src_stub() for + * intr_disab_eoi_src(). + * + * Return value: + * o 0: everything ok. + * o EINVAL: stray interrupt. + * o ECHILD: no ithread scheduled. + * o EFAULT: something went wrong with ithread scheduling. + */ +int +mi_handle_intr(struct intr_event *ie, struct trapframe *frame, + void (*intr_eoi_src)(void *), + void (*intr_disab_eoi_src)(void *), void *arg) +{ + struct intr_thread *ithd; + struct thread *td; + int error, res, thread; + + ithd = NULL; + res = 0; + td = curthread; + + if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) + return (EINVAL); + + td->td_intr_nesting_level++; + thread = 0; + critical_enter(); + thread = intr_filter_loop(ie, frame, &ithd); + + /* + * If the interrupt was fully served, send it an EOI but leave + * it unmasked. Otherwise, mask the source as well as sending + * it an EOI. + */ + if (thread & FILTER_HANDLED) + intr_eoi_src(arg); + else + intr_disab_eoi_src(arg); + critical_exit(); + + /* Interrupt storm logic */ + if (thread & FILTER_STRAY) { + if (ie->ie_enable == NULL || ie->ie_pending == NULL) + printf("Interrupt stray detection not present:" + "check ie_enable and ie_pending\n"); + else { + printf("Interrupt stray detected on \"%s\";" + "throttling interrupt source\n", ie->ie_name); + ie->ie_count = INT_MAX; + intr_callout_reset(); + } + } + + /* Schedule an ithread if needed. */ + if (thread & FILTER_SCHEDULE_THREAD) { + error = intr_event_schedule_thread(ie, ithd); + res = (error == 0) ? 0 : EFAULT; + } else + res = ECHILD; + td->td_intr_nesting_level--; + return (res); +} + #ifdef DDB /* * Dump details about an interrupt handler ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#13 (text+ko) ==== @@ -91,6 +91,8 @@ extern struct callout stray_callout_handle; +void intr_callout_reset(void); + extern int extint, extsize; extern u_long extint_call; @@ -241,45 +243,39 @@ } void +intr_callout_reset(void) +{ + + mtx_lock_spin(&intr_table_lock); + callout_reset(&stray_callout_handle, hz, + &stray_detection, &walk_intr_ppc); + mtx_unlock_spin(&intr_table_lock); +} + +void intr_handle(u_int irq) { struct ppc_intr_handler *ppc_ih = &intr_handlers[irq]; struct intr_event *ie = ppc_ih->ih_event; - int error, thread; + int res; - if (ie == NULL) { + res = mi_handle_intr(ie, NULL, intr_eoi_src_stub, + intr_disab_eoi_src_stub, NULL); + switch (res) { + case 0: + /* FALLTHROUGH */ + case ECHILD: + atomic_add_long(ppc_ih->ih_count, 1); + break; + case EFAULT: + atomic_add_long(ppc_ih->ih_count, 1); + /* FALLTHROUGH */ + case EINVAL: intr_stray_handler(ppc_ih); - return; - } - - atomic_add_long(ppc_ih->ih_count, 1); - - critical_enter(); - /* Execute fast interrupt handlers directly. */ - thread = 0; - thread = intr_filter_loop(ie, NULL); - critical_exit(); - - /* Interrupt storm logic */ - if (thread & FILTER_STRAY) { - if (ie->ie_enable == NULL || ie->ie_pending == NULL) - printf("Interrupt stray detection not ready yet: check ie_enable and ie_pending\n"); - else { - printf("Interrupt stray detected on \"%s\"; throttling interrupt source\n", ie->ie_name); - ie->ie_count = INT_MAX; - mtx_lock_spin(&intr_table_lock); - callout_reset(&stray_callout_handle, hz, - &stray_detection, &walk_intr_ppc); - mtx_unlock_spin(&intr_table_lock); - } - } - - // XXX eoi & mask intr not verified. - /* Schedule a heavyweight interrupt process. */ - if (thread & FILTER_SCHEDULE_THREAD) { - error = intr_event_schedule_thread(ie); - if (error == EINVAL) - intr_stray_handler(ppc_ih); + break; + default: + printf("Ouch! Return code from mi_handle_intr()" + "not expected.\n"); } } ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#11 (text+ko) ==== @@ -107,6 +107,8 @@ extern struct callout stray_callout_handle; +void intr_callout_reset(void); + static void intr_execute_handlers(void *); static void intr_stray_level(struct trapframe *); static void intr_stray_vector(void *); @@ -251,44 +253,41 @@ return (NULL); } +void +intr_callout_reset(void) +{ + + mtx_lock_spin(&intr_table_lock); + callout_reset(&stray_callout_handle, hz, + &stray_detection, &walk_intr_sparc64); + mtx_unlock_spin(&intr_table_lock); +} + static void intr_execute_handlers(void *cookie) { struct intr_vector *iv; struct intr_event *ie; - int error = 0, thread; + int res; iv = cookie; ie = iv->iv_event; - if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) { + res = mi_handle_intr(ie, NULL, intr_eoi_src_stub, intr_disab_eoi_src_stub, + NULL); + switch (res) { + case 0: + /* FALLTHROUGH */ + case ECHILD: + break; + case EFAULT: + /* FALLTHROUGH */ + case EINVAL: intr_stray_vector(iv); - return; + break; + default: + printf("Ouch! Return code from mi_handle_intr()" + "not expected.\n"); } - - /* Execute fast interrupt handlers directly. */ - thread = intr_filter_loop(ie, NULL); - - /* Interrupt storm logic */ - if (thread & FILTER_STRAY) { - if (ie->ie_enable == NULL || ie->ie_pending == NULL) - printf("Interrupt stray detection not ready yet: check ie_enable and ie_pending\n"); - else { - printf("Interrupt stray detected on \"%s\"; throttling interrupt source\n", ie->ie_name); - ie->ie_count = INT_MAX; - mtx_lock_spin(&intr_table_lock); - callout_reset(&stray_callout_handle, hz, - &stray_detection, &walk_intr_sparc64); - mtx_unlock_spin(&intr_table_lock); - } - } - - // XXX eoi & mask intr not verified. - /* Schedule a heavyweight interrupt process. */ - if (thread & FILTER_SCHEDULE_THREAD) - error = intr_event_schedule_thread(ie); - - if (error == EINVAL) - intr_stray_vector(iv); } int ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#8 (text+ko) ==== @@ -119,6 +119,11 @@ int intr_filter_loop(struct intr_event *ie, struct trapframe *frame, struct intr_thread **ithd); void stray_detection(void *_arg); +void intr_eoi_src_stub(void *arg __unused); +void intr_disab_eoi_src_stub(void *arg __unused); +int mi_handle_intr(struct intr_event *ie, struct trapframe *frame, + void (*intr_eoi_src)(void *), + void (*intr_disab_eoi_src)(void *), void *arg); u_char intr_priority(enum intr_type flags); int intr_event_add_handler(struct intr_event *ie, const char *name, driver_filter_t filter, driver_intr_t handler, void *arg, u_char pri, enum intr_type flags, From owner-p4-projects@FreeBSD.ORG Tue Dec 12 03:26: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 3C55616A40F; Tue, 12 Dec 2006 03:26:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1314416A403 for ; Tue, 12 Dec 2006 03:26:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2F2243CB2 for ; Tue, 12 Dec 2006 03:25:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBC3QS2u086299 for ; Tue, 12 Dec 2006 03:26:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBC3QSUE086296 for perforce@freebsd.org; Tue, 12 Dec 2006 03:26:28 GMT (envelope-from imp@freebsd.org) Date: Tue, 12 Dec 2006 03:26:28 GMT Message-Id: <200612120326.kBC3QSUE086296@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 111525 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, 12 Dec 2006 03:26:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=111525 Change 111525 by imp@imp_lighthouse on 2006/12/12 03:25:53 MF FreeBSD-tsc-6: o More generic description o less verbose dmesg, unless bootverbose (this data should be exported via sysctl) o Initialize the lock o don't do zero length read after the write to verify it succeeded. This lead a lock leak in at91_twi (to be fixed separately). MFP4 after: soon Affected files ... .. //depot/projects/arm/src/sys/dev/iicbus/icee.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/dev/iicbus/icee.c#7 (text+ko) ==== @@ -62,7 +62,7 @@ #define ICEE_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) #define ICEE_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) #define ICEE_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), "icee", MTX_SPIN) + mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), "icee", MTX_SPIN) #define ICEE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define ICEE_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define ICEE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); @@ -86,8 +86,8 @@ static int icee_probe(device_t dev) { - /* XXX really probe? */ - device_set_desc(dev, "AT24C I2C EEPROM"); + /* XXX really probe? -- not until we know the size... */ + device_set_desc(dev, "I2C EEPROM"); return (0); } @@ -109,8 +109,9 @@ if (sc->rd_sz > MAX_RD_SZ) sc->rd_sz = MAX_RD_SZ; resource_int_value(dname, dunit, "wr_sz", &sc->wr_sz); - device_printf(dev, "size: %d bytes bus_width: %d-bits\n", sc->size, - sc->type); + if (bootverbose) + device_printf(dev, "size: %d bytes bus_width: %d-bits\n", + sc->size, sc->type); sc->cdev = make_dev(&icee_cdevsw, device_get_unit(dev), UID_ROOT, GID_WHEEL, 0600, "icee%d", device_get_unit(dev)); if (sc->cdev == NULL) { @@ -118,6 +119,7 @@ goto out; } sc->cdev->si_drv1 = sc; + ICEE_LOCK_INIT(sc); out:; return (err); } @@ -212,11 +214,10 @@ icee_write(struct cdev *dev, struct uio *uio, int ioflag) { struct icee_softc *sc; - int error, len, i, slave; + int error, len, slave; uint8_t data[MAX_WR_SZ + 2]; - struct iic_msg msgs[3] = { + struct iic_msg msgs[1] = { { 0, IIC_M_WR, 0, data }, - { 0, IIC_M_RD, 0, data }, }; sc = CDEV2SOFTC(dev); @@ -244,12 +245,11 @@ data[1] = uio->uio_offset & 0xff; break; } - for (i = 0; i < 2; i++) - msgs[i].slave = slave; + msgs[0].slave = slave; error = uiomove(data + sc->type / 8, len, uio); if (error) break; - error = iicbus_transfer(sc->sc_dev, msgs, 2); + error = iicbus_transfer(sc->sc_dev, msgs, 1); if (error) break; } From owner-p4-projects@FreeBSD.ORG Tue Dec 12 03:28: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 2909016A417; Tue, 12 Dec 2006 03:28:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 060A416A407 for ; Tue, 12 Dec 2006 03:28:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91BC343CA4 for ; Tue, 12 Dec 2006 03:27:11 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBC3SVr2086562 for ; Tue, 12 Dec 2006 03:28:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBC3SVQX086559 for perforce@freebsd.org; Tue, 12 Dec 2006 03:28:31 GMT (envelope-from imp@freebsd.org) Date: Tue, 12 Dec 2006 03:28:31 GMT Message-Id: <200612120328.kBC3SVQX086559@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 111526 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, 12 Dec 2006 03:28:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=111526 Change 111526 by imp@imp_lighthouse on 2006/12/12 03:27:31 Don't leak a lock on an invalid transfer. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#39 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#39 (text+ko) ==== @@ -321,8 +321,10 @@ len = msgs[i].len; buf = msgs[i].buf; /* zero byte transfers aren't allowed */ - if (len == 0 || buf == NULL) - return (EINVAL); + if (len == 0 || buf == NULL) { + err = EINVAL; + goto out; + } if (len == 1) WR4(sc, TWI_CR, TWI_CR_START | TWI_CR_STOP); else From owner-p4-projects@FreeBSD.ORG Tue Dec 12 06:56: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 1D42416A47E; Tue, 12 Dec 2006 06:56:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E248916A47C for ; Tue, 12 Dec 2006 06:56:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2D7743CAE for ; Tue, 12 Dec 2006 06:54:46 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBC6u7uq038155 for ; Tue, 12 Dec 2006 06:56:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBC6u1wP038152 for perforce@freebsd.org; Tue, 12 Dec 2006 06:56:01 GMT (envelope-from imp@freebsd.org) Date: Tue, 12 Dec 2006 06:56:01 GMT Message-Id: <200612120656.kBC6u1wP038152@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 111533 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, 12 Dec 2006 06:56:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=111533 Change 111533 by imp@imp_paco-paco on 2006/12/12 06:55:28 IFC @111526 Affected files ... .. //depot/projects/arm/src/bin/hostname/hostname.1#3 integrate .. //depot/projects/arm/src/bin/hostname/hostname.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/CHANGES#4 integrate .. //depot/projects/arm/src/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/arm/src/contrib/bind9/FAQ#2 integrate .. //depot/projects/arm/src/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/arm/src/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/README#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/configure.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/arm/src/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/arm/src/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/arm/src/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/version#4 integrate .. //depot/projects/arm/src/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/arm/src/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/arm/src/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/arm/src/etc/pccard_ether#4 integrate .. //depot/projects/arm/src/etc/rc.d/auto_linklocal#3 integrate .. //depot/projects/arm/src/lib/bind/bind/config.h#2 integrate .. //depot/projects/arm/src/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/arm/src/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/arm/src/lib/bind/config.h#2 integrate .. //depot/projects/arm/src/lib/bind/dns/code.h#2 integrate .. //depot/projects/arm/src/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/arm/src/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/arm/src/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/arm/src/lib/bind/lwres/lwres/platform.h#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/arm/src/lib/libarchive/config_freebsd.h#1 branch .. //depot/projects/arm/src/lib/libc/sys/chmod.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/chown.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/link.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/rename.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/arm/src/lib/libelf/elf.3#2 integrate .. //depot/projects/arm/src/lib/libelf/elf_errmsg.c#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#4 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/arm/src/sbin/fdisk/fdisk.8#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifieee80211.c#4 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#10 integrate .. //depot/projects/arm/src/share/man/man9/mbuf.9#2 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/arm/src/sys/conf/NOTES#38 integrate .. //depot/projects/arm/src/sys/conf/files#58 integrate .. //depot/projects/arm/src/sys/conf/options#36 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/advansys/advansys.c#5 integrate .. //depot/projects/arm/src/sys/dev/advansys/adw_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/advansys/adwcam.c#5 integrate .. //depot/projects/arm/src/sys/dev/aha/aha.c#4 integrate .. //depot/projects/arm/src/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/arm/src/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/arm/src/sys/dev/ahb/ahb.c#5 integrate .. //depot/projects/arm/src/sys/dev/amd/amd.c#5 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#11 integrate .. //depot/projects/arm/src/sys/dev/awi/awivar.h#3 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt_eisa.c#3 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/arm/src/sys/dev/iir/iir_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#19 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#18 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/arm/src/sys/dev/isp/ispmbox.h#9 integrate .. //depot/projects/arm/src/sys/dev/ispfw/ispfw.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/arm/src/sys/dev/mii/e1000phy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#10 integrate .. //depot/projects/arm/src/sys/dev/mly/mly.c#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#21 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#22 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#30 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#11 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#20 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#11 integrate .. //depot/projects/arm/src/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/arm/src/sys/dev/trm/trm.c#6 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/if_auereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/arm/src/sys/dev/wds/wd7000.c#3 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_node.h#5 integrate .. //depot/projects/arm/src/sys/modules/isp/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/bridgestp.c#14 integrate .. //depot/projects/arm/src/sys/net/bridgestp.h#7 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#29 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#12 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#19 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#17 integrate .. //depot/projects/arm/src/sys/pci/if_xl.c#9 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/elf_machdep.c#4 integrate .. //depot/projects/arm/src/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/pmap.c#8 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/trap.c#6 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#23 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#7 integrate .. //depot/projects/arm/src/usr.bin/id/id.c#3 integrate .. //depot/projects/arm/src/usr.bin/jot/jot.c#4 integrate .. //depot/projects/arm/src/usr.bin/setchannel/Makefile#1 branch .. //depot/projects/arm/src/usr.bin/setchannel/setchannel.1#1 branch .. //depot/projects/arm/src/usr.bin/setchannel/setchannel.c#1 branch .. //depot/projects/arm/src/usr.bin/truss/truss.1#3 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/index.c#3 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/menus.c#3 integrate Differences ... ==== //depot/projects/arm/src/bin/hostname/hostname.1#3 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.19 2006/12/05 12:09:50 ru Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.21 2006/12/08 07:47:08 kientzle Exp $ .\" -.Dd December 5, 2006 +.Dd December 7, 2006 .Dt HOSTNAME 1 .Os .Sh NAME @@ -37,7 +37,7 @@ .Nd set or print name of current host system .Sh SYNOPSIS .Nm -.Op Fl s +.Op Fl fs .Op Ar name-of-host .Sh DESCRIPTION The @@ -56,6 +56,9 @@ .Pp Options: .Bl -tag -width flag +.It Fl f +Include domain information in the printed name. +This is the default behavior. .It Fl s Trim off any domain information from the printed name. ==== //depot/projects/arm/src/bin/hostname/hostname.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.17 2005/01/10 08:39:22 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.19 2006/12/08 07:47:08 kientzle Exp $"); #include @@ -58,8 +58,15 @@ char *p, hostname[MAXHOSTNAMELEN]; sflag = 0; - while ((ch = getopt(argc, argv, "s")) != -1) + while ((ch = getopt(argc, argv, "fs")) != -1) switch (ch) { + case 'f': + /* + * On Linux, "hostname -f" prints FQDN. + * BSD "hostname" always prints FQDN by + * default, so we accept but ignore -f. + */ + break; case 's': sflag = 1; break; @@ -93,6 +100,6 @@ usage(void) { - (void)fprintf(stderr, "usage: hostname [-s] [name-of-host]\n"); + (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n"); exit(1); } ==== //depot/projects/arm/src/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,5 +1,37 @@ - --- 9.3.2-P2 released --- + --- 9.3.3 released --- + +2107. [bug] dighost.c: more cleanup of buffers. [RT #16499] + +2104. [port] Fix Solaris SMF error message. + +2103. [port] Add /usr/sfw to list of locations for OpenSSL + under Solaris. + +2102. [port] Silence solaris 10 warnings. + +2101. [bug] OpenSSL version checks were not quite right. + [RT #16476] + +2100. [port] win32: copy libeay32.dll to Build\Debug. + +2099. [port] win32: more manifiest issues. + + --- 9.3.3rc3 released --- + +2096. [bug] libbind: handle applications that fail to detect + res_init() failures better. + +2095. [port] libbind: alway prototype inet_cidr_ntop_ipv6() and + net_cidr_ntop_ipv6(). [RT #16388] + +2094. [contrib] Update named-bootconf. [RT# 16404] + +2092. [bug] win32: dig, host, nslookup. Use registry config + if resolv.conf does not exist or no nameservers + listed. [RT #15877] + +2091. [port] dighost.c: race condition on cleanup. [RT #16417] 2090. [port] win32: Visual C++ 2005 command line manifest support. [RT #16417] @@ -12,15 +44,307 @@ 2088. [security] Change the default RSA exponent from 3 to 65537. [RT #16391] +2086. [port] libbind: FreeBSD now has get*by*_r() functions. + [RT #16403] + +2085. [doc] win32: added index.html and README to zip. [RT #16201] + +2084. [contrib] dbus update for 9.3.3rc2. + 2083. [port] win32: Visual C++ 2005 support. - --- 9.3.2-P1 released --- +2082. [doc] Document 'cache-file' as a test only option. + + --- 9.3.3rc2 released --- + +2081. [port] libbind: minor 64-bit portability fix in memcluster.c. + [RT #16360] + +2080. [port] libbind: res_init.c did not compile on older versions + of Solaris. [RT #16363] + +2076. [bug] Several files were missing #include + causing build failures on OSF. [RT #16341] + +2074. [bug] dns_request_createvia2(), dns_request_createvia3(), + dns_request_createraw2() and dns_request_createraw3() + failed to send multiple UDP requests. [RT #16349] 2066. [security] Handle SIG queries gracefully. [RT #16300] + --- 9.3.3rc1 released --- + +2071. [port] Test whether gcc accepts -fno-strict-aliasing. + [RT #16324] + +2070. [bug] The remote address was not always displayed when + reporting dispatch failures. [RT #16315] + +2069. [bug] Cross compiling was not working. [RT #16330] + +2067. [bug] 'rndc' could close the socket too early triggering + a INSIST under Windows. [RT #16317] + +2065. [bug] libbind: probe for HPUX prototypes for + endprotoent_r() and endservent_r(). [RT 16313] + +2064. [bug] libbind: silence AIX compiler warnings. [RT #16218] + +2063. [bug] Change #1955 introduced a bug which caused the first + 'rndc flush' call to not free memory. [RT #16244] + +2062. [bug] 'dig +nssearch' was reusing a buffer before it had + been returned by the socket code. [RT #16307] + +2057. [bug] Make setting "ra" dependent on both allow-query and + allow-recursion. [RT #16290] + +2056. [bug] dig: ixfr= was not being treated case insensitively + at all times. [RT #15955] + +2055. [bug] Missing goto after dropping multicast query. + [RT #15944] + +2054. [port] freebsd: do not explicitly link against -lpthread. + [RT #16170] + +2053. [port] netbsd:libbind: silence compiler warnings. [RT #16220] + +2052. [bug] 'rndc' improve connect failed message to report + the failing address. [RT #15978] + +2051. [port] More strtol() fixes. [RT #16249] + +2050. [bug] Parsing of NSAP records was not case insensitive. + [RT #16287] + +2049. [bug] Restore SOA before AXFR when falling back from + a attempted IXFR when transfering in a zone. + Allow a initial SOA query before attempting + a AXFR to be requested. [RT #16156] + +2048. [bug] It was possible to loop forever when using + avoid-v4-udp-ports / avoid-v6-udp-ports when + the OS always returned the same local port. + [RT #16182] + +2047. [bug] Failed to initialise the interface flags to zero. + [RT #16245] + +2043. [port] nsupdate/nslookup: Force the flushing of the prompt + for interactive sessions. [RT#16148] + +2038. [bug] dig/nslookup/host was unlinking from wrong list + when handling errors. [RT #16122] + +2037. [func] When unlinking the first or last element in a list + check that the list head points to the element to + be unlinked. [RT #15959] + +2036. [bug] 'rndc recursing' could cause trigger a REQUIRE. + [RT #16075] + +2034. [bug] gcc: set -fno-strict-aliasing. [RT #16124] + + --- 9.3.3b1 released --- + +2031. [bug] Emit a error message when "rndc refresh" is called on + a non slave/stub zone. [RT # 16073] + +2030. [bug] We were being overly conservative when disabling + openssl engine support. [RT #16030] + +2029. [bug] host printed out the server multiple times when + specified on the command line. [RT #15992] + +2028. [port] linux: socket.c compatability for old systems. + [RT #16015] + +2027. [port] libbind: Solaris x86 support. [RT #16020] + +2026. [bug] Rate limit the two recursive client exceeded messages. + [RT #16044] + +2024. [bug] named emited spurious "zone serial unchanged" + messages on reload. [RT #16027] + +2023. [bug] "make install" should create ${localstatedir}/run and + ${sysconfdir} if they do not exist. [RT #16033] + +2016. [bug] Return a partial answer if recursion is not + allowed but requested and we had the answer + to the original qname. [RT #15945] + +2013. [bug] Handle unexpected TSIGs on unsigned AXFR/IXFR + responses more gracefully. [RT #15941] + +2009. [bug] libbind: coverity fixes. [RT #15808] + +2005. [bug] libbind: Retransmission timeouts should be + based on which attempt it is to the nameserver + and not the nameserver itself. [RT #13548] + +2004. [bug] dns_tsig_sign() could pass a NULL pointer to + dst_context_destroy() when cleaning up after a + error. [RT #15835] + +2003. [bug] libbind: The DNS name/address lookup functions could + occasionally follow a random pointer due to + structures not being completely zeroed. [RT #15806] + +2002. [bug] libbind: tighten the constraints on when + struct addrinfo._ai_pad exists. [RT #15783] + +2000. [bug] memmove()/strtol() fix was incomplete. [RT #15812] + +1998. [bug] Restrict handling of fifos as sockets to just SunOS. + This allows named to connect to entropy gathering + daemons that use fifos instead of sockets. [RT #15840] + +1997. [bug] Named was failing to replace negative cache entries + when a positive one for the type was learnt. + [RT #15818] + +1995. [bug] 'host' was reporting multiple "is an alias" messages. + [RT #15702] + +1994. [port] OpenSSL 0.9.8 support. [RT #15694] + +1993. [bug] Log messsage, via syslog, were missing the space + after the timestamp if "print-time yes" was specified. + [RT #15844] + +1991. [cleanup] The configuration data, once read, should be treated + as readonly. Expand the use of const to enforce this + at compile time. [RT #15813] + +1990. [bug] libbind: isc's override of broken gettimeofday() + implementions was not always effective. + [RT #15709] + +1989. [bug] win32: don't check the service password when + re-installing. [RT #15882] + +1985. [protocol] DLV has now been assigned a official type code of + 32769. [RT #15807] + + Note: care should be taken to ensure you upgrade + both named and dnssec-signzone at the same time for + zones with DLV records where named is the master + server for the zone. Also any zones that contain + DLV records should be removed when upgrading a slave + zone. You do not however have to upgrade all + servers for a zone with DLV records simultaniously. + +1982. [bug] DNSKEY was being accepted on the parent side of + a delegation. KEY is still accepted there for + RFC 3007 validated updates. [RT #15620] + +1981. [bug] win32: condition.c:wait() could fail to reattain + the mutex lock. + +1979. [port] linux: allow named to drop core after changing + user ids. [RT #15753] + +1978. [port] Handle systems which have a broken recvmsg(). + [RT #15742] + +1977. [bug] Silence noisy log message. [RT #15704] + +1976. [bug] Handle systems with no IPv4 addresses. [RT #15695] + +1975. [bug] libbind: isc_gethexstring() could misparse multi-line + hex strings with comments. [RT #15814] + +1974. [doc] List each of the zone types and associated zone + options seperately in the ARM. + +1972. [contrib] DBUS dynamic forwarders integation from + Jason Vas Dias . + +1971. [port] linux: make detection of missing IF_NAMESIZE more + robust. [RT #15443] + +1970. [bug] nsupdate: adjust UDP timeout when falling back to + unsigned SOA query. [RT #15775] + +1969. [bug] win32: the socket code was freeing the socket + structure too early. [RT #15776] + +1968. [bug] Missing lock in resolver.c:validated(). [RT #15739] + +1966. [bug] Don't set CD when we have fallen back to plain DNS. + [RT #15727] + +1963. [port] Tru64 4.0E doesn't support send() and recv(). + [RT #15586] + +1962. [bug] Named failed to clear old update-policy when it + was removed. [RT #15491] + +1961. [bug] Check the port and address of responses forwarded + to dispatch. [RT #15474] + +1960. [bug] Update code should set NSEC ttls from SOA MINIMUM. + [RT #15465] + +1958. [bug] Named failed to update the zone's secure state + until the zone was reloaded. [RT #15412] + +1957. [bug] Dig mishandled responses to class ANY queries. + [RT #15402] + +1956. [bug] Improve cross compile support, 'gen' is now built + by native compiler. See README for additional + cross compile support information. [RT #15148] + +1955. [bug] Pre-allocate the cache cleaning interator. [RT #14998] + +1952. [port] hpux: tell the linker to build a runtime link + path "-Wl,+b:". [RT #14816]. + +1951. [security] Drop queries from particular well known ports. + Don't return FORMERR to queries from particular + well known ports. [RT #15636] + +1950. [port] Solaris 2.5.1 and earlier cannot bind() then connect() + a TCP socket. This prevents the source address being + set for TCP connections. [RT #15628] + +1948. [bug] If was possible to trigger a REQUIRE failure in + xfrin.c:maybe_free() if named ran out of memory. + [RT #15568] + +1946. [bug] resume_dslookup() could trigger a REQUIRE failure + when using forwarders. [RT #15549] + +1944. [cleanup] isc_hash_create() does not need a read/write lock. + [RT #15522] + +1943. [bug] Set the loadtime after rolling forward the journal. + [RT #15647] + +1942. [bug] If the name of a DNSKEY match that of one in + trusted-keys do not attempt to validate the DNSKEY + using the parents DS RRset. [RT #15649] + 1941. [bug] ncache_adderesult() should set eresult even if no rdataset is passed to it. [RT #15642] +1940. [bug] Fixed a number of error conditions reported by + Coverity. + +1939. [bug] The resolver could dereference a null pointer after + validation if all the queries have timed out. + [RT #15528] + +1938. [bug] The validator was not correctly handling unsecure + negative responses at or below a SEP. [RT #15528] + +1919. [contrib] queryperf: a set of new features: collecting/printing + response delays, printing intermediate results, and + adjusting query rate for the "target" qps. + --- 9.3.2 released --- --- 9.3.2rc1 released --- @@ -338,14 +662,14 @@ 1779. [port] OSF 5.1: libtool didn't handle -pthread correctly. -1778. [port] HUX 11.11: fix broken IN6ADDR_ANY_INIT and +1778. [port] HUX 11.11: fix broken IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT macros. -1777. [port] OSF 5.1: fix broken IN6ADDR_ANY_INIT and +1777. [port] OSF 5.1: fix broken IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT macros. -1776. [port] Solaris 2.9: fix broken IN6ADDR_ANY_INIT and - IN6ADDR_LOOPBACK_INIT macros. +1776. [port] Solaris 2.9: fix broken IN6ADDR_ANY_INIT and + IN6ADDR_LOOPBACK_INIT macros. 1775. [bug] Only compile getnetent_r.c when threaded. [RT #13205] @@ -1188,8 +1512,8 @@ 1414. [func] Support for KSK flag. -1413. [func] Explictly request the (re-)generation of DS records from - keysets (dnssec-signzone -g). +1413. [func] Explicitly request the (re-)generation of DS records + from keysets (dnssec-signzone -g). 1412. [func] You can now specify servers to be tried if a nameserver has IPv6 address and you only support IPv4 or the @@ -5586,7 +5910,7 @@ , , or . - 119. [cleanup] structure definitions for generic rdata stuctures do + 119. [cleanup] structure definitions for generic rdata structures do not have _generic_ in their names. 118. [cleanup] libdns.a is now namespace-clean, on NetBSD, excepting ==== //depot/projects/arm/src/contrib/bind9/COPYRIGHT#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and distribute this software for any @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.6.2.2.8.3 2005/01/10 23:51:37 marka Exp $ +$Id: COPYRIGHT,v 1.6.2.2.8.4 2006/01/04 00:37:22 marka Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/arm/src/contrib/bind9/FAQ#2 (text+ko) ==== @@ -4,26 +4,36 @@ Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads? -A: Linux threads do not fully implement the Posix threads (pthreads) standard. - In particular, setuid() operates only on the current thread, not the full - process. Because of this limitation, BIND 9 cannot use setuid() on Linux as - it can on all other supported platforms. setuid() cannot be called before - creating threads, since the server does not start listening on reserved - ports until after threads have started. +A: Linux threads do not fully implement the Posix threads (pthreads) standard. In + particular, setuid() operates only on the current thread, not the full process. + Because of this limitation, BIND 9 cannot use setuid() on Linux as it can on + all other supported platforms. setuid() cannot be called before creating + threads, since the server does not start listening on reserved ports until + after threads have started. In the 2.2.18 or 2.3.99-pre3 and newer kernels, the ability to preserve capabilities across a setuid() call is present. This allows BIND 9 to call - setuid() early, while retaining the ability to bind reserved ports. This is - a Linux-specific hack. + setuid() early, while retaining the ability to bind reserved ports. This is a + Linux-specific hack. - On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less - of a security risk than a root process that has not dropped privileges. + On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less of + a security risk than a root process that has not dropped privileges. If Linux threads ever work correctly, this restriction will go away. Configuring BIND9 with the --disable-threads option (the default) causes a non-threaded version to be built, which will allow -u to be used. +Q: Why do I get the following errors: + + general: errno2result.c:109: unexpected error: + general: unable to convert errno to isc_result: 14: Bad address + client: UDP client handler shutting down due to fatal receive error: unexpected error + +A: This is the result of a Linux kernel bug. + + See: http://marc.theaimsgroup.com/?l=linux-netdev&m=113081708031466&w=2 + Q: Why does named log the warning message "no TTL specified - using SOA MINTTL instead"? @@ -40,23 +50,26 @@ Q: Why do I see 5 (or more) copies of named on Linux? A: Linux threads each show up as a process under ps. The approximate number of - threads running is n+4, where n is the number of CPUs. Note that the amount - of memory used is not cumulative; if each process is using 10M of memory, - only a total of 10M is used. + threads running is n+4, where n is the number of CPUs. Note that the amount of + memory used is not cumulative; if each process is using 10M of memory, only a + total of 10M is used. + + Newer versions of Linux's ps command hide the individual threads and require -L + to display them. Q: Why does BIND 9 log "permission denied" errors accessing its configuration files or zones on my Linux system even though it is running as root? -A: On Linux, BIND 9 drops most of its root privileges on startup. This - including the privilege to open files owned by other users. Therefore, if - the server is running as root, the configuration files and zone files should - also be owned by root. +A: On Linux, BIND 9 drops most of its root privileges on startup. This including + the privilege to open files owned by other users. Therefore, if the server is + running as root, the configuration files and zone files should also be owned by + root. -Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master file - bar: ran out of space"? +Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master file bar: + ran out of space"? -A: This is often caused by TXT records with missing close quotes. Check that - all TXT records containing quoted strings have both open and close quotes. +A: This is often caused by TXT records with missing close quotes. Check that all + TXT records containing quoted strings have both open and close quotes. Q: How do I produce a usable core file from a multithreaded named on Linux? @@ -68,16 +81,16 @@ Q: How do I restrict people from looking up the server version? -A: Put a "version" option containing something other than the real version in - the "options" section of named.conf. Note doing this will not prevent - attacks and may impede people trying to diagnose problems with your server. - Also it is possible to "fingerprint" nameservers to determine their version. +A: Put a "version" option containing something other than the real version in the + "options" section of named.conf. Note doing this will not prevent attacks and + may impede people trying to diagnose problems with your server. Also it is + possible to "fingerprint" nameservers to determine their version. Q: How do I restrict only remote users from looking up the server version? -A: The following view statement will intercept lookups as the internal view - that holds the version information will be matched last. The caveats of the - previous answer still apply, of course. +A: The following view statement will intercept lookups as the internal view that + holds the version information will be matched last. The caveats of the previous + answer still apply, of course. view "chaos" chaos { match-clients { ; }; @@ -91,48 +104,45 @@ Q: What do "no source of entropy found" or "could not open entropy source foo" mean? -A: The server requires a source of entropy to perform certain operations, - mostly DNSSEC related. These messages indicate that you have no source of - entropy. On systems with /dev/random or an equivalent, it is used by - default. A source of entropy can also be defined using the random-device - option in named.conf. +A: The server requires a source of entropy to perform certain operations, mostly >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 12 11:36: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 ED88216A4FF; Tue, 12 Dec 2006 11:36:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 935E116A4A7 for ; Tue, 12 Dec 2006 11:36:41 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E5764456D for ; Tue, 12 Dec 2006 11:14:36 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCBFojk007264 for ; Tue, 12 Dec 2006 11:15:50 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCBFb0w007248 for perforce@freebsd.org; Tue, 12 Dec 2006 11:15:37 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 12 Dec 2006 11:15:37 GMT Message-Id: <200612121115.kBCBFb0w007248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111539 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, 12 Dec 2006 11:36:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=111539 Change 111539 by zec@zec_tca51 on 2006/12/12 11:15:34 IFC @ 11537. Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#2 integrate .. //depot/projects/vimage/src/sys/conf/files#3 integrate .. //depot/projects/vimage/src/sys/conf/options#3 integrate .. //depot/projects/vimage/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/amd/amd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/vimage/src/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/am7990.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/am79900.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/lance.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/trm/trm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_ethersubr.h#2 integrate .. //depot/projects/vimage/src/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_kse.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/vimage/src/sys/kern/ksched.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#2 integrate .. //depot/projects/vimage/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/isp/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/vimage/src/sys/net/if_llc.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_pppvar.h#2 integrate .. //depot/projects/vimage/src/sys/net/ppp_tty.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/vimage/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/vimage/src/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#3 integrate .. //depot/projects/vimage/src/sys/sys/rtprio.h#2 integrate .. //depot/projects/vimage/src/sys/sys/runq.h#2 integrate .. //depot/projects/vimage/src/sys/sys/sched.h#2 integrate .. //depot/projects/vimage/src/sys/sys/umtx.h#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -1121,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include #include @@ -215,7 +215,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is an entire 2M page. */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { if (is_dumpable(pa)) dump_add_page(pa); @@ -326,7 +326,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is a single 2M block. Generate a fake PTP */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { fakept[k] = (pa + (k * PAGE_SIZE)) | PG_V | PG_RW | PG_A | PG_M; } ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.576 2006/11/23 21:37:04 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); /* * Manages physical address maps. @@ -947,9 +947,7 @@ pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract: bad pde")); - rtval = (pde & PG_FRAME) | (va & PDRMASK); + rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); PMAP_UNLOCK(pmap); return rtval; } @@ -982,9 +980,7 @@ if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract_and_hold: bad pde")); - m = PHYS_TO_VM_PAGE((pde & PG_FRAME) | + m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); vm_page_hold(m); } @@ -1013,7 +1009,7 @@ } else { pde = vtopde(va); if (*pde & PG_PS) { - pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); } else { pa = *vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.469 2006/11/22 10:34:12 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ cpu HAMMER ident GENERIC @@ -71,11 +71,6 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Linux 32-bit ABI support -options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS -options LINSYSFS - # Bus support. device acpi device pci ==== //depot/projects/vimage/src/sys/amd64/include/pmap.h#2 (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.137 2006/11/19 20:54:57 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -71,6 +71,7 @@ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 #define PG_FRAME (0x000ffffffffff000ul) +#define PG_PS_FRAME (0x000fffffffe00000ul) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ ==== //depot/projects/vimage/src/sys/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); /* * Routines to handle clock hardware. @@ -115,6 +115,7 @@ static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; +static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -421,24 +422,30 @@ u_char val; RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } val = inb(IO_RTC + 1); - inb(0x84); RTC_UNLOCK; return (val); } -static __inline void -writertc(u_char reg, u_char val) +static void +writertc(int reg, u_char val) { RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } + outb(IO_RTC + 1, val); inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ RTC_UNLOCK; } ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1120,7 +1120,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: - break; + return EOPNOTSUPP; } return error; } ==== //depot/projects/vimage/src/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.76 2006/12/01 12:29:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $"); #include #include #include @@ -2807,6 +2807,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); pmap_free_pv_entry(pv); + pmap_free_l2_bucket(pmap, l2b, 1); } vm_page_unlock_queues(); cpu_idcache_wbinv_all(); ==== //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.19 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.20 2006/12/06 06:34:53 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -455,11 +455,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#2 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.9 2006/07/20 21:03:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 00:24:15 cognet Exp $"); #include "opt_comconsole.h" @@ -323,7 +323,10 @@ static int at91_usart_bus_attach(struct uart_softc *sc) { - int err, i; +#ifndef SKYEYE_WORKAROUNDS + int err; + int i; +#endif uint32_t cr; struct at91_usart_softc *atsc; @@ -345,6 +348,7 @@ sc->sc_rxfifosz = USART_BUFFER_SIZE; sc->sc_hwiflow = 0; +#ifndef SKYEYE_WORKAROUNDS /* * Allocate DMA tags and maps */ @@ -374,6 +378,7 @@ atsc->ping = &atsc->ping_pong[0]; atsc->pong = &atsc->ping_pong[1]; } +#endif /* * Prime the pump with the RX buffer. We use two 64 byte bounce @@ -407,9 +412,13 @@ WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); } WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK); +#ifndef SKYEYE_WORKAROUNDS errout:; // XXX bad return (err); +#else + return (0); +#endif } static int ==== //depot/projects/vimage/src/sys/arm/sa11x0/assabet_machdep.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.20 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.21 2006/12/06 06:34:54 julian Exp $"); #include "opt_md.h" @@ -422,11 +422,7 @@ /* Set stack for exception handlers */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/vimage/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.4 2006/11/17 00:53:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.5 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -429,11 +429,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_space.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.6 2006/11/20 13:21:02 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.7 2006/12/02 13:37:29 cognet Exp $"); #include #include @@ -139,6 +139,42 @@ generic_armv4_bs_c_2, NULL, NULL, + + /* read (single) stream */ + generic_bs_r_1, + generic_armv4_bs_r_2, + generic_bs_r_4, + NULL, + + /* read multiple stream */ + generic_bs_rm_1, + generic_armv4_bs_rm_2, + generic_bs_rm_4, + NULL, + + /* read region stream */ + generic_bs_rr_1, + generic_armv4_bs_rr_2, + generic_bs_rr_4, + NULL, + + /* write (single) stream */ + generic_bs_w_1, + generic_armv4_bs_w_2, + generic_bs_w_4, + NULL, + + /* write multiple stream */ + generic_bs_wm_1, + generic_armv4_bs_wm_2, + generic_bs_wm_4, + NULL, + + /* write region stream */ + NULL, + generic_armv4_bs_wr_2, + generic_bs_wr_4, + NULL, }; void ==== //depot/projects/vimage/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.25 2006/11/17 00:53:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.26 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -427,11 +427,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.2 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -493,11 +493,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.1 2006/11/19 23:55:23 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2 2006/12/07 00:49:33 sam Exp $ arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard arm/xscale/ixp425/ixp425.c standard @@ -18,7 +18,11 @@ # # NPE-based Ethernet support (requires qmgr also). Note the # firmware images must be downloaded from the Intel web site. +# The URL seems to change frequently; try this as a starting +# place: # +# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm +# arm/xscale/ixp425/if_npe.c optional npe arm/xscale/ixp425/ixp425_npe.c optional npe ixp425_npe_fw.c optional npe_fw \ @@ -31,10 +35,15 @@ # get known values for reference in the _fw.c file. # IxNpeMicrocode.fwo optional npe_fw \ - dependency "$S/arm/xscale/ixp425/IxNpeMicrocode.dat" \ - compile-with "ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat ${.OBJDIR}; ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ + dependency "IxNpeMicrocode.dat" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ no-implicit-rule \ - clean "IxNpeMicrocode.dat IxNpeMicrocode.fwo" + clean "IxNpeMicrocode.fwo" +IxNpeMicrocode.dat optional npe_fw \ + dependency ".PHONY" \ + compile-with "if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \ + no-obj no-implicit-rule \ + clean "IxNpeMicrocode.dat" # # Q-Manager support # ==== //depot/projects/vimage/src/sys/boot/i386/btx/btx/btx.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.43 2006/10/05 15:30:51 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.44 2006/12/06 17:45:35 jhb Exp $ */ /* @@ -499,6 +499,8 @@ je v86cli # Yes cmpb $0xfb,%al # STI? je v86sti # Yes + cmpb $0xcc,%al # INT3? + je v86mon.7 # Yes, ignore movzwl 0x38(%ebp),%ebx # Load V86 SS shll $0x4,%ebx # To offset pushl %ebx # Save ==== //depot/projects/vimage/src/sys/cam/cam_ccb.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.33 2006/11/02 00:54:32 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.34 2006/12/03 07:19:28 mjacob Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -719,7 +719,6 @@ #define CTS_SPI_VALID_PPR_OPTIONS 0x10 u_int flags; #define CTS_SPI_FLAGS_DISC_ENB 0x01 -#define CTS_SPI_FLAGS_TAG_ENB 0x02 u_int sync_period; u_int sync_offset; u_int bus_width; ==== //depot/projects/vimage/src/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.63 2006/10/01 20:23:50 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.64 2006/12/05 07:45:27 mjacob Exp $"); #include #include @@ -334,12 +334,12 @@ if (periph != NULL && periph->unit_number == newunit) { if (wired != 0) { - xpt_print_path(periph->path); - printf("Duplicate Wired Device entry!\n"); - xpt_print_path(periph->path); - printf("Second device (%s device at scbus%d " - "target %d lun %d) will not be wired\n", - periph_name, pathid, target, lun); + xpt_print(periph->path, "Duplicate Wired " + "Device entry!\n"); + xpt_print(periph->path, "Second device (%s " + "device at scbus%d target %d lun %d) will " + "not be wired\n", periph_name, pathid, + target, lun); wired = 0; } continue; @@ -995,8 +995,8 @@ saved_ccb->ccb_h.status |= CAM_AUTOSNS_VALID; #if 0 - xpt_print_path(saved_ccb->ccb_h.path); - printf("Recovered Sense\n"); + xpt_print(saved_ccb->ccb_h.path, + "Recovered Sense\n"); scsi_sense_print(&saved_ccb->csio); cam_error_print(saved_ccb, CAM_ESF_ALL, CAM_EPF_ALL); @@ -1287,8 +1287,7 @@ *timeout = 0; error = ERESTART; if (bootverbose) { - xpt_print_path(ccb->ccb_h.path); - printf("Queue Full\n"); + xpt_print(ccb->ccb_h.path, "Queue Full\n"); } break; } @@ -1300,8 +1299,7 @@ * command completes or a 1 second timeout. */ if (bootverbose) { - xpt_print_path(ccb->ccb_h.path); - printf("Device Busy\n"); + xpt_print(ccb->ccb_h.path, "Device Busy\n"); } if (ccb->ccb_h.retry_count > 0) { ccb->ccb_h.retry_count--; @@ -1314,13 +1312,12 @@ } break; case SCSI_STATUS_RESERV_CONFLICT: - xpt_print_path(ccb->ccb_h.path); - printf("Reservation Conflict\n"); + xpt_print(ccb->ccb_h.path, "Reservation Conflict\n"); error = EIO; break; default: - xpt_print_path(ccb->ccb_h.path); - printf("SCSI Status 0x%x\n", ccb->csio.scsi_status); + xpt_print(ccb->ccb_h.path, "SCSI Status 0x%x\n", + ccb->csio.scsi_status); error = EIO; break; } @@ -1574,42 +1571,38 @@ &timeout); break; case CAM_AUTOSENSE_FAIL: - xpt_print_path(ccb->ccb_h.path); - printf("AutoSense Failed\n"); + xpt_print(ccb->ccb_h.path, "AutoSense Failed\n"); error = EIO; /* we have to kill the command */ break; case CAM_REQ_CMP_ERR: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Request completed with CAM_REQ_CMP_ERR\n"); + xpt_print(ccb->ccb_h.path, + "Request completed with CAM_REQ_CMP_ERR\n"); printed++; } /* FALLTHROUGH */ case CAM_CMD_TIMEOUT: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Command timed out\n"); + xpt_print(ccb->ccb_h.path, "Command timed out\n"); printed++; } /* FALLTHROUGH */ case CAM_UNEXP_BUSFREE: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Unexpected Bus Free\n"); + xpt_print(ccb->ccb_h.path, "Unexpected Bus Free\n"); printed++; } /* FALLTHROUGH */ case CAM_UNCOR_PARITY: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Uncorrected Parity Error\n"); + xpt_print(ccb->ccb_h.path, + "Uncorrected Parity Error\n"); printed++; } /* FALLTHROUGH */ case CAM_DATA_RUN_ERR: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Data Overrun\n"); + xpt_print(ccb->ccb_h.path, "Data Overrun\n"); printed++; } error = EIO; /* we have to kill the command */ @@ -1638,8 +1631,8 @@ ccb->ccb_h.retry_count--; error = ERESTART; if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Selection Timeout\n"); + xpt_print(ccb->ccb_h.path, + "Selection Timeout\n"); printed++; } @@ -1701,8 +1694,7 @@ /* Unconditional requeue */ error = ERESTART; if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Request Requeued\n"); + xpt_print(ccb->ccb_h.path, "Request Requeued\n"); printed++; } break; @@ -1723,8 +1715,8 @@ ccb->ccb_h.retry_count--; error = ERESTART; if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("CAM Status 0x%x\n", status); + xpt_print(ccb->ccb_h.path, "CAM Status 0x%x\n", + status); printed++; } } else { @@ -1763,11 +1755,9 @@ if (action_string == NULL) action_string = "Unretryable Error"; if (error != ERESTART) { - xpt_print_path(ccb->ccb_h.path); - printf("error %d\n", error); + xpt_print(ccb->ccb_h.path, "error %d\n", error); } - xpt_print_path(ccb->ccb_h.path); - printf("%s\n", action_string); + xpt_print(ccb->ccb_h.path, "%s\n", action_string); } return (error); ==== //depot/projects/vimage/src/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.168 2006/11/07 23:06:00 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.171 2006/12/10 05:37:48 mjacob Exp $"); #include #include @@ -63,6 +63,7 @@ #include #include #include +#include /* for xpt_print below */ #include "opt_cam.h" /* Datastructures internal to the xpt layer */ @@ -150,6 +151,8 @@ #define CAM_DEV_RESIZE_QUEUE_NEEDED 0x10 #define CAM_DEV_TAG_AFTER_COUNT 0x20 #define CAM_DEV_INQUIRY_DATA_VALID 0x40 +#define CAM_DEV_IN_DV 0x80 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 12 11:38: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 B93DA16A530; Tue, 12 Dec 2006 11:38:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 31AE616A515 for ; Tue, 12 Dec 2006 11:38:14 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D001449EF for ; Tue, 12 Dec 2006 11:24:59 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCBQ4pU009008 for ; Tue, 12 Dec 2006 11:26:04 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCBQ4hb009005 for perforce@freebsd.org; Tue, 12 Dec 2006 11:26:04 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 12 Dec 2006 11:26:04 GMT Message-Id: <200612121126.kBCBQ4hb009005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111541 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, 12 Dec 2006 11:38:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=111541 Change 111541 by zec@zec_tca51 on 2006/12/12 11:26:00 In sonewconn() new sockets must be allocated with M_NOWAIT flag, not with M_WAITOK. Affected files ... .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#3 (text+ko) ==== @@ -431,9 +431,9 @@ return (NULL); #ifdef VIMAGE VNET_ASSERT(head->so_vnetb); - so = soalloc(M_WAITOK, head->so_vnetb); + so = soalloc(M_NOWAIT, head->so_vnetb); #else - so = soalloc(M_WAITOK, NULL); + so = soalloc(M_NOWAIT, NULL); #endif if (so == NULL) return (NULL); From owner-p4-projects@FreeBSD.ORG Tue Dec 12 12:15: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 85BC516A4FD; Tue, 12 Dec 2006 12:15:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 41C9616A4D4 for ; Tue, 12 Dec 2006 12:15:35 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D86443DF4 for ; Tue, 12 Dec 2006 12:09:55 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCCB2W5017984 for ; Tue, 12 Dec 2006 12:11:02 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCCB2DG017967 for perforce@freebsd.org; Tue, 12 Dec 2006 12:11:02 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 12 Dec 2006 12:11:02 GMT Message-Id: <200612121211.kBCCB2DG017967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111542 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, 12 Dec 2006 12:15:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=111542 Change 111542 by zec@zec_tca51 on 2006/12/12 12:10:03 Virtualize igmpstat. Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#6 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#5 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#6 (text+ko) ==== @@ -81,10 +81,12 @@ static struct router_info *find_rti(struct ifnet *ifp); static void igmp_sendpkt(struct in_multi *, int, unsigned long); +#ifndef VIMAGE static struct igmpstat igmpstat; +#endif -SYSCTL_STRUCT(_net_inet_igmp, IGMPCTL_STATS, stats, CTLFLAG_RW, &igmpstat, - igmpstat, ""); +SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_igmp, IGMPCTL_STATS, + stats, CTLFLAG_RW, igmpstat, igmpstat, ""); /* * igmp_mtx protects all mutable global variables in igmp.c, as well as the @@ -197,7 +199,7 @@ int timer; /** timer value in the igmp query header **/ INIT_VNET_INET(ifp->if_vnetb); - ++igmpstat.igps_rcv_total; + ++V_igmpstat.igps_rcv_total; ip = mtod(m, struct ip *); igmplen = ip->ip_len; @@ -206,14 +208,14 @@ * Validate lengths. */ if (igmplen < IGMP_MINLEN) { - ++igmpstat.igps_rcv_tooshort; + ++V_igmpstat.igps_rcv_tooshort; m_freem(m); return; } minlen = iphlen + IGMP_MINLEN; if ((m->m_flags & M_EXT || m->m_len < minlen) && (m = m_pullup(m, minlen)) == 0) { - ++igmpstat.igps_rcv_tooshort; + ++V_igmpstat.igps_rcv_tooshort; return; } @@ -224,7 +226,7 @@ m->m_len -= iphlen; igmp = mtod(m, struct igmp *); if (in_cksum(m, igmplen)) { - ++igmpstat.igps_rcv_badsum; + ++V_igmpstat.igps_rcv_badsum; m_freem(m); return; } @@ -249,7 +251,7 @@ */ switch (igmp->igmp_type) { case IGMP_MEMBERSHIP_QUERY: - ++igmpstat.igps_rcv_queries; + ++V_igmpstat.igps_rcv_queries; if (ifp->if_flags & IFF_LOOPBACK) break; @@ -276,7 +278,7 @@ if (ip->ip_dst.s_addr != igmp_all_hosts_group || igmp->igmp_group.s_addr != 0) { - ++igmpstat.igps_rcv_badqueries; + ++V_igmpstat.igps_rcv_badqueries; m_freem(m); return; } @@ -287,7 +289,7 @@ if (igmp->igmp_group.s_addr != 0 && !IN_MULTICAST(ntohl(igmp->igmp_group.s_addr))) { - ++igmpstat.igps_rcv_badqueries; + ++V_igmpstat.igps_rcv_badqueries; m_freem(m); return; } @@ -335,13 +337,13 @@ ip->ip_src.s_addr == IA_SIN(ia)->sin_addr.s_addr) break; - ++igmpstat.igps_rcv_reports; + ++V_igmpstat.igps_rcv_reports; if (ifp->if_flags & IFF_LOOPBACK) break; if (!IN_MULTICAST(ntohl(igmp->igmp_group.s_addr))) { - ++igmpstat.igps_rcv_badreports; + ++V_igmpstat.igps_rcv_badreports; m_freem(m); return; } @@ -368,7 +370,7 @@ IN_LOOKUP_MULTI(igmp->igmp_group, ifp, inm); if (inm != NULL) { inm->inm_timer = 0; - ++igmpstat.igps_rcv_ourreports; + ++V_igmpstat.igps_rcv_ourreports; inm->inm_state = IGMP_OTHERMEMBER; } IN_MULTI_UNLOCK(); @@ -530,5 +532,5 @@ */ ip_output(m, router_alert, &igmprt, 0, &imo, NULL); - ++igmpstat.igps_snd_reports; + ++V_igmpstat.igps_snd_reports; } ==== //depot/projects/vimage/src/sys/netinet/vinet.h#5 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -85,6 +86,7 @@ struct icmpstat _icmpstat; struct ipstat _ipstat; + struct igmpstat _igmpstat; SLIST_HEAD(, router_info) _router_info_head; }; @@ -131,6 +133,7 @@ #define V_icmpstat VNET_INET(icmpstat) #define V_ipstat VNET_INET(ipstat) +#define V_igmpstat VNET_INET(igmpstat) #define V_router_info_head VNET_INET(router_info_head) From owner-p4-projects@FreeBSD.ORG Tue Dec 12 12:41: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 9BB0516A412; Tue, 12 Dec 2006 12:41:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 63FAF16A416; Tue, 12 Dec 2006 12:41:40 +0000 (UTC) (envelope-from ticso@cicely12.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C0C743CAB; Tue, 12 Dec 2006 12:40:16 +0000 (GMT) (envelope-from ticso@cicely12.cicely.de) Received: from cicely5.cicely.de ([10.1.1.7]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id kBCCfbVF043141; Tue, 12 Dec 2006 13:41:37 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (cicely12.cicely.de [10.1.1.14]) by cicely5.cicely.de (8.13.4/8.13.4) with ESMTP id kBCCfTdl042118 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 12 Dec 2006 13:41:30 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (localhost [127.0.0.1]) by cicely12.cicely.de (8.13.4/8.13.3) with ESMTP id kBCCfTjJ074589; Tue, 12 Dec 2006 13:41:29 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: (from ticso@localhost) by cicely12.cicely.de (8.13.4/8.13.3/Submit) id kBCCfTuC074588; Tue, 12 Dec 2006 13:41:29 +0100 (CET) (envelope-from ticso) Date: Tue, 12 Dec 2006 13:41:29 +0100 From: Bernd Walter To: Warner Losh Message-ID: <20061212124128.GS54209@cicely12.cicely.de> References: <200612120328.kBC3SVQX086559@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200612120328.kBC3SVQX086559@repoman.freebsd.org> X-Operating-System: FreeBSD cicely12.cicely.de 5.4-STABLE alpha User-Agent: Mutt/1.5.9i X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED=-1.8, BAYES_00=-2.599 autolearn=ham version=3.1.7 X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on cicely12.cicely.de Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Dec 2006 12:41:40 -0000 On Tue, Dec 12, 2006 at 03:28:31AM +0000, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=111526 > > Change 111526 by imp@imp_lighthouse on 2006/12/12 03:27:31 > > Don't leak a lock on an invalid transfer. Ups... > Affected files ... > > .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#39 edit > > Differences ... > > ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#39 (text+ko) ==== > > @@ -321,8 +321,10 @@ > len = msgs[i].len; > buf = msgs[i].buf; > /* zero byte transfers aren't allowed */ > - if (len == 0 || buf == NULL) > - return (EINVAL); > + if (len == 0 || buf == NULL) { > + err = EINVAL; > + goto out; > + } > if (len == 1) > WR4(sc, TWI_CR, TWI_CR_START | TWI_CR_STOP); > else -- B.Walter http://www.bwct.de http://www.fizon.de bernd@bwct.de info@bwct.de support@fizon.de From owner-p4-projects@FreeBSD.ORG Tue Dec 12 15:36: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 A542616A407; Tue, 12 Dec 2006 15:36:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3A1F516A49E for ; Tue, 12 Dec 2006 15:36:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93F7843DB8 for ; Tue, 12 Dec 2006 15:32:43 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCFXkf7069171 for ; Tue, 12 Dec 2006 15:33:46 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCFXkJC069166 for perforce@freebsd.org; Tue, 12 Dec 2006 15:33:46 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 12 Dec 2006 15:33:46 GMT Message-Id: <200612121533.kBCFXkJC069166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 111552 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, 12 Dec 2006 15:36:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=111552 Change 111552 by gonzo@gonzo_hq on 2006/12/12 15:33:37 o Unbreak world break. including setjmp.h from libc we got __register_t type undefined. Replace cdefs.h with types.h is OK since there is mention in style(9) that presence of types.h assumes cdefs.h as well. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/setjmp.h#3 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/setjmp.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ #ifndef _MACHINE_SETJMP_H_ #define _MACHINE_SETJMP_H_ -#include +#include #define _JBLEN 12 /* Size of the jmp_buf on MIPS. */ From owner-p4-projects@FreeBSD.ORG Tue Dec 12 16:00: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 CE43F16A516; Tue, 12 Dec 2006 16:00:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7894E16A505 for ; Tue, 12 Dec 2006 16:00:44 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B01BA43E2A for ; Tue, 12 Dec 2006 15:57:12 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCFwIlE074314 for ; Tue, 12 Dec 2006 15:58:18 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCFwIdu074311 for perforce@freebsd.org; Tue, 12 Dec 2006 15:58:18 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 12 Dec 2006 15:58:18 GMT Message-Id: <200612121558.kBCFwIdu074311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111553 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, 12 Dec 2006 16:00:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=111553 Change 111553 by zec@zec_tca51 on 2006/12/12 15:57:31 Introduce a quiet version of a macro used to set the per-thread vnet affinity. The standard CURVNETB_SET() version normally prints out a warning message if we begin to "stack" the vnet affinity, i.e. if in a call graph we call CURVNETB_SET() more than once without previously reverting it with CURVNETB_RESTORE(). However, there are circumstances when such "stacking" of vnet affinity is unavoidable, such as when instatiating new vnets or moving interfaces from one vnet to another, in which case the CURVNETB_SET_QUIET() macro can / should be used. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#10 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#8 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#10 (text+ko) ==== @@ -192,7 +192,7 @@ if (vi_req != NULL) { struct ifnet *t_ifp; - CURVNETB_SET(new_vnetb); + CURVNETB_SET_QUIET(new_vnetb); t_ifp = ifunit(vi_req->vi_parent_name); CURVNETB_RESTORE(); if (t_ifp != NULL) @@ -442,7 +442,7 @@ LIST_INSERT_HEAD(&vnetb_head, vnetb, vnetb_le); LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le); LIST_INSERT_HEAD(&vcpu_head, vcpu, vcpu_le); - CURVNETB_SET(vnetb); + CURVNETB_SET_QUIET(vnetb); /* * Initialize modules with ORDER_1ST flag set @@ -504,7 +504,7 @@ struct vcpu *vcpu = vip->v_cpu; struct ifnet *ifp; - CURVNETB_SET(vnetb); + CURVNETB_SET_QUIET(vnetb); INIT_VNET_NET(vnetb); /* return all interfaces to the parent vnetb */ ==== //depot/projects/vimage/src/sys/sys/vimage.h#8 (text+ko) ==== @@ -126,16 +126,21 @@ #define VNET_MAGIC_N 0x3e0d8f29 -#define CURVNETB_SET(arg) \ +#define CURVNETB_SET_QUIET(arg) \ VNET_ASSERT((arg)->vnet_magic_n == VNET_MAGIC_N); \ struct vnet_base *saved_vnetb = curvnetb; \ const char *saved_vnet_lpush = curthread->td_vnet_lpush; \ curvnetb = arg; \ - curthread->td_vnet_lpush = __FUNCTION__ ; \ + curthread->td_vnet_lpush = __FUNCTION__ ; + +#define CURVNETB_SET_VERBOSE(arg) \ + CURVNETB_SET_QUIET(arg) \ if (saved_vnetb) \ printf("curvnetb_set() in %s cpu %d: %p (%s) -> %p\n", \ curthread->td_vnet_lpush, curcpu, saved_vnetb, \ saved_vnet_lpush, curvnetb); + +#define CURVNETB_SET(arg) CURVNETB_SET_VERBOSE(arg) #define CURVNETB_RESTORE() \ VNET_ASSERT(saved_vnetb == NULL || \ @@ -176,6 +181,7 @@ * Non-VIMAGE null-macros */ #define CURVNETB_SET(arg) +#define CURVNETB_SET_QUIET(arg) #define CURVNETB_RESTORE() #define VNET_ASSERT(condition) #define VSYM(base, sym) (sym) From owner-p4-projects@FreeBSD.ORG Tue Dec 12 16:01: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 7E17416A521; Tue, 12 Dec 2006 16:01:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5B4BD16A510 for ; Tue, 12 Dec 2006 16:01:21 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E7D143E4F for ; Tue, 12 Dec 2006 15:58:38 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCFxK0H074456 for ; Tue, 12 Dec 2006 15:59:20 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCFxKjY074453 for perforce@freebsd.org; Tue, 12 Dec 2006 15:59:20 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 12 Dec 2006 15:59:20 GMT Message-Id: <200612121559.kBCFxKjY074453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111554 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, 12 Dec 2006 16:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=111554 Change 111554 by mjacob@mjexp on 2006/12/12 15:59:19 Include mulitpath in search path. Affected files ... .. //depot/projects/mjexp/include/Makefile#4 edit Differences ... ==== //depot/projects/mjexp/include/Makefile#4 (text+ko) ==== @@ -46,7 +46,7 @@ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ - geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ + geom/mirror geom/multipath geom/nop geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ From owner-p4-projects@FreeBSD.ORG Tue Dec 12 16:29: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 ED71716A47C; Tue, 12 Dec 2006 16:29:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF0E516A412 for ; Tue, 12 Dec 2006 16:29:00 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9DAF43CA6 for ; Tue, 12 Dec 2006 16:27:36 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCGSx2F082328 for ; Tue, 12 Dec 2006 16:28:59 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCGSxNB082325 for perforce@freebsd.org; Tue, 12 Dec 2006 16:28:59 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 12 Dec 2006 16:28:59 GMT Message-Id: <200612121628.kBCGSxNB082325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111557 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, 12 Dec 2006 16:29:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=111557 Change 111557 by zec@zec_tca51 on 2006/12/12 16:28:01 Don't print out warnings about vnet stacking when moving Ethernet frames from one vnet to another. XXX / TODO: we should probably somehow ensure that if vnet stacking has occured, we never dispatch the protocol handler directly, even if net.isr.direct == 1. Affected files ... .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#4 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#4 (text+ko) ==== @@ -548,7 +548,7 @@ } #endif - CURVNETB_SET(ifp->if_vnetb); + CURVNETB_SET_QUIET(ifp->if_vnetb); #ifdef MAC /* From owner-p4-projects@FreeBSD.ORG Tue Dec 12 17:43: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 E1D4716A53D; Tue, 12 Dec 2006 17:43:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9EC5E16A533 for ; Tue, 12 Dec 2006 17:43:40 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 960EC43E69 for ; Tue, 12 Dec 2006 17:39:11 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCHeUK8004972 for ; Tue, 12 Dec 2006 17:40:30 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCHeUjR004969 for perforce@freebsd.org; Tue, 12 Dec 2006 17:40:30 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 12 Dec 2006 17:40:30 GMT Message-Id: <200612121740.kBCHeUjR004969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111561 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, 12 Dec 2006 17:43:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=111561 Change 111561 by mjacob@mjexp on 2006/12/12 17:39:43 Fix path. Affected files ... .. //depot/projects/mjexp/sbin/geom/class/multipath/Makefile#2 edit Differences ... ==== //depot/projects/mjexp/sbin/geom/class/multipath/Makefile#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/sbin/geom/class/stripe/Makefile,v 1.3 2004/05/21 22:12:24 pjd Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/../../misc -CFLAGS+= -I${.CURDIR}/../../../newisp CLASS= multipath NO_MAN=true + .include + +CFLAGS+= -I${.CURDIR}/../../../../sys From owner-p4-projects@FreeBSD.ORG Tue Dec 12 17: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 C949216A655; Tue, 12 Dec 2006 17:59:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A026E16A64A for ; Tue, 12 Dec 2006 17:59:05 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFCC443CCB for ; Tue, 12 Dec 2006 17:57:31 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCHwtMJ008780 for ; Tue, 12 Dec 2006 17:58:55 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCHwtbU008774 for perforce@freebsd.org; Tue, 12 Dec 2006 17:58:55 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 12 Dec 2006 17:58:55 GMT Message-Id: <200612121758.kBCHwtbU008774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111564 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, 12 Dec 2006 17:59:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=111564 Change 111564 by mjacob@mjexp on 2006/12/12 17:58:31 More baby steps. Now have something that doesn't crash right away. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#2 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#2 (text+ko) ==== @@ -126,10 +126,27 @@ g_topology_assert(); + /* + * Check to make sure parameters from the two providers are the same + */ + if (pp0->mediasize != pp1->mediasize) { + gctl_error(req, "Provider %s has mediasize %zx; Provider %s " + "has mediasize %zx", pp0->name, (intmax_t) pp0->mediasize, + pp1->name, (intmax_t) pp1->mediasize); + return (EINVAL); + } + if (pp0->sectorsize != pp1->sectorsize) { + gctl_error(req, "Provider %s has sectorsize %u; Provider %s " + "has sectorsize %u", pp0->name, pp0->sectorsize, + pp1->name, pp1->sectorsize); + return (EINVAL); + } + gp = NULL; newpp = NULL; cp0 = cp1 = NULL; + LIST_FOREACH(gp, &mp->geom, geom) { if (strcmp(gp->name, mpname) == 0) { gctl_error(req, "Provider %s already exists", mpname); @@ -155,6 +172,8 @@ error = ENOMEM; goto fail; } + newpp->mediasize = pp0->mediasize; + newpp->sectorsize = pp0->sectorsize; cp0 = g_new_consumer(gp); if (cp0 == NULL) { From owner-p4-projects@FreeBSD.ORG Tue Dec 12 19:55: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 5220316A4C2; Tue, 12 Dec 2006 19:55:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 004B716A417 for ; Tue, 12 Dec 2006 19:55:27 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A1C44408D for ; Tue, 12 Dec 2006 19:24:36 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCJPsFT033225 for ; Tue, 12 Dec 2006 19:25:54 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCJPrnn033222 for perforce@freebsd.org; Tue, 12 Dec 2006 19:25:53 GMT (envelope-from ticso@freebsd.org) Date: Tue, 12 Dec 2006 19:25:53 GMT Message-Id: <200612121925.kBCJPrnn033222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111568 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, 12 Dec 2006 19:55:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=111568 Change 111568 by ticso@ticso on 2006/12/12 19:25:13 rework VLAN_MTU support - setup in the correct place - support for disabling the feature Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#66 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#66 (text+ko) ==== @@ -308,9 +308,6 @@ } IF_ADDR_UNLOCK(sc->ifp); - /* enable big packets */ - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); - /* * Write the hash to the hash register. This card can also * accept unicast packets as well as multicast packets using this @@ -757,6 +754,9 @@ */ ate_setmcast(sc); + /* enable big packets */ + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); + /* * Set 'running' flag, and clear output active flag * and attempt to start the output @@ -953,7 +953,13 @@ mask = ifp->if_capenable ^ ifr->ifr_reqcap; if (mask & IFCAP_VLAN_MTU) { ATE_LOCK(sc); - ifp->if_capenable ^= IFCAP_VLAN_MTU; + if (ifr->ifr_reqcap & IFCAP_VLAN_MTU) { + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); + ifp->if_capenable |= IFCAP_VLAN_MTU; + } else { + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_BIG); + ifp->if_capenable &= ~IFCAP_VLAN_MTU; + } ATE_UNLOCK(sc); } default: From owner-p4-projects@FreeBSD.ORG Tue Dec 12 20:12: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 5D6F116A531; Tue, 12 Dec 2006 20:12:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2BD1816A51F for ; Tue, 12 Dec 2006 20:12:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C61B4406E for ; Tue, 12 Dec 2006 19:41:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCJgHAA036961 for ; Tue, 12 Dec 2006 19:42:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCJgGFX036957 for perforce@freebsd.org; Tue, 12 Dec 2006 19:42:16 GMT (envelope-from jhb@freebsd.org) Date: Tue, 12 Dec 2006 19:42:16 GMT Message-Id: <200612121942.kBCJgGFX036957@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 111572 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, 12 Dec 2006 20:12:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=111572 Change 111572 by jhb@jhb_mutex on 2006/12/12 19:41:57 IFC @111571. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#22 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#6 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#11 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#23 integrate .. //depot/projects/smpng/sys/dev/awi/awivar.h#8 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#82 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#47 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#79 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#17 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/mptable_pci.c#6 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#13 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#31 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#34 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#17 integrate .. //depot/projects/smpng/sys/net/bridgestp.h#7 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#42 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#16 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#32 integrate .. //depot/projects/smpng/sys/netgraph/ng_nat.c#5 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#81 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#92 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#13 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#36 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#37 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#15 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#28 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#17 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#20 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#46 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#27 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#27 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#19 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#38 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#23 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#18 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#8 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#42 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#17 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#12 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#31 integrate .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#7 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#19 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#22 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.26 2006/11/17 16:41:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ */ /* @@ -190,13 +190,13 @@ int intr_remove_handler(void *cookie) { + struct intsrc *isrc; int error; + isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); -#ifdef XXX if (error == 0) - intrcnt_updatename(/* XXX */); -#endif + intrcnt_updatename(isrc); return (error); } ==== //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.5 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); #include #include @@ -72,6 +72,27 @@ return (bus_generic_attach(dev)); } +/* Pass MSI alloc requests up to the nexus. */ +static int +mptable_hostb_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +mptable_hostb_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static device_method_t mptable_hostb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, mptable_hostb_probe), @@ -96,9 +117,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -165,4 +186,3 @@ DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); - ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#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/sys/amd64/include/intr_machdep.h,v 1.12 2006/11/13 22:23:33 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -147,9 +147,9 @@ void intr_resume(void); void intr_suspend(void); void intrcnt_add(const char *name, u_long **countp); -void msi_init(void); int msi_alloc(device_t dev, int count, int maxcount, int *irqs, int *newirq, int *newcount); +void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); int msix_release(int irq); ==== //depot/projects/smpng/sys/amd64/pci/pci_bus.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.118 2006/11/13 22:23:33 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 jhb Exp $"); #include "opt_cpu.h" @@ -81,6 +81,28 @@ return (PCI_INVALID_IRQ); } +/* Pass MSI alloc requests up to the nexus. */ + +static int +legacy_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +legacy_pcib_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, uint32_t id, uint8_t class, uint8_t subclass, @@ -322,9 +344,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, legacy_pcib_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.51 2006/11/13 21:47:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.52 2006/12/12 19:27:00 jhb Exp $"); #include "opt_acpi.h" #include @@ -74,6 +74,10 @@ int func, int reg, uint32_t data, int bytes); static int acpi_pcib_acpi_route_interrupt(device_t pcib, device_t dev, int pin); +static int acpi_pcib_alloc_msi(device_t pcib, device_t dev, + int count, int maxcount, int *irqs); +static int acpi_pcib_alloc_msix(device_t pcib, device_t dev, + int index, int *irq); static struct resource *acpi_pcib_acpi_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, @@ -103,9 +107,9 @@ DEVMETHOD(pcib_read_config, acpi_pcib_read_config), DEVMETHOD(pcib_write_config, acpi_pcib_write_config), DEVMETHOD(pcib_route_interrupt, acpi_pcib_acpi_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, acpi_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, acpi_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} @@ -306,6 +310,26 @@ return (acpi_pcib_route_interrupt(pcib, dev, pin, &sc->ap_prt)); } +static int +acpi_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +acpi_pcib_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static u_long acpi_host_mem_start = 0x80000000; TUNABLE_ULONG("hw.acpi.host_mem_start", &acpi_host_mem_start); ==== //depot/projects/smpng/sys/dev/awi/awivar.h#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awivar.h,v 1.20 2004/01/15 09:39:15 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.12 2005/06/10 16:49:05 brooks Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.13 2006/12/12 03:05:04 kevlo Exp $ */ /*- * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc. @@ -76,6 +76,7 @@ struct awi_softc { #ifdef __NetBSD__ struct device sc_dev; + void (*sc_power)(struct awi_softc *, int); #endif #ifdef __FreeBSD__ struct arpcom sc_arp; @@ -86,7 +87,6 @@ u_char sc_banner[AWI_BANNER_LEN]; int (*sc_enable)(struct awi_softc *); void (*sc_disable)(struct awi_softc *); - void (*sc_power)(struct awi_softc *, int); int (*sc_newstate)(struct ieee80211com *, enum ieee80211_state, int); ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#82 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.158 2006/12/11 18:00:34 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.159 2006/12/12 05:11:12 scottl Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -256,6 +256,10 @@ { BGE_CHIPID_BCM5714_B3, "BCM5714 B3" }, { BGE_CHIPID_BCM5715_A0, "BCM5715 A0" }, { BGE_CHIPID_BCM5715_A1, "BCM5715 A1" }, + /* 5784 and 5787 share the same ASIC ID */ + { BGE_CHIPID_BCM5787_A0, "BCM5754/5787 A0" }, + { BGE_CHIPID_BCM5787_A1, "BCM5754/5787 A1" }, + { BGE_CHIPID_BCM5787_A2, "BCM5754/5787 A2" }, { 0, NULL } }; @@ -276,7 +280,8 @@ { BGE_ASICREV_BCM5780, "unknown BCM5780" }, { BGE_ASICREV_BCM5714, "unknown BCM5714" }, { BGE_ASICREV_BCM5755, "unknown BCM5755" }, - { BGE_ASICREV_BCM5787, "unknown BCM5787" }, + /* 5784 and 5787 share the same ASIC ID */ + { BGE_ASICREV_BCM5787, "unknown BCM5754/5787" }, { 0, NULL } }; @@ -345,6 +350,7 @@ static uint32_t bge_readreg_ind(struct bge_softc *, int); #endif static void bge_writereg_ind(struct bge_softc *, int, int); +static void bge_writemem_direct(struct bge_softc *, int, int) __unused; static int bge_miibus_readreg(device_t, int, int); static int bge_miibus_writereg(device_t, int, int, int); @@ -361,6 +367,18 @@ static int bge_reset(struct bge_softc *); static void bge_link_upd(struct bge_softc *); +/* + * The BGE_REGISTER_DEBUG option is only for low-level debugging. It may + * leak information to untrusted users. It is also known to cause alignment + * traps on certain architectures. + */ +#ifdef BGE_REGISTER_DEBUG +static int bge_sysctl_debug_info(SYSCTL_HANDLER_ARGS); +static int bge_sysctl_reg_read(SYSCTL_HANDLER_ARGS); +static int bge_sysctl_mem_read(SYSCTL_HANDLER_ARGS); +#endif +static void bge_add_sysctls(struct bge_softc *); + static device_method_t bge_methods[] = { /* Device interface */ DEVMETHOD(device_probe, bge_probe), @@ -409,11 +427,14 @@ bge_readmem_ind(struct bge_softc *sc, int off) { device_t dev; + uint32_t val; dev = sc->bge_dev; pci_write_config(dev, BGE_PCI_MEMWIN_BASEADDR, off, 4); - return (pci_read_config(dev, BGE_PCI_MEMWIN_DATA, 4)); + val = pci_read_config(dev, BGE_PCI_MEMWIN_DATA, 4); + pci_write_config(dev, BGE_PCI_MEMWIN_BASEADDR, 0, 4); + return (val); } static void @@ -425,6 +446,7 @@ pci_write_config(dev, BGE_PCI_MEMWIN_BASEADDR, off, 4); pci_write_config(dev, BGE_PCI_MEMWIN_DATA, val, 4); + pci_write_config(dev, BGE_PCI_MEMWIN_BASEADDR, 0, 4); } #ifdef notdef @@ -451,6 +473,12 @@ pci_write_config(dev, BGE_PCI_REG_DATA, val, 4); } +static void +bge_writemem_direct(struct bge_softc *sc, int off, int val) +{ + CSR_WRITE_4(sc, off, val); +} + /* * Map a single buffer address. */ @@ -1193,6 +1221,7 @@ struct bge_rcb *rcb; bus_size_t vrcb; bge_hostaddr taddr; + uint32_t val; int i; /* @@ -1330,7 +1359,12 @@ * values are 1/8th the number of descriptors allocated to * each ring. */ - CSR_WRITE_4(sc, BGE_RBDI_STD_REPL_THRESH, BGE_STD_RX_RING_CNT/8); + if (sc->bge_flags & BGE_FLAG_5705_PLUS) + val = 8; + else + val = BGE_STD_RX_RING_CNT / 8; + + CSR_WRITE_4(sc, BGE_RBDI_STD_REPL_THRESH, val); CSR_WRITE_4(sc, BGE_RBDI_JUMBO_REPL_THRESH, BGE_JUMBO_RX_RING_CNT/8); /* @@ -1500,9 +1534,16 @@ if (!(BGE_IS_5705_PLUS(sc))) CSR_WRITE_4(sc, BGE_DMAC_MODE, BGE_DMACMODE_ENABLE); + + val = BGE_WDMAMODE_ENABLE|BGE_WDMAMODE_ALL_ATTNS; + + /* Enable host coalescing bug fix. */ + if (sc->bge_asicrev == BGE_ASICREV_BCM5755 || + sc->bge_asicrev == BGE_ASICREV_BCM5787) + val |= (1 << 29); + /* Turn on write DMA state machine */ - CSR_WRITE_4(sc, BGE_WDMA_MODE, - BGE_WDMAMODE_ENABLE|BGE_WDMAMODE_ALL_ATTNS); + CSR_WRITE_4(sc, BGE_WDMA_MODE, val); /* Turn on read DMA state machine */ CSR_WRITE_4(sc, BGE_RDMA_MODE, @@ -2071,7 +2112,7 @@ uint32_t mac_tmp = 0; u_char eaddr[6]; int error = 0, rid; - int trys; + int trys, reg; sc = device_get_softc(dev); sc->bge_dev = dev; @@ -2143,28 +2184,38 @@ break; } - /* - * XXX: Broadcom Linux driver. Not in specs or eratta. - * PCI-Express? - */ - if (BGE_IS_5705_PLUS(sc)) { - uint32_t v; - - v = pci_read_config(dev, BGE_PCI_MSI_CAPID, 4); - if (((v >> 8) & 0xff) == BGE_PCIE_CAPID_REG) { - v = pci_read_config(dev, BGE_PCIE_CAPID_REG, 4); - if ((v & 0xff) == BGE_PCIE_CAPID) - sc->bge_flags |= BGE_FLAG_PCIE; - } + /* + * Check if this is a PCI-X or PCI Express device. + */ +#if __FreeBSD_version > 700010 + if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { + /* + * Found a PCI Express capabilities register, this + * must be a PCI Express device. + */ + if (reg != 0) + sc->bge_flags |= BGE_FLAG_PCIE; + } else if (pci_find_extcap(dev, PCIY_PCIX, ®) == 0) { + if (reg != 0) + sc->bge_flags |= BGE_FLAG_PCIX; + } + +#else + if (sc->bge_flags & BGE_FLAG_5705_PLUS) { + reg = pci_read_config(dev, BGE_PCIE_CAPID_REG, 4); + if ((reg & 0xff) == BGE_PCIE_CAPID) + sc->bge_flags |= BGE_FLAG_PCIE; + } else { + /* + * Check if the device is in PCI-X Mode. + * (This bit is not valid on PCI Express controllers.) + */ + if ((pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4) & + BGE_PCISTATE_PCI_BUSMODE) == 0) + sc->bge_flags |= BGE_FLAG_PCIX; } +#endif - /* - * PCI-X ? - */ - if ((pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4) & - BGE_PCISTATE_PCI_BUSMODE) == 0) - sc->bge_flags |= BGE_FLAG_PCIX; - /* Try to reset the chip. */ if (bge_reset(sc)) { device_printf(sc->bge_dev, "chip reset failed\n"); @@ -2244,8 +2295,8 @@ sc->bge_stat_ticks = BGE_TICKS_PER_SEC; sc->bge_rx_coal_ticks = 150; sc->bge_tx_coal_ticks = 150; - sc->bge_rx_max_coal_bds = 64; - sc->bge_tx_max_coal_bds = 128; + sc->bge_rx_max_coal_bds = 10; + sc->bge_tx_max_coal_bds = 10; /* Set up ifnet structure */ ifp = sc->bge_ifp = if_alloc(IFT_ETHER); @@ -2384,6 +2435,8 @@ device_printf(sc->bge_dev, "couldn't set up irq\n"); } + bge_add_sysctls(sc); + fail: return (error); } @@ -2458,10 +2511,19 @@ { device_t dev; uint32_t cachesize, command, pcistate, reset; + void (*write_op)(struct bge_softc *, int, int); int i, val = 0; dev = sc->bge_dev; + if (BGE_IS_5705_PLUS(sc) && !BGE_IS_5714_FAMILY(sc)) + if (sc->bge_flags & BGE_FLAG_PCIE) + write_op = bge_writemem_direct; + else + write_op = bge_writemem_ind; + else + write_op = bge_writereg_ind; + /* Save some important PCI state. */ cachesize = pci_read_config(dev, BGE_PCI_CACHESZ, 4); command = pci_read_config(dev, BGE_PCI_CMD, 4); @@ -2471,6 +2533,23 @@ BGE_PCIMISCCTL_INDIRECT_ACCESS|BGE_PCIMISCCTL_MASK_PCI_INTR| BGE_HIF_SWAP_OPTIONS|BGE_PCIMISCCTL_PCISTATE_RW, 4); + /* Disable fastboot on controllers that support it. */ + if (sc->bge_asicrev == BGE_ASICREV_BCM5752 || + sc->bge_asicrev == BGE_ASICREV_BCM5755 || + sc->bge_asicrev == BGE_ASICREV_BCM5787) { + if (bootverbose) + device_printf(sc->bge_dev, "%s: Disabling fastboot\n", + __FUNCTION__); + CSR_WRITE_4(sc, BGE_FASTBOOT_PC, 0x0); + } + + /* + * Write the magic number to SRAM at offset 0xB50. + * When firmware finishes its initialization it will + * write ~BGE_MAGIC_NUMBER to the same location. + */ + bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER); + reset = BGE_MISCCFG_RESET_CORE_CLOCKS|(65<<1); /* XXX: Broadcom Linux driver. */ @@ -2490,8 +2569,15 @@ */ bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER); + /* + * Set GPHY Power Down Override to leave GPHY + * powered up in D0 uninitialized. + */ + if (sc->bge_flags & BGE_FLAG_5705_PLUS) + reset |= 0x04000000; + /* Issue global reset */ - bge_writereg_ind(sc, BGE_MISC_CFG, reset); + write_op(sc, BGE_MISC_CFG, reset); DELAY(1000); @@ -2504,7 +2590,7 @@ v = pci_read_config(dev, 0xc4, 4); pci_write_config(dev, 0xc4, v | (1<<15), 4); } - /* Set PCIE max payload size and clear error status. */ + /* Set PCIE max payload size to 128 bytes and clear error status. */ pci_write_config(dev, 0xd8, 0xf5000, 4); } @@ -2514,7 +2600,7 @@ BGE_HIF_SWAP_OPTIONS|BGE_PCIMISCCTL_PCISTATE_RW, 4); pci_write_config(dev, BGE_PCI_CACHESZ, cachesize, 4); pci_write_config(dev, BGE_PCI_CMD, command, 4); - bge_writereg_ind(sc, BGE_MISC_CFG, (65 << 1)); + write_op(sc, BGE_MISC_CFG, (65 << 1)); /* Enable memory arbiter. */ if (BGE_IS_5714_FAMILY(sc)) { @@ -2526,8 +2612,7 @@ CSR_WRITE_4(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE); /* - * Poll the value location we just wrote until - * we see the 1's complement of the magic number. + * Poll until we see the 1's complement of the magic number. * This indicates that the firmware initialization * is complete. */ @@ -2539,8 +2624,8 @@ } if (i == BGE_TIMEOUT) { - device_printf(sc->bge_dev, "firmware handshake timed out\n"); - return(0); + device_printf(sc->bge_dev, "firmware handshake timed out! " + "found 0x%08X\n", val); } /* @@ -2557,6 +2642,11 @@ DELAY(10); } + if (sc->bge_flags & BGE_FLAG_PCIE) { + reset = bge_readmem_ind(sc, 0x7c00); + bge_writemem_ind(sc, 0x7c00, reset | (1 << 25)); + } + /* Fix up byte swapping. */ CSR_WRITE_4(sc, BGE_MODE_CTL, BGE_DMA_SWAP_OPTIONS| BGE_MODECTL_BYTESWAP_DATA); @@ -3947,3 +4037,141 @@ BGE_MACSTAT_CFG_CHANGED|BGE_MACSTAT_MI_COMPLETE| BGE_MACSTAT_LINK_CHANGED); } + +static void +bge_add_sysctls(struct bge_softc *sc) +{ + struct sysctl_ctx_list *ctx; + struct sysctl_oid_list *children; + + ctx = device_get_sysctl_ctx(sc->bge_dev); + children = SYSCTL_CHILDREN(device_get_sysctl_tree(sc->bge_dev)); + +#ifdef BGE_REGISTER_DEBUG + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "debug_info", + CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_debug_info, "I", + "Debug Information"); + + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "reg_read", + CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_reg_read, "I", + "Register Read"); + + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "mem_read", + CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_mem_read, "I", + "Memory Read"); + + SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "stat_IfHcInOctets", + CTLFLAG_RD, + &sc->bge_ldata.bge_stats->rxstats.ifHCInOctets.bge_addr_lo, + "Bytes received"); + + SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "stat_IfHcOutOctets", + CTLFLAG_RD, + &sc->bge_ldata.bge_stats->txstats.ifHCOutOctets.bge_addr_lo, + "Bytes received"); +#endif +} + +#ifdef BGE_REGISTER_DEBUG +static int +bge_sysctl_debug_info(SYSCTL_HANDLER_ARGS) +{ + struct bge_softc *sc; + uint16_t *sbdata; + int error; + int result; + int i, j; + + result = -1; + error = sysctl_handle_int(oidp, &result, 0, req); + if (error || (req->newptr == NULL)) + return (error); + + if (result == 1) { + sc = (struct bge_softc *)arg1; + + sbdata = (uint16_t *)sc->bge_ldata.bge_status_block; + printf("Status Block:\n"); + for (i = 0x0; i < (BGE_STATUS_BLK_SZ / 4); ) { + printf("%06x:", i); + for (j = 0; j < 8; j++) { + printf(" %04x", sbdata[i]); + i += 4; + } + printf("\n"); + } + + printf("Registers:\n"); + for (i = 0x800; i < 0xa00; ) { + printf("%06x:", i); + for (j = 0; j < 8; j++) { + printf(" %08x", CSR_READ_4(sc, i)); + i += 4; + } + printf("\n"); + } + + printf("Hardware Flags:\n"); + if (sc->bge_flags & BGE_FLAG_575X_PLUS) + printf(" - 575X Plus\n"); + if (sc->bge_flags & BGE_FLAG_5705_PLUS) + printf(" - 5705 Plus\n"); + if (sc->bge_flags & BGE_FLAG_JUMBO) + printf(" - Supports Jumbo Frames\n"); + if (sc->bge_flags & BGE_FLAG_PCIX) + printf(" - PCI-X Bus\n"); + if (sc->bge_flags & BGE_FLAG_PCIE) + printf(" - PCI Express Bus\n"); + if (sc->bge_flags & BGE_FLAG_NO3LED) + printf(" - No 3 LEDs\n"); + if (sc->bge_flags & BGE_FLAG_RX_ALIGNBUG) + printf(" - RX Alignment Bug\n"); + } + + return (error); +} + +static int +bge_sysctl_reg_read(SYSCTL_HANDLER_ARGS) +{ + struct bge_softc *sc; + int error; + uint16_t result; + uint32_t val; + + result = -1; + error = sysctl_handle_int(oidp, &result, 0, req); + if (error || (req->newptr == NULL)) + return (error); + + if (result < 0x8000) { + sc = (struct bge_softc *)arg1; + val = CSR_READ_4(sc, result); + printf("reg 0x%06X = 0x%08X\n", result, val); + } + + return (error); +} + +static int +bge_sysctl_mem_read(SYSCTL_HANDLER_ARGS) +{ + struct bge_softc *sc; + int error; + uint16_t result; + uint32_t val; + + result = -1; + error = sysctl_handle_int(oidp, &result, 0, req); + if (error || (req->newptr == NULL)) + return (error); + + if (result < 0x8000) { + sc = (struct bge_softc *)arg1; + val = bge_readmem_ind(sc, result); + printf("mem 0x%06X = 0x%08X\n", result, val); + } + + return (error); +} +#endif ==== //depot/projects/smpng/sys/dev/bge/if_bgereg.h#47 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.60 2006/12/04 22:12:21 jkim Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.61 2006/12/12 05:11:12 scottl Exp $ */ /* @@ -271,6 +271,15 @@ #define BGE_CHIPID_BCM5714_B3 0x80030000 #define BGE_CHIPID_BCM5715_A0 0x90000000 #define BGE_CHIPID_BCM5715_A1 0x90010000 +#define BGE_CHIPID_BCM5755_A0 0xa0000000 +#define BGE_CHIPID_BCM5755_A1 0xa0010000 +#define BGE_CHIPID_BCM5755_A2 0xa0020000 +#define BGE_CHIPID_BCM5754_A0 0xb0000000 +#define BGE_CHIPID_BCM5754_A1 0xb0010000 +#define BGE_CHIPID_BCM5754_A2 0xb0020000 +#define BGE_CHIPID_BCM5787_A0 0xb0000000 +#define BGE_CHIPID_BCM5787_A1 0xb0010000 +#define BGE_CHIPID_BCM5787_A2 0xb0020000 /* shorthand one */ #define BGE_ASICREV(x) ((x) >> 28) @@ -285,6 +294,7 @@ #define BGE_ASICREV_BCM5780 0x08 #define BGE_ASICREV_BCM5714 0x09 #define BGE_ASICREV_BCM5755 0x0a +#define BGE_ASICREV_BCM5754 0x0b #define BGE_ASICREV_BCM5787 0x0b /* chip revisions */ @@ -1661,6 +1671,7 @@ #define BGE_EE_CTL 0x6840 #define BGE_MDI_CTL 0x6844 #define BGE_EE_DELAY 0x6848 +#define BGE_FASTBOOT_PC 0x6894 /* Mode control register */ #define BGE_MODECTL_INT_SNDCOAL_ONLY 0x00000001 ==== //depot/projects/smpng/sys/dev/pci/pci.c#79 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.324 2006/11/21 05:46:09 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.327 2006/12/12 19:33:25 jhb Exp $"); #include "opt_bus.h" @@ -52,6 +52,10 @@ #include #include +#if defined(__i386__) || defined(__amd64__) +#include +#endif + #include #include #include @@ -442,6 +446,10 @@ pci_read_extcap(device_t pcib, pcicfgregs *cfg) { #define REG(n, w) PCIB_READ_CONFIG(pcib, cfg->bus, cfg->slot, cfg->func, n, w) +#define WREG(n, v, w) PCIB_WRITE_CONFIG(pcib, cfg->bus, cfg->slot, cfg->func, n, v, w) +#if defined(__i386__) || defined(__amd64__) + uint64_t addr; +#endif uint32_t val; int ptr, nextptr, ptrptr; @@ -483,6 +491,29 @@ cfg->pp.pp_data = ptr + PCIR_POWER_DATA; } break; +#if defined(__i386__) || defined(__amd64__) + case PCIY_HT: /* HyperTransport */ + /* Determine HT-specific capability type. */ + val = REG(ptr + PCIR_HT_COMMAND, 2); + switch (val & PCIM_HTCMD_CAP_MASK) { + case PCIM_HTCAP_MSI_MAPPING: + /* Sanity check the mapping window. */ + addr = REG(ptr + PCIR_HTMSI_ADDRESS_HI, 4); + addr <<= 32; + addr = REG(ptr + PCIR_HTMSI_ADDRESS_LO, 4); + if (addr != MSI_INTEL_ADDR_BASE) + device_printf(pcib, + "HT Bridge at %d:%d:%d has non-default MSI window 0x%llx\n", + cfg->bus, cfg->slot, cfg->func, + (long long)addr); + + /* Enable MSI -> HT mapping. */ + val |= PCIM_HTCMD_MSI_ENABLE; + WREG(ptr + PCIR_HT_COMMAND, val, 2); + break; + } + break; +#endif case PCIY_MSI: /* PCI MSI */ cfg->msi.msi_location = ptr; cfg->msi.msi_ctrl = REG(ptr + PCIR_MSI_CTRL, 2); @@ -511,7 +542,7 @@ break; } } -/* REG use carry through to next functions */ +/* REG and WREG use carry through to next functions */ } /* @@ -520,7 +551,6 @@ static uint32_t pci_read_vpd_reg(device_t pcib, pcicfgregs *cfg, int reg) { -#define WREG(n, v, w) PCIB_WRITE_CONFIG(pcib, cfg->bus, cfg->slot, cfg->func, n, v, w) KASSERT((reg & 3) == 0, ("VPD register must by 4 byte aligned")); @@ -545,7 +575,6 @@ return; } #endif -#undef WREG struct vpd_readstate { device_t pcib; @@ -807,6 +836,7 @@ cfg->vpd.vpd_ros = NULL; } #undef REG +#undef WREG } int @@ -990,6 +1020,10 @@ if (cfg->msix.msix_alloc != 0) return (ENXIO); + if (bootverbose) + device_printf(child, + "attempting to allocate %d MSI-X vectors (%d supported)\n", + *count, cfg->msix.msix_msgnum); max = min(*count, cfg->msix.msix_msgnum); for (i = 0; i < max; i++) { /* Allocate a message. */ @@ -1002,6 +1036,51 @@ } actual = i; + if (bootverbose) { + rle = resource_list_find(&dinfo->resources, SYS_RES_IRQ, 1); + if (actual == 1) + device_printf(child, "using IRQ %lu for MSI-X\n", + rle->start); + else { + int run; + + /* + * Be fancy and try to print contiguous runs of + * IRQ values as ranges. 'irq' is the previous IRQ. + * 'run' is true if we are in a range. + */ + device_printf(child, "using IRQs %lu", rle->start); + irq = rle->start; + run = 0; + for (i = 1; i < actual; i++) { + rle = resource_list_find(&dinfo->resources, + SYS_RES_IRQ, i + 1); + + /* Still in a run? */ + if (rle->start == irq + 1) { + run = 1; + irq++; + continue; + } + + /* Finish previous range. */ + if (run) { + printf("-%d", irq); + run = 0; + } + + /* Start new range. */ + printf(",%lu", rle->start); + irq = rle->start; + } + + /* Unfinished range? */ + if (run) + printf("%d", irq); + printf(" for MSI-X\n"); + } + } + /* Mask all vectors. */ for (i = 0; i < cfg->msix.msix_msgnum; i++) pci_mask_msix(child, i); @@ -1151,6 +1230,11 @@ if (cfg->msi.msi_alloc != 0) return (ENXIO); + if (bootverbose) + device_printf(child, + "attempting to allocate %d MSI vectors (%d supported)\n", + *count, cfg->msi.msi_msgnum); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 12 22:51:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F28C16A40F; Tue, 12 Dec 2006 22:51:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CCDA316A47E for ; Tue, 12 Dec 2006 22:51:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0ECF43FA8 for ; Tue, 12 Dec 2006 22:07:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCM8VnJ078146 for ; Tue, 12 Dec 2006 22:08:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCM8V4s078137 for perforce@freebsd.org; Tue, 12 Dec 2006 22:08:31 GMT (envelope-from imp@freebsd.org) Date: Tue, 12 Dec 2006 22:08:31 GMT Message-Id: <200612122208.kBCM8V4s078137@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 111579 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, 12 Dec 2006 22:51:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111579 Change 111579 by imp@imp_lighthouse on 2006/12/12 22:08:26 Move __NO_STRICT_ALIGNMENT and use it. Affected files ... .. //depot/projects/arm/src/sys/amd64/include/_types.h#7 edit .. //depot/projects/arm/src/sys/amd64/include/param.h#5 edit .. //depot/projects/arm/src/sys/i386/include/_types.h#7 edit .. //depot/projects/arm/src/sys/i386/include/param.h#4 edit .. //depot/projects/arm/src/sys/net/bpf_filter.c#5 edit .. //depot/projects/arm/src/sys/net/if_loop.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/amd64/include/_types.h#7 (text+ko) ==== @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __NO_STRICT_ALIGNMENT - /* * Basic types upon which most other types are built. */ ==== //depot/projects/arm/src/sys/amd64/include/param.h#5 (text+ko) ==== @@ -66,6 +66,7 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __NO_STRICT_ALIGNMENT #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT ==== //depot/projects/arm/src/sys/i386/include/_types.h#7 (text+ko) ==== @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __NO_STRICT_ALIGNMENT - /* * Basic types upon which most other types are built. */ ==== //depot/projects/arm/src/sys/i386/include/param.h#4 (text+ko) ==== @@ -51,6 +51,7 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __NO_STRICT_ALIGNMENT #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT ==== //depot/projects/arm/src/sys/net/bpf_filter.c#5 (text+ko) ==== @@ -38,11 +38,7 @@ #include -#ifdef sun -#include -#endif - -#ifndef __i386__ +#ifndef __NO_STRICT_ALIGNMENT #define BPF_ALIGN #endif ==== //depot/projects/arm/src/sys/net/if_loop.c#8 (text+ko) ==== @@ -290,7 +290,7 @@ /* Strip away media header */ if (hlen > 0) { m_adj(m, hlen); -#if defined(__ia64__) || defined(__sparc64__) +#ifndef __NO_STRICT_ALIGNMENT /* * Some archs do not like unaligned data, so * we move data down in the first mbuf. From owner-p4-projects@FreeBSD.ORG Tue Dec 12 23:55: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 8483216A417; Tue, 12 Dec 2006 23:55:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5DB1416A415 for ; Tue, 12 Dec 2006 23:55:04 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6187943DC0 for ; Tue, 12 Dec 2006 23:52:25 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCNriOC032030 for ; Tue, 12 Dec 2006 23:53:44 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCNriBh032026 for perforce@freebsd.org; Tue, 12 Dec 2006 23:53:44 GMT (envelope-from ticso@freebsd.org) Date: Tue, 12 Dec 2006 23:53:44 GMT Message-Id: <200612122353.kBCNriBh032026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111582 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, 12 Dec 2006 23:55:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=111582 Change 111582 by ticso@ticso on 2006/12/12 23:53:26 fix a race in transmit buffer handling Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#67 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#67 (text+ko) ==== @@ -72,7 +72,7 @@ #include "miibus_if.h" -#define ATE_MAX_TX_BUFFERS 64 /* We have ping-pong tx buffers */ +#define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 struct ate_softc @@ -833,6 +833,9 @@ */ BPF_MTAP(ifp, m); + if (sc->sent_mbuf[sc->txcur] != 0) { + panic("ate: sc->sent_mbuf[%i] != 0", sc->txcur); + } sc->sent_mbuf[sc->txcur] = m; sc->txcur++; } From owner-p4-projects@FreeBSD.ORG Wed Dec 13 01:59: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 7E96616A47B; Wed, 13 Dec 2006 01:59:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 57B6116A416 for ; Wed, 13 Dec 2006 01:59:25 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04BC843CAD for ; Wed, 13 Dec 2006 01:57:58 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBD1xOUj063617 for ; Wed, 13 Dec 2006 01:59:24 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBD1xM6e063610 for perforce@freebsd.org; Wed, 13 Dec 2006 01:59:22 GMT (envelope-from marcel@freebsd.org) Date: Wed, 13 Dec 2006 01:59:22 GMT Message-Id: <200612130159.kBD1xM6e063610@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 111583 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, 13 Dec 2006 01:59:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=111583 Change 111583 by marcel@marcel_nfs on 2006/12/13 01:58:56 IFC @111581 Affected files ... .. //depot/projects/powerpc/contrib/cvs/src/log.c#2 integrate .. //depot/projects/powerpc/lib/libc/sys/kse.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/powerpc/lib/libelf/elf.3#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/powerpc/sbin/fdisk/fdisk.8#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/powerpc/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/powerpc/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/powerpc/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/powerpc/sys/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/powerpc/sys/dev/advansys/adv_isa.c#4 integrate .. //depot/projects/powerpc/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/advansys/advansys.c#4 integrate .. //depot/projects/powerpc/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/powerpc/sys/dev/aha/aha.c#4 integrate .. //depot/projects/powerpc/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/powerpc/sys/dev/aha/aha_mca.c#4 integrate .. //depot/projects/powerpc/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/powerpc/sys/dev/amd/amd.c#2 integrate .. //depot/projects/powerpc/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/powerpc/sys/dev/asr/asr.c#5 integrate .. //depot/projects/powerpc/sys/dev/awi/awivar.h#4 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/powerpc/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/powerpc/sys/dev/buslogic/bt_eisa.c#4 integrate .. //depot/projects/powerpc/sys/dev/buslogic/bt_isa.c#4 integrate .. //depot/projects/powerpc/sys/dev/buslogic/bt_mca.c#4 integrate .. //depot/projects/powerpc/sys/dev/buslogic/bt_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/powerpc/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/powerpc/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/powerpc/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/powerpc/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/powerpc/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/powerpc/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/powerpc/sys/dev/mii/miidevs#5 integrate .. //depot/projects/powerpc/sys/dev/mly/mly.c#5 integrate .. //depot/projects/powerpc/sys/dev/pci/pci.c#5 integrate .. //depot/projects/powerpc/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/powerpc/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/powerpc/sys/dev/trm/trm.c#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/if_auereg.h#4 integrate .. //depot/projects/powerpc/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/usb_ethersubr.h#4 integrate .. //depot/projects/powerpc/sys/dev/wds/wd7000.c#4 integrate .. //depot/projects/powerpc/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/powerpc/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/powerpc/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/powerpc/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/powerpc/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/powerpc/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/powerpc/sys/i386/pci/pci_cfgreg.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_intr.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_kse.c#2 integrate .. //depot/projects/powerpc/sys/net/bridgestp.c#2 integrate .. //depot/projects/powerpc/sys/net/bridgestp.h#2 integrate .. //depot/projects/powerpc/sys/net/if_bridge.c#2 integrate .. //depot/projects/powerpc/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/powerpc/sys/net/if_spppsubr.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/powerpc/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.c#2 integrate .. //depot/projects/powerpc/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/powerpc/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/frag6.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/in6.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/mld6.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/nd6.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/scope6.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/powerpc/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/powerpc/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/powerpc/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/powerpc/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/powerpc/sys/sys/interrupt.h#5 integrate .. //depot/projects/powerpc/usr.bin/truss/truss.1#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/index.c#2 integrate Differences ... ==== //depot/projects/powerpc/contrib/cvs/src/log.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ * argument, prints the log information for all the files in the directory * (recursive by default). * - * $FreeBSD: src/contrib/cvs/src/log.c,v 1.2 2004/07/06 08:10:38 des Exp $ + * $FreeBSD: src/contrib/cvs/src/log.c,v 1.3 2006/12/12 03:20:36 obrien Exp $ */ #include "cvs.h" @@ -236,7 +236,7 @@ prl = &log_data.revlist; optind = 0; - while ((c = getopt (argc, argv, "+bd:hlNSRr::s:tw::")) != -1) + while ((c = getopt (argc, argv, "+bd:hlNnSRr::s:tw::")) != -1) { switch (c) { @@ -255,6 +255,9 @@ case 'N': log_data.notags = 1; break; + case 'n': + log_data.notags = 0; + break; case 'S': log_data.sup_header = 1; break; ==== //depot/projects/powerpc/lib/libc/sys/kse.2#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.18 2006/08/04 07:56:31 yar Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.19 2006/12/12 08:13:02 julian Exp $ .\" .Dd July 12, 2004 .Dt KSE 2 @@ -264,13 +264,10 @@ If this KSE is the last one in the KSE group, there must be no remaining threads associated with the KSE group blocked in the kernel. This system call does not return unless there is an error. -.Pp -As a special case, if the last remaining KSE in the last remaining KSE group -invokes this system call, then the KSE is not destroyed; -instead, the KSE just loses the association with its mailbox and +Calling .Fn kse_exit -returns normally. -This returns the process to its original, unthreaded state. +from the last thread is the same as calling +.Fn exit . .Pp The .Fn kse_release ==== //depot/projects/powerpc/lib/libc/sys/mkdir.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.21 2006/12/09 22:39:28 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.22 2006/12/12 15:00:08 pjd Exp $ .\" .Dd December 9, 2006 .Dt MKDIR 2 @@ -79,7 +79,8 @@ .It Bq Er ELOOP Too many symbolic links were encountered in translating the pathname. .It Bq Er EPERM -The parent directory of the named file has its immutable flag set, see the +The parent directory of the directory to be created has its immutable flag set, +see the .Xr chflags 2 manual page for more information. .It Bq Er EROFS ==== //depot/projects/powerpc/lib/libc/sys/symlink.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)symlink.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/symlink.2,v 1.16 2006/12/09 23:01:38 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/symlink.2,v 1.20 2006/12/12 20:06:52 pjd Exp $ .\" .Dd December 9, 2006 .Dt SYMLINK 2 @@ -65,18 +65,28 @@ .It Bq Er ENOTDIR A component of the .Fa name2 -prefix is not a directory. +path prefix is not a directory. .It Bq Er ENAMETOOLONG -A component of either pathname exceeded 255 characters, +A component of the +.Fa name2 +pathname exceeded 255 characters, or the entire length of either path name exceeded 1023 characters. .It Bq Er ENOENT -The named file does not exist. +A component of the +.Fa name2 +path prefix does not exist. .It Bq Er EACCES A component of the .Fa name2 path prefix denies search permission. +.It Bq Er EACCES +A component of the +.Fa name2 +path prefix denies write permission. .It Bq Er ELOOP -Too many symbolic links were encountered in translating the pathname. +Too many symbolic links were encountered in translating the +.Fa name2 +path name. .It Bq Er EEXIST The path name pointed at by the .Fa name2 ==== //depot/projects/powerpc/lib/libelf/elf.3#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf.3,v 1.2 2006/11/13 09:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libelf/elf.3,v 1.3 2006/12/11 09:03:27 jkoshy Exp $ .\" -.Dd September 1, 2006 +.Dd December 11, 2006 .Os .Dt ELF 3 .Sh NAME @@ -287,6 +287,98 @@ .Vt Elf_Scn descriptor is opaque and contains no application modifiable fields. .El +.Ss Supported Elf Types +The following ELF datatypes are supported by the library. +.Pp +.Bl -tag -width ".Dv ELF_T_SYMINFO" -compact +.It Dv ELF_T_ADDR +Machine addresses. +.It Dv ELF_T_BYTE +Byte data. +The library will not attempt to translate byte data. +.It Dv ELF_T_CAP +Software and hardware capability records. +.It Dv ELF_T_DYN +Records used in a section of type +.Dv SHT_DYNAMIC . +.It Dv ELF_T_EHDR +ELF executable header. +.It Dv ELF_T_HALF +16-bit unsigned words. +.It Dv ELF_T_LWORD +64 bit unsigned words. +.It Dv ELF_T_MOVE +ELF Move records. +.\".It Dv ELF_T_MOVEP +.\" As yet unsupported. +.It Dv ELF_T_NOTE +ELF Note structures. +.It Dv ELF_T_OFF +File offsets. +.It Dv ELF_T_PHDR +ELF program header table entries. +.It Dv ELF_T_REL +ELF relocation entries. +.It Dv ELF_T_RELA +ELF relocation entries with addends. +.It Dv ELF_T_SHDR +ELF section header entries. +.It Dv ELF_T_SWORD +Signed 32-bit words. +.It Dv ELF_T_SXWORD +Signed 64-bit words. +.It Dv ELF_T_SYMINFO +ELF symbol information. +.It Dv ELF_T_SYM +ELF symbol table entries. +.It Dv ELF_T_VDEF +Symbol version definition records. +.It Dv ELF_T_VNEED +Symbol version requirement records. +.It Dv ELF_T_WORD +Unsigned 32-bit words. +.It Dv ELF_T_XWORD +Unsigned 64-bit words. +.El +.Pp +The symbol +.Dv ELF_T_NUM +denotes the number of Elf types known to the library. +.Pp +The following table shows the mapping between ELF section types +defined in +.Xr elf 5 +and the types supported by the library. +.Bl -column ".Dv SHT_PREINIT_ARRAY" ".Dv ELF_T_SYMINFO" +.It Em Section Type Ta Em "Library Type" Ta Em Description +.It Dv SHT_DYNAMIC Ta Dv ELF_T_DYN Ta Xo +.Sq .dynamic +section entries. +.Xc +.It Dv SHT_DYNSYM Ta Dv ELF_T_SYM Ta Symbols for dynamic linking. +.It Dv SHT_FINI_ARRAY Ta Dv ELF_T_ADDR Ta Termination function pointers. +.It Dv SHT_GROUP Ta Dv ELF_T_WORD Ta Section group marker. +.It Dv SHT_HASH Ta Dv ELF_T_HASH Ta Symbol hashes. +.It Dv SHT_INIT_ARRAY Ta Dv ELF_T_ADDR Ta Initialization function pointers. +.It Dv SHT_NOBITS Ta Dv ELF_T_BYTE Ta Xo +Empty sections. +See +.Xr elf 5 . +.Xc +.It Dv SHT_NOTE Ta Dv ELF_T_NOTE Ta ELF note records. +.It Dv SHT_PREINIT_ARRAY Ta Dv ELF_T_ADDR Ta Pre-initialization function pointers. +.It Dv SHT_PROGBITS Ta Dv ELF_T_BYTE Ta Machine code. +.It Dv SHT_REL Ta Dv ELF_T_REL Ta ELF relocation records. +.It Dv SHT_RELA Ta Dv ELF_T_RELA Ta Relocation records with addends. +.It Dv SHT_STRTAB Ta Dv ELF_T_BYTE Ta String tables. +.It Dv SHT_SYMTAB Ta Dv ELF_T_SYM Ta Symbol tables. +.It Dv SHT_SYMTAB_SHNDX Ta Dv ELF_T_WORD Ta Used with extended section numbering. +.It Dv SHT_GNU_verdef Ta Dv ELF_T_VDEF Ta Symbol version definitions. +.It Dv SHT_GNU_verneed Ta Dv ELF_T_VNEED Ta Symbol versioning requirements. +.It Dv SHT_SUNW_move Ta Dv ELF_T_MOVE Ta ELF move records. +.It Dv SHT_SUNW_syminfo Ta Dv ELF_T_SYMINFO Ta Additional symbol flags. +.El +.TE .Ss Functional Grouping This section contains a brief overview of the available functionality in the ELF library. ==== //depot/projects/powerpc/lib/libthr/thread/thr_cond.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/thread/thr_cond.c,v 1.22 2006/12/05 07:23:58 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.23 2006/12/12 03:08:49 davidxu Exp $ */ #include "namespace.h" @@ -124,13 +124,6 @@ else { cv = *cond; THR_UMUTEX_LOCK(curthread, &cv->c_lock); -#if 0 - /* Lock the condition variable structure: */ - if (cv->c_kerncv.c_has_waiters) { - THR_UMUTEX_UNLOCK(curthread, &cv->c_lock); - return (EBUSY); - } -#endif /* * NULL the caller's pointer now that the condition * variable has been destroyed: @@ -143,7 +136,6 @@ * variable structure: */ free(cv); - } /* Return the completion status: */ return (rval); @@ -163,9 +155,10 @@ struct cond_cancel_info *info = (struct cond_cancel_info *)arg; pthread_cond_t cv; - cv = *(info->cond); - if ((cv->c_lock.m_owner & ~UMUTEX_CONTESTED) == TID(curthread)) + if (info->cond != NULL) { + cv = *(info->cond); THR_UMUTEX_UNLOCK(curthread, &cv->c_lock); + } _mutex_cv_lock(info->mutex, info->count); } @@ -209,6 +202,7 @@ THR_CLEANUP_PUSH(curthread, cond_cancel_handler, &info); _thr_cancel_enter_defer(curthread); ret = _thr_ucond_wait(&cv->c_kerncv, &cv->c_lock, tsp, 1); + info.cond = NULL; _thr_cancel_leave_defer(curthread, ret); THR_CLEANUP_POP(curthread, 0); } else { @@ -275,12 +269,10 @@ cv = *cond; THR_UMUTEX_LOCK(curthread, &cv->c_lock); - if (cv->c_kerncv.c_has_waiters) { - if (!broadcast) - ret = _thr_ucond_signal(&cv->c_kerncv); - else - ret = _thr_ucond_broadcast(&cv->c_kerncv); - } + if (!broadcast) + ret = _thr_ucond_signal(&cv->c_kerncv); + else + ret = _thr_ucond_broadcast(&cv->c_kerncv); THR_UMUTEX_UNLOCK(curthread, &cv->c_lock); return (ret); } ==== //depot/projects/powerpc/lib/libthr/thread/thr_umtx.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/thread/thr_umtx.c,v 1.8 2006/12/05 06:53:44 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.10 2006/12/12 05:26:39 davidxu Exp $ * */ @@ -41,7 +41,7 @@ int __thr_umutex_lock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, 0) == 0) + if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, 0) != -1) return 0; return (errno); } @@ -54,7 +54,7 @@ timeout->tv_nsec <= 0))) return (ETIMEDOUT); if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, - __DECONST(void *, timeout)) == 0) + __DECONST(void *, timeout)) != -1) return (0); return (errno); } @@ -62,7 +62,7 @@ int __thr_umutex_unlock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0) == 0) + if (_umtx_op(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0) != -1) return (0); return (errno); } @@ -70,7 +70,7 @@ int __thr_umutex_trylock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_TRYLOCK, 0, 0, 0) == 0) + if (_umtx_op(mtx, UMTX_OP_MUTEX_TRYLOCK, 0, 0, 0) != -1) return (0); return (errno); } @@ -79,7 +79,7 @@ __thr_umutex_set_ceiling(struct umutex *mtx, uint32_t ceiling, uint32_t *oldceiling) { - if (_umtx_op(mtx, UMTX_OP_SET_CEILING, ceiling, oldceiling, 0) == 0) + if (_umtx_op(mtx, UMTX_OP_SET_CEILING, ceiling, oldceiling, 0) != -1) return (0); return (errno); } @@ -91,7 +91,7 @@ timeout->tv_nsec <= 0))) return (ETIMEDOUT); if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT, id, 0, - __DECONST(void*, timeout)) == 0) + __DECONST(void*, timeout)) != -1) return (0); return (errno); } @@ -100,7 +100,7 @@ _thr_umtx_wake(volatile umtx_t *mtx, int nr_wakeup) { if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAKE, - nr_wakeup, 0, 0) == 0) + nr_wakeup, 0, 0) != -1) return (0); return (errno); } @@ -122,7 +122,7 @@ } if (_umtx_op(cv, UMTX_OP_CV_WAIT, check_unparking ? UMTX_CHECK_UNPARKING : 0, - m, __DECONST(void*, timeout)) == 0) { + m, __DECONST(void*, timeout)) != -1) { return (0); } return (errno); @@ -131,7 +131,9 @@ int _thr_ucond_signal(struct ucond *cv) { - if (_umtx_op(cv, UMTX_OP_CV_SIGNAL, 0, NULL, NULL) == 0) + if (!cv->c_has_waiters) + return (0); + if (_umtx_op(cv, UMTX_OP_CV_SIGNAL, 0, NULL, NULL) != -1) return (0); return (errno); } @@ -139,7 +141,9 @@ int _thr_ucond_broadcast(struct ucond *cv) { - if (_umtx_op(cv, UMTX_OP_CV_BROADCAST, 0, NULL, NULL) == 0) + if (!cv->c_has_waiters) + return (0); + if (_umtx_op(cv, UMTX_OP_CV_BROADCAST, 0, NULL, NULL) != -1) return (0); return (errno); } ==== //depot/projects/powerpc/sbin/fdisk/fdisk.8#2 (text+ko) ==== @@ -1,6 +1,6 @@ -.\" $FreeBSD: src/sbin/fdisk/fdisk.8,v 1.37 2006/12/08 21:50:48 ru Exp $ +.\" $FreeBSD: src/sbin/fdisk/fdisk.8,v 1.38 2006/12/12 15:26:25 ru Exp $ .\" -.Dd December 9, 2006 +.Dd December 12, 2006 .Dt FDISK 8 .Os .Sh NAME @@ -75,7 +75,7 @@ .Ar configfile . The .Ar configfile -always modifies existing slices, unless +only modifies explicitly specified slices, unless .Fl i is also given, in which case all existing slices are deleted (marked as @@ -100,13 +100,12 @@ Use with caution! .It Fl i Initialize sector 0 of the disk. -This implies -.Fl u , -unless -.Fl f -is given. +Existing slice entries will be cleared +(marked as unused) before editing. +(Compare with +.Fl u . ) .It Fl I -Initialize the contents of sector 0 +Initialize sector 0 slice table for one .Fx slice covering the entire disk. @@ -120,7 +119,7 @@ Implies .Fl v . .It Fl u -Is used for updating (editing) sector 0 of the disk. +Update (edit) the disk's sector 0 slice table. Ignored if .Fl f is given. @@ -257,13 +256,15 @@ flags is that the .Fl u -flag just edits (updates) the fields as they appear on the disk, +flag edits (updates) the existing slice parameters while the .Fl i flag is used to .Dq initialize -sector 0; -it will set up the first BIOS slice to use the whole disk for +them (old values will be ignored); +if you edit the first slice, +.Fl i +will also set it up to use the whole disk for .Fx and make it active. .Sh NOTES @@ -281,8 +282,6 @@ please make sure that the .Fx slice starts on a cylinder boundary. -A number of decisions made later may assume this. -(This might not be necessary later.) .Pp Editing an existing slice will most likely result in the loss of all data in that slice. @@ -413,7 +412,6 @@ downwards to correspond to head and cylinder boundaries): .Pp .Dl "p 1 165 1 2503871" -.Pp .It Ic a Ar slice Make .Ar slice ==== //depot/projects/powerpc/sbin/ifconfig/ifbridge.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.8 2006/11/27 20:52:57 thompsa Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.9 2006/12/11 23:46:40 thompsa Exp $"; #endif /* not lint */ #include @@ -413,27 +413,27 @@ } static void -setbridge_p2p(const char *val, int d, int s, const struct afswtch *afp) +setbridge_ptp(const char *val, int d, int s, const struct afswtch *afp) { - do_bridgeflag(s, val, IFBIF_BSTP_P2P, 1); + do_bridgeflag(s, val, IFBIF_BSTP_PTP, 1); } static void -unsetbridge_p2p(const char *val, int d, int s, const struct afswtch *afp) +unsetbridge_ptp(const char *val, int d, int s, const struct afswtch *afp) { - do_bridgeflag(s, val, IFBIF_BSTP_P2P, 0); + do_bridgeflag(s, val, IFBIF_BSTP_PTP, 0); } static void -setbridge_autop2p(const char *val, int d, int s, const struct afswtch *afp) +setbridge_autoptp(const char *val, int d, int s, const struct afswtch *afp) { - do_bridgeflag(s, val, IFBIF_BSTP_AUTOP2P, 1); + do_bridgeflag(s, val, IFBIF_BSTP_AUTOPTP, 1); } static void -unsetbridge_autop2p(const char *val, int d, int s, const struct afswtch *afp) +unsetbridge_autoptp(const char *val, int d, int s, const struct afswtch *afp) { - do_bridgeflag(s, val, IFBIF_BSTP_AUTOP2P, 0); + do_bridgeflag(s, val, IFBIF_BSTP_AUTOPTP, 0); } static void @@ -681,10 +681,10 @@ DEF_CMD_ARG("-edge", unsetbridge_edge), DEF_CMD_ARG("autoedge", setbridge_autoedge), DEF_CMD_ARG("-autoedge", unsetbridge_autoedge), - DEF_CMD_ARG("p2p", setbridge_p2p), - DEF_CMD_ARG("-p2p", unsetbridge_p2p), - DEF_CMD_ARG("autop2p", setbridge_autop2p), - DEF_CMD_ARG("-autop2p", unsetbridge_autop2p), + DEF_CMD_ARG("ptp", setbridge_ptp), + DEF_CMD_ARG("-ptp", unsetbridge_ptp), + DEF_CMD_ARG("autoptp", setbridge_autoptp), + DEF_CMD_ARG("-autoptp", unsetbridge_autoptp), DEF_CMD("flush", 0, setbridge_flush), DEF_CMD("flushall", 0, setbridge_flushall), DEF_CMD_ARG2("static", setbridge_static), ==== //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.129 2006/11/27 21:59:04 thompsa Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.130 2006/12/11 23:46:40 thompsa Exp $ .\" .Dd November 27, 2006 .Dt IFCONFIG 8 @@ -1296,24 +1296,24 @@ .It Cm -autoedge Ar interface Disable automatic edge status on .Ar interface . -.It Cm p2p Ar interface +.It Cm ptp Ar interface Set the .Ar interface as a point to point link. This is required for straight transitions to forwarding and should be enabled on a direct link to another RSTP capable switch. -.It Cm -p2p Ar interface +.It Cm -ptp Ar interface Disable point to point link status on .Ar interface . This should be disabled for a half duplex link and for an interface connected to a shared network segment, like a hub or a wireless network. -.It Cm autop2p Ar interface +.It Cm autoptp Ar interface Automatically detect the point to point status on .Ar interface by checking the full duplex link status. This is the default for interfaces added to the bridge. -.It Cm -autop2p Ar interface +.It Cm -autoptp Ar interface Disable automatic point to point link detection on .Ar interface . .It Cm maxage Ar seconds ==== //depot/projects/powerpc/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.26 2006/11/17 16:41:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ */ /* @@ -190,13 +190,13 @@ int intr_remove_handler(void *cookie) { + struct intsrc *isrc; int error; + isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); -#ifdef XXX if (error == 0) - intrcnt_updatename(/* XXX */); -#endif + intrcnt_updatename(isrc); return (error); } ==== //depot/projects/powerpc/sys/amd64/amd64/mptable_pci.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.5 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); #include #include @@ -72,6 +72,27 @@ return (bus_generic_attach(dev)); } +/* Pass MSI alloc requests up to the nexus. */ +static int +mptable_hostb_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +mptable_hostb_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static device_method_t mptable_hostb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, mptable_hostb_probe), @@ -96,9 +117,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -165,4 +186,3 @@ DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); - ==== //depot/projects/powerpc/sys/amd64/include/intr_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.12 2006/11/13 22:23:33 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -147,9 +147,9 @@ void intr_resume(void); void intr_suspend(void); void intrcnt_add(const char *name, u_long **countp); -void msi_init(void); int msi_alloc(device_t dev, int count, int maxcount, int *irqs, int *newirq, int *newcount); +void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); int msix_release(int irq); ==== //depot/projects/powerpc/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.118 2006/11/13 22:23:33 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 jhb Exp $"); #include "opt_cpu.h" @@ -81,6 +81,28 @@ return (PCI_INVALID_IRQ); } +/* Pass MSI alloc requests up to the nexus. */ + +static int +legacy_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +legacy_pcib_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, uint32_t id, uint8_t class, uint8_t subclass, @@ -322,9 +344,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, legacy_pcib_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } ==== //depot/projects/powerpc/sys/dev/aac/aac_pci.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.60 2006/11/03 04:57:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.61 2006/12/11 18:28:28 mjacob Exp $"); /* * PCI bus interface and resource allocation. @@ -82,6 +82,8 @@ static devclass_t aac_devclass; DRIVER_MODULE(aac, pci, aac_pci_driver, aac_devclass, 0, 0); +MODULE_DEPEND(aac, pci, 1, 1, 1); + struct aac_ident { ==== //depot/projects/powerpc/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.51 2006/11/13 21:47:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.52 2006/12/12 19:27:00 jhb Exp $"); #include "opt_acpi.h" #include @@ -74,6 +74,10 @@ int func, int reg, uint32_t data, int bytes); static int acpi_pcib_acpi_route_interrupt(device_t pcib, device_t dev, int pin); +static int acpi_pcib_alloc_msi(device_t pcib, device_t dev, + int count, int maxcount, int *irqs); +static int acpi_pcib_alloc_msix(device_t pcib, device_t dev, + int index, int *irq); static struct resource *acpi_pcib_acpi_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, @@ -103,9 +107,9 @@ DEVMETHOD(pcib_read_config, acpi_pcib_read_config), DEVMETHOD(pcib_write_config, acpi_pcib_write_config), DEVMETHOD(pcib_route_interrupt, acpi_pcib_acpi_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, acpi_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, acpi_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} @@ -306,6 +310,26 @@ return (acpi_pcib_route_interrupt(pcib, dev, pin, &sc->ap_prt)); } +static int +acpi_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +acpi_pcib_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static u_long acpi_host_mem_start = 0x80000000; TUNABLE_ULONG("hw.acpi.host_mem_start", &acpi_host_mem_start); ==== //depot/projects/powerpc/sys/dev/advansys/adv_eisa.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.19 2006/02/04 22:33:08 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.20 2006/12/11 18:28:28 mjacob Exp $"); #include #include @@ -351,3 +351,4 @@ static devclass_t adv_eisa_devclass; DRIVER_MODULE(adv, eisa, adv_eisa_driver, adv_eisa_devclass, 0, 0); +MODULE_DEPEND(adv, eisa, 1, 1, 1); ==== //depot/projects/powerpc/sys/dev/advansys/adv_isa.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.29 2005/07/13 15:44:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.30 2006/12/11 18:28:28 mjacob Exp $"); #include #include @@ -430,3 +430,4 @@ static devclass_t adv_isa_devclass; DRIVER_MODULE(adv, isa, adv_isa_driver, adv_isa_devclass, 0, 0); +MODULE_DEPEND(adv, isa, 1, 1, 1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 13 10:23: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 C693116A417; Wed, 13 Dec 2006 10:23:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A26E016A407 for ; Wed, 13 Dec 2006 10:23:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DF8843CA6 for ; Wed, 13 Dec 2006 10:21:54 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDANMrO031797 for ; Wed, 13 Dec 2006 10:23:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDANM50031793 for perforce@freebsd.org; Wed, 13 Dec 2006 10:23:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 13 Dec 2006 10:23:22 GMT Message-Id: <200612131023.kBDANM50031793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 111621 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, 13 Dec 2006 10:23:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=111621 Change 111621 by hselasky@hselasky_mini_itx on 2006/12/13 10:23:21 Fix a regression. After this patch it should be possible to do kldload-kldunload cycles without having to replug the USB device. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#21 (text+ko) ==== @@ -873,6 +873,53 @@ return 0; } +/* The following function will remove detached + * devices from the interface list. This can + * happen during USB device module unload. + */ +static void +usbd_remove_detached_devices(struct usbd_device *udev) +{ + device_t *subdev = udev->subdevs; + device_t *subdev_end = udev->subdevs_end; + uint8_t detached_first = 0; + + PRINTFN(3,("udev=%p\n", udev)); + + while (subdev < subdev_end) { + if (subdev[0]) { + if (device_is_attached(subdev[0]) == 0) { + if (device_delete_child(device_get_parent(subdev[0]), + subdev[0]) == 0) { + subdev[0] = NULL; + if (subdev == udev->subdevs) { + detached_first = 1; + } + + } else { + /* Panic here, else one can get a double call to + * device_detach(). USB devices should never fail + * on detach! + */ + panic("device_delete_child() failed!\n"); + } + } + } + subdev++; + } + + if (detached_first) { + if ((udev->probed == USBD_PROBED_SPECIFIC_AND_FOUND) || + (udev->probed == USBD_PROBED_GENERIC_AND_FOUND)) { + /* The first and only device is gone. + * Reset the "probed" variable. + */ + udev->probed = USBD_PROBED_NOTHING; + } + } + return; +} + /* "usbd_probe_and_attach()" is called * from "usbd_new_device()" and "uhub_explore()" */ @@ -895,6 +942,8 @@ return (USBD_INVAL); } + usbd_remove_detached_devices(udev); + bzero(&uaa, sizeof(uaa)); /* probe and attach */ From owner-p4-projects@FreeBSD.ORG Wed Dec 13 10:32: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 179DC16A4B3; Wed, 13 Dec 2006 10:32:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E1F5616A4A0 for ; Wed, 13 Dec 2006 10:32:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEAF343CA9 for ; Wed, 13 Dec 2006 10:31:08 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDAWXaY034890 for ; Wed, 13 Dec 2006 10:32:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDAWXcE034886 for perforce@freebsd.org; Wed, 13 Dec 2006 10:32:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 13 Dec 2006 10:32:33 GMT Message-Id: <200612131032.kBDAWXcE034886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 111622 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, 13 Dec 2006 10:32:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=111622 Change 111622 by hselasky@hselasky_mini_itx on 2006/12/13 10:31:33 Compile fix: Add missing dependency, vnode_if.h. Affected files ... .. //depot/projects/usb/src/sys/modules/ugen/Makefile#2 edit Differences ... ==== //depot/projects/usb/src/sys/modules/ugen/Makefile#2 (text+ko) ==== @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/usb KMOD= ugen -SRCS= bus_if.h device_if.h opt_usb.h ugen.c usbdevs.h +SRCS= bus_if.h device_if.h opt_usb.h ugen.c usbdevs.h vnode_if.h .include From owner-p4-projects@FreeBSD.ORG Wed Dec 13 10:51:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C91AA16A47C; Wed, 13 Dec 2006 10:51:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9DC8A16A416 for ; Wed, 13 Dec 2006 10:51:27 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8461D43CED for ; Wed, 13 Dec 2006 10:49:29 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDAouZN038804 for ; Wed, 13 Dec 2006 10:50:56 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDAouWq038798 for perforce@freebsd.org; Wed, 13 Dec 2006 10:50:56 GMT (envelope-from piso@freebsd.org) Date: Wed, 13 Dec 2006 10:50:56 GMT Message-Id: <200612131050.kBDAouWq038798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111623 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, 13 Dec 2006 10:51:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=111623 Change 111623 by piso@piso_newluxor on 2006/12/13 10:50:40 Looks like p_ih is not used anywhere. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#8 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/puc/puc.c#8 (text+ko) ==== @@ -59,7 +59,6 @@ int p_hasintr:1; - driver_intr_t *p_ih; serdev_intr_t *p_ihsrc[PUC_ISRCCNT]; void *p_iharg; @@ -637,10 +636,6 @@ sc->sc_serdevs |= 1UL << (port->p_nr - 1); port->p_hasintr = 1; - /* - * XXX_FILTER this code doesn't take care of filters. - */ - port->p_ih = (driver_intr_t *)filter; port->p_iharg = arg; *cookiep = port; @@ -681,7 +676,6 @@ return (EINVAL); port->p_hasintr = 0; - port->p_ih = NULL; port->p_iharg = NULL; for (i = 0; i < PUC_ISRCCNT; i++) From owner-p4-projects@FreeBSD.ORG Wed Dec 13 11:05: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 1CFAE16A517; Wed, 13 Dec 2006 11:05:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D3DAA16A500 for ; Wed, 13 Dec 2006 11:05:19 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C38443C9F for ; Wed, 13 Dec 2006 11:03:51 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDB5JJM043599 for ; Wed, 13 Dec 2006 11:05:19 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDB5JFQ043596 for perforce@freebsd.org; Wed, 13 Dec 2006 11:05:19 GMT (envelope-from piso@freebsd.org) Date: Wed, 13 Dec 2006 11:05:19 GMT Message-Id: <200612131105.kBDB5JFQ043596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111625 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, 13 Dec 2006 11:05:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=111625 Change 111625 by piso@piso_newluxor on 2006/12/13 11:05:18 Looks like m_fastintr isn't used anywhere. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#3 edit .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#10 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#3 (text) ==== @@ -71,7 +71,6 @@ u_int m_mode; int m_attached:1; - int m_fastintr:1; int m_hasintr:1; int m_probed:1; int m_sysdev:1; ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#10 (text) ==== @@ -536,7 +536,6 @@ /* * XXX_FILTER this code doesn't take care of filters. */ - m->m_fastintr = IS_FAST(filter, ihand) ? 1 : 0; m->ih = ihand; m->ih_arg = arg; @@ -565,7 +564,6 @@ return (EINVAL); m->m_hasintr = 0; - m->m_fastintr = 0; m->ih = NULL; m->ih_arg = NULL; for (i = 0; i < SCC_ISRCCNT; i++) From owner-p4-projects@FreeBSD.ORG Wed Dec 13 12:43: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 1E18E16A508; Wed, 13 Dec 2006 12:43:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC6BF16A554 for ; Wed, 13 Dec 2006 12:43:29 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61E7243CA7 for ; Wed, 13 Dec 2006 12:41:54 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDChNNF065193 for ; Wed, 13 Dec 2006 12:43:23 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDChM1S065190 for perforce@freebsd.org; Wed, 13 Dec 2006 12:43:22 GMT (envelope-from piso@freebsd.org) Date: Wed, 13 Dec 2006 12:43:22 GMT Message-Id: <200612131243.kBDChM1S065190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111629 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, 13 Dec 2006 12:43:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=111629 Change 111629 by piso@piso_newluxor on 2006/12/13 12:43:14 Comment out a check about FAST only handlers: with filters it shouldn't be a problem anymore. Affected files ... .. //depot/projects/soc2006/intr_filter/arm/at91/at91.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/arm/at91/at91.c#6 (text) ==== @@ -548,9 +548,15 @@ { struct at91_softc *sc = device_get_softc(dev); - if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && - !IS_FAST(filter, intr)) - panic("All system interrupt ISRs must be type INTR_FAST"); + /* + * XXX mixing FAST and non FAST handlers on arm was a pain + * XXX due to latency, so this check was put here: with + * XXX filters these problems should be resolved, so comment + * XXX out this part but keep it here as a remainder. + * if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && + * !IS_FAST(filter, intr)) + * panic("All system interrupt ISRs must be type INTR_FAST"); + */ BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filter, intr, arg, cookiep); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, From owner-p4-projects@FreeBSD.ORG Wed Dec 13 14:40: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 A27BD16A51F; Wed, 13 Dec 2006 14:40:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 63BE016A52F for ; Wed, 13 Dec 2006 14:40:56 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C86743CB3 for ; Wed, 13 Dec 2006 14:39:26 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDEetes096718 for ; Wed, 13 Dec 2006 14:40:55 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDEet3w096709 for perforce@freebsd.org; Wed, 13 Dec 2006 14:40:55 GMT (envelope-from piso@freebsd.org) Date: Wed, 13 Dec 2006 14:40:55 GMT Message-Id: <200612131440.kBDEet3w096709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111635 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, 13 Dec 2006 14:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=111635 Change 111635 by piso@piso_newluxor on 2006/12/13 14:40:23 Axe the IS_FAST macro, it's just used in 3 places and probably i can simplify its usage there. Affected files ... .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#9 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#9 (text+ko) ==== @@ -55,8 +55,6 @@ struct intr_thread *ih_thread; /* Ithread for filtered handler. */ }; -#define IS_FAST(filter, handler) (filter != NULL && handler == NULL) - /* Interrupt handle flags kept in ih_flags */ #define IH_EXCLUSIVE 0x00000002 /* Exclusive interrupt. */ #define IH_ENTROPY 0x00000004 /* Device is a good entropy source. */ From owner-p4-projects@FreeBSD.ORG Wed Dec 13 18:57: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 65E4F16A4B3; Wed, 13 Dec 2006 18:57:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 17A2416A492 for ; Wed, 13 Dec 2006 18:57:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 981A843D9B for ; Wed, 13 Dec 2006 18:54:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDItJCx001090 for ; Wed, 13 Dec 2006 18:55:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDItJdN001084 for perforce@freebsd.org; Wed, 13 Dec 2006 18:55:19 GMT (envelope-from imp@freebsd.org) Date: Wed, 13 Dec 2006 18:55:19 GMT Message-Id: <200612131855.kBDItJdN001084@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 111642 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, 13 Dec 2006 18:57:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=111642 Change 111642 by imp@imp_paco-paco on 2006/12/13 18:55:09 use bus_dma_get_tag(dev) Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#27 edit .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#15 edit .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#21 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#27 (text+ko) ==== @@ -175,9 +175,9 @@ /* * Allocate DMA tags and maps */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, MAXPHYS, 1, MAXPHYS, - BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag); + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MAXPHYS, + 1, MAXPHYS, BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag); if (err != 0) goto out; ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#15 (text+ko) ==== @@ -95,11 +95,11 @@ goto out; /* - * Allocate DMA tags and maps + * Allocate DMA tags and maps XXX should be larger than 10k? */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, 1024 * 10, 1, 1024 * 10, - BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag); + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, 1024 * 10, + 1, 1024 * 10, BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag); if (err != 0) goto out; for (i = 0; i < 4; i++) { @@ -208,6 +208,8 @@ int i, j, rxdone, err, mode[4]; bus_addr_t addr; + // XXX need to check to make sure that we don't exceed 10k + // size that we define for tags above. sc = device_get_softc(dev); WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); i = 0; ==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#21 (text+ko) ==== @@ -192,9 +192,9 @@ /* * Allocate DMA tags and maps */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, 2048, 1, 2048, BUS_DMA_ALLOCNOW, - busdma_lock_mutex, &sc->sc_mtx, &sc->tag); + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, 2048, 1, + 2048, BUS_DMA_ALLOCNOW, busdma_lock_mutex, &sc->sc_mtx, &sc->tag); if (err != 0) goto out; err = bus_dmamap_create(sc->tag, 0, &sc->tx_map); From owner-p4-projects@FreeBSD.ORG Wed Dec 13 19:59: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 AE43F16A526; Wed, 13 Dec 2006 19:59:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8518016A522 for ; Wed, 13 Dec 2006 19:59:26 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A0C743E79 for ; Wed, 13 Dec 2006 19:50:54 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDJqBlB038274 for ; Wed, 13 Dec 2006 19:52:11 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDJqAux038271 for perforce@freebsd.org; Wed, 13 Dec 2006 19:52:10 GMT (envelope-from piso@freebsd.org) Date: Wed, 13 Dec 2006 19:52:10 GMT Message-Id: <200612131952.kBDJqAux038271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111647 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, 13 Dec 2006 19:59:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=111647 Change 111647 by piso@piso_newluxor on 2006/12/13 19:51:53 Fix pccbb making cbb_func_intr() filter-friendly: o make it pass down the filter's result. o in case of a missing card, treat it as legitim case and return FILTER_HANDLED (just to eoi the interrupt). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#7 edit .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#5 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#7 (text+ko) ==== @@ -177,7 +177,7 @@ device_t child); static void cbb_cardbus_power_disable_socket(device_t brdev, device_t child); -static void cbb_func_intr(void *arg); +static int cbb_func_intr(void *arg); static void cbb_remove_res(struct cbb_softc *sc, struct resource *res) @@ -362,16 +362,13 @@ * least common denominator until the base system supports mixing * and matching better. */ - if (IS_FAST(filter, intr)) + if (filter == NULL) return (EINVAL); ih = malloc(sizeof(struct cbb_intrhand), M_DEVBUF, M_NOWAIT); if (ih == NULL) return (ENOMEM); *cookiep = ih; - /* - * XXX_FILTER this code doesn't take care of filters. - */ - ih->intr = intr; + ih->intr = filter; ih->arg = arg; ih->sc = sc; /* @@ -379,7 +376,7 @@ * XXX for now that's all we need to do. */ err = BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags, - filter, cbb_func_intr, ih, &ih->cookie); + cbb_func_intr, intr, ih, &ih->cookie); if (err != 0) { free(ih, M_DEVBUF); return (err); @@ -604,7 +601,7 @@ * cbb_func_intr(), we could just check the SOCKET_MASK register and if * CD changes were clear there, then we'd know the card was gone. */ -static void +static int cbb_func_intr(void *arg) { struct cbb_intrhand *ih = (struct cbb_intrhand *)arg; @@ -614,17 +611,17 @@ * Make sure that the card is really there. */ if ((sc->flags & CBB_CARD_OK) == 0) - return; + return (FILTER_HANDLED); if (!CBB_CARD_PRESENT(cbb_get(sc, CBB_SOCKET_STATE))) { sc->flags &= ~CBB_CARD_OK; - return; + return (FILTER_HANDLED); } /* * nb: don't have to check for giant or not, since that's done * in the ISR dispatch */ - (*ih->intr)(ih->arg); + return ((*ih->intr)(ih->arg)); } /************************************************************************/ ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ struct cbb_intrhand { - driver_intr_t *intr; + driver_filter_t *intr; void *arg; struct cbb_softc *sc; void *cookie; From owner-p4-projects@FreeBSD.ORG Wed Dec 13 22:39: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 00B7F16A494; Wed, 13 Dec 2006 22:39:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E52516A4AB for ; Wed, 13 Dec 2006 22:39:57 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8097243CAE for ; Wed, 13 Dec 2006 22:38:20 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBDMdpVn080622 for ; Wed, 13 Dec 2006 22:39:51 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBDMdp7Q080619 for perforce@freebsd.org; Wed, 13 Dec 2006 22:39:51 GMT (envelope-from piso@freebsd.org) Date: Wed, 13 Dec 2006 22:39:51 GMT Message-Id: <200612132239.kBDMdp7Q080619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111664 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, 13 Dec 2006 22:39:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111664 Change 111664 by piso@piso_newluxor on 2006/12/13 22:38:54 Teach scc about filters: o added a new wrapper function (scc_bfe_ihand()) for ithread handler. o axe the condition into which bus_setup_intr() could fail to setup a filter. o teach scc_bfe_filter() to return the filter return codes. filters. o put an XXX comment in case different filters attached to the same scc would return opposite values (STRAY and any other values). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#4 edit .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#11 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#4 (text) ==== @@ -72,10 +72,12 @@ u_int m_mode; int m_attached:1; int m_hasintr:1; + int m_hasihand:1; int m_probed:1; int m_sysdev:1; - driver_intr_t *ih; + driver_filter_t *ihf; + driver_intr_t *ih; serdev_intr_t *ih_src[SCC_ISRCCNT]; void *ih_arg; }; ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#11 (text) ==== @@ -51,14 +51,32 @@ MALLOC_DEFINE(M_SCC, "SCC", "SCC driver"); +static void +scc_bfe_ihand(void *arg) +{ + struct scc_softc *sc = arg; + struct scc_class *cl; + struct scc_mode *m; + int c; + + cl = sc->sc_class; + for (c = 0; c < cl->cl_channels; c++) { + m = &sc->sc_chan[c].ch_mode[0]; + if (m->m_hasihand) { + (*m->ih)(m->ih_arg); + m->m_hasihand = 0; + } + } +} + static int -scc_bfe_intr(void *arg) +scc_bfe_filter(void *arg) { struct scc_softc *sc = arg; struct scc_chan *ch; struct scc_class *cl; struct scc_mode *m; - int c, i, ipend, isrc; + int c, i, ipend, isrc, res; cl = sc->sc_class; while (!sc->sc_leaving && (ipend = SCC_IPEND(sc)) != 0) { @@ -79,19 +97,34 @@ ch->ch_ipend &= ~isrc; } } + res = FILTER_HANDLED; for (c = 0; c < cl->cl_channels; c++) { ch = &sc->sc_chan[c]; if (!ch->ch_ipend) continue; m = &ch->ch_mode[0]; - if (m->ih != NULL) - (*m->ih)(m->ih_arg); - else + // XXX propagation of filter return value is broken: + // XXX what if one handler returns STRAY and another + // XXX one returns HANDLED | SCHEDULE_THREAD? + // XXX what i'm supposed to do? for now, just OR all + // XXX the return values. + m->m_hasihand = 0; + if (m->ihf != NULL) { + res |= (*m->ihf)(m->ih_arg); + if (res & FILTER_SCHEDULE_THREAD) + m->m_hasihand = 1; + } else { + if (m->ih != NULL) { + res |= FILTER_HANDLED | + FILTER_SCHEDULE_THREAD; + m->m_hasihand = 1; + } SCC_ICLEAR(sc, ch); + } } - return(FILTER_HANDLED); + return (res); } - return(FILTER_STRAY); + return (FILTER_STRAY); } int @@ -220,15 +253,8 @@ if (ch->ch_ires == NULL) continue; error = bus_setup_intr(dev, ch->ch_ires, - INTR_TYPE_TTY, scc_bfe_intr, NULL, + INTR_TYPE_TTY, scc_bfe_filter, scc_bfe_ihand, sc, &ch->ch_icookie); - if (error) { - error = bus_setup_intr(dev, ch->ch_ires, - INTR_TYPE_TTY | INTR_MPSAFE, - NULL, (driver_intr_t *)scc_bfe_intr, sc, - &ch->ch_icookie); - } else - sc->sc_fastintr = 1; if (error) { device_printf(dev, "could not activate interrupt\n"); @@ -502,40 +528,24 @@ driver_filter_t *filter, void (*ihand)(void *), void *arg, void **cookiep) { - struct scc_chan *ch; struct scc_mode *m; struct scc_softc *sc; - int c, i, isrc; + int i, isrc; if (device_get_parent(child) != dev) return (EINVAL); /* Interrupt handlers must be FAST or MPSAFE. */ - if (!(IS_FAST(filter, ihand)) || ((flags & INTR_MPSAFE) == 0)) + if ((filter == NULL) && !(flags & INTR_MPSAFE)) return (EINVAL); sc = device_get_softc(dev); if (sc->sc_polled) return (ENXIO); - if (sc->sc_fastintr && !(IS_FAST(filter, ihand))) { - sc->sc_fastintr = 0; - 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, NULL, sc, &ch->ch_icookie); - } - } - m = device_get_ivars(child); m->m_hasintr = 1; - /* - * XXX_FILTER this code doesn't take care of filters. - */ + m->ihf = filter; m->ih = ihand; m->ih_arg = arg; From owner-p4-projects@FreeBSD.ORG Thu Dec 14 03:44:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D3B816A407; Thu, 14 Dec 2006 03:44:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48ED316A4CA for ; Thu, 14 Dec 2006 03:44:16 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5909543CA3 for ; Thu, 14 Dec 2006 03:42:43 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBE3iFXk051301 for ; Thu, 14 Dec 2006 03:44:15 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBE3iFFD051294 for perforce@freebsd.org; Thu, 14 Dec 2006 03:44:15 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 14 Dec 2006 03:44:15 GMT Message-Id: <200612140344.kBE3iFFD051294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111670 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, 14 Dec 2006 03:44:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=111670 Change 111670 by mjacob@mjexp on 2006/12/14 03:44:06 More toy tinkering- now get it to connect up correctly and, with fault injection, DTRT and ping-pong. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#3 edit .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.h#2 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#3 (text+ko) ==== @@ -46,6 +46,10 @@ SYSCTL_UINT(_kern_geom_multipath, OID_AUTO, debug, CTLFLAG_RW, &g_multipath_debug, 0, "Debug level"); +static void g_multipath_orphan(struct g_consumer *); +static void g_multipath_start(struct bio *); +static void g_multipath_done(struct bio *); + static int g_multipath_destroy(struct g_geom *); static int g_multipath_destroy_geom(struct gctl_req *, struct g_class *, struct g_geom *); @@ -72,43 +76,92 @@ { struct g_multipath_softc *sc; struct g_geom *gp; - struct g_provider *pp; + struct g_consumer *cp; struct bio *cbp; gp = bp->bio_to->geom; - sc = gp->softc; - switch (bp->bio_cmd) { - case BIO_READ: - break; - case BIO_WRITE: - break; - } cbp = g_clone_bio(bp); if (cbp == NULL) { g_io_deliver(bp, ENOMEM); return; } - cbp->bio_done = g_std_done; - cbp->bio_offset = bp->bio_offset; - cbp->bio_data = bp->bio_data; - cbp->bio_length = bp->bio_length; - pp = LIST_FIRST(&gp->provider); - KASSERT(pp != NULL, ("NULL pp")); - cbp->bio_to = pp; - g_io_request(cbp, LIST_FIRST(&gp->consumer)); + cbp->bio_done = g_multipath_done; + sc = gp->softc; + KASSERT(sc != NULL, ("NULL sc")); + cp = sc->consumers[sc->cur_prov]; + KASSERT(cp != NULL, ("NULL cp")); + g_io_request(cbp, cp); +} + +static void +g_multipath_done(struct bio *bp) +{ + struct bio *pbp = bp->bio_parent; + struct g_geom *gp = pbp->bio_to->geom; + struct g_multipath_softc *sc = gp->softc; + int dofail; + + KASSERT(sc != NULL, ("NULL sc")); + if (sc->ready == 0) { + g_std_done(bp); + return; + } + + if (bp->bio_error == ENXIO || bp->bio_error == EIO) { + dofail = 1; +#if 0 + } else if (bp->bio_error == 0) { + static uint8_t inject = 0; + if (++inject == 0) { + bp->bio_error = ENXIO; + dofail = 1; + } else { + dofail = 0; + } +#endif + } else { + dofail = 0; + } + + /* XXX yes, this only handles single failures XXX */ + if (dofail) { + if ((pbp->bio_pflags & G_MULTIPATH_BIO_PFLAG_ERROR) == 0) { + struct g_provider *pp0, *pp1; + pp0 = sc->providers[sc->cur_prov]; + sc->cur_prov++; + pp1 = sc->providers[sc->cur_prov]; + pbp->bio_pflags |= G_MULTIPATH_BIO_PFLAG_ERROR; + printf("error %d: switching from provider %s to" + " provider %s\n", bp->bio_error, + pp0->name, pp1->name); + g_destroy_bio(bp); + pbp->bio_children--; + g_multipath_start(pbp); + return; + } + } + g_std_done(bp); } + + static int g_multipath_access(struct g_provider *pp, int dr, int dw, int de) { struct g_geom *gp; - struct g_consumer *cp; + struct g_multipath_softc *sc; int error; gp = pp->geom; - cp = LIST_FIRST(&gp->consumer); - error = g_access(cp, dr, dw, de); - + sc = gp->softc; + KASSERT(sc != NULL, ("NULL sc")); + error = g_access(sc->consumers[0], dr, dw, de); + if (error == 0) { + error = g_access(sc->consumers[1], dr, dw, de); + if (error) { + (void) g_access(sc->consumers[0], -dr, -dw, -de); + } + } return (error); } @@ -119,8 +172,7 @@ struct g_multipath_softc *sc; struct g_geom *gp; struct g_provider *newpp; - struct g_consumer *cp0; - struct g_consumer *cp1; + struct g_consumer *cp0, *cp1; char name[64]; int error; @@ -129,9 +181,13 @@ /* * Check to make sure parameters from the two providers are the same */ + if (pp0 == pp1) { + gctl_error(req, "providers are the same"); + return (EINVAL); + } if (pp0->mediasize != pp1->mediasize) { - gctl_error(req, "Provider %s has mediasize %zx; Provider %s " - "has mediasize %zx", pp0->name, (intmax_t) pp0->mediasize, + gctl_error(req, "Provider %s has mediasize %zu; Provider %s " + "has mediasize %zu", pp0->name, (intmax_t) pp0->mediasize, pp1->name, (intmax_t) pp1->mediasize); return (EINVAL); } @@ -146,7 +202,6 @@ newpp = NULL; cp0 = cp1 = NULL; - LIST_FOREACH(gp, &mp->geom, geom) { if (strcmp(gp->name, mpname) == 0) { gctl_error(req, "Provider %s already exists", mpname); @@ -160,20 +215,17 @@ } sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO); + if (sc == NULL) { + gctl_error(req, "Cannot allocate softc"); + error = ENOMEM; + goto fail; + } + gp->softc = sc; gp->start = g_multipath_start; gp->orphan = g_multipath_orphan; gp->access = g_multipath_access; - snprintf(name, sizeof(name), "multipath/%s", mpname); - newpp = g_new_providerf(gp, name); - if (newpp == NULL) { - gctl_error(req, "Cannot create provider %s", name); - error = ENOMEM; - goto fail; - } - newpp->mediasize = pp0->mediasize; - newpp->sectorsize = pp0->sectorsize; cp0 = g_new_consumer(gp); if (cp0 == NULL) { @@ -186,6 +238,8 @@ gctl_error(req, "Cannot attach provider %s", pp0->name); goto fail; } + cp0->private = sc; + cp0->index = 0; cp1 = g_new_consumer(gp); if (cp1 == NULL) { @@ -198,8 +252,27 @@ gctl_error(req, "Cannot attach provider %s", pp1->name); goto fail; } + cp1->private = sc; + cp1->index = 1; + + sc->consumers[0] = cp0; + sc->consumers[1] = cp1; + sc->providers[0] = pp0; + sc->providers[1] = pp1; + + snprintf(name, sizeof(name), "multipath/%s", mpname); + newpp = g_new_providerf(gp, name); + if (newpp == NULL) { + gctl_error(req, "Cannot create provider %s", name); + error = ENOMEM; + goto fail; + } + newpp->mediasize = pp0->mediasize; + newpp->sectorsize = pp0->sectorsize; sc->pp = newpp; g_error_provider(newpp, 0); + sc->ready = 1; + return (0); fail: if (cp0 != NULL) { ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.h#2 (text+ko) ==== @@ -33,8 +33,16 @@ #define G_MULTIPATH_VERSION 0 #ifdef _KERNEL + +#define G_MULTIPATH_BIO_PFLAG_ERROR 0x1 + struct g_multipath_softc { - struct g_provider *pp; + struct g_provider * pp; + unsigned int : 30, + ready : 1, + cur_prov : 1; + struct g_consumer * consumers[2]; + struct g_provider * providers[2]; }; #endif /* _KERNEL */ #endif /* _G_MULTIPATH_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Dec 14 06:35: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 0FD8316A58C; Thu, 14 Dec 2006 06:35:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BEADD16A582 for ; Thu, 14 Dec 2006 06:35:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B92743CA7 for ; Thu, 14 Dec 2006 06:34:22 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBE6ZtZs092932 for ; Thu, 14 Dec 2006 06:35:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBE6ZtvY092929 for perforce@freebsd.org; Thu, 14 Dec 2006 06:35:55 GMT (envelope-from marcel@freebsd.org) Date: Thu, 14 Dec 2006 06:35:55 GMT Message-Id: <200612140635.kBE6ZtvY092929@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 111675 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, 14 Dec 2006 06:35:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=111675 Change 111675 by marcel@marcel_nfs on 2006/12/14 06:35:15 Dump the beginnings of a PMU driver here. I probably should look at NetBSD for the details. Affected files ... .. //depot/projects/powerpc/sys/conf/files.powerpc#4 edit .. //depot/projects/powerpc/sys/powerpc/powermac/viapmu.c#1 add .. //depot/projects/powerpc/sys/powerpc/powermac/viapmuvar.h#1 add Differences ... ==== //depot/projects/powerpc/sys/conf/files.powerpc#4 (text+ko) ==== @@ -82,7 +82,7 @@ dev/ofw/openfirm.c standard dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_bus_subr.c standard -dev/ofw/ofw_console.c standard +dev/ofw/ofw_console.c optional ofw_console dev/ofw/ofw_disk.c optional ofwd libkern/ashldi3.c standard @@ -115,6 +115,7 @@ powerpc/powermac/openpic_macio.c optional powermac pci powerpc/powermac/pswitch.c optional powermac pswitch powerpc/powermac/uninorth.c optional powermac pci +powerpc/powermac/viapmu.c optional powermac powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim From owner-p4-projects@FreeBSD.ORG Thu Dec 14 06:37:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9614616A416; Thu, 14 Dec 2006 06:37:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2807916A40F for ; Thu, 14 Dec 2006 06:37:37 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77E1443CA0 for ; Thu, 14 Dec 2006 06:36:03 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBE6ba0f093080 for ; Thu, 14 Dec 2006 06:37:36 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBE6auS7093059 for perforce@freebsd.org; Thu, 14 Dec 2006 06:36:56 GMT (envelope-from marcel@freebsd.org) Date: Thu, 14 Dec 2006 06:36:56 GMT Message-Id: <200612140636.kBE6auS7093059@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 111676 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, 14 Dec 2006 06:37:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=111676 Change 111676 by marcel@marcel_cluster on 2006/12/14 06:36:05 IFC @111674 Affected files ... .. //depot/projects/powerpc/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/powerpc/lib/libc/sys/chmod.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/chown.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/mkdir.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/symlink.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/powerpc/lib/libelf/gelf_getsymshndx.3#2 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/powerpc/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/powerpc/share/man/man4/Makefile#2 integrate .. //depot/projects/powerpc/share/man/man4/altq.4#2 integrate .. //depot/projects/powerpc/share/man/man4/miibus.4#2 integrate .. //depot/projects/powerpc/share/man/man4/msk.4#1 branch .. //depot/projects/powerpc/share/man/man4/vlan.4#2 integrate .. //depot/projects/powerpc/share/man/man9/bpf.9#2 integrate .. //depot/projects/powerpc/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/powerpc/sys/conf/NOTES#4 integrate .. //depot/projects/powerpc/sys/conf/files#6 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/powerpc/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/powerpc/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/powerpc/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/powerpc/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/powerpc/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/powerpc/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/powerpc/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/powerpc/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/powerpc/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/powerpc/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/powerpc/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/powerpc/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/powerpc/sys/dev/usb/if_auereg.h#5 integrate .. //depot/projects/powerpc/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/powerpc/sys/modules/Makefile#5 integrate .. //depot/projects/powerpc/sys/modules/msk/Makefile#1 branch .. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/powerpc/sys/powerpc/include/bus.h#5 integrate .. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#6 integrate .. //depot/projects/powerpc/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/powerpc/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/powerpc/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/powerpc/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/powerpc/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/powerpc/sys/sys/mac_policy.h#2 integrate .. //depot/projects/powerpc/usr.bin/apply/apply.1#2 integrate .. //depot/projects/powerpc/usr.bin/find/find.1#2 integrate .. //depot/projects/powerpc/usr.bin/login/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/login/login.c#2 integrate .. //depot/projects/powerpc/usr.bin/login/login.h#2 integrate .. //depot/projects/powerpc/usr.bin/tty/tty.1#2 integrate .. //depot/projects/powerpc/usr.bin/what/what.1#2 integrate .. //depot/projects/powerpc/usr.bin/which/which.1#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/devices.c#2 integrate Differences ... ==== //depot/projects/powerpc/games/fortune/datfiles/fortunes#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.231 2006/12/03 15:25:55 maxim Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.232 2006/12/13 00:33:39 grog Exp $ % ======================================================================= @@ -14788,6 +14788,10 @@ stuff, thereby making you buy either all new stuff or expensive interface devices. % +Conquering the world on horseback is easy; it is dismounting and +governing that is hard. + -- Chinggis (Genghis) Khan +% Conquering Russia should be done steppe by steppe. % Conscience doth make cowards of us all. @@ -19941,6 +19945,20 @@ president, political party, etc.) to consummate the act of social schizophrenia in mass genocide. % +From dusk till dawn +I gathered people and their crown +Conquered the hearts of +Not too few +United the heads of +Now too humble. +When weaken your mind +Don?t get weakened +When tired of thinking +Don?t get tired +My sons and descendants +Don?t get exhausted in mind and thought and but get experienced. + -- Chinggis (Genghis) Khan +% From Italian tourist guide: "Non stop trains to Roma Termini Station leave from 7.38 @@ -26710,6 +26728,17 @@ had made a lot of Capital, it would have been much better. -- Karl Marx's Mother % + +If Khaan behaves as serfs +Lose entire states and all estates. +If serfs behave as Khaan +He will regret for his head. +In time of friendship and harmony +Befriend as closely +In time of conflict with enemies +Be falcon of advance and attacks + -- Chinggis (Genghis) Khan +% If life gives you lemons, make lemonade. % If life is a stage, I want some better lighting. @@ -30183,6 +30212,15 @@ -- Red Skelton, surveying the funeral of Hollywood mogul Harry Cohn % + +It ruins mind +It exhausts wealth +When it reaches to the tongue +It is like a mosquito +When it relives from tongue +It is like an elephant. + -- Boorchi (first of 9 knights of Chinggis (Genghis) Khan) +% "It runs like _x, where _x is something unsavory" -- Prof. Romas Aleliunas, CS 435 % @@ -32003,6 +32041,13 @@ around his neck. -- Dave Barry % + +Let my petty body exhausted, +But not my state nature. +Let my whole body exhausted +But not my entire state + -- Chinggis (Genghis) Khan +% Let no guilty man escape. -- U. S. Grant % @@ -44230,6 +44275,14 @@ implication. Advance to manipulation and humiliation. Above all, relax and have a nice day. % +Strive to the pass of high mountain +Cross in the shallow side of the wide ocean +Do not give up because of distance +Will certainly reach if walks +Do not discourage of human +Shall overcome if you try + -- Chinggis (Genghis) Khan +% Stuckness shouldn't be avoided. It's the psychic predecessor of all real understanding. An egoless acceptance of stuckness is a key to an understanding of all Quality, in mechanical work as in other endeavors. @@ -44742,6 +44795,12 @@ being only an inference. -- Ambrose Bierce, "The Devil's Dictionary" % +Teeth for meat is in mouth +Teeth for human is in soul. +Win one with your body strength +Win many with your mind strength + -- Chinggis (Genghis) Khan +% Technique?" said the programmer turning from his terminal, "What I follow is Tao -- beyond all technique! When I first began to program I would see before me the whole problem in one mass. After three years I no longer saw @@ -47028,7 +47087,7 @@ before him. To ride their horses and take away their possessions. To see the faces of those who were dear to them bedewed with tears, and to clasp their wives and daughters to his arms. - -- Genghis Khan + -- Chinggis (Genghis) Khan % The greatest love is a mother's, then a dog's, then a sweetheart's. -- Polish proverb ==== //depot/projects/powerpc/lib/libc/sys/chmod.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/chmod.2,v 1.33 2006/12/09 22:41:01 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/chmod.2,v 1.35 2006/12/13 13:46:01 pjd Exp $ .\" .Dd December 9, 2006 .Dt CHMOD 2 @@ -179,7 +179,7 @@ The effective user ID does not match the owner of the file and the effective user ID is not the super-user. .It Bq Er EPERM -The named file has its immutable flag set, see the +The named file has its immutable or append-only flag set, see the .Xr chflags 2 manual page for more information. .It Bq Er EROFS @@ -192,7 +192,9 @@ .It Bq Er EIO An I/O error occurred while reading from or writing to the file system. .It Bq Er EFTYPE -An attempt was made to set the sticky bit upon an executable. +The effective user ID is not the super-user, the mode includes the sticky bit +.Dv ( S_ISVTX ) , +and path does not refer to a directory. .El .Pp The ==== //depot/projects/powerpc/lib/libc/sys/chown.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chown.2 8.4 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/sys/chown.2,v 1.22 2006/12/09 22:41:26 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/chown.2,v 1.24 2006/12/13 22:17:58 pjd Exp $ .\" .Dd December 9, 2006 .Dt CHOWN 2 @@ -118,9 +118,10 @@ .It Bq Er ELOOP Too many symbolic links were encountered in translating the pathname. .It Bq Er EPERM -The effective user ID is not the super-user. +The operation would change the ownership, but the effective user ID is not the +super-user. .It Bq Er EPERM -The named file has its immutable flag set, see the +The named file has its immutable or append-only flag set, see the .Xr chflags 2 manual page for more information. .It Bq Er EROFS ==== //depot/projects/powerpc/lib/libc/sys/mkdir.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.22 2006/12/12 15:00:08 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.23 2006/12/13 13:26:32 pjd Exp $ .\" .Dd December 9, 2006 .Dt MKDIR 2 @@ -84,7 +84,7 @@ .Xr chflags 2 manual page for more information. .It Bq Er EROFS -The named file resides on a read-only file system. +The named directory would reside on a read-only file system. .It Bq Er EEXIST The named file exists. .It Bq Er ENOSPC ==== //depot/projects/powerpc/lib/libc/sys/mkfifo.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkfifo.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/mkfifo.2,v 1.18 2006/12/09 23:06:01 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/mkfifo.2,v 1.21 2006/12/13 13:26:32 pjd Exp $ .\" .Dd December 10, 2006 .Dt MKFIFO 2 @@ -79,11 +79,12 @@ .It Bq Er ENOENT A component of the path prefix does not exist. .It Bq Er EACCES -Search permission is denied for a component of the path prefix. +A component of the path prefix denies search permission, or write permission +is denied on the parent directory of the fifo to be created. .It Bq Er ELOOP Too many symbolic links were encountered in translating the pathname. .It Bq Er EROFS -The named file resides on a read-only file system. +The named file would reside on a read-only file system. .It Bq Er EEXIST The named file exists. .It Bq Er EPERM ==== //depot/projects/powerpc/lib/libc/sys/symlink.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)symlink.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/symlink.2,v 1.20 2006/12/12 20:06:52 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/symlink.2,v 1.21 2006/12/13 11:26:03 pjd Exp $ .\" .Dd December 9, 2006 .Dt SYMLINK 2 @@ -78,11 +78,8 @@ .It Bq Er EACCES A component of the .Fa name2 -path prefix denies search permission. -.It Bq Er EACCES -A component of the -.Fa name2 -path prefix denies write permission. +path prefix denies search permission, or write permission is denied on the +parent directory of the file to be created. .It Bq Er ELOOP Too many symbolic links were encountered in translating the .Fa name2 ==== //depot/projects/powerpc/lib/libc/sys/truncate.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)truncate.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/truncate.2,v 1.19 2006/12/09 22:49:28 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/truncate.2,v 1.20 2006/12/13 22:51:23 pjd Exp $ .\" -.Dd December 9, 2006 +.Dd December 13, 2006 .Dt TRUNCATE 2 .Os .Sh NAME @@ -102,6 +102,14 @@ The named file resides on a read-only file system. .It Bq Er ETXTBSY The file is a pure procedure (shared text) file that is being executed. +.It Bq Er EFBIG +The +.Fa length +argument was greater than the maximum file size. +.It Bq Er EINVAL +The +.Fa length +argument was less than 0. .It Bq Er EIO An I/O error occurred updating the inode. .It Bq Er EFAULT ==== //depot/projects/powerpc/lib/libelf/gelf_getsymshndx.3#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/gelf_getsymshndx.3,v 1.2 2006/11/13 09:46:16 ru Exp $ +.\" $FreeBSD: src/lib/libelf/gelf_getsymshndx.3,v 1.3 2006/12/13 15:14:46 jkoshy Exp $ .\" .Dd November 5, 2006 .Os @@ -35,7 +35,7 @@ .Sh SYNOPSIS .In gelf.h .Ft "GElf_Sym *" -.Fo gelf_getsyminfo +.Fo gelf_getsymshndx .Fa "Elf_Data *symdata" .Fa "Elf_Data *xndxdata" .Fa "int ndx" @@ -43,7 +43,7 @@ .Fa "Elf32_Word *xndxptr" .Fc .Ft int -.Fo gelf_update_syminfo +.Fo gelf_update_symshndx .Fa "Elf_Data *symdata" .Fa "Elf_Data *xndxdata" .Fa "int ndx" ==== //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.306 2006/10/01 13:14:07 joel Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.307 2006/12/13 08:53:27 brueffer Exp $ Supported Devices @@ -248,6 +248,8 @@ &hwlist.lge; + &hwlist.msk; + &hwlist.mxge; &hwlist.my; ==== //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.993 2006/12/06 19:53:49 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.994 2006/12/13 17:27:46 bmah Exp $ 2000 @@ -701,6 +701,10 @@ &man.pcn.4; drivers support all devices that were supported by lnc(4). + The &man.msk.4; driver has been added. It supports + network interfaces using the Marvell/SysKonnect Yukon II + Gigabit Ethernet controller. + The &man.my.4; driver is now MPSAFE. &merged; The &man.my.4; driver now supports &man.altq.4;. &merged; @@ -990,6 +994,9 @@ environment. &merged; + The &man.arcmsr.4; driver has been updated to version + 1.20.00.13. + The &man.ata.4; driver now supports a workaround for some controllers whose DMA does not work properly in 48bit mode. For affected controllers, @@ -1720,7 +1727,7 @@ has been updated to 20051021. BIND has been updated from 9.3.1 - to 9.3.2-P1. &merged; + to 9.3.3. &merged; BSNMPD has been updated from 1.11 to 1.12. ==== //depot/projects/powerpc/release/doc/share/misc/dev.archlist.txt#2 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.90 2006/10/01 13:14:07 joel Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.91 2006/12/13 08:53:27 brueffer Exp $ # # @@ -84,6 +84,7 @@ mfi i386,alpha,ia64,amd64 mlx i386,alpha,ia64,amd64 mly i386,ia64,amd64 +msk i386,amd64 mxge i386,amd64 my i386,pc98 ncr i386,pc98,alpha,sparc64,amd64 ==== //depot/projects/powerpc/share/man/man4/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.369 2006/12/05 16:57:10 ru Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.370 2006/12/13 02:37:48 yongari Exp $ MAN= aac.4 \ acpi.4 \ @@ -165,6 +165,7 @@ mn.4 \ mouse.4 \ mpt.4 \ + msk.4 \ mtio.4 \ multicast.4 \ mxge.4 \ ==== //depot/projects/powerpc/share/man/man4/altq.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.22 2006/12/01 20:29:55 mlaier Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.24 2006/12/13 08:55:20 brueffer Exp $ .\" -.Dd December 1, 2006 +.Dd December 13, 2006 .Dt ALTQ 4 .Os .Sh NAME @@ -128,6 +128,7 @@ .Xr fxp 4 , .Xr hme 4 , .Xr le 4 , +.Xr msk 4 , .Xr mxge 4 , .Xr my 4 , .Xr nve 4 , ==== //depot/projects/powerpc/share/man/man4/miibus.4#2 (text+ko) ==== @@ -6,9 +6,9 @@ .\" Originally this file looked much like the NetBSD mii(4) manual page, but .\" I doubt you would ever notice due to large differences. .\" -.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.17 2006/07/25 00:59:39 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.19 2006/12/13 08:56:15 brueffer Exp $ .\" -.Dd July 25, 2006 +.Dd December 13, 2006 .Dt MIIBUS 4 .Os .Sh NAME @@ -67,6 +67,8 @@ Sun HME Ethernet .It Xr lge 4 Level 1 LXT1001 NetCellerator Gigabit Ethernet +.It Xr msk 4 +Marvell/SysKonnect Yukon II Gigabit Ethernet .It Xr my 4 Myson Technologies PCI Ethernet adaptors .It Xr nge 4 @@ -128,6 +130,7 @@ .Xr gem 4 , .Xr hme 4 , .Xr lge 4 , +.Xr msk 4 , .Xr my 4 , .Xr netintro 4 , .Xr nge 4 , ==== //depot/projects/powerpc/share/man/man4/vlan.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.32 2006/08/12 17:11:43 yar Exp $ +.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.33 2006/12/13 02:42:01 yongari Exp $ .\" -.Dd August 11, 2006 +.Dd December 13, 2006 .Dt VLAN 4 .Os .Sh NAME @@ -125,6 +125,7 @@ .Xr bge 4 , .Xr em 4 , .Xr ixgb 4 , +.Xr msk 4 , .Xr nge 4 , .Xr re 4 , .Xr stge 4 , ==== //depot/projects/powerpc/share/man/man9/bpf.9#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bpf.9,v 1.6 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/bpf.9,v 1.7 2006/12/13 06:27:20 ru Exp $ .\" -.Dd May 19, 2004 +.Dd December 13, 2006 .Dt BPF 9 .Os .\" @@ -51,7 +51,7 @@ .Fn bpf_mtap2 "struct bpf_if *bp" "void *data" "u_int dlen" "struct mbuf *m" .Ft u_int .Fo bpf_filter -.Fa "const struct bpf_insn *pc " "u_char *pkt" "u_int *wirelen" "u_int *buflen" +.Fa "const struct bpf_insn *pc " "u_char *pkt" "u_int wirelen" "u_int buflen" .Fc .Ft int .Fn bpf_validate "const struct bpf_insn *fcode" "int flen" @@ -217,6 +217,12 @@ is the length of the original packet and .Fa buflen is the amount of data present. +The +.Fa buflen +value of 0 is special; it indicates that the +.Fa pkt +is actually a pointer to an mbuf chain +.Pq Vt "struct mbuf *" . .Pp The .Fn bpf_validate ==== //depot/projects/powerpc/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.471 2006/12/13 03:41:47 yongari Exp $ cpu HAMMER ident GENERIC @@ -195,6 +195,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') ==== //depot/projects/powerpc/sys/boot/forth/loader.conf#4 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.113 2006/10/01 14:58:30 ariff Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.114 2006/12/13 02:48:22 yongari Exp $ ############################################################## ### Basic configuration options ############################ @@ -232,6 +232,7 @@ if_ixgb_load="NO" # Intel PRO/10Gb Ethernet if_le_load="NO" # AMD Am7900 LANCE and Am79C9xx PCnet if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI Gigabit Ethernet +if_msk_load="NO" # Marvell/SysKonnect Yukon II Gigabit Ethernet if_mxge_load="NO" # Myricom Myri10GE 10Gb Ethernet if_my_load="NO" # Myson PCI Fast Ethernet if_nfe_load="NO" # NVIDIA nForce MCP Networking Adapter ==== //depot/projects/powerpc/sys/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1401 2006/12/10 04:23:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1402 2006/12/13 02:33:32 yongari Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1773,6 +1773,10 @@ # lge: Support for PCI gigabit ethernet adapters based on the Level 1 # LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX, # SMC TigerCard 1000 (SMC9462SX), and some Addtron cards. +# msk: Support for gigabit ethernet adapters based on the Marvell/SysKonnect +# Yukon II Gigabit controllers, including 88E8021, 88E8022, 88E8061, +# 88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053, +# 88E8055, 88E8056 and D-Link 560T/550SX. # lmc: Support for the LMC/SBE wide-area network interface cards. # my: Myson Fast Ethernet (MTD80X, MTD89X) # nge: Support for PCI gigabit ethernet adapters based on the National ==== //depot/projects/powerpc/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1166 2006/12/10 01:10:08 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1167 2006/12/13 02:33:33 yongari Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -761,6 +761,7 @@ dev/mpt/mpt_debug.c optional mpt dev/mpt/mpt_pci.c optional mpt pci dev/mpt/mpt_raid.c optional mpt +dev/msk/if_msk.c optional msk dev/my/if_my.c optional my dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard ==== //depot/projects/powerpc/sys/contrib/dev/ath/ah.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: //depot/sw/branches/sam_hal/ah.h#10 $ + * $Id: //depot/sw/branches/sam_hal/ah.h#19 $ */ #ifndef _ATH_AH_H_ @@ -131,6 +131,8 @@ HAL_CAP_TPC_CTS = 27, /* cts txpower with per-packet tpc */ HAL_CAP_11D = 28, /* 11d beacon support for changing cc */ HAL_CAP_INTMIT = 29, /* interference mitigation */ + HAL_CAP_RXORN_FATAL = 30, /* HAL_INT_RXORN treated as fatal */ + HAL_CAP_RXTSTAMP_PREC = 34, /* rx desc tstamp precision (bits) */ } HAL_CAPABILITY_TYPE; /* @@ -286,9 +288,7 @@ /* compression definitions */ #define HAL_COMP_BUF_MAX_SIZE 9216 /* 9K */ #define HAL_COMP_BUF_ALIGN_SIZE 512 -#define HAL_DECOMP_MASK_SIZE 128 - /* * Transmit packet types. This belongs in ah_desc.h, but * is here so we can give a proper type to various parameters @@ -358,7 +358,7 @@ HAL_INT_GPIO = 0x01000000, HAL_INT_CABEND = 0x02000000, /* Non-common mapping */ HAL_INT_FATAL = 0x40000000, /* Non-common mapping */ - HAL_INT_GLOBAL = 0x80000000, /* Set/clear IER */ +#define HAL_INT_GLOBAL 0x80000000 /* Set/clear IER */ HAL_INT_BMISC = HAL_INT_TIM | HAL_INT_DTIM | HAL_INT_DTIMSYNC @@ -377,7 +377,6 @@ | HAL_INT_SWBA | HAL_INT_BMISS | HAL_INT_GPIO, - HAL_INT_NOCARD = 0xffffffff /* To signal the card was removed */ } HAL_INT; typedef enum { @@ -525,6 +524,7 @@ u_int16_t kv_len; /* length in bits */ u_int8_t kv_val[16]; /* enough for 128-bit keys */ u_int8_t kv_mic[8]; /* TKIP MIC key */ + u_int8_t kv_txmic[8]; /* TKIP TX MIC key (optional) */ } HAL_KEYVAL; typedef enum { @@ -592,6 +592,8 @@ #define HAL_RSSI_EP_MULTIPLIER (1<<7) /* pow2 to optimize out * and / */ struct ath_desc; +struct ath_tx_status; +struct ath_rx_status; /* * Hardware Access Layer (HAL) API. @@ -606,7 +608,7 @@ struct ath_hal { u_int32_t ah_magic; /* consistency check magic number */ u_int32_t ah_abi; /* HAL ABI version */ -#define HAL_ABI_VERSION 0x06052200 /* YYMMDDnn */ +#define HAL_ABI_VERSION 0x06102600 /* YYMMDDnn */ u_int16_t ah_devid; /* PCI device ID */ u_int16_t ah_subvendorid; /* PCI subvendor ID */ HAL_SOFTC ah_sc; /* back pointer to driver/os state */ @@ -620,7 +622,7 @@ /* NB: when only one radio is present the rev is in 5Ghz */ u_int16_t ah_analog5GhzRev;/* 5GHz radio revision */ u_int16_t ah_analog2GhzRev;/* 2GHz radio revision */ - u_int8_t ah_decompMask[HAL_DECOMP_MASK_SIZE]; /* decomp mask array */ + const HAL_RATE_TABLE *__ahdecl(*ah_getRateTable)(struct ath_hal *, u_int mode); void __ahdecl(*ah_detach)(struct ath_hal*); @@ -635,12 +637,7 @@ HAL_BOOL __ahdecl(*ah_perCalibration)(struct ath_hal*, HAL_CHANNEL *, HAL_BOOL *); HAL_BOOL __ahdecl(*ah_setTxPowerLimit)(struct ath_hal *, u_int32_t); - void __ahdecl(*ah_arEnable)(struct ath_hal *); - void __ahdecl(*ah_arDisable)(struct ath_hal *); - void __ahdecl(*ah_arReset)(struct ath_hal *); - HAL_BOOL __ahdecl(*ah_radarHaveEvent)(struct ath_hal *); - HAL_BOOL __ahdecl(*ah_processDfs)(struct ath_hal *, HAL_CHANNEL *); - u_int32_t __ahdecl(*ah_dfsNolCheck)(struct ath_hal *, HAL_CHANNEL *, u_int32_t); + /* DFS support */ HAL_BOOL __ahdecl(*ah_radarWait)(struct ath_hal *, HAL_CHANNEL *); /* Transmit functions */ @@ -674,7 +671,8 @@ HAL_BOOL __ahdecl(*ah_fillTxDesc)(struct ath_hal *, struct ath_desc *, u_int segLen, HAL_BOOL firstSeg, HAL_BOOL lastSeg, const struct ath_desc *); - HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *, struct ath_desc*); + HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *, + struct ath_desc *, struct ath_tx_status *); void __ahdecl(*ah_getTxIntrQueue)(struct ath_hal *, u_int32_t *); void __ahdecl(*ah_reqTxIntrDesc)(struct ath_hal *, struct ath_desc*); @@ -695,9 +693,10 @@ void __ahdecl(*ah_setRxFilter)(struct ath_hal*, u_int32_t); HAL_BOOL __ahdecl(*ah_setupRxDesc)(struct ath_hal *, struct ath_desc *, u_int32_t size, u_int flags); - HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *, struct ath_desc *, - u_int32_t phyAddr, struct ath_desc *next, - u_int64_t tsf); + HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *, + struct ath_desc *, u_int32_t phyAddr, + struct ath_desc *next, u_int64_t tsf, + struct ath_rx_status *); void __ahdecl(*ah_rxMonitor)(struct ath_hal *, const HAL_NODE_STATS *, HAL_CHANNEL *); void __ahdecl(*ah_procMibEvent)(struct ath_hal *, ==== //depot/projects/powerpc/sys/contrib/dev/ath/ah_desc.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: //depot/sw/branches/sam_hal/ah_desc.h#2 $ + * $Id: //depot/sw/branches/sam_hal/ah_desc.h#5 $ */ #ifndef _DEV_ATH_DESC_H @@ -59,6 +59,7 @@ u_int8_t ts_longretry; /* # long retries */ u_int8_t ts_virtcol; /* virtual collision count */ u_int8_t ts_antenna; /* antenna information */ + u_int8_t ts_finaltsi; /* final transmit series index */ }; #define HAL_TXERR_XRETRY 0x01 /* excessive retries */ @@ -153,17 +154,14 @@ u_int32_t ds_ctl0; /* opaque DMA control 0 */ u_int32_t ds_ctl1; /* opaque DMA control 1 */ u_int32_t ds_hw[4]; /* opaque h/w region */ - /* - * The remaining definitions are managed by software; - * these are valid only after the rx/tx process descriptor - * methods return a non-EINPROGRESS code. - */ +}; + +struct ath_desc_status { union { struct ath_tx_status tx;/* xmit status */ struct ath_rx_status rx;/* recv status */ } ds_us; - void *ds_vdata; /* virtual addr of data buffer */ -} __packed; +}; #define ds_txstat ds_us.tx #define ds_rxstat ds_us.rx @@ -180,4 +178,4 @@ /* flags passed to rx descriptor setup methods */ #define HAL_RXDESC_INTREQ 0x0020 /* enable per-descriptor interrupt */ -#endif /* _DEV_ATH_AR521XDMA_H */ +#endif /* _DEV_ATH_DESC_H */ ==== //depot/projects/powerpc/sys/contrib/dev/ath/ah_devid.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: //depot/sw/branches/sam_hal/ah_devid.h#1 $ + * $Id: //depot/sw/branches/sam_hal/ah_devid.h#2 $ */ #ifndef _DEV_ATH_DEVID_H_ @@ -88,6 +88,12 @@ #define AR5213_SREV_1_0 0x0055 #define AR5213_SREV_REG 0x4020 +/* AR5416 */ +#define AR5416_DEVID_EMU_PCI 0xff1d /* PCI Owl Emulation*/ +#define AR5416_DEVID_EMU_PCIE 0xff1c /* PCIe Owl Emulation*/ +#define AR5416_DEVID 0x0023 /* PCI (MB/CB) */ +#define AR5418_DEVID 0x0024 /* PCI Express (XB) */ + #define AR_SUBVENDOR_ID_NOG 0x0e11 /* No 11G subvendor ID */ #define AR_SUBVENDOR_ID_NEW_A 0x7065 /* Update device to new RD */ #endif /* _DEV_ATH_DEVID_H */ ==== //depot/projects/powerpc/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 (text) ==== @@ -35,9 +35,9 @@ * * $Id: //depot/sw/branches/sam_hal/COPYRIGHT#1 $ */ -#define ATH_HAL_VERSION "0.9.17.2" +#define ATH_HAL_VERSION "0.9.20.3" begin 644 hal.o -M?T5,1@(!`0````````````$`)I`!`````````````````````````"@-!``` +M?T5,1@(!`0````````````$`)I`!`````````````````````````.CP`P`` M`````````$```````$``#@`+````NR<``+TC$`#P0Z(5"T(``#TD```!($\` M0/2A'0M"&@`@Y*%]`T(,`"#DH5D#0D4`(.2A70)"!0`@Y*$Y`D(X`"#DH?4` M0C,`(/1!`.##H74"0CP`(/0^`.##H54*0C,`(/2A70I"!0`@Y**5`T(``#TD @@ -53,8 +53,8 @@ M`"#D`P`@_.SO(B`3`"#D(@#@P^[N(B`6`"#D'P#@PP$`?R0;\6,@H05#0!$` M(/2A#4-`!0`@Y`$`/R03\"$@H05!0`8`(/04`.##`0`_)!G_(2"A!4%`$``@ MY!,`'R(``'VG`$!;:P``NB<``+TC#0#@PP``?:<`0%MK``"Z)P``O2,(`.## -M``!]IP!`6VL``+HG``"](P,`X,,`!/]'`0`_(```-+`(``#D,`0@H`@`(+`T -M!""@+``@L#@$(*`P`""P/`0@H#0`(+```%ZG$`#>(P&`^FM`!#"R`0`?(`&` +M``!]IP!`6VL``+HG``"](P,`X,,`!/]'`0`_(```-+`(``#D>`,@H`@`(+!\ +M`R"@+``@L(`#(*`P`""PA`,@H#0`(+```%ZG$`#>(P&`^FN(`S"R`0`?(`&` M^FL``+LG``"](]#_WB,``%ZW"``^M1``7K48`'ZU(`">M2@`OK4-!/!'#`3Q M1PL$\D<)!/]'*O9A2A`$[4<1!.Q'``!]IP!`6VL``+HG``"](P``"T0@]@%( MH`4*0`$`/R`)``#T"@`?(@``?:<`0%MK``"Z)P``O2,),"!!&?PI(.W_/^P! @@ -64,9 +64,9 @@ MJ0!@Y&$%I2``WB,!@/IK``"[)P``O2/P_]XC``!> -MMP@`/K4)!/%'H!0PIF$%*4%A!2E````A0`@`(.9&_U_3(/8!2```/20``"$@ +MMP@`/K4)!/%'Z!,PIF$%*4%A!2E````A0`@`(.9&_U_3(/8!2```/20``"$@ M``0!0```("S!`"!(```I3```7J<(`#ZE$`#>(P&`^FL``+LG``"](_#_WB,` -M`%ZW"``^M0D$\4>@%#"F"P`@YC+_7],@]@%(```])```(2``!`%````@+Q@` +M`%ZW"``^M0D$\4?H$S"F"P`@YC+_7],@]@%(```])```(2``!`%````@+Q@` MZ4/9`"!+``!]IP!`^VH+`.##(?8A26(%(4!B!T)`8@5!0&(%04!"!D)`(_=! M2",%8D!#!F%`8P5A0)N69$@`!/M'``!>IP@`/J40`-XC`8#Z:P``NR<``+TC MP/_>(P``7K<(`#ZU$`!>M1@`?K4@`)ZU*`"^M3``WK4.!/!'#`3Q1P0`,:`! @@ -105,2507 +105,2515 @@ M!.Y'$03L1PX`7R(3!.M'%`3_1R?^7],,`"HL+`!)($$"(DA@!P)(``0!1`P` M"CP0!.Y'$03L1PX`7R(3!.M'`0"?(AO^7],.`"HL+@`I(4$"*4A@!PE(``0! M1`X`"CP-,*!!```LH*$-+4#(_S_D``!>IP@`/J40`%ZE&`!^I2``GJ4H`+ZE -M,`#>I4``WB,!@/IK``"[)P``O2-(!%`@,?8A2J&7(T)9`"#D```])```(2!! -M!"%"```AH`$$H4-1`.%K;`0PH`(`X,,(`"*@P5(@2"%V($@``#.P``3_1P&` -M^FL(`"*@^O__PP``(J#!4B!()P#@PP``(J"!]B%(``3_1X"R(40!@/IK```B -MH`&0($0"`.##```BH`$0(42A`^%#``3_1X"T(40!@/IK```BH`$0(D3Y___# -M7`0PH.7__\,R]D%*H35`0@<`(/0`!/]'+P!`YJ%50$('`"#TH75`0@<`(/0G -M`.##8`0PH"$7)DB!%R9(U___PV`$,*#3___#9`0PH-/__\,``"*@@38B2``$ -M_T?`LB%$`8#Z:P``(J"!5B)(^O__PP``(J"!%B%(]___PP``(J"!EB)(]/__ -MPP``(J"!MB)(\?__PS+V04JA-4!"!P`@]`,`0.:A54!"!@`@]`<`X,,``"*@ -M@=8B2.?__\.\%#"@R?__P[@4,*"S___##0`?(`&`^FL,`!\@`8#Z:S'V(4JA -M]2%"`P`@]*$U(T('`"#T%@#@PZ%U0$(4`"#DH9=@0A(`(.1D!'"R"`#@PS+V -M04JA-4!"`P`@]*%50$(%`"#T"@#@PZ$#\T.\%#"P`0`?(`&`^FNX%%"@(I9? -M2"%V8$H!!")$N!0PL/C__\,"`(#F#``_(```-+``!/]'`8#Z:P``NR<``+TC -ML/_>(P``7K<(`#ZU$`!>M1@`?K4@`)ZU*`"^M3``WK4X`/ZU#03P1T``/K9( -M`%ZV"@3S1PL$\DI$$$XD$``$$LR0)!2`(` -M02P"`"$@P@)!2"$7(DD!!")$```KL`0`:R$JD4!!+/9!2!`$[4<1!.E'``!] -MIP!`6VL``+HG``"](P``"[`$`&LA"9`@02J10$$B]B%)H@=,0"'V04FA`\%! -M`@!!1/#_7_0/,.!!H?=`0>#_/^1(`#ZD(`%A00``7J<(`#ZE$`!>I1@`?J4@ -M`)ZE*`"^I3``WJ4X`/ZE4`#>(P&`^FL``+LG``"](_#_WB,``%ZW"``^M0D$ -M]4>AM2%"#0`@]*&](4("`"#D!@`@YB(`X,.AM2-"#0`@]*'5(T(0`"#T'0#@ -MPS`$,"```#2T$``_(`D`X,,``'6B$03R1P``5*:I_U_3```)L!$`X,/`%#`@ -M```TM!@`/R```"FP#`#@PP8`8/8$`#\@```UL```5*1H!#"@```BL`4`X,.A -ME6!"``3_1P4`(.0``#*@:`0PL`$`'R`!`.##``3_1P``7J<(`#ZE$`#>(P&` -M^FL$`#&@``3_1W@`(.0``#*@```QL`0`,J`(`#&P"``RH`P`,;`,`#*@$``Q -ML!``,J`B]B%(__\_(($6)$BA!4%`!``@]*'S7T""]#]$`03B1P$`X,,"`#\@ -M%``QL!0`,J`D]B%(__\_(($6)$BA!8%`$@`@]``$7R"C`X)``0`_(!@`,;#" -M!&1$`P3B1P$`/R"A`R)`"P`@Y`$`7R`!!$)``30@1`($X4(P``7K<( -M`#ZU$`!>M1@`?K4*!/!'"P3Q1P``?:<`0%MK``"Z)P``O2,)!.!'``3_1QX` -M(.44`"F@@1>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 14 07:09: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 7299816A494; Thu, 14 Dec 2006 07:09:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1CC3C16A416 for ; Thu, 14 Dec 2006 07:09:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6211443CAD for ; Thu, 14 Dec 2006 07:07:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBE795CV000141 for ; Thu, 14 Dec 2006 07:09:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBE78FW1099994 for perforce@freebsd.org; Thu, 14 Dec 2006 07:08:15 GMT (envelope-from jb@freebsd.org) Date: Thu, 14 Dec 2006 07:08:15 GMT Message-Id: <200612140708.kBE78FW1099994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111677 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, 14 Dec 2006 07:09:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=111677 Change 111677 by jb@jb_freebsd8 on 2006/12/14 07:08:02 IFC Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#9 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#40 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hubs/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#35 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#16 integrate .. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#8 integrate .. //depot/projects/dtrace/ports/LEGAL#17 integrate .. //depot/projects/dtrace/ports/MOVED#36 integrate .. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#7 integrate .. //depot/projects/dtrace/ports/Mk/bsd.local.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.php.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#9 integrate .. //depot/projects/dtrace/ports/Tools/scripts/rmport#8 integrate .. //depot/projects/dtrace/ports/UPDATING#28 integrate .. //depot/projects/dtrace/src/contrib/bind9/CHANGES#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/FAQ#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/README#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkconf.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkconf.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkzone.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkzone.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/nslookup.1#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/nslookup.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/aclconf.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/controlconf.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/aclconf.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/client.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/config.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/control.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/globals.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/logconf.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/lwresd.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/server.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/sortlist.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/tkeyconf.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/tsigconf.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/include/named/zoneconf.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/interfacemgr.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/logconf.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwdgabn.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwdgrbn.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwresd.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/sortlist.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/tkeyconf.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/tsigconf.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/zoneconf.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc-confgen.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc-confgen.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/config.threads.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/configure.in#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/config.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/include/isc/list.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/include/netdb.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/dns.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/gen_ho.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/gethostent.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/getnameinfo.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/getservent_r.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/irp.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/irp_nw.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/irpmarshall.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/lcl_ho.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/lcl_pr.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/isc/ev_connects.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/isc/eventlib.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/isc/eventlib_p.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/isc/heap.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/isc/hex.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/isc/memcluster.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/nameser/ns_sign.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/nameser/ns_verify.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/port_after.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/port_before.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/resolv/mtctxres.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind9/include/bind9/check.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/acl.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/compress.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/dst_api.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/gen.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/acl.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/cache.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/compress.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/keytable.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/message.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/name.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/peer.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/rdataset.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/resolver.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/types.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/xfrin.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/zone.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/keytable.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/masterdump.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/name.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/opensslrsa_link.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/peer.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/portlist.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#4 delete .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#4 delete .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdataset.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/request.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/tcpmsg.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/hash.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/heap.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/hmacmd5.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/heap.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/list.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/symtab.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/lex.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/log.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/netscope.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/nothreads/condition.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/nothreads/mutex.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/print.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/sockaddr.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/taskpool.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/entropy.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/fsaccess.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/ipv6.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isccc/api#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isccfg/parser.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/gai_strerror.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/lwconfig.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_config.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_context.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gethostent.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getipnode.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gnba.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gnba.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_inetntop.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_inetntop.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_noop.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_noop.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_packet.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_packet.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_resutil.3#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_resutil.html#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/libtool.m4#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/ltmain.sh#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/make/rules.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/version#6 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/log.c#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#17 integrate .. //depot/projects/dtrace/src/lib/bind/bind/config.h#4 integrate .. //depot/projects/dtrace/src/lib/bind/bind/port_after.h#4 integrate .. //depot/projects/dtrace/src/lib/bind/bind/port_before.h#4 integrate .. //depot/projects/dtrace/src/lib/bind/config.h#4 integrate .. //depot/projects/dtrace/src/lib/bind/dns/code.h#4 integrate .. //depot/projects/dtrace/src/lib/bind/dns/dns/enumclass.h#4 integrate .. //depot/projects/dtrace/src/lib/bind/dns/dns/enumtype.h#4 integrate .. //depot/projects/dtrace/src/lib/bind/dns/dns/rdatastruct.h#4 integrate .. //depot/projects/dtrace/src/lib/bind/lwres/lwres/platform.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/chmod.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/chown.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/kse.2#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/link.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/mkdir.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/mkfifo.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/rename.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/rmdir.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/symlink.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/truncate.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/unlink.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/utimes.2#5 integrate .. //depot/projects/dtrace/src/lib/libelf/elf.3#7 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#12 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_getsymshndx.3#3 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_cond.c#8 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.c#8 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#10 integrate .. //depot/projects/dtrace/src/sbin/fdisk/fdisk.8#5 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifbridge.c#7 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#11 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#18 integrate .. //depot/projects/dtrace/src/share/man/man4/altq.4#9 integrate .. //depot/projects/dtrace/src/share/man/man4/miibus.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/msk.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/vlan.4#6 integrate .. //depot/projects/dtrace/src/share/man/man9/bpf.9#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/mptable_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/dtrace/src/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/dtrace/src/sys/amd64/pci/pci_bus.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#26 integrate .. //depot/projects/dtrace/src/sys/conf/files#42 integrate .. //depot/projects/dtrace/src/sys/conf/options#27 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/alpha-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/version.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/adv_isa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/advansys.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/adwcam.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/aha/aha.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/aha/aha_mca.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ahb/ahb.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/amd/amd.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/arcmsr/arcmsr.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/asr/asr.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/sample/sample.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_athrate.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/awi/awivar.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#12 integrate .. //depot/projects/dtrace/src/sys/dev/buslogic/bt.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/buslogic/bt_eisa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/buslogic/bt_isa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/buslogic/bt_mca.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/buslogic/bt_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/iir/iir_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_pci.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/isp/ispmbox.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/ispfw/ispfw.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#8 integrate .. //depot/projects/dtrace/src/sys/dev/mly/mly.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/dtrace/src/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_skreg.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/trm/trm.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_auereg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_ethersubr.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_ethersubr.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/wds/wd7000.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/wi/if_wivar.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#19 integrate .. //depot/projects/dtrace/src/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/mptable_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/include/intr_machdep.h#6 integrate .. //depot/projects/dtrace/src/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_kse.c#8 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#20 integrate .. //depot/projects/dtrace/src/sys/modules/isp/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/msk/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/bridgestp.c#13 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.h#8 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#21 integrate .. //depot/projects/dtrace/src/sys/net/if_bridgevar.h#10 integrate .. //depot/projects/dtrace/src/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_nat.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/frag6.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/ipsec.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/mld6.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/scope6.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#6 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#11 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/bus.h#4 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/ofw_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#6 integrate .. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#7 integrate .. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#7 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/elf_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#9 integrate .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_init.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#21 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#17 integrate .. //depot/projects/dtrace/src/sys/sys/interrupt.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/mac_policy.h#10 integrate .. //depot/projects/dtrace/src/usr.bin/apply/apply.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/find/find.1#7 integrate .. //depot/projects/dtrace/src/usr.bin/id/id.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/jot/jot.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/login/Makefile#5 integrate .. //depot/projects/dtrace/src/usr.bin/login/login.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/login/login.h#4 integrate .. //depot/projects/dtrace/src/usr.bin/setchannel/Makefile#1 branch .. //depot/projects/dtrace/src/usr.bin/setchannel/setchannel.1#1 branch .. //depot/projects/dtrace/src/usr.bin/setchannel/setchannel.c#1 branch .. //depot/projects/dtrace/src/usr.bin/truss/truss.1#6 integrate .. //depot/projects/dtrace/src/usr.bin/tty/tty.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/what/what.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/which/which.1#4 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/devices.c#7 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/index.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/menus.c#6 integrate .. //depot/projects/dtrace/www/de/platforms/arm.sgml#6 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#8 integrate .. //depot/projects/dtrace/www/de/share/sgml/press.xml#7 integrate .. //depot/projects/dtrace/www/de/where.sgml#7 integrate .. //depot/projects/dtrace/www/en/cgi/query-pr.cgi#8 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#21 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#20 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#15 integrate .. //depot/projects/dtrace/www/en/layout/css/query-pr.css#4 integrate .. //depot/projects/dtrace/www/en/news/news.sgml#5 integrate .. //depot/projects/dtrace/www/en/projects/netperf/cluster.sgml#5 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#16 integrate .. //depot/projects/dtrace/www/share/sgml/press.xml#11 integrate Differences ... ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#9 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.69 2006/11/20 17:09:06 jkois Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.587 2006/11/03 19:27:29 jkois Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.70 2006/12/13 19:56:21 jkois Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.588 2006/12/02 17:35:57 jkois Exp $ - basiert auf: 1.789 + basiert auf: 1.790 --> @@ -33,7 +33,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.587 2006/11/03 19:27:29 jkois Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.588 2006/12/02 17:35:57 jkois Exp $ 1995 @@ -2722,11 +2722,11 @@ &prompt.root; kbdcontrol -k /dev/kbd1 < /dev/ttyv0 > /dev/null Wenn Sie nur die USB-Tastatur angeschlossen haben, ist - diese als /dev/kbd0 verfügbar; + diese als /dev/ukbd0 verfügbar; daher muss in diesem Fall das folgende Kommando benutzt werden: - &prompt.root; kbdcontrol -k /dev/kbd0 < /dev/ttyv0 > /dev/null + &prompt.root; kbdcontrol -k /dev/ukbd0 < /dev/ttyv0 > /dev/null Tragen Sie dieses Kommando in Datei /etc/rc.i386 ein. ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#5 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.43 2006/11/20 17:09:06 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.126 2006/10/29 16:04:02 jkois Exp $ - basiert auf: 1.223 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.44 2006/12/13 19:56:21 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.128 2006/11/30 13:02:54 jkois Exp $ + basiert auf: 1.225 --> @@ -1748,19 +1748,23 @@ sysctl.conf sieht ähnlich wie rc.conf aus. Werte werden in der Form Variable=Wert gesetzt. - Die angegebenen Werte werden - gesetzt, nachdem sich das System im Mehrbenutzermodus befindet, - das heißt nicht alle Werte können in - diesem Modus gesetzt werden. + Die angegebenen Werte werden gesetzt, nachdem sich das + System bereits im Mehrbenutzermodus befindet. Allerdings + lassen sich im Mehrbenutzermodus nicht alle Werte + setzen. + + Um das Protokollieren von fatalen Signalen abzustellen + und Benutzer daran zu hindern, von anderen Benutzern + gestartete Prozesse zu sehen, können Sie in der + Datei sysctl.conf die folgenden + Variablen setzen: - In der folgenden sysctl.conf wird das - Loggen von fatalen Signalen abgestellt und Linux Programmen - wird klar gemacht, dass sie in Wirklichkeit unter - &os; laufen: + # Do not log fatal signal exits (e.g. sig 11) +kern.logsigexit=0 - kern.logsigexit=0 # Do not log fatal signal exits (e.g. sig 11) -compat.linux.osname=FreeBSD -compat.linux.osrelease=4.3-STABLE +# Prevent users from seeing information about processes that +# are being run under another UID. +security.bsd.see_other_uids=0 @@ -1775,7 +1779,7 @@ Mit &man.sysctl.8; können Sie Änderungen an - einem laufenden &os; System vornehmen. Unter anderem + einem laufenden &os;-System vornehmen. Unter anderem können Optionen des TCP/IP-Stacks oder des virtuellen Speichermanagements verändert werden. Unter der Hand eines erfahrenen Systemadministrators kann dies ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#4 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.26 2006/10/26 15:01:45 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/desktop/chapter.sgml,v 1.54 2006/10/21 17:07:51 jkois Exp $ - basiert auf: 1.66 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.27 2006/12/13 19:56:21 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/desktop/chapter.sgml,v 1.57 2006/12/13 18:49:01 jkois Exp $ + basiert auf: 1.69 --> @@ -305,7 +305,16 @@ Enter-Taste. Dadurch wird eine Seite geladen, auf der alle installierten Plugins aufgelistet werden. Auch das &java;-Plugin sollte nun - in dieser Liste aufgeführt sein. + in dieser Liste aufgeführt sein. Sollte dies bei Ihnen + nicht der Fall sein, müssen Sie als + root noch den folgenden Befehl + ausführen: + + &prompt.root; ln -s /usr/local/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so \ + /usr/local/lib/browser_plugins/ + + Danach starten Sie Ihren Browser neu, um das Plugin zu + aktivieren. @@ -343,9 +352,9 @@ die folgenden Befehle aus: &prompt.root; ln -s /usr/local/lib/npapi/linux-flashplugin/libflashplayer.so \ - /usr/X11R6/lib/browser_plugins/ + /usr/local/lib/browser_plugins/ &prompt.root; ln -s /usr/local/lib/npapi/linux-flashplugin/flashplayer.xpt \ -/usr/X11R6/lib/browser_plugins/ + /usr/local/lib/browser_plugins/ Nach einem Neustart sollte das Plugin nun in der Liste der installierten Plugins auftauchen. Falls Ihr Browser @@ -644,7 +653,7 @@ OpenOffice.org installieren Sie wie folgt: - &prompt.root; pkg_add -r openoffice + &prompt.root; pkg_add -r openoffice.org Diese Art der Installation sollte mit einer -RELEASE-Version @@ -675,7 +684,7 @@ viel Plattenplatz und Zeit benötigen, um die Quellen zu übersetzen. - &prompt.root; cd /usr/ports/editors/openoffice-2.0 + &prompt.root; cd /usr/ports/editors/openoffice-2 &prompt.root; make install clean ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#7 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.51 2006/11/20 17:09:06 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.147 2006/11/06 19:31:54 jkois Exp $ - basiert auf: 1.267 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.52 2006/12/13 19:56:21 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.148 2006/12/07 20:34:46 jkois Exp $ + basiert auf: 1.268 --> @@ -905,6 +905,72 @@ beschreibt, wie Sie USB-Laufwerke formatieren und Partitionen einrichten. + Damit auch normale Anwender (ohne + root-Rechte) USB-Laufwerke einhängen + können, müssen Sie Ihr System erst entsprechend + konfigurieren. Als erstes müssen Sie sicherstellen, dass + diese Anwender auf die beim Einhängen eines USB-Laufwerks + dynamisch erzeugten Gerätedateien zugreifen dürfen. + Dazu können Sie beispielsweise mit &man.pw.8; alle + potentiellen Benutzer dieser Gerätedateien in die Gruppe + operator aufnehmen. Außerdem + muss sichergestellt werden, dass Mitglieder der Gruppe + operator Schreib- und Lesezugriff + auf diese Gerätedateien haben. Dazu fügen Sie die + folgende Zeile in die Konfigurationsdatei + /etc/devfs.rules ein: + + add path 'da*' mode 0660 group operator + + + Verfügt Ihr System auch über SCSI-Laufwerke, + gibt es eine Besonderheit. Haben Sie beispielsweise + die SCSI-Laufwerke da0 bis + da2 installiert, so sieht diese + Zeile wie folgt aus: + + add path 'da[3-9]*' mode 0660 group operator + + Dadurch werden die bereits vorhandenen + SCSI-Laufwerke nicht in die Gruppe + operator aufgenommen. + + + Als nächstes müssen Sie Ihre Kernelkonfiguration + anpassen, damit auch normale Benutzer Dateisysteme mounten + dürfen. Dazu fügen Sie am besten folgende Zeile + in die Konfigurationsdatei + /etc/sysctl.conf ein: + + vfs.usermount="1" + + Damit diese Einstellung wirksam wird, müssen Sie Ihr + System neu starten. Alternativ können Sie diese Variable + auch mit &man.sysctl.8; setzen. + + Zuletzt müssen Sie noch ein Verzeichnis anlegen, in + das das USB-Laufwerk eingehängt werden soll. Dieses + Verzeichnis muss dem Benutzer gehören, der das + USB-Laufwerk in den Verzeichnisbaum einhängen will. + Dazu legen Sie als root ein + Unterverzeichnis + /mnt/$USER + an (wobei Sie $USER + durch den Login des jeweiligen Benutzers ersetzen): + + &prompt.root; mkdir /mnt/$USER +&prompt.root; chown $USER:$USER /mnt/$USER + + Wenn Sie nun beispielsweise einen USB-Stick + anschließen, wird automatisch die Gerätedatei + /dev/da0s1 erzeugt. Da derartige + Geräte in der Regel mit dem FAT-Dateisystem + formatiert sind, können Sie sie beispielsweise mit + dem folgenden Befehl in den Verzeichnisbaum + einhängen: + + &prompt.user; mount_msdosfs -m 644 -M 755 /dev/da0s1 /mnt/$USER + Wenn Sie das Gerät entfernen (das Dateisystem müssen Sie vorher abhängen), sehen Sie in den Systemmeldungen Einträge wie die folgenden: ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#6 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -2625,7 +2625,7 @@ Im Beispiel werden Adressen aus einem Klasse C Netz (192.168.0.0 bis - 192.168.255.255) benutzt. + 192.168.0.255) benutzt. Standardmäßig besitzt ein Klasse C Netz die Netzmaske 255.255.255.0. ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#4 (text+ko) ==== @@ -4,9 +4,9 @@ Original Revision der ersten Uebersetzung: 1.20 - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.31 2006/10/26 15:01:47 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/mail/chapter.sgml,v 1.61 2006/10/26 09:06:42 jkois Exp $ - basiert auf: 1.134 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.32 2006/12/13 19:56:22 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/mail/chapter.sgml,v 1.62 2006/12/13 18:53:14 jkois Exp $ + basiert auf: 1.135 --> @@ -2847,6 +2847,14 @@ + RELENG_6_2_0_RELEASE + + + FreeBSD 6.2 + + + + RELENG_6_1_0_RELEASE ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.29 2006/10/26 15:01:47 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/multimedia/chapter.sgml,v 1.79 2006/10/26 09:12:42 jkois Exp $ - basiert auf: 1.118 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.30 2006/12/13 19:56:22 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/multimedia/chapter.sgml,v 1.80 2006/12/10 14:01:39 jkois Exp $ + basiert auf: 1.119 --> @@ -1629,8 +1629,8 @@ &os; unterstützt sowohl SCSI- als auch USB-Scanner. Prüfen Sie vor der Konfiguration mithilfe der - Liste - der unterstützten Geräte ob Ihr Scanner + + Liste der unterstützten Geräte ob Ihr Scanner von SANE unterstützt wird. Die Hilfeseite &man.uscanner.4; zählt ebenfalls die unterstützten USB-Scanner auf. @@ -1750,8 +1750,8 @@ (graphics/sane-frontends). Das Backend greift auf den Scanner zu. Welches Backend welchen Scanner unterstützt, entnehmen Sie der - Liste - der unterstützten Geräte.. + + Liste der unterstützten Geräte.. Der Betrieb eines Scanners ist nur dem richtigen Backend möglich. Die Frontends sind die Anwendungen, mit denen gescannt wird (xscanimage). ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v 1.31 2006/08/01 19:43:13 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/ppp-and-slip/chapter.sgml,v 1.72 2006/07/30 17:26:31 jkois Exp $ - basiert auf: 1.173 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v 1.32 2006/12/13 19:56:22 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/ppp-and-slip/chapter.sgml,v 1.73 2006/12/07 19:16:07 jkois Exp $ + basiert auf: 1.175 --> @@ -854,9 +854,9 @@ Link auf ppp-shell. Wenn Sie beispielsweise die drei Kunden, - fred, sam, und - mary haben, für die Sie Netzwerke - der Klasse C routen, schreiben Sie Folgendes: + fred, sam und + mary haben, für die Sie + CIDR-/24-Netzwerke routen, schreiben Sie Folgendes: &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-sam @@ -925,8 +925,8 @@ Die Datei /etc/ppp/ppp.linkup sollte, falls erforderlich, ebenfalls Routinginformationen für jeden Benutzer mit statischer IP-Adresse enthalten. Die unten - dargestellte Zeile würde dem Klasse C Netzwerk 203.14.101.0 eine Route über die + dargestellte Zeile würde dem Netzwerk 203.14.101.0/24 eine Route über die PPP-Verbindung des Client hinzufügen. fred: ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#7 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml,v 1.48 2006/11/20 17:09:07 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.148 2006/11/12 10:48:39 jkois Exp $ - basiert auf: 1.307 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml,v 1.49 2006/12/13 19:56:22 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.149 2006/12/12 19:23:25 jkois Exp $ + basiert auf: 1.308 --> @@ -869,7 +869,7 @@ die erwartete Auslastung gut abfangen können. Allerdings sollten Sie den Wert nicht so hoch setzen, dass der Rechner über seine eigenen Füße fällt. - Es ist auch klug, sendmail im + Es ist auch klug, Sendmail im Queue-Modus () laufen zu lassen. Der Dæmon (sendmail -bd) sollte getrennt von den Queue-Läufen (sendmail -q15m) @@ -877,7 +877,7 @@ wünschen, können Sie die Queue in einem geringeren Intervall, etwa , abarbeiten. Geben Sie für dieses - sendmail aber einen vernünftigen + Sendmail aber einen vernünftigen Wert für MaxDaemonChildren an, um Fehler zu verhindern. ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#6 (text+ko) ==== @@ -1,9 +1,9 @@