De bovenstaande Powered by FreeBSD logo's kunnen De bovenstaande Powered by &os; logo's kunnen gedownload worden en mogen worden weergegeven op persoonlijke en zakelijke webpagina's die - worden geserveerd door FreeBSD machines. Voor het gebruik van + worden geserveerd door &os; machines. Voor het gebruik van dit logo of de verschijning van de BSD Daemons met winstoogmerk + href="../en/copyright/daemon.html">BSD Daemons met winstoogmerk is toestemming nodig van Brian Tao (maker van het power logo) en Marshall Kirk McKusick + href="mailto:mckusick@mckusick.com">Marshall Kirk McKusick (houder van het handelsmerk voor de afbeelding van de BSD Daemon).

Gebaseerd op BSD &unix;

FreeBSD® is een geavanceerd +

&os;® is een geavanceerd besturingssystem voor moderne platforms + href="&enbase;/platforms/">platforms voor servers, desktop, en embedded computers. - De broncode van FreeBSD heeft meer dan dertig + De broncode van &os; heeft meer dan dertig jaar van continue ontwikkeling, verbetering en optimalisatie doorgemaakt. Het wordt ontwikkeld en onderhouden door een groot - team van individuen. FreeBSD biedt + team van individuen. &os; biedt geavanceerd netwerken, indrukwekkende beveiligingsmogelijkheden en topprestaties en wordt door sommige van 's werelds drukste + href="&base;/doc/nl_NL.ISO8859-1/books/handbook/nutshell.html#INTRODUCTION-NUTSHELL-USERS">drukste websites en de meest voorkomende embedded netwerk- en opslagapparaten gebruikt.

@@ -99,7 +99,7 @@

- Krijg FreeBSD nu! + Krijg &os; nu!

@@ -116,7 +116,7 @@

- Volgende uitgave + Volgende uitgave &betarel.current; - &betarel.vers;

@@ -187,7 +187,7 @@

SNELKEUZE

- Mailinglijsten + Mailinglijsten
Rapporteer een bug @@ -196,10 +196,10 @@ FAQ
- Handboek + Handboek
- Ports + Ports

@@ -209,16 +209,16 @@

- Nieuw bij FreeBSD? + Nieuw bij &os;?

LAATSTE NIEUWS

@@ -232,7 +232,7 @@

- Meer nieuws + Meer nieuws
@@ -258,7 +258,7 @@
- - Meer evenementen + Meer evenementen
@@ -281,7 +281,7 @@
- - Meer pers + Meer pers
@@ -304,17 +304,17 @@
- - Meer + Meer
- - +

ERRATAMEDEDELINGEN

ERRATA

@@ -325,7 +325,7 @@

- Meer + Meer
@@ -339,17 +339,17 @@
-

From owner-p4-projects@FreeBSD.ORG Sun May 10 12:10:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 690281065675; Sun, 10 May 2009 12:10:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B14B106564A for ; Sun, 10 May 2009 12:10:38 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F308F8FC25 for ; Sun, 10 May 2009 12:10:37 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4ACAbK6044216 for ; Sun, 10 May 2009 12:10:37 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4ACAbo1044214 for perforce@freebsd.org; Sun, 10 May 2009 12:10:37 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 May 2009 12:10:37 GMT Message-Id: <200905101210.n4ACAbo1044214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 12:10:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=161882 Change 161882 by rene@rene_self on 2009/05/10 12:10:35 Remove community.sgml, it was replaced by community.xsl (murray, 2008-04-20 03:22:44, rev 1.7) Affected files ... .. //depot/projects/docproj_nl/www/nl/community.sgml#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 10 12:21:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFBB71065670; Sun, 10 May 2009 12:21:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84F191065676 for ; Sun, 10 May 2009 12:21:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7279D8FC17 for ; Sun, 10 May 2009 12:21:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4ACLnAt045020 for ; Sun, 10 May 2009 12:21:49 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4ACLnQ2045018 for perforce@freebsd.org; Sun, 10 May 2009 12:21:49 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 May 2009 12:21:49 GMT Message-Id: <200905101221.n4ACLnQ2045018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 12:21:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=161883 Change 161883 by rene@rene_self on 2009/05/10 12:21:36 [website] * Fix minor nits and add %SOURCE% / %SRCID% markers to vendors.html Affected files ... .. //depot/projects/docproj_nl/www/nl/vendors.html#2 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/vendors.html#2 (text+ko) ==== @@ -1,21 +1,23 @@ + Leveranciers van FreeBSD - - - - + -

Een lijst met leveranciers die iets te maken hebben met FreeBSD +

De lijst met leveranciers die FreeBSD ter beschikking hebben is beschikbaar als - onderdeel van het FreeBSD handboek. Deze pagina hoort - over een paar seconden automatisch door te sturen. Als dat niet + onderdeel van het FreeBSD handboek. Deze pagina hoort u + over een paar seconden automatisch daar naar door te sturen. Als dat niet zo is, volg dan de link en werk uw favorieten bij. We verontschuldigen ons voor het ongemak.

From owner-p4-projects@FreeBSD.ORG Sun May 10 13:06:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A3DE106566B; Sun, 10 May 2009 13:06:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE71C1065677 for ; Sun, 10 May 2009 13:06:36 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC8228FC1C for ; Sun, 10 May 2009 13:06:36 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4AD6aqP059379 for ; Sun, 10 May 2009 13:06:36 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4AD6aC8059377 for perforce@freebsd.org; Sun, 10 May 2009 13:06:36 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 May 2009 13:06:36 GMT Message-Id: <200905101306.n4AD6aC8059377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 13:06:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=161887 Change 161887 by rene@rene_self on 2009/05/10 13:06:02 [website] Make docs.sgml buildable and add %SOURCE% / %SRCID% markers Affected files ... .. //depot/projects/docproj_nl/www/nl/docs.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/docs.sgml#2 (text+ko) ==== @@ -1,12 +1,13 @@ - - - %navincludes; - %includes; + + + ]> - - - + + &header; From owner-p4-projects@FreeBSD.ORG Sun May 10 13:36:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70E711065676; Sun, 10 May 2009 13:36:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B5BF1065674 for ; Sun, 10 May 2009 13:36:07 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 18B6C8FC13 for ; Sun, 10 May 2009 13:36:07 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4ADa6LM061712 for ; Sun, 10 May 2009 13:36:06 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4ADa6oR061710 for perforce@freebsd.org; Sun, 10 May 2009 13:36:06 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 May 2009 13:36:06 GMT Message-Id: <200905101336.n4ADa6oR061710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 13:36:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=161889 Change 161889 by rene@rene_self on 2009/05/10 13:35:13 [website] * Remove old untranslated 5.4 and 6.0 release notes. * Adjust Makefile Affected files ... .. //depot/projects/docproj_nl/www/nl/releases/5.4R/Makefile#2 delete .. //depot/projects/docproj_nl/www/nl/releases/5.4R/announce.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/5.4R/errata_policy.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/5.4R/hardware.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/5.4R/installation.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/5.4R/relnotes.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/6.0R/Makefile#2 delete .. //depot/projects/docproj_nl/www/nl/releases/6.0R/announce.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/6.0R/hardware.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/6.0R/installation.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/6.0R/relnotes.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/releases/Makefile#2 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/releases/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: www/en/releases/Makefile,v 1.46 2005/02/10 21:30:18 hrs Exp $ -# $FreeBSDnl: www/nl/releases/Makefile,v 1.3 2005/12/17 23:15:43 siebrand Exp $ -# Gebaseerd op: 1.46 +# $FreeBSD: $ # Bewerkt door: Siebrand Mazeland +# %SOURCE% www/en/releases/Makefile +# %SRCID% 1.53 .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -12,8 +12,6 @@ DOCS?= index.sgml -SUBDIR= 5.4R 6.0R - .if defined $(NEW_BUILD) SUBDIR= .endif From owner-p4-projects@FreeBSD.ORG Sun May 10 14:50:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0724E1065673; Sun, 10 May 2009 14:50:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B42421065672 for ; Sun, 10 May 2009 14:50:29 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9722F8FC14 for ; Sun, 10 May 2009 14:50:29 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4AEoNr4068349 for ; Sun, 10 May 2009 14:50:23 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4AEoMfq068343 for perforce@freebsd.org; Sun, 10 May 2009 14:50:22 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 May 2009 14:50:22 GMT Message-Id: <200905101450.n4AEoMfq068343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 14:50:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=161891 Change 161891 by rene@rene_self on 2009/05/10 14:50:06 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#23 integrate .. //depot/projects/docproj_nl/www/en/community/mailinglists.sgml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -375,12 +375,14 @@ To set the number of virtual channels, there are two sysctl knobs which, if you are the root user, can be set like this: - &prompt.root; sysctl hw.snd.pcm0.vchans=4 + &prompt.root; sysctl dev.pcm.0.play.vchans=4 +&prompt.root; sysctl dev.pcm.0.rec.vchans=4 &prompt.root; sysctl hw.snd.maxautovchans=4 The above example allocates four virtual channels, which is a - practical number for everyday use. hw.snd.pcm0.vchans - is the number of virtual channels pcm0 has, and is configurable + practical number for everyday use. Both dev.pcm.0.play.vchans=4 + and dev.pcm.0.rec.vchans=4 + are the number of virtual channels pcm0 has for playback and recording, and are configurable once a device has been attached. hw.snd.maxautovchans is the number of virtual channels a new audio device is given when it is attached using @@ -388,7 +390,8 @@ can be loaded independently of the hardware drivers, hw.snd.maxautovchans can store how many virtual channels any devices which are attached later will be - given. + given. Refer to &man.pcm.4; manual page for more + information. You cannot change the number of virtual channels for a @@ -400,7 +403,7 @@ your applications at /dev/dsp0.x, where x is 0 to 3 if - hw.snd.pcm.0.vchans is set to 4 as in the + dev.pcm.0.rec.vchans is set to 4 as in the above example. On a system using &man.devfs.5;, the above will automatically be allocated transparently to a program that requests /dev/dsp0. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#23 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -428,14 +428,16 @@ als root als volgt ingesteld worden: - &prompt.root; sysctl hw.snd.pcm0.vchans=4 + &prompt.root; sysctl dev.pcm.0.play.vchans=4 +&prompt.root; sysctl dev.pcm.0.rec.vchans=4 &prompt.root; sysctl hw.snd.maxautovchans=4 In het bovenstaande voorbeeld worden vier virtuele kanalen - toegewezen, wat in het dagelijks gebruik voldoende is. - In hw.snd.pcm0.vchans staat het aantal - virtuele kanalen dat pcm0 heeft en is - instelbaar als een apparaat is aangesloten. + toegewezen, wat in het dagelijks gebruik voldoende is. Zowel + dev.pcm.0.play.vchans=4 als + dev.pcm.0.rec.vchans=4 zijn het aantal + virtuele kanalen dat pcm0 heeft voor + afspelen en opnemen, en zijn instelbaar als een apparaat is aangesloten. In hw.snd.maxautovchans staat het aantal virtuele kanalen dat aan een nieuw audio-apparaat wordt gegeven als het wordt aangesloten met &man.kldload.8;. Omdat de module @@ -443,7 +445,7 @@ stuurprogramma's geladen kan worden, kan in hw.snd.maxautovchans opgeslagen worden hoeveel virtuele kanalen apparaten die later worden aangesloten - krijgen. + krijgen. Voor meer informatie wordt naar &man.pcm.4; verwezen. Het aantal virtuele kanalen voor een apparaat kan niet @@ -456,7 +458,7 @@ moeten applicaties wijzen naar /dev/dsp0.x, waar x tussen 0 en 3 ligt als - hw.snd.pcm.0.vchans is ingesteld op 4, zoals + dev.pcm.0.rec.vchans is ingesteld op 4, zoals in het bovenstaande voorbeeld. Op een systeem waar &man.devfs.5; wordt gebruikt, wordt het voorgaande voor een programma dat om /dev/dsp0 vraagt From owner-p4-projects@FreeBSD.ORG Sun May 10 17:17:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B715E10656A7; Sun, 10 May 2009 17:17:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56091106568F for ; Sun, 10 May 2009 17:17:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A99E8FC12 for ; Sun, 10 May 2009 17:17:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4AHH2f7092399 for ; Sun, 10 May 2009 17:17:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4AHH1sk092397 for perforce@freebsd.org; Sun, 10 May 2009 17:17:01 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 May 2009 17:17:01 GMT Message-Id: <200905101717.n4AHH1sk092397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 17:17:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=161898 Change 161898 by rene@rene_self on 2009/05/10 17:16:45 [website] * fix typoin applications.sgml * update and fix features.sgml Affected files ... .. //depot/projects/docproj_nl/www/nl/applications.sgml#4 edit .. //depot/projects/docproj_nl/www/nl/features.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/applications.sgml#4 (text+ko) ==== @@ -27,7 +27,7 @@ organisatorische of bedrijfsmatige behoeften.

Met het genereuze licensiebeleid + href="&enbase;/copyright/freebsd-license.html">licentiebeleid kan &os; als de basis van elk aantal vrije of commerciële applicaties gebruikt worden.

==== //depot/projects/docproj_nl/www/nl/features.sgml#2 (text+ko) ==== @@ -1,92 +1,158 @@ - - - %navincludes; - %includes; + + + ]> - - - + + &header; - -

FreeBSD biedt vele uitgebreide mogelijkheden

- + +

&os; biedt vele uitgebreide mogelijkheden

Welke applicatie u ook gebruikt, u wilt dat de mogelijkheden - van uw systeem maximaal gebruikt worden. De uitgebreide - mogelijkheden van FreeBSD maken dat mogelijk.

+ van uw systeem maximaal gebruikt worden. De focus van &os; op + prestatie, netwerk, en opslag gaan samen met eenvoudig systeemonderhoud + en uitstekende documentatie om u in staat te stellen om precies + dat te doen.

Een compleet besturingssysteem gebaseerd op 4.4BSD

De wortels van FreeBSD liggen bij de laatste BSD - software releases van de Computer Systems Research Group aan de - University of California, Berkeley. Het boek The Design and - Implementation of 4.4BSD Operating System, geschreven - door de 4.4BSD systeemarchitecten, beschrijven veel van de - kernfunctionaliteit in detail.

De wortels van &os; liggen bij de BSD + software-uitgaven van de Computer Systems Research Group aan de + University of California, Berkeley. Er is meer dan tien jaar + werk besteed aan het verbeteren van BSD, het toevoegen van + industrieleidende SMP, multithreading en netwerkprestatie, alsmede + aan nieuwe beheergereedschappen, bestandssystemen, en + beveiligingsmogelijkheden. Als resultaat hiervan kan &os; overal + op het Internet, in het besturingssysteem van kernrouterproducten, + in draaiende rootnaamservers, voor het hosten van grote websites, + en als de basis van veelgebruikte besturingssystemen voor het bureau + gevonden worden. Dit is alleen mogelijk vanwege het diverse en + wereldwijde lidmaatschap van het vrijwillige &os; Project.

+ +

&os; biedt geavanceerde mogelijkheden van besturingssystemen, + waardoor het ideaal is over meerdere systemen, van embedded omgevingen + tot krachtige servers met meerdere processors.

+ +

&os; 7.0, uitgegeven in februari 2008, brengt vele nieuwe + mogelijkheden en prestatieverbeteringen. Met een speciale focus op + de prestatie van opslag en multiprocessing werd &os; 7.0 geleverd + met ondersteuning van Sun's ZFS-bestandssysteem en hoog + schaalbare multiprocessing prestaties. Benchmarks hebben + aangetoond dat &os; tweemaal de prestatie van MySQL en PostgreSQL biedt + als huidige Linux-systemen op 8-core servers.

+ +

SMPng: Na zeven jaar ontwikkeling aan geavanceerde + SMP-ondersteuning realiseert &os; 7.0 de doelen van een + fijnkorrelige kernel waardoor het mogelijk is om vele werklasten + lineair tot over 8 CPU-cores te schalen. In &os; 7.0 is het + Giant-slot bijna geheel geëlimineerd, het is verwijderd uit de + CAM-opslaglaag en de NFS-cliënt en in het netwerkdeelsysteem + wordt naar een fijnkorreligere locking toegewerkt. Er is ook + significant werk verricht om kernel-scheduling en locking-primitieven + te optimaliseren, en de optionele ULE-scheduler staat CPU-affiniteit + voor threads en per-CPU draairijen toe om overhead te verminderen + en cache-vriendelijkheid te vergroten. Het threading-pakket libthr, + dat 1:1-threading biedt, is nu de standaard. Benchmarks laten een + groot prestatievoordeel zien ten opzichte van andere &unix; + besturingssystemen op identieke multicore-hardware en reflecteren een + lange investering in SMP-technologie voor de kernel van &os;.
ZFS-bestandssysteem: Sun's ZFS is state-of-the-art + bestandssysteem dat eenvoudig beheer, transactiesemantiek, + end-to-end gegevensintegriteit en immense schaalbaarheid biedt. Van + zelfreparatie tot ingebouwde compressie, RAID, snapshots, en + volumebeheer, ZFS zal &os;-systeembeheerders in staat stellen om + eenvoudig grote opslagrijen te beheren.
10Gbps-netwerkoptimalisatie: Met geoptimaliseerde + apparaatstuurprogramma's van alle grote verkopers van + 10Gbps-netwerkkaarten is de netwerk-stack in &os; 7.0 uitgebreid + geoptimaliseerd voor hoog presterende werklasten, inclusief + zelfschalende socket-buffers, TCP Segment Offload (TSO), Large + Receive Offload (LRO), direct dispatchen van de netwerk-stack, en het + balanceren van TCP/IP-werklasten over meerdere CPU's op + 10Gbps-kaarten die dit ondersteunen of wanneer meerdere + netwerkinterfaces gelijktijdig gebruikt worden. Volledige + verkopersondersteuning is beschikbaar van Chelsio, Intel, Myricom en + Neterion.
SCTP: &os; 7.0 is de referentie-implementatie van het + nieuwe IETF Stream Control Transmission Protocol (SCTP), bedoeld om + VoIP, telecommunicatie en andere toepassingen met sterke + betrouwbaarheid en verzenden met variabele kwaliteit te ondersteunen + middels eigenschappen zoals multi-pad-aflevering, fail-over en + multi-streaming.

Door te putten uit de talenten en ervaring van een diverse en - wereldwijde groep van vrijwillige ontwikkelaars, is het FreeBSD - project gegroeid tot een systeem dat op veel manieren verder - gaat dan het 4.4BSD besturingssysteem en constant streeft naar - het stabieler, sneller en rijker maken van het besturingssysteem - op basis van gebruikersbehoeften.

Draadloos netwerken: &os; 7.0 wordt geleverd met + significant verbeterde ondersteuning voor draadloos netwerken, + inclusief op Atheros gebaseerde kaarten met hoog vermogen, nieuwe + stuurprogramma's voor Ralink-, Intel- en ZyDAS-kaarten, WPA, + scannen en roamen op de achtergrond en 802.11n.

FreeBSD biedt meer prestaties, betere compatibiliteit met - andere besturingssystemen en minder systeembeheer

Nieuwe hardware-architecturen: &os; 7.0 bevat + significant verbeterde ondersteuning voor de embedded + ARM-architectuur, alsmede beginnende ondersteuning voor het platform + Sun Ultrasparc T1.

De ontwikkelaars van FreeBSD hebben een aantal van de - moeilijkere problemen aangepakt om de volgende geavanceerde - mogelijkheden voor u als gebruiker te realiseren:

&os; heeft een lange geschiedenis van ontwikkeling van geavanceerde + mogelijkheden van besturingssystemen; enkele van deze mogelijkheden + staan hieronder:

Virtueel geheugen en buffer cache voor het bestandssysteem samengevoegd waardoor de hoeveelheid - geheugen voor programma's en schijfcache voortdurend wordt + geheugen voor programma's en schijf-cache voortdurend wordt geoptimaliseerd. Het resultaat daarvan is dat programma's - zowel erg goed geheugenmanagement en betere prestaties voor + zowel erg goed geheugenbeheer en betere prestaties voor schijftoegang hebben en een beheerder hoeft niet langer de - cachegroottes te optimaliseren.
Compatibiliteitsmodules maken het mogelijk om - programma's van andere besturingssystemen op FreeBSD te + programma's van andere besturingssystemen op &os; te draaien, waaronder programma's voor Linux, SCO UNIX en System V Release 4.
Soft Updates bieden verbeterde prestaties voor het - bestandssysteem zoder daarvoor veiligheid en betrouwbaarheid - op te geven. Hiermee worden meta-data bewerkingen op het + bestandssysteem zonder daarvoor veiligheid en betrouwbaarheid + op te geven. Hiermee worden bewerkingen op meta-gegevens op het bestandssysteem geanalyseerd om te voorkomen dat al die operaties synchroon moeten worden uitgevoerd. In plaats daarvan wordt een interne status bijgehouden voor nog uit te - voeren meta-data bewerkingen en wordt deze informatie gebruikt - om meta-data te cachen, worden meta-data bewerkingen + voeren bewerkingen op meta-gegevens en wordt deze informatie gebruikt + om meta-gegevens te cachen, worden bewerkingen op meta-gegevens gecombineerd om opeenvolgende bewerkingen op hetzelfde - bestanden te herschrijven en wordt de volgorde van meta-data - bewerkingen gewijzigd zodat ze efficienter verwerkt kunnen + bestanden te herschrijven en wordt de volgorde van bewerkingen op + meta-gegevens gewijzigd zodat ze efficiënter verwerkt kunnen worden. Mogelijkheden zoals het op de achtergrond controleren van bestandssystemen en snapshots van bestandssystemen zijn gebouwd op het fundament van de consistentie en prestaties - van soft updates.
Snapshots van bestandssystemen, waardoor beheerders 'atomic' snapshots van hun bestandssystemen kunnen maken - voor back-ups, daarbij gebruik makend van de vrije ruimte op + voor reservekopiën, daarbij gebruik makend van de vrije ruimte op een bestandssysteem en ook voor het faciliteren van fsck op de achtergrond, waardoor een systeem naar - multi-user modus kan schakelen zonder te wachten op het + meergebruikersmodus kan schakelen zonder te wachten op het opschonen van bestandssystemen na een stroomstoring.
Ondersteuning voor IP Security (IPsec) biedt verbeterde beveiliging en ondersteuning voor het volgende - generatie Internet Protocol, IPv6. De FreeBSD IPsec - implementatie bevat ondersteuning voor een brede selectie aan + generatie Internet Protocol, IPv6. De IPsec-implementatie van &os; + bevat ondersteuning voor een brede selectie aan hardware crypto-versnellers.
Out of the box ondersteuning voor IPv6 via de KAME - IPv6 stack stelt FreeBSD in staat om naadloos te integreren - met de volgende generatie netwerkomgevingen. FreeBSD bevat + IPv6 stack stelt &os; in staat om naadloos te integreren + met de volgende generatie netwerkomgevingen. &os; bevat zelfs veel applicaties die standaard ondersteuning bieden voor IPv6!

kernel preemption

multi-threaded network - stack

multi-threaded virtueel geheugen - subsysteem

multi-threaded netwerk-stack

multi-threaded subsysteem voor virtueel geheugen

M:N application threading via pthreads staat threads - toe om schaalbaar uit te voeren op meerdere CPU's door veel - user threads te mappen op een klein aantal Kernel +
M:N applicatie-threading via pthreads staat threads + toe om schaalbaar te draaien op meerdere CPU's door veel + gebruikers-threads af te beelden op een klein aantal Kernel Schedulable Entities. Door het adopteren van het - Scheduler Activation model, de threading aangepast - worden op de specifieke eisen van een breed spectrum + Scheduler Activation model, kan de threading aangepast + worden op de specifieke eisen van een breed spectrum aan applicaties.

-
De Netgraph pluggable network stack stelt - ontwikkelaars in staat om eenvoudig en dynamisch de netwerk - stack uit te breiden met nette gelaagde netwerkabstracties. - Met netgraph nodes kan een breed scale aan nieuwe +
De Netgraph pluggable netwerk-stack stelt + ontwikkelaars in staat om eenvoudig en dynamisch de netwerk-stack + uit te breiden met nette gelaagde netwerkabstracties. + Met netgraph nodes kan een breed scala aan nieuwe netwerkdiensten aangeboden worden, waaronder encapsulatie, - tunneling, encryptie en performance adaptation. Als resultaat + tunneling, encryptie en prestatie-adaptatie. Als resultaat is het mogelijk om verbeterde netwerkdiensten sneller, eenvoudiger en met minder bugs te prototypen en in productie te nemen.
@@ -124,64 +190,79 @@
TrustedBSD MAC Framework extensible kernel security stelt ontwikkelaars in staat om het beveiligingsmodel voor het besturingssysteem aan te passen voor specifieke - omgevingen. Van het maken van herdening policies tot het + omgevingen. Van het maken van hardening-beleiden tot het uitrollen van verplichte gelabelde vertrouwelijkheid van integriteitsbeleid. Geleverd voorbeeldbeleid bevat Multi-Level Security (MLS) en Biba integriteitsbeveiliging. Een module van derden is - onder andere SEBSD, een FLASK-gebaseerde implementatie + onder andere SEBSD, een op FLASK gebaseerde implementatie van Type Enforcement.
-
De GEOM pluggable storage layer, die het mogelijk +
TrustedBSD Audit is een logdienst voor + beveiligingsevenementen, dat fijnkorrelige, veilige, betrouwbare + logging biedt van systeemevenementen via de audit-dienst. Beheerders + kunnen de aard en granulariteit van loggen op gebruiker, het volgen + van bestandstoegangen, uitgevoerde commando's, netwerkactiviteit, + systeemaanmeldingen, en een scala aan ander systeemgedrag + configureren. Audit-pijpen staan IDS-gereedschappen toe om zich aan + de audit-dienst van de kernel te koppelen en zich te abonneren op + evenementen die ze nodig hebben voor het in de gaten houden van de + beveiliging. &os; ondersteunt BSM, de industriestandaard voor + audit-trail bestandsformaten en APIs, waardoor bestaande + BSM-gereedschappen met weinig of geen aanpassingen kunnen draaien. + Dit bestandsformaat wordt gebruikt op Solaris en MAC OS X, waardoor + directe interoperabiliteit en gezamenlijke analyse mogelijk is.
+ +
De GEOM pluggable opslaglaag, dat het mogelijk maakt om nieuwe opslagdiensten snel te ontwikkelen en netjes - te integreren in het FreeBSD opslag subsysteem. GEOM biedt + te integreren in het opslagsubsysteem van &os;. GEOM biedt een consistent en coherent model voor het ontdekken en in lagen verdelen van opslagapparaten, waardoor het mogelijk - wordt om diensten als RAID en volume management eenvoudig in + wordt om diensten als RAID en volumebeheer eenvoudig in lagen te verdelen.
-
FreeBSD's GEOM-Based Disk Encryption (GBDE), levert - sterkt cryptografische bescherming met het GEOM Framework en - kan bestandssystemen, swapapparaten en andere opslagmedia +
&os;'s GEOM-Based Disk Encryption (GBDE), levert + sterke cryptografische bescherming met het GEOM Framework en + kan bestandssystemen, wisselbestandapparaten en andere opslagmedia beschermen.

Kernel Queues maken het mogelijk dat programma's - efficienter reageren op een varieteit vna asynchrone - gebeurtenissen waaronder bestands- en socket-OI, waardoor - de prestaties van applicaties en een systeem toenoemen.
+ efficiënter reageren op een variëteit van asynchrone + gebeurtenissen waaronder bestands- en socket-IO, waardoor + de prestaties van applicaties en een systeem toenemen.
Accept Filters maken het mogelijk om - connectie-intensieve applicaties, zoals webservers, netjes + verbindingsintensieve applicaties, zoals webservers, netjes een deel van hun functionaliteit naar de kernel te verplaatsen waardoor prestaties verbeteren.

-
FreeBSD levert veel beveiligingsmogelijkheden om netwerken en +
&os; levert veel beveiligingsmogelijkheden om netwerken en servers te beschermen
-
De FreeBSD ontwikkelaars zijn net zo bezig met beveiliging als - met prestaties en stabiliteit. FreeBSD bevat +
De &os; ontwikkelaars zijn net zo bezig met beveiliging als + met prestaties en stabiliteit. &os; bevat kernelondersteuning voor stateful IP firewalling en ook - voor andere diensten als IP proxy gateways, access - control lists, mandatory access control, - jail-gebaseerde virtual hosting en cryptografisch + voor andere diensten als IP proxy gateways, + toegangscontrolelijsten, verplichte toegangscontrole, + jail-gebaseerde virtuele hosting en cryptografisch beschermde opslag. Hiermee is het mogelijk om veilig meerdere klanten of consumenten van dienst te zijn die elkaar wederzijds niet vertrouwen, netwerksegmenten scherp te - partitioneren en veilige pipelines te maken voor information - scrubbing en information flow control.
+ partitioneren en veilige pipelines te maken voor informatie + scrubbing en informatie flow-beheer.
-
FreeBSD biedt ook ondersteuning voor encryptiesoftware, secure - shells, Kerberos authenticatie, "virtual servers" gemaakt met +
&os; biedt ook ondersteuning voor encryptiesoftware, secure + shells, Kerberos-authenticatie, "virtuele servers" gemaakt met jails, het chroot-en van diensten om applicatietoegang tot het bestandssysteem te beperken, Secure RPC mogelijkheden en - access lists voor diensten die TCP wrappers ondersteunen.
+ toegangslijsten voor diensten die TCP wrappers ondersteunen.
&footer; - - - + &header; -
FreeBSD is ontworpen voor het internet
+
&os; is ontworpen voor het Internet
-
FreeBSD bevat wat velen beschouwen als de referentie +
&os; bevat wat velen beschouwen als de referentie implementatie voor TCP/IP software, de 4.4 BSD TCP/IP protocolstack, waardoor het besturingssysteem ideaal is voor - netwerkapplicaties en het internet.
+ netwerkapplicaties en het Internet. &os; 7.0 bevat ook de + referentie-implementatie van SCTP, waardoor het een ideaal platform is + voor telefonie en andere gegevens-streaming-toepassingen.
-
FreeBSD ondersteunt standaard TCP/IP protocollen
+
&os; ondersteunt standaard alle TCP/IP protocollen
-
Net als de meerste &unix;-systemen, stelt het FreeBSD +
Net als de meeste &unix;-systemen, stelt het &os; besturingssysteem u in staat om:

+
Statische en dynamische webinhoud over HTTP te serveren
+
Bestandssystemen te delen met NFS
- -
Netwerkinformatie de distribueren met NIS
- -
Aanmelden op afstand te ondersteunen
- + +
Netwerkinformatie te distribueren met NIS
+ +
Email-diensten over SMTP, IMAP en POP3 af te handelen en aan te + bieden
+ +
Aanmelden op afstand te ondersteunen over SSH en rsh
+
Op afstand via SNMP instellingen te maken en te beheren
- +
Bestanden te serveren met FTP
- -
Internet hostnamen te resolven met DNS/BIND
- -
Paketten te routeren tussen meerdere interfaces, inclusief + +
Internet-hostnamen te resolven met DNS/BIND
+ +
Pakketten te routeren tussen meerdere interfaces, inclusief PPP en SLIP
- +
IP Multicastdiensten te gebruiken (de MBONE)
+ +
Diensten aan te bieden over IPv6

-
FreeBSD stelt u in staat een Pc om te toveren in een webserver - of een Usenet news relay met bijgesloten software. Met de +
&os; stelt u in staat een PC om te toveren in een webserver of + mailserver of een Usenet news relay met bijgesloten software. Met de bijgesloten software SAMBA kunt u zelfs bestanden of printers - delen met Windows machines en met de PCNFS authenticatiedaemon - is het mogelijk te integreren met machines die PC/NFS draaien. - FreeBSD ondersteunt ook Appletalk en Novell client/server - (via een optioneel commercieel - pakket), waardoor het een echte "Intranet" - netwerkoplossing is.
+ delen met Microsoft®Windows® machines en met de PCNFS + authenticatie-daemon is het mogelijk te integreren met machines die + PC/NFS draaien. &os; ondersteunt ook Appletalk en Novell client/server + (via een optioneel commercieel pakket), waardoor het een echte + "Intranet"-netwerkoplossing is.
-
FreeBSD kan ook omgaan met TCP uitbreidingen als de RFC-1323 - hoge prestaties uitbreiding met SLIP en dial-on-demand PPP. +
&os; kan ook omgaan met TCP-uitbreidingen als de RFC-1323 hoge + prestaties uitbreiding, plus SLIP en bel-op-aanvraag PPP. Het is een besturingssysteem dat geschikt is voor de surfende - thuisgebruiker en de corporate systeembeheerder.
+ thuisgebruiker en de bedrijfssysteembeheerder.
-
Netwerken met FreeBSD is stabiel en snel
+
Netwerken met &os; is stabiel en snel
-
Als u een internet server platform zoekt dat betrouwbaar is en +
Als u een Internet-server-platform zoekt dat betrouwbaar is en de beste prestaties onder zware belasting biedt, overweeg dan - FreeBSD. Hieronder een opsomming van slechts een aantal - bedrijven dat iedere dag FreeBSD gebruikt:
+ &os;. Hieronder een opsomming van slechts een aantal + bedrijven dat iedere dag &os; gebruikt:

Walnut Creek CDROM draaide vele jaren een van de meest - populaire FTP servers op het internet, ftp.cdrom.com, - exclusief op FreeBSD. Het was slechts een FreeBSD machine + populaire FTP servers op het Internet, ftp.cdrom.com, + exclusief op &os;. Het was slechts een &os; machine die 6000 verbindingen ondersteunde en in staat was om meer dan dertig 30 terabyte (in juni 1999 - ja, terabyte!) aan bestanden te serveren aan meer dan 10 miljoen mensen.

Yahoo Inc. draait de - untieme index op internet, en serveert hordes surfers - informatie over internet. Yahoo, en ook de bedrijven die op - Yahoo adverteren, vertrouwen op FreeBSD als betrouwbare en + untieme index op Internet, en serveert hordes surfers + informatie over Internet. Yahoo, en ook de bedrijven die op + Yahoo adverteren, vertrouwen op &os; als betrouwbare en responsieve webserver.

Netcraft is de - leidende onderzoeker naar gebruik van webserversoftware op - internet. Ze gebruiken FreeBSD en Apache voor hun website - en FreeBSD/Perl voor al hun data collectie op internet.
+ leidende onderzoeker naar gebruik van webserver-software op + Internet. Ze gebruiken &os; en Apache voor hun website + en &os;/Perl voor al hun data collectie op Internet.
-
FreeBSD is het ideale platform voor deze en andere - internetdiensten:
+
&os; is het ideale platform voor deze en andere + Internetdiensten:

Bedrijfsbrede of wereldwijde webdiensten
- +
WWW proxy
- +
Anonieme FTP
- -
Enterprise bestands-, print- en e-maildiensten
+ +
Enterprise bestands-, print- en emaildiensten
+ +
Routers, firewalls en binnendringdetectiesystemen

-
De FreeBSD Portscollectie - bevat ready-to-run software die het makkelijk maakt uw eigen - internetserver op te zetten.
+
De &os; Portscollectie + bevat kant-en-klare software die het makkelijk maakt om uw eigen + Internetserver op te zetten.

Hoge prestaties en beveiliging
-
De FreeBSD ontwikkelaar zijn net zo druk met beveiliging als - met prestaties.. FreeBSD bevat kernelondersteuning voor +
De &os; ontwikkelaar zijn net zo druk met beveiliging als + met prestaties. &os; bevat kernelondersteuning voor IP firewalling en andere diensten als IP proxy gateways. - Als uw bedrijfsservers zijn aangesloten op internet, kan iedere - computer waarop FreeBSD draait dienst doen als netwerkfirewall + Als uw bedrijfsservers zijn aangesloten op Internet, kan iedere + computer waarop &os; draait dienst doen als netwerk-firewall om ze te beschermen tegen dreigingen van buitenaf.
-
Encryptie software, secure shells, Kerberos, end-to-end - encryptie en veilige RPC faciliteiten zijn ook beschikbaar - (mogelijk onderhevig aan exportbeperkingen).
+
Encryptiesoftware, secure shells, Kerberos, end-to-end + encryptie en veilige RPC-faciliteiten zijn ook beschikbaar.
-
Verder is het FreeBSD team pro-actief bezig met het ontdekken +
Verder is het &os; team pro-actief bezig met het ontdekken en elimineren van beveiligingsproblemen door het verstrekken van beveiligingsinformatie en het verwerken van bugmeldingen - met een security - officer en banden met het Computer Emergency Response - Team (CERT).
+ met een Beveiligingsofficier en + banden met het Computer Emergency Response Team (CERT).

Wat de experts te zeggen hebben. . .
-
``FreeBSD ... biedt wat mogelijk de meest robuuste en +
``&os; ... biedt wat mogelijk de meest robuuste en capabele TCP/IP-stack is die bestaat ...''

---Michael O'Brien, SunExpert Augustus 1996 @@ -133,7 +143,7 @@ - + &header;
-
Usage Guideline
-
Resource
-
Sample
+
Gebruiksrichtlijnen
+
Bronnen
+
Voorbeeld

-
Usage Guideline
+
Gebruiksrichtlijnen
-
FreeBSD is a registered trademark of The FreeBSD Foundation. The - FreeBSD logo and The Power to Serve are trademarks of The FreeBSD - Foundation.
+
&os; is een geregistreerd handelsmerk van The &os; Foundation. Het &os; + logo en The Power to Serve zijn handelsmerken van The &os; Foundation.
-
All images listed under the heading "Resource" are available for - use under license from The FreeBSD Foundation.
+
Alle afbeeldingen genoemd onder de kop "Bronnen" zijn beschikbaar voor + gebruik onder licentie van The &os; Foundation.
-
For more information on how to obtain permission to use the logo, - please refer to the FreeBSD Logo Usage Guidelines at Voor meer informatie over hoe toestemming te krijgen voor gebruik van het + logo wordt naar de &os; Logo Usage Guidelines op The - FreeBSD Foundation.
+ &os; Foundation verwezen.
-
Resource
+
Bronnen
-
Standard Logo (fullcolor)
+
Standaard Logo (fullcolor)
-
-
Standard Logo (fullcolor for dark background)
+
Standaard Logo (fullcolor voor donkere achtergrond)
-
+
- + -
Standard Logo (black and white)
+
Standaard Logo (zwart-wit)
-
-
Vector formats
+
Vectorformaten
-
Format: Adobe(r) Illustrator(r), - SVG
+
Formaat: Adobe(r) Illustrator(r), + SVG
-
+
-
Sample
+
Voorbeeld
-
NOTE: "freeBSD" text in these images - were created based on draft version of logo contest. Correct - version of this text should be rendered by one black color, not - two colors and first "f" character should be spelled capitalized - as "F".
+
NOOT: "freeBSD" tekst in deze afbeeldingen + waren gemaakt naar aanleiding van een kladversie van de logowedstrijd. + De correcte versie van deze tekst dient te worden weergegeven door + één zwarte kleur, niet twee kleuren en het eerste "f"-teken + dient als hoofdletter "F" gespeld te worden.
-
CD/DVD package
+
CD/DVD-pakket
-
+
-
Postcard
+
Ansichtkaart
-
-
+ src="&enbase;/logo/postcard2-thumb.jpg" alt="">
-
+ src="&enbase;/logo/postcard3-thumb.jpg" alt="">

-
+ src="&enbase;/logo/postcard4-thumb.jpg" alt="">

-
Wallpaper
+
Behang
-
Here are sample wallpapers.
+
Hier zijn voorbeelden van behang.
-
-
-
&footer; From owner-p4-projects@FreeBSD.ORG Sun May 10 20:39:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D69A1065672; Sun, 10 May 2009 20:39:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9368106566B for ; Sun, 10 May 2009 20:39:35 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A72F28FC0A for ; Sun, 10 May 2009 20:39:35 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4AKdZSM013314 for ; Sun, 10 May 2009 20:39:35 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4AKdZvt013312 for perforce@freebsd.org; Sun, 10 May 2009 20:39:35 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 May 2009 20:39:35 GMT Message-Id: <200905102039.n4AKdZvt013312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 20:39:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=161911 Change 161911 by rene@rene_self on 2009/05/10 20:38:45 [website] fix/update mailto.sgml Affected files ... .. //depot/projects/docproj_nl/www/nl/mailto.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/mailto.sgml#2 (text+ko) ==== @@ -1,55 +1,54 @@ - - - %navincludes; - %includes; + + + ]> - - - + &header; -
Vragen over FreeBSD...
+
Vragen over &os;...
-
Vragen over FreeBSD dienen gericht te worden aan de FreeBSD - Vragen mailinglijst, Vragen over &os; dienen gericht te worden aan de &os; Vragen + mailinglijst, freebsd-questions@FreeBSD.org.
-
Mailinglijsten - zijn de primaire ondersteuningskanalen voor gebruikers van FreeBSD, - met verschillende mailinglijsten die verschillende - onderwerpsgebieden behandelen. Er zijn ook verschillende - niet-Engelse mailinglijsten beschikbaar.
+
Mailinglijsten zijn + de primaire ondersteuningskanalen voor gebruikers van &os;, met + verschillende mailinglijsten die verschillende onderwerpsgebieden + behandelen. Er zijn ook verschillende niet-Engelstalige mailinglijsten + beschikbaar.

Vragen over de inhoud van deze webserver...

Vragen of opmerkingen over onze documentatie (Handboek, + href="&base;/doc/nl_NL.ISO8859-1/books/handbook/index.html">Handboek, FAQ, Boeken & artikelen) dienen gericht - te worden aan de FreeBSD Documentatie Project mailinglijst, freebsd-doc@FreeBSD.org.

Slakkenpost, telefoon en fax

Voor CDROM-bestellingen: The - FreeBSD Mall
+ &os; Mall

Voor commerciële ondersteuning: The FreeBSD Mall
+ href="http://www.freebsdmall.com/">The &os; Mall
-
- Wie is waarvoor verantwoordelijk
+
Wie is waarvoor + verantwoordelijk
-
Public Relations & Corporate Liaison, Veiligheidsofficier, - Postmaster, Webmaster etc.
+
Publieke Relaties & Bedrijfsrelaties, Beveiligingsofficier, + Postmeester, Webmaster etc.
&footer; - + January-March @@ -19,7 +19,7 @@ Virtual Memory subsystem. The FreeBSD Kernel Virtual Address space has been increased to 6GB on amd64. An updated jail(8) subsystem that supports multi-IPv4/IPv6/noIP and much more. Lots of FreeBSD - Developers are in Ottawa, Canada attending The FreeBSD Developer + Developers are in Ottawa, Canada attending the FreeBSD Developer Summit that is before BSDCan. BSDCan officially starts tomorrow and should cover lots of interesting topics, see the BSDCan Website @@ -98,7 +98,7 @@
We continue to classify PRs as they arrive, with 'tags' - corresponding to the kernel subsystem, or man page referencesfor + corresponding to the kernel subsystem, or man page references for userland PRs. These tags, in turn, produce lists of PRs sorted both - 'customised reports for developers' + 'customized reports for developers' announced in the last status report.
@@ -132,7 +132,7 @@ currently exist but which would be beneficial are welcomed.

Mark Linimon also continues attempting to define the general - problem and investigating possible new workflow models, and will be + problem and investigating possible new work flow models, and will be presenting on the subject at BSDCan.

The list of @@ -140,15 +140,15 @@ href="http://people.freebsd.org/~linimon/studies/prs/recommended_prs.html"> PRs recommended for committer evaluation - by the bugbusting team continues to receive new additions. This - list contains PRs, mostly with patches, that the bugbusting team + by the BugBusting team continues to receive new additions. This + list contains PRs, mostly with patches, that the BugBusting team feel are probably ready to be committed as-is, or are probably trivially resolved in the hands of a committer with knowledge of the particular subsystem. All committers are invited to take a look at this list whenever they have a spare 5 minutes and wish to close a PR.
-
Since the last status report, the number of open bugs has +
Since the last status report, the number of open bugs continued to hover around the 5600 mark, although has began to rise with the 7.2 ports freeze.
@@ -169,7 +169,7 @@ and for what we intend to do next. Define new categories, classifications, and states for PRs, - that will better match our workflow (in progress). + that will better match our work flow (in progress). @@ -370,7 +370,7 @@
-
In Februay 2009 the German version of the FreeBSD Developer's +
In February 2009 the German version of the FreeBSD Developer's handbook went online. Additionally we managed to update large areas of the FAQ thanks to the contributions of Benedict Reuschling.
@@ -558,7 +558,7 @@ other people) released FreeBSD 7.2 on May 4th, 2009. During this period we have also begun reminding developers of the upcoming FreeBSD 8.0 release cycle which is scheduled to begin in early June - 2009 with release targetted at early September 2009.
+ 2009 with release targeted at early September 2009.
@@ -654,8 +654,8 @@
Sysinfo - a shell script which purpose is to automatically gather system - information and document hardware and software configuration of the + is a shell script, the purpose of which is to automatically gather system + information and document the hardware and software configuration of the given host system. The goal is to provide a system operator with descriptive information about an unknown FreeBSD installation.
@@ -719,7 +719,7 @@
There is on-going work to allow "options MAC" to be included in - the GENERIC kernel for 8.0 This primarily consists of performance + the GENERIC kernel for 8.0. This primarily consists of performance work to reduce overhead when policies are used, and eliminate when none are configured. Work to date includes:
@@ -774,8 +774,8 @@ 7.2-RC1. Additionally, as of r191076 machfb(4) has been fixed to work with UltraSPARC III and beyond, that fix unfortunately did not make it into 7.2-RC1 but will be in the final version. The X.Org - 7.4 and firefox ports as well as some other gecko-based ones like - seamonkey once again have been fixed to also work and package on + 7.4 and Firefox ports as well as some other gecko-based ones like + Seamonkey once again have been fixed to also work and package on sparc64, including on UltraSPARC III and UltraSPARC IIIi based machines equipped with cards driven by creator(4) or machfb(4). The driver for the Sun Cassini/Cassini+ as well as National @@ -901,7 +901,7 @@ - Vbox first Screenshots + VirtualBox first Screenshots @@ -910,18 +910,17 @@
After the first mail from Alexander Eichner on the vbox-dev - mailinglist, we started the work on a virtualbox port. 6 Days was - needed to get virtualbox to start with over 20 patches. We'd like - to say thanks to Alexander Eichner all vbox developers, Gustau - Perez and Ulf Lilleengen. If you like to play with the current port - you can checkout the port - - here + here. - . Please do not ping us about any problems we know about a lot and - still working to get all solved befor we officel call for - testing.
+ Please do not ping us about any problems, we know about a lot and + are still working to get them all solved before we do an official + call for testing.
==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#23 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.6 2009/05/05 17:08:47 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.7 2009/05/08 11:54:02 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#12 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.59 2009/03/28 19:05:11 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.60 2009/05/09 18:27:51 jkois Exp $ @@ -359,17 +359,17 @@ - - Core Digital - http://www.core-digital.com + + Core Software + http://www.coresoftware.net.au - Core Digital is based in Perth, Western Australia. We are a + Core Software is based in Perth, Western Australia. We are a consulting company specializing in OpenBSD, FreeBSD, Linux and Windows. We work with firewalls, Virtual Private Networks, Database Servers, Email and Web Servers, Security, WAN/LAN implementations, - Multi OS networks. For more information please contact info@core-digital.com or - visit our website. + Multi OS networks. You can contact us here or visit + our website. ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#55 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.249 2009/05/07 18:30:05 brd Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.254 2009/05/11 07:40:46 murray Exp $ @@ -36,6 +36,105 @@ 5 + 10 + + + Google Summer of Code Projects Announced + +
The FreeBSD Project again received many high quality + applications from students participating + in Google's Summer of + Code program. This year 20 student proposals were + accepted to work with the FreeBSD Project as part of this + program. For those with projects that were not accepted + this year, we'd like to note that the FreeBSD Project is + always willing to help mentor students so they can learn + more about operating system development through our normal + community mailing lists and development forums.
+ +
The complete list of student projects selected for funding + is : + +
+
Aditya Sarawgi, Improving + Second Extended File system (ext2fs) and making it GPL free + (Mentor: Ulf Lilleengen) +
Alejandro Pulver, Ports license + infrastructure (part 2: integration) + (Mentor: Erwin Lansing) +
Ana Kukec, IPv6 Secure Neighbor Discovery + - native kernel APIs for FreeBSD + (Mentor: Bjoern Zeeb) +
David Forsythe, Package + tools rewrite via a new package library, with new + features (Mentor: Tim Kientzle) +
Edward Tomasz Napierala, Hierarchical + Resource Limits + (Mentor: Brooks Davis) +
Fabio Checconi, Geom-based + Disk Schedulers (Mentor: Luigi Rizzo) +
Fang Wang, Implement TCP UTO + (Mentor: Rui Paulo) +
G�bor K�vesd�n, BSD-licensed + libiconv in base system + (Mentor: Xin Li) +
Gleb Kurtsov, In + kernel stackable cryptographic filesystem (pefs) + (Mentor: Stanislav Sedov) +
Ilias Marinos, Application-Specific + Audit Trails + (Mentor: Robert Watson) +
Marta Carbone, Ipfw + and dummynet improvements (Mentor: Luigi Rizzo) +
Nikhil Bysani, Porting NetworkManager to FreeBSD + (Mentor: Ed Schouten) +
P�li G�bor J�nos, Design + and Implementation of Subsystem Support Libraries for Monitoring + and Management + (Mentor: Oleksandr Tymoshenko) +
Prashant Vaibhav, Reworking + the callout scheme: towards a tickless kernel + (Mentor: Ed Maste) +
Satish Srinivasan, TrustedBSD + Audit: Developing BSD licensed tools for importing, exporting + from/to Linux audit log format and BSM + (Mentor: Stacey Son) +
Sylvestre Gallon, USB + improvements under FreeBSD + (Mentor: Philip Paeps) +
Tatsiana Elavaya, ipfw ruleset optimization and + highlevel rule definition language + (Mentor: Diomidis Spinellis) +
Tatsiana Severyna, puffs + (pass-to-userspace framework file system) port for + FreeBSD (Mentor: Konstantin Belousov) +
Zachariah Riggle, TCP\IP + Regression Testing Suite + (Mentor: George Neville Neil) +
Zhao Shuai, FIFO + Optimizations + (Mentor: John Baldwin) +
+
+ +
The Summer + of Code wiki contains additional information about + FreeBSD Participation in this program. Coding starts May + 23, so please join us in welcoming the 20 new students to + our community.
+ + + + 7 From owner-p4-projects@FreeBSD.ORG Mon May 11 12:09:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A4E0106575F; Mon, 11 May 2009 12:09:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5B051065753 for ; Mon, 11 May 2009 12:09:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D252B8FC18 for ; Mon, 11 May 2009 12:09:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4BC9qrE058056 for ; Mon, 11 May 2009 12:09:52 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4BC9q7Z058054 for perforce@freebsd.org; Mon, 11 May 2009 12:09:52 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 11 May 2009 12:09:52 GMT Message-Id: <200905111209.n4BC9q7Z058054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 161930 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 12:09:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=161930 Change 161930 by pgj@beehive on 2009/05/11 12:09:20 MFen (www): 1.17 -> 1.18 hu/community/mailinglists.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#15 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#15 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -102,7 +102,7 @@
Német — Adminisztráció vagy Keresés. + href="http://www.freebsd.de">Keresés.

Norvég — Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4C021065679; Mon, 11 May 2009 12:52:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72D8F1065677 for ; Mon, 11 May 2009 12:52:36 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 465798FC17 for ; Mon, 11 May 2009 12:52:36 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4BCqaIg071342 for ; Mon, 11 May 2009 12:52:36 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4BCqaVh071340 for perforce@freebsd.org; Mon, 11 May 2009 12:52:36 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Mon, 11 May 2009 12:52:36 GMT Message-Id: <200905111252.n4BCqaVh071340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhaoshuai@FreeBSD.org using -f From: Zhao Shuai To: Perforce Change Reviews Cc: Subject: PERFORCE change 161931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 12:52:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=161931 Change 161931 by zhaoshuai@zhaoshuai on 2009/05/11 12:51:40 coding start :) Affected files ... .. //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 11 20:29:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7236F106566C; Mon, 11 May 2009 20:29:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F64E1065673 for ; Mon, 11 May 2009 20:29:34 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DE4D8FC15 for ; Mon, 11 May 2009 20:29:34 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4BKTYXU029106 for ; Mon, 11 May 2009 20:29:34 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4BKTXF9029104 for perforce@freebsd.org; Mon, 11 May 2009 20:29:33 GMT (envelope-from syl@FreeBSD.org) Date: Mon, 11 May 2009 20:29:33 GMT Message-Id: <200905112029.n4BKTXF9029104@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 161952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 20:29:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=161952 Change 161952 by syl@syl_atuin on 2009/05/11 20:29:11 - Add USB_LIST_EMPTY macro. - Add stuct usb_transfer for implementation of flying_transfers. - Update libusb_exit to deinitialise pollfd and default_context - Update libusb_alloc_transfer to use usb_transfer. - Update libusb_submit_transfer to use flying_transfers. - Implement libusb_wait_for_events. - Implement libusb_get_next_timeout. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#10 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#10 (text+ko) ==== @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include "libusb20.h" #include "libusb20_desc.h" @@ -48,6 +50,8 @@ */ #define USB_LIST_INIT(entry) \ (entry)->prev = (entry)->next = entry; +#define USB_LIST_EMPTY(entry) \ + ((entry)->next = (entry)) #define LIST_ADD(entry, head) \ (entry)->next = (head)->next; \ @@ -92,6 +96,14 @@ struct list_head list; }; +struct usb_transfer { + int num_iso_packets; + struct list_head list; + struct timeval timeout; + int transferred; + uint8_t flags; +}; + void libusb_set_debug(libusb_context * ctx, int level) { @@ -211,8 +223,17 @@ void libusb_exit(libusb_context * ctx) { + usb_remove_pollfd(ctx, ctx->ctrl_pipe[0]); + close(ctx->ctrl_pipe[0]); + close(ctx->ctrl_pipe[1]); + + pthread_mutex_lock(&default_context_lock); + if (ctx == usbi_default_context) { + usbi_default_context = NULL; + } + pthread_mutex_unlock(&default_context_lock); + free(ctx); - return; } /* Device handling and initialisation. */ @@ -635,8 +656,9 @@ struct libusb_transfer *xfer; int len; - len = sizeof(libusb_transfer) + - (iso_packets * sizeof(libusb_iso_packet_descriptor)); + len = sizeof(struct libusb_transfer) + + sizeof(struct usb_transfer) + + (iso_packets * sizeof(libusb_iso_packet_descriptor)); xfer = malloc(len); if (xfer == NULL) @@ -644,6 +666,8 @@ memset(xfer, 0, len); + xfer = (struct libusb_transfer *) ((void *)xfer + + sizeof(struct usb_transfer)); return (xfer); } @@ -672,20 +696,76 @@ libusb_submit_transfer(struct libusb_transfer *xfer) { struct libusb20_transfer *usb20_xfer; + struct usb_transfer *usb_backend; + struct usb_transfer *usb_node; struct libusb20_device *pdev; + struct libusb_context *ctx; + struct timespec cur_ts; + struct timeval *cur_tv; int ret; + if (xfer == NULL) + return (LIBUSB_ERROR_NO_MEM); + + ctx = xfer->dev_handle->dev->ctx; pdev = xfer->dev_handle->os_priv; + + usb_backend = (struct usb_transfer *) ((void *)xfer - + sizeof(struct usb_transfer)); + usb_backend->transferred = 0; + usb_backend->flags = 0; + + /*calculate_timeout*/ + if (xfer->timeout == 0) + return (LIBUSB_ERROR_OTHER); + + ret = clock_gettime(CLOCK_MONOTONIC, &cur_ts); + cur_ts.tv_sec += xfer->timeout / 1000; + cur_ts.tv_nsec += (xfer->timeout % 1000) * 1000000; + if (cur_ts.tv_nsec > 1000000000) { + cur_ts.tv_nsec -= 1000000000; + cur_ts.tv_sec++; + } + TIMESPEC_TO_TIMEVAL(&usb_backend->timeout, &cur_ts); + + /*Add to flying list*/ + pthread_mutex_lock(&ctx->flying_transfers_lock); + if (USB_LIST_EMPTY(&ctx->flying_transfers)) { + LIST_ADD(&usb_backend->list, &ctx->flying_transfers); + goto out; + } + if (timerisset(&usb_backend->timeout)) { + LIST_ADD_TAIL(&usb_backend->list, &ctx->flying_transfers); + goto out; + } + LIST_FOREACH_ENTRY(usb_node, &ctx->flying_transfers, list) { + cur_tv = &usb_node->timeout; + if (timerisset(cur_tv) == 0 || + (cur_tv->tv_sec > usb_backend->timeout.tv_sec) || + (cur_tv->tv_sec == usb_backend->timeout.tv_sec && + cur_tv->tv_usec > usb_backend->timeout.tv_usec)) { + LIST_ADD_TAIL(&usb_backend->list, &usb_node->list); + goto out; + } + } + LIST_ADD_TAIL(&usb_backend->list, &ctx->flying_transfers); + +out: + pthread_mutex_unlock(&ctx->flying_transfers_lock); + + /*libusb20 dependent code*/ GET_XFER(usb20_xfer, xfer->endpoint, pdev); xfer->os_priv = usb20_xfer; ret = libusb20_tr_open(usb20_xfer, xfer->length, xfer->num_iso_packets, xfer->endpoint); - if (ret == LIBUSB20_ERROR_BUSY) - return (LIBUSB_ERROR_BUSY); - if (ret != 0) + if (ret != 0) { + pthread_mutex_lock(&ctx->flying_transfers_lock); + LIST_DEL(&usb_backend->list); + pthread_mutex_unlock(&ctx->flying_transfers_lock); return (LIBUSB_ERROR_OTHER); + } libusb20_tr_set_timeout(usb20_xfer, xfer->timeout); libusb20_tr_set_buffer(usb20_xfer, xfer->buffer, xfer->num_iso_packets); @@ -819,6 +899,31 @@ int libusb_wait_for_event(libusb_context * ctx, struct timeval *tv) { + int ret; + struct timespec ts; + + if (tv == NULL) { + pthread_cond_wait(&ctx->event_waiters_cond, + &ctx->event_waiters_lock); + return (0); + } + + ret = clock_gettime(CLOCK_REALTIME, &ts); + if (ret < 0) + return (LIBUSB_ERROR_OTHER); + + ts.tv_sec = tv->tv_sec; + ts.tv_nsec = tv->tv_usec * 1000; + if (ts.tv_nsec > 1000000000) { + ts.tv_nsec -= 1000000000; + ts.tv_sec++; + } + + ret = pthread_cond_timedwait(&ctx->event_waiters_cond, + &ctx->event_waiters_lock, &ts); + + if (ret == ETIMEDOUT) + return (1); return (0); } @@ -847,7 +952,45 @@ int libusb_get_next_timeout(libusb_context * ctx, struct timeval *tv) { - return (0); + struct usb_transfer *xfer; + struct timeval *next_tv; + struct timeval cur_tv; + struct timespec cur_ts; + int found; + int ret; + + found = 0; + pthread_mutex_lock(&ctx->flying_transfers_lock); + if (USB_LIST_EMPTY(&ctx->flying_transfers)) + return (0); + + LIST_FOREACH_ENTRY(xfer, &ctx->flying_transfers, list) { + if (!(xfer->flags & LIBUSB_TRANSFER_TIMED_OUT)) { + found = 1; + break ; + } + } + pthread_mutex_unlock(&ctx->flying_transfers_lock); + + if (found == 0) { + return 0; + } + + next_tv = &xfer->timeout; + if (timerisset(next_tv) == 0) + return (0); + + ret = clock_gettime(CLOCK_MONOTONIC, &cur_ts); + if (ret < 0) + return (LIBUSB_ERROR_OTHER); + TIMESPEC_TO_TIMEVAL(&cur_tv, &cur_ts); + + if (timercmp(&cur_tv, next_tv, >=)) + timerclear(tv); + else + timersub(next_tv, &cur_tv, tv); + + return (1); } void From owner-p4-projects@FreeBSD.ORG Tue May 12 06:24:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46AE91065678; Tue, 12 May 2009 06:24:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0272C1065674; Tue, 12 May 2009 06:24:44 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232]) by mx1.freebsd.org (Postfix) with ESMTP id AB3D48FC15; Tue, 12 May 2009 06:24:43 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.3/8.14.3) with ESMTP id n4C6NRBJ016437; Tue, 12 May 2009 01:23:28 -0500 (CDT) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.3/8.14.3/Submit) id n4C6NRx8016436; Tue, 12 May 2009 01:23:27 -0500 (CDT) (envelope-from brooks) Date: Tue, 12 May 2009 01:23:27 -0500 From: Brooks Davis To: Marko Zec Message-ID: <20090512062327.GA16196@lor.one-eyed-alien.net> References: <200905082144.n48LiKYP021818@repoman.freebsd.org> <20090509191540.GA85588@lor.one-eyed-alien.net> <200905110405.32580.zec@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ikeVEW9yuYc//A+q" Content-Disposition: inline In-Reply-To: <200905110405.32580.zec@freebsd.org> User-Agent: Mutt/1.5.17 (2007-11-01) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (lor.one-eyed-alien.net [127.0.0.1]); Tue, 12 May 2009 01:23:28 -0500 (CDT) Cc: Brooks Davis , Perforce Change Reviews Subject: Re: PERFORCE change 161793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 06:24:45 -0000 --ikeVEW9yuYc//A+q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, May 11, 2009 at 04:05:32AM +0200, Marko Zec wrote: > On Saturday 09 May 2009 21:15:41 Brooks Davis wrote: > > On Fri, May 08, 2009 at 09:44:20PM +0000, Marko Zec wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=3D161793 > > > > > > Change 161793 by zec@zec_tpx32 on 2009/05/08 21:43:51 > > > > > > A controversial hack: when allocating if_unit numbers for > > > cloning ifnets, do NOT resort to bitmap mappings, but > > > iterate through all existing ifnets in a particular vnet > > > as long as a free unit number is found. > > > > > > The problem here is that we are switchng from a O(n) to > > > a O(n**2) search method with more work being done in each > > > iteration. So this should be revisited RSN. > > > > IMO the best solution for now is to retain the global namespace and > > thus not worry about virtualizing this any more than we do for em0. >=20 > It's not that simple - don't forget that we need to have lo0 in each vnet= due=20 > to expectations from various userland applications. Moreover, users of= =20 > cloning ifnets would expect to get (as an example) vlan0, vlan1, vlan2 wh= en=20 > issuing ifconfig vlan create, not vlan539, vlan1, vlan123 etc. The same = goes=20 > for tunneling interfaces, ng_eiface, ng_iface etc. I think the general= =20 > principle behind vimage / vnets was not to allow for any information leak= ages=20 > between the isolated contexts, and retaining global namespace for cloning= =20 > ifnets would significantly violate that principle. lo0 will need to be an exception, but I'd be inclined to only violate name uniqueness in that case. I agree that there is a longterm argument that vimage instances should look like stand alone machines in the areas that are virtualized, but at this stage of the 8.0 I think we're much better off not attempting to find all the possible edge cases. > > This must not make it in to current since if it did, users with tunnel > > brokers would be very unhappy. >=20 > Precisely for the sake of tunnel brokers, I think each vnet should have i= ts=20 > own namespace for cloning devices - and this has nothing to do with "em0"= or=20 > any other physical ifnet which does not use the if_clone infrastructure. = I=20 > agree that the O(n**2) code for searching for free ifunits should not get= =20 > commited into svn, but Julian and I already discussed how we could virtua= lize=20 > the existing O(n) bitmapped algorithm in if_clone.c, and will try to subm= it=20 Tunnel brokers mostly likely won't care AT ALL what name the interfaces have. They will case that performance will be terrible due to the n^2 algorithm. -- Brooks >=20 > Marko >=20 --ikeVEW9yuYc//A+q Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iD8DBQFKCRXdXY6L6fI4GtQRAiUSAKDMaQx/i2JPNx1zIczBRbWLvON4BQCeNLaP Id+cuGDuyaUzME763kncfEw= =H0/L -----END PGP SIGNATURE----- --ikeVEW9yuYc//A+q-- From owner-p4-projects@FreeBSD.ORG Tue May 12 06:39:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8849D1065675; Tue, 12 May 2009 06:39:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47064106566C for ; Tue, 12 May 2009 06:39:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 35CB48FC1D for ; Tue, 12 May 2009 06:39:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4C6dreI026286 for ; Tue, 12 May 2009 06:39:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4C6drRs026284 for perforce@freebsd.org; Tue, 12 May 2009 06:39:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 12 May 2009 06:39:53 GMT Message-Id: <200905120639.n4C6drRs026284@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 161961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 06:39:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=161961 Change 161961 by hselasky@hselasky_laptop001 on 2009/05/12 06:38:57 USB CORE: - Cancelled error code must be returned in special case, else device drivers might end up in infinite loop. - The special case code was introduced by a recent commit. Bug report by: Andrey Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#144 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#144 (text+ko) ==== @@ -1439,7 +1439,11 @@ /* Check if the device is still alive */ if (info->udev->state < USB_STATE_POWERED) { USB_BUS_LOCK(bus); - usb2_transfer_done(xfer, USB_ERR_NOT_CONFIGURED); + /* + * Must return cancelled error code else + * device drivers can hang. + */ + usb2_transfer_done(xfer, USB_ERR_CANCELLED); USB_BUS_UNLOCK(bus); return; } From owner-p4-projects@FreeBSD.ORG Tue May 12 08:19:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C82E10656AE; Tue, 12 May 2009 08:19:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C739E10656A7 for ; Tue, 12 May 2009 08:19:35 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2EB18FC1D for ; Tue, 12 May 2009 08:19:35 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4C8JZ0B036691 for ; Tue, 12 May 2009 08:19:35 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4C8JYU6036687 for perforce@freebsd.org; Tue, 12 May 2009 08:19:34 GMT (envelope-from zec@fer.hr) Date: Tue, 12 May 2009 08:19:34 GMT Message-Id: <200905120819.n4C8JYU6036687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 08:19:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=161963 Change 161963 by zec@zec_amdx2 on 2009/05/12 08:18:48 IFC @ 161962 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/XENHVM#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#8 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/BWCT#7 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CRB#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-78XXX#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F5XXX#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F6XXX#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/EP80219#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/HL200#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#8 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/NSLU#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_mib.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_mib.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#23 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#35 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#16 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.pc98#11 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/asr/asr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bwi/bwimac.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_multiq.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/snp/snp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/xencons_ring.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsport.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdsocket.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#15 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/PAE#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/XBOX#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/XEN#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/ADM5120#4 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/IDT#6 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/MALTA#4 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/QEMU#3 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/SENTRY5#6 integrate .. //depot/projects/vimage-commit2/src/sys/modules/opensolaris/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/svr4/Makefile#5 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#8 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#43 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_serv.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_impl.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/MPC85XX#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#11 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/_null.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ioctl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ioctl_compat.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#37 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#9 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $ machine amd64 @@ -21,4 +21,4 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR -options FLOWTABLE +options FLOWTABLE ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#14 (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.524 2009/05/01 17:20:16 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -68,7 +68,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.89 2009/03/16 10:36:24 dchagin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $ # # @@ -33,7 +33,7 @@ # # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -153,7 +153,7 @@ # # AGP debugging. # -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -288,7 +288,7 @@ device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath #device ath_rate_amrr # AMRR rate control for ath driver #device ath_rate_onoe # Onoe rate control for ath driver @@ -457,7 +457,7 @@ #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/XENHVM#3 (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/XENHVM,v 1.2 2009/05/06 17:52:38 dfr Exp $ +# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.3 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -69,12 +69,12 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks -options NO_ADAPTIVE_MUTEXES -options NO_ADAPTIVE_RWLOCKS +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -99,7 +99,7 @@ device fdc # Xen HVM support -options XENHVM +options XENHVM device xenpci # ATA and ATAPI devices ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.26 2009/05/07 09:39:20 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.27 2009/05/11 13:50:42 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -96,7 +96,7 @@ typedef struct { l_time_t tv_sec; l_suseconds_t tv_usec; -} __packed l_timeval; +} l_timeval; #define l_fd_set fd_set ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.49 2009/05/07 18:36:47 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.51 2009/05/10 18:43:43 dchagin Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -261,7 +261,17 @@ pos = base + (imgp->args->argc + imgp->args->envc + 2); AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz); + + /* + * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0, + * as it has appeared in the 2.4.0-rc7 first time. + * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), + * glibc falls back to the hard-coded CLK_TCK value when aux entry + * is not present. + * Also see linux_times() implementation. + */ + if (linux_kernver(curthread) >= LINUX_KERNVER_2004000) + AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, stclohz); AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent); AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum); @@ -1125,6 +1135,7 @@ linux_szplatform = roundup(strlen(linux_platform) + 1, sizeof(char *)); linux_osd_jail_register(); + stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_cfata.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.2 2009/04/23 00:00:57 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.3 2009/05/10 11:05:22 stas Exp $"); #include #include @@ -131,9 +131,9 @@ struct resource *r) { - KASSERT(type == SYS_RES_IRQ && *rid == ATA_IRQ_RID, + KASSERT(type == SYS_RES_IRQ && rid == ATA_IRQ_RID, ("[at91_cfata, %d]: illegal resource request (type %u rid %u)", - __LINE__, type, *rid)); + __LINE__, type, rid)); return (0); } ==== //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#5 (text) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.30 2008/11/25 00:14:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.32 2009/05/10 10:32:29 stas Exp $"); #include #include @@ -76,6 +76,12 @@ #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 +/* + * Driver-specific flags. + */ +#define ATE_FLAG_DETACHING 0x01 +#define ATE_FLAG_MULTICAST 0x02 + struct ate_softc { struct ifnet *ifp; /* ifnet pointer */ @@ -100,6 +106,8 @@ eth_rx_desc_t *rx_descs; int use_rmii; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ + int flags; + int if_flags; }; static inline uint32_t @@ -149,6 +157,7 @@ static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int ate_get_mac(struct ate_softc *sc, u_char *eaddr); static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_rxfilter(struct ate_softc *sc); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -238,6 +247,7 @@ ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + sc->if_flags = ifp->if_flags; ether_ifattach(ifp, eaddr); @@ -307,26 +317,39 @@ * of different MAC chips use this method (or the reverse the bits) * method. */ -static void +static int ate_setmcast(struct ate_softc *sc) { uint32_t index; uint32_t mcaf[2]; u_char *af = (u_char *) mcaf; struct ifmultiaddr *ifma; + struct ifnet *ifp; + ifp = sc->ifp; + + if ((ifp->if_flags & IFF_PROMISC) != 0) + return (0); + if ((ifp->if_flags & IFF_ALLMULTI) != 0) { + WR4(sc, ETH_HSL, 0xffffffff); + WR4(sc, ETH_HSH, 0xffffffff); + return (1); + } + + /* + * Compute the multicast hash. + */ mcaf[0] = 0; mcaf[1] = 0; - - IF_ADDR_LOCK(sc->ifp); - TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; af[index >> 3] |= 1 << (index & 7); } - IF_ADDR_UNLOCK(sc->ifp); + IF_ADDR_UNLOCK(ifp); /* * Write the hash to the hash register. This card can also @@ -337,6 +360,7 @@ */ WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); + return (mcaf[0] || mcaf[1]); } static int @@ -763,13 +787,11 @@ else WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII); + ate_rxfilter(sc); + /* - * Turn on the multicast hash, and write 0's to it. + * Turn on MACs and interrupt processing. */ - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_MTI); - WR4(sc, ETH_HSH, 0); - WR4(sc, ETH_HSL, 0); - WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_TE | ETH_CTL_RE); WR4(sc, ETH_IER, ETH_ISR_RCOM | ETH_ISR_TCOM | ETH_ISR_RBNA); @@ -779,7 +801,6 @@ * the byte order is big endian, not little endian, so we have some * swapping to do. Again, if we need it (which I don't think we do). */ - ate_setmcast(sc); /* enable big packets */ WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); @@ -940,35 +961,83 @@ */ } +static void +ate_rxfilter(struct ate_softc *sc) +{ + struct ifnet *ifp; + uint32_t reg; + int enabled; + + KASSERT(sc != NULL, ("[ate, %d]: sc is NULL!", __LINE__)); + ATE_ASSERT_LOCKED(sc); + ifp = sc->ifp; + + /* + * Wipe out old filter settings. + */ + reg = RD4(sc, ETH_CFG); + reg &= ~(ETH_CFG_CAF | ETH_CFG_MTI | ETH_CFG_UNI); + reg |= ETH_CFG_NBC; + sc->flags &= ~ATE_FLAG_MULTICAST; + + /* + * Set new parameters. + */ + if ((ifp->if_flags & IFF_BROADCAST) != 0) + reg &= ~ETH_CFG_NBC; + if ((ifp->if_flags & IFF_PROMISC) != 0) { + reg |= ETH_CFG_CAF; + } else { + enabled = ate_setmcast(sc); + if (enabled != 0) { + reg |= ETH_CFG_MTI; + sc->flags |= ATE_FLAG_MULTICAST; + } + } + WR4(sc, ETH_CFG, reg); +} + static int ateioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ate_softc *sc = ifp->if_softc; struct mii_data *mii; struct ifreq *ifr = (struct ifreq *)data; - int mask, error = 0; + int drv_flags, flags; + int mask, error, enabled; + error = 0; + flags = ifp->if_flags; + drv_flags = ifp->if_drv_flags; switch (cmd) { case SIOCSIFFLAGS: ATE_LOCK(sc); - if ((ifp->if_flags & IFF_UP) == 0 && - ifp->if_drv_flags & IFF_DRV_RUNNING) { + if ((flags & IFF_UP) != 0) { + if ((drv_flags & IFF_DRV_RUNNING) != 0) { + if (((flags ^ sc->if_flags) + & (IFF_PROMISC | IFF_ALLMULTI)) != 0) + ate_rxfilter(sc); + } else { + if ((sc->flags & ATE_FLAG_DETACHING) == 0) + ateinit_locked(sc); + } + } else if ((drv_flags & IFF_DRV_RUNNING) != 0) { ifp->if_drv_flags &= ~IFF_DRV_RUNNING; atestop(sc); - } else { - /* reinitialize card on any parameter change */ - ateinit_locked(sc); } + sc->if_flags = flags; ATE_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: - /* update multicast filter list. */ - ATE_LOCK(sc); - ate_setmcast(sc); - ATE_UNLOCK(sc); - error = 0; + if ((drv_flags & IFF_DRV_RUNNING) != 0) { + ATE_LOCK(sc); + enabled = ate_setmcast(sc); + if (enabled != (sc->flags & ATE_FLAG_MULTICAST)) + ate_rxfilter(sc); + ATE_UNLOCK(sc); + } break; case SIOCSIFMEDIA: ==== //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#8 (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/arm/conf/AVILA,v 1.30 2009/03/30 21:54:39 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $ ident AVILA @@ -99,12 +99,12 @@ device if_bridge device md -device random # Entropy device +device random # Entropy device # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_TDMA device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support @@ -112,12 +112,12 @@ device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -options ATH_DIAGAPI -#options ATH_TX99_DIAG +options ATH_DIAGAPI +#options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -#options AH_DEBUG -#options AH_ASSERT +#options AH_DEBUG +#options AH_ASSERT #device ath_ar5210 #device ath_ar5211 device ath_ar5212 @@ -129,7 +129,7 @@ device ath_rf5413 # device ath_ar5416 -options AH_SUPPORT_AR5416 +options AH_SUPPORT_AR5416 device ath_ar9160 makeoptions WITH_LEGACY ==== //depot/projects/vimage-commit2/src/sys/arm/conf/BWCT#7 (text+ko) ==== @@ -15,13 +15,13 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.10 2009/04/17 22:45:57 ticso Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.11 2009/05/10 00:00:25 kuriyama Exp $ ident BWCT -options VERBOSE_INIT_ARM +options VERBOSE_INIT_ARM -options AT91_BWCT +options AT91_BWCT include "../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints @@ -30,8 +30,8 @@ makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER @@ -43,15 +43,15 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:md0\" #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFSLOCKD #Network Lock Manager -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 @@ -65,7 +65,7 @@ options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options SYSCTL_OMIT_DESCR options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING device loop @@ -83,7 +83,7 @@ #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC device md device at91_twi # TWI: Two Wire Interface ==== //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#4 (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/arm/conf/CAMBRIA,v 1.10 2009/03/30 19:23:49 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.11 2009/05/10 00:00:25 kuriyama Exp $ ident CAMBRIA @@ -68,7 +68,7 @@ device ixpwdog # watchdog timer -options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M +options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M device cfi # flash support device cfid # flash disk support device geom_redboot # redboot fis parser @@ -86,7 +86,7 @@ device cambria_led # 8-LED latch device ata -device atadisk # ATA disk drives +device atadisk # ATA disk drives device avila_ata # Gateworks CF/IDE support device npe # Network Processing Engine @@ -102,12 +102,12 @@ device if_bridge device md -device random # Entropy device +device random # Entropy device # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_TDMA device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support @@ -115,13 +115,13 @@ device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -options ATH_DIAGAPI -#options ATH_TX99_DIAG +options ATH_DIAGAPI +#options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -options AH_DEBUG -#options AH_ASSERT -options AH_PRIVATE_DIAG +options AH_DEBUG +#options AH_ASSERT +options AH_PRIVATE_DIAG #device ath_ar5210 #device ath_ar5211 # @@ -133,7 +133,7 @@ device ath_rf5413 # #device ath_ar5416 -#options AH_SUPPORT_AR5416 # NB: for 11n descriptor format +#options AH_SUPPORT_AR5416 # NB: for 11n descriptor format #device ath_rf2133 #device ath_ar9160 #device ath_ar9280 @@ -142,8 +142,8 @@ # NB: 2 USB 2.0 ports standard device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -#options USB_DEBUG +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +#options USB_DEBUG device ehci device umass device scbus # SCSI bus (required for SCSI) ==== //depot/projects/vimage-commit2/src/sys/arm/conf/CRB#4 (text+ko) ==== @@ -15,16 +15,16 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CRB,v 1.7 2008/11/30 17:53:19 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.8 2009/05/10 00:00:25 kuriyama Exp $ ident CRB options PHYSADDR=0x00000000 -options KERNPHYSADDR=0x00200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options KERNPHYSADDR=0x00200000 +options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -options COUNTS_PER_SEC=400000000 -options STARTUP_PAGETABLE_ADDR=0x00000000 +options COUNTS_PER_SEC=400000000 +options STARTUP_PAGETABLE_ADDR=0x00000000 include "../xscale/i8134x/std.crb" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. @@ -32,9 +32,9 @@ #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale -options HZ=100 -options BREAK_TO_DEBUGGER -#options DEVICE_POLLING +options HZ=100 +options BREAK_TO_DEBUGGER +#options DEVICE_POLLING options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -53,18 +53,18 @@ options PSEUDOFS #Pseudo-filesystem framework options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support -options INTR_FILTER +options INTR_FILTER options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=em0 -options BOOTP_COMPAT -#options PREEMPTION +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=em0 +options BOOTP_COMPAT +#options PREEMPTION device loop device ether #device saarm @@ -75,12 +75,12 @@ device pci device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives +options ATA_STATIC_ID # Static device numbering device "7seg" @@ -93,22 +93,22 @@ # output. Adds ~215k to driver. # Debugging for use in -current -options KDB +options KDB options DDB #Enable the kernel debugger #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -options XSCALE_CACHE_READ_WRITE_ALLOCATE -device md -device random # Entropy device +options XSCALE_CACHE_READ_WRITE_ALLOCATE +device md +device random # Entropy device device iopwdog -options ARM_USE_SMALL_ALLOC +options ARM_USE_SMALL_ALLOC # Floppy drives ==== //depot/projects/vimage-commit2/src/sys/arm/conf/DB-78XXX#5 (text+ko) ==== @@ -1,13 +1,13 @@ # # Custom kernel for Marvell DB-78xx boards. # -# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.4 2008/11/30 17:53:19 sam Exp $ +# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.5 2009/05/10 00:00:25 kuriyama Exp $ # ident DB-88F78XX include "../mv/discovery/std.db78xxx" -options SOC_MV_DISCOVERY +options SOC_MV_DISCOVERY makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -18,34 +18,34 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 12 08:19:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 090EE106576D; Tue, 12 May 2009 08:19:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A40FB1065760 for ; Tue, 12 May 2009 08:19:37 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 825998FC17 for ; Tue, 12 May 2009 08:19:37 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4C8JbKW036700 for ; Tue, 12 May 2009 08:19:37 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4C8JZ38036694 for perforce@freebsd.org; Tue, 12 May 2009 08:19:35 GMT (envelope-from zec@fer.hr) Date: Tue, 12 May 2009 08:19:35 GMT Message-Id: <200905120819.n4C8JZ38036694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 08:19:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=161964 Change 161964 by zec@zec_tpx32 on 2009/05/12 08:19:02 IFC @ 161962 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/XENHVM#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#7 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/BWCT#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CRB#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-78XXX#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-88F5XXX#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-88F6XXX#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/EP80219#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/GUMSTIX#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/HL200#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X#7 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/NSLU#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SKYEYE#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#4 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#4 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#3 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#3 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#4 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#4 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#3 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#3 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_mib.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_mib.h#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#12 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_ioctl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_ttold.c#3 delete .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_ttold.h#3 delete .. //depot/projects/vimage-commit/src/sys/conf/NOTES#17 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#25 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#12 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.pc98#7 integrate .. //depot/projects/vimage-commit/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/asr/asr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/bwi/bwimac.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_multiq.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/snp/snp.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpi.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/console/console.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/console/xencons_ring.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/console/xencons_ring.h#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/vimage-commit/src/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsport.h#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdsocket.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/vimage-commit/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/journal/g_journal.c#8 integrate .. //depot/projects/vimage-commit/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/DEFAULTS#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#13 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/PAE#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/XBOX#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/XEN#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_ioctl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_xenix.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/vimage-commit/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/vimage-commit/src/sys/ia64/conf/NOTES#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_acct.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_default.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/vimage-commit/src/sys/mips/conf/ADM5120#4 integrate .. //depot/projects/vimage-commit/src/sys/mips/conf/IDT#5 integrate .. //depot/projects/vimage-commit/src/sys/mips/conf/MALTA#4 integrate .. //depot/projects/vimage-commit/src/sys/mips/conf/QEMU#4 integrate .. //depot/projects/vimage-commit/src/sys/mips/conf/SENTRY5#5 integrate .. //depot/projects/vimage-commit/src/sys/modules/opensolaris/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/svr4/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#9 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_var.h#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/route6.c#9 integrate .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs.h#7 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/vimage-commit/src/sys/nlm/nlm_prot_impl.c#8 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/conf/MPC85XX#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/_null.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/ioctl.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/ioctl_compat.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/mount.h#6 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#21 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/extattr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_extern.h#4 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_vfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/vm/vnode_pager.c#8 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $ machine amd64 @@ -21,4 +21,4 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR -options FLOWTABLE +options FLOWTABLE ==== //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#13 (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.524 2009/05/01 17:20:16 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -68,7 +68,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#6 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.89 2009/03/16 10:36:24 dchagin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $ # # @@ -33,7 +33,7 @@ # # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -153,7 +153,7 @@ # # AGP debugging. # -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -288,7 +288,7 @@ device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath #device ath_rate_amrr # AMRR rate control for ath driver #device ath_rate_onoe # Onoe rate control for ath driver @@ -457,7 +457,7 @@ #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation ==== //depot/projects/vimage-commit/src/sys/amd64/conf/XENHVM#3 (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/XENHVM,v 1.2 2009/05/06 17:52:38 dfr Exp $ +# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.3 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -69,12 +69,12 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks -options NO_ADAPTIVE_MUTEXES -options NO_ADAPTIVE_RWLOCKS +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -99,7 +99,7 @@ device fdc # Xen HVM support -options XENHVM +options XENHVM device xenpci # ATA and ATAPI devices ==== //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.26 2009/05/07 09:39:20 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.27 2009/05/11 13:50:42 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -96,7 +96,7 @@ typedef struct { l_time_t tv_sec; l_suseconds_t tv_usec; -} __packed l_timeval; +} l_timeval; #define l_fd_set fd_set ==== //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.49 2009/05/07 18:36:47 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.51 2009/05/10 18:43:43 dchagin Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -261,7 +261,17 @@ pos = base + (imgp->args->argc + imgp->args->envc + 2); AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz); + + /* + * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0, + * as it has appeared in the 2.4.0-rc7 first time. + * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), + * glibc falls back to the hard-coded CLK_TCK value when aux entry + * is not present. + * Also see linux_times() implementation. + */ + if (linux_kernver(curthread) >= LINUX_KERNVER_2004000) + AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, stclohz); AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent); AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum); @@ -1125,6 +1135,7 @@ linux_szplatform = roundup(strlen(linux_platform) + 1, sizeof(char *)); linux_osd_jail_register(); + stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else ==== //depot/projects/vimage-commit/src/sys/arm/at91/at91_cfata.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.2 2009/04/23 00:00:57 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.3 2009/05/10 11:05:22 stas Exp $"); #include #include @@ -131,9 +131,9 @@ struct resource *r) { - KASSERT(type == SYS_RES_IRQ && *rid == ATA_IRQ_RID, + KASSERT(type == SYS_RES_IRQ && rid == ATA_IRQ_RID, ("[at91_cfata, %d]: illegal resource request (type %u rid %u)", - __LINE__, type, *rid)); + __LINE__, type, rid)); return (0); } ==== //depot/projects/vimage-commit/src/sys/arm/at91/if_ate.c#5 (text) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.30 2008/11/25 00:14:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.32 2009/05/10 10:32:29 stas Exp $"); #include #include @@ -76,6 +76,12 @@ #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 +/* + * Driver-specific flags. + */ +#define ATE_FLAG_DETACHING 0x01 +#define ATE_FLAG_MULTICAST 0x02 + struct ate_softc { struct ifnet *ifp; /* ifnet pointer */ @@ -100,6 +106,8 @@ eth_rx_desc_t *rx_descs; int use_rmii; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ + int flags; + int if_flags; }; static inline uint32_t @@ -149,6 +157,7 @@ static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int ate_get_mac(struct ate_softc *sc, u_char *eaddr); static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_rxfilter(struct ate_softc *sc); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -238,6 +247,7 @@ ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + sc->if_flags = ifp->if_flags; ether_ifattach(ifp, eaddr); @@ -307,26 +317,39 @@ * of different MAC chips use this method (or the reverse the bits) * method. */ -static void +static int ate_setmcast(struct ate_softc *sc) { uint32_t index; uint32_t mcaf[2]; u_char *af = (u_char *) mcaf; struct ifmultiaddr *ifma; + struct ifnet *ifp; + ifp = sc->ifp; + + if ((ifp->if_flags & IFF_PROMISC) != 0) + return (0); + if ((ifp->if_flags & IFF_ALLMULTI) != 0) { + WR4(sc, ETH_HSL, 0xffffffff); + WR4(sc, ETH_HSH, 0xffffffff); + return (1); + } + + /* + * Compute the multicast hash. + */ mcaf[0] = 0; mcaf[1] = 0; - - IF_ADDR_LOCK(sc->ifp); - TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; af[index >> 3] |= 1 << (index & 7); } - IF_ADDR_UNLOCK(sc->ifp); + IF_ADDR_UNLOCK(ifp); /* * Write the hash to the hash register. This card can also @@ -337,6 +360,7 @@ */ WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); + return (mcaf[0] || mcaf[1]); } static int @@ -763,13 +787,11 @@ else WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII); + ate_rxfilter(sc); + /* - * Turn on the multicast hash, and write 0's to it. + * Turn on MACs and interrupt processing. */ - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_MTI); - WR4(sc, ETH_HSH, 0); - WR4(sc, ETH_HSL, 0); - WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_TE | ETH_CTL_RE); WR4(sc, ETH_IER, ETH_ISR_RCOM | ETH_ISR_TCOM | ETH_ISR_RBNA); @@ -779,7 +801,6 @@ * the byte order is big endian, not little endian, so we have some * swapping to do. Again, if we need it (which I don't think we do). */ - ate_setmcast(sc); /* enable big packets */ WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); @@ -940,35 +961,83 @@ */ } +static void +ate_rxfilter(struct ate_softc *sc) +{ + struct ifnet *ifp; + uint32_t reg; + int enabled; + + KASSERT(sc != NULL, ("[ate, %d]: sc is NULL!", __LINE__)); + ATE_ASSERT_LOCKED(sc); + ifp = sc->ifp; + + /* + * Wipe out old filter settings. + */ + reg = RD4(sc, ETH_CFG); + reg &= ~(ETH_CFG_CAF | ETH_CFG_MTI | ETH_CFG_UNI); + reg |= ETH_CFG_NBC; + sc->flags &= ~ATE_FLAG_MULTICAST; + + /* + * Set new parameters. + */ + if ((ifp->if_flags & IFF_BROADCAST) != 0) + reg &= ~ETH_CFG_NBC; + if ((ifp->if_flags & IFF_PROMISC) != 0) { + reg |= ETH_CFG_CAF; + } else { + enabled = ate_setmcast(sc); + if (enabled != 0) { + reg |= ETH_CFG_MTI; + sc->flags |= ATE_FLAG_MULTICAST; + } + } + WR4(sc, ETH_CFG, reg); +} + static int ateioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ate_softc *sc = ifp->if_softc; struct mii_data *mii; struct ifreq *ifr = (struct ifreq *)data; - int mask, error = 0; + int drv_flags, flags; + int mask, error, enabled; + error = 0; + flags = ifp->if_flags; + drv_flags = ifp->if_drv_flags; switch (cmd) { case SIOCSIFFLAGS: ATE_LOCK(sc); - if ((ifp->if_flags & IFF_UP) == 0 && - ifp->if_drv_flags & IFF_DRV_RUNNING) { + if ((flags & IFF_UP) != 0) { + if ((drv_flags & IFF_DRV_RUNNING) != 0) { + if (((flags ^ sc->if_flags) + & (IFF_PROMISC | IFF_ALLMULTI)) != 0) + ate_rxfilter(sc); + } else { + if ((sc->flags & ATE_FLAG_DETACHING) == 0) + ateinit_locked(sc); + } + } else if ((drv_flags & IFF_DRV_RUNNING) != 0) { ifp->if_drv_flags &= ~IFF_DRV_RUNNING; atestop(sc); - } else { - /* reinitialize card on any parameter change */ - ateinit_locked(sc); } + sc->if_flags = flags; ATE_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: - /* update multicast filter list. */ - ATE_LOCK(sc); - ate_setmcast(sc); - ATE_UNLOCK(sc); - error = 0; + if ((drv_flags & IFF_DRV_RUNNING) != 0) { + ATE_LOCK(sc); + enabled = ate_setmcast(sc); + if (enabled != (sc->flags & ATE_FLAG_MULTICAST)) + ate_rxfilter(sc); + ATE_UNLOCK(sc); + } break; case SIOCSIFMEDIA: ==== //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.30 2009/03/30 21:54:39 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $ ident AVILA @@ -99,12 +99,12 @@ device if_bridge device md -device random # Entropy device +device random # Entropy device # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_TDMA device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support @@ -112,12 +112,12 @@ device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -options ATH_DIAGAPI -#options ATH_TX99_DIAG +options ATH_DIAGAPI +#options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -#options AH_DEBUG -#options AH_ASSERT +#options AH_DEBUG +#options AH_ASSERT #device ath_ar5210 #device ath_ar5211 device ath_ar5212 @@ -129,7 +129,7 @@ device ath_rf5413 # device ath_ar5416 -options AH_SUPPORT_AR5416 +options AH_SUPPORT_AR5416 device ath_ar9160 makeoptions WITH_LEGACY ==== //depot/projects/vimage-commit/src/sys/arm/conf/BWCT#6 (text+ko) ==== @@ -15,13 +15,13 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.10 2009/04/17 22:45:57 ticso Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.11 2009/05/10 00:00:25 kuriyama Exp $ ident BWCT -options VERBOSE_INIT_ARM +options VERBOSE_INIT_ARM -options AT91_BWCT +options AT91_BWCT include "../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints @@ -30,8 +30,8 @@ makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER @@ -43,15 +43,15 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:md0\" #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFSLOCKD #Network Lock Manager -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 @@ -65,7 +65,7 @@ options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options SYSCTL_OMIT_DESCR options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING device loop @@ -83,7 +83,7 @@ #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC device md device at91_twi # TWI: Two Wire Interface ==== //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA#3 (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/arm/conf/CAMBRIA,v 1.10 2009/03/30 19:23:49 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.11 2009/05/10 00:00:25 kuriyama Exp $ ident CAMBRIA @@ -68,7 +68,7 @@ device ixpwdog # watchdog timer -options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M +options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M device cfi # flash support device cfid # flash disk support device geom_redboot # redboot fis parser @@ -86,7 +86,7 @@ device cambria_led # 8-LED latch device ata -device atadisk # ATA disk drives +device atadisk # ATA disk drives device avila_ata # Gateworks CF/IDE support device npe # Network Processing Engine @@ -102,12 +102,12 @@ device if_bridge device md -device random # Entropy device +device random # Entropy device # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_TDMA device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support @@ -115,13 +115,13 @@ device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -options ATH_DIAGAPI -#options ATH_TX99_DIAG +options ATH_DIAGAPI +#options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -options AH_DEBUG -#options AH_ASSERT -options AH_PRIVATE_DIAG +options AH_DEBUG +#options AH_ASSERT +options AH_PRIVATE_DIAG #device ath_ar5210 #device ath_ar5211 # @@ -133,7 +133,7 @@ device ath_rf5413 # #device ath_ar5416 -#options AH_SUPPORT_AR5416 # NB: for 11n descriptor format +#options AH_SUPPORT_AR5416 # NB: for 11n descriptor format #device ath_rf2133 #device ath_ar9160 #device ath_ar9280 @@ -142,8 +142,8 @@ # NB: 2 USB 2.0 ports standard device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -#options USB_DEBUG +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +#options USB_DEBUG device ehci device umass device scbus # SCSI bus (required for SCSI) ==== //depot/projects/vimage-commit/src/sys/arm/conf/CRB#5 (text+ko) ==== @@ -15,16 +15,16 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CRB,v 1.7 2008/11/30 17:53:19 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.8 2009/05/10 00:00:25 kuriyama Exp $ ident CRB options PHYSADDR=0x00000000 -options KERNPHYSADDR=0x00200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options KERNPHYSADDR=0x00200000 +options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -options COUNTS_PER_SEC=400000000 -options STARTUP_PAGETABLE_ADDR=0x00000000 +options COUNTS_PER_SEC=400000000 +options STARTUP_PAGETABLE_ADDR=0x00000000 include "../xscale/i8134x/std.crb" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. @@ -32,9 +32,9 @@ #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale -options HZ=100 -options BREAK_TO_DEBUGGER -#options DEVICE_POLLING +options HZ=100 +options BREAK_TO_DEBUGGER +#options DEVICE_POLLING options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -53,18 +53,18 @@ options PSEUDOFS #Pseudo-filesystem framework options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support -options INTR_FILTER +options INTR_FILTER options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=em0 -options BOOTP_COMPAT -#options PREEMPTION +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=em0 +options BOOTP_COMPAT +#options PREEMPTION device loop device ether #device saarm @@ -75,12 +75,12 @@ device pci device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives +options ATA_STATIC_ID # Static device numbering device "7seg" @@ -93,22 +93,22 @@ # output. Adds ~215k to driver. # Debugging for use in -current -options KDB +options KDB options DDB #Enable the kernel debugger #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -options XSCALE_CACHE_READ_WRITE_ALLOCATE -device md -device random # Entropy device +options XSCALE_CACHE_READ_WRITE_ALLOCATE +device md +device random # Entropy device device iopwdog -options ARM_USE_SMALL_ALLOC +options ARM_USE_SMALL_ALLOC # Floppy drives ==== //depot/projects/vimage-commit/src/sys/arm/conf/DB-78XXX#3 (text+ko) ==== @@ -1,13 +1,13 @@ # # Custom kernel for Marvell DB-78xx boards. # -# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.4 2008/11/30 17:53:19 sam Exp $ +# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.5 2009/05/10 00:00:25 kuriyama Exp $ # ident DB-88F78XX include "../mv/discovery/std.db78xxx" -options SOC_MV_DISCOVERY +options SOC_MV_DISCOVERY makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -18,34 +18,34 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 12 08:22:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A56AA1065670; Tue, 12 May 2009 08:22:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B5A3106566B for ; Tue, 12 May 2009 08:22:42 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3731D8FC08 for ; Tue, 12 May 2009 08:22:42 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4C8MgXX036980 for ; Tue, 12 May 2009 08:22:42 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4C8Met7036974 for perforce@freebsd.org; Tue, 12 May 2009 08:22:40 GMT (envelope-from zec@fer.hr) Date: Tue, 12 May 2009 08:22:40 GMT Message-Id: <200905120822.n4C8Met7036974@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 08:22:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=161965 Change 161965 by zec@zec_imunes on 2009/05/12 08:22:09 IFC @ 161962 Affected files ... .. //depot/projects/vimage/src/share/man/man4/Makefile#8 integrate .. //depot/projects/vimage/src/share/man/man4/iwn.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/iwnfw.4#1 branch .. //depot/projects/vimage/src/share/man/man4/smp.4#2 integrate .. //depot/projects/vimage/src/share/man/man5/fstab.5#2 integrate .. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#9 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#30 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#18 integrate .. //depot/projects/vimage/src/sys/amd64/conf/XENHVM#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#13 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#18 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#12 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#16 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT#9 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/CRB#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-78XXX#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F5XXX#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F6XXX#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/EP80219#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/HL200#8 integrate .. //depot/projects/vimage/src/sys/arm/conf/IQ31244#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#12 integrate .. //depot/projects/vimage/src/sys/arm/conf/NSLU#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/SIMICS#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/SKYEYE#6 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/vimage/src/sys/compat/linux/linux_mib.c#7 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_mib.h#4 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#31 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.h#5 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#20 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/vimage/src/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/vimage/src/sys/conf/NOTES#49 integrate .. //depot/projects/vimage/src/sys/conf/files#67 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#30 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#20 integrate .. //depot/projects/vimage/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/vimage/src/sys/dev/asr/asr.c#7 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#22 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#15 integrate .. //depot/projects/vimage/src/sys/dev/bwi/bwimac.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#16 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#17 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#9 integrate .. //depot/projects/vimage/src/sys/dev/snp/snp.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#48 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#12 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#8 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/xencons_ring.c#4 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#19 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs.h#2 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_var.h#2 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfsport.h#2 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdsocket.c#2 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.h#4 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#7 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs.h#10 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#13 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#13 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#18 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#12 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#10 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#13 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#14 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#8 integrate .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#13 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#33 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#30 integrate .. //depot/projects/vimage/src/sys/i386/conf/PAE#11 integrate .. //depot/projects/vimage/src/sys/i386/conf/XBOX#10 integrate .. //depot/projects/vimage/src/sys/i386/conf/XEN#8 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#14 integrate .. //depot/projects/vimage/src/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/vimage/src/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_acct.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_malloc.c#12 integrate .. //depot/projects/vimage/src/sys/kern/subr_kdb.c#5 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#13 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#22 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_export.c#19 integrate .. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#8 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#22 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#32 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#25 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#24 integrate .. //depot/projects/vimage/src/sys/mips/conf/ADM5120#4 integrate .. //depot/projects/vimage/src/sys/mips/conf/IDT#6 integrate .. //depot/projects/vimage/src/sys/mips/conf/MALTA#4 integrate .. //depot/projects/vimage/src/sys/mips/conf/QEMU#3 integrate .. //depot/projects/vimage/src/sys/mips/conf/SENTRY5#6 integrate .. //depot/projects/vimage/src/sys/modules/opensolaris/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/svr4/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/usb/Makefile#10 integrate .. //depot/projects/vimage/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/zfs/Makefile#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/in_var.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#76 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/route6.c#14 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs.h#9 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#26 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#16 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#16 integrate .. //depot/projects/vimage/src/sys/nlm/nlm_prot_impl.c#10 integrate .. //depot/projects/vimage/src/sys/pc98/conf/DEFAULTS#5 integrate .. //depot/projects/vimage/src/sys/pc98/conf/NOTES#13 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#21 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/MPC85XX#6 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#12 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#13 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#21 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/sys/_null.h#3 integrate .. //depot/projects/vimage/src/sys/sys/ioctl.h#3 integrate .. //depot/projects/vimage/src/sys/sys/ioctl_compat.h#5 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#20 integrate .. //depot/projects/vimage/src/sys/sys/param.h#52 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#22 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/extattr.h#4 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extattr.c#8 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#15 integrate .. //depot/projects/vimage/src/usr.bin/kdump/mkioctls#4 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.447 2009/04/06 12:47:09 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.448 2009/05/09 19:44:23 sam Exp $ MAN= aac.4 \ acpi.4 \ @@ -152,6 +152,7 @@ ispfw.4 \ iwi.4 \ iwn.4 \ + iwnfw.4 \ ixgb.4 \ ixgbe.4 \ jme.4 \ ==== //depot/projects/vimage/src/share/man/man4/iwn.4#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/share/man/man4/iwn.4,v 1.2 2008/05/12 08:53:02 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.4 2009/05/09 19:19:30 sam Exp $ .\" .Dd April 13, 2008 .Os ==== //depot/projects/vimage/src/share/man/man4/smp.4#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/share/man/man4/smp.4,v 1.23 2006/09/18 15:24:19 ru Exp $ +.\" $FreeBSD: src/share/man/man4/smp.4,v 1.24 2009/05/09 20:18:20 ivoras Exp $ .\" -.Dd December 17, 2004 +.Dd May 7, 2008 .Dt SMP 4 .Os .Sh NAME @@ -69,12 +69,63 @@ Setting a bit to 1 will result in the corresponding CPU being disabled. .Pp +The +.Xr sched_ule 4 +scheduler implements CPU topology detection and adjusts the scheduling +algorithms to make better use of modern multi-core CPUs. +The sysctl variable +.Va kern.sched.topology_spec +reflects the detected CPU hardware in a parsable XML format. +The top level XML tag is , which encloses one or more tags +containing data about individual CPU groups. +A CPU group contains CPUs that are detected to be "close" together, usually +by being cores in a single multi-core processor. +Attributes available in a tag are "level", corresponding to the +nesting level of the CPU group and "cache-level", corresponding to the +level of CPU caches shared by the CPUs in the group. +The tag contains the and tags. +The tag describes CPUs in the group. +Its attributes are "count", corresponding to the number of CPUs in the +group and "mask", corresponding to the integer binary mask in which +each bit position set to 1 signifies a CPU belonging to the group. +The contents (CDATA) of the tag is the comma-delimited list +of CPU indexes (derived from the "mask" attribute). +The tag contains special tags (if any) describing the relation +of the CPUs in the group. +The possible flags are currently "HTT" and "SMT", corresponding to +the various implementations of hardware multithreading. +An example topology_spec output for a system consisting of +two quad-core processors is: +.Bd -literal + + + 0, 1, 2, 3, 4, 5, 6, 7 + + + + 0, 1, 2, 3 + + + + 4, 5, 6, 7 + + + + + +.Ed +.Pp +This information is used internally by the kernel to schedule related +tasks on CPUs that are closely grouped together. +.Pp .Fx -supports hyperthreading on Intel CPU's on the i386 platform. +supports hyperthreading on Intel CPU's on the i386 and AMD64 platforms. Since using logical CPUs can cause performance penalties under certain loads, the logical CPUs can be disabled by setting the .Va machdep.hlt_logical_cpus -sysctl to one. +sysctl to one. +Note that this operation is different from the mechanism used by the +.Xr cpuset 1 . .Sh SEE ALSO .Xr mptable 1 , .Xr sysctl 8 , @@ -83,7 +134,11 @@ .Xr mtx_pool 9 , .Xr mutex 9 , .Xr sema 9 , -.Xr sx 9 +.Xr sx 9 , +.Xr rwlock 9 , +.Xr sched_4bsd 4 , +.Xr sched_ule 4 , +.Xr cpuset 1 .Sh HISTORY The .Nm ==== //depot/projects/vimage/src/share/man/man5/fstab.5#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fstab.5 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man5/fstab.5,v 1.31 2008/11/23 19:52:56 keramida Exp $ +.\" $FreeBSD: src/share/man/man5/fstab.5,v 1.32 2009/05/11 17:05:41 imp Exp $ .\" .Dd November 23, 2008 .Dt FSTAB 5 @@ -80,8 +80,7 @@ compiled into the kernel; everything else will be automatically loaded at mount time. -(Exception: the UFS family - FFS and LFS cannot -currently be demand-loaded.) +(Exception: the FFS cannot currently be demand-loaded.) Some people still prefer to statically compile other file systems as well. .Pp ==== //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#9 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $ machine amd64 @@ -21,4 +21,4 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR -options FLOWTABLE +options FLOWTABLE ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#30 (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.524 2009/05/01 17:20:16 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -68,7 +68,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/vimage/src/sys/amd64/conf/NOTES#18 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.89 2009/03/16 10:36:24 dchagin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $ # # @@ -33,7 +33,7 @@ # # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -153,7 +153,7 @@ # # AGP debugging. # -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -288,7 +288,7 @@ device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath #device ath_rate_amrr # AMRR rate control for ath driver #device ath_rate_onoe # Onoe rate control for ath driver @@ -457,7 +457,7 @@ #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation ==== //depot/projects/vimage/src/sys/amd64/conf/XENHVM#3 (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/XENHVM,v 1.2 2009/05/06 17:52:38 dfr Exp $ +# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.3 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -69,12 +69,12 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks -options NO_ADAPTIVE_MUTEXES -options NO_ADAPTIVE_RWLOCKS +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -99,7 +99,7 @@ device fdc # Xen HVM support -options XENHVM +options XENHVM device xenpci # ATA and ATAPI devices ==== //depot/projects/vimage/src/sys/amd64/linux32/linux.h#13 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.26 2009/05/07 09:39:20 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.27 2009/05/11 13:50:42 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -96,7 +96,7 @@ typedef struct { l_time_t tv_sec; l_suseconds_t tv_usec; -} __packed l_timeval; +} l_timeval; #define l_fd_set fd_set ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.49 2009/05/07 18:36:47 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.51 2009/05/10 18:43:43 dchagin Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -261,7 +261,17 @@ pos = base + (imgp->args->argc + imgp->args->envc + 2); AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz); + + /* + * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0, + * as it has appeared in the 2.4.0-rc7 first time. + * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), + * glibc falls back to the hard-coded CLK_TCK value when aux entry + * is not present. + * Also see linux_times() implementation. + */ + if (linux_kernver(curthread) >= LINUX_KERNVER_2004000) + AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, stclohz); AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent); AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum); @@ -1125,6 +1135,7 @@ linux_szplatform = roundup(strlen(linux_platform) + 1, sizeof(char *)); linux_osd_jail_register(); + stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else ==== //depot/projects/vimage/src/sys/arm/at91/at91_cfata.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.2 2009/04/23 00:00:57 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.3 2009/05/10 11:05:22 stas Exp $"); #include #include @@ -131,9 +131,9 @@ struct resource *r) { - KASSERT(type == SYS_RES_IRQ && *rid == ATA_IRQ_RID, + KASSERT(type == SYS_RES_IRQ && rid == ATA_IRQ_RID, ("[at91_cfata, %d]: illegal resource request (type %u rid %u)", - __LINE__, type, *rid)); + __LINE__, type, rid)); return (0); } ==== //depot/projects/vimage/src/sys/arm/at91/if_ate.c#12 (text) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.30 2008/11/25 00:14:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.32 2009/05/10 10:32:29 stas Exp $"); #include #include @@ -76,6 +76,12 @@ #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 +/* + * Driver-specific flags. + */ +#define ATE_FLAG_DETACHING 0x01 +#define ATE_FLAG_MULTICAST 0x02 + struct ate_softc { struct ifnet *ifp; /* ifnet pointer */ @@ -100,6 +106,8 @@ eth_rx_desc_t *rx_descs; int use_rmii; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ + int flags; + int if_flags; }; static inline uint32_t @@ -149,6 +157,7 @@ static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int ate_get_mac(struct ate_softc *sc, u_char *eaddr); static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_rxfilter(struct ate_softc *sc); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -238,6 +247,7 @@ ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + sc->if_flags = ifp->if_flags; ether_ifattach(ifp, eaddr); @@ -307,26 +317,39 @@ * of different MAC chips use this method (or the reverse the bits) * method. */ -static void +static int ate_setmcast(struct ate_softc *sc) { uint32_t index; uint32_t mcaf[2]; u_char *af = (u_char *) mcaf; struct ifmultiaddr *ifma; + struct ifnet *ifp; + ifp = sc->ifp; + + if ((ifp->if_flags & IFF_PROMISC) != 0) + return (0); + if ((ifp->if_flags & IFF_ALLMULTI) != 0) { + WR4(sc, ETH_HSL, 0xffffffff); + WR4(sc, ETH_HSH, 0xffffffff); + return (1); + } + + /* + * Compute the multicast hash. + */ mcaf[0] = 0; mcaf[1] = 0; - - IF_ADDR_LOCK(sc->ifp); - TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; af[index >> 3] |= 1 << (index & 7); } - IF_ADDR_UNLOCK(sc->ifp); + IF_ADDR_UNLOCK(ifp); /* * Write the hash to the hash register. This card can also @@ -337,6 +360,7 @@ */ WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); + return (mcaf[0] || mcaf[1]); } static int @@ -763,13 +787,11 @@ else WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII); + ate_rxfilter(sc); + /* - * Turn on the multicast hash, and write 0's to it. + * Turn on MACs and interrupt processing. */ - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_MTI); - WR4(sc, ETH_HSH, 0); - WR4(sc, ETH_HSL, 0); - WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_TE | ETH_CTL_RE); WR4(sc, ETH_IER, ETH_ISR_RCOM | ETH_ISR_TCOM | ETH_ISR_RBNA); @@ -779,7 +801,6 @@ * the byte order is big endian, not little endian, so we have some * swapping to do. Again, if we need it (which I don't think we do). */ - ate_setmcast(sc); /* enable big packets */ WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); @@ -940,35 +961,83 @@ */ } +static void +ate_rxfilter(struct ate_softc *sc) +{ + struct ifnet *ifp; + uint32_t reg; + int enabled; + + KASSERT(sc != NULL, ("[ate, %d]: sc is NULL!", __LINE__)); + ATE_ASSERT_LOCKED(sc); + ifp = sc->ifp; + + /* + * Wipe out old filter settings. + */ + reg = RD4(sc, ETH_CFG); + reg &= ~(ETH_CFG_CAF | ETH_CFG_MTI | ETH_CFG_UNI); + reg |= ETH_CFG_NBC; + sc->flags &= ~ATE_FLAG_MULTICAST; + + /* + * Set new parameters. + */ + if ((ifp->if_flags & IFF_BROADCAST) != 0) + reg &= ~ETH_CFG_NBC; + if ((ifp->if_flags & IFF_PROMISC) != 0) { + reg |= ETH_CFG_CAF; + } else { + enabled = ate_setmcast(sc); + if (enabled != 0) { + reg |= ETH_CFG_MTI; + sc->flags |= ATE_FLAG_MULTICAST; + } + } + WR4(sc, ETH_CFG, reg); +} + static int ateioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ate_softc *sc = ifp->if_softc; struct mii_data *mii; struct ifreq *ifr = (struct ifreq *)data; - int mask, error = 0; + int drv_flags, flags; + int mask, error, enabled; + error = 0; + flags = ifp->if_flags; + drv_flags = ifp->if_drv_flags; switch (cmd) { case SIOCSIFFLAGS: ATE_LOCK(sc); - if ((ifp->if_flags & IFF_UP) == 0 && - ifp->if_drv_flags & IFF_DRV_RUNNING) { + if ((flags & IFF_UP) != 0) { + if ((drv_flags & IFF_DRV_RUNNING) != 0) { + if (((flags ^ sc->if_flags) + & (IFF_PROMISC | IFF_ALLMULTI)) != 0) + ate_rxfilter(sc); + } else { + if ((sc->flags & ATE_FLAG_DETACHING) == 0) + ateinit_locked(sc); + } + } else if ((drv_flags & IFF_DRV_RUNNING) != 0) { ifp->if_drv_flags &= ~IFF_DRV_RUNNING; atestop(sc); - } else { - /* reinitialize card on any parameter change */ - ateinit_locked(sc); } + sc->if_flags = flags; ATE_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: - /* update multicast filter list. */ - ATE_LOCK(sc); - ate_setmcast(sc); - ATE_UNLOCK(sc); - error = 0; + if ((drv_flags & IFF_DRV_RUNNING) != 0) { + ATE_LOCK(sc); + enabled = ate_setmcast(sc); + if (enabled != (sc->flags & ATE_FLAG_MULTICAST)) + ate_rxfilter(sc); + ATE_UNLOCK(sc); + } break; case SIOCSIFMEDIA: ==== //depot/projects/vimage/src/sys/arm/conf/AVILA#16 (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/arm/conf/AVILA,v 1.30 2009/03/30 21:54:39 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $ ident AVILA @@ -99,12 +99,12 @@ device if_bridge device md -device random # Entropy device +device random # Entropy device # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_TDMA device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support @@ -112,12 +112,12 @@ device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -options ATH_DIAGAPI -#options ATH_TX99_DIAG +options ATH_DIAGAPI +#options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -#options AH_DEBUG -#options AH_ASSERT +#options AH_DEBUG +#options AH_ASSERT #device ath_ar5210 #device ath_ar5211 device ath_ar5212 @@ -129,7 +129,7 @@ device ath_rf5413 # device ath_ar5416 -options AH_SUPPORT_AR5416 +options AH_SUPPORT_AR5416 device ath_ar9160 makeoptions WITH_LEGACY ==== //depot/projects/vimage/src/sys/arm/conf/BWCT#9 (text+ko) ==== @@ -15,13 +15,13 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.10 2009/04/17 22:45:57 ticso Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.11 2009/05/10 00:00:25 kuriyama Exp $ ident BWCT -options VERBOSE_INIT_ARM +options VERBOSE_INIT_ARM -options AT91_BWCT +options AT91_BWCT include "../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints @@ -30,8 +30,8 @@ makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER @@ -43,15 +43,15 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:md0\" #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFSLOCKD #Network Lock Manager -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 @@ -65,7 +65,7 @@ options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options SYSCTL_OMIT_DESCR options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING device loop @@ -83,7 +83,7 @@ #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC device md device at91_twi # TWI: Two Wire Interface ==== //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#6 (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/arm/conf/CAMBRIA,v 1.10 2009/03/30 19:23:49 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.11 2009/05/10 00:00:25 kuriyama Exp $ ident CAMBRIA @@ -68,7 +68,7 @@ device ixpwdog # watchdog timer -options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M +options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M device cfi # flash support device cfid # flash disk support device geom_redboot # redboot fis parser @@ -86,7 +86,7 @@ device cambria_led # 8-LED latch device ata -device atadisk # ATA disk drives +device atadisk # ATA disk drives device avila_ata # Gateworks CF/IDE support device npe # Network Processing Engine @@ -102,12 +102,12 @@ device if_bridge device md -device random # Entropy device +device random # Entropy device # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_TDMA device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support @@ -115,13 +115,13 @@ device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -options ATH_DIAGAPI -#options ATH_TX99_DIAG +options ATH_DIAGAPI +#options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -options AH_DEBUG -#options AH_ASSERT -options AH_PRIVATE_DIAG +options AH_DEBUG +#options AH_ASSERT +options AH_PRIVATE_DIAG #device ath_ar5210 #device ath_ar5211 # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 12 09:16:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68BF51065673; Tue, 12 May 2009 09:16:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28C081065670 for ; Tue, 12 May 2009 09:16:37 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 165048FC08 for ; Tue, 12 May 2009 09:16:37 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4C9GagM052773 for ; Tue, 12 May 2009 09:16:36 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4C9GaJW052771 for perforce@freebsd.org; Tue, 12 May 2009 09:16:36 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 12 May 2009 09:16:36 GMT Message-Id: <200905120916.n4C9GaJW052771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 161966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 09:16:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=161966 Change 161966 by pgj@beehive on 2009/05/12 09:15:45 IFC Affected files ... .. //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#16 integrate Differences ... ==== //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> From owner-p4-projects@FreeBSD.ORG Tue May 12 12:16:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04E6E1065672; Tue, 12 May 2009 12:16:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6B3B106566C for ; Tue, 12 May 2009 12:16:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A15A58FC13 for ; Tue, 12 May 2009 12:16:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CCGd33070544 for ; Tue, 12 May 2009 12:16:39 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CCGdui070542 for perforce@freebsd.org; Tue, 12 May 2009 12:16:39 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 12 May 2009 12:16:39 GMT Message-Id: <200905121216.n4CCGdui070542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 161970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 12:16:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=161970 Change 161970 by pgj@beehive on 2009/05/12 12:16:11 MFen (www): 1.249 -> 1.254 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#24 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#24 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,130 @@ 5 + 10 + + + Kihirdették az ezévi Google Summer of + Code projekteket + +
A &os; Projekt ebben az évben is rengeteg nagyon + jó pályázatot kapott a Google Summer of Code + programjában résztvenni + kívánó hallgatóktól. A + program részeként ebben az évben a &os; + Projekt részére 20 hallgatói + pályázatot választottak ki + finanszírozásra. Szeretnénk viszont + bíztatni mindenkit, akinek ebben az évben nem + fogadtuk el a beadott pályázatát, hogy + a &os; Projekt a közösségi + levelezési listákon és más + fejlesztõi fórumokon keresztül + továbbra is támogatja az + operációs rendszerek fejlesztése + iránt érdeklõdõ + hallgatókat.
+ +
A következõ hallgatói projektek kaptak + tehát támogatást: + +
+
Aditya Sarawgi, + Az ext2fs támogatás továbbfejlesztése és GPL-mentessé tétele + (Mentor: Ulf Lilleengen)
+ +
Alejandro Pulver, + A portfa licenszelési infrastruktúrája (második rész: integrálás) + (Mentor: Erwin Lansing)
+ +
Ana Kukec, + A környezõ gépek biztonságos felderítése IPv6 alatt — natív API &os; rendszerekre + (Mentor: Bjoern Zeeb)
+ +
David Forsythe, + A csomagkezelõ eszközök újraírása egy új könyvtáron keresztül, sok újítással + (Mentor: Tim Kientzle)
+ +
Edward Tomasz Napierala, + Hierarchikus erõforráskorlátozás + (Mentor: Brooks Davis)
+ +
Fabio Checconi, + GEOM alapú lemezütemezõk + (Mentor: Luigi Rizzo)
+ +
Fang Wang, + A TCP UTO megvalósítása + (Mentor: Rui Paulo)
+ +
Kövesdán Gábor, + BSD licenszû libiconv az alaprendszerben + (Mentor: Xin Li)
+ +
Gleb Kurtsov, + Rendszermagon belül támogatott, halmozható titkosított állományrendszer (pefs) + (Mentor: Stanislav Sedov)
+ +
Ilias Marinos, + Alkalmazásfüggõ biztonsági nyomkövetés + (Mentor: Robert Watson)
+ +
Marta Carbone, + Az IPFW és a dummynet továbbfejlesztése + (Mentor: Luigi Rizzo)
+ +
Nikhil Bysani, + A NetworkManager portolása &os; rendszerekre + (Mentor: Ed Schouten)
+ +
Páli Gábor János, + Segédkönyvtárak tervezése és fejlesztése a különbözõ alrendszerek felügyeletéhez és vezérléséhez + (Mentor: Oleksandr Tymoshenko)
+ +
Prashant Vaibhav, + A idõzített hívási séma átdolgozása: egy lépés a "tickless" rendszermag felé + (Mentor: Ed Maste)
+ +
Satish Srinivasan, + TrustedBSD Audit: Linuxos és BSM formátumú audit naplók konvertálásához BSD licenszû segédprogramok fejlesztése + (Mentor: Stacey Son)
+ +
Sylvestre Gallon, + A &os; USB támogatásának javítása + (Mentor: Philip Paeps)
+ +
Tatsiana Elavaya, + Az IPW szabályrendszerének optimalizációja és egy magasabb szintû szabályleíró nyelv létrehozása + (Mentor: Diomidis Spinellis)
+ +
Tatsiana Severyna, + A puffs (pass-to-userspace framework file system) &os; portja + (Mentor: Konstantin Belousov)
+ +
Zachariah Riggle, + TCP/IP regressziós tesztek + (Mentor: George Neville Neil)
+ +
Zhao Shuai, + FIFO optimalizációk + (Mentor: John Baldwin)
+
+
+ +
A &os; programbeli résztvételérõl + a Summer of + Code Wiki oldalán található + részletesebb információkat. A nagy + nyári kódolás május 23-án + veszi kezdetét, addig köszöntsük + együtt körünkben a programban ezévben + résztvevõ 20 hallgatót!
+ + + + 7 From owner-p4-projects@FreeBSD.ORG Tue May 12 13:00:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 823F51065672; Tue, 12 May 2009 13:00:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 410EB106566C for ; Tue, 12 May 2009 13:00:24 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2FBEB8FC20 for ; Tue, 12 May 2009 13:00:24 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CD0O9R087754 for ; Tue, 12 May 2009 13:00:24 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CD0Oql087752 for perforce@freebsd.org; Tue, 12 May 2009 13:00:24 GMT (envelope-from syl@FreeBSD.org) Date: Tue, 12 May 2009 13:00:24 GMT Message-Id: <200905121300.n4CD0Oql087752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 161971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 13:00:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=161971 Change 161971 by syl@syl_atuin on 2009/05/12 12:59:45 Update libusb-1.0 to allow gammu to compile. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb.h#9 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#11 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb.h#9 (text+ko) ==== @@ -23,8 +23,8 @@ * SUCH DAMAGE. */ -#ifndef _LIBUSB_H_ -#define _LIBUSB_H_ +#ifndef __LIBUSB_H__ +#define __LIBUSB_H__ #include #include @@ -349,21 +349,25 @@ /* Device handling and enumeration */ -ssize_t libusb_get_device_list(libusb_context * ctx, libusb_device *** list); +ssize_t libusb_get_device_list(libusb_context * ctx, libusb_device *** list); void libusb_free_device_list(libusb_device ** list, int unref_devices); uint8_t libusb_get_bus_number(libusb_device * dev); uint8_t libusb_get_device_address(libusb_device * dev); int libusb_get_max_packet_size(libusb_device * dev, unsigned char endpoint); libusb_device *libusb_ref_device(libusb_device * dev); void libusb_unref_device(libusb_device * dev); -int libusb_open(libusb_device * dev, libusb_device_handle ** handle); +int libusb_open(libusb_device * dev, libusb_device_handle ** devh); libusb_device_handle *libusb_open_device_with_vid_pid(libusb_context * ctx, uint16_t vendor_id, uint16_t product_id); -void libusb_close(libusb_device_handle * dev_handle); -libusb_device *libusb_get_device(libusb_device_handle * dev_handle); -int libusb_get_configuration(libusb_device_handle * dev, int *config); -int libusb_set_configuration(libusb_device_handle * dev, int configuration); -int libusb_claim_interface(libusb_device_handle * dev, int interface_number); -int libusb_release_interface(libusb_device_handle * dev, int interface_number); +void libusb_close(libusb_device_handle * devh); +libusb_device *libusb_get_device(libusb_device_handle * devh); +int libusb_get_configuration(libusb_device_handle * devh, int *config); +int libusb_set_configuration(libusb_device_handle * devh, int configuration); +int libusb_claim_interface(libusb_device_handle * devh, int interface_number); +int libusb_release_interface(libusb_device_handle * devh, int interface_number); +int libusb_kernel_driver_active(libusb_device_handle * devh, int interface); +int libusb_detach_kernel_driver(libusb_device_handle * devh, int interface); +int libusb_attach_kernel_driver(libusb_device_handle * devh, int interface); +int libusb_set_interface_alt_setting(libusb_device_handle * devh, int interface_number, int alternate_setting); /* USB Descriptors */ @@ -401,9 +405,9 @@ /* Synchronous device I/O */ -int libusb_control_transfer(libusb_device_handle * dev_handle, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout); -int libusb_bulk_transfer(struct libusb_device_handle *dev_handle, unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout); -int libusb_interrupt_transfer(struct libusb_device_handle *dev_handle, unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout); +int libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout); +int libusb_bulk_transfer(struct libusb_device_handle *devh, unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout); +int libusb_interrupt_transfer(struct libusb_device_handle *devh, unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout); #if 0 { /* indent fix */ @@ -413,4 +417,4 @@ #endif -#endif /* _LIBUSB_H_ */ +#endif /* __LIBUSB_H__ */ ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#11 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue May 12 13:20:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6101A1065670; Tue, 12 May 2009 13:20:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 236D2106566B for ; Tue, 12 May 2009 13:20:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1282A8FC1C for ; Tue, 12 May 2009 13:20:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CDKiro090372 for ; Tue, 12 May 2009 13:20:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CDKik6090370 for perforce@freebsd.org; Tue, 12 May 2009 13:20:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 12 May 2009 13:20:44 GMT Message-Id: <200905121320.n4CDKik6090370@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 161973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 13:20:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=161973 Change 161973 by hselasky@hselasky_laptop001 on 2009/05/12 13:19:53 USB storage: - umass quirks from Lucius Windschuh PR: usb/134476 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#55 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#15 (text+ko) ==== @@ -396,6 +396,10 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS }, + {USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU6390, RID_WILDCARD, + UMASS_PROTO_DEFAULT, + NO_SYNCHRONIZE_CACHE + }, {USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_UMCR_9361, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_GETMAXLUN @@ -428,6 +432,10 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, FORCE_SHORT_INQUIRY | NO_START_STOP | IGNORE_RESIDUE }, + {USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_XX6830XX, RID_WILDCARD, + UMASS_PROTO_DEFAULT, + NO_GETMAXLUN | NO_SYNCHRONIZE_CACHE + }, {USB_VENDOR_DESKNOTE, USB_PRODUCT_DESKNOTE_UCR_61S2B, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#55 (text+ko) ==== @@ -818,6 +818,7 @@ product ALCOR UMCR_9361 0x9361 USB Multimedia Card Reader product ALCOR SM_KBD 0x9410 MicroConnectors/StrongMan Keyboard product ALCOR NEC_KBD_HUB 0x9472 NEC Kbd Hub +product ALCOR AU6390 0x6390 AU6390 USB-IDE converter /* Altec Lansing products */ product ALTEC ADA70 0x0070 ADA70 Speakers @@ -1107,6 +1108,7 @@ product CYPRESS FMRADIO 0x1002 FM Radio product CYPRESS USBRS232 0x5500 USB-RS232 Interface product CYPRESS SLIM_HUB 0x6560 Slim Hub +product CYPRESS XX6830XX 0x6830 PATA Storage Device /* Daisy Technology products */ product DAISY DMC 0x6901 USB MultiMedia Reader From owner-p4-projects@FreeBSD.ORG Tue May 12 13:54:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB07F1065672; Tue, 12 May 2009 13:54:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A95B2106566B for ; Tue, 12 May 2009 13:54:21 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 967A38FC14 for ; Tue, 12 May 2009 13:54:21 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CDsLAK093215 for ; Tue, 12 May 2009 13:54:21 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CDsJ83093209 for perforce@freebsd.org; Tue, 12 May 2009 13:54:19 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Tue, 12 May 2009 13:54:19 GMT Message-Id: <200905121354.n4CDsJ83093209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhaoshuai@FreeBSD.org using -f From: Zhao Shuai To: Perforce Change Reviews Cc: Subject: PERFORCE change 161975 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 13:54:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=161975 Change 161975 by zhaoshuai@zhaoshuai on 2009/05/12 13:54:13 integrate with the main tree Affected files ... .. //depot/projects/soc2009/fifo/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2009/fifo/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/AVILA#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/BWCT#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/CRB#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/EP80219#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/HL200#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/KB920X#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/NSLU#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/soc2009/fifo/sys/arm/include/pmap.h#2 integrate .. //depot/projects/soc2009/fifo/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/soc2009/fifo/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2009/fifo/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/soc2009/fifo/sys/conf/NOTES#2 integrate .. //depot/projects/soc2009/fifo/sys/conf/files#2 integrate .. //depot/projects/soc2009/fifo/sys/conf/files.i386#2 integrate .. //depot/projects/soc2009/fifo/sys/conf/files.pc98#2 integrate .. //depot/projects/soc2009/fifo/sys/conf/kern.post.mk#2 integrate .. //depot/projects/soc2009/fifo/sys/conf/options#2 integrate .. //depot/projects/soc2009/fifo/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/soc2009/fifo/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/soc2009/fifo/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/soc2009/fifo/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/asr/asr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/bwi/bitops.h#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/bwimac.c#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/bwimac.h#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/bwiphy.c#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/bwiphy.h#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/bwirf.c#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/bwirf.h#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/if_bwi.c#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/if_bwi_pci.c#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/if_bwireg.h#1 branch .. //depot/projects/soc2009/fifo/sys/dev/bwi/if_bwivar.h#1 branch .. //depot/projects/soc2009/fifo/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/snp/snp.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/usb_wlan.h#2 delete .. //depot/projects/soc2009/fifo/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/soc2009/fifo/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/soc2009/fifo/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/soc2009/fifo/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/bios/apm.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/conf/PAE#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/conf/XBOX#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/conf/XEN#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/isa/clock.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/linux/linux.h#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/xen/clock.c#2 integrate .. //depot/projects/soc2009/fifo/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/soc2009/fifo/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/fifo/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/soc2009/fifo/sys/isa/atrtc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/isa/rtc.h#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/init_sysent.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_linker.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_osd.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/sched_ule.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/subr_witness.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/sys_socket.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/syscalls.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/syscalls.master#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/systrace_args.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/tty.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_export.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/soc2009/fifo/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/soc2009/fifo/sys/mips/conf/IDT#2 integrate .. //depot/projects/soc2009/fifo/sys/mips/conf/MALTA#2 integrate .. //depot/projects/soc2009/fifo/sys/mips/conf/QEMU#2 integrate .. //depot/projects/soc2009/fifo/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/soc2009/fifo/sys/mips/include/pmap.h#2 integrate .. //depot/projects/soc2009/fifo/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/soc2009/fifo/sys/modules/Makefile#2 integrate .. //depot/projects/soc2009/fifo/sys/modules/bwi/Makefile#1 branch .. //depot/projects/soc2009/fifo/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2009/fifo/sys/modules/opensolaris/Makefile#2 integrate .. //depot/projects/soc2009/fifo/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/soc2009/fifo/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/soc2009/fifo/sys/modules/usb/Makefile#2 integrate .. //depot/projects/soc2009/fifo/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/soc2009/fifo/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2009/fifo/sys/net/bpf.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if_bridge.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if_clone.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if_gif.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if_gif.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if_lagg.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if_mib.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/if_var.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net/netisr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/route.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net/vnet.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_superg.c#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_superg.h#2 integrate .. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/icmp6.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/if_ether.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/igmp.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/in.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/in_var.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/ip_input.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet/vinet.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/in6.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/in6.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/in6_mcast.c#1 branch .. //depot/projects/soc2009/fifo/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/mld6.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/mld6.h#1 branch .. //depot/projects/soc2009/fifo/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/nd6.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/route6.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netinet6/vinet6.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netipsec/key.c#2 integrate .. //depot/projects/soc2009/fifo/sys/netipsec/vipsec.h#2 integrate .. //depot/projects/soc2009/fifo/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nlm/nlm_advlock.c#2 integrate .. //depot/projects/soc2009/fifo/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/soc2009/fifo/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/soc2009/fifo/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/fifo/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/soc2009/fifo/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/soc2009/fifo/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/soc2009/fifo/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/soc2009/fifo/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2009/fifo/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_inet6.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/soc2009/fifo/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/soc2009/fifo/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/soc2009/fifo/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/_null.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/buf_ring.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/ioctl.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/jail.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/ktr.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/mount.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/osd.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/param.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/priv.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/proc.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/socketvar.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/syscall.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/syscall.mk#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/sysproto.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/termios.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/ucred.h#2 integrate .. //depot/projects/soc2009/fifo/sys/sys/vimage.h#2 integrate .. //depot/projects/soc2009/fifo/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/soc2009/fifo/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/soc2009/fifo/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/soc2009/fifo/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2009/fifo/sys/vm/vm_fault.c#2 integrate .. //depot/projects/soc2009/fifo/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2009/fifo/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $"); #include "opt_cpu.h" @@ -472,6 +472,22 @@ cpu_feature = regs[3]; cpu_feature2 = regs[2]; + /* + * Clear "Limit CPUID Maxval" bit and get the largest standard CPUID + * function number again if it is set from BIOS. It is necessary + * for probing correct CPU topology later. + * XXX This is only done on the BSP package. + */ + if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high > 0 && cpu_high < 4) { + uint64_t msr; + msr = rdmsr(MSR_IA32_MISC_ENABLE); + if ((msr & 0x400000ULL) != 0) { + wrmsr(MSR_IA32_MISC_ENABLE, msr & ~0x400000ULL); + do_cpuid(0, regs); + cpu_high = regs[0]; + } + } + if (cpu_vendor_id == CPU_VENDOR_INTEL || cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_CENTAUR) { ==== //depot/projects/soc2009/fifo/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -112,7 +112,7 @@ u_long la_stat_ticks; u_long la_prof_ticks; /* Include IDT_SYSCALL to make indexing easier. */ - u_int la_ioint_irqs[APIC_NUM_IOINTS + 1]; + int la_ioint_irqs[APIC_NUM_IOINTS + 1]; } static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -254,6 +254,8 @@ lapics[apic_id].la_lvts[i] = lvts[i]; lapics[apic_id].la_lvts[i].lvt_active = 0; } + for (i = 0; i <= APIC_NUM_IOINTS; i++) + lapics[apic_id].la_ioint_irqs[i] = -1; lapics[apic_id].la_ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL; lapics[apic_id].la_ioint_irqs[APIC_TIMER_INT - APIC_IO_INTS] = IRQ_TIMER; @@ -317,7 +319,7 @@ } /* We don't setup the timer during boot on the BSP until later. */ - if (!(boot && PCPU_GET(cpuid) == 0)) { + if (!(boot && PCPU_GET(cpuid) == 0) && lapic_timer_hz != 0) { KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", lapic_id())); lapic_timer_set_divisor(lapic_timer_divisor); @@ -363,11 +365,15 @@ lapic_setup_clock(void) { u_long value; + int i; /* Can't drive the timer without a local APIC. */ if (lapic == NULL) return (0); + if (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0) + return (0); + /* Start off with a divisor of 2 (power on reset default). */ lapic_timer_divisor = 2; @@ -807,7 +813,7 @@ */ mtx_lock_spin(&icu_lock); for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { - if (lapics[apic_id].la_ioint_irqs[vector] != 0) + if (lapics[apic_id].la_ioint_irqs[vector] != -1) continue; lapics[apic_id].la_ioint_irqs[vector] = irq; mtx_unlock_spin(&icu_lock); @@ -847,7 +853,7 @@ for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { /* Vector is in use, end run. */ - if (lapics[apic_id].la_ioint_irqs[vector] != 0) { + if (lapics[apic_id].la_ioint_irqs[vector] != -1) { run = 0; first = 0; continue; @@ -932,7 +938,7 @@ sched_bind(td, apic_cpuid(apic_id)); thread_unlock(td); mtx_lock_spin(&icu_lock); - lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0; + lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1; mtx_unlock_spin(&icu_lock); thread_lock(td); sched_unbind(td); @@ -944,11 +950,15 @@ u_int apic_idt_to_irq(u_int apic_id, u_int vector) { + int irq; KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && vector <= APIC_IO_INTS + APIC_NUM_IOINTS, ("Vector %u does not map to an IRQ line", vector)); - return (lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]); + irq = lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]; + if (irq < 0) + irq = 0; + return (irq); } #ifdef DDB @@ -974,7 +984,7 @@ db_printf("Interrupts bound to lapic %u\n", apic_id); for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = lapics[apic_id].la_ioint_irqs[i]; - if (irq == 0 || irq == IRQ_SYSCALL) + if (irq == -1 || irq == IRQ_SYSCALL) continue; db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); if (irq == IRQ_TIMER) ==== //depot/projects/soc2009/fifo/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.304 2009/04/29 06:54:40 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.306 2009/05/02 12:20:43 mav Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -57,6 +57,7 @@ #include #include +#include #include #include #include @@ -292,6 +293,10 @@ static void topo_probe(void) { + static int cpu_topo_probed = 0; + + if (cpu_topo_probed) + return; logical_cpus = logical_cpus_mask = 0; if (cpu_high >= 0xb) @@ -299,9 +304,10 @@ else if (cpu_high) topo_probe_0x4(); if (cpu_cores == 0) - cpu_cores = mp_ncpus; + cpu_cores = mp_ncpus > 0 ? mp_ncpus : 1; if (cpu_logical == 0) cpu_logical = 1; + cpu_topo_probed = 1; } struct cpu_group * @@ -313,6 +319,7 @@ * Determine whether any threading flags are * necessry. */ + topo_probe(); if (cpu_logical > 1 && hyperthreading_cpus) cg_flags = CG_FLAG_HTT; else if (cpu_logical > 1) @@ -1118,6 +1125,15 @@ sched_preempt(curthread); /* Nothing to do for AST */ + + if (ipi_bitmap & (1 << IPI_HARDCLOCK)) + hardclockintr(&frame); + + if (ipi_bitmap & (1 << IPI_STATCLOCK)) + statclockintr(&frame); + + if (ipi_bitmap & (1 << IPI_PROFCLOCK)) + profclockintr(&frame); } /* ==== //depot/projects/soc2009/fifo/sys/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $ machine amd64 @@ -21,4 +21,4 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR -options FLOWTABLE +options FLOWTABLE ==== //depot/projects/soc2009/fifo/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.523 2009/04/10 00:40:48 jfv Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -68,7 +68,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. @@ -292,8 +292,10 @@ device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da device ums # Mouse +device rum # Ralink Technology RT2501USB wireless NICs +device uath # Atheros AR5523 wireless NICs device ural # Ralink Technology RT2500USB wireless NICs -device rum # Ralink Technology RT2501USB wireless NICs +device zyd # ZyDAS zb1211/zb1211b wireless NICs device urio # Diamond Rio 500 MP3 player # USB Serial devices device uark # Technologies ARK3116 based serial adapters ==== //depot/projects/soc2009/fifo/sys/amd64/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.89 2009/03/16 10:36:24 dchagin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $ # # @@ -33,7 +33,7 @@ # # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -153,7 +153,7 @@ # # AGP debugging. # -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -288,7 +288,7 @@ device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath #device ath_rate_amrr # AMRR rate control for ath driver #device ath_rate_onoe # Onoe rate control for ath driver @@ -457,7 +457,7 @@ #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation ==== //depot/projects/soc2009/fifo/sys/amd64/conf/XENHVM#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/XENHVM,v 1.1 2009/03/11 15:30:12 dfr Exp $ +# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.3 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -69,10 +69,12 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -97,7 +99,7 @@ device fdc # Xen HVM support -options XENHVM +options XENHVM device xenpci # ATA and ATAPI devices ==== //depot/projects/soc2009/fifo/sys/amd64/include/apicvar.h#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/include/apicvar.h,v 1.28 2009/03/17 00:48:11 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.29 2009/05/02 12:20:43 mav Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -126,7 +126,10 @@ /* IPIs handled by IPI_BITMAPED_VECTOR (XXX ups is there a better place?) */ #define IPI_AST 0 /* Generate software trap. */ #define IPI_PREEMPT 1 -#define IPI_BITMAP_LAST IPI_PREEMPT +#define IPI_HARDCLOCK 2 +#define IPI_STATCLOCK 3 +#define IPI_PROFCLOCK 4 +#define IPI_BITMAP_LAST IPI_PROFCLOCK #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST) #define IPI_STOP (APIC_IPI_INTS + 7) /* Stop CPU until restarted. */ ==== //depot/projects/soc2009/fifo/sys/amd64/include/clock.h#2 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.61 2008/10/21 00:38:00 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.63 2009/05/03 17:47:21 mav Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -15,7 +15,6 @@ * XXX large parts of the driver and its interface are misplaced. */ extern int clkintr_pending; -extern int statclock_disable; extern u_int i8254_freq; extern int i8254_max_count; extern uint64_t tsc_freq; @@ -24,6 +23,12 @@ void i8254_init(void); +struct trapframe; + +int hardclockintr(struct trapframe *frame); +int statclockintr(struct trapframe *frame); +int profclockintr(struct trapframe *frame); + /* * Driver to clock driver interface. */ ==== //depot/projects/soc2009/fifo/sys/amd64/include/pcpu.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/pcpu.h,v 1.53 2009/04/01 13:09:26 kib Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.54 2009/05/06 17:48:39 dfr Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -75,7 +75,7 @@ /* Pointer to the CPU LDT descriptor */ \ struct system_segment_descriptor *pc_ldt; \ /* Pointer to the CPU TSS descriptor */ \ - struct system_segment_descriptor *pc_tss + struct system_segment_descriptor *pc_tss \ PCPU_XEN_FIELDS #ifdef _KERNEL ==== //depot/projects/soc2009/fifo/sys/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.243 2008/04/22 19:38:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.246 2009/05/03 17:47:21 mav Exp $"); /* * Routines to handle clock hardware. @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -62,6 +63,7 @@ #include #include #include +#include #include #ifdef DEV_ISA @@ -74,7 +76,6 @@ int clkintr_pending; static int pscnt = 1; static int psdiv = 1; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 12 14:20:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C271065670; Tue, 12 May 2009 14:20:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AFD8106566C for ; Tue, 12 May 2009 14:20:48 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 709938FC1D for ; Tue, 12 May 2009 14:20:48 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CEKmRY098588 for ; Tue, 12 May 2009 14:20:48 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CEKmsw098586 for perforce@freebsd.org; Tue, 12 May 2009 14:20:48 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Tue, 12 May 2009 14:20:48 GMT Message-Id: <200905121420.n4CEKmsw098586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhaoshuai@FreeBSD.org using -f From: Zhao Shuai To: Perforce Change Reviews Cc: Subject: PERFORCE change 161976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 14:20:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=161976 Change 161976 by zhaoshuai@zhaoshuai on 2009/05/12 14:20:26 add some files which is needed when building kernel Affected files ... .. //depot/projects/soc2009/fifo/Makefile#1 add .. //depot/projects/soc2009/fifo/Makefile.inc1#1 add .. //depot/projects/soc2009/fifo/sys/i386/conf/MYKERNEL#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 12 14:46:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4DB11065674; Tue, 12 May 2009 14:45:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 769A8106566B; Tue, 12 May 2009 14:45:59 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from pele.citylink.co.nz (pele.citylink.co.nz [202.8.44.226]) by mx1.freebsd.org (Postfix) with ESMTP id 361C78FC08; Tue, 12 May 2009 14:45:59 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by pele.citylink.co.nz (Postfix) with ESMTP id 9074EFF4D; Wed, 13 May 2009 02:27:23 +1200 (NZST) X-Virus-Scanned: Debian amavisd-new at citylink.co.nz Received: from pele.citylink.co.nz ([127.0.0.1]) by localhost (pele.citylink.co.nz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IZBDVXuyb5jd; Wed, 13 May 2009 02:27:18 +1200 (NZST) Received: from citylink.fud.org.nz (unknown [202.8.44.45]) by pele.citylink.co.nz (Postfix) with ESMTP; Wed, 13 May 2009 02:27:18 +1200 (NZST) Received: by citylink.fud.org.nz (Postfix, from userid 1001) id 53E8711432; Wed, 13 May 2009 02:27:18 +1200 (NZST) Date: Tue, 12 May 2009 07:27:18 -0700 From: Andrew Thompson To: Hans Petter Selasky Message-ID: <20090512142718.GI45375@citylink.fud.org.nz> References: <200905120639.n4C6drRs026284@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200905120639.n4C6drRs026284@repoman.freebsd.org> User-Agent: Mutt/1.5.17 (2007-11-01) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 161961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 14:46:00 -0000 On Tue, May 12, 2009 at 06:39:53AM +0000, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=161961 > > Change 161961 by hselasky@hselasky_laptop001 on 2009/05/12 06:38:57 > > > USB CORE: > - Cancelled error code must be returned in special > case, else device drivers might end up in infinite loop. > - The special case code was introduced by a recent commit. > > Bug report by: Andrey > > Affected files ... > > .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#144 edit > > Differences ... > > ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#144 (text+ko) ==== > > @@ -1439,7 +1439,11 @@ > /* Check if the device is still alive */ > if (info->udev->state < USB_STATE_POWERED) { > USB_BUS_LOCK(bus); > - usb2_transfer_done(xfer, USB_ERR_NOT_CONFIGURED); > + /* > + * Must return cancelled error code else > + * device drivers can hang. > + */ > + usb2_transfer_done(xfer, USB_ERR_CANCELLED); > USB_BUS_UNLOCK(bus); > return; > } I rather think this is a bug in the drivers, they blindly resubmit the transfer without knowing if the error is restartable. Andew From owner-p4-projects@FreeBSD.ORG Tue May 12 15:59:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E5E11065673; Tue, 12 May 2009 15:59:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D23861065670 for ; Tue, 12 May 2009 15:59:50 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe01.swip.net [212.247.154.1]) by mx1.freebsd.org (Postfix) with ESMTP id 40C558FC12 for ; Tue, 12 May 2009 15:59:50 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=PNk-2GfCM84A:10 a=j+k/Ze5hWUCaCztCgEjzDQ==:17 a=6I5d2MoRAAAA:8 a=pGLkceISAAAA:8 a=DZS4klXWeaC5DWzOUSIA:9 a=65qNvJ2X3gPX_eTnpDkA:7 a=1C9gX6FvuTa7vNFQ0gM5pnMqSNEA:4 a=MSl-tDqOz04A:10 Received: from [81.191.55.181] (account mc467741@c2i.net HELO laptop) by mailfe01.swip.net (CommuniGate Pro SMTP 5.2.13) with ESMTPA id 188851970; Tue, 12 May 2009 16:59:47 +0200 From: Hans Petter Selasky To: Andrew Thompson Date: Tue, 12 May 2009 17:02:21 +0200 User-Agent: KMail/1.9.7 References: <200905120639.n4C6drRs026284@repoman.freebsd.org> <20090512142718.GI45375@citylink.fud.org.nz> In-Reply-To: <20090512142718.GI45375@citylink.fud.org.nz> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200905121702.22017.hselasky@freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 161961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 15:59:51 -0000 On Tuesday 12 May 2009, Andrew Thompson wrote: > On Tue, May 12, 2009 at 06:39:53AM +0000, Hans Petter Selasky wrote: > > http://perforce.freebsd.org/chv.cgi?CH=161961 > > > > Change 161961 by hselasky@hselasky_laptop001 on 2009/05/12 06:38:57 > > > > > > USB CORE: > > - Cancelled error code must be returned in special > > case, else device drivers might end up in infinite loop. > > - The special case code was introduced by a recent commit. > > > > Bug report by: Andrey > > > > Affected files ... > > > > .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#144 edit > > > > Differences ... > > > > ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#144 (text+ko) > > ==== > > > > @@ -1439,7 +1439,11 @@ > > /* Check if the device is still alive */ > > if (info->udev->state < USB_STATE_POWERED) { > > USB_BUS_LOCK(bus); > > - usb2_transfer_done(xfer, USB_ERR_NOT_CONFIGURED); > > + /* > > + * Must return cancelled error code else > > + * device drivers can hang. > > + */ > > + usb2_transfer_done(xfer, USB_ERR_CANCELLED); > > USB_BUS_UNLOCK(bus); > > return; > > } > > I rather think this is a bug in the drivers, they blindly resubmit the > transfer without knowing if the error is restartable. No, this is no bug. And they do not blindly re-submit the transfer. When a transfer goes through a failure, then it will do a clear stall. After the clear stall is finished the transfer is re-started. The clear stall is niced at 50ms intervals. Because you added that check, the driver will spin 100% CPU instead of every 50ms interval at detach. All drivers check for CANCELLED. Adding another check for a similar error code is just waste in my opinion. Nicing a transfer is a feature, but the timeout is started after the not configured check, so that is where the bug is. --HPS From owner-p4-projects@FreeBSD.ORG Tue May 12 17:22:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E19101065675; Tue, 12 May 2009 17:22:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A17EA1065673 for ; Tue, 12 May 2009 17:22:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 904B88FC1C for ; Tue, 12 May 2009 17:22:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CHMrjb029344 for ; Tue, 12 May 2009 17:22:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CHMrZm029342 for perforce@freebsd.org; Tue, 12 May 2009 17:22:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 12 May 2009 17:22:53 GMT Message-Id: <200905121722.n4CHMrZm029342@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 161985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 17:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=161985 Change 161985 by hselasky@hselasky_laptop001 on 2009/05/12 17:22:29 USB controller: - finish atmegadci chip init Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#24 (text+ko) ==== @@ -1216,13 +1216,28 @@ sc->sc_bus.methods = &atmegadci_bus_methods; USB_BUS_LOCK(&sc->sc_bus); -#if 0 - /* XXX TODO - currently done by boot strap */ + + /* make sure USB is enabled */ + ATMEGA_WRITE_1(sc, ATMEGA_USBCON, + ATMEGA_USBCON_USBE | + ATMEGA_USBCON_FRZCLK); /* enable USB PAD regulator */ ATMEGA_WRITE_1(sc, ATMEGA_UHWCON, - ATMEGA_UHWCON_UVREGE | ATMEGA_UHWCON_UIMOD); -#endif + ATMEGA_UHWCON_UVREGE | + ATMEGA_UHWCON_UIMOD); + + /* the following register sets up the USB PLL, assuming 16MHz X-tal */ + ATMEGA_WRITE_1(sc, 0x49 /* PLLCSR */, 0x14 | 0x02); + + /* wait for PLL to lock */ + for (n = 0; n != 20; n++) { + if (!(ATMEGA_READ_1(sc, 0x49) & 0x01)) + break; + /* wait a little bit for PLL to start */ + usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); + } + /* make sure USB is enabled */ ATMEGA_WRITE_1(sc, ATMEGA_USBCON, ATMEGA_USBCON_USBE | @@ -1846,6 +1861,11 @@ /* clear connect change flag */ sc->sc_flags.change_connect = 0; + if (!sc->sc_flags.status_bus_reset) { + /* we are not connected */ + break; + } + /* configure the control endpoint */ /* select endpoint number */ From owner-p4-projects@FreeBSD.ORG Tue May 12 17:34:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A23D3106566B; Tue, 12 May 2009 17:34:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33EDF106567F for ; Tue, 12 May 2009 17:34:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1ED7B8FC27 for ; Tue, 12 May 2009 17:34:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CHY514030191 for ; Tue, 12 May 2009 17:34:05 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CHY4lw030189 for perforce@freebsd.org; Tue, 12 May 2009 17:34:04 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 12 May 2009 17:34:04 GMT Message-Id: <200905121734.n4CHY4lw030189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 17:34:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=161986 Change 161986 by rene@rene_self on 2009/05/12 17:34:03 [website] Replace publish.sgml by its English version, now the file builds again. Only a tiny part was translated. Affected files ... .. //depot/projects/docproj_nl/www/nl/publish.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/publish.sgml#2 (text+ko) ==== @@ -1,49 +1,49 @@ - + - %navincludes; - %includes; + ]> - - - + &header; -

-
BOEKEN
-
CD-ROMS
-
TIJDSCHRIFTEN
-
PERS
+
BOOKS
+
CDROMS
+
MAGAZINES
+
PRESS

-
Hier vindt u de covers van veel FreeBSD-gerelateerde publicaties. - Als u weet van andere FreeBSD publicaties/CD-ROM's laat dat ons dan - weten op www@FreeBSD.org zodat - we ze aan de website kunnen toevoegen.
+ Here you will find the covers of many FreeBSD related publications. If you + know of any additional FreeBSD publications/CDROMs let us know, at www@FreeBSD.org, so that they may be + added to this site. + +
The FreeBSD Handbook contains a + considerably longer bibliography.
+ +
-
Het - FreeBSD handboek - bevat een aanzienlijk langere - bibliografie.
+ Click on any of the graphics to see a larger version. -
Klik op een afbeelding voor een grotere versie. -
+ +
-
Boeken
+
Books
- - - - - - + Jian-Da Li (aka. jdli). - - - - - - - - - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

A publication from Tatsumi Hosokawa and @@ -53,7 +53,7 @@

(Japanese FreeBSD book with 2.0.5, titled "FreeBSD: Fun and easy @@ -61,7 +61,7 @@

(Japanese FreeBSD book with 2.0.5, titled "FreeBSD Introductory @@ -69,7 +69,7 @@

This is BSDi's "The Complete FreeBSD" with installation @@ -77,16 +77,16 @@

This book was recently published (early 1997) in Taiwan. Its title + This book was published (early 1997) in Taiwan. Its title is "FreeBSD: introduction and applications" and the author is - Jian-Da Li.

This is the "Getting Started with FreeBSD" from Fuki-Shuppan. @@ -97,7 +97,7 @@

The "Personal Unix Starter Kit - FreeBSD" from ASCII. Includes @@ -107,7 +107,7 @@

BSD mit Methode, M. Schulze, B. Roehrig, M. Hoelzer und andere, @@ -117,7 +117,7 @@

This is the "FreeBSD Install and utilization manual" from Mainichi @@ -128,7 +128,7 @@

The "FreeBSD User's Reference Manual" from Mainichi @@ -139,7 +139,7 @@

The "FreeBSD System Administrator's Manual" from Mainichi @@ -150,7 +150,7 @@

This is "About FreeBSD" from Youngjin.com. It is first FreeBSD @@ -160,7 +160,7 @@

@@ -174,7 +174,7 @@

The FreeBSD Handbook 1st Edition is a comprehensive FreeBSD Tutorial and reference. It covers installation, day-to-day use @@ -185,7 +185,7 @@

The Complete FreeBSD with CDs, 3rd Ed, FreeBSD 4.2. Everything you ever wanted to know about how to get @@ -197,7 +197,7 @@

The FreeBSD Handbook 2nd Edition is a comprehensive FreeBSD Tutorial and reference. It covers installation, day-to-day use @@ -208,7 +208,7 @@

"The FreeBSD Corporate Networker's Guide" Mittelstaedt, Ted. Addison Wesley, 2000.
@@ -225,7 +225,7 @@

"FreeBSD, An Open-Source Operating System for Your Personal Computer", Annelise Anderson.
An introduction to FreeBSD for users new to both FreeBSD and UNIX. @@ -238,7 +238,7 @@

Absolute BSD. This book discusses management of FreeBSD-based servers in high-performance enterprise environments. @@ -248,7 +248,7 @@

Fultus presents FreeBSD Open Documentation Library. This @@ -272,7 +272,21 @@

+ "Building an Internet Server with FreeBSD 6" is a step-by-step + guide for helping new and experienced users to FreeBSD + install and configure the latest Internet server applications + in a minimum of time. The guide includes descriptions of + many of the Internet's most popular and widely deployed + open source projects, detailed instructions on implementing + each, and maintenance tasks important to an Internet + server. May 2006, Lulu Press, ISBN 1411695747, 228 pages.
Written by the professionals of EnderUNIX and Huseyin Yuce this book is the first Turkish FreeBSD book. The book is @@ -297,7 +311,7 @@
Les cahiers de l'Admin: BSD (the BSD sysadmin notebook), @@ -307,6 +321,87 @@ href="http://www.eyrolles.com/">Eyrolles, 2004. ISBN 2-212-11463-X
+ The OpenBSD PF Packet Filter Book covers the PF packet filter + suite, ALTQ, spamd, address translation, and more for FreeBSD, + NetBSD, OpenBSD, and DragonFly. August 2006, Reed Media Services. + ISBN 978-0-9790342-0-6. +
+ FreeBSD 6 Unleashed covers everything you need to know to use + FreeBSD to its fullest potential. + Jun 7, 2006, + Sams. ISBN 0-672-32875-5 +
+ (Traditional Chinese FreeBSD book with 6.0) + December 2005, Drmaster. ISBN 9-575-27878-X +
+ This Romanian language book is a useful guide for people + taking their first steps with FreeBSD. It covers installation + and day-to-day operation of a FreeBSD system, and contains + practical examples illustrating the use of FreeBSD's utilities. + It has two case studies on configuring FreeBSD as a server + and a router. 2005, Polirom Publishing House, ISBN + 973-681-683-4
The “RadioBSD Crier: 2007/01” is a 24-page article + on managing FreeBSD and NetBSD IPFW, IPFW2, and IP6FW firewalls.
+ + The Best of FreeBSD Basics by Dru Lavigne provides near 100 + tutorials covering a wide range of FreeBSD and open source Unix + topics. December 2007. + Reed Media Services. + ISBN 978-0-9790342-2-0. +

@@ -320,7 +415,7 @@ - - - - - - - + - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - +

This is InfoMagic's BSDisc, containing FreeBSD 2.0 and NetBSD 1.0 @@ -329,7 +424,7 @@

This is the original 4.4 BSD Lite2 release from UC Berkeley, the @@ -337,7 +432,7 @@

The first of Laser5's "BSD" series. Contains FreeBSD-2.0.5R, @@ -345,7 +440,7 @@

The second of Laser5's "BSD" series. From this version, the CDs @@ -354,7 +449,7 @@

This is the Laser5 Japanese edition of the FreeBSD CDROM. It is a @@ -362,7 +457,7 @@

This is the only FreeBSD CD Pacific Hitech produced before merging @@ -370,8 +465,8 @@ produces the FreeBSD/J (Japanese) CD product.

This is the cover disc from the Korean magazine. Note the creative cover art! The @@ -380,7 +475,7 @@

This is it - the very first FreeBSD CD published! Both the @@ -391,7 +486,7 @@

This was the second FreeBSD CD published by Walnut Creek CDROM and @@ -402,7 +497,7 @@

This unusual CD is something of a collector's item now given that @@ -415,7 +510,7 @@

This is the fixed-up version of the FreeBSD 2.0 CD. Note that the @@ -425,7 +520,7 @@

The FreeBSD 2.0.5 release CD. This was the first CD to feature @@ -433,7 +528,7 @@

The FreeBSD 2.1 release CD. This was the first CD release on the @@ -441,21 +536,21 @@

The FreeBSD 2.1.5 release CD.

The FreeBSD 2.1.6 release CD.

The Japanese version of 2.1.6. This was the first and last @@ -466,7 +561,7 @@

The FreeBSD 2.1.7 release CD. Also the last CD released on the @@ -474,7 +569,7 @@

An early release SNAPshot of 2.2 (done before 2.2.1 was @@ -482,7 +577,7 @@

The FreeBSD 2.2.1 release CD. This was the first CD on the 2.2 @@ -490,21 +585,21 @@

The FreeBSD 2.2.2 release CD.

The FreeBSD 3.0 snapshot CD.

The FreeBSD mailing list and newsgroup archives, turned into HTML @@ -515,27 +610,27 @@

FreeBSD Toolkit: Six disc set of resources to make your FreeBSD experience more enriching.

FreeBSD Alpha 4.2 - The full version of the DEC Alpha 64-bit UNIX operating system.

FreeBSD 4.2: The full version of the PC 32-bit UNIX operating system.

FreeBSD 4.2 CD-ROM. Lehmanns CD-ROM Edition. January 2001, 4 CD-ROMs. Lehmanns Fachbuchhandlung. Germany. @@ -543,14 +638,14 @@

FreeBSD 4.3 RELEASE CDROM. April 2001, Wind River Systems. ISBN 1-57176-300-7.

FreeBSD Toolkit: Six disc set of resources to make your FreeBSD experience more enriching. @@ -559,7 +654,7 @@

FreeBSD 4.4 CD-ROM. Lehmanns CD-ROM Edition. November 2001, 6 CD-ROMs in Jewelcase. @@ -569,14 +664,14 @@

FreeBSD 4.4 RELEASE CDROM. Wind River Systems. September 2001. ISBN 1-57176-304-X.

FreeBSD 4.5 RELEASE CDROM. February 2002, FreeBSD Mall Inc. ISBN 1-57176-306-6. @@ -591,7 +686,7 @@ - - - - -

Cover of Korean UNIX magazine, May 1997 issue. Also included
UNIX User Magazine November 1996 issue. Also included FreeBSD @@ -607,7 +702,7 @@

This is the "FreeBSD Full Course" special in April 1997's Software @@ -617,8 +712,8 @@

This is the "BSD magazine" published by ASCII corporation, From owner-p4-projects@FreeBSD.ORG Tue May 12 18:48:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AEEF1065686; Tue, 12 May 2009 18:48:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EB0A1065677 for ; Tue, 12 May 2009 18:48:21 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFB698FC1D for ; Tue, 12 May 2009 18:48:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CImK4X036693 for ; Tue, 12 May 2009 18:48:20 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CImKQt036691 for perforce@freebsd.org; Tue, 12 May 2009 18:48:20 GMT (envelope-from zec@fer.hr) Date: Tue, 12 May 2009 18:48:20 GMT Message-Id: <200905121848.n4CImKQt036691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 18:48:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=161987 Change 161987 by zec@zec_tpx32 on 2009/05/12 18:47:49 Back out O(n**2) ad-hoc hack for searching for available ifunits in cloning ifnets, and restore the standard O(n) bitmapped searching / ifunit allocation method for both default and options VIMAGE builds. HOWEVER, hereby we also introduce per-vnet if_clone driver registration and ifunit allocation. As a (necessary) example, if_loop is modified to attach itself as an independent cloner instance to each vnet. This approach has a neat byproduct: if_clone drivers that do not explicitly declare themselves as multi-vnet, by exporting an iattach() method and registering to the vnet framework, continue to work with unmodified semantics in the default vnet. However, they will NOT be available in other vnets. This brings us a step closer to being able to selectively attach subsystems to particular vnets, instead of having all subsystems unconditionally available to all vnets by default. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#7 edit .. //depot/projects/vimage-commit2/src/sys/net/if_clone.h#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#29 edit .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#17 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#27 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#59 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_clone.c#7 (text+ko) ==== @@ -55,10 +55,13 @@ static void if_clone_free(struct if_clone *ifc); static int if_clone_createif(struct if_clone *ifc, char *name, size_t len, caddr_t params); +static int vnet_clone_iattach(const void *); static struct mtx if_cloners_mtx; +#ifdef VIMAGE_GLOBALS static int if_cloners_count; -LIST_HEAD(, if_clone) if_cloners = LIST_HEAD_INITIALIZER(if_cloners); +LIST_HEAD(, if_clone) if_cloners; +#endif #define IF_CLONERS_LOCK_INIT() \ mtx_init(&if_cloners_mtx, "if_cloners lock", NULL, MTX_DEF) @@ -112,10 +115,32 @@ static MALLOC_DEFINE(M_CLONE, "clone", "interface cloning framework"); +#ifndef VIMAGE_GLOBALS +static const vnet_modinfo_t vnet_clone_modinfo = { + .vmi_id = VNET_MOD_IF_CLONE, + .vmi_name = "if_clone", + .vmi_iattach = vnet_clone_iattach +}; +#endif /* !VIMAGE_GLOBALS */ + +static int vnet_clone_iattach(const void *unused __unused) +{ + INIT_VNET_NET(curvnet); + + LIST_INIT(&V_if_cloners); + return (0); +} + void if_clone_init(void) { + IF_CLONERS_LOCK_INIT(); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_clone_modinfo); +#else + vnet_loif_iattach(NULL); +#endif } /* @@ -124,11 +149,12 @@ int if_clone_create(char *name, size_t len, caddr_t params) { + INIT_VNET_NET(curvnet); struct if_clone *ifc; /* Try to find an applicable cloner for this request */ IF_CLONERS_LOCK(); - LIST_FOREACH(ifc, &if_cloners, ifc_list) { + LIST_FOREACH(ifc, &V_if_cloners, ifc_list) { if (ifc->ifc_match(ifc, name)) { break; } @@ -176,6 +202,7 @@ int if_clone_destroy(const char *name) { + INIT_VNET_NET(curvnet); struct if_clone *ifc; struct ifnet *ifp; @@ -185,7 +212,7 @@ /* Find the cloner for this interface */ IF_CLONERS_LOCK(); - LIST_FOREACH(ifc, &if_cloners, ifc_list) { + LIST_FOREACH(ifc, &V_if_cloners, ifc_list) { if (strcmp(ifc->ifc_name, ifp->if_dname) == 0) { break; } @@ -212,7 +239,6 @@ IFC_IFLIST_REMOVE(ifc, ifp); IF_CLONE_UNLOCK(ifc); - CURVNET_SET_QUIET(ifp->if_vnet); if_delgroup(ifp, ifc->ifc_name); err = (*ifc->ifc_destroy)(ifc, ifp); @@ -224,7 +250,6 @@ IFC_IFLIST_INSERT(ifc, ifp); IF_CLONE_UNLOCK(ifc); } - CURVNET_RESTORE(); return (err); } @@ -234,6 +259,7 @@ void if_clone_attach(struct if_clone *ifc) { + INIT_VNET_NET(curvnet); int len, maxclone; /* @@ -249,8 +275,8 @@ IF_CLONE_ADDREF(ifc); IF_CLONERS_LOCK(); - LIST_INSERT_HEAD(&if_cloners, ifc, ifc_list); - if_cloners_count++; + LIST_INSERT_HEAD(&V_if_cloners, ifc, ifc_list); + V_if_cloners_count++; IF_CLONERS_UNLOCK(); LIST_INIT(&ifc->ifc_iflist); @@ -266,11 +292,12 @@ void if_clone_detach(struct if_clone *ifc) { + INIT_VNET_NET(curvnet); struct ifc_simple_data *ifcs = ifc->ifc_data; IF_CLONERS_LOCK(); LIST_REMOVE(ifc, ifc_list); - if_cloners_count--; + V_if_cloners_count--; IF_CLONERS_UNLOCK(); /* Allow all simples to be destroyed */ @@ -287,6 +314,7 @@ static void if_clone_free(struct if_clone *ifc) { + for (int bytoff = 0; bytoff < ifc->ifc_bmlen; bytoff++) { KASSERT(ifc->ifc_units[bytoff] == 0x00, ("ifc_units[%d] is not empty", bytoff)); @@ -294,7 +322,6 @@ KASSERT(LIST_EMPTY(&ifc->ifc_iflist), ("%s: ifc_iflist not empty", __func__)); - IF_CLONE_LOCK_DESTROY(ifc); free(ifc->ifc_units, M_CLONE); } @@ -305,6 +332,7 @@ int if_clone_list(struct if_clonereq *ifcr) { + INIT_VNET_NET(curvnet); char *buf, *dst, *outbuf = NULL; struct if_clone *ifc; int buf_count, count, err = 0; @@ -321,23 +349,23 @@ * could be because that would let arbitrary users cause us to * allocate abritrary amounts of kernel memory. */ - buf_count = (if_cloners_count < ifcr->ifcr_count) ? - if_cloners_count : ifcr->ifcr_count; + buf_count = (V_if_cloners_count < ifcr->ifcr_count) ? + V_if_cloners_count : ifcr->ifcr_count; IF_CLONERS_UNLOCK(); outbuf = malloc(IFNAMSIZ*buf_count, M_CLONE, M_WAITOK | M_ZERO); IF_CLONERS_LOCK(); - ifcr->ifcr_total = if_cloners_count; + ifcr->ifcr_total = V_if_cloners_count; if ((dst = ifcr->ifcr_buffer) == NULL) { /* Just asking how many there are. */ goto done; } - count = (if_cloners_count < buf_count) ? - if_cloners_count : buf_count; + count = (V_if_cloners_count < buf_count) ? + V_if_cloners_count : buf_count; - for (ifc = LIST_FIRST(&if_cloners), buf = outbuf; + for (ifc = LIST_FIRST(&V_if_cloners), buf = outbuf; ifc != NULL && count != 0; ifc = LIST_NEXT(ifc, ifc_list), count--, buf += IFNAMSIZ) { strlcpy(buf, ifc->ifc_name, IFNAMSIZ); @@ -401,25 +429,6 @@ * Find a free unit if none was given. */ if (wildcard) { -#ifdef VIMAGE - /* XXX revisit - O(n**2) loop below! */ - INIT_VNET_NET(curvnet); - char name[IFNAMSIZ]; - struct ifnet *ifp; - int i = 0; - - IFNET_RLOCK(); -again: - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - sprintf(name, "%s%d", ifc->ifc_name, i); - if (strcmp(name, ifp->if_xname) == 0) { - i++; - goto again; - } - } - IFNET_RUNLOCK(); - *unit = i; -#else while ((bytoff < ifc->ifc_bmlen) && (ifc->ifc_units[bytoff] == 0xff)) bytoff++; @@ -430,7 +439,6 @@ while ((ifc->ifc_units[bytoff] & (1 << bitoff)) != 0) bitoff++; *unit = (bytoff << 3) + bitoff; -#endif } if (*unit > ifc->ifc_maxunit) { @@ -438,7 +446,6 @@ goto done; } -#ifndef VIMAGE if (!wildcard) { bytoff = *unit >> 3; bitoff = *unit - (bytoff << 3); @@ -454,7 +461,6 @@ KASSERT((ifc->ifc_units[bytoff] & (1 << bitoff)) == 0, ("%s: bit is already set", __func__)); ifc->ifc_units[bytoff] |= (1 << bitoff); -#endif IF_CLONE_ADDREF_LOCKED(ifc); done: @@ -465,7 +471,6 @@ void ifc_free_unit(struct if_clone *ifc, int unit) { -#ifndef VIMAGE int bytoff, bitoff; /* @@ -473,14 +478,11 @@ */ bytoff = unit >> 3; bitoff = unit - (bytoff << 3); -#endif IF_CLONE_LOCK(ifc); -#ifndef VIMAGE KASSERT((ifc->ifc_units[bytoff] & (1 << bitoff)) != 0, ("%s: bit is already cleared", __func__)); ifc->ifc_units[bytoff] &= ~(1 << bitoff); -#endif IF_CLONE_REMREF_LOCKED(ifc); /* releases lock */ } ==== //depot/projects/vimage-commit2/src/sys/net/if_clone.h#3 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#29 (text+ko) ==== @@ -111,16 +111,21 @@ struct ifnet *loif; /* Used externally */ #endif +IFC_SIMPLE_DECLARE(lo, 1); + +#ifdef VIMAGE +MALLOC_DEFINE(M_LO_CLONER, "lo_cloner", "lo_cloner"); +#endif + #ifndef VIMAGE_GLOBALS static const vnet_modinfo_t vnet_loif_modinfo = { .vmi_id = VNET_MOD_LOIF, + .vmi_dependson = VNET_MOD_IF_CLONE, .vmi_name = "loif", .vmi_iattach = vnet_loif_iattach }; #endif /* !VIMAGE_GLOBALS */ -IFC_SIMPLE_DECLARE(lo, 1); - static void lo_clone_destroy(struct ifnet *ifp) { @@ -168,10 +173,15 @@ V_loif = NULL; LIST_INIT(&V_lo_list); - if (IS_DEFAULT_VNET(curvnet)) - if_clone_attach(&lo_cloner); - else - lo_cloner.ifc_attach(&lo_cloner); + +#ifdef VIMAGE + V_lo_cloner = malloc(sizeof(*V_lo_cloner), M_LO_CLONER, + M_WAITOK | M_ZERO); + bcopy(&lo_cloner, V_lo_cloner, sizeof(*V_lo_cloner)); + if_clone_attach(V_lo_cloner); +#else + if_clone_attach(&lo_cloner); +#endif return (0); } ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#17 (text+ko) ==== @@ -31,26 +31,31 @@ */ #ifndef _NET_VNET_H_ -#define _NET_VNET_H_ +#define _NET_VNET_H_ #include struct vnet_net { - int _if_index; - struct ifindex_entry * _ifindex_table; struct ifnethead _ifnet; struct ifgrouphead _ifg_head; - int _if_indexlim; - struct knlist _ifklist; + struct ifnet * _loif; + LIST_HEAD(, lo_softc) _lo_list; + struct radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1]; struct rtstat _rtstat; - struct radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1]; int _rttrash; uma_zone_t _rtzone; - struct ifnet * _loif; - LIST_HEAD(, lo_softc) _lo_list; + struct ifindex_entry * _ifindex_table; + int _if_index; + int _if_indexlim; + struct knlist _ifklist; + + struct if_clone * _lo_cloner; + + LIST_HEAD(, if_clone) _if_cloners; + int _if_cloners_count; LIST_HEAD(, rawcb) _rawcb_list; @@ -74,19 +79,22 @@ #define VNET_NET(sym) VSYM(vnet_net, sym) -#define V_ether_ipfw VNET_NET(ether_ipfw) -#define V_if_index VNET_NET(if_index) -#define V_if_indexlim VNET_NET(if_indexlim) -#define V_ifg_head VNET_NET(ifg_head) -#define V_ifindex_table VNET_NET(ifindex_table) -#define V_ifklist VNET_NET(ifklist) -#define V_ifnet VNET_NET(ifnet) -#define V_lo_list VNET_NET(lo_list) -#define V_loif VNET_NET(loif) -#define V_rawcb_list VNET_NET(rawcb_list) -#define V_rt_tables VNET_NET(rt_tables) -#define V_rtstat VNET_NET(rtstat) -#define V_rttrash VNET_NET(rttrash) -#define V_rtzone VNET_NET(rtzone) +#define V_ether_ipfw VNET_NET(ether_ipfw) +#define V_if_cloners VNET_NET(if_cloners) +#define V_if_cloners_count VNET_NET(if_cloners_count) +#define V_if_index VNET_NET(if_index) +#define V_if_indexlim VNET_NET(if_indexlim) +#define V_ifg_head VNET_NET(ifg_head) +#define V_ifindex_table VNET_NET(ifindex_table) +#define V_ifklist VNET_NET(ifklist) +#define V_ifnet VNET_NET(ifnet) +#define V_lo_list VNET_NET(lo_list) +#define V_lo_cloner VNET_NET(lo_cloner) +#define V_loif VNET_NET(loif) +#define V_rawcb_list VNET_NET(rawcb_list) +#define V_rt_tables VNET_NET(rt_tables) +#define V_rtstat VNET_NET(rtstat) +#define V_rttrash VNET_NET(rttrash) +#define V_rtzone VNET_NET(rtzone) #endif /* !_NET_VNET_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#27 (text+ko) ==== @@ -814,6 +814,7 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin, int scrub) { + INIT_VNET_NET(ifp->if_vnet); INIT_VNET_INET(ifp->if_vnet); register u_long i = ntohl(sin->sin_addr.s_addr); struct sockaddr_in oldaddr; @@ -1004,6 +1005,7 @@ static int in_scrubprefix(struct in_ifaddr *target) { + INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); struct in_ifaddr *ia; struct in_addr prefix, mask, p; ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#59 (text+ko) ==== @@ -123,6 +123,7 @@ #define VNET_MOD_MLD 13 /* Stateless modules. */ +#define VNET_MOD_IF_CLONE 19 #define VNET_MOD_NG_ETHER 20 #define VNET_MOD_NG_IFACE 21 #define VNET_MOD_NG_EIFACE 22 From owner-p4-projects@FreeBSD.ORG Tue May 12 21:29:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11F6F1065688; Tue, 12 May 2009 21:29:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B83A1065686 for ; Tue, 12 May 2009 21:29:04 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D6B98FC1C for ; Tue, 12 May 2009 21:29:04 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CLT42X071902 for ; Tue, 12 May 2009 21:29:04 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CLT4mP071900 for perforce@freebsd.org; Tue, 12 May 2009 21:29:04 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 12 May 2009 21:29:04 GMT Message-Id: <200905122129.n4CLT4mP071900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 161991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 21:29:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=161991 Change 161991 by rene@rene_self on 2009/05/12 21:28:28 [website] Update (and presumably fix) support.sgml Affected files ... .. //depot/projects/docproj_nl/www/nl/support.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/support.sgml#2 (text+ko) ==== @@ -1,41 +1,43 @@ - - - %navincludes; - %includes; + + + ]> - - - + + + &header; -
Voor gebruikers van FreeBSD is een breed scala aan +
Voor gebruikers van &os; is een breed scala aan commerciële en gemeenschapsondersteuning beschikbaar. In de sectie gemeenschap van deze website staat een gedetailleerd overzicht van de - mogelijkheden voor ondersteuning voor gebruikers uit de FreeBSD + mogelijkheden voor ondersteuning voor gebruikers uit de &os; gemeenschap, inclusief een aantal mailinglijsten.

Commerciële ondersteuning is ook beschikbaar van een van de vele leveranciers die commerciële producten, diensten en/of advies voor, van of - met FreeBSD aanbieden.
+ met &os; aanbieden.

Problemen melden
-
Een bug in FreeBSD gevonden? Een fout in de documentatie +
Een bug in &os; gevonden? Een fout in de documentatie aangetroffen? Laat het ons weten als het niet al eerder is gemeld.
-
Dit kan nagezocht worden door te Om na te gaan wat reeds is gemeld, is het mogelijk om te zoeken in de - openstaande probleemrapporten (en ze per categorie, - behandelaar, etc. te bekijken), voor specifieke categorie, behandelend vrijwilliger, + insturend persoon, tekst, enzovoorts, of een enkel probleemrapport - te bekijken of alle - openstaande rapporten te bekijken.
+ te bekijken of alle + openstaande probleemrapporten te bekijken.

Als er nog geen melding is gemaakt, lees dan eerst onze richtlijnen voor From owner-p4-projects@FreeBSD.ORG Tue May 12 21:34:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C589F1065679; Tue, 12 May 2009 21:34:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8516F1065674 for ; Tue, 12 May 2009 21:34:09 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outW.internet-mail-service.net (outw.internet-mail-service.net [216.240.47.246]) by mx1.freebsd.org (Postfix) with ESMTP id 6B5808FC12 for ; Tue, 12 May 2009 21:34:09 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 5DFF9DACC8; Tue, 12 May 2009 14:34:52 -0700 (PDT) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id C2EAF2D600E; Tue, 12 May 2009 14:34:08 -0700 (PDT) Message-ID: <4A09EB50.3030608@elischer.org> Date: Tue, 12 May 2009 14:34:08 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.21 (Macintosh/20090302) MIME-Version: 1.0 To: Marko Zec References: <200905121848.n4CImKQt036691@repoman.freebsd.org> In-Reply-To: <200905121848.n4CImKQt036691@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews , Brooks Davis Subject: Re: PERFORCE change 161987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 21:34:10 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=161987 > > Change 161987 by zec@zec_tpx32 on 2009/05/12 18:47:49 > > Back out O(n**2) ad-hoc hack for searching for available > ifunits in cloning ifnets, and restore the standard O(n) > bitmapped searching / ifunit allocation method for both > default and options VIMAGE builds. > > HOWEVER, hereby we also introduce per-vnet if_clone driver > registration and ifunit allocation. As a (necessary) example, > if_loop is modified to attach itself as an independent > cloner instance to each vnet. > > This approach has a neat byproduct: if_clone drivers that > do not explicitly declare themselves as multi-vnet, by > exporting an iattach() method and registering to the vnet > framework, continue to work with unmodified semantics in > the default vnet. However, they will NOT be available > in other vnets. > > This brings us a step closer to being able to selectively > attach subsystems to particular vnets, instead of having > all subsystems unconditionally available to all vnets by > default. > excellent sidestep. From owner-p4-projects@FreeBSD.ORG Tue May 12 21:50:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7EAA1065677; Tue, 12 May 2009 21:50:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 743921065674 for ; Tue, 12 May 2009 21:50:52 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outP.internet-mail-service.net (outp.internet-mail-service.net [216.240.47.239]) by mx1.freebsd.org (Postfix) with ESMTP id 598698FC15 for ; Tue, 12 May 2009 21:50:52 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 277BDA300F; Tue, 12 May 2009 14:50:59 -0700 (PDT) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id 4F9952D6013; Tue, 12 May 2009 14:50:51 -0700 (PDT) Message-ID: <4A09EF38.6060407@elischer.org> Date: Tue, 12 May 2009 14:50:48 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.21 (Macintosh/20090302) MIME-Version: 1.0 To: Marko Zec References: <200905121848.n4CImKQt036691@repoman.freebsd.org> In-Reply-To: <200905121848.n4CImKQt036691@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: virtualization@freebsd.org, Perforce Change Reviews , Brooks Davis Subject: Re: PERFORCE change 161987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 21:50:54 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=161987 > > Change 161987 by zec@zec_tpx32 on 2009/05/12 18:47:49 > > Back out O(n**2) ad-hoc hack for searching for available > ifunits in cloning ifnets, and restore the standard O(n) > bitmapped searching / ifunit allocation method for both > default and options VIMAGE builds. > > HOWEVER, hereby we also introduce per-vnet if_clone driver > registration and ifunit allocation. As a (necessary) example, > if_loop is modified to attach itself as an independent > cloner instance to each vnet. > > This approach has a neat byproduct: if_clone drivers that > do not explicitly declare themselves as multi-vnet, by > exporting an iattach() method and registering to the vnet > framework, continue to work with unmodified semantics in > the default vnet. However, they will NOT be available > in other vnets. Ah I didn't read this right the first time.. generally, good but... So we cannot have tun drivers in vimages? tun needs it's /dev entres, so can not be 'renumbered' (in the base sense) until we somehow add vimage support to devfs. however having tun3 in one vimage and tun4 in another would still be pretty ok I think. So I think the modes wanted would be: "Unvirtualised" appears in base vimage only "Scattered" one namespace, but in different vimages. "Virtualised" separate namespaces. p.s excuse my unamerican way of spelling 'ised' (not ized) my fingers refuse to co-operate. > > This brings us a step closer to being able to selectively > attach subsystems to particular vnets, instead of having > all subsystems unconditionally available to all vnets by > default. > From owner-p4-projects@FreeBSD.ORG Tue May 12 23:00:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 582041065674; Tue, 12 May 2009 23:00:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1881C106564A; Tue, 12 May 2009 23:00:51 +0000 (UTC) (envelope-from zec@freebsd.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id 98AC48FC08; Tue, 12 May 2009 23:00:50 +0000 (UTC) (envelope-from zec@freebsd.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 5ABE99B647; Wed, 13 May 2009 01:00:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from localhost (imunes.tel.fer.hr [161.53.19.8]) by xaqua.tel.fer.hr (Postfix) with ESMTP id 535249B645; Wed, 13 May 2009 01:00:33 +0200 (CEST) From: Marko Zec To: Julian Elischer Date: Wed, 13 May 2009 01:00:32 +0200 User-Agent: KMail/1.9.10 References: <200905121848.n4CImKQt036691@repoman.freebsd.org> <4A09EF38.6060407@elischer.org> In-Reply-To: <4A09EF38.6060407@elischer.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200905130100.32678.zec@freebsd.org> Cc: virtualization@freebsd.org, Perforce Change Reviews , Brooks Davis Subject: Re: PERFORCE change 161987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 23:00:52 -0000 On Tuesday 12 May 2009 23:50:48 Julian Elischer wrote: > Marko Zec wrote: > > http://perforce.freebsd.org/chv.cgi?CH=161987 > > > > Change 161987 by zec@zec_tpx32 on 2009/05/12 18:47:49 > > > > Back out O(n**2) ad-hoc hack for searching for available > > ifunits in cloning ifnets, and restore the standard O(n) > > bitmapped searching / ifunit allocation method for both > > default and options VIMAGE builds. > > > > HOWEVER, hereby we also introduce per-vnet if_clone driver > > registration and ifunit allocation. As a (necessary) example, > > if_loop is modified to attach itself as an independent > > cloner instance to each vnet. > > > > This approach has a neat byproduct: if_clone drivers that > > do not explicitly declare themselves as multi-vnet, by > > exporting an iattach() method and registering to the vnet > > framework, continue to work with unmodified semantics in > > the default vnet. However, they will NOT be available > > in other vnets. > > Ah I didn't read this right the first time.. > generally, good but... > > So we cannot have tun drivers in vimages? > > tun needs it's /dev entres, so can not be 'renumbered' (in the > base sense) until we somehow add vimage support to devfs. > however having tun3 in one vimage and tun4 in another would still > be pretty ok I think. Hmm but how would such an approach help with say /dev/pf, which also has to be functional in all vnets? Wouldn't it be useful if a single /dev entry could provide access to appropriate subsystem instances in different vnets, depending in which vnet the process which opens the special file operates? I think this is how the virtualized pf did work, and there's anegdotal evidence that it did work well, at least until this got ripped off the vimage branch with the next pf import from OpenBSD :) Marko > So I think the modes wanted would be: > > "Unvirtualised" appears in base vimage only > "Scattered" one namespace, but in different vimages. > "Virtualised" separate namespaces. > > p.s excuse my unamerican way of spelling 'ised' (not ized) > my fingers refuse to co-operate. > > > This brings us a step closer to being able to selectively > > attach subsystems to particular vnets, instead of having > > all subsystems unconditionally available to all vnets by > > default. From owner-p4-projects@FreeBSD.ORG Wed May 13 02:14:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9C511065672; Wed, 13 May 2009 02:14:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BBB7106564A for ; Wed, 13 May 2009 02:14:00 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 606E28FC0C for ; Wed, 13 May 2009 02:14:00 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4D2DwTl017062 for ; Wed, 13 May 2009 02:13:58 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4D2Dwrw017060 for perforce@freebsd.org; Wed, 13 May 2009 02:13:58 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Wed, 13 May 2009 02:13:58 GMT Message-Id: <200905130213.n4D2Dwrw017060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhaoshuai@FreeBSD.org using -f From: Zhao Shuai To: Perforce Change Reviews Cc: Subject: PERFORCE change 161998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 02:14:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=161998 Change 161998 by zhaoshuai@zhaoshuai on 2009/05/13 02:13:58 custom kernel profile Affected files ... .. //depot/projects/soc2009/fifo/sys/i386/conf/MYKERNEL#2 edit Differences ... ==== //depot/projects/soc2009/fifo/sys/i386/conf/MYKERNEL#2 (text+ko) ==== @@ -335,3 +335,7 @@ device fwip # IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver device dcons_crom # Configuration ROM for dcons + +#display +options VESA +options SC_PIXEL_MODE From owner-p4-projects@FreeBSD.ORG Wed May 13 02:35:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33AF21065670; Wed, 13 May 2009 02:35:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6CCD106566B for ; Wed, 13 May 2009 02:35:20 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D42578FC14 for ; Wed, 13 May 2009 02:35:20 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4D2ZKJZ018951 for ; Wed, 13 May 2009 02:35:20 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4D2ZKFu018949 for perforce@freebsd.org; Wed, 13 May 2009 02:35:20 GMT (envelope-from antab@FreeBSD.org) Date: Wed, 13 May 2009 02:35:20 GMT Message-Id: <200905130235.n4D2ZKFu018949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 02:35:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=162000 Change 162000 by antab@antab_farm on 2009/05/13 02:34:49 * Lots of pmap changes, most of it copied from i386 and modified. * Mark page PTE_ACCESSED when its inserted into the tlb. * Route tlb protection fault for usermode to trap_pfault() * Move tblehi and tlbear into struct trapframe instead of passing it as parameter to trap(), its only stored for tlb exceptions. * Add show tlb ddb command, dumps all tlb entries * Add show sysreg ddb command, used to view system registers. fork() seems to work now, but later panics on execve(). Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#12 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#18 edit .. //depot/projects/avr32/src/sys/avr32/avr32/support.S#12 edit .. //depot/projects/avr32/src/sys/avr32/avr32/switch.S#13 edit .. //depot/projects/avr32/src/sys/avr32/avr32/tlb.c#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/trap.c#9 edit .. //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#11 edit .. //depot/projects/avr32/src/sys/avr32/include/asm.h#5 edit .. //depot/projects/avr32/src/sys/avr32/include/atomic.h#7 edit .. //depot/projects/avr32/src/sys/avr32/include/cpu.h#6 edit .. //depot/projects/avr32/src/sys/avr32/include/frame.h#3 edit .. //depot/projects/avr32/src/sys/avr32/include/pmap.h#8 edit .. //depot/projects/avr32/src/sys/avr32/include/pte.h#7 edit .. //depot/projects/avr32/src/sys/avr32/include/tlb.h#6 edit .. //depot/projects/avr32/src/sys/avr32/include/trap.h#8 edit .. //depot/projects/avr32/src/sys/conf/files.avr32#15 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/exception.S#12 (text+ko) ==== @@ -127,14 +127,15 @@ cp.w r2, 0 /* No entry */ breq tlb_miss_long - /* Mark dirty if write miss */ + /* Mark access and dirty if write miss */ mfsr r3, AT32_SYS_ECR /* Get exception number */ cp.w r3, T_TLB_MISS_WRITE /* Check if Write miss */ - brne tlb_miss_1 + brne 1f orl r2, PTE_DIRTY /* Mark page if so */ +1: orl r2, PTE_ACCESSED /* Mark page accessed */ st.w r0, r2 /* Save entry */ -tlb_miss_1: + andl r2, lo(~PTE_SOFTWARE_MASK) /* Mask out software */ orl r2, PTE_SIZE_4K /* All pages are 4k */ @@ -171,14 +172,12 @@ */ tlb_miss_long: popm r0-r3 - PUSH_TRAPFRAME(EX) + PUSH_TLB_TRAPFRAME(EX) mfsr r12, AT32_SYS_ECR mov r11, sp - mfsr r10, AT32_SYS_TLBEAR - mfsr r9, AT32_SYS_TLBEHI csrf AT32_SYS_SR_EM /* Enable exceptions */ rcall trap - POP_TRAPFRAME(EX) + POP_TLB_TRAPFRAME(EX) rete tlb_at_ptr: @@ -268,14 +267,12 @@ * Trap running in Exception mode */ ENTRY(handle_tlb_exception) - PUSH_TRAPFRAME(EX) + PUSH_TLB_TRAPFRAME(EX) mfsr r12, AT32_SYS_ECR mov r11, sp - mfsr r10, AT32_SYS_TLBEAR - mfsr r9, AT32_SYS_TLBEHI call trap call handle_ast - POP_TRAPFRAME(EX) + POP_TLB_TRAPFRAME(EX) rete END(handle_tlb_exception) ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#18 (text+ko) ==== @@ -35,24 +35,33 @@ #include #include -// antab: What does this stand for? +#define PV_ENTRY_ZONE_MIN 2048 + #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 #endif static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags); -static int page_is_managed(vm_offset_t pa); -static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m, boolean_t wired); +static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static void pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va); static void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); -static int pmap_remove_pte(struct pmap *pmap, pt_entry_t *ptq, vm_offset_t va); -static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); -static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); -static int _pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m); -static __inline int pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m); +static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, + vm_page_t *free); +static void pmap_remove_page(pmap_t pmap, vm_offset_t va, vm_page_t *free); +static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t *); +static int _pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m, vm_page_t *free); +static __inline int pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m, vm_page_t *free); +static void pmap_invalidate_page(pmap_t pmap, vm_offset_t va); +static void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva); static void pmap_invalidate_all(pmap_t pmap); +static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, + vm_page_t m, vm_prot_t prot, vm_page_t mpte); +static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, + vm_page_t m); +static __inline void pmap_free_zero_pages(vm_page_t free); + struct pmap kernel_pmap_store; vm_offset_t kernel_vm_end = 0; @@ -164,6 +173,7 @@ pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); + uma_prealloc(pvzone, PV_ENTRY_ZONE_MIN); } /* @@ -191,8 +201,9 @@ pmap_pinit(pmap_t pmap) { vm_page_t ptdpg; + int i; + PMAP_LOCK_INIT(pmap); - int i; /* allocate the page directory page */ ptdpg = vm_page_alloc(NULL, 512, @@ -224,6 +235,7 @@ { pmap_t pmap, oldpmap; + critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); oldpmap = PCPU_GET(curpmap); @@ -233,13 +245,34 @@ pmap_asid_alloc(pmap); /* XXX: Set tlbear here? */ PCPU_SET(curpmap, pmap); + critical_exit(); } boolean_t pmap_is_modified(vm_page_t m) { - avr32_impl(); - return (0); + pv_entry_t pv; + pt_entry_t *pte; + boolean_t rv; + + rv = FALSE; + if (m->flags & PG_FICTITIOUS) { + return (rv); + } + + sched_pin(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + PMAP_LOCK(pv->pv_pmap); + pte = pmap_pte(pv->pv_pmap, pv->pv_va); + rv = (*pte & PTE_DIRTY) != 0; + PMAP_UNLOCK(pv->pv_pmap); + if (rv) { + break; + } + } + sched_unpin(); + return (rv); } void @@ -248,27 +281,22 @@ pv_entry_t pv; pt_entry_t *pte; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->flags & PG_FICTITIOUS) { return; } - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (m->md.pv_flags & PV_TABLE_MOD) { - panic("Need to look more into this"); - /* - * Loop over all current mappings - */ - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - PMAP_LOCK(pv->pv_pmap); - - pte = pmap_pte(pv->pv_pmap, pv->pv_va); - KASSERT((pte != NULL || pte != 0), ("Mapped page not found")); - *pte &= ~PTE_DIRTY; - - PMAP_UNLOCK(pv->pv_pmap); + sched_pin(); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + PMAP_LOCK(pv->pv_pmap); + pte = pmap_pte(pv->pv_pmap, pv->pv_va); + if (*pte & PTE_DIRTY) { + atomic_clear_32(pte, PTE_DIRTY); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } - m->md.pv_flags &= ~PV_TABLE_MOD; + PMAP_UNLOCK(pv->pv_pmap); } + sched_unpin(); } int @@ -302,11 +330,13 @@ if (!ent) { panic("pmap_kenter: not in kernel segment\n"); } - *ent = PTE_CACHEABLE | PTE_PERM_READ | PTE_PERM_WRITE | PTE_GLOBAL; - pfn_set(*ent, pa); + *ent = pa | PTE_CACHEABLE | PTE_PERM_RW | PTE_GLOBAL; - /* No need to do any tlb inserts, will just get a miss exception - * when the page is needed */ + /* + * No need to do any tlb inserts, will just get a miss exception + * when the page is needed, but has the page been invalidated + * before calling this? + */ } /* @@ -319,7 +349,6 @@ ent = pmap_pte(kernel_pmap, va); *ent = 0; - tlb_remove_entry(kernel_pmap, va); } /* @@ -411,31 +440,61 @@ } void -pmap_qenter(vm_offset_t va, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) { + pt_entry_t *pte, oldpte; + vm_offset_t va; int i; - for (i = 0; i < count; i++) { - pmap_kenter(va, VM_PAGE_TO_PHYS(m[i])); - va += PAGE_SIZE; + oldpte = 0; + for (i = 0, va = sva; i < count; i++, va += PAGE_SIZE) { + pte = pmap_pte(kernel_pmap, va); + KASSERT(pte != NULL, ("pmap_qenter: page entry not found\n")); + + oldpte |= *pte; + *pte = VM_PAGE_TO_PHYS(m[i]) | PTE_CACHEABLE | PTE_PERM_RW | + PTE_GLOBAL; + } + + if ((oldpte & PTE_ACCESSED) != 0) { + pmap_invalidate_range(kernel_pmap, sva, sva + count * + PAGE_SIZE); } } void -pmap_qremove(vm_offset_t va, int count) +pmap_qremove(vm_offset_t sva, int count) { + vm_offset_t va; + + va = sva; while (count-- > 0) { pmap_kremove(va); va += PAGE_SIZE; - } + } + pmap_invalidate_range(kernel_pmap, sva, va); +} + +/*************************************************** + * Page table page management routines..... + ***************************************************/ +static __inline void +pmap_free_zero_pages(vm_page_t free) +{ + vm_page_t m; + + while (free != NULL) { + m = free; + free = m->right; + /* Preserve the page's PG_ZERO setting. */ + vm_page_free_toq(m); + } } void pmap_page_init(vm_page_t m) { TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; - m->md.pv_flags = 0; } /* @@ -463,7 +522,7 @@ va += PAGE_SIZE; start += PAGE_SIZE; } - + pmap_invalidate_range(kernel_pmap, sva, va); *virt = va; return (sva); } @@ -482,12 +541,21 @@ pt_entry_t *pte; pt_entry_t origpte, newpte; vm_page_t mpte, om; + boolean_t invalidate; + + mpte = NULL; + va &= ~PAGE_MASK; + KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); + vm_page_lock_queues(); PMAP_LOCK(pmap); + sched_pin(); - va &= ~PAGE_MASK; - mpte = NULL; + /* + * In the case that a page table page is not + * resident, we are creating it here. + */ if (va < VM_MAXUSER_ADDRESS) { mpte = pmap_allocpte(pmap, va, M_WAITOK); } @@ -496,10 +564,11 @@ if (pte == NULL) { panic("pmap_enter: Invalid page directory, va=0x%08X\n", va); } + pa = VM_PAGE_TO_PHYS(m); om = NULL; origpte = *pte; - opa = pfn_get(origpte); + opa = origpte & PTE_PFN; /* Mapping has not changed, must be proection or wired changed */ if (origpte != 0 && opa == pa) { @@ -525,8 +594,9 @@ * We might be turning off write access to the page, so we * go ahead and sense modify status. */ - if (page_is_managed(opa)) { + if (origpte & PTE_MANAGED) { om = m; + pa |= PTE_MANAGED; } goto update; } @@ -536,11 +606,11 @@ if (origpte & PTE_WIRED) { pmap->pm_stats.wired_count--; } - if (page_is_managed(opa)) { + if (origpte & PTE_MANAGED) { om = PHYS_TO_VM_PAGE(opa); pmap_remove_entry(pmap, om, va); } - if (mpte) { + if (mpte != NULL) { mpte->wire_count--; KASSERT(mpte->wire_count > 0, ("pmap_enter: missing reference to page table page," @@ -554,7 +624,8 @@ if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva, ("pmap_enter: managed mapping within the clean submap")); - pmap_insert_entry(pmap, va, mpte, m, wired); + pmap_insert_entry(pmap, va, m); + pa |= PTE_MANAGED; } /* Increment counters */ @@ -563,8 +634,7 @@ } update: - newpte = 0; - pfn_set(newpte, pa); + newpte = (pt_entry_t)pa; if (prot & VM_PROT_READ) { newpte |= PTE_PERM_READ; } @@ -579,31 +649,47 @@ if (wired) { newpte |= PTE_WIRED; } + if (pmap == kernel_pmap) { + newpte |= PTE_GLOBAL; + } /* Mapping changed, update */ - if (origpte != newpte) { + if ((origpte & ~(PTE_DIRTY | PTE_ACCESSED)) != newpte) { + newpte |= PTE_ACCESSED; + if ((access & VM_PROT_WRITE) != 0) { + newpte |= PTE_DIRTY; + } if (origpte != 0) { - *pte = newpte; - if (page_is_managed(opa) && (opa != pa)) { - if (om->md.pv_flags & PV_TABLE_REF) { + invalidate = FALSE; + origpte = atomic_load_store_32(pte, newpte); + if (origpte & PTE_ACCESSED) { + if (origpte & PTE_MANAGED) { vm_page_flag_set(om, PG_REFERENCED); } - om->md.pv_flags &= ~(PV_TABLE_REF | PV_TABLE_MOD); + if (opa != VM_PAGE_TO_PHYS(m)) { + invalidate = TRUE; + } + if ((origpte & PTE_PERM_EXECUTE) == 0 && + (newpte & PTE_PERM_EXECUTE) != 0) { + invalidate = TRUE; + } } if (origpte & PTE_DIRTY) { - KASSERT((origpte & PTE_RW), - ("pmap_enter: modified page not writable:" - " va: 0x%x, pte: 0x%x", va, origpte)); - if (page_is_managed(opa)) { + if ((origpte & PTE_MANAGED) != 0) { vm_page_dirty(om); } + if ((prot & VM_PROT_WRITE) == 0) { + invalidate = TRUE; + } } + if (invalidate) { + pmap_invalidate_page(pmap, va); + } } else { *pte = newpte; } } - tlb_update_entry(pmap, va, newpte); /* * XXX: Sync I & D caches for executable pages. Do this only if the the @@ -616,6 +702,7 @@ avr32_dcache_wbinv_range(va, PAGE_SIZE); } + sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -626,15 +713,23 @@ void pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { - pt_entry_t *pte; - vm_page_t mpte = NULL; + PMAP_LOCK(pmap); + pmap_enter_quick_locked(pmap, va, m, prot, NULL); + PMAP_UNLOCK(pmap); +} + +static vm_page_t +pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_prot_t prot, vm_page_t mpte) +{ + pt_entry_t *pte, newpte; + vm_page_t free; KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, ("pmap_enter_quick_locked: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); - PMAP_LOCK(pmap); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* * In the case that a page table page is not @@ -651,7 +746,6 @@ if (mpte && (mpte->pindex == pdindex)) { mpte->wire_count++; } else { -retry: /* * Get the page directory entry */ @@ -667,16 +761,7 @@ } else { mpte = _pmap_allocpte(pmap, pdindex, M_NOWAIT); if (mpte == NULL) { - PMAP_UNLOCK(pmap); - vm_page_busy(m); - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(m->object); - VM_WAIT; - VM_OBJECT_LOCK(m->object); - vm_page_lock_queues(); - vm_page_wakeup(m); - PMAP_LOCK(pmap); - goto retry; + return (NULL); } } } @@ -687,17 +772,27 @@ pte = pmap_pte(pmap, va); if (*pte) { if (mpte != NULL) { - pmap_unwire_pte_hold(pmap, mpte); + // XXX: Seems we should call pmap_unwire_pte_hold here? + mpte->wire_count--; + mpte = NULL; } - PMAP_UNLOCK(pmap); - return; + return (mpte); } /* * Enter on the PV list if part of our managed memory. */ - if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { - pmap_insert_entry(pmap, va, mpte, m, FALSE); + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0 && + !pmap_try_insert_pv_entry(pmap, va, m)) { + if (mpte != NULL) { + free = NULL; + if (pmap_unwire_pte_hold(pmap, mpte, &free)) { + pmap_invalidate_page(pmap, va); + pmap_free_zero_pages(free); + } + mpte = NULL; + } + return (mpte); } /* @@ -705,17 +800,22 @@ */ pmap->pm_stats.resident_count++; - pfn_set(*pte, VM_PAGE_TO_PHYS(m)); + newpte = VM_PAGE_TO_PHYS(m); if (prot & VM_PROT_READ) { - *pte |= PTE_PERM_READ; + newpte |= PTE_PERM_READ; } if (prot & VM_PROT_WRITE) { - *pte |= PTE_PERM_WRITE; + newpte |= PTE_PERM_WRITE; } if (prot & VM_PROT_EXECUTE) { - *pte |= PTE_PERM_EXECUTE; + newpte |= PTE_PERM_EXECUTE; + } + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + newpte |= PTE_MANAGED; } - PMAP_UNLOCK(pmap); + *pte = newpte; + + return (mpte); } @@ -735,21 +835,20 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m_start, vm_prot_t prot) { - vm_page_t m; + vm_page_t m, mpte; vm_pindex_t diff, psize; + VM_OBJECT_LOCK_ASSERT(m_start->object, MA_OWNED); psize = atop(end - start); + mpte = NULL; m = m_start; + PMAP_LOCK(pmap); while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { - /* FIX ME FIX ME - prot is passed in both the - * the normal spot m, prot but also as the fault_type - * which we don't use. If we ever use it in pmap_enter - * we will have to fix this. - */ - pmap_enter(pmap, start + ptoa(diff), prot, m, prot & - (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); + mpte = pmap_enter_quick_locked(pmap, start + ptoa(diff), m, + prot, mpte); m = TAILQ_NEXT(m, listq); } + PMAP_UNLOCK(pmap); } void @@ -757,16 +856,17 @@ { vm_offset_t va; pt_entry_t *pte; + vm_page_t free = NULL; + int anyvalid; - if (pmap == NULL) { + if (pmap->pm_stats.resident_count == 0) { return; } - if (pmap->pm_stats.resident_count == 0) { - return; - } + anyvalid = 0; vm_page_lock_queues(); + sched_pin(); PMAP_LOCK(pmap); /* @@ -774,68 +874,89 @@ * and easy to short circuit some code. */ if ((sva + PAGE_SIZE) == eva) { - pmap_remove_page(pmap, sva); + pmap_remove_page(pmap, sva, &free); goto out; } for (va = sva; va < eva; va += PAGE_SIZE) { + if (pmap->pm_stats.resident_count == 0) { + break; + } + pte = pmap_pte(pmap, va); if (!pte || !*pte) { continue; } - pmap_remove_page(pmap, va); + + if ((*pte & PTE_GLOBAL) == 0) { + anyvalid = 1; + } + pmap_remove_pte(pmap, pte, va, &free); } out: + + if (anyvalid) { + pmap_invalidate_all(pmap); + } + sched_unpin(); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); - PMAP_UNLOCK(pmap); + pmap_free_zero_pages(free); } void pmap_remove_all(vm_page_t m) { register pv_entry_t pv; - register pt_entry_t *pte; + register pt_entry_t *pte, tpte; + vm_page_t free; + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (m->md.pv_flags & PV_TABLE_REF) { - vm_page_flag_set(m, PG_REFERENCED); - } - + sched_pin(); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pv->pv_pmap->pm_stats.resident_count--; - /* * Update the vm_page_t clean and reference bits. */ pte = pmap_pte(pv->pv_pmap, pv->pv_va); - if (*pte & PTE_WIRED) { + KASSERT(pte != NULL, ("pv_entry has invalid pte\n")); + tpte = atomic_readandclear_32(pte); + + if (tpte & PTE_WIRED) { pv->pv_pmap->pm_stats.wired_count--; } - if (*pte & PTE_DIRTY) { + if (tpte & PTE_ACCESSED) { + vm_page_flag_set(m, PG_REFERENCED); + } + if (tpte & PTE_DIRTY) { + KASSERT((tpte & PTE_PERM_WRITE), + ("pmap_remove_all: modified page not writable: va: %#x, pte: %#jx", + pv->pv_va, (uintmax_t)tpte)); vm_page_dirty(m); } - *pte = 0; - tlb_remove_entry(pv->pv_pmap, pv->pv_va); - + free = NULL; + pmap_unuse_pt(pv->pv_pmap, pv->pv_va, &free); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pmap_free_zero_pages(free); TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; PMAP_UNLOCK(pv->pv_pmap); free_pv_entry(pv); } - vm_page_flag_clear(m, PG_WRITEABLE); - m->md.pv_flags &= ~(PV_TABLE_REF | PV_TABLE_MOD); + sched_unpin(); } void pmap_remove_pages(pmap_t pmap) { - pv_entry_t pv, npv; - pt_entry_t *pte; - vm_page_t m; + vm_page_t m, free = NULL; + pv_entry_t pv, next_pv; + pt_entry_t *pte, tpte; if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) { printf("warning: pmap_remove_pages called with non-current pmap\n"); @@ -845,45 +966,47 @@ PMAP_LOCK(pmap); sched_pin(); - for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - npv = TAILQ_NEXT(pv, pv_plist); - + TAILQ_FOREACH_SAFE(pv, &pmap->pm_pvlist, pv_plist, next_pv) { pte = pmap_pte(pv->pv_pmap, pv->pv_va); KASSERT(pte != NULL, ("page on pm_pvlist has no pte\n")); + tpte = atomic_load_32(pte); /* We cannot remove wired pages from a process' mapping at this time */ - if (*pte & PTE_WIRED) { + if (tpte & PTE_WIRED) { continue; } + m = PHYS_TO_VM_PAGE(tpte & PTE_PFN); + KASSERT(m->phys_addr == (tpte & PTE_PFN), + ("vm_page_t %p phys_addr mismatch %016jx %016jx", + m, (uintmax_t)m->phys_addr, + (uintmax_t)tpte)); - m = PHYS_TO_VM_PAGE(pfn_get(*pte)); KASSERT(m < &vm_page_array[vm_page_array_size], - ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)*pte)); + ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); + pv->pv_pmap->pm_stats.resident_count--; + *pte = 0; /* Update the vm_page_t clean and reference bits. */ - if (*pte & PTE_DIRTY) { + if (tpte & PTE_DIRTY) { vm_page_dirty(m); } /* Remove from lists and free */ - pv->pv_pmap->pm_stats.resident_count--; TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); - - m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) { vm_page_flag_clear(m, PG_WRITEABLE); } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pv->pv_pmap, pv->pv_va, &free); free_pv_entry(pv); } - sched_unpin(); pmap_invalidate_all(pmap); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); - vm_page_unlock_queues(); + pmap_free_zero_pages(free); } /* @@ -891,23 +1014,22 @@ * conditionally free the page, and manage the hold/wire counts. */ static int -pmap_unuse_pt(pmap_t pmap, vm_offset_t va, vm_page_t mpte) +pmap_unuse_pt(pmap_t pmap, vm_offset_t va, vm_page_t *free) { pd_entry_t pteva; + vm_page_t mpte; if (va >= VM_MAXUSER_ADDRESS) { return (0); } - if (mpte == NULL) { - pteva = *pmap_pde(pmap, va); - mpte = PHYS_TO_VM_PAGE(AVR32_P1_TO_PHYS(pteva)); - } - return pmap_unwire_pte_hold(pmap, mpte); + pteva = *pmap_pde(pmap, va); + mpte = PHYS_TO_VM_PAGE(AVR32_P1_TO_PHYS(pteva)); + return (pmap_unwire_pte_hold(pmap, mpte, free)); } static int -_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) +_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m, vm_page_t *free) { /* * Unmap the page table page @@ -915,134 +1037,177 @@ pmap->pm_pd[m->pindex] = 0; --pmap->pm_stats.resident_count; + atomic_subtract_32(&cnt.v_wire_count, 1); + /* - * If the page is finally unwired, simply free it. + * If the page is finally unwired, then add it to the free list */ - vm_page_free_zero(m); - atomic_subtract_int(&cnt.v_wire_count, 1); + m->right = *free; + *free = m; return (1); } static __inline int -pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) +pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m, vm_page_t *free) { --m->wire_count; if (m->wire_count == 0) { - return (_pmap_unwire_pte_hold(pmap, m)); + return (_pmap_unwire_pte_hold(pmap, m, free)); } else { return (0); } } static void +pmap_invalidate_page(pmap_t pmap, vm_offset_t va) +{ + if (pmap->pm_asid_generation < PCPU_GET(asid_generation)) { + return; + } + + sched_pin(); + tlb_remove_entry(pmap, va); + sched_unpin(); +} + +static void +pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + vm_offset_t addr; + + if (pmap->pm_asid_generation < PCPU_GET(asid_generation)) { + return; + } + + sched_pin(); + for (addr = sva; addr < eva; addr += PAGE_SIZE) { + panic("pmap_invalidate_range"); // addr + } + sched_unpin(); +} + +static void pmap_invalidate_all(pmap_t pmap) { - /* XXX: Need to implement this. */ + pv_entry_t pv; + + if (pmap->pm_asid_generation < PCPU_GET(asid_generation)) { + return; + } + sched_pin(); + TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) { + tlb_remove_entry(pmap, pv->pv_va); + } + sched_unpin(); } void pmap_remove_write(vm_page_t m) { - pv_entry_t pv, npv; - vm_offset_t va; - pt_entry_t *pte; + pv_entry_t pv; + pt_entry_t oldpte, *pte; - if ((m->flags & PG_WRITEABLE) == 0) { + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if ((m->flags & PG_FICTITIOUS) != 0 || + (m->flags & PG_WRITEABLE) == 0) { return; } - /* - * Loop over all current mappings setting/clearing as appropos. - */ - for (pv = TAILQ_FIRST(&m->md.pv_list); pv; pv = npv) { - npv = TAILQ_NEXT(pv, pv_plist); + sched_pin(); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + PMAP_LOCK(pv->pv_pmap); pte = pmap_pte(pv->pv_pmap, pv->pv_va); - - if (pte == NULL) { - panic("page on pm_pvlist has no pte\n"); + KASSERT(pte != NULL, ("page on pv_list has no pte\n")); +retry: + oldpte = *pte; + if ((oldpte & PTE_PERM_WRITE) != 0) { + if (!atomic_cmpset_int(pte, oldpte, + oldpte & ~(PTE_PERM_WRITE | PTE_DIRTY))) { + goto retry; + } + if ((oldpte & PTE_DIRTY) != 0) { + vm_page_dirty(m); + } + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } - - va = pv->pv_va; - pmap_protect(pv->pv_pmap, va, va + PAGE_SIZE, - VM_PROT_READ | VM_PROT_EXECUTE); + PMAP_UNLOCK(pv->pv_pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + sched_unpin(); } /* * pmap_remove_pte: do the things to unmap a page in a process */ static int -pmap_remove_pte(struct pmap *pmap, pt_entry_t *pte, vm_offset_t va) +pmap_remove_pte(pmap_t pmap, pt_entry_t *pte, vm_offset_t va, vm_page_t *free) { vm_page_t m; - vm_offset_t pa; + pt_entry_t oldpte; mtx_assert(&vm_page_queue_mtx, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); + oldpte = atomic_readandclear_32(pte); + pmap->pm_stats.resident_count--; - if (*pte & PTE_WIRED) { + if (oldpte & PTE_WIRED) { pmap->pm_stats.wired_count--; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 13 04:22:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7027E106566C; Wed, 13 May 2009 04:22:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 087ED106564A for ; Wed, 13 May 2009 04:22:13 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E8D9F8FC15 for ; Wed, 13 May 2009 04:22:12 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4D4MCIf028965 for ; Wed, 13 May 2009 04:22:12 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4D4M9bV028959 for perforce@freebsd.org; Wed, 13 May 2009 04:22:09 GMT (envelope-from antab@FreeBSD.org) Date: Wed, 13 May 2009 04:22:09 GMT Message-Id: <200905130422.n4D4M9bV028959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 04:22:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=162004 Change 162004 by antab@antab_farm on 2009/05/13 04:22:00 IFC @ 161999 Affected files ... .. //depot/projects/avr32/src/UPDATING#7 integrate .. //depot/projects/avr32/src/bin/rm/rm.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/avr32/src/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/avr32/src/contrib/file/.cvsignore#2 delete .. //depot/projects/avr32/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/compress#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/epoc#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/graphviz#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/images#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/mach#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/perl#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/printer#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/timezone#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/wireless#1 branch .. //depot/projects/avr32/src/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/avr32/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/avr32/src/contrib/file/Makefile.am-src#1 branch .. //depot/projects/avr32/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/file/README#2 integrate .. //depot/projects/avr32/src/contrib/file/TODO#2 integrate .. //depot/projects/avr32/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/avr32/src/contrib/file/apptype.c#2 integrate .. //depot/projects/avr32/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/avr32/src/contrib/file/asprintf.c#2 integrate .. //depot/projects/avr32/src/contrib/file/cdf.c#1 branch .. //depot/projects/avr32/src/contrib/file/cdf.h#1 branch .. //depot/projects/avr32/src/contrib/file/cdf_time.c#1 branch .. //depot/projects/avr32/src/contrib/file/compress.c#2 integrate .. //depot/projects/avr32/src/contrib/file/config.h.in#2 integrate .. //depot/projects/avr32/src/contrib/file/configure#2 integrate .. //depot/projects/avr32/src/contrib/file/configure.ac#2 integrate .. //depot/projects/avr32/src/contrib/file/encoding.c#1 branch .. //depot/projects/avr32/src/contrib/file/file.c#2 integrate .. //depot/projects/avr32/src/contrib/file/file.h#2 integrate .. //depot/projects/avr32/src/contrib/file/file.man#2 integrate .. //depot/projects/avr32/src/contrib/file/file_opts.h#2 integrate .. //depot/projects/avr32/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/avr32/src/contrib/file/funcs.c#2 integrate .. //depot/projects/avr32/src/contrib/file/getopt_long.c#2 integrate .. //depot/projects/avr32/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/avr32/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/avr32/src/contrib/file/magic.c#2 integrate .. //depot/projects/avr32/src/contrib/file/magic.h#2 integrate .. //depot/projects/avr32/src/contrib/file/magic.man#2 integrate .. //depot/projects/avr32/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/avr32/src/contrib/file/print.c#2 integrate .. //depot/projects/avr32/src/contrib/file/readcdf.c#1 branch .. //depot/projects/avr32/src/contrib/file/readelf.c#2 integrate .. //depot/projects/avr32/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/avr32/src/contrib/file/vasprintf.c#2 integrate .. //depot/projects/avr32/src/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/avr32/src/contrib/less/COPYING#2 integrate .. //depot/projects/avr32/src/contrib/less/FREEBSD-upgrade#2 integrate .. //depot/projects/avr32/src/contrib/less/LICENSE#2 integrate .. //depot/projects/avr32/src/contrib/less/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/less/NEWS#2 integrate .. //depot/projects/avr32/src/contrib/less/README#2 integrate .. //depot/projects/avr32/src/contrib/less/brac.c#2 integrate .. //depot/projects/avr32/src/contrib/less/ch.c#2 integrate .. //depot/projects/avr32/src/contrib/less/charset.c#2 integrate .. //depot/projects/avr32/src/contrib/less/charset.h#2 integrate .. //depot/projects/avr32/src/contrib/less/cmd.h#2 integrate .. //depot/projects/avr32/src/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/avr32/src/contrib/less/command.c#2 integrate .. //depot/projects/avr32/src/contrib/less/configure#2 integrate .. //depot/projects/avr32/src/contrib/less/configure.ac#2 integrate .. //depot/projects/avr32/src/contrib/less/decode.c#2 integrate .. //depot/projects/avr32/src/contrib/less/defines.ds#2 integrate .. //depot/projects/avr32/src/contrib/less/defines.o2#2 integrate .. //depot/projects/avr32/src/contrib/less/defines.o9#2 integrate .. //depot/projects/avr32/src/contrib/less/defines.wn#2 integrate .. //depot/projects/avr32/src/contrib/less/edit.c#2 integrate .. //depot/projects/avr32/src/contrib/less/filename.c#2 integrate .. //depot/projects/avr32/src/contrib/less/forwback.c#2 integrate .. //depot/projects/avr32/src/contrib/less/funcs.h#2 integrate .. //depot/projects/avr32/src/contrib/less/help.c#2 integrate .. //depot/projects/avr32/src/contrib/less/ifile.c#2 integrate .. //depot/projects/avr32/src/contrib/less/input.c#2 integrate .. //depot/projects/avr32/src/contrib/less/install.sh#2 integrate .. //depot/projects/avr32/src/contrib/less/jump.c#2 integrate .. //depot/projects/avr32/src/contrib/less/less.h#2 integrate .. //depot/projects/avr32/src/contrib/less/less.hlp#2 integrate .. //depot/projects/avr32/src/contrib/less/less.man#2 integrate .. //depot/projects/avr32/src/contrib/less/less.nro#2 integrate .. //depot/projects/avr32/src/contrib/less/lessecho.c#2 integrate .. //depot/projects/avr32/src/contrib/less/lessecho.man#2 integrate .. //depot/projects/avr32/src/contrib/less/lessecho.nro#2 integrate .. //depot/projects/avr32/src/contrib/less/lesskey.c#2 integrate .. //depot/projects/avr32/src/contrib/less/lesskey.h#2 integrate .. //depot/projects/avr32/src/contrib/less/lesskey.man#2 integrate .. //depot/projects/avr32/src/contrib/less/lesskey.nro#2 integrate .. //depot/projects/avr32/src/contrib/less/lglob.h#2 integrate .. //depot/projects/avr32/src/contrib/less/line.c#3 integrate .. //depot/projects/avr32/src/contrib/less/linenum.c#2 integrate .. //depot/projects/avr32/src/contrib/less/lsystem.c#2 integrate .. //depot/projects/avr32/src/contrib/less/main.c#2 integrate .. //depot/projects/avr32/src/contrib/less/mark.c#2 integrate .. //depot/projects/avr32/src/contrib/less/mkhelp.c#2 integrate .. //depot/projects/avr32/src/contrib/less/optfunc.c#2 integrate .. //depot/projects/avr32/src/contrib/less/option.c#2 integrate .. //depot/projects/avr32/src/contrib/less/option.h#2 integrate .. //depot/projects/avr32/src/contrib/less/opttbl.c#2 integrate .. //depot/projects/avr32/src/contrib/less/os.c#2 integrate .. //depot/projects/avr32/src/contrib/less/output.c#2 integrate .. //depot/projects/avr32/src/contrib/less/pckeys.h#2 integrate .. //depot/projects/avr32/src/contrib/less/position.c#2 integrate .. //depot/projects/avr32/src/contrib/less/position.h#2 integrate .. //depot/projects/avr32/src/contrib/less/prompt.c#2 integrate .. //depot/projects/avr32/src/contrib/less/screen.c#2 integrate .. //depot/projects/avr32/src/contrib/less/scrsize.c#2 integrate .. //depot/projects/avr32/src/contrib/less/search.c#2 integrate .. //depot/projects/avr32/src/contrib/less/signal.c#2 integrate .. //depot/projects/avr32/src/contrib/less/tags.c#2 integrate .. //depot/projects/avr32/src/contrib/less/ttyin.c#2 integrate .. //depot/projects/avr32/src/contrib/less/version.c#2 integrate .. //depot/projects/avr32/src/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/avr32/src/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/avr32/src/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/avr32/src/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/avr32/src/etc/rc.d/jail#3 integrate .. //depot/projects/avr32/src/gnu/usr.bin/patch/common.h#2 integrate .. //depot/projects/avr32/src/gnu/usr.bin/patch/inp.c#2 integrate .. //depot/projects/avr32/src/gnu/usr.bin/patch/patch.c#2 integrate .. //depot/projects/avr32/src/gnu/usr.bin/patch/pch.c#2 integrate .. //depot/projects/avr32/src/gnu/usr.bin/patch/pch.h#2 integrate .. //depot/projects/avr32/src/gnu/usr.bin/patch/util.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/Makefile#5 integrate .. //depot/projects/avr32/src/lib/libarchive/archive.h#5 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_disk_entry_from_file.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_compression_xz.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_empty.c#5 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_mtree.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_raw.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/tar.5#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/avr32/src/lib/libarchive/test/main.c#5 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test.h#4 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_compat_solaris_tar_acl.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_fuzz.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_pax_filename_encoding.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_cpio_bin_be.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_raw.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_raw.data.Z.uu#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_raw.data.uu#1 branch .. //depot/projects/avr32/src/lib/libbluetooth/Makefile#3 integrate .. //depot/projects/avr32/src/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/avr32/src/lib/libbluetooth/bluetooth.h#3 integrate .. //depot/projects/avr32/src/lib/libbluetooth/hci.c#2 integrate .. //depot/projects/avr32/src/lib/libc/arm/string/strncmp.S#2 integrate .. //depot/projects/avr32/src/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/avr32/src/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/avr32/src/lib/libc/gen/tcgetsid.3#2 integrate .. //depot/projects/avr32/src/lib/libc/gen/tcsetsid.3#1 branch .. //depot/projects/avr32/src/lib/libc/gen/termios.c#2 integrate .. //depot/projects/avr32/src/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/avr32/src/lib/libc/net/sourcefilter.c#3 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_set_qualifier.3#2 integrate .. //depot/projects/avr32/src/lib/libc/stdlib/ptsname.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/memchr.3#3 integrate .. //depot/projects/avr32/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/avr32/src/lib/libc/sys/jail.2#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/setfib.2#2 integrate .. //depot/projects/avr32/src/lib/libmagic/Makefile#2 integrate .. //depot/projects/avr32/src/lib/libmagic/config.h#2 integrate .. //depot/projects/avr32/src/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/avr32/src/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/avr32/src/lib/libutil/login_tty.c#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/amd64/rtld_machdep.h#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/arm/rtld_machdep.h#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/i386/rtld_machdep.h#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/mips/rtld_machdep.h#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/powerpc/rtld_machdep.h#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/avr32/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/avr32/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/avr32/src/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/avr32/src/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/avr32/src/sbin/ifconfig/iflagg.c#2 integrate .. //depot/projects/avr32/src/sbin/newfs/newfs.8#2 integrate .. //depot/projects/avr32/src/sbin/pflogd/Makefile#2 integrate .. //depot/projects/avr32/src/sbin/savecore/savecore.8#2 integrate .. //depot/projects/avr32/src/sbin/tunefs/tunefs.8#2 integrate .. //depot/projects/avr32/src/share/man/man4/Makefile#5 integrate .. //depot/projects/avr32/src/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/isp.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/iwn.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/iwnfw.4#1 branch .. //depot/projects/avr32/src/share/man/man4/man4.i386/glxsb.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/avr32/src/share/man/man4/man4.powerpc/bm.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/man4.powerpc/tsec.4#1 branch .. //depot/projects/avr32/src/share/man/man4/mpt.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/ng_hole.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/pts.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/route.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/smp.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/u3g.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/ubsec.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/avr32/src/share/man/man5/fstab.5#2 integrate .. //depot/projects/avr32/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/avr32/src/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/avr32/src/share/misc/bsd-family-tree#3 integrate .. //depot/projects/avr32/src/share/misc/committers-ports.dot#4 integrate .. //depot/projects/avr32/src/share/misc/committers-src.dot#4 integrate .. //depot/projects/avr32/src/share/misc/iso3166#4 integrate .. //depot/projects/avr32/src/share/zoneinfo/africa#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/avr32/src/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/avr32/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/avr32/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/avr32/src/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/avr32/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/avr32/src/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/avr32/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/avr32/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/avr32/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/avr32/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/avr32/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/avr32/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/avr32/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/avr32/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/avr32/src/sys/arm/at91/at91_cfata.c#1 branch .. //depot/projects/avr32/src/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/avr32/src/sys/arm/at91/files.at91#4 integrate .. //depot/projects/avr32/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/avr32/src/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/avr32/src/sys/arm/conf/BWCT#4 integrate .. //depot/projects/avr32/src/sys/arm/conf/BWCT.hints#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/avr32/src/sys/arm/conf/CAMBRIA.hints#3 integrate .. //depot/projects/avr32/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/HL200#4 integrate .. //depot/projects/avr32/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/KB920X#4 integrate .. //depot/projects/avr32/src/sys/arm/conf/NSLU#3 integrate .. //depot/projects/avr32/src/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/avr32/src/sys/arm/include/param.h#3 integrate .. //depot/projects/avr32/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/avr32/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/avr32/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/avr32/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/avr32/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/avr32/src/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/avr32/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/avr32/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/avr32/src/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/avr32/src/sys/conf/NOTES#6 integrate .. //depot/projects/avr32/src/sys/conf/files#9 integrate .. //depot/projects/avr32/src/sys/conf/files.i386#5 integrate .. //depot/projects/avr32/src/sys/conf/files.pc98#5 integrate .. //depot/projects/avr32/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/avr32/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/avr32/src/sys/conf/options#5 integrate .. //depot/projects/avr32/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/avr32/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/avr32/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/avr32/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/avr32/src/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/avr32/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/avr32/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/avr32/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-sata.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/chipsets/ata-ati.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/avr32/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/avr32/src/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/avr32/src/sys/dev/bwi/bitops.h#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/bwimac.c#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/bwimac.h#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/bwiphy.c#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/bwiphy.h#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/bwirf.c#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/bwirf.h#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/if_bwi.c#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/if_bwi_pci.c#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/if_bwireg.h#1 branch .. //depot/projects/avr32/src/sys/dev/bwi/if_bwivar.h#1 branch .. //depot/projects/avr32/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_em.h#3 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/avr32/src/sys/dev/fb/creator.c#3 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/avr32/src/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/avr32/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/avr32/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/avr32/src/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/avr32/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/avr32/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/avr32/src/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/avr32/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/avr32/src/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/avr32/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/avr32/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/avr32/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/avr32/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_bus.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_compat_linux.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_generic.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_handle_request.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_request.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rumvar.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uralvar.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/usb_wlan.h#3 delete .. //depot/projects/avr32/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/avr32/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/avr32/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/avr32/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/avr32/src/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/avr32/src/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/avr32/src/sys/dev/xl/if_xl.c#3 integrate .. //depot/projects/avr32/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/avr32/src/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/avr32/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/avr32/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/avr32/src/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/avr32/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/avr32/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/avr32/src/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/avr32/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/avr32/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/avr32/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/avr32/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/avr32/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/avr32/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/avr32/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/avr32/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/avr32/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/avr32/src/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/avr32/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/avr32/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/avr32/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/avr32/src/sys/i386/conf/XBOX#4 integrate .. //depot/projects/avr32/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/avr32/src/sys/i386/cpufreq/hwpstate.c#2 integrate .. //depot/projects/avr32/src/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/avr32/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/avr32/src/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/avr32/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/avr32/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/avr32/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/param.h#3 integrate .. //depot/projects/avr32/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/avr32/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/avr32/src/sys/i386/linux/linux.h#3 integrate .. //depot/projects/avr32/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/avr32/src/sys/i386/xen/clock.c#3 integrate .. //depot/projects/avr32/src/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/avr32/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/avr32/src/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/avr32/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/avr32/src/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/avr32/src/sys/isa/atrtc.c#2 integrate .. //depot/projects/avr32/src/sys/isa/rtc.h#2 integrate .. //depot/projects/avr32/src/sys/kern/init_main.c#2 integrate .. //depot/projects/avr32/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_acct.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/avr32/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_osd.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_vimage.c#3 integrate .. //depot/projects/avr32/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/avr32/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/avr32/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/avr32/src/sys/kern/subr_smp.c#4 integrate .. //depot/projects/avr32/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/avr32/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/avr32/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/avr32/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/avr32/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/avr32/src/sys/kern/tty.c#6 integrate .. //depot/projects/avr32/src/sys/kern/tty_pts.c#5 integrate .. //depot/projects/avr32/src/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/avr32/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/avr32/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/avr32/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/avr32/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/avr32/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/avr32/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/avr32/src/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/avr32/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/avr32/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/avr32/src/sys/mips/conf/IDT#2 integrate .. //depot/projects/avr32/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/avr32/src/sys/mips/conf/QEMU#2 integrate .. //depot/projects/avr32/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/avr32/src/sys/mips/include/param.h#3 integrate .. //depot/projects/avr32/src/sys/mips/include/pmap.h#3 integrate .. //depot/projects/avr32/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/avr32/src/sys/modules/Makefile#6 integrate .. //depot/projects/avr32/src/sys/modules/bwi/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/linux/Makefile#3 integrate .. //depot/projects/avr32/src/sys/modules/opensolaris/Makefile#3 integrate .. //depot/projects/avr32/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/avr32/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/avr32/src/sys/net/bpf.c#3 integrate .. //depot/projects/avr32/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/avr32/src/sys/net/flowtable.c#2 integrate .. //depot/projects/avr32/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/avr32/src/sys/net/if.c#7 integrate .. //depot/projects/avr32/src/sys/net/if.h#4 integrate .. //depot/projects/avr32/src/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_bridge.c#5 integrate .. //depot/projects/avr32/src/sys/net/if_clone.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_dead.c#1 branch .. //depot/projects/avr32/src/sys/net/if_ef.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/avr32/src/sys/net/if_gif.c#4 integrate .. //depot/projects/avr32/src/sys/net/if_gif.h#4 integrate .. //depot/projects/avr32/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_loop.c#6 integrate .. //depot/projects/avr32/src/sys/net/if_mib.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_stf.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_tun.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_var.h#4 integrate .. //depot/projects/avr32/src/sys/net/netisr.c#2 integrate .. //depot/projects/avr32/src/sys/net/route.c#4 integrate .. //depot/projects/avr32/src/sys/net/rtsock.c#4 integrate .. //depot/projects/avr32/src/sys/net/vnet.h#6 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_adhoc.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_scan.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_superg.c#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_superg.h#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_wds.c#4 integrate .. //depot/projects/avr32/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/icmp6.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/igmp.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/in.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/avr32/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/in_var.h#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_mroute.h#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_output.c#7 integrate .. //depot/projects/avr32/src/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/avr32/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/vinet.h#6 integrate .. //depot/projects/avr32/src/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/in6.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/in6.h#3 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_mcast.c#1 branch .. //depot/projects/avr32/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/avr32/src/sys/netinet6/mld6.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/mld6.h#1 branch .. //depot/projects/avr32/src/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6.c#6 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/route6.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/vinet6.h#4 integrate .. //depot/projects/avr32/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/avr32/src/sys/netipsec/key.c#5 integrate .. //depot/projects/avr32/src/sys/netipsec/key.h#2 integrate .. //depot/projects/avr32/src/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/avr32/src/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/avr32/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/avr32/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_krpc.c#4 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/avr32/src/sys/nlm/nlm_advlock.c#2 integrate .. //depot/projects/avr32/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/avr32/src/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/avr32/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/avr32/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/avr32/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/avr32/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/swtch.S#3 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/avr32/src/sys/powerpc/conf/MPC85XX#3 integrate .. //depot/projects/avr32/src/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/avr32/src/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/param.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/mpc85xx/atpic.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/mpc85xx/isa.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/mpc85xx/ocpbus.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/mpc85xx/pci_ocp.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/bus_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_atalk.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_audit.c#4 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_cred.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/avr32/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/avr32/src/sys/sparc64/include/param.h#3 integrate .. //depot/projects/avr32/src/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/sun4v/include/param.h#3 integrate .. //depot/projects/avr32/src/sys/sys/_null.h#3 integrate .. //depot/projects/avr32/src/sys/sys/buf_ring.h#2 integrate .. //depot/projects/avr32/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/avr32/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/avr32/src/sys/sys/jail.h#4 integrate .. //depot/projects/avr32/src/sys/sys/kernel.h#3 integrate .. //depot/projects/avr32/src/sys/sys/ktr.h#2 integrate .. //depot/projects/avr32/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/avr32/src/sys/sys/mount.h#4 integrate .. //depot/projects/avr32/src/sys/sys/osd.h#3 integrate .. //depot/projects/avr32/src/sys/sys/param.h#7 integrate .. //depot/projects/avr32/src/sys/sys/priv.h#3 integrate .. //depot/projects/avr32/src/sys/sys/proc.h#3 integrate .. //depot/projects/avr32/src/sys/sys/queue.h#2 integrate .. //depot/projects/avr32/src/sys/sys/smp.h#3 integrate .. //depot/projects/avr32/src/sys/sys/socketvar.h#2 integrate .. //depot/projects/avr32/src/sys/sys/syscall.h#2 integrate .. //depot/projects/avr32/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/avr32/src/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/avr32/src/sys/sys/sysctl.h#4 integrate .. //depot/projects/avr32/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/avr32/src/sys/sys/termios.h#3 integrate .. //depot/projects/avr32/src/sys/sys/ucred.h#2 integrate .. //depot/projects/avr32/src/sys/sys/vimage.h#5 integrate .. //depot/projects/avr32/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/dinode.h#2 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/avr32/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/avr32/src/sys/vm/vm_fault.c#4 integrate .. //depot/projects/avr32/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/avr32/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/avr32/src/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/avr32/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/avr32/src/usr.bin/du/du.c#2 integrate .. //depot/projects/avr32/src/usr.bin/file/Makefile#2 integrate .. //depot/projects/avr32/src/usr.bin/file/config.h#2 delete .. //depot/projects/avr32/src/usr.bin/kdump/mkioctls#3 integrate .. //depot/projects/avr32/src/usr.bin/login/login_audit.c#2 integrate .. //depot/projects/avr32/src/usr.bin/ncal/Makefile#2 integrate .. //depot/projects/avr32/src/usr.bin/ncal/ncal.1#3 integrate .. //depot/projects/avr32/src/usr.bin/ncal/ncal.c#3 integrate .. //depot/projects/avr32/src/usr.bin/netstat/inet6.c#3 integrate .. //depot/projects/avr32/src/usr.bin/netstat/mroute.c#3 integrate .. //depot/projects/avr32/src/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/amd64-fbsd32.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/amd64-linux32.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/main.c#4 integrate .. //depot/projects/avr32/src/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/truss.1#3 integrate .. //depot/projects/avr32/src/usr.bin/truss/truss.h#2 integrate .. //depot/projects/avr32/src/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/avr32/src/usr.sbin/cpucontrol/cpucontrol.8#2 integrate .. //depot/projects/avr32/src/usr.sbin/crashinfo/crashinfo.8#2 integrate .. //depot/projects/avr32/src/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/avr32/src/usr.sbin/ifmcstat/ifmcstat.c#4 integrate .. //depot/projects/avr32/src/usr.sbin/jail/jail.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/kbdmap/kbdmap.1#2 integrate .. //depot/projects/avr32/src/usr.sbin/mtest/Makefile#2 integrate .. //depot/projects/avr32/src/usr.sbin/mtest/mtest.8#3 integrate .. //depot/projects/avr32/src/usr.sbin/mtest/mtest.c#3 integrate .. //depot/projects/avr32/src/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/ppp/ipv6cp.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/ppp/route.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/ppp/route.h#2 integrate .. //depot/projects/avr32/src/usr.sbin/setfib/setfib.1#2 integrate .. //depot/projects/avr32/src/usr.sbin/sysinstall/devices.c#4 integrate Differences ... ==== //depot/projects/avr32/src/UPDATING#7 (text+ko) ==== @@ -22,23 +22,129 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090430: + The layout of the following structs has changed: sysctl_oid, + socket, ifnet, inpcbinfo, tcpcb, syncache_head, vnet_inet, + vnet_inet6 and vnet_ipfw. Most modules need to be rebuild or + panics may be experienced. World rebuild is required for + correctly checking networking state from userland. + Bump __FreeBSD_version to 800085. + +20090429: + MLDv2 and Source-Specific Multicast (SSM) have been merged + to the IPv6 stack. VIMAGE hooks are in but not yet used. + The implementation of SSM within FreeBSD's IPv6 stack closely + follows the IPv4 implementation. + + For kernel developers: + + * The most important changes are that the ip6_output() and + ip6_input() paths no longer take the IN6_MULTI_LOCK, + and this lock has been downgraded to a non-recursive mutex. + + * As with the changes to the IPv4 stack to support SSM, filtering + of inbound multicast traffic must now be performed by transport + protocols within the IPv6 stack. This does not apply to TCP and + SCTP, however, it does apply to UDP in IPv6 and raw IPv6. + + * The KPIs used by IPv6 multicast are similar to those used by + the IPv4 stack, with the following differences: + * im6o_mc_filter() is analogous to imo_multicast_filter(). + * The legacy KAME entry points in6_joingroup and in6_leavegroup() + are shimmed to in6_mc_join() and in6_mc_leave() respectively. + * IN6_LOOKUP_MULTI() has been deprecated and removed. + * IPv6 relies on MLD for the DAD mechanism. KAME's internal KPIs + for MLDv1 have an additional 'timer' argument which is used to + jitter the initial membership report for the solicited-node + multicast membership on-link. + * This is not strictly needed for MLDv2, which already jitters + its report transmissions. However, the 'timer' argument is + preserved in case MLDv1 is active on the interface. + + * The KAME linked-list based IPv6 membership implementation has + been refactored to use a vector similar to that used by the IPv4 + stack. + Code which maintains a list of its own multicast memberships + internally, e.g. carp, has been updated to reflect the new + semantics. + + * There is a known Lock Order Reversal (LOR) due to in6_setscope() + acquiring the IF_AFDATA_LOCK and being called within ip6_output(). + Whilst MLDv2 tries to avoid this otherwise benign LOR, it is an + implementation constraint which needs to be addressed in HEAD. + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 13 04:26:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81E711065676; Wed, 13 May 2009 04:26:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4246E1065675 for ; Wed, 13 May 2009 04:26:17 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30D998FC18 for ; Wed, 13 May 2009 04:26:17 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4D4QHls029302 for ; Wed, 13 May 2009 04:26:17 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4D4QHYj029300 for perforce@freebsd.org; Wed, 13 May 2009 04:26:17 GMT (envelope-from antab@FreeBSD.org) Date: Wed, 13 May 2009 04:26:17 GMT Message-Id: <200905130426.n4D4QHYj029300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 04:26:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=162005 Change 162005 by antab@antab_farm on 2009/05/13 04:26:09 * Define CACHE_LINE_SHIFT and CACHE_LINE_SIZE * Remove opt_kdb.h include Affected files ... .. //depot/projects/avr32/src/libexec/rtld-elf/avr32/rtld_machdep.h#2 edit .. //depot/projects/avr32/src/sys/avr32/include/asm.h#6 edit .. //depot/projects/avr32/src/sys/avr32/include/param.h#4 edit Differences ... ==== //depot/projects/avr32/src/libexec/rtld-elf/avr32/rtld_machdep.h#2 (text+ko) ==== @@ -32,8 +32,6 @@ #include #include -#define CACHE_LINE_SIZE 32 - struct Struct_Obj_Entry; /* Return the address of the .dynamic section in the dynamic linker. */ ==== //depot/projects/avr32/src/sys/avr32/include/asm.h#6 (text+ko) ==== @@ -37,7 +37,6 @@ #ifndef _MACHINE_ASM_H_ #define _MACHINE_ASM_H_ -#include "opt_kdb.h" #include #define GLOBAL(sym) .globl sym; \ ==== //depot/projects/avr32/src/sys/avr32/include/param.h#4 (text+ko) ==== @@ -72,6 +72,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * CACHE_LINE_SIZE is the compile-time maximum cache line size for an + * architecture. It should be used with appropriate caution. + */ +#define CACHE_LINE_SHIFT 5 +#define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) + #define PAGE_SHIFT 12 #define PAGE_SIZE (1 << PAGE_SHIFT) /* Page size */ #define PAGE_MASK (PAGE_SIZE - 1) From owner-p4-projects@FreeBSD.ORG Wed May 13 13:57:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 013AF1065673; Wed, 13 May 2009 13:57:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B477C106566C for ; Wed, 13 May 2009 13:57:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A03BF8FC14 for ; Wed, 13 May 2009 13:57:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DDv4qV015742 for ; Wed, 13 May 2009 13:57:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DDv2bS015740 for perforce@freebsd.org; Wed, 13 May 2009 13:57:02 GMT (envelope-from jhb@freebsd.org) Date: Wed, 13 May 2009 13:57:02 GMT Message-Id: <200905131357.n4DDv2bS015740@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 162010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 13:57:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=162010 Change 162010 by jhb@jhb_jhbbsd on 2009/05/13 13:56:17 IFC @162009 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#93 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#13 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#77 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#51 integrate .. //depot/projects/smpng/sys/amd64/conf/XENHVM#3 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#22 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#40 integrate .. //depot/projects/smpng/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#20 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#17 integrate .. //depot/projects/smpng/sys/arm/conf/BWCT#9 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#8 integrate .. //depot/projects/smpng/sys/arm/conf/CRB#6 integrate .. //depot/projects/smpng/sys/arm/conf/DB-78XXX#4 integrate .. //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#4 integrate .. //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#4 integrate .. //depot/projects/smpng/sys/arm/conf/EP80219#10 integrate .. //depot/projects/smpng/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/smpng/sys/arm/conf/HL200#9 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#19 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#16 integrate .. //depot/projects/smpng/sys/arm/conf/NSLU#7 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#17 integrate .. //depot/projects/smpng/sys/arm/conf/SKYEYE#10 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#31 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#22 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#6 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.h#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#97 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.h#5 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#46 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#15 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.h#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#20 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#20 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.c#10 delete .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.h#3 delete .. //depot/projects/smpng/sys/conf/NOTES#167 integrate .. //depot/projects/smpng/sys/conf/files#238 integrate .. //depot/projects/smpng/sys/conf/files.i386#123 integrate .. //depot/projects/smpng/sys/conf/files.pc98#98 integrate .. //depot/projects/smpng/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/smpng/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#13 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#7 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#40 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#27 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#16 integrate .. //depot/projects/smpng/sys/dev/bwi/bwimac.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#7 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#21 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#60 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#32 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwivar.h#12 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#7 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#40 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#35 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#135 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/smpng/sys/dev/vge/if_vge.c#24 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#10 integrate .. //depot/projects/smpng/sys/dev/xen/console/console.c#7 integrate .. //depot/projects/smpng/sys/dev/xen/console/xencons_ring.c#4 integrate .. //depot/projects/smpng/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_vfsops.c#12 integrate .. //depot/projects/smpng/sys/fs/coda/coda_vfsops.c#6 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#21 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#31 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#79 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc.h#9 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#27 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#35 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#40 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#63 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs.h#2 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_var.h#2 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsport.h#2 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdkrpc.c#2 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsocket.c#2 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#40 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#31 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#28 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#25 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#28 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#27 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#31 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#41 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs.h#6 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#9 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#11 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#47 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#40 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#18 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#13 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#20 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#11 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#9 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#15 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#108 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#142 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#24 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#13 integrate .. //depot/projects/smpng/sys/i386/conf/XEN#7 integrate .. //depot/projects/smpng/sys/i386/cpufreq/hwpstate.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#132 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#15 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_syscall.h#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_sysent.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#19 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#16 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#17 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#19 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.h#14 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_syscall.h#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_sysent.c#13 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#22 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#69 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#12 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#12 integrate .. //depot/projects/smpng/sys/kern/init_main.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#55 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#138 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#118 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#100 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#55 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_vimage.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#22 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#21 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#122 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#115 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#120 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#60 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#8 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#58 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#92 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#165 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#145 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#95 integrate .. //depot/projects/smpng/sys/mips/conf/ADM5120#4 integrate .. //depot/projects/smpng/sys/mips/conf/IDT#6 integrate .. //depot/projects/smpng/sys/mips/conf/MALTA#4 integrate .. //depot/projects/smpng/sys/mips/conf/QEMU#3 integrate .. //depot/projects/smpng/sys/mips/conf/SENTRY5#6 integrate .. //depot/projects/smpng/sys/modules/opensolaris/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/sound/sound/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/svr4/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#16 integrate .. //depot/projects/smpng/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/zfs/Makefile#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#34 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#15 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#32 integrate .. //depot/projects/smpng/sys/netinet/in.c#52 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#26 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#108 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#19 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#63 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#15 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#25 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#36 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#55 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#70 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#65 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#49 integrate .. //depot/projects/smpng/sys/nlm/nlm_advlock.c#3 integrate .. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#5 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#12 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#68 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#57 integrate .. //depot/projects/smpng/sys/powerpc/conf/MPC85XX#7 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#14 integrate .. //depot/projects/smpng/sys/security/audit/audit_worker.c#12 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#92 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#54 integrate .. //depot/projects/smpng/sys/sys/_null.h#7 integrate .. //depot/projects/smpng/sys/sys/ioctl.h#9 integrate .. //depot/projects/smpng/sys/sys/ioctl_compat.h#8 integrate .. //depot/projects/smpng/sys/sys/kernel.h#44 integrate .. //depot/projects/smpng/sys/sys/mount.h#74 integrate .. //depot/projects/smpng/sys/sys/param.h#144 integrate .. //depot/projects/smpng/sys/sys/proc.h#197 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#58 integrate .. //depot/projects/smpng/sys/sys/ucred.h#31 integrate .. //depot/projects/smpng/sys/sys/vimage.h#9 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#113 integrate .. //depot/projects/smpng/sys/ufs/ufs/extattr.h#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#47 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#19 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#27 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#103 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#45 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#71 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#93 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.657 2009/03/22 04:32:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.658 2009/05/13 07:42:53 alc Exp $"); /* * Manages physical address maps. @@ -3556,7 +3556,7 @@ dstmpte->wire_count++; else if ((dstmpte = pmap_allocpte(dst_pmap, addr, M_NOWAIT)) == NULL) - break; + goto out; dst_pte = (pt_entry_t *) PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpte)); dst_pte = &dst_pte[pmap_pte_index(addr)]; @@ -3579,6 +3579,7 @@ addr); pmap_free_zero_pages(free); } + goto out; } if (dstmpte->wire_count >= srcmpte->wire_count) break; @@ -3587,6 +3588,7 @@ src_pte++; } } +out: vm_page_unlock_queues(); PMAP_UNLOCK(src_pmap); PMAP_UNLOCK(dst_pmap); ==== //depot/projects/smpng/sys/amd64/conf/DEFAULTS#13 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $ machine amd64 @@ -21,4 +21,4 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR -options FLOWTABLE +options FLOWTABLE ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#77 (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.524 2009/05/01 17:20:16 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -68,7 +68,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/smpng/sys/amd64/conf/NOTES#51 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.89 2009/03/16 10:36:24 dchagin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $ # # @@ -33,7 +33,7 @@ # # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -153,7 +153,7 @@ # # AGP debugging. # -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -288,7 +288,7 @@ device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath #device ath_rate_amrr # AMRR rate control for ath driver #device ath_rate_onoe # Onoe rate control for ath driver @@ -457,7 +457,7 @@ #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation ==== //depot/projects/smpng/sys/amd64/conf/XENHVM#3 (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/XENHVM,v 1.2 2009/05/06 17:52:38 dfr Exp $ +# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.3 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -69,12 +69,12 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks -options NO_ADAPTIVE_MUTEXES -options NO_ADAPTIVE_RWLOCKS +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -99,7 +99,7 @@ device fdc # Xen HVM support -options XENHVM +options XENHVM device xenpci # ATA and ATAPI devices ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#22 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.26 2009/05/07 09:39:20 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.27 2009/05/11 13:50:42 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -96,7 +96,7 @@ typedef struct { l_time_t tv_sec; l_suseconds_t tv_usec; -} __packed l_timeval; +} l_timeval; #define l_fd_set fd_set ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#40 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.49 2009/05/07 18:36:47 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.51 2009/05/10 18:43:43 dchagin Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -261,7 +261,17 @@ pos = base + (imgp->args->argc + imgp->args->envc + 2); AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz); + + /* + * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0, + * as it has appeared in the 2.4.0-rc7 first time. + * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), + * glibc falls back to the hard-coded CLK_TCK value when aux entry + * is not present. + * Also see linux_times() implementation. + */ + if (linux_kernver(curthread) >= LINUX_KERNVER_2004000) + AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, stclohz); AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent); AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum); @@ -1125,6 +1135,7 @@ linux_szplatform = roundup(strlen(linux_platform) + 1, sizeof(char *)); linux_osd_jail_register(); + stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else ==== //depot/projects/smpng/sys/arm/at91/at91_cfata.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.2 2009/04/23 00:00:57 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.3 2009/05/10 11:05:22 stas Exp $"); #include #include @@ -131,9 +131,9 @@ struct resource *r) { - KASSERT(type == SYS_RES_IRQ && *rid == ATA_IRQ_RID, + KASSERT(type == SYS_RES_IRQ && rid == ATA_IRQ_RID, ("[at91_cfata, %d]: illegal resource request (type %u rid %u)", - __LINE__, type, *rid)); + __LINE__, type, rid)); return (0); } ==== //depot/projects/smpng/sys/arm/at91/if_ate.c#20 (text) ==== @@ -23,18 +23,14 @@ * SUCH DAMAGE. */ -/* TODO: (in no order) +/* TODO * - * 8) Need to sync busdma goo in atestop - * 9) atestop should maybe free the mbufs? - * - * 1) detach - * 2) Free dma setup - * 3) Turn on the clock in pmc? Turn off? + * 1) Turn on the clock in pmc? Turn off? + * 2) GPIO initializtion in board setup code. */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.30 2008/11/25 00:14:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.35 2009/05/12 21:28:41 stas Exp $"); #include #include @@ -76,6 +72,12 @@ #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 +/* + * Driver-specific flags. + */ +#define ATE_FLAG_DETACHING 0x01 +#define ATE_FLAG_MULTICAST 0x02 + struct ate_softc { struct ifnet *ifp; /* ifnet pointer */ @@ -100,6 +102,8 @@ eth_rx_desc_t *rx_descs; int use_rmii; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ + int flags; + int if_flags; }; static inline uint32_t @@ -114,6 +118,13 @@ bus_write_4(sc->mem_res, off, val); } +static inline void +BARRIER(struct ate_softc *sc, bus_size_t off, bus_size_t len, int flags) +{ + + bus_barrier(sc->mem_res, off, len, flags); +} + #define ATE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define ATE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define ATE_LOCK_INIT(_sc) \ @@ -144,11 +155,12 @@ /* helper routines */ static int ate_activate(device_t dev); -static void ate_deactivate(device_t dev); +static void ate_deactivate(struct ate_softc *sc); static int ate_ifmedia_upd(struct ifnet *ifp); static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int ate_get_mac(struct ate_softc *sc, u_char *eaddr); static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_rxfilter(struct ate_softc *sc); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -170,11 +182,33 @@ struct ifnet *ifp = NULL; struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; - int err; u_char eaddr[ETHER_ADDR_LEN]; uint32_t rnd; + int rid, err; sc->dev = dev; + ATE_LOCK_INIT(sc); + + /* + * Allocate resources. + */ + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) { + device_printf(dev, "could not allocate memory resources.\n"); + err = ENOMEM; + goto out; + } + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->irq_res == NULL) { + device_printf(dev, "could not allocate interrupt resources.\n"); + err = ENOMEM; + goto out; + } + err = ate_activate(dev); if (err) goto out; @@ -188,8 +222,9 @@ CTLFLAG_RD, &sc->use_rmii, 0, "rmii in use"); /* calling atestop before ifp is set is OK */ + ATE_LOCK(sc); atestop(sc); - ATE_LOCK_INIT(sc); + ATE_UNLOCK(sc); callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { @@ -238,30 +273,70 @@ ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + sc->if_flags = ifp->if_flags; ether_ifattach(ifp, eaddr); /* - * Activate the interrupt + * Activate the interrupt. */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, NULL, ate_intr, sc, &sc->intrhand); if (err) { + device_printf(dev, "could not establish interrupt handler.\n"); ether_ifdetach(ifp); - ATE_LOCK_DESTROY(sc); + goto out; } -out:; + +out: if (err) - ate_deactivate(dev); - if (err && ifp) - if_free(ifp); + ate_detach(dev); return (err); } static int ate_detach(device_t dev) { - return EBUSY; /* XXX TODO(1) */ + struct ate_softc *sc; + struct ifnet *ifp; + + sc = device_get_softc(dev); + KASSERT(sc != NULL, ("[ate: %d]: sc is NULL", __LINE__)); + ifp = sc->ifp; + if (device_is_attached(dev)) { + ATE_LOCK(sc); + sc->flags |= ATE_FLAG_DETACHING; + atestop(sc); + ATE_UNLOCK(sc); + callout_drain(&sc->tick_ch); + ether_ifdetach(ifp); + } + if (sc->miibus != NULL) { + device_delete_child(dev, sc->miibus); + sc->miibus = NULL; + } + bus_generic_detach(sc->dev); + ate_deactivate(sc); + if (sc->intrhand != NULL) { + bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + sc->intrhand = NULL; + } + if (ifp != NULL) { + if_free(ifp); + sc->ifp = NULL; + } + if (sc->mem_res != NULL) { + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(sc->mem_res), sc->mem_res); + sc->mem_res = NULL; + } + if (sc->irq_res != NULL) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->irq_res), sc->irq_res); + sc->irq_res = NULL; + } + ATE_LOCK_DESTROY(sc); + return (0); } static void @@ -307,26 +382,39 @@ * of different MAC chips use this method (or the reverse the bits) * method. */ -static void +static int ate_setmcast(struct ate_softc *sc) { uint32_t index; uint32_t mcaf[2]; u_char *af = (u_char *) mcaf; struct ifmultiaddr *ifma; + struct ifnet *ifp; + ifp = sc->ifp; + + if ((ifp->if_flags & IFF_PROMISC) != 0) + return (0); + if ((ifp->if_flags & IFF_ALLMULTI) != 0) { + WR4(sc, ETH_HSL, 0xffffffff); + WR4(sc, ETH_HSH, 0xffffffff); + return (1); + } + + /* + * Compute the multicast hash. + */ mcaf[0] = 0; mcaf[1] = 0; - - IF_ADDR_LOCK(sc->ifp); - TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; af[index >> 3] |= 1 << (index & 7); } - IF_ADDR_UNLOCK(sc->ifp); + IF_ADDR_UNLOCK(ifp); /* * Write the hash to the hash register. This card can also @@ -337,26 +425,16 @@ */ WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); + return (mcaf[0] || mcaf[1]); } static int ate_activate(device_t dev) { struct ate_softc *sc; - int rid, err, i; + int err, i; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) - goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (sc->irq_res == NULL) - goto errout; - /* * Allocate DMA tags and maps */ @@ -399,7 +477,6 @@ sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), ate_getaddr, sc, 0) != 0) goto errout; - /* XXX TODO(5) Put this in ateinit_locked? */ for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { sc->rx_buf_ptr = i; if (bus_dmamem_alloc(sc->rxtag, (void **)&sc->rx_buf[i], @@ -415,65 +492,69 @@ /* Write the descriptor queue address. */ WR4(sc, ETH_RBQP, sc->rx_desc_phys); return (0); + errout: - ate_deactivate(dev); return (ENOMEM); } static void -ate_deactivate(device_t dev) +ate_deactivate(struct ate_softc *sc) { - struct ate_softc *sc; + int i; - sc = device_get_softc(dev); - /* XXX TODO(2) teardown busdma junk, below from fxp -- customize */ -#if 0 - if (sc->fxp_mtag) { - for (i = 0; i < FXP_NRFABUFS; i++) { - rxp = &sc->fxp_desc.rx_list[i]; - if (rxp->rx_mbuf != NULL) { - bus_dmamap_sync(sc->fxp_mtag, rxp->rx_map, - BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->fxp_mtag, rxp->rx_map); - m_freem(rxp->rx_mbuf); + KASSERT(sc != NULL, ("[ate, %d]: sc is NULL!", __LINE__)); + if (sc->mtag != NULL) { + for (i = 0; i < ATE_MAX_TX_BUFFERS; i++) { + if (sc->sent_mbuf[i] != NULL) { + bus_dmamap_sync(sc->mtag, sc->tx_map[i], + BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->mtag, sc->tx_map[i]); + m_freem(sc->sent_mbuf[i]); + } + bus_dmamap_destroy(sc->mtag, sc->tx_map[i]); + sc->sent_mbuf[i] = NULL; + sc->tx_map[i] = NULL; + } + bus_dma_tag_destroy(sc->mtag); + } + if (sc->rx_desc_tag != NULL) { + if (sc->rx_descs != NULL) { + if (sc->rx_desc_phys != 0) { + bus_dmamap_sync(sc->rx_desc_tag, + sc->rx_desc_map, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->rx_desc_tag, + sc->rx_desc_map); + sc->rx_desc_phys = 0; } - bus_dmamap_destroy(sc->fxp_mtag, rxp->rx_map); } - bus_dmamap_destroy(sc->fxp_mtag, sc->spare_map); - for (i = 0; i < FXP_NTXCB; i++) { - txp = &sc->fxp_desc.tx_list[i]; - if (txp->tx_mbuf != NULL) { - bus_dmamap_sync(sc->fxp_mtag, txp->tx_map, - BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->fxp_mtag, txp->tx_map); - m_freem(txp->tx_mbuf); + } + if (sc->rxtag != NULL) { + for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { + if (sc->rx_buf[i] != NULL) { + if (sc->rx_descs[i].addr != 0) { + bus_dmamap_sync(sc->rxtag, + sc->rx_map[i], + BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->rxtag, + sc->rx_map[i]); + sc->rx_descs[i].addr = 0; + } + bus_dmamem_free(sc->rxtag, sc->rx_buf[i], + sc->rx_map[i]); + sc->rx_buf[i] = NULL; + sc->rx_map[i] = NULL; } - bus_dmamap_destroy(sc->fxp_mtag, txp->tx_map); } - bus_dma_tag_destroy(sc->fxp_mtag); + bus_dma_tag_destroy(sc->rxtag); + } + if (sc->rx_desc_tag != NULL) { + if (sc->rx_descs != NULL) + bus_dmamem_free(sc->rx_desc_tag, sc->rx_descs, + sc->rx_desc_map); + bus_dma_tag_destroy(sc->rx_desc_tag); + sc->rx_descs = NULL; + sc->rx_desc_tag = NULL; } - if (sc->fxp_stag) - bus_dma_tag_destroy(sc->fxp_stag); - if (sc->cbl_tag) - bus_dma_tag_destroy(sc->cbl_tag); - if (sc->mcs_tag) - bus_dma_tag_destroy(sc->mcs_tag); -#endif - if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); - sc->intrhand = 0; - bus_generic_detach(sc->dev); - if (sc->miibus) - device_delete_child(sc->dev, sc->miibus); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; } /* @@ -512,18 +593,19 @@ static void ate_stat_update(struct ate_softc *sc, int active) { + uint32_t reg; + /* * The speed and full/half-duplex state needs to be reflected * in the ETH_CFG register. */ - if (IFM_SUBTYPE(active) == IFM_10_T) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_SPD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_SPD); + reg = RD4(sc, ETH_CFG); + reg &= ~(ETH_CFG_SPD | ETH_CFG_FD); + if (IFM_SUBTYPE(active) != IFM_10_T) + reg |= ETH_CFG_SPD; if (active & IFM_FDX) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_FD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_FD); + reg |= ETH_CFG_FD; + WR4(sc, ETH_CFG, reg); } static void @@ -635,11 +717,10 @@ { struct ate_softc *sc = xsc; struct ifnet *ifp = sc->ifp; - int status; + struct mbuf *mb; + void *bp; + uint32_t status, reg, rx_stat; int i; - void *bp; - struct mbuf *mb; - uint32_t rx_stat; status = RD4(sc, ETH_ISR); if (status == 0) @@ -653,7 +734,8 @@ bp = sc->rx_buf[i]; rx_stat = sc->rx_descs[i].status; if ((rx_stat & ETH_LEN_MASK) == 0) { - printf("ignoring bogus 0 len packet\n"); + if (bootverbose) + device_printf(sc->dev, "ignoring bogus zero-length packet\n"); bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; @@ -694,6 +776,7 @@ if (sc->sent_mbuf[0]) { bus_dmamap_sync(sc->mtag, sc->tx_map[0], BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->mtag, sc->tx_map[0]); m_freem(sc->sent_mbuf[0]); ifp->if_opackets++; sc->sent_mbuf[0] = NULL; @@ -702,6 +785,7 @@ if (RD4(sc, ETH_TSR) & ETH_TSR_IDLE) { bus_dmamap_sync(sc->mtag, sc->tx_map[1], BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->mtag, sc->tx_map[1]); m_freem(sc->sent_mbuf[1]); ifp->if_opackets++; sc->txcur = 0; @@ -724,10 +808,13 @@ ATE_UNLOCK(sc); } if (status & ETH_ISR_RBNA) { - printf("RBNA workaround\n"); /* Workaround Errata #11 */ - WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) &~ ETH_CTL_RE); - WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_RE); + if (bootverbose) + device_printf(sc->dev, "RBNA workaround\n"); + reg = RD4(sc, ETH_CTL); + WR4(sc, ETH_CTL, reg & ~ETH_CTL_RE); + BARRIER(sc, ETH_CTL, 4, BUS_SPACE_BARRIER_WRITE); + WR4(sc, ETH_CTL, reg | ETH_CTL_RE); } } @@ -740,6 +827,7 @@ struct ate_softc *sc = xsc; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 13 13:57:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46B4B10656EE; Wed, 13 May 2009 13:57:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7AA71065670 for ; Wed, 13 May 2009 13:57:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B39E78FC18 for ; Wed, 13 May 2009 13:57:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DDv428015747 for ; Wed, 13 May 2009 13:57:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DDv4PG015745 for perforce@freebsd.org; Wed, 13 May 2009 13:57:04 GMT (envelope-from jhb@freebsd.org) Date: Wed, 13 May 2009 13:57:04 GMT Message-Id: <200905131357.n4DDv4PG015745@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 162011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 13:57:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=162011 Change 162011 by jhb@jhb_jhbbsd on 2009/05/13 13:56:34 Branch section 9 manpages. Affected files ... .. //depot/projects/smpng/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/smpng/share/man/man9/BUF_LOCK.9#1 branch .. //depot/projects/smpng/share/man/man9/BUF_LOCKFREE.9#1 branch .. //depot/projects/smpng/share/man/man9/BUF_LOCKINIT.9#1 branch .. //depot/projects/smpng/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/smpng/share/man/man9/BUF_TIMELOCK.9#1 branch .. //depot/projects/smpng/share/man/man9/BUF_UNLOCK.9#1 branch .. //depot/projects/smpng/share/man/man9/BUS_ADD_CHILD.9#1 branch .. //depot/projects/smpng/share/man/man9/BUS_CONFIG_INTR.9#1 branch .. //depot/projects/smpng/share/man/man9/BUS_PRINT_CHILD.9#1 branch .. //depot/projects/smpng/share/man/man9/BUS_READ_IVAR.9#1 branch .. //depot/projects/smpng/share/man/man9/BUS_SETUP_INTR.9#1 branch .. //depot/projects/smpng/share/man/man9/CTASSERT.9#1 branch .. //depot/projects/smpng/share/man/man9/DB_COMMAND.9#1 branch .. //depot/projects/smpng/share/man/man9/DECLARE_GEOM_CLASS.9#1 branch .. //depot/projects/smpng/share/man/man9/DECLARE_MODULE.9#1 branch .. //depot/projects/smpng/share/man/man9/DELAY.9#1 branch .. //depot/projects/smpng/share/man/man9/DEVICE_ATTACH.9#1 branch .. //depot/projects/smpng/share/man/man9/DEVICE_DETACH.9#1 branch .. //depot/projects/smpng/share/man/man9/DEVICE_IDENTIFY.9#1 branch .. //depot/projects/smpng/share/man/man9/DEVICE_PROBE.9#1 branch .. //depot/projects/smpng/share/man/man9/DEVICE_SHUTDOWN.9#1 branch .. //depot/projects/smpng/share/man/man9/DEV_MODULE.9#1 branch .. //depot/projects/smpng/share/man/man9/DRIVER_MODULE.9#1 branch .. //depot/projects/smpng/share/man/man9/EVENTHANDLER.9#1 branch .. //depot/projects/smpng/share/man/man9/KASSERT.9#1 branch .. //depot/projects/smpng/share/man/man9/LOCK_PROFILING.9#1 branch .. //depot/projects/smpng/share/man/man9/MD5.9#1 branch .. //depot/projects/smpng/share/man/man9/MODULE_DEPEND.9#1 branch .. //depot/projects/smpng/share/man/man9/MODULE_VERSION.9#1 branch .. //depot/projects/smpng/share/man/man9/Makefile#1 branch .. //depot/projects/smpng/share/man/man9/SYSCALL_MODULE.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_CHECKEXP.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_FHTOVP.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_LOCK_GIANT.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_MOUNT.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_QUOTACTL.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_ROOT.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_SET.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_STATFS.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_SYNC.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_UNMOUNT.9#1 branch .. //depot/projects/smpng/share/man/man9/VFS_VGET.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_ACCESS.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_ACLCHECK.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_ADVLOCK.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_ATTRIB.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_BWRITE.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_CREATE.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_FSYNC.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_GETACL.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_GETEXTATTR.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_GETPAGES.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_GETVOBJECT.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_INACTIVE.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_IOCTL.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_LINK.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_LISTEXTATTR.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_LOCK.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_LOOKUP.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_OPENCLOSE.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_PATHCONF.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_PRINT.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_RDWR.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_READDIR.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_READLINK.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_REALLOCBLKS.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_REMOVE.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_RENAME.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_REVOKE.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_SETACL.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_SETEXTATTR.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_STRATEGY.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/smpng/share/man/man9/VOP_VPTOFH.9#1 branch .. //depot/projects/smpng/share/man/man9/accept_filter.9#1 branch .. //depot/projects/smpng/share/man/man9/accf_data.9#1 branch .. //depot/projects/smpng/share/man/man9/accf_dns.9#1 branch .. //depot/projects/smpng/share/man/man9/accf_http.9#1 branch .. //depot/projects/smpng/share/man/man9/acl.9#1 branch .. //depot/projects/smpng/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/smpng/share/man/man9/alq.9#1 branch .. //depot/projects/smpng/share/man/man9/altq.9#1 branch .. //depot/projects/smpng/share/man/man9/atomic.9#1 branch .. //depot/projects/smpng/share/man/man9/bios.9#1 branch .. //depot/projects/smpng/share/man/man9/boot.9#1 branch .. //depot/projects/smpng/share/man/man9/bpf.9#1 branch .. //depot/projects/smpng/share/man/man9/buf.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_activate_resource.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_alloc_resource.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_child_present.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_dma.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_generic_attach.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_generic_detach.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_generic_print_child.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_generic_read_ivar.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_generic_shutdown.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_release_resource.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_set_resource.9#1 branch .. //depot/projects/smpng/share/man/man9/bus_space.9#1 branch .. //depot/projects/smpng/share/man/man9/byteorder.9#1 branch .. //depot/projects/smpng/share/man/man9/cd.9#1 branch .. //depot/projects/smpng/share/man/man9/condvar.9#1 branch .. //depot/projects/smpng/share/man/man9/config_intrhook.9#1 branch .. //depot/projects/smpng/share/man/man9/contigmalloc.9#1 branch .. //depot/projects/smpng/share/man/man9/copy.9#1 branch .. //depot/projects/smpng/share/man/man9/cr_cansee.9#1 branch .. //depot/projects/smpng/share/man/man9/cr_seeothergids.9#1 branch .. //depot/projects/smpng/share/man/man9/cr_seeotheruids.9#1 branch .. //depot/projects/smpng/share/man/man9/critical_enter.9#1 branch .. //depot/projects/smpng/share/man/man9/crypto.9#1 branch .. //depot/projects/smpng/share/man/man9/dev_clone.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_add_driver.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_find.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_get_device.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_get_devices.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_get_drivers.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_get_maxunit.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_get_name.9#1 branch .. //depot/projects/smpng/share/man/man9/devclass_get_softc.9#1 branch .. //depot/projects/smpng/share/man/man9/devfs_set_cdevpriv.9#1 branch .. //depot/projects/smpng/share/man/man9/device.9#1 branch .. //depot/projects/smpng/share/man/man9/device_add_child.9#1 branch .. //depot/projects/smpng/share/man/man9/device_delete_child.9#1 branch .. //depot/projects/smpng/share/man/man9/device_enable.9#1 branch .. //depot/projects/smpng/share/man/man9/device_find_child.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_children.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_devclass.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_driver.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_ivars.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_name.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_parent.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_softc.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_state.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/smpng/share/man/man9/device_get_unit.9#1 branch .. //depot/projects/smpng/share/man/man9/device_printf.9#1 branch .. //depot/projects/smpng/share/man/man9/device_probe_and_attach.9#1 branch .. //depot/projects/smpng/share/man/man9/device_quiet.9#1 branch .. //depot/projects/smpng/share/man/man9/device_set_desc.9#1 branch .. //depot/projects/smpng/share/man/man9/device_set_driver.9#1 branch .. //depot/projects/smpng/share/man/man9/device_set_flags.9#1 branch .. //depot/projects/smpng/share/man/man9/devstat.9#1 branch .. //depot/projects/smpng/share/man/man9/devtoname.9#1 branch .. //depot/projects/smpng/share/man/man9/disk.9#1 branch .. //depot/projects/smpng/share/man/man9/domain.9#1 branch .. //depot/projects/smpng/share/man/man9/driver.9#1 branch .. //depot/projects/smpng/share/man/man9/extattr.9#1 branch .. //depot/projects/smpng/share/man/man9/fetch.9#1 branch .. //depot/projects/smpng/share/man/man9/firmware.9#1 branch .. //depot/projects/smpng/share/man/man9/g_access.9#1 branch .. //depot/projects/smpng/share/man/man9/g_attach.9#1 branch .. //depot/projects/smpng/share/man/man9/g_bio.9#1 branch .. //depot/projects/smpng/share/man/man9/g_consumer.9#1 branch .. //depot/projects/smpng/share/man/man9/g_data.9#1 branch .. //depot/projects/smpng/share/man/man9/g_event.9#1 branch .. //depot/projects/smpng/share/man/man9/g_geom.9#1 branch .. //depot/projects/smpng/share/man/man9/g_provider.9#1 branch .. //depot/projects/smpng/share/man/man9/g_provider_by_name.9#1 branch .. //depot/projects/smpng/share/man/man9/g_wither_geom.9#1 branch .. //depot/projects/smpng/share/man/man9/get_cyclecount.9#1 branch .. //depot/projects/smpng/share/man/man9/getnewvnode.9#1 branch .. //depot/projects/smpng/share/man/man9/groupmember.9#1 branch .. //depot/projects/smpng/share/man/man9/hash.9#1 branch .. //depot/projects/smpng/share/man/man9/hashinit.9#1 branch .. //depot/projects/smpng/share/man/man9/hexdump.9#1 branch .. //depot/projects/smpng/share/man/man9/ieee80211.9#1 branch .. //depot/projects/smpng/share/man/man9/ieee80211_crypto.9#1 branch .. //depot/projects/smpng/share/man/man9/ieee80211_input.9#1 branch .. //depot/projects/smpng/share/man/man9/ieee80211_ioctl.9#1 branch .. //depot/projects/smpng/share/man/man9/ieee80211_node.9#1 branch .. //depot/projects/smpng/share/man/man9/ieee80211_output.9#1 branch .. //depot/projects/smpng/share/man/man9/ieee80211_proto.9#1 branch .. //depot/projects/smpng/share/man/man9/ieee80211_radiotap.9#1 branch .. //depot/projects/smpng/share/man/man9/ifnet.9#1 branch .. //depot/projects/smpng/share/man/man9/inittodr.9#1 branch .. //depot/projects/smpng/share/man/man9/insmntque.9#1 branch .. //depot/projects/smpng/share/man/man9/intro.9#1 branch .. //depot/projects/smpng/share/man/man9/ithread.9#1 branch .. //depot/projects/smpng/share/man/man9/kernacc.9#1 branch .. //depot/projects/smpng/share/man/man9/kernel_mount.9#1 branch .. //depot/projects/smpng/share/man/man9/kobj.9#1 branch .. //depot/projects/smpng/share/man/man9/kproc.9#1 branch .. //depot/projects/smpng/share/man/man9/kqueue.9#1 branch .. //depot/projects/smpng/share/man/man9/kthread.9#1 branch .. //depot/projects/smpng/share/man/man9/ktr.9#1 branch .. //depot/projects/smpng/share/man/man9/lock.9#1 branch .. //depot/projects/smpng/share/man/man9/locking.9#1 branch .. //depot/projects/smpng/share/man/man9/mac.9#1 branch .. //depot/projects/smpng/share/man/man9/make_dev.9#1 branch .. //depot/projects/smpng/share/man/man9/malloc.9#1 branch .. //depot/projects/smpng/share/man/man9/mbchain.9#1 branch .. //depot/projects/smpng/share/man/man9/mbpool.9#1 branch .. //depot/projects/smpng/share/man/man9/mbuf.9#1 branch .. //depot/projects/smpng/share/man/man9/mbuf_tags.9#1 branch .. //depot/projects/smpng/share/man/man9/mdchain.9#1 branch .. //depot/projects/smpng/share/man/man9/memguard.9#1 branch .. //depot/projects/smpng/share/man/man9/mi_switch.9#1 branch .. //depot/projects/smpng/share/man/man9/microseq.9#1 branch .. //depot/projects/smpng/share/man/man9/microtime.9#1 branch .. //depot/projects/smpng/share/man/man9/microuptime.9#1 branch .. //depot/projects/smpng/share/man/man9/module.9#1 branch .. //depot/projects/smpng/share/man/man9/mtx_pool.9#1 branch .. //depot/projects/smpng/share/man/man9/mutex.9#1 branch .. //depot/projects/smpng/share/man/man9/namei.9#1 branch .. //depot/projects/smpng/share/man/man9/p_candebug.9#1 branch .. //depot/projects/smpng/share/man/man9/p_cansee.9#1 branch .. //depot/projects/smpng/share/man/man9/panic.9#1 branch .. //depot/projects/smpng/share/man/man9/pbuf.9#1 branch .. //depot/projects/smpng/share/man/man9/pci.9#1 branch .. //depot/projects/smpng/share/man/man9/pfil.9#1 branch .. //depot/projects/smpng/share/man/man9/pfind.9#1 branch .. //depot/projects/smpng/share/man/man9/pgfind.9#1 branch .. //depot/projects/smpng/share/man/man9/physio.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_activate.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_change_wiring.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_clear_modify.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_copy.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_enter.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_extract.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_growkernel.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_init.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_is_modified.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_is_prefaultable.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_map.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_mincore.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_object_init_pt.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_page_exists_quick.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_page_init.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_page_protect.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_pinit.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_qenter.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_release.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_remove.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_resident_count.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_zero_page.9#1 branch .. //depot/projects/smpng/share/man/man9/printf.9#1 branch .. //depot/projects/smpng/share/man/man9/prison_check.9#1 branch .. //depot/projects/smpng/share/man/man9/priv.9#1 branch .. //depot/projects/smpng/share/man/man9/pseudofs.9#1 branch .. //depot/projects/smpng/share/man/man9/psignal.9#1 branch .. //depot/projects/smpng/share/man/man9/random.9#1 branch .. //depot/projects/smpng/share/man/man9/random_harvest.9#1 branch .. //depot/projects/smpng/share/man/man9/redzone.9#1 branch .. //depot/projects/smpng/share/man/man9/refcount.9#1 branch .. //depot/projects/smpng/share/man/man9/resettodr.9#1 branch .. //depot/projects/smpng/share/man/man9/resource_int_value.9#1 branch .. //depot/projects/smpng/share/man/man9/rijndael.9#1 branch .. //depot/projects/smpng/share/man/man9/rman.9#1 branch .. //depot/projects/smpng/share/man/man9/rmlock.9#1 branch .. //depot/projects/smpng/share/man/man9/rtalloc.9#1 branch .. //depot/projects/smpng/share/man/man9/rtentry.9#1 branch .. //depot/projects/smpng/share/man/man9/runqueue.9#1 branch .. //depot/projects/smpng/share/man/man9/rwlock.9#1 branch .. //depot/projects/smpng/share/man/man9/sbuf.9#1 branch .. //depot/projects/smpng/share/man/man9/scheduler.9#1 branch .. //depot/projects/smpng/share/man/man9/securelevel_gt.9#1 branch .. //depot/projects/smpng/share/man/man9/selrecord.9#1 branch .. //depot/projects/smpng/share/man/man9/sema.9#1 branch .. //depot/projects/smpng/share/man/man9/sf_buf.9#1 branch .. //depot/projects/smpng/share/man/man9/signal.9#1 branch .. //depot/projects/smpng/share/man/man9/sleep.9#1 branch .. //depot/projects/smpng/share/man/man9/sleepqueue.9#1 branch .. //depot/projects/smpng/share/man/man9/socket.9#1 branch .. //depot/projects/smpng/share/man/man9/spl.9#1 branch .. //depot/projects/smpng/share/man/man9/stack.9#1 branch .. //depot/projects/smpng/share/man/man9/store.9#1 branch .. //depot/projects/smpng/share/man/man9/style.9#1 branch .. //depot/projects/smpng/share/man/man9/swi.9#1 branch .. //depot/projects/smpng/share/man/man9/sx.9#1 branch .. //depot/projects/smpng/share/man/man9/sysctl.9#1 branch .. //depot/projects/smpng/share/man/man9/sysctl_add_oid.9#1 branch .. //depot/projects/smpng/share/man/man9/sysctl_ctx_init.9#1 branch .. //depot/projects/smpng/share/man/man9/taskqueue.9#1 branch .. //depot/projects/smpng/share/man/man9/thread_exit.9#1 branch .. //depot/projects/smpng/share/man/man9/time.9#1 branch .. //depot/projects/smpng/share/man/man9/timeout.9#1 branch .. //depot/projects/smpng/share/man/man9/tvtohz.9#1 branch .. //depot/projects/smpng/share/man/man9/ucred.9#1 branch .. //depot/projects/smpng/share/man/man9/uidinfo.9#1 branch .. //depot/projects/smpng/share/man/man9/uio.9#1 branch .. //depot/projects/smpng/share/man/man9/usbdi.9#1 branch .. //depot/projects/smpng/share/man/man9/utopia.9#1 branch .. //depot/projects/smpng/share/man/man9/vaccess.9#1 branch .. //depot/projects/smpng/share/man/man9/vaccess_acl_posix1e.9#1 branch .. //depot/projects/smpng/share/man/man9/vcount.9#1 branch .. //depot/projects/smpng/share/man/man9/vflush.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_busy.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_getnewfsid.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_getopt.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_getvfs.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_mount.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_rootmountalloc.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_suser.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_timestamp.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_unbusy.9#1 branch .. //depot/projects/smpng/share/man/man9/vfs_unmountall.9#1 branch .. //depot/projects/smpng/share/man/man9/vfsconf.9#1 branch .. //depot/projects/smpng/share/man/man9/vget.9#1 branch .. //depot/projects/smpng/share/man/man9/vgone.9#1 branch .. //depot/projects/smpng/share/man/man9/vhold.9#1 branch .. //depot/projects/smpng/share/man/man9/vinvalbuf.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_fault_prefault.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_check_protection.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_clean.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_create.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_delete.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_entry_resize_free.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_find.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_findspace.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_inherit.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_init.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_insert.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_lock.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_lookup.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_madvise.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_max.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_protect.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_remove.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_simplify_entry.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_stack.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_submap.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_map_wire.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_alloc.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_bits.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_cache.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_copy.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_deactivate.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_dontneed.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_flag.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_free.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_grab.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_hold.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_insert.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_io.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_lookup.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_protect.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_rename.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_sleep_busy.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_wakeup.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_wire.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_zero_fill.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_set_page_size.9#1 branch .. //depot/projects/smpng/share/man/man9/vn_fullpath.9#1 branch .. //depot/projects/smpng/share/man/man9/vn_isdisk.9#1 branch .. //depot/projects/smpng/share/man/man9/vnode.9#1 branch .. //depot/projects/smpng/share/man/man9/vput.9#1 branch .. //depot/projects/smpng/share/man/man9/vref.9#1 branch .. //depot/projects/smpng/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/smpng/share/man/man9/vrele.9#1 branch .. //depot/projects/smpng/share/man/man9/vslock.9#1 branch .. //depot/projects/smpng/share/man/man9/watchdog.9#1 branch .. //depot/projects/smpng/share/man/man9/zero_copy.9#1 branch .. //depot/projects/smpng/share/man/man9/zone.9#1 branch .. //depot/user/jhb/pat/modules/patdev/patdev.c#5 edit .. //depot/user/jhb/pat/sys/mman.h#3 edit .. //depot/user/jhb/pat/vm/vm_mmap.c#19 edit Differences ... ==== //depot/user/jhb/pat/modules/patdev/patdev.c#5 (text+ko) ==== ==== //depot/user/jhb/pat/sys/mman.h#3 (text+ko) ==== @@ -87,6 +87,8 @@ * Extended flags */ #define MAP_NOCORE 0x00020000 /* dont include these pages in a coredump */ +#define MAP_PREFAULT_READ 0x00040000 /* prefault mapping for reading */ +#define MAP_PREFAULT_WRITE 0x00080000 /* prefault mapping for writing */ #endif /* __BSD_VISIBLE */ #if __POSIX_VISIBLE >= 199309 ==== //depot/user/jhb/pat/vm/vm_mmap.c#19 (text+ko) ==== @@ -1510,6 +1510,22 @@ if ((rv == KERN_SUCCESS) && (map->flags & MAP_WIREFUTURE)) vm_map_wire(map, *addr, *addr + size, VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES); + else if ((rv == KERN_SUCCESS) && + (map->flags & (MAP_PREFAULT_READ | MAP_PREFAULT_WRITE))) { + vm_offset_t va; + vm_size_t len; + int prot; + + prot = VM_PROT_READ; + if (map->flags & MAP_PREFAULT_WRITE) + prot |= VM_PROT_WRITE; + va = trunc_page(*addr); + len = size + (*addr - va); + for (; len > 0; va += PAGE_SIZE, len -= PAGE_SIZE) { + vm_fault(map, va, prot, (prot & VM_PROT_WRITE) ? + VM_FAULT_DIRTY : VM_FAULT_NORMAL); + } + } switch (rv) { case KERN_SUCCESS: From owner-p4-projects@FreeBSD.ORG Wed May 13 14:44:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D1DC106567B; Wed, 13 May 2009 14:44:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 158491065672 for ; Wed, 13 May 2009 14:44:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0247E8FC25 for ; Wed, 13 May 2009 14:44:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DEiqLl020308 for ; Wed, 13 May 2009 14:44:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DEiqdh020306 for perforce@freebsd.org; Wed, 13 May 2009 14:44:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 13 May 2009 14:44:52 GMT Message-Id: <200905131444.n4DEiqdh020306@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 162013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 14:44:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=162013 Change 162013 by hselasky@hselasky_laptop001 on 2009/05/13 14:44:43 USB controller: - Minor bugfix. Bit 0 is set when PLL is locked. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#25 (text+ko) ==== @@ -1232,7 +1232,7 @@ /* wait for PLL to lock */ for (n = 0; n != 20; n++) { - if (!(ATMEGA_READ_1(sc, 0x49) & 0x01)) + if (ATMEGA_READ_1(sc, 0x49) & 0x01) break; /* wait a little bit for PLL to start */ usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); From owner-p4-projects@FreeBSD.ORG Wed May 13 16:03:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3CF3106566C; Wed, 13 May 2009 16:03:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62B32106564A for ; Wed, 13 May 2009 16:03:14 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E93D8FC16 for ; Wed, 13 May 2009 16:03:14 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DG3EkO028765 for ; Wed, 13 May 2009 16:03:14 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DG3CoS028761 for perforce@freebsd.org; Wed, 13 May 2009 16:03:12 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 13 May 2009 16:03:12 GMT Message-Id: <200905131603.n4DG3CoS028761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 162015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 16:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=162015 Change 162015 by thompsa@thompsa_burger on 2009/05/13 16:03:09 IFC Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#15 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#15 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#10 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#25 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#18 integrate .. //depot/projects/usb/src/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/usb/src/sys/amd64/include/pcpu.h#8 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#12 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#20 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#12 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#15 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT#9 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#7 integrate .. //depot/projects/usb/src/sys/arm/conf/CRB#6 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-78XXX#4 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#4 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#4 integrate .. //depot/projects/usb/src/sys/arm/conf/EP80219#10 integrate .. //depot/projects/usb/src/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#9 integrate .. //depot/projects/usb/src/sys/arm/conf/IQ31244#10 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#19 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU#7 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/usb/src/sys/arm/conf/SIMICS#10 integrate .. //depot/projects/usb/src/sys/arm/conf/SKYEYE#9 integrate .. //depot/projects/usb/src/sys/arm/include/pmap.h#9 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#10 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#11 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_mib.c#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_mib.h#3 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.h#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_util.h#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/usb/src/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/usb/src/sys/conf/NOTES#34 integrate .. //depot/projects/usb/src/sys/conf/files#61 integrate .. //depot/projects/usb/src/sys/conf/files.i386#23 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#18 integrate .. //depot/projects/usb/src/sys/conf/kern.post.mk#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/usb/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/usb/src/sys/dev/asr/asr.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#11 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.h#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#24 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#18 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#12 integrate .. //depot/projects/usb/src/sys/dev/bwi/bwimac.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#12 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#8 integrate .. //depot/projects/usb/src/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/usb/src/sys/dev/snp/snp.c#11 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/usb/src/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/usb/src/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#36 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_revision.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#145 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#56 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#8 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#12 integrate .. //depot/projects/usb/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/usb/src/sys/dev/xen/console/xencons_ring.c#4 integrate .. //depot/projects/usb/src/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs.c#5 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#7 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#9 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#13 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#11 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_plex.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_raid5.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_subr.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#10 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#11 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#21 integrate .. //depot/projects/usb/src/sys/i386/conf/PAE#9 integrate .. //depot/projects/usb/src/sys/i386/conf/XBOX#8 integrate .. //depot/projects/usb/src/sys/i386/conf/XEN#6 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/hwpstate.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#15 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_proto.h#4 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix.h#4 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/usb/src/sys/i386/linux/linux.h#11 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/usb/src/sys/ia64/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/ia64/conf/NOTES#5 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_acct.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_osd.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_vimage.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_kdb.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_pcpu.c#5 integrate .. //depot/projects/usb/src/sys/kern/sys_socket.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty.c#20 integrate .. //depot/projects/usb/src/sys/kern/tty_ttydisc.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_export.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_extattr.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#19 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#18 integrate .. //depot/projects/usb/src/sys/mips/conf/ADM5120#5 integrate .. //depot/projects/usb/src/sys/mips/conf/IDT#7 integrate .. //depot/projects/usb/src/sys/mips/conf/MALTA#5 integrate .. //depot/projects/usb/src/sys/mips/conf/QEMU#4 integrate .. //depot/projects/usb/src/sys/mips/conf/SENTRY5#6 integrate .. //depot/projects/usb/src/sys/modules/linux/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/opensolaris/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/sound/sound/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/svr4/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#17 integrate .. //depot/projects/usb/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/usb/src/sys/net/bpf.c#16 integrate .. //depot/projects/usb/src/sys/net/if.c#24 integrate .. //depot/projects/usb/src/sys/net/if_clone.c#4 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/usb/src/sys/net/if_var.h#16 integrate .. //depot/projects/usb/src/sys/net/netisr.c#6 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#21 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#18 integrate .. //depot/projects/usb/src/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#19 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#15 integrate .. //depot/projects/usb/src/sys/netinet/in.c#22 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#15 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#16 integrate .. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/route6.c#9 integrate .. //depot/projects/usb/src/sys/netipsec/xform_tcp.c#3 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs.h#9 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#22 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#15 integrate .. //depot/projects/usb/src/sys/nlm/nlm_advlock.c#4 integrate .. //depot/projects/usb/src/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/usb/src/sys/pc98/cbus/clock.c#9 integrate .. //depot/projects/usb/src/sys/pc98/conf/DEFAULTS#7 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#16 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#18 integrate .. //depot/projects/usb/src/sys/powerpc/conf/MPC85XX#6 integrate .. //depot/projects/usb/src/sys/powerpc/conf/NOTES#12 integrate .. //depot/projects/usb/src/sys/security/audit/audit_worker.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/usb/src/sys/sys/_null.h#3 integrate .. //depot/projects/usb/src/sys/sys/buf_ring.h#3 integrate .. //depot/projects/usb/src/sys/sys/ioctl.h#3 integrate .. //depot/projects/usb/src/sys/sys/ioctl_compat.h#5 integrate .. //depot/projects/usb/src/sys/sys/jail.h#13 integrate .. //depot/projects/usb/src/sys/sys/kernel.h#13 integrate .. //depot/projects/usb/src/sys/sys/mount.h#17 integrate .. //depot/projects/usb/src/sys/sys/param.h#29 integrate .. //depot/projects/usb/src/sys/sys/proc.h#18 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#17 integrate .. //depot/projects/usb/src/sys/sys/termios.h#7 integrate .. //depot/projects/usb/src/sys/sys/ucred.h#5 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#9 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#18 integrate .. //depot/projects/usb/src/sys/ufs/ufs/extattr.h#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_extattr.c#8 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#13 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#15 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#15 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $"); #include "opt_cpu.h" @@ -472,6 +472,22 @@ cpu_feature = regs[3]; cpu_feature2 = regs[2]; + /* + * Clear "Limit CPUID Maxval" bit and get the largest standard CPUID + * function number again if it is set from BIOS. It is necessary + * for probing correct CPU topology later. + * XXX This is only done on the BSP package. + */ + if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high > 0 && cpu_high < 4) { + uint64_t msr; + msr = rdmsr(MSR_IA32_MISC_ENABLE); + if ((msr & 0x400000ULL) != 0) { + wrmsr(MSR_IA32_MISC_ENABLE, msr & ~0x400000ULL); + do_cpuid(0, regs); + cpu_high = regs[0]; + } + } + if (cpu_vendor_id == CPU_VENDOR_INTEL || cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_CENTAUR) { ==== //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.54 2009/05/01 20:53:37 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -319,7 +319,7 @@ } /* We don't setup the timer during boot on the BSP until later. */ - if (!(boot && PCPU_GET(cpuid) == 0)) { + if (!(boot && PCPU_GET(cpuid) == 0) && lapic_timer_hz != 0) { KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", lapic_id())); lapic_timer_set_divisor(lapic_timer_divisor); ==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#10 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $ machine amd64 @@ -21,4 +21,4 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR -options FLOWTABLE +options FLOWTABLE ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#25 (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.524 2009/05/01 17:20:16 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -68,7 +68,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/usb/src/sys/amd64/conf/NOTES#18 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.89 2009/03/16 10:36:24 dchagin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $ # # @@ -33,7 +33,7 @@ # # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -153,7 +153,7 @@ # # AGP debugging. # -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -288,7 +288,7 @@ device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath #device ath_rate_amrr # AMRR rate control for ath driver #device ath_rate_onoe # Onoe rate control for ath driver @@ -457,7 +457,7 @@ #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation ==== //depot/projects/usb/src/sys/amd64/conf/XENHVM#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/XENHVM,v 1.1 2009/03/11 15:30:12 dfr Exp $ +# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.3 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -69,10 +69,12 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -97,7 +99,7 @@ device fdc # Xen HVM support -options XENHVM +options XENHVM device xenpci # ATA and ATAPI devices ==== //depot/projects/usb/src/sys/amd64/include/pcpu.h#8 (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/pcpu.h,v 1.53 2009/04/01 13:09:26 kib Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.54 2009/05/06 17:48:39 dfr Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -75,7 +75,7 @@ /* Pointer to the CPU LDT descriptor */ \ struct system_segment_descriptor *pc_ldt; \ /* Pointer to the CPU TSS descriptor */ \ - struct system_segment_descriptor *pc_tss + struct system_segment_descriptor *pc_tss \ PCPU_XEN_FIELDS #ifdef _KERNEL ==== //depot/projects/usb/src/sys/amd64/linux32/linux.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.25 2009/03/27 17:00:49 ambrisko Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.27 2009/05/11 13:50:42 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -96,7 +96,7 @@ typedef struct { l_time_t tv_sec; l_suseconds_t tv_usec; -} __packed l_timeval; +} l_timeval; #define l_fd_set fd_set @@ -669,14 +669,6 @@ #define LINUX_SENDMSG 16 #define LINUX_RECVMSG 17 -#define LINUX_AF_UNSPEC 0 -#define LINUX_AF_UNIX 1 -#define LINUX_AF_INET 2 -#define LINUX_AF_AX25 3 -#define LINUX_AF_IPX 4 -#define LINUX_AF_APPLETALK 5 -#define LINUX_AF_INET6 10 - #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 #define LINUX_SOL_IPX 256 ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#20 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.48 2009/05/02 10:06:49 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.51 2009/05/10 18:43:43 dchagin Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -261,7 +261,17 @@ pos = base + (imgp->args->argc + imgp->args->envc + 2); AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz); + + /* + * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0, + * as it has appeared in the 2.4.0-rc7 first time. + * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), + * glibc falls back to the hard-coded CLK_TCK value when aux entry + * is not present. + * Also see linux_times() implementation. + */ + if (linux_kernver(curthread) >= LINUX_KERNVER_2004000) + AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, stclohz); AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent); AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum); @@ -1124,6 +1134,8 @@ linux_proc_exec, NULL, 1000); linux_szplatform = roundup(strlen(linux_platform) + 1, sizeof(char *)); + linux_osd_jail_register(); + stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -1151,6 +1163,7 @@ EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); + linux_osd_jail_deregister(); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/usb/src/sys/arm/arm/cpufunc.c#9 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.25 2009/01/09 10:45:04 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.26 2009/05/05 12:57:16 stas Exp $"); #include #include @@ -1192,6 +1192,7 @@ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || + (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA27X || (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA210) { cpufuncs = xscale_cpufuncs; ==== //depot/projects/usb/src/sys/arm/arm/pmap.c#14 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.107 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.108 2009/05/07 05:42:13 alc Exp $"); #include #include #include @@ -224,7 +224,6 @@ vm_offset_t kernel_vm_end = 0; struct pmap kernel_pmap_store; -pmap_t kernel_pmap; static pt_entry_t *csrc_pte, *cdst_pte; static vm_offset_t csrcp, cdstp; @@ -2337,7 +2336,6 @@ firstaddr, loadaddr)); virtual_avail = firstaddr; - kernel_pmap = &kernel_pmap_store; kernel_pmap->pm_l1 = l1; kernel_l1pa = l1pt->pv_pa; ==== //depot/projects/usb/src/sys/arm/at91/at91_cfata.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.2 2009/04/23 00:00:57 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.3 2009/05/10 11:05:22 stas Exp $"); #include #include @@ -131,9 +131,9 @@ struct resource *r) { - KASSERT(type == SYS_RES_IRQ && *rid == ATA_IRQ_RID, + KASSERT(type == SYS_RES_IRQ && rid == ATA_IRQ_RID, ("[at91_cfata, %d]: illegal resource request (type %u rid %u)", - __LINE__, type, *rid)); + __LINE__, type, rid)); return (0); } ==== //depot/projects/usb/src/sys/arm/at91/if_ate.c#12 (text) ==== @@ -23,18 +23,14 @@ * SUCH DAMAGE. */ -/* TODO: (in no order) +/* TODO * - * 8) Need to sync busdma goo in atestop - * 9) atestop should maybe free the mbufs? - * - * 1) detach - * 2) Free dma setup - * 3) Turn on the clock in pmc? Turn off? + * 1) Turn on the clock in pmc? Turn off? + * 2) GPIO initializtion in board setup code. */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.30 2008/11/25 00:14:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.35 2009/05/12 21:28:41 stas Exp $"); #include #include @@ -76,6 +72,12 @@ #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 +/* + * Driver-specific flags. + */ +#define ATE_FLAG_DETACHING 0x01 +#define ATE_FLAG_MULTICAST 0x02 + struct ate_softc { struct ifnet *ifp; /* ifnet pointer */ @@ -100,6 +102,8 @@ eth_rx_desc_t *rx_descs; int use_rmii; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ + int flags; + int if_flags; }; static inline uint32_t @@ -114,6 +118,13 @@ bus_write_4(sc->mem_res, off, val); } +static inline void +BARRIER(struct ate_softc *sc, bus_size_t off, bus_size_t len, int flags) +{ + + bus_barrier(sc->mem_res, off, len, flags); +} + #define ATE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define ATE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define ATE_LOCK_INIT(_sc) \ @@ -144,11 +155,12 @@ /* helper routines */ static int ate_activate(device_t dev); -static void ate_deactivate(device_t dev); +static void ate_deactivate(struct ate_softc *sc); static int ate_ifmedia_upd(struct ifnet *ifp); static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int ate_get_mac(struct ate_softc *sc, u_char *eaddr); static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_rxfilter(struct ate_softc *sc); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -170,11 +182,33 @@ struct ifnet *ifp = NULL; struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; - int err; u_char eaddr[ETHER_ADDR_LEN]; uint32_t rnd; + int rid, err; sc->dev = dev; + ATE_LOCK_INIT(sc); + + /* + * Allocate resources. + */ + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) { + device_printf(dev, "could not allocate memory resources.\n"); + err = ENOMEM; + goto out; + } + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->irq_res == NULL) { + device_printf(dev, "could not allocate interrupt resources.\n"); + err = ENOMEM; + goto out; + } + err = ate_activate(dev); if (err) goto out; @@ -188,8 +222,9 @@ CTLFLAG_RD, &sc->use_rmii, 0, "rmii in use"); /* calling atestop before ifp is set is OK */ + ATE_LOCK(sc); atestop(sc); - ATE_LOCK_INIT(sc); + ATE_UNLOCK(sc); callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { @@ -238,30 +273,70 @@ ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + sc->if_flags = ifp->if_flags; ether_ifattach(ifp, eaddr); /* - * Activate the interrupt + * Activate the interrupt. */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, NULL, ate_intr, sc, &sc->intrhand); if (err) { + device_printf(dev, "could not establish interrupt handler.\n"); ether_ifdetach(ifp); - ATE_LOCK_DESTROY(sc); + goto out; } -out:; + +out: if (err) - ate_deactivate(dev); - if (err && ifp) - if_free(ifp); + ate_detach(dev); return (err); } static int ate_detach(device_t dev) { - return EBUSY; /* XXX TODO(1) */ + struct ate_softc *sc; + struct ifnet *ifp; + + sc = device_get_softc(dev); + KASSERT(sc != NULL, ("[ate: %d]: sc is NULL", __LINE__)); + ifp = sc->ifp; + if (device_is_attached(dev)) { + ATE_LOCK(sc); + sc->flags |= ATE_FLAG_DETACHING; + atestop(sc); + ATE_UNLOCK(sc); + callout_drain(&sc->tick_ch); + ether_ifdetach(ifp); + } + if (sc->miibus != NULL) { + device_delete_child(dev, sc->miibus); + sc->miibus = NULL; + } + bus_generic_detach(sc->dev); + ate_deactivate(sc); + if (sc->intrhand != NULL) { + bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + sc->intrhand = NULL; + } + if (ifp != NULL) { + if_free(ifp); + sc->ifp = NULL; + } + if (sc->mem_res != NULL) { + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(sc->mem_res), sc->mem_res); + sc->mem_res = NULL; + } + if (sc->irq_res != NULL) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->irq_res), sc->irq_res); + sc->irq_res = NULL; + } + ATE_LOCK_DESTROY(sc); + return (0); } static void @@ -307,26 +382,39 @@ * of different MAC chips use this method (or the reverse the bits) * method. */ -static void +static int ate_setmcast(struct ate_softc *sc) { uint32_t index; uint32_t mcaf[2]; u_char *af = (u_char *) mcaf; struct ifmultiaddr *ifma; + struct ifnet *ifp; + ifp = sc->ifp; + + if ((ifp->if_flags & IFF_PROMISC) != 0) + return (0); + if ((ifp->if_flags & IFF_ALLMULTI) != 0) { + WR4(sc, ETH_HSL, 0xffffffff); + WR4(sc, ETH_HSH, 0xffffffff); + return (1); + } + + /* + * Compute the multicast hash. + */ mcaf[0] = 0; mcaf[1] = 0; - - IF_ADDR_LOCK(sc->ifp); - TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; af[index >> 3] |= 1 << (index & 7); } - IF_ADDR_UNLOCK(sc->ifp); + IF_ADDR_UNLOCK(ifp); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 13 17:52:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B31BD106572C; Wed, 13 May 2009 17:52:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64E321065724; Wed, 13 May 2009 17:52:25 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id 012D38FC08; Wed, 13 May 2009 17:52:24 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id AA0031D2B4; Wed, 13 May 2009 19:52:23 +0200 (CEST) Date: Wed, 13 May 2009 19:52:23 +0200 From: Ed Schouten To: Julian Elischer Message-ID: <20090513175223.GG58540@hoeg.nl> References: <200905121848.n4CImKQt036691@repoman.freebsd.org> <4A09EF38.6060407@elischer.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="YE/X56qLfGGj1U5i" Content-Disposition: inline In-Reply-To: <4A09EF38.6060407@elischer.org> User-Agent: Mutt/1.5.19 (2009-01-05) Cc: virtualization@freebsd.org, Perforce Change Reviews , Marko Zec , Brooks Davis Subject: Re: PERFORCE change 161987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 17:52:27 -0000 --YE/X56qLfGGj1U5i Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Julian Elischer wrote: > tun needs it's /dev entres, so can not be 'renumbered' (in the > base sense) until we somehow add vimage support to devfs. > however having tun3 in one vimage and tun4 in another would still > be pretty ok I think. So I think the modes wanted would be: It's the same with pts(4) right now. Be sure to prevent tun entries from being opened from a different jail, though. --=20 Ed Schouten WWW: http://80386.nl/ --YE/X56qLfGGj1U5i Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkoLCNcACgkQ52SDGA2eCwU/OACePSwrSYZ7isUVfuzOvGrtk1pa XSYAn2btSbkb5+y46MnZIo4yIbsbD1X6 =MLiI -----END PGP SIGNATURE----- --YE/X56qLfGGj1U5i-- From owner-p4-projects@FreeBSD.ORG Wed May 13 18:55:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 176611065679; Wed, 13 May 2009 18:55:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA9361065675 for ; Wed, 13 May 2009 18:55:28 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B7C048FC15 for ; Wed, 13 May 2009 18:55:28 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DItSvD054287 for ; Wed, 13 May 2009 18:55:28 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DItSV7054285 for perforce@freebsd.org; Wed, 13 May 2009 18:55:28 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 13 May 2009 18:55:28 GMT Message-Id: <200905131855.n4DItSV7054285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 162030 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 18:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=162030 Change 162030 by rene@rene_self on 2009/05/13 18:55:13 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributing/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#5 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2009-01-2009-03.xml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#40 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributing/article.sgml#3 (text+ko) ==== @@ -8,7 +8,7 @@ Contributing to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributing/article.sgml,v 1.510 2009/04/30 18:26:32 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributing/article.sgml,v 1.511 2009/05/13 02:05:11 keramida Exp $ This article describes the different ways in which an @@ -172,7 +172,8 @@ - If you have contributed any ports, send your patches + If you have contributed any ports and you had to make + &os;-specific changes, send your patches back to the original authors (this will make your life easier when they bring out the next version). @@ -341,22 +342,24 @@ For example: - - &prompt.user; diff -c oldfile newfile + &prompt.user; diff -c oldfile newfile - or + or - &prompt.user; diff -c -r olddir newdir + &prompt.user; diff -c -r olddir newdir - would generate such a set of context diffs for the given + would generate such a set of context diffs for the given source file or directory hierarchy. - Likewise, - &prompt.user; diff -u oldfile newfile - or - &prompt.user; diff -u -r olddir newdir + Likewise, + + &prompt.user; diff -u oldfile newfile + + or + + &prompt.user; diff -u -r olddir newdir - would do the same, except in the unified diff format. + would do the same, except in the unified diff format. See the manual page for &man.diff.1; for more details. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -124,12 +124,22 @@ reverse. It only allows traffic matching the rules through and blocks everything else. - Inclusive firewalls are generally safer than exclusive + An inclusive firewall offers much better control of the outgoing + traffic, making it a better choice for systems that offer services to + the public Internet. It also controls the type of traffic originating + from the public Internet that can gain access to your private network. + All traffic that does not match the rules, is blocked and logged by + design. Inclusive firewalls are generally safer than exclusive firewalls because they significantly reduce the risk of allowing - unwanted traffic to pass through the firewall. + unwanted traffic to pass through them. + + + Unless noted otherwise, all configuration and example + rulesets in this chapter, create inclusive type firewalls. + Security can be tightened further using a stateful - firewall. With a stateful firewall the firewall keeps + firewall. This type of firewall keeps track of which connections are opened through the firewall and will only allow traffic through which either matches an existing connection or opens a new one. The disadvantage of a stateful @@ -153,14 +163,14 @@ &man.altq.4; and &man.dummynet.4;. Dummynet has traditionally been closely tied with IPFW, and ALTQ with - PF. Traffic shaping for IPFILTER can currently - be done with IPFILTER for NAT and filtering and + PF. Traffic shaping for IPFILTER can currently + be done with IPFILTER for NAT and filtering and IPFW with &man.dummynet.4; or by using PF with ALTQ. IPFW, and PF all use rules to control the access of packets to and from your system, although they go about it different ways and - have different rule syntaxes. + have a different rule syntax. The reason that &os; has multiple built in firewall packages is that different people have different requirements and @@ -174,7 +184,7 @@ Since all firewalls are based on inspecting the values of selected packet control fields, the creator of the firewall rulesets must have an understanding of how - TCP/IP works, what the different values in + TCP/IP works, what the different values in the packet control fields are and how these values are used in a normal session conversation. For a good explanation go to: pf_enable="YES" is present. However, the PF module will - not load if the system cannot find a PF + not be loaded if the system cannot find a PF ruleset configuration file. The default location is /etc/pf.conf. If your PF ruleset is located somewhere else put @@ -291,7 +301,7 @@ paired with &man.carp.4; to create failover firewalls using PF. More information on CARP can be found in - chapter 29 of the handbook. + of the Handbook. The PF kernel options can be found in /usr/src/sys/conf/NOTES and are reproduced @@ -448,14 +458,14 @@ options ALTQ enables the ALTQ framework. - options ALTQ_CBQ enables Class Based - Queuing (CBQ). CBQ + options ALTQ_CBQ enables Class Based + Queuing (CBQ). CBQ allows you to divide a connection's bandwidth into different classes or queues to prioritize traffic based on filter rules. - options ALTQ_RED enables Random Early - Detection (RED). RED is + options ALTQ_RED enables Random Early + Detection (RED). RED is used to avoid network congestion. RED does this by measuring the length of the queue and comparing it to the minimum and maximum thresholds for the queue. If the @@ -463,16 +473,16 @@ True to its name, RED drops packets from different connections randomly. - options ALTQ_RIO enables Random Early - Detection In and Out. + options ALTQ_RIO enables Random Early + Detection In and Out. options ALTQ_HFSC enables the - Hierarchical Fair Service Curve Packet Scheduler. For more + Hierarchical Fair Service Curve Packet Scheduler. For more information about HFSC see: . - options ALTQ_PRIQ enables Priority - Queuing (PRIQ). PRIQ + options ALTQ_PRIQ enables Priority + Queuing (PRIQ). PRIQ will always pass traffic that is in a higher queue first. @@ -492,11 +502,6 @@ IPFILTER - - This section is work in progress. The contents might - not be accurate at all times. - - The author of IPFILTER is Darren Reed. IPFILTER is not operating system dependent: it is an open source application and has been ported to &os;, NetBSD, OpenBSD, &sunos;, HP/UX, and @@ -519,29 +524,16 @@ stateless type of rules. Over time IPF has been enhanced to include a quick option and a stateful keep state option which drastically modernized the rules - processing logic. IPF's official documentation covers the legacy - rule coding parameters and the legacy rule file processing + processing logic. IPF's official documentation covers only the legacy + rule coding parameters and rule file processing logic. The modernized functions are only included as additional options, completely understating their benefits in producing a - far superior secure firewall. + far superior and more secure firewall. The instructions contained in this section are based on using rules that contain the quick option and the stateful keep state option. This is the basic - framework for coding an inclusive firewall rule set. - - - - An inclusive firewall only allows packets matching the rules - to pass through. This way you can control what services can - originate behind the firewall destined for the public Internet - and also control the services which can originate from the - public Internet accessing your private network. Everything else - is blocked and logged by default design. Inclusive firewalls are - much, much more secure than exclusive firewall rule sets and is - the only rule set type covered herein. + framework for coding an inclusive firewall ruleset. For detailed explanation of the legacy rules processing method see: IPF is included in the basic &os; install as a separate run time loadable module. The system will dynamically load the IPF - kernel loadable module when the rc.conf statement + kernel loadable module when the rc.conf statement ipfilter_enable="YES" is used. The loadable module was created with logging enabled and the - default pass all options. You do not need + default pass all options. There is no need to compile IPF into the &os; kernel just to change the default - to block all, you can do that by just coding - a block all rule at the end of your rule set. + to block all. This can be done just by adding + a block all rule at the end of your ruleset. @@ -603,7 +595,7 @@ kernel options - It is not a mandatory requirement that you enable IPF by + It is not a mandatory requirement to enable IPF by compiling the following options into the &os; kernel. It is only presented here as background information. Compiling IPF into the kernel causes the loadable module to never be @@ -630,16 +622,15 @@ the default behavior so any packet not matching a firewall pass rule gets blocked. - These settings will take effect only after you have built - and installed a kernel with them set. + These settings will take effect only after installing a kernel + that has been built with the above options set. Available rc.conf Options - You need the following statements in - /etc/rc.conf to activate IPF at boot - time: + To activate IPF at boot time, the following statements need to + be added to /etc/rc.conf: ipfilter_enable="YES" # Start ipf firewall ipfilter_rules="/etc/ipf.rules" # loads rules definition text file @@ -649,9 +640,9 @@ # v = log tcp window, ack, seq # n = map IP & port to names - If you have a LAN behind this firewall that uses the - reserved private IP address ranges, then you need to add the - following to enable NAT + If there is a LAN behind this firewall that uses the + reserved private IP address ranges, the following lines will have to + be added to enable NAT functionality: gateway_enable="YES" # Enable as LAN gateway @@ -664,10 +655,10 @@ ipf - The ipf command is used to load your rules file. Normally - you create a file containing your custom rules and use this - command to replace in mass the currently running firewall - internal rules: + The &man.ipf.8; command is used to load your ruleset file. + Your custom rules would normally be placed in a file, and the + following command could then be used to replace in mass the + currently running firewall rules: &prompt.root; ipf -Fa -f /etc/ipf.rules @@ -738,7 +729,7 @@ Packet log flags set: (0) When supplied with either for inbound - or for outbound, it will retrieve and + or for outbound, the command will retrieve and display the appropriate list of filter rules currently installed and in use by the kernel. @@ -772,7 +763,7 @@ ipfstat command is the flag which displays the state table in a way similar to the way &man.top.1; shows the &os; running process table. When your - firewall is under attack this function gives you the ability to + firewall is under attack, this function gives you the ability to identify, drill down to, and see the attacking packets. The optional sub-flags give the ability to select the destination or source IP, port, or protocol that you want to monitor in @@ -792,19 +783,19 @@ In order for ipmon to work properly, the - kernel option IPFILTER_LOG must be turned on. This command has + kernel option IPFILTER_LOG must be turned on. This command has two different modes that it can be used in. Native mode is the - default mode when you type the command on the command line + default mode when the command is typed on the command line without the flag. - Daemon mode is for when you want to have a continuous - system log file available so that you can review logging of - past events. This is how &os; and IPFILTER are configured to + Daemon mode is for when a continuous + system log file is desired, so that logging of past events may be + reviewed. This is how &os; and IPFILTER are configured to work together. &os; has a built in facility to automatically rotate system logs. That is why outputting the log information - to syslogd is better than the default of outputting to a - regular file. In the default rc.conf file - you see the ipmon_flags statement uses the + to &man.syslogd.8; is better than the default of outputting to a + regular file. In the default rc.conf file, + the ipmon_flags statement uses the flags: ipmon_flags="-Ds" # D = start as daemon @@ -815,19 +806,19 @@ The benefits of logging are obvious. It provides the ability to review, after the fact, information such as which packets had been dropped, what addresses they came from and - where they were going. These all give you a significant edge + where they were going. These can all provide a significant edge in tracking down attackers. Even with the logging facility enabled, IPF will not generate any rule logging on its own. The firewall - administrator decides what rules in the rule set he wants to + administrator decides what rules in the ruleset he wants to log and adds the log keyword to those rules. Normally only deny rules are logged. It is very customary to include a default deny everything rule with the log keyword included as your last rule in the - rule set. This way you get to see all the packets that did not - match any of the rules in the rule set. + ruleset. This makes it possible to see all the packets that did not + match any of the rules in the ruleset. @@ -850,15 +841,15 @@ To setup IPFILTER to log all data to - /var/log/ipfilter.log, you will need to - create the file. The following command will do that: + /var/log/ipfilter.log, the file will need to be + created beforehand. The following command will do that: &prompt.root; touch /var/log/ipfilter.log - The syslog function is controlled by definition statements + The &man.syslogd.8; function is controlled by definition statements in the /etc/syslog.conf file. The syslog.conf file offers considerable - flexibility in how syslog will deal with system messages issued + flexibility in how syslog will deal with system messages issued by software applications like IPF. Add the following statement to @@ -871,13 +862,13 @@ file location. To activate the changes to /etc/syslog.conf - you can reboot or bump the syslog task into + you can reboot or bump the &man.syslogd.8; daemon into re-reading /etc/syslog.conf by running /etc/rc.d/syslogd reload Do not forget to change /etc/newsyslog.conf to rotate the new log - you just created above. + created above. @@ -924,18 +915,18 @@ The addresses. This is actually three fields: the source address and port (separated by a comma), the -> - symbol, and the destination address and port. - 209.53.17.22,80 -> 198.73.220.17,1722. + symbol, and the destination address and port, e.g.: + 209.53.17.22,80 -> 198.73.220.17,1722. PR followed by the protocol name or - number, e.g. PR tcp. + number, e.g.: PR tcp. len followed by the header length - and total length of the packet, e.g. len 20 40. + and total length of the packet, e.g.: len 20 40. @@ -958,15 +949,15 @@ Some experienced IPF users create a file containing the rules and code them in a manner compatible with running them as a script with symbolic substitution. The major benefit of - doing this is that you only have to change the value associated - with the symbolic name and when the script is run all the rules + doing this is that only the value associated + with the symbolic name needs to be changed, and when the script is run all the rules containing the symbolic name will have the value substituted in - the rules. Being a script, you can use symbolic substitution + the rules. Being a script, symbolic substitution can be used to code frequently used values and substitute them in multiple - rules. You will see this in the following example. + rules. This can be seen in the following example. - The script syntax used here is compatible with the sh, csh, - and tcsh shells. + The script syntax used here is compatible with the &man.sh.1;, &man.csh.1;, + and &man.tcsh.1; shells. Symbolic substitution fields are prefixed with a dollar sign: $. @@ -1012,8 +1003,8 @@ That is all there is to it. The rules are not important in this example; how the symbolic substitution fields are populated and used are. If the above example was in a file - named /etc/ipf.rules.script, you could - reload these rules by entering the following command: + named /etc/ipf.rules.script, these rules could be + reloaded by entering the following command: &prompt.root; sh /etc/ipf.rules.script @@ -1040,7 +1031,7 @@ value) into /etc/rc.conf file. Add a script like the following to your - /usr/local/etc/rc.d/ startup + /usr/local/etc/rc.d/ startup directory. The script should have an obvious name like ipf.loadrules.sh. The .sh extension is mandatory. @@ -1060,27 +1051,21 @@ - IPF Rule Sets + IPF Rulesets - - - A rule set is a group of ipf rules coded to pass or block + A ruleset is a group of IPF rules coded to pass or block packets based on the values contained in the packet. The bi-directional exchange of packets between hosts comprises a - session conversation. The firewall rule set processes the - packet two times, once on its arrival from the public Internet - host and again as it leaves for its return trip back to the - public Internet host. Each TCP/IP service (i.e. telnet, www, - mail, etc.) is predefined by its protocol, source and - destination IP address, or the source and destination port - number. This is the basic selection criteria used to create - rules which will pass or block services. + session conversation. The firewall ruleset processes both the + packets arriving from the public Internet, as well as the packets + produced by the system as a response to them. + Each TCP/IP service (i.e.: telnet, www, + mail, etc.) is predefined by its protocol and privileged (listening) + port. Packets destined for a specific service, originate from the + source address using an unprivileged (high order) port and target the + specific service port on the destination address. All the above + parameters (i.e.: ports and addresses) can be used as selection + criteria to create rules which will pass or block services. IPFILTER @@ -1101,19 +1086,6 @@ basic framework for coding an inclusive firewall rule set. - - - An inclusive firewall only allows services matching the - rules through. This way you can control what services can - originate behind the firewall destined for the public Internet - and also control the services which can originate from the - public Internet accessing your private network. Everything - else is blocked and logged by default design. Inclusive - firewalls are much, much securer than exclusive firewall rule - sets and is the only rule set type covered herein. - When working with the firewall rules, be very careful. Some configurations will @@ -1187,7 +1159,7 @@ The action indicates what to do with the packet if it matches the rest of the filter rule. Each rule - must have a action. The following + must have an action. The following actions are recognized: block indicates that the packet should @@ -1204,7 +1176,7 @@ A mandatory requirement is that each filter rule explicitly state which side of the I/O it is to be used on. - The next keyword must be either in or out and one or the + The next keyword must be either in or out and one or the other has to be coded or the rule will not pass syntax checks. @@ -1250,8 +1222,8 @@ processing logic. When a packet is logged, the headers of the packet are - written to the IPL packet logging pseudo-device. - Immediately following the log keyword, the following + written to the IPL packet logging pseudo-device. + Immediately following the log keyword, the following qualifiers may be used (in this order): body indicates that the first 128 @@ -1259,8 +1231,8 @@ headers. first If the log - keyword is being used in conjunction with a keep - state option, it is recommended that this option is + keyword is being used in conjunction with a keep + state option, it is recommended that this option is also applied so that only the triggering packet is logged and not every packet which thereafter matches the keep state information. @@ -1270,7 +1242,7 @@ SELECTION The keywords described in this section are used to - describe attributes of the packet to be interrogated when + describe attributes of the packet to be checked when determining whether rules match or not. There is a keyword subject, and it has sub-option keywords, one of which has to be selected. The following general-purpose @@ -1291,7 +1263,7 @@ protocol names found in /etc/protocols are recognized and may be used. The special protocol keyword tcp/udp may be used to match either a - TCP or a UDP packet, and has been added as + TCP or a UDP packet, and has been added as a convenience to save duplication of otherwise identical rules. @@ -1303,24 +1275,22 @@ synonym for from any to any with no other match parameters. - from src to dst: the from and to + from src to dst: the from and to keywords are used to match against IP addresses. Rules must - specify BOTH source and destination parameters. + specify both source and destination parameters. any is a special keyword that matches any - IP address. Examples of use: from any to any - or from 0.0.0.0/0 to any or from any to - 0.0.0.0/0 or from 0.0.0.0 to any or - from any to 0.0.0.0. + IP address. Examples of use: from any to any + or from 0.0.0.0/0 to any or from any to + 0.0.0.0/0 or from 0.0.0.0 to any or + from any to 0.0.0.0. - - IP addresses may be specified as a dotted IP address - numeric form/mask-length, or as single dotted IP address - numeric form. - There is no way to match ranges of IP addresses which - do not express themselves easily as mask-length. See this - web page for help on writing mask-length: net-mgmt/ipcalc port may be used to + ease up the calculations. Additional information is available in + the utility's web page: . @@ -1329,21 +1299,21 @@ If a port match is included, for either or both of source and destination, then it is only applied to - TCP and UDP packets. When composing port + TCP and UDP packets. When composing port comparisons, either the service name from /etc/services or an integer port number - may be used. When the port appears as part of the from + may be used. When the port appears as part of the from object, it matches the source port number; when it appears - as part of the to object, it matches the destination port + as part of the to object, it matches the destination port number. The use of the port option with the to object is a mandatory requirement for the modernized rules processing logic. Example of use: - from any to any port = 80 + from any to any port = 80 - + - Port comparisons may be done in a number of forms, with - a number of comparison operators, or port ranges may be + Single port comparisons may be done in a number of ways, using + a number of different comparison operators. Port ranges may also be specified. port "=" | "!=" | "<" | ">" | "<=" | ">=" | @@ -1364,8 +1334,8 @@ <acronym>TCP</acronym>_FLAG Flags are only effective for TCP - filtering. The letters represents one of the possible flags - that can be interrogated in the TCP packet + filtering. The letters represent one of the possible flags + that can be matched against the TCP packet header. The modernized rules processing logic uses the @@ -1402,16 +1372,16 @@ exchange of packets comprising a session conversation. When activated, keep-state dynamically generates internal rules for each anticipated packet being exchanged during the - bi-directional session conversation. It has the interrogation - abilities to determine if the session conversation between the + bi-directional session conversation. It has sufficient matching + capabilities to determine if the session conversation between the originating sender and the destination are following the valid procedure of bi-directional packet exchange. Any packets that do not properly fit the session conversation template are automatically rejected as impostors. - Keep state will also allow ICMP packets related to a - TCP or UDP session through. So if you get - ICMP type 3 code 4 in response to some web surfing allowed out + Keep state will also allow ICMP packets related to a + TCP or UDP session through. So if you get + ICMP type 3 code 4 in response to some web surfing allowed out by a keep state rule, they will be automatically allowed in. Any packet that IPF can be certain is part of an active session, even if it is a different protocol, will be let @@ -1419,21 +1389,22 @@ What happens is: - Packets destined to go out the interface connected to the + Packets destined to go out through the interface connected to the public Internet are first checked against the dynamic state - table, if the packet matches the next expected packet - comprising in a active session conversation, then it exits the + table. If the packet matches the next expected packet + comprising an active session conversation, then it exits the firewall and the state of the session conversation flow is - updated in the dynamic state table, the remaining packets get - checked against the outbound rule set. + updated in the dynamic state table. Packets that do not belong to + an already active session, are simply checked against the outbound + ruleset. - Packets coming in to the interface connected to the public - Internet are first checked against the dynamic state table, if - the packet matches the next expected packet comprising a + Packets coming in from the interface connected to the public + Internet are first checked against the dynamic state table. If + the packet matches the next expected packet comprising an active session conversation, then it exits the firewall and the state of the session conversation flow is updated in the - dynamic state table, the remaining packets get checked against - the inbound rule set. + dynamic state table. Packets that do not belong to an already active + session, are simply checked against the inbound ruleset. When the conversation completes it is removed from the dynamic state table. @@ -1443,7 +1414,7 @@ packets will be allowed through automatically and any impostors automatically rejected. If a new session is blocked, none of its subsequent packets will be allowed through. Stateful - filtering has technically advanced interrogation abilities + filtering has technically advanced matching abilities capable of defending against the flood of different attack methods currently employed by attackers. @@ -1451,14 +1422,19 @@ - Inclusive Rule Set Example + Inclusive Ruleset Example - The following rule set is an example of how to code a very + The following ruleset is an example of how to code a very secure inclusive type of firewall. An inclusive firewall only - allows services matching pass rules through and blocks all - other by default. All firewalls have at the minimum two - interfaces which have to have rules to allow the firewall to - function. + allows services matching pass rules through, and blocks all + others by default. Firewalls intended to protect other machines, + also called network firewalls, should have at least + two interfaces, which are generally configured to trust one side + (the LAN) and not the other (the public Internet). Alternatively, + a firewall might be configured to protect only the system it is + running on—this is called a + host based firewall, and is particularly appropriate + for servers on an untrusted network. All &unix; flavored systems including &os; are designed to use interface lo0 and IP address @@ -1468,20 +1444,19 @@ special internally used packets. The interface which faces the public Internet is the one - where you place your rules to authorize and control access out - to the public Internet and access requests arriving from the - public Internet. This can be your user PPP + to place the rules that authorize and control access of the outbound + and inbound connections. This can be your user PPP tun0 interface or your NIC that is connected to your DSL or cable modem. - In cases where one or more NICs are cabled to private LANs - behind the firewall, those interfaces must have a rule coded to - allow free unmolested movement of packets originating from - those LAN interfaces. + In cases where one or more NICs are cabled to private network + segments, those interfaces may require rules to allow packets + originating from those LAN interfaces transit to each other and/or + to the outside (Internet). - The rules should be first organized into three major - sections: all the free unmolested interfaces, the public - interface outbound, and the public interface inbound. + The rules should be organized into three major + sections: first trusted interfaces, then the public + interface outbound, and last the public untrusted interface inbound. The rules in each of the public interface sections should have the most frequently matched rules placed before less @@ -1489,67 +1464,66 @@ blocking and logging all packets on that interface and direction. - The Outbound section in the following rule set only - contains 'pass' rules which contain selection values that + The Outbound section in the following ruleset only + contains pass rules which contain selection values that uniquely identify the service that is authorized for public - Internet access. All the rules have the 'quick', 'on', - 'proto', 'port', and 'keep state' option coded. The 'proto - tcp' rules have the 'flag' option included to identify the + Internet access. All the rules have the quick, on, + proto, port, and keep state options set. The proto + tcp rules have the flag option included to identify the session start request as the triggering packet to activate the stateful facility. The Inbound section has all the blocking of undesirable packets first, for two different reasons. The first is that - these things being blocked may be part of an otherwise valid - packet which may be allowed in by the later authorized service - rules. The second reason is that by having a rule that - explicitly blocks selected packets that I receive on an - infrequent basis and that I do not want to see in the log, they - will not be caught by the last rule in the section which blocks - and logs all packets which have fallen through the rules. The - last rule in the section which blocks and logs all packets is - how you create the legal evidence needed to prosecute the - people who are attacking your system. + malicious packets may be partial matches for legitimate traffic. + These packets have to be discarded rather than allowed in, based on + their partial matches against allow rules. + The second reason is that known and uninteresting rejects may be + blocked silently, rather than being caught and logged by the last + rules in the section. The final rule in each section, blocks and + logs all packets and can be used to create the legal evidence needed + to prosecute the people who are attacking your system. - Another thing you should take note of, is there is no - response returned for any of the undesirable stuff, their - packets just get dropped and vanish. This way the attacker + Another thing that should be taken care of, is to insure there is no + response returned for any of the undesirable traffic. Invalid + packets should just get dropped and vanish. This way the attacker has no knowledge if his packets have reached your system. The less the attackers can learn about your system, the more time they must invest before actually doing something bad. - The inbound 'nmap OS fingerprint' attempts rule I log + Rules that include a log first option, will only + log the event the first time they are triggered. This option is + included in the sample nmap OS fingerprint rule. + The security/nmap utility is + commonly used by attackers who attempt to identify the operating + system of your server. - + Any time there are logged messages on a rule with + the log first option, an ipfstat -hio + command should be executed to evaluate how many times the rule has + actually matched. Large number of matches usually indicate that the + system is being flooded (i.e.: under attack). - the first occurrence because this is something a attacker - would do. - - Any time you see log messages on a rule with 'log first'. - You should do an ipfstat -hio command to see - the number of times the rule has been matched so you know if - you are being flooded, i.e. under attack. - - When you log packets with port numbers you do not - recognize, look it up in /etc/services or - go to The /etc/services file may be used to + lookup unknown port numbers. Alternatively, + visit - and do a port number lookup to find what the purpose of that - port number is. + and do a port number lookup to find the purpose of a particular + port number. Check out this link for port numbers used by Trojans . - The following rule set is a complete very secure - 'inclusive' type of firewall rule set that I have used on my - system. You can not go wrong using this rule set for your own. - Just comment out any pass rules for services that you do not - want to authorize. + The following ruleset creates a complete and very secure + inclusive type of firewall ruleset that has been + tested on production systems. It can be easily modified for your + own system. Just comment out any pass rules for + services that should not be authorized. - If you see messages in your log that you want to stop - seeing just add a block rule in the inbound section. + To avoid logging unwanted messages, + just add a block rule in the inbound section. - You have to change the dc0 - interface name in every rule to the interface name of the Nic + The dc0 interface name has to be changed + in every rule to the real interface name of the NIC card that connects your system to the public Internet. For user PPP it would be tun0. @@ -1572,9 +1546,9 @@ ################################################################# # Interface facing Public Internet (Outbound Section) -# Interrogate session start requests originating from behind the +# Match session start requests originating from behind the # firewall on the private network -# or from this gateway server destine for the public Internet. +# or from this gateway server destined for the public Internet. ################################################################# # Allow out access to my ISP's Domain name server. @@ -1609,38 +1583,38 @@ # Allow out nntp news pass out quick on dc0 proto tcp from any to any port = 119 flags S keep state -# Allow out gateway & LAN users non-secure FTP ( both passive & active modes) +# Allow out gateway & LAN users' non-secure FTP ( both passive & active modes) # This function uses the IPNAT built in FTP proxy function coded in # the nat rules file to make this single rule function correctly. # If you want to use the pkg_add command to install application packages # on your gateway system you need this rule. pass out quick on dc0 proto tcp from any to any port = 21 flags S keep state -# Allow out secure FTP, Telnet, and SCP +# Allow out ssh/sftp/scp (telnet/rlogin/FTP replacements) # This function is using SSH (secure shell) pass out quick on dc0 proto tcp from any to any port = 22 flags S keep state -# Allow out non-secure Telnet +# Allow out insecure Telnet pass out quick on dc0 proto tcp from any to any port = 23 flags S keep state -# Allow out FBSD CVSUP function +# Allow out FreeBSD CVSup pass out quick on dc0 proto tcp from any to any port = 5999 flags S keep state # Allow out ping to public Internet pass out quick on dc0 proto icmp from any to any icmp-type 8 keep state -# Allow out whois for LAN PC to public Internet +# Allow out whois from LAN to public Internet pass out quick on dc0 proto tcp from any to any port = 43 flags S keep state # Block and log only the first occurrence of everything # else that's trying to get out. -# This rule enforces the block all by default logic. +# This rule implements the default block block out log first quick on dc0 all ################################################################# # Interface facing Public Internet (Inbound Section) -# Interrogate packets originating from the public Internet -# destine for this gateway server or the private network. +# Match packets originating from the public Internet +# destined for this gateway server or the private network. ################################################################# # Block all inbound traffic from non-routable or reserved address spaces @@ -1711,9 +1685,8 @@ # Block and log only first occurrence of all remaining traffic # coming into the firewall. The logging of only the first -# occurrence stops a .denial of service. attack targeted -# at filling up your log file space. -# This rule enforces the block all by default logic. +# occurrence avoids filling up disk with Denial of Service logs. +# This rule implements the default block. block in log first quick on dc0 all ################### End of rules file ##################################### @@ -1735,8 +1708,8 @@ NAT - NAT stands for Network Address - Translation. To those familiar with &linux;, this concept is + NAT stands for Network Address + Translation. To those familiar with &linux;, this concept is called IP Masquerading; NAT and IP Masquerading are the same thing. One of the many things the IPF NAT function enables is the ability to @@ -1748,17 +1721,16 @@ normally assign a dynamic IP address to their non-commercial users. Dynamic means that the IP address can be different each time you dial in and log on to your ISP, or for cable and DSL - modem users when you power off and then power on your modems - you can get assigned a different IP address. This IP address - is how you are known to the public Internet. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 13 21:15:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5903A10656D1; Wed, 13 May 2009 21:15:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11BC910656C5 for ; Wed, 13 May 2009 21:15:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7CB0D8FC21 for ; Wed, 13 May 2009 21:15:51 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DLFplr077843 for ; Wed, 13 May 2009 21:15:51 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DLFpTo077841 for perforce@freebsd.org; Wed, 13 May 2009 21:15:51 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 13 May 2009 21:15:51 GMT Message-Id: <200905132115.n4DLFpTo077841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 162036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 21:15:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=162036 Change 162036 by rene@rene_self on 2009/05/13 21:14:58 MFen articles/contributing 1.510 -> 1.511 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#18 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#18 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -183,8 +183,9 @@ - Als u ports heeft bijgedragen, stuur dan uw patches - terug naar de originele auteurs (dit maakt het gemakkelijker + Als u ports heeft bijgedragen en u &os;-specifieke + veranderingen moest maken, stuur dan uw patches terug naar + de originele auteurs (dit maakt het gemakkelijker voor u wanneer ze de volgende versie uitbrengen). @@ -363,24 +364,24 @@ Bijvoorbeeld: - - &prompt.user; diff -c oudbestand nieuwbestand + &prompt.user; diff -c oudbestand nieuwbestand - of + of - &prompt.user; diff -c -r oudemap nieuwemap + &prompt.user; diff -c -r oudemap nieuwemap - zal zo'n verzameling van contextdiffs aanmaken voor het gegeven + zal zo'n verzameling van contextdiffs aanmaken voor het gegeven broncodebestand of maphiërarchie. - Evenzo, - &prompt.user; diff -u oudbestand nieuwbestand + Evenzo zal + + &prompt.user; diff -u oudbestand nieuwbestand - of + of - &prompt.user; diff -u -r oudemap nieuwemap + &prompt.user; diff -u -r oudemap nieuwemap - zal hetzelfde doen, maar dan in het verenigde + hetzelfde doen, maar dan in het verenigde diff-formaat. Zie de hulppagina van &man.diff.1; voor meer details. From owner-p4-projects@FreeBSD.ORG Wed May 13 21:32:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A300C1065674; Wed, 13 May 2009 21:32:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62FCF1065672 for ; Wed, 13 May 2009 21:32:08 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 375428FC18 for ; Wed, 13 May 2009 21:32:08 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DLW8Br079244 for ; Wed, 13 May 2009 21:32:08 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DLW8is079242 for perforce@freebsd.org; Wed, 13 May 2009 21:32:08 GMT (envelope-from brueffer@freebsd.org) Date: Wed, 13 May 2009 21:32:08 GMT Message-Id: <200905132132.n4DLW8is079242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 162038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 21:32:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=162038 Change 162038 by brueffer@brueffer_haakonia on 2009/05/13 21:31:58 Fix typos and catch up with the new audit_control default settings. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#23 (text+ko) ==== @@ -26,9 +26,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#22 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#23 $ .\" -.Dd January 29, 2009 +.Dd May 14, 2009 .Dt AUDIT_CONTROL 5 .Os .Sh NAME @@ -94,7 +94,7 @@ This may be after a time period has passed since the file was last written to or when the aggregate of all the trail files have reached a specified size or a combination of both. -If no expire-after parameter is given then audit log files with not +If no expire-after parameter is given then audit log files will not expire and be removed by the audit control system. See the information below for the format of the expiration specification. @@ -217,7 +217,7 @@ If both an age and disk space value are used they are seperated by AND or OR and both values are used to determine when audit log files expire. -In the case of AND, both the age and disk space conditions must be meet +In the case of AND, both the age and disk space conditions must be met before the log file is removed. In the case of OR, either condition may expire the log file. For example: @@ -233,17 +233,18 @@ file: .Bd -literal -offset indent dir:/var/audit -flags:lo +flags:lo,aa minfree:5 -naflags:lo +naflags:lo,aa policy:cnt,argv -filesz:2097152 +filesz:2M +expire-after:10M .Ed .Pp The .Va flags parameter above specifies the system-wide mask corresponding to login/logout -events. +as well as authentication and authorization events. The .Va policy parameter specifies that the system should neither fail stop nor suspend @@ -253,6 +254,7 @@ events. The trail file will be automatically rotated by the audit daemon when the file size reaches approximately 2MB. +Trail files will expire when their aggregate size exceeds 10MB. .Sh FILES .Bl -tag -width ".Pa /etc/security/audit_control" -compact .It Pa /etc/security/audit_control From owner-p4-projects@FreeBSD.ORG Wed May 13 23:32:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12D4210656C1; Wed, 13 May 2009 23:32:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C726F106564A for ; Wed, 13 May 2009 23:32:10 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6EDA8FC0C for ; Wed, 13 May 2009 23:32:10 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DNWAVf090281 for ; Wed, 13 May 2009 23:32:10 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DNWAdn090279 for perforce@freebsd.org; Wed, 13 May 2009 23:32:10 GMT (envelope-from zec@fer.hr) Date: Wed, 13 May 2009 23:32:10 GMT Message-Id: <200905132332.n4DNWAdn090279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 23:32:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=162045 Change 162045 by zec@zec_tpx32 on 2009/05/13 23:31:15 if_free_internal() is called with ifp->if_vnet already set to NULL, so instead of fetching the vnet context from ifp->if_vnet, resort to curvnet instead. This unbreaks ifconfig destroy operations on cloning ifnets with options VIMAGE builds. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#59 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#59 (text+ko) ==== @@ -545,7 +545,7 @@ static void if_free_internal(struct ifnet *ifp) { - INIT_VNET_NET(ifp->if_vnet); + INIT_VNET_NET(curvnet); /* ifp->if_vnet is already NULL here */ KASSERT((ifp->if_flags & IFF_DYING), ("if_free_internal: interface not dying")); From owner-p4-projects@FreeBSD.ORG Wed May 13 23:47:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 973831065673; Wed, 13 May 2009 23:47:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 576581065670 for ; Wed, 13 May 2009 23:47:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46A068FC20 for ; Wed, 13 May 2009 23:47:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4DNlQH6091424 for ; Wed, 13 May 2009 23:47:26 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DNlQqi091422 for perforce@freebsd.org; Wed, 13 May 2009 23:47:26 GMT (envelope-from zec@fer.hr) Date: Wed, 13 May 2009 23:47:26 GMT Message-Id: <200905132347.n4DNlQqi091422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 23:47:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=162046 Change 162046 by zec@zec_tpx32 on 2009/05/13 23:46:54 When processing requests to create an instance of a cloning ifnet, and the cloner for the requested cloning ifnet class is not found in the current vnet, look up for the cloner in the default vnet. Apply the same logic when attempting to destroy a cloning ifnet. In effect, this simple change allows for having both per-vnet and global unit numbers for cloning ifnets. Only if_loop is currently registered on a per-vnet basis, so by default all the other cloning ifnet types will be assigned globally unique ifunit numbers. Let it remain noted that I was personally strongly opposed to introducing such special-case logic, which I believe will cause us more trouble than good in the long run, as users / applications running in parallel vnets will not be able to rely on predictability and availability of free ifunits. For example, if a user / application in a non-default vnet requests and gets a vlan0 instance, a later request for vlan0 creation in the default vnet will fail without any reasonable or obvious explanation. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#40 edit .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#8 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#60 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#40 (text+ko) ==== @@ -94,6 +94,8 @@ static u_int last_vi_id = 0; static u_int last_vnet_id = 0; static u_int last_vprocg_id = 0; + +struct vnet *vnet0; #endif #ifdef VIMAGE @@ -721,6 +723,8 @@ panic("vi_alloc: malloc failed for vnet \"%s\"\n", name); vip->v_net = vnet; vnet->vnet_id = last_vnet_id++; + if (vnet->vnet_id == 0) + vnet0 = vnet; vnet->vnet_magic_n = VNET_MAGIC_N; vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT | M_ZERO); ==== //depot/projects/vimage-commit2/src/sys/net/if_clone.c#8 (text+ko) ==== @@ -159,6 +159,17 @@ break; } } +#ifdef VIMAGE + if (ifc == NULL && !IS_DEFAULT_VNET(curvnet)) { + CURVNET_SET_QUIET(vnet0); + INIT_VNET_NET(vnet0); + LIST_FOREACH(ifc, &V_if_cloners, ifc_list) { + if (ifc->ifc_match(ifc, name)) + break; + } + CURVNET_RESTORE(); + } +#endif IF_CLONERS_UNLOCK(); if (ifc == NULL) @@ -217,6 +228,17 @@ break; } } +#ifdef VIMAGE + if (ifc == NULL && !IS_DEFAULT_VNET(curvnet)) { + CURVNET_SET_QUIET(vnet0); + INIT_VNET_NET(vnet0); + LIST_FOREACH(ifc, &V_if_cloners, ifc_list) { + if (ifc->ifc_match(ifc, name)) + break; + } + CURVNET_RESTORE(); + } +#endif IF_CLONERS_UNLOCK(); if (ifc == NULL) return (EINVAL); @@ -235,6 +257,13 @@ if (ifc->ifc_destroy == NULL) return(EOPNOTSUPP); + /* + * Given that the cloned ifnet might be attached to a different + * vnet from where it's cloner was registered, we have to + * switch to the vnet context of the target vnet. + */ + CURVNET_SET_QUIET(ifp->if_vnet); + IF_CLONE_LOCK(ifc); IFC_IFLIST_REMOVE(ifc, ifp); IF_CLONE_UNLOCK(ifc); @@ -250,6 +279,7 @@ IFC_IFLIST_INSERT(ifc, ifp); IF_CLONE_UNLOCK(ifc); } + CURVNET_RESTORE(); return (err); } ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#60 (text+ko) ==== @@ -307,6 +307,7 @@ #ifdef VIMAGE LIST_HEAD(vnet_list_head, vnet); extern struct vnet_list_head vnet_head; +extern struct vnet *vnet0; #define VNET_ITERATOR_DECL(arg) struct vnet *arg; #define VNET_FOREACH(arg) LIST_FOREACH(arg, &vnet_head, vnet_le) #else From owner-p4-projects@FreeBSD.ORG Thu May 14 08:33:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7457310656B1; Thu, 14 May 2009 08:33:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DDD910656A7 for ; Thu, 14 May 2009 08:33:22 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 019F08FC19 for ; Thu, 14 May 2009 08:33:22 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4E8XKWc064618 for ; Thu, 14 May 2009 08:33:20 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4E8XK8b064616 for perforce@freebsd.org; Thu, 14 May 2009 08:33:20 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Thu, 14 May 2009 08:33:20 GMT Message-Id: <200905140833.n4E8XK8b064616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhaoshuai@FreeBSD.org using -f From: Zhao Shuai To: Perforce Change Reviews Cc: Subject: PERFORCE change 162054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 08:33:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=162054 Change 162054 by zhaoshuai@zhaoshuai on 2009/05/14 08:32:39 backup the pipe file Affected files ... .. //depot/projects/soc2009/fifo/sys/i386/conf/MYKERNEL#3 edit .. //depot/projects/soc2009/fifo/sys/kern/sys_pipe_backup.c#1 add .. //depot/projects/soc2009/fifo/sys/sys/pipe_backup.h#1 add Differences ... ==== //depot/projects/soc2009/fifo/sys/i386/conf/MYKERNEL#3 (text+ko) ==== @@ -21,7 +21,7 @@ #cpu I486_CPU #cpu I586_CPU cpu I686_CPU -ident GENERIC +ident MYKERNEL # To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" # Default places to look for devices. @@ -310,15 +310,15 @@ #device zyd # ZyDAS zb1211/zb1211b wireless NICs #device urio # Diamond Rio 500 MP3 player # USB Serial devices -device u3g # USB-based 3G modems (Option, Huawei, Sierra) -device uark # Technologies ARK3116 based serial adapters -device ubsa # Belkin F5U103 and compatible serial adapters -device uftdi # For FTDI usb serial adapters -device uipaq # Some WinCE based devices -device uplcom # Prolific PL-2303 serial adapters -device uslcom # SI Labs CP2101/CP2102 serial adapters -device uvisor # Visor and Palm devices -device uvscom # USB serial support for DDI pocket's PHS +#device u3g # USB-based 3G modems (Option, Huawei, Sierra) +#device uark # Technologies ARK3116 based serial adapters +#device ubsa # Belkin F5U103 and compatible serial adapters +#device uftdi # For FTDI usb serial adapters +#device uipaq # Some WinCE based devices +#device uplcom # Prolific PL-2303 serial adapters +#device uslcom # SI Labs CP2101/CP2102 serial adapters +#device uvisor # Visor and Palm devices +#device uvscom # USB serial support for DDI pocket's PHS # USB Ethernet, requires miibus #device aue # ADMtek USB Ethernet #device axe # ASIX Electronics USB Ethernet @@ -329,12 +329,12 @@ #device udav # Davicom DM9601E USB # FireWire support -device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) -device fwip # IP over FireWire (RFC 2734,3146) -device dcons # Dumb console driver -device dcons_crom # Configuration ROM for dcons +#device firewire # FireWire bus code +#device sbp # SCSI over FireWire (Requires scbus and da) +#device fwe # Ethernet over FireWire (non-standard!) +#device fwip # IP over FireWire (RFC 2734,3146) +#device dcons # Dumb console driver +#device dcons_crom # Configuration ROM for dcons #display options VESA From owner-p4-projects@FreeBSD.ORG Thu May 14 19:37:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D7B7106566C; Thu, 14 May 2009 19:37:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D2A6106564A for ; Thu, 14 May 2009 19:37:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 018798FC17 for ; Thu, 14 May 2009 19:37:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4EJbgY6064411 for ; Thu, 14 May 2009 19:37:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4EJbg6r064409 for perforce@freebsd.org; Thu, 14 May 2009 19:37:42 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 May 2009 19:37:42 GMT Message-Id: <200905141937.n4EJbg6r064409@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 162080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 19:37:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=162080 Change 162080 by hselasky@hselasky_laptop001 on 2009/05/14 19:36:56 USB Controller: - start of AVR32 USB support Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#1 add .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 14 19:47:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB30D1065676; Thu, 14 May 2009 19:47:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9ADF21065674 for ; Thu, 14 May 2009 19:47:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 896618FC14 for ; Thu, 14 May 2009 19:47:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4EJlrQt065222 for ; Thu, 14 May 2009 19:47:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4EJlrli065220 for perforce@freebsd.org; Thu, 14 May 2009 19:47:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 May 2009 19:47:53 GMT Message-Id: <200905141947.n4EJlrli065220@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 162082 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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 May 2009 19:47:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=162082 Change 162082 by hselasky@hselasky_laptop001 on 2009/05/14 19:47:11 USB controller (AVR32 DCI) - add basic structures, mostly copied from the atmegadci driver. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/sys/dev/usb/controller/avr32dci.h $ */ /*- * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. * @@ -26,6 +27,8 @@ #ifndef _AVR32DCI_H_ #define _AVR32DCI_H_ +#define AVR32_MAX_DEVICES (USB_MIN_DEVICES + 1) + /* Register definitions */ #define AVR32_CTRL 0x00 /* Control */ @@ -60,4 +63,114 @@ #define AVR32_DMANXTDSC 0x310 /* DMA Next Descriptor Address */ #define AVR32_DMAADDRESS 0x314 /* DMA Channel Address */ +#define AVR32_READ_4(sc, reg) \ + bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, reg) + +#define AVR32_WRITE_4(sc, reg, data) \ + bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, data) + +#define AVR32_WRITE_MULTI_4(sc, reg, ptr, len) \ + bus_space_write_multi_4((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, ptr, len) + +#define AVR32_READ_MULTI_4(sc, reg, ptr, len) \ + bus_space_read_multi_4((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, ptr, len) + +/* + * Maximum number of endpoints supported: + */ +#define AVR32_EP_MAX 7 + +struct avr32dci_td; + +typedef uint8_t (avr32dci_cmd_t)(struct avr32dci_td *td); +typedef void (avr32dci_clocks_t)(struct usb2_bus *); + +struct avr32dci_td { + struct avr32dci_td *obj_next; + avr32dci_cmd_t *func; + struct usb2_page_cache *pc; + uint32_t offset; + uint32_t remainder; + uint16_t max_packet_size; + uint8_t error:1; + uint8_t alt_next:1; + uint8_t short_pkt:1; + uint8_t support_multi_buffer:1; + uint8_t did_stall:1; + uint8_t ep_no:3; +}; + +struct avr32dci_std_temp { + avr32dci_cmd_t *func; + struct usb2_page_cache *pc; + struct avr32dci_td *td; + struct avr32dci_td *td_next; + uint32_t len; + uint32_t offset; + uint16_t max_frame_size; + uint8_t short_pkt; + /* + * short_pkt = 0: transfer should be short terminated + * short_pkt = 1: transfer should not be short terminated + */ + uint8_t setup_alt_next; +}; + +struct avr32dci_config_desc { + struct usb2_config_descriptor confd; + struct usb2_interface_descriptor ifcd; + struct usb2_endpoint_descriptor endpd; +} __packed; + +union avr32dci_hub_temp { + uWord wValue; + struct usb2_port_status ps; +}; + +struct avr32dci_flags { + uint8_t change_connect:1; + uint8_t change_suspend:1; + uint8_t status_suspend:1; /* set if suspended */ + uint8_t status_vbus:1; /* set if present */ + uint8_t status_bus_reset:1; /* set if reset complete */ + uint8_t remote_wakeup:1; + uint8_t self_powered:1; + uint8_t clocks_off:1; + uint8_t port_powered:1; + uint8_t port_enabled:1; + uint8_t d_pulled_up:1; +}; + +struct avr32dci_softc { + struct usb2_bus sc_bus; + union avr32dci_hub_temp sc_hub_temp; + + /* must be set by by the bus interface layer */ + avr32dci_clocks_t *sc_clocks_on; + avr32dci_clocks_t *sc_clocks_off; + + struct usb2_device *sc_devices[AVR32_MAX_DEVICES]; + struct resource *sc_irq_res; + void *sc_intr_hdl; + struct resource *sc_io_res; + bus_space_tag_t sc_io_tag; + bus_space_handle_t sc_io_hdl; + + uint8_t sc_rt_addr; /* root hub address */ + uint8_t sc_dv_addr; /* device address */ + uint8_t sc_conf; /* root hub config */ + + uint8_t sc_hub_idata[1]; + + struct avr32dci_flags sc_flags; +}; + +/* prototypes */ + +usb2_error_t avr32dci_init(struct avr32dci_softc *sc); +void avr32dci_uninit(struct avr32dci_softc *sc); +void avr32dci_suspend(struct avr32dci_softc *sc); +void avr32dci_resume(struct avr32dci_softc *sc); +void avr32dci_interrupt(struct avr32dci_softc *sc); + #endif /* _AVR32DCI_H_ */ From owner-p4-projects@FreeBSD.ORG Fri May 15 00:24:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1CC31065670; Fri, 15 May 2009 00:24:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58E07106566B for ; Fri, 15 May 2009 00:24:46 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 451578FC0A for ; Fri, 15 May 2009 00:24:46 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4F0OkxK001735 for ; Fri, 15 May 2009 00:24:46 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4F0Ojix001733 for perforce@freebsd.org; Fri, 15 May 2009 00:24:45 GMT (envelope-from zec@fer.hr) Date: Fri, 15 May 2009 00:24:45 GMT Message-Id: <200905150024.n4F0Ojix001733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 00:24:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=162097 Change 162097 by zec@zec_tpx32 on 2009/05/15 00:23:50 First cut implementation of if_vmove(), inspired by Julian's sketches from a few days ago. if_vmove() calls if_detach1() with a flag set resulting in only a subset of common if_detach() tasks being done, i.e. vnet-agnostic state being preserved. The ifnet is then detached from ifindex_table in current vnet, and linked to the ifindex_table in target vnet. Finally, if_attach1() is called with a vmove flag set, resulting in ifnet being attached to the target vnet while preserving vnet-agnostic state such ase LLADDRs, if_* interface methods etc. While here, nuke if_reassign_common() which is no longer used. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#41 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#60 edit .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#26 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#23 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#41 (text+ko) ==== @@ -115,86 +115,11 @@ } /* - * if_reassign_common() should be called by all device specific - * ifnet reassignment routines after the interface is detached from - * current vnet and before the interface gets attached to the target - * vnet. This routine attempts to shrink if_index in current vnet, - * find an unused if_index in target vnet and calls if_grow() if - * necessary, and finally finds an unused if_xname for the target - * vnet. - * - * XXX this routine should hold a lock over if_index and return with - * such a lock held, and the caller should release that lock - * after ifattach completes! - */ -void -if_reassign_common(struct ifnet *ifp, struct vnet *new_vnet, const char *dname) -{ - - /* do / while construct needed to confine scope of INIT_VNET_NET(). */ - do { - INIT_VNET_NET(curvnet); - - IFNET_WLOCK(); - ifnet_setbyindex(ifp->if_index, NULL); - while (V_if_index > 0 && \ - ifnet_byindex_locked(V_if_index) == NULL) - V_if_index--; - IFNET_WUNLOCK(); - } while (0); - - CURVNET_SET_QUIET(new_vnet); - INIT_VNET_NET(new_vnet); - /* - * Try to find an empty slot below if_index. If we fail, take - * the next slot. - */ - IFNET_WLOCK(); - for (ifp->if_index = 1; ifp->if_index <= V_if_index; ifp->if_index++) { - if (ifnet_byindex_locked(ifp->if_index) == NULL) - break; - } - /* Catch if_index overflow. */ - if (ifp->if_index < 1) - panic("vi_if_move: if_index overflow"); - - if (ifp->if_index > V_if_index) - V_if_index = ifp->if_index; - if (V_if_index >= V_if_indexlim) - if_grow(); - ifnet_setbyindex(ifp->if_index, ifp); - IFNET_WUNLOCK(); - -#ifdef NOTYET - /* Rename the ifnet */ - if (new_vnet == ifp->if_home_vnet) { - /* always restore the original name on return to home vnet */ - snprintf(ifp->if_xname, IFNAMSIZ, "%s%d", ifp->if_dname, - ifp->if_dunit); - } else { - int unit = 0; - struct ifnet *iter; - - do { - snprintf(ifp->if_xname, IFNAMSIZ, "%s%d", dname, unit); - TAILQ_FOREACH(iter, &V_ifnet, if_link) - if (strcmp(ifp->if_xname, iter->if_xname) == 0) - break; - unit++; - } while (iter); - } -#endif - CURVNET_RESTORE(); -} - -/* - * Move the interface to another vnet. The interface can be specified either + * Move an ifnet to another vnet. The ifnet can be specified either * by ifp argument, or by name contained in vi_req->vi_if_xname if NULL is - * passed as ifp. The interface will be renamed to vi_req->vi_parent_name - * if vi_req->vi_parent_name is not an empty string (uff ugly ugly)... - * Similary, the target vnet can be specified either by vnet argument or - * by name. If vnet name equals to ".." or vi_req is set to NULL the - * interface is moved to the parent vnet. + * passed as ifp. The target vnet can be specified either by vnet + * argument or by name. If vnet name equals to ".." or vi_req is set to + * NULL the interface is moved to the parent vnet. */ int vi_if_move(struct vi_req *vi_req, struct ifnet *ifp, struct vimage *vip) @@ -206,6 +131,7 @@ if (vi_req->vi_api_cookie != VI_API_COOKIE) return (EDOOFUS); + /* Find the target vnet. */ if (vi_req == NULL || strcmp(vi_req->vi_name, "..") == 0) { if (IS_DEFAULT_VIMAGE(vip)) return (ENXIO); @@ -217,15 +143,23 @@ new_vnet = new_vip->v_net; } + /* Try to find the target ifnet by name. */ if (ifp == NULL) ifp = ifunit(vi_req->vi_if_xname); + if (ifp == NULL) return (ENXIO); +#if 0 /* Abort if driver did not provide a if_reassign() method */ if (ifp->if_reassign == NULL) return (ENODEV); +#endif + /* + * Check for naming clashes in target vnet. Not locked so races + * are possible. + */ if (vi_req != NULL) { struct ifnet *t_ifp; @@ -236,11 +170,8 @@ return (EEXIST); } - if (vi_req && strlen(vi_req->vi_if_xname) > 0) - ifp->if_reassign(ifp, new_vnet, vi_req->vi_if_xname); - else - ifp->if_reassign(ifp, new_vnet, NULL); - getmicrotime(&ifp->if_lastchange); + /* Detach from curvnet and attach to new_vnet. */ + if_vmove(ifp, new_vnet); /* Report the new if_xname back to the userland */ if (vi_req != NULL) ==== //depot/projects/vimage-commit2/src/sys/net/if.c#60 (text+ko) ==== @@ -141,6 +141,8 @@ static int if_getgroup(struct ifgroupreq *, struct ifnet *); static int if_getgroupmembers(struct ifgroupreq *); static void if_delgroups(struct ifnet *); +static void if_attach1(struct ifnet *, int); +static void if_detach1(struct ifnet *, int); #ifdef INET6 /* @@ -652,7 +654,10 @@ /* * Perform generic interface initalization tasks and attach the interface - * to the list of "active" interfaces. + * to the list of "active" interfaces. If vmove flag is set on entry + * to if_attach1(), perform only a limited subset of initialization + * tasks, given that we are moving an ifnet which has already been fully + * initialized from one vnet to another. * * XXX: * - The decision to return void and thus require this function to @@ -663,6 +668,13 @@ void if_attach(struct ifnet *ifp) { + + if_attach1(ifp, 0); +} + +static void +if_attach1(struct ifnet *ifp, int vmove) +{ INIT_VNET_NET(curvnet); unsigned socksize, ifasize; int namelen, masklen; @@ -679,7 +691,7 @@ * Record in which vnet has this ifnet been attached * for the first time. */ - if (ifp->if_home_vnet == NULL) + if (ifp->if_home_vnet == NULL) ifp->if_home_vnet = curvnet; #endif @@ -697,55 +709,58 @@ ifp->if_qflush = if_qflush; } + if (!vmove) { #ifdef MAC - mac_ifnet_create(ifp); + mac_ifnet_create(ifp); #endif - if (IS_DEFAULT_VNET(curvnet)) { - ifdev_setbyindex(ifp->if_index, make_dev(&net_cdevsw, - ifp->if_index, UID_ROOT, GID_WHEEL, 0600, "%s/%s", - net_cdevsw.d_name, ifp->if_xname)); - make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d", - net_cdevsw.d_name, ifp->if_index); - } + if (IS_DEFAULT_VNET(curvnet)) { + ifdev_setbyindex(ifp->if_index, make_dev(&net_cdevsw, + ifp->if_index, UID_ROOT, GID_WHEEL, 0600, "%s/%s", + net_cdevsw.d_name, ifp->if_xname)); + make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d", + net_cdevsw.d_name, ifp->if_index); + } - ifq_attach(&ifp->if_snd, ifp); + ifq_attach(&ifp->if_snd, ifp); - /* - * create a Link Level name for this device - */ - namelen = strlen(ifp->if_xname); - /* - * Always save enough space for any possiable name so we can do - * a rename in place later. - */ - masklen = offsetof(struct sockaddr_dl, sdl_data[0]) + IFNAMSIZ; - socksize = masklen + ifp->if_addrlen; - if (socksize < sizeof(*sdl)) - socksize = sizeof(*sdl); - socksize = roundup2(socksize, sizeof(long)); - ifasize = sizeof(*ifa) + 2 * socksize; - ifa = malloc(ifasize, M_IFADDR, M_WAITOK | M_ZERO); - IFA_LOCK_INIT(ifa); - sdl = (struct sockaddr_dl *)(ifa + 1); - sdl->sdl_len = socksize; - sdl->sdl_family = AF_LINK; - bcopy(ifp->if_xname, sdl->sdl_data, namelen); - sdl->sdl_nlen = namelen; - sdl->sdl_index = ifp->if_index; - sdl->sdl_type = ifp->if_type; - ifp->if_addr = ifa; - ifa->ifa_ifp = ifp; - ifa->ifa_rtrequest = link_rtrequest; - ifa->ifa_addr = (struct sockaddr *)sdl; - sdl = (struct sockaddr_dl *)(socksize + (caddr_t)sdl); - ifa->ifa_netmask = (struct sockaddr *)sdl; - sdl->sdl_len = masklen; - while (namelen != 0) - sdl->sdl_data[--namelen] = 0xff; - ifa->ifa_refcnt = 1; - TAILQ_INSERT_HEAD(&ifp->if_addrhead, ifa, ifa_link); - ifp->if_broadcastaddr = NULL; /* reliably crash if used uninitialized */ + /* + * Create a Link Level name for this device. + */ + namelen = strlen(ifp->if_xname); + /* + * Always save enough space for any possiable name so we + * can do a rename in place later. + */ + masklen = offsetof(struct sockaddr_dl, sdl_data[0]) + IFNAMSIZ; + socksize = masklen + ifp->if_addrlen; + if (socksize < sizeof(*sdl)) + socksize = sizeof(*sdl); + socksize = roundup2(socksize, sizeof(long)); + ifasize = sizeof(*ifa) + 2 * socksize; + ifa = malloc(ifasize, M_IFADDR, M_WAITOK | M_ZERO); + IFA_LOCK_INIT(ifa); + sdl = (struct sockaddr_dl *)(ifa + 1); + sdl->sdl_len = socksize; + sdl->sdl_family = AF_LINK; + bcopy(ifp->if_xname, sdl->sdl_data, namelen); + sdl->sdl_nlen = namelen; + sdl->sdl_index = ifp->if_index; + sdl->sdl_type = ifp->if_type; + ifp->if_addr = ifa; + ifa->ifa_ifp = ifp; + ifa->ifa_rtrequest = link_rtrequest; + ifa->ifa_addr = (struct sockaddr *)sdl; + sdl = (struct sockaddr_dl *)(socksize + (caddr_t)sdl); + ifa->ifa_netmask = (struct sockaddr *)sdl; + sdl->sdl_len = masklen; + while (namelen != 0) + sdl->sdl_data[--namelen] = 0xff; + ifa->ifa_refcnt = 1; + TAILQ_INSERT_HEAD(&ifp->if_addrhead, ifa, ifa_link); + /* Reliably crash if used uninitialized. */ + ifp->if_broadcastaddr = NULL; + } IFNET_WLOCK(); TAILQ_INSERT_TAIL(&V_ifnet, ifp, if_link); @@ -764,7 +779,7 @@ /* Announce the interface. */ rt_ifannouncemsg(ifp, IFAN_ARRIVAL); - if (ifp->if_watchdog != NULL) { + if (!vmove && ifp->if_watchdog != NULL) { if_printf(ifp, "WARNING: using obsoleted if_watchdog interface\n"); @@ -882,8 +897,10 @@ } /* - * Detach an interface, removing it from the - * list of "active" interfaces. + * Detach an interface, removing it from the list of "active" interfaces. + * If vmove flag is set on entry to if_detach1(), perform only a limited + * subset of cleanup tasks, given that we are moving an ifnet from one + * vnet to another, where it must be fully operational. * * XXXRW: There are some significant questions about event ordering, and * how to prevent things from starting to use the interface during detach. @@ -891,10 +908,17 @@ void if_detach(struct ifnet *ifp) { + + if_detach1(ifp, 0); +} + +static void +if_detach1(struct ifnet *ifp, int vmove) +{ INIT_VNET_NET(ifp->if_vnet); struct ifaddr *ifa; struct radix_node_head *rnh; - int s, i, j; + int i, j; struct domain *dp; struct ifnet *iter; int found = 0; @@ -911,8 +935,12 @@ --curvnet->ifcnt; #endif IFNET_WUNLOCK(); - if (!found) - return; + if (!found) { + if (vmove) + panic("interface not in it's own ifnet list"); + else + return; /* XXX this should panic as well? */ + } /* * Remove/wait for pending events. @@ -922,7 +950,6 @@ /* * Remove routes and flush queues. */ - s = splnet(); if_down(ifp); #ifdef ALTQ if (ALTQ_IS_ENABLED(&ifp->if_snd)) @@ -948,29 +975,27 @@ #endif if_purgemaddrs(ifp); - /* - * Prevent further calls into the device driver via ifnet. - * XXX temporarily disabled in VIMAGE builds as we may need to - * to reattach the ifnet to another vnet. - */ -#ifndef VIMAGE - if_dead(ifp); -#endif + if (!vmove) { + /* + * Prevent further calls into the device driver via ifnet. + */ + if_dead(ifp); - /* - * Remove link ifaddr pointer and maybe decrement if_index. - * Clean up all addresses. - */ - ifp->if_addr = NULL; - if (IS_DEFAULT_VNET(curvnet)) - destroy_dev(ifdev_byindex(ifp->if_index)); - ifdev_setbyindex(ifp->if_index, NULL); + /* + * Remove link ifaddr pointer and maybe decrement if_index. + * Clean up all addresses. + */ + ifp->if_addr = NULL; + if (IS_DEFAULT_VNET(curvnet)) + destroy_dev(ifdev_byindex(ifp->if_index)); + ifdev_setbyindex(ifp->if_index, NULL); - /* We can now free link ifaddr. */ - if (!TAILQ_EMPTY(&ifp->if_addrhead)) { - ifa = TAILQ_FIRST(&ifp->if_addrhead); - TAILQ_REMOVE(&ifp->if_addrhead, ifa, ifa_link); - IFAFREE(ifa); + /* We can now free link ifaddr. */ + if (!TAILQ_EMPTY(&ifp->if_addrhead)) { + ifa = TAILQ_FIRST(&ifp->if_addrhead); + TAILQ_REMOVE(&ifp->if_addrhead, ifa, ifa_link); + IFAFREE(ifa); + } } /* @@ -1003,13 +1028,83 @@ ifp->if_afdata[dp->dom_family]); } IF_AFDATA_UNLOCK(ifp); - ifq_detach(&ifp->if_snd); + + if (!vmove) + ifq_detach(&ifp->if_snd); +} + #ifdef VIMAGE - ifp->if_vnet = NULL; - ifp->if_afdata_initialized = 0; -#endif - splx(s); +/* + * if_vmove() should be called by all device specific + * ifnet reassignment routines after the interface is detached from + * current vnet and before the interface gets attached to the target + * vnet. This routine attempts to shrink if_index in current vnet, + * find an unused if_index in target vnet and calls if_grow() if + * necessary, and finally finds an unused if_xname for the target + * vnet. + * + * XXX this routine should hold a lock over if_index and return with + * such a lock held, and the caller should release that lock + * after ifattach completes! + */ +void +if_vmove(struct ifnet *ifp, struct vnet *new_vnet) +{ + + /* + * Detach from current vnet, but preserve LLADDR info, do not + * mark as dead etc. so that we can reattach later. + */ + if_detach1(ifp, 1); + + /* + * Unlink the ifnet from ifindex_table[] in current vnet, + * and shrink the if_index for that vnet if possible. + * do / while construct below is needed to confine the scope + * of INIT_VNET_NET(). + */ + do { + INIT_VNET_NET(curvnet); + + IFNET_WLOCK(); + ifnet_setbyindex(ifp->if_index, NULL); + while (V_if_index > 0 && \ + ifnet_byindex_locked(V_if_index) == NULL) + V_if_index--; + IFNET_WUNLOCK(); + } while (0); + + /* + * Switch to the context of the target vnet. + */ + CURVNET_SET_QUIET(new_vnet); + INIT_VNET_NET(new_vnet); + + /* + * Try to find an empty slot below if_index. If we fail, take + * the next slot. + */ + IFNET_WLOCK(); + for (ifp->if_index = 1; ifp->if_index <= V_if_index; ifp->if_index++) { + if (ifnet_byindex_locked(ifp->if_index) == NULL) + break; + } + /* Catch if_index overflow. */ + if (ifp->if_index < 1) + panic("vi_if_move: if_index overflow"); + + if (ifp->if_index > V_if_index) + V_if_index = ifp->if_index; + if (V_if_index >= V_if_indexlim) + if_grow(); + ifnet_setbyindex(ifp->if_index, ifp); + IFNET_WUNLOCK(); + + if_attach1(ifp, 1); + + CURVNET_RESTORE(); } +#endif /* VIMAGE */ /* * Add a group to an interface ==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#26 (text+ko) ==== @@ -924,25 +924,6 @@ return (etherbuf); } -#ifdef VIMAGE -static void -ether_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname) -{ - u_char eaddr[6]; - - bcopy(IF_LLADDR(ifp), eaddr, 6); - ether_ifdetach(ifp); - ifp->if_bpf = NULL; - if_reassign_common(ifp, vnet, "eth"); - if (dname) - snprintf(ifp->if_xname, IFNAMSIZ, "%s", dname); - - CURVNET_SET_QUIET(vnet); - ether_ifattach(ifp, eaddr); - CURVNET_RESTORE(); -} -#endif - /* * Perform common duties while attaching to interface list */ @@ -952,9 +933,6 @@ int i; struct ifaddr *ifa; struct sockaddr_dl *sdl; -#ifdef VIMAGE - struct vnet *home_vnet_0 = ifp->if_home_vnet; -#endif ifp->if_addrlen = ETHER_ADDR_LEN; ifp->if_hdrlen = ETHER_HDR_LEN; @@ -963,9 +941,6 @@ ifp->if_output = ether_output; ifp->if_input = ether_input; ifp->if_resolvemulti = ether_resolvemulti; -#ifdef VIMAGE - ifp->if_reassign = ether_reassign; -#endif if (ifp->if_baudrate == 0) ifp->if_baudrate = IF_Mbps(10); /* just a default */ ifp->if_broadcastaddr = etherbroadcastaddr; @@ -985,11 +960,7 @@ for (i = 0; i < ifp->if_addrlen; i++) if (lla[i] != 0) break; -#ifdef VIMAGE - if (i != ifp->if_addrlen && home_vnet_0 != ifp->if_home_vnet) -#else if (i != ifp->if_addrlen) -#endif if_printf(ifp, "Ethernet address: %6D\n", lla, ":"); } ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#23 (text+ko) ==== @@ -765,6 +765,7 @@ int if_delmulti(struct ifnet *, struct sockaddr *); void if_delmulti_ifma(struct ifmultiaddr *); void if_detach(struct ifnet *); +void if_vmove(struct ifnet *, struct vnet *); void if_purgeaddrs(struct ifnet *); void if_purgemaddrs(struct ifnet *); void if_down(struct ifnet *); From owner-p4-projects@FreeBSD.ORG Fri May 15 07:45:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B70F1065670; Fri, 15 May 2009 07:45:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43508106566B for ; Fri, 15 May 2009 07:45:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 27DAB8FC17 for ; Fri, 15 May 2009 07:45:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4F7jESS061859 for ; Fri, 15 May 2009 07:45:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4F7jEPh061857 for perforce@freebsd.org; Fri, 15 May 2009 07:45:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 15 May 2009 07:45:14 GMT Message-Id: <200905150745.n4F7jEPh061857@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 162107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 07:45:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=162107 Change 162107 by hselasky@hselasky_laptop001 on 2009/05/15 07:45:03 USB controller: - add more AVR32 DCI register definitions. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#3 (text+ko) ==== @@ -32,33 +32,105 @@ /* Register definitions */ #define AVR32_CTRL 0x00 /* Control */ +#define AVR32_CTRL_DEV_ADDR 0x7F +#define AVR32_CTRL_DEV_FADDR_EN 0x80 +#define AVR32_CTRL_DEV_EN_USBA 0x100 +#define AVR32_CTRL_DEV_DETACH 0x200 +#define AVR32_CTRL_DEV_REWAKEUP 0x400 + #define AVR32_FNUM 0x04 /* Frame Number */ +#define AVR32_FNUM_MASK 0x3FFF + /* 0x08 - 0x0C Reserved */ #define AVR32_IEN 0x10 /* Interrupt Enable */ #define AVR32_INTSTA 0x14 /* Interrupt Status */ #define AVR32_CLRINT 0x18 /* Clear Interrupt */ + +#define AVR32_INT_SPEED 0x00000002 /* set if High Speed else Full Speed */ +#define AVR32_INT_DET_SUSPD 0x00000002 +#define AVR32_INT_MICRO_SOF 0x00000004 +#define AVR32_INT_INT_SOF 0x00000008 +#define AVR32_INT_ENDRESET 0x00000010 +#define AVR32_INT_WAKE_UP 0x00000020 +#define AVR32_INT_ENDOFRSM 0x00000040 +#define AVR32_INT_UPSTR_RES 0x00000080 +#define AVR32_INT_EPT_INT(n) (0x00000100 << (n)) +#define AVR32_INT_DMA_INT(n) (0x01000000 << (n)) + #define AVR32_EPTRST 0x1C /* Endpoints Reset */ +#define AVR32_EPTRST_MASK(n) (0x00000001 << (n)) + /* 0x20 - 0xCC Reserved */ #define AVR32_TSTSOFCNT 0xD0 /* Test SOF Counter */ #define AVR32_TSTCNTA 0xD4 /* Test A Counter */ #define AVR32_TSTCNTB 0xD8 /* Test B Counter */ #define AVR32_TSTMODEREG 0xDC /* Test Mode */ #define AVR32_TST 0xE0 /* Test */ +#define AVR32_TST_NORMAL 0x00000000 +#define AVR32_TST_HS_ONLY 0x00000002 +#define AVR32_TST_FS_ONLY 0x00000003 + /* 0xE4 - 0xE8 Reserved */ #define AVR32_IPPADDRSIZE 0xEC /* PADDRSIZE */ #define AVR32_IPNAME1 0xF0 /* Name1 */ #define AVR32_IPNAME2 0xF4 /* Name2 */ #define AVR32_IPFEATURES 0xF8 /* Features */ +#define AVR32_IPFEATURES_NEP(x) (((x) & 0xF) ? ((x) & 0xF) : 0x10) + #define AVR32_IPVERSION 0xFC /* IP Version */ + #define _A(base,n) ((base) + (0x20*(n))) #define AVR32_EPTCFG(n) _A(0x100, n) /* Endpoint Configuration */ +#define AVR32_EPTCFG_EPSIZE(n) ((n)-3) /* power of two */ +#define AVR32_EPTCFG_EPDIR_OUT 0x00000000 +#define AVR32_EPTCFG_EPDIR_IN 0x00000008 +#define AVR32_EPTCFG_TYPE_CTRL 0x00000000 +#define AVR32_EPTCFG_TYPE_ISOC 0x00000100 +#define AVR32_EPTCFG_TYPE_BULK 0x00000200 +#define AVR32_EPTCFG_TYPE_INTR 0x00000300 +#define AVR32_EPTCFG_NBANK(n) (0x00000400*(n)) +#define AVR32_EPTCFG_NB_TRANS(n) (0x00001000*(n)) +#define AVR32_EPTCFG_EPT_MAPD 0x80000000 + #define AVR32_EPTCTLENB(n) _A(0x104, n) /* Endpoint Control Enable */ #define AVR32_EPTCTLDIS(n) _A(0x108, n) /* Endpoint Control Disable */ #define AVR32_EPTCTL(n) _A(0x10C, n) /* Endpoint Control */ +#define AVR32_EPTCTL_EPT_ENABL 0x00000001 +#define AVR32_EPTCTL_AUTO_VALID 0x00000002 +#define AVR32_EPTCTL_INTDIS_DMA 0x00000008 +#define AVR32_EPTCTL_NYET_DIS 0x00000010 +#define AVR32_EPTCTL_DATAX_RX 0x00000040 +#define AVR32_EPTCTL_MDATA_RX 0x00000080 +#define AVR32_EPTCTL_ERR_OVFLW 0x00000100 +#define AVR32_EPTCTL_RX_BK_RDY 0x00000200 +#define AVR32_EPTCTL_TX_COMPLT 0x00000400 +#define AVR32_EPTCTL_TX_PK_RDY 0x00000800 +#define AVR32_EPTCTL_RX_SETUP 0x00001000 +#define AVR32_EPTCTL_STALL_SNT 0x00002000 +#define AVR32_EPTCTL_NAK_IN 0x00004000 +#define AVR32_EPTCTL_NAK_OUT 0x00008000 +#define AVR32_EPTCTL_BUSY_BANK 0x00040000 +#define AVR32_EPTCTL_SHORT_PCKT 0x80000000 + /* 0x110 Reserved */ #define AVR32_EPTSETSTA(n) _A(0x114, n) /* Endpoint Set Status */ #define AVR32_EPTCLRSTA(n) _A(0x118, n) /* Endpoint Clear Status */ #define AVR32_EPTSTA(n) _A(0x11C, n) /* Endpoint Status */ +#define AVR32_EPTSTA_FRCESTALL 0x00000020 +#define AVR32_EPTSTA_TOGGLESQ_STA(x) (((x) & 0xC0) >> 6) +#define AVR32_EPTSTA_ERR_OVFLW 0x00000000 +#define AVR32_EPTSTA_RX_BK_RDY 0x00000000 +#define AVR32_EPTSTA_TX_COMPLT 0x00000000 +#define AVR32_EPTSTA_TX_PK_RDY 0x00000000 +#define AVR32_EPTSTA_RX_SETUP 0x00000000 +#define AVR32_EPTSTA_STALL_SNT 0x00000000 +#define AVR32_EPTSTA_NAK_IN 0x00000000 +#define AVR32_EPTSTA_NAK_OUT 0x00000000 +#define AVR32_EPTSTA_CURRENT_BANK(x) (((x) & 0x00030000) >> 16) +#define AVR32_EPTSTA_BUSY_BANK_STA(x) (((x) & 0x000C0000) >> 18) +#define AVR32_EPTSTA_BYTE_COUNT(x) (((x) & 0x7FF00000) >> 20) +#define AVR32_EPTSTA_SHRT_PCKT 0x80000000 + /* 0x300 - 0x30C Reserved */ #define AVR32_DMANXTDSC 0x310 /* DMA Next Descriptor Address */ #define AVR32_DMAADDRESS 0x314 /* DMA Channel Address */ From owner-p4-projects@FreeBSD.ORG Fri May 15 10:57:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 989F910656B4; Fri, 15 May 2009 10:57:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23C2910656A8 for ; Fri, 15 May 2009 10:57:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15AC98FC32 for ; Fri, 15 May 2009 10:56:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4FAus3c088739 for ; Fri, 15 May 2009 10:56:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4FAustn088737 for perforce@freebsd.org; Fri, 15 May 2009 10:56:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 15 May 2009 10:56:54 GMT Message-Id: <200905151056.n4FAustn088737@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 162109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 10:57:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=162109 Change 162109 by hselasky@hselasky_laptop001 on 2009/05/15 10:55:54 USB controller: - initial version of AVR32 USB DCI driver. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#2 (text+ko) ==== @@ -30,3 +30,2035 @@ * This file contains the driver for the AVR32 series USB Device * Controller */ + +/* + * NOTE: When the chip detects BUS-reset it will also reset the + * endpoints, Function-address and more. + */ + +#include +#include +#include + +#define USB_DEBUG_VAR avr32dci_debug + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#define AVR32_BUS2SC(bus) \ + ((struct avr32dci_softc *)(((uint8_t *)(bus)) - \ + ((uint8_t *)&(((struct avr32dci_softc *)0)->sc_bus)))) + +#define AVR32_PC2SC(pc) \ + AVR32_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) + +#if USB_DEBUG +static int avr32dci_debug = 0; + +SYSCTL_NODE(_hw_usb2, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI"); +SYSCTL_INT(_hw_usb2_avr32dci, OID_AUTO, debug, CTLFLAG_RW, + &avr32dci_debug, 0, "AVR32 DCI debug level"); +#endif + +#define AVR32_INTR_ENDPT 1 + +/* prototypes */ + +struct usb2_bus_methods avr32dci_bus_methods; +struct usb2_pipe_methods avr32dci_device_non_isoc_methods; +struct usb2_pipe_methods avr32dci_device_isoc_fs_methods; + +static avr32dci_cmd_t avr32dci_setup_rx; +static avr32dci_cmd_t avr32dci_data_rx; +static avr32dci_cmd_t avr32dci_data_tx; +static avr32dci_cmd_t avr32dci_data_tx_sync; +static void avr32dci_device_done(struct usb2_xfer *, usb2_error_t); +static void avr32dci_do_poll(struct usb2_bus *); +static void avr32dci_standard_done(struct usb2_xfer *); +static void avr32dci_root_intr(struct avr32dci_softc *sc); + +/* + * Here is a list of what the chip supports: + */ +static const struct usb2_hw_ep_profile + avr32dci_ep_profile[4] = { + + [0] = { + .max_in_frame_size = 64, + .max_out_frame_size = 64, + .is_simplex = 1, + .support_control = 1, + }, + + [1] = { + .max_in_frame_size = 512, + .max_out_frame_size = 512, + .is_simplex = 1, + .support_bulk = 1, + .support_interrupt = 1, + .support_isochronous = 1, + .support_in = 1, + .support_out = 1, + }, + + [2] = { + .max_in_frame_size = 64, + .max_out_frame_size = 64, + .is_simplex = 1, + .support_bulk = 1, + .support_interrupt = 1, + .support_in = 1, + .support_out = 1, + }, + + [3] = { + .max_in_frame_size = 1024, + .max_out_frame_size = 1024, + .is_simplex = 1, + .support_bulk = 1, + .support_interrupt = 1, + .support_isochronous = 1, + .support_in = 1, + .support_out = 1, + }, +}; + +static void +avr32dci_get_hw_ep_profile(struct usb2_device *udev, + const struct usb2_hw_ep_profile **ppf, uint8_t ep_addr) +{ + if (ep_addr == 0) + *ppf = avr32dci_ep_profile; + else if (ep_addr < 3) + *ppf = avr32dci_ep_profile + 1; + else if (ep_addr < 5) + *ppf = avr32dci_ep_profile + 2; + else if (ep_addr < 7) + *ppf = avr32dci_ep_profile + 3; + else + *ppf = NULL; +} + +static void +avr32dci_mod_ctrl(struct avr32dci_softc *sc, uint32_t set, uint32_t clear) +{ + uint32_t temp; + + temp = AVR32_READ_4(sc, AVR32_CTRL); + temp |= set; + temp &= ~clear; + AVR32_WRITE_4(sc, AVR32_CTRL, temp); +} + +static void +avr32dci_mod_ien(struct avr32dci_softc *sc, uint32_t set, uint32_t clear) +{ + uint32_t temp; + + temp = AVR32_READ_4(sc, AVR32_IEN); + temp |= set; + temp &= ~clear; + AVR32_WRITE_4(sc, AVR32_IEN, temp); +} + +static void +avr32dci_clocks_on(struct avr32dci_softc *sc) +{ + if (sc->sc_flags.clocks_off && + sc->sc_flags.port_powered) { + + DPRINTFN(5, "\n"); + + /* turn on clocks */ + (sc->sc_clocks_on) (&sc->sc_bus); + + avr32dci_mod_ctrl(sc, AVR32_CTRL_DEV_EN_USBA, 0); + + sc->sc_flags.clocks_off = 0; + } +} + +static void +avr32dci_clocks_off(struct avr32dci_softc *sc) +{ + if (!sc->sc_flags.clocks_off) { + + DPRINTFN(5, "\n"); + + avr32dci_mod_ctrl(sc, 0, AVR32_CTRL_DEV_EN_USBA); + + /* turn clocks off */ + (sc->sc_clocks_off) (&sc->sc_bus); + + sc->sc_flags.clocks_off = 1; + } +} + +static void +avr32dci_pull_up(struct avr32dci_softc *sc) +{ + /* pullup D+, if possible */ + + if (!sc->sc_flags.d_pulled_up && + sc->sc_flags.port_powered) { + sc->sc_flags.d_pulled_up = 1; + avr32dci_mod_ctrl(sc, 0, AVR32_CTRL_DEV_DETACH); + } +} + +static void +avr32dci_pull_down(struct avr32dci_softc *sc) +{ + /* pulldown D+, if possible */ + + if (sc->sc_flags.d_pulled_up) { + sc->sc_flags.d_pulled_up = 0; + avr32dci_mod_ctrl(sc, AVR32_CTRL_DEV_DETACH, 0); + } +} + +static void +avr32dci_wakeup_peer(struct avr32dci_softc *sc) +{ + if (!sc->sc_flags.status_suspend) { + return; + } + avr32dci_mod_ctrl(sc, AVR32_CTRL_DEV_REWAKEUP, 0); + + /* wait 8 milliseconds */ + /* Wait for reset to complete. */ + usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); + + /* hardware should have cleared RMWKUP bit */ +} + +static void +avr32dci_set_address(struct avr32dci_softc *sc, uint8_t addr) +{ + DPRINTFN(5, "addr=%d\n", addr); + + avr32dci_mod_ctrl(sc, AVR32_UDADDR_ADDEN | addr, 0); +} + +static uint8_t +avr32dci_setup_rx(struct avr32dci_td *td) +{ + struct avr32dci_softc *sc; + struct usb2_device_request req; + uint16_t count; + uint32_t temp; + + /* get pointer to softc */ + sc = AVR32_PC2SC(td->pc); + + /* check endpoint status */ + temp = AVR32_READ_4(sc, AVR32_EPTSTA(td->ep_no)); + + DPRINTFN(5, "EPTSTA(%u)=0x%08x\n", td->ep_no, temp); + + if (!(temp & AVR32_EPTSTA_RX_SETUP)) { + goto not_complete; + } + /* clear did stall */ + td->did_stall = 0; + /* get the packet byte count */ + count = AVR32_EPTSTA_BYTE_COUNT(temp); + + /* verify data length */ + if (count != td->remainder) { + DPRINTFN(0, "Invalid SETUP packet " + "length, %d bytes\n", count); + goto not_complete; + } + if (count != sizeof(req)) { + DPRINTFN(0, "Unsupported SETUP packet " + "length, %d bytes\n", count); + goto not_complete; + } + /* receive data */ + memcpy(&req, sc->physdata, sizeof(req)); + + /* copy data into real buffer */ + usb2_copy_in(td->pc, 0, &req, sizeof(req)); + + td->offset = sizeof(req); + td->remainder = 0; + + /* sneak peek the set address */ + if ((req.bmRequestType == UT_WRITE_DEVICE) && + (req.bRequest == UR_SET_ADDRESS)) { + sc->sc_dv_addr = req.wValue[0] & 0x7F; + /* must write address before ZLP */ + avr32dci_mod_ctrl(sc, 0, AVR32_CTRL_DEV_FADDR_EN | + AVR32_CTRL_DEV_ADDR); + avr32dci_mod_ctrl(sc, sc->sc_dv_addr, 0); + } else { + sc->sc_dv_addr = 0xFF; + } + + /* clear SETUP packet interrupt */ + AVR32_WRITE_4(sc, AVR32_EPTCLRSTA(td->ep_no), AVR32_EPTSTA_RX_SETUP); + return (0); /* complete */ + +not_complete: + if (temp & AVR32_EPTSTA_RX_SETUP) { + /* clear SETUP packet interrupt */ + AVR32_WRITE_4(sc, AVR32_EPTCLRSTA(td->ep_no), AVR32_EPTSTA_RX_SETUP); + } + /* abort any ongoing transfer */ + if (!td->did_stall) { + DPRINTFN(5, "stalling\n"); + AVR32_WRITE_4(sc, AVR32_EPTSETSTA(td->ep_no), + AVR32_EPTSTA_FRCESTALL); + td->did_stall = 1; + } + return (1); /* not complete */ +} + +static uint8_t +avr32dci_data_rx(struct avr32dci_td *td) +{ + struct avr32dci_softc *sc; + struct usb2_page_search buf_res; + uint16_t count; + uint32_t temp; + uint8_t to; + uint8_t got_short; + + to = 4; /* don't loop forever! */ + got_short = 0; + + /* get pointer to softc */ + sc = AVR32_PC2SC(td->pc); + +repeat: + /* check if any of the FIFO banks have data */ + /* check endpoint status */ + temp = AVR32_READ_4(sc, AVR32_EPTSTA(td->ep_no)); + + DPRINTFN(5, "EPTSTA(%u)=0x%08x\n", td->ep_no, temp); + + if (temp & AVR32_EPTSTA_RX_SETUP) { + if (td->remainder == 0) { + /* + * We are actually complete and have + * received the next SETUP + */ + DPRINTFN(5, "faking complete\n"); + return (0); /* complete */ + } + /* + * USB Host Aborted the transfer. + */ + td->error = 1; + return (0); /* complete */ + } + /* check status */ + if (!(temp & AVR32_EPTSTA_RX_BK_RDY)) { + /* no data */ + goto not_complete; + } + /* get the packet byte count */ + count = AVR32_EPTSTA_BYTE_COUNT(temp); + + /* verify the packet byte count */ + if (count != td->max_packet_size) { + if (count < td->max_packet_size) { + /* we have a short packet */ + td->short_pkt = 1; + got_short = 1; + } else { + /* invalid USB packet */ + td->error = 1; + return (0); /* we are complete */ + } + } + /* verify the packet byte count */ + if (count > td->remainder) { + /* invalid USB packet */ + td->error = 1; + return (0); /* we are complete */ + } + while (count > 0) { + usb2_get_page(td->pc, td->offset, &buf_res); + + /* get correct length */ + if (buf_res.length > count) { + buf_res.length = count; + } + /* receive data */ + bcopy(sc->physdata + + (AVR32_EPTSTA_CURRENT_BANK(temp) << td->bank_shift) + + (td->ep_no << 16) + (td->offset % td->max_packet_size), + buf_res.buffer, buf_res.length) + /* update counters */ + count -= buf_res.length; + td->offset += buf_res.length; + td->remainder -= buf_res.length; + } + + /* clear OUT packet interrupt */ + AVR32_WRITE_4(sc, AVR32_EPTCLRSTA(td->ep_no), AVR32_EPTSTA_RX_BK_RDY); + + /* check if we are complete */ + if ((td->remainder == 0) || got_short) { + if (td->short_pkt) { + /* we are complete */ + return (0); + } + /* else need to receive a zero length packet */ + } + if (--to) { + goto repeat; + } +not_complete: + return (1); /* not complete */ +} + +static uint8_t +avr32dci_data_tx(struct avr32dci_td *td) +{ + struct avr32dci_softc *sc; + struct usb2_page_search buf_res; + uint16_t count; + uint8_t to; + uint32_t temp; + + to = 4; /* don't loop forever! */ + + /* get pointer to softc */ + sc = AVR32_PC2SC(td->pc); + +repeat: + + /* check endpoint status */ + temp = AVR32_READ_4(sc, AVR32_EPTSTA(td->ep_no)); + + DPRINTFN(5, "EPTSTA(%u)=0x%08x\n", td->ep_no, temp); + + if (temp & AVR32_EPTSTA_RX_SETUP) { + /* + * The current transfer was aborted + * by the USB Host + */ + td->error = 1; + return (0); /* complete */ + } + if (temp & AVR32_EPTSTA_TX_PK_RDY) { + /* cannot write any data - all banks are busy */ + goto not_complete; + } + count = td->max_packet_size; + if (td->remainder < count) { + /* we have a short packet */ + td->short_pkt = 1; + count = td->remainder; + } + while (count > 0) { + + usb2_get_page(td->pc, td->offset, &buf_res); + + /* get correct length */ + if (buf_res.length > count) { + buf_res.length = count; + } + /* transmit data */ + bcopy(buf_res.buffer, sc->physdata + + (AVR32_EPTSTA_CURRENT_BANK(temp) << td->bank_shift) + + (td->ep_no << 16) + (td->offset % td->max_packet_size), + buf_res.length) + /* update counters */ + count -= buf_res.length; + td->offset += buf_res.length; + td->remainder -= buf_res.length; + } + + /* allocate FIFO bank */ + AVR32_WRITE_4(sc, AVR32_EPTCLRSTA(td->ep_no), AVR32_EPTSTA_TX_BK_RDY); + + /* check remainder */ + if (td->remainder == 0) { + if (td->short_pkt) { + return (0); /* complete */ + } + /* else we need to transmit a short packet */ + } + if (--to) { + goto repeat; + } +not_complete: + return (1); /* not complete */ +} + +static uint8_t +avr32dci_data_tx_sync(struct avr32dci_td *td) +{ + struct avr32dci_softc *sc; + uint32_t temp; + + /* get pointer to softc */ + sc = AVR32_PC2SC(td->pc); + + /* check endpoint status */ + temp = AVR32_READ_4(sc, AVR32_EPTSTA(td->ep_no)); + + DPRINTFN(5, "EPTSTA(%u)=0x%08x\n", td->ep_no, temp); + + if (temp & AVR32_EPTSTA_RX_SETUP) { + DPRINTFN(5, "faking complete\n"); + /* Race condition */ + return (0); /* complete */ + } + /* + * The control endpoint has only got one bank, so if that bank + * is free the packet has been transferred! + */ + if (AVR32_EPTSTA_BUSY_BANK_STA(temp) != 0) { + /* cannot write any data - a bank is busy */ + goto not_complete; + } + if (sc->sc_dv_addr != 0xFF) { + /* set new address */ + avr32dci_set_address(sc, sc->sc_dv_addr); + } + return (0); /* complete */ + +not_complete: + return (1); /* not complete */ +} + +static uint8_t +avr32dci_xfer_do_fifo(struct usb2_xfer *xfer) +{ + struct avr32dci_td *td; + + DPRINTFN(9, "\n"); + + td = xfer->td_transfer_cache; + while (1) { + if ((td->func) (td)) { + /* operation in progress */ + break; + } + if (((void *)td) == xfer->td_transfer_last) { + goto done; + } + if (td->error) { + goto done; + } else if (td->remainder > 0) { + /* + * We had a short transfer. If there is no alternate + * next, stop processing ! + */ + if (!td->alt_next) { + goto done; + } + } + /* + * Fetch the next transfer descriptor and transfer + * some flags to the next transfer descriptor + */ + td = td->obj_next; + xfer->td_transfer_cache = td; + } + return (1); /* not complete */ + +done: + /* compute all actual lengths */ + + avr32dci_standard_done(xfer); + return (0); /* complete */ +} + +static void +avr32dci_interrupt_poll(struct avr32dci_softc *sc) +{ + struct usb2_xfer *xfer; + +repeat: + TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { + if (!avr32dci_xfer_do_fifo(xfer)) { + /* queue has been modified */ + goto repeat; + } + } +} + +void +avr32dci_vbus_interrupt(struct avr32dci_softc *sc, uint8_t is_on) +{ + DPRINTFN(5, "vbus = %u\n", is_on); + + if (is_on) { + if (!sc->sc_flags.status_vbus) { + sc->sc_flags.status_vbus = 1; + + /* complete root HUB interrupt endpoint */ + + avr32dci_root_intr(sc); + } + } else { + if (sc->sc_flags.status_vbus) { + sc->sc_flags.status_vbus = 0; + sc->sc_flags.status_bus_reset = 0; + sc->sc_flags.status_suspend = 0; + sc->sc_flags.change_suspend = 0; + sc->sc_flags.change_connect = 1; + + /* complete root HUB interrupt endpoint */ + + avr32dci_root_intr(sc); + } + } +} + +void +avr32dci_interrupt(struct avr32dci_softc *sc) +{ + uint32_t status; + + USB_BUS_LOCK(&sc->sc_bus); + + /* read interrupt status */ + status = AVR32_READ_4(sc, AVR32_INTSTA); + + /* clear all set interrupts */ + AVR32_WRITE_4(sc, AVR32_CLRINT, status); + + DPRINTFN(14, "INTSTA=0x%08x\n", status); + + /* check for any bus state change interrupts */ + if (status & AVR32_INT_ENDRESET) { + + DPRINTFN(5, "end of reset\n"); + + /* set correct state */ + sc->sc_flags.status_bus_reset = 1; + sc->sc_flags.status_suspend = 0; + sc->sc_flags.change_suspend = 0; + sc->sc_flags.change_connect = 1; + + /* disable resume interrupt */ + avr32dci_mod_ien(sc, AVR32_INT_DET_SUSPD | + AVR32_INT_ENDRESET, AVR32_INT_WAKE_UP); + + /* complete root HUB interrupt endpoint */ + avr32dci_root_intr(sc); + } + /* + * If resume and suspend is set at the same time we interpret + * that like RESUME. Resume is set when there is at least 3 + * milliseconds of inactivity on the USB BUS. + */ + if (status & AVR32_INT_WAKE_UP) { + + DPRINTFN(5, "resume interrupt\n"); + + if (sc->sc_flags.status_suspend) { + /* update status bits */ + sc->sc_flags.status_suspend = 0; + sc->sc_flags.change_suspend = 1; + + /* disable resume interrupt */ + avr32dci_mod_ien(sc, AVR32_INT_DET_SUSPD | + AVR32_INT_ENDRESET, AVR32_INT_WAKE_UP); + + /* complete root HUB interrupt endpoint */ + avr32dci_root_intr(sc); + } + } else if (status & AVR32_INT_DET_SUSPD) { + + DPRINTFN(5, "suspend interrupt\n"); + + if (!sc->sc_flags.status_suspend) { + /* update status bits */ + sc->sc_flags.status_suspend = 1; + sc->sc_flags.change_suspend = 1; + + /* disable suspend interrupt */ + avr32dci_mod_ien(sc, AVR32_INT_WAKE_UP | + AVR32_INT_ENDRESET, AVR32_INT_DET_SUSPD); + + /* complete root HUB interrupt endpoint */ + avr32dci_root_intr(sc); + } + } + /* check for any endpoint interrupts */ + if (status & -AVR32_INT_EPT_INT(0)) { + + DPRINTFN(5, "real endpoint interrupt\n"); + + avr32dci_interrupt_poll(sc); + } + USB_BUS_UNLOCK(&sc->sc_bus); +} + +static void +avr32dci_setup_standard_chain_sub(struct avr32dci_std_temp *temp) +{ + struct avr32dci_td *td; + + /* get current Transfer Descriptor */ + td = temp->td_next; + temp->td = td; + + /* prepare for next TD */ + temp->td_next = td->obj_next; + + /* fill out the Transfer Descriptor */ + td->func = temp->func; + td->pc = temp->pc; + td->offset = temp->offset; + td->remainder = temp->len; + td->error = 0; + td->did_stall = 0; + td->short_pkt = temp->short_pkt; + td->alt_next = temp->setup_alt_next; +} + +static void +avr32dci_setup_standard_chain(struct usb2_xfer *xfer) +{ + struct avr32dci_std_temp temp; + struct avr32dci_softc *sc; + struct avr32dci_td *td; + uint32_t x; + uint8_t ep_no; + uint8_t need_sync; + + DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", + xfer->address, UE_GET_ADDR(xfer->endpoint), + xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + + temp.max_frame_size = xfer->max_frame_size; + + td = xfer->td_start[0]; + xfer->td_transfer_first = td; + xfer->td_transfer_cache = td; + + /* setup temp */ + + temp.td = NULL; + temp.td_next = xfer->td_start[0]; + temp.offset = 0; + temp.setup_alt_next = xfer->flags_int.short_frames_ok; + + sc = AVR32_BUS2SC(xfer->xroot->bus); + ep_no = (xfer->endpoint & UE_ADDR); + + /* check if we should prepend a setup message */ + + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_hdr) { + + temp.func = &avr32dci_setup_rx; + temp.len = xfer->frlengths[0]; + temp.pc = xfer->frbuffers + 0; + temp.short_pkt = temp.len ? 1 : 0; + /* check for last frame */ + if (xfer->nframes == 1) { + /* no STATUS stage yet, SETUP is last */ + if (xfer->flags_int.control_act) + temp.setup_alt_next = 0; + } + avr32dci_setup_standard_chain_sub(&temp); + } + x = 1; + } else { + x = 0; + } + + if (x != xfer->nframes) { + if (xfer->endpoint & UE_DIR_IN) { + temp.func = &avr32dci_data_tx; + need_sync = 1; + } else { + temp.func = &avr32dci_data_rx; + need_sync = 0; + } + + /* setup "pc" pointer */ + temp.pc = xfer->frbuffers + x; + } else { + need_sync = 0; + } + while (x != xfer->nframes) { + + /* DATA0 / DATA1 message */ + + temp.len = xfer->frlengths[x]; + + x++; + + if (x == xfer->nframes) { + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_act) { + temp.setup_alt_next = 0; + } + } else { + temp.setup_alt_next = 0; + } + } + if (temp.len == 0) { + + /* make sure that we send an USB packet */ + + temp.short_pkt = 0; + + } else { + + /* regular data transfer */ + + temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1; + } + + avr32dci_setup_standard_chain_sub(&temp); + + if (xfer->flags_int.isochronous_xfr) { + temp.offset += temp.len; + } else { + /* get next Page Cache pointer */ + temp.pc = xfer->frbuffers + x; + } + } + + if (xfer->flags_int.control_xfr) { + + /* always setup a valid "pc" pointer for status and sync */ + temp.pc = xfer->frbuffers + 0; + temp.len = 0; + temp.short_pkt = 0; + temp.setup_alt_next = 0; + + /* check if we need to sync */ + if (need_sync) { + /* we need a SYNC point after TX */ + temp.func = &avr32dci_data_tx_sync; + avr32dci_setup_standard_chain_sub(&temp); + } + /* check if we should append a status stage */ + if (!xfer->flags_int.control_act) { + + /* + * Send a DATA1 message and invert the current + * endpoint direction. + */ + if (xfer->endpoint & UE_DIR_IN) { + temp.func = &avr32dci_data_rx; + need_sync = 0; + } else { + temp.func = &avr32dci_data_tx; + need_sync = 1; + } + + avr32dci_setup_standard_chain_sub(&temp); + if (need_sync) { + /* we need a SYNC point after TX */ + temp.func = &avr32dci_data_tx_sync; + avr32dci_setup_standard_chain_sub(&temp); + } + } + } + /* must have at least one frame! */ + td = temp.td; + xfer->td_transfer_last = td; +} + +static void +avr32dci_timeout(void *arg) +{ + struct usb2_xfer *xfer = arg; + + DPRINTF("xfer=%p\n", xfer); + + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); + + /* transfer is transferred */ + avr32dci_device_done(xfer, USB_ERR_TIMEOUT); +} + +static void +avr32dci_start_standard_chain(struct usb2_xfer *xfer) +{ + DPRINTFN(9, "\n"); + + /* poll one time - will turn on interrupts */ + if (avr32dci_xfer_do_fifo(xfer)) { + uint8_t ep_no = xfer->endpoint & UE_ADDR_MASK; + + avr32dci_mod_ien(sc, AVR32_INT_EPT_INT(ep_no), 0); + + /* put transfer on interrupt queue */ + usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); + + /* start timeout, if any */ + if (xfer->timeout != 0) { + usb2_transfer_timeout_ms(xfer, + &avr32dci_timeout, xfer->timeout); + } + } +} + +static void +avr32dci_root_intr(struct avr32dci_softc *sc) +{ + DPRINTFN(9, "\n"); + + USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + + /* set port bit */ + sc->sc_hub_idata[0] = 0x02; /* we only have one port */ + + uhub_root_intr(&sc->sc_bus, sc->sc_hub_idata, + sizeof(sc->sc_hub_idata)); +} + +static usb2_error_t +avr32dci_standard_done_sub(struct usb2_xfer *xfer) +{ + struct avr32dci_td *td; + uint32_t len; + uint8_t error; + + DPRINTFN(9, "\n"); + + td = xfer->td_transfer_cache; + + do { + len = td->remainder; + + if (xfer->aframes != xfer->nframes) { + /* + * Verify the length and subtract + * the remainder from "frlengths[]": + */ + if (len > xfer->frlengths[xfer->aframes]) { + td->error = 1; + } else { + xfer->frlengths[xfer->aframes] -= len; + } + } + /* Check for transfer error */ + if (td->error) { + /* the transfer is finished */ + error = 1; + td = NULL; + break; + } + /* Check for short transfer */ + if (len > 0) { + if (xfer->flags_int.short_frames_ok) { + /* follow alt next */ + if (td->alt_next) { + td = td->obj_next; + } else { + td = NULL; + } + } else { + /* the transfer is finished */ + td = NULL; + } + error = 0; + break; + } + td = td->obj_next; + + /* this USB frame is complete */ + error = 0; + break; + + } while (0); + + /* update transfer cache */ + + xfer->td_transfer_cache = td; + + return (error ? + USB_ERR_STALLED : USB_ERR_NORMAL_COMPLETION); +} + +static void +avr32dci_standard_done(struct usb2_xfer *xfer) +{ + usb2_error_t err = 0; + + DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", + xfer, xfer->pipe); + + /* reset scanner */ + + xfer->td_transfer_cache = xfer->td_transfer_first; + + if (xfer->flags_int.control_xfr) { + + if (xfer->flags_int.control_hdr) { + + err = avr32dci_standard_done_sub(xfer); + } + xfer->aframes = 1; + + if (xfer->td_transfer_cache == NULL) { + goto done; + } + } + while (xfer->aframes != xfer->nframes) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 15 12:29:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CBF41065674; Fri, 15 May 2009 12:29:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0B821065670 for ; Fri, 15 May 2009 12:29:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE6238FC13 for ; Fri, 15 May 2009 12:29:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4FCTRv3098316 for ; Fri, 15 May 2009 12:29:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4FCTRua098314 for perforce@freebsd.org; Fri, 15 May 2009 12:29:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 15 May 2009 12:29:27 GMT Message-Id: <200905151229.n4FCTRua098314@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 162111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 12:29:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=162111 Change 162111 by hselasky@hselasky_laptop001 on 2009/05/15 12:29:08 USB serial: - add support for new U3G device Reported by: Flemming Jacobsen PR: usb/134117 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#57 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#10 (text+ko) ==== @@ -163,6 +163,7 @@ U3G_DEV(OPTION, GT3GQUAD, 0), U3G_DEV(OPTION, GT3GPLUS, 0), U3G_DEV(OPTION, GTMAX36, 0), + U3G_DEV(OPTION, GTHSDPA, 0), U3G_DEV(OPTION, GTMAXHSUPA, 0), U3G_DEV(OPTION, VODAFONEMC3G, 0), /* OEM: Qualcomm, Inc. */ ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#57 (text+ko) ==== @@ -1914,6 +1914,7 @@ product OPTION GT3GPLUS 0x6600 GlobeTrotter 3G+ datacard product OPTION GTICON322 0xd033 GlobeTrotter Icon322 storage product OPTION GTMAX36 0x6701 GlobeTrotter Max 3.6 Modem +product OPTION GTHSDPA 0x6971 GlobeTrotter HSDPA product OPTION GTMAXHSUPA 0x7001 GlobeTrotter HSUPA /* OQO */ From owner-p4-projects@FreeBSD.ORG Fri May 15 18:22:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C7751065674; Fri, 15 May 2009 18:22:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B73D81065672 for ; Fri, 15 May 2009 18:22:28 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B35C8FC13 for ; Fri, 15 May 2009 18:22:28 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4FIMSOl051895 for ; Fri, 15 May 2009 18:22:28 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4FIMScG051893 for perforce@freebsd.org; Fri, 15 May 2009 18:22:28 GMT (envelope-from antab@FreeBSD.org) Date: Fri, 15 May 2009 18:22:28 GMT Message-Id: <200905151822.n4FIMScG051893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 18:22:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=162124 Change 162124 by antab@antab_farm on 2009/05/15 18:21:37 * Enable exceptions before falling trap() * Fix argc/argv in crt1 and pass in cleanup Affected files ... .. //depot/projects/avr32/src/lib/csu/avr32/crt1.c#4 edit .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#13 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#7 edit Differences ... ==== //depot/projects/avr32/src/lib/csu/avr32/crt1.c#4 (text+ko) ==== @@ -56,7 +56,7 @@ extern void _fini(void); extern void _init(void); extern int main(int, char **, char **); -extern void _start(char *ap, struct ps_strings *, ...); +extern void _start(char **ap, struct ps_strings *, fptr cleanup); #ifdef GCRT extern void _mcleanup(void); @@ -70,20 +70,17 @@ struct ps_strings *__ps_strings; void -_start(char *ap, struct ps_strings *ps_strings, ...) +_start(char **ap, struct ps_strings *ps_strings, fptr cleanup) { - fptr cleanup; int argc; char **argv; char **env; const char *s; - //cleanup = get_rtld_cleanup(); - argv = ≈ - argc = *(int *)(void *)(argv - 1); - env = argv + argc + 1; + argc = *(long *)(void *)ap; + argv = ap + 1; + env = ap + 2 + argc; environ = env; - if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; for (s = __progname; *s != '\0'; s++) ==== //depot/projects/avr32/src/sys/avr32/avr32/exception.S#13 (text+ko) ==== @@ -244,6 +244,7 @@ PUSH_TRAPFRAME(NMI) mfsr r12, AT32_SYS_ECR mov r11, sp + csrf AT32_SYS_SR_EM call trap POP_TRAPFRAME(NMI) rete @@ -257,6 +258,7 @@ PUSH_TRAPFRAME(EX) mfsr r12, AT32_SYS_ECR mov r11, sp + csrf AT32_SYS_SR_EM call trap call handle_ast POP_TRAPFRAME(EX) @@ -270,6 +272,7 @@ PUSH_TLB_TRAPFRAME(EX) mfsr r12, AT32_SYS_ECR mov r11, sp + csrf AT32_SYS_SR_EM call trap call handle_ast POP_TLB_TRAPFRAME(EX) ==== //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#7 (text+ko) ==== @@ -71,6 +71,7 @@ { /* Clear frame and set init register values, SP must be word aligned */ bzero((char *)td->td_frame, sizeof(struct trapframe)); + td->td_frame->regs.r10 = 0; td->td_frame->regs.r11 = ps_strings; td->td_frame->regs.r12 = stack; td->td_frame->regs.sp = ((register_t)stack) & ~(sizeof(register_t) - 1); From owner-p4-projects@FreeBSD.ORG Fri May 15 23:03:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EB7D1065674; Fri, 15 May 2009 23:03:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1D5E1065670 for ; Fri, 15 May 2009 23:03:17 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A635F8FC0C for ; Fri, 15 May 2009 23:03:17 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4FN3Hju088048 for ; Fri, 15 May 2009 23:03:17 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4FN3GGL088044 for perforce@freebsd.org; Fri, 15 May 2009 23:03:16 GMT (envelope-from zec@fer.hr) Date: Fri, 15 May 2009 23:03:16 GMT Message-Id: <200905152303.n4FN3GGL088044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 23:03:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=162136 Change 162136 by zec@zec_tpx32 on 2009/05/15 23:03:06 Add a KASSERT() where it may be triggered by sloppines in if_vmove() implementation. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#37 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#37 (text+ko) ==== @@ -609,6 +609,7 @@ IGMP_LOCK(); igi = ((struct in_ifinfo *)ifp->if_afdata[AF_INET])->ii_igmp; + KASSERT(igi != NULL, ("%s: no igmp_ifinfo for ifp %p", __func__, ifp)); if (igi->igi_version == IGMP_VERSION_3) { IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { From owner-p4-projects@FreeBSD.ORG Fri May 15 23:27:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E23EF1065672; Fri, 15 May 2009 23:27:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C30A106566C for ; Fri, 15 May 2009 23:27:43 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A9688FC14 for ; Fri, 15 May 2009 23:27:43 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4FNRgrP089860 for ; Fri, 15 May 2009 23:27:42 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4FNRgUo089858 for perforce@freebsd.org; Fri, 15 May 2009 23:27:42 GMT (envelope-from zec@fer.hr) Date: Fri, 15 May 2009 23:27:42 GMT Message-Id: <200905152327.n4FNRgUo089858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 23:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=162137 Change 162137 by zec@zec_tpx32 on 2009/05/15 23:26:43 When detaching and ifnet, clear ifp->if_afdata_initialized after completing iteration over all protocol families for possible dom_ifdetach. ifp->if_afdata_initialized needs to be clear for if_attach() to work properly on ifnets moved from one vnet to another. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#61 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#61 (text+ko) ==== @@ -1028,6 +1028,7 @@ ifp->if_afdata[dp->dom_family]); } IF_AFDATA_UNLOCK(ifp); + ifp->if_afdata_initialized = 0; if (!vmove) ifq_detach(&ifp->if_snd); From owner-p4-projects@FreeBSD.ORG Fri May 15 23:36:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31C021065672; Fri, 15 May 2009 23:36:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5C7A106566C for ; Fri, 15 May 2009 23:36:51 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D48438FC15 for ; Fri, 15 May 2009 23:36:51 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4FNapYJ090565 for ; Fri, 15 May 2009 23:36:51 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4FNapsc090563 for perforce@freebsd.org; Fri, 15 May 2009 23:36:51 GMT (envelope-from zec@fer.hr) Date: Fri, 15 May 2009 23:36:51 GMT Message-Id: <200905152336.n4FNapsc090563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 23:36:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=162138 Change 162138 by zec@zec_tpx32 on 2009/05/15 23:36:35 Re-staticize ifnet_byindex_locked() and ifnet_setbyindex(), because they are no longer refernced outside of net/if.c. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#62 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#24 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#62 (text+ko) ==== @@ -203,7 +203,7 @@ MALLOC_DEFINE(M_IFADDR, "ifaddr", "interface address"); MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address"); -struct ifnet * +static struct ifnet * ifnet_byindex_locked(u_short idx) { INIT_VNET_NET(curvnet); @@ -240,7 +240,7 @@ return (ifp); } -void +static void ifnet_setbyindex(u_short idx, struct ifnet *ifp) { INIT_VNET_NET(curvnet); ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#24 (text+ko) ==== @@ -735,9 +735,7 @@ * to call ifnet_byindex() instead if ifnet_byindex_ref(). */ struct ifnet *ifnet_byindex(u_short idx); -struct ifnet *ifnet_byindex_locked(u_short idx); struct ifnet *ifnet_byindex_ref(u_short idx); -void ifnet_setbyindex(u_short idx, struct ifnet *ifp); /* * Given the index, ifaddr_byindex() returns the one and only From owner-p4-projects@FreeBSD.ORG Sat May 16 00:21:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 598F91065675; Sat, 16 May 2009 00:21:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E65D1065670 for ; Sat, 16 May 2009 00:21:38 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5D998FC12 for ; Sat, 16 May 2009 00:21:37 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4G0Lbrp095041 for ; Sat, 16 May 2009 00:21:37 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4G0Lb9J095039 for perforce@freebsd.org; Sat, 16 May 2009 00:21:37 GMT (envelope-from zec@fer.hr) Date: Sat, 16 May 2009 00:21:37 GMT Message-Id: <200905160021.n4G0Lb9J095039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 00:21:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=162139 Change 162139 by zec@zec_tpx32 on 2009/05/16 00:21:31 Reduce diff against svn. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#42 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#63 edit .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#9 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#30 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#61 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#42 (text+ko) ==== @@ -150,12 +150,6 @@ if (ifp == NULL) return (ENXIO); -#if 0 - /* Abort if driver did not provide a if_reassign() method */ - if (ifp->if_reassign == NULL) - return (ENODEV); -#endif - /* * Check for naming clashes in target vnet. Not locked so races * are possible. @@ -621,20 +615,10 @@ vi_alloc(struct vimage *parent, char *name) { struct vimage *vip; + struct vprocg *vprocg; struct vnet *vnet; - struct vprocg *vprocg; struct vnet_modlink *vml; - /* - * XXX don't forget the locking - */ - - /* A brute force check whether there's enough mem for a new vimage */ - vip = malloc(512*1024, M_VIMAGE, M_NOWAIT); /* XXX aaaargh... */ - if (vip == NULL) - goto vi_alloc_done; - free(vip, M_VIMAGE); - vip = malloc(sizeof(struct vimage), M_VIMAGE, M_NOWAIT | M_ZERO); if (vip == NULL) panic("vi_alloc: malloc failed for vimage \"%s\"\n", name); ==== //depot/projects/vimage-commit2/src/sys/net/if.c#63 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -765,7 +766,7 @@ IFNET_WLOCK(); TAILQ_INSERT_TAIL(&V_ifnet, ifp, if_link); #ifdef VIMAGE - ++curvnet->ifcnt; + curvnet->ifcnt++; #endif IFNET_WUNLOCK(); @@ -932,7 +933,7 @@ } #ifdef VIMAGE if (found) - --curvnet->ifcnt; + curvnet->ifcnt--; #endif IFNET_WUNLOCK(); if (!found) { ==== //depot/projects/vimage-commit2/src/sys/net/if_clone.c#9 (text+ko) ==== @@ -352,6 +352,7 @@ KASSERT(LIST_EMPTY(&ifc->ifc_iflist), ("%s: ifc_iflist not empty", __func__)); + IF_CLONE_LOCK_DESTROY(ifc); free(ifc->ifc_units, M_CLONE); } ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#30 (text+ko) ==== @@ -111,8 +111,6 @@ struct ifnet *loif; /* Used externally */ #endif -IFC_SIMPLE_DECLARE(lo, 1); - #ifdef VIMAGE MALLOC_DEFINE(M_LO_CLONER, "lo_cloner", "lo_cloner"); #endif @@ -126,6 +124,8 @@ }; #endif /* !VIMAGE_GLOBALS */ +IFC_SIMPLE_DECLARE(lo, 1); + static void lo_clone_destroy(struct ifnet *ifp) { ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#61 (text+ko) ==== @@ -81,6 +81,7 @@ typedef int vnet_detach_fn(const void *); #ifndef VIMAGE_GLOBALS + struct vnet_symmap { char *name; size_t offset; @@ -233,7 +234,6 @@ #endif #endif - #define curvnet curthread->td_vnet #define VNET_MAGIC_N 0x3e0d8f29 From owner-p4-projects@FreeBSD.ORG Sat May 16 00:24:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 792BF1065673; Sat, 16 May 2009 00:24:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39691106566B for ; Sat, 16 May 2009 00:24:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 27E748FC15 for ; Sat, 16 May 2009 00:24:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4G0OfA1095236 for ; Sat, 16 May 2009 00:24:41 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4G0Of1R095234 for perforce@freebsd.org; Sat, 16 May 2009 00:24:41 GMT (envelope-from zec@fer.hr) Date: Sat, 16 May 2009 00:24:41 GMT Message-Id: <200905160024.n4G0Of1R095234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 00:24:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=162140 Change 162140 by zec@zec_tpx32 on 2009/05/16 00:23:54 Bump copyright notes to include 2009 in two files which have already undergone significant overhaul this year. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#43 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#62 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#43 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2004-2008 University of Zagreb - * Copyright (c) 2006-2008 FreeBSD Foundation + * Copyright (c) 2004-2009 University of Zagreb + * Copyright (c) 2006-2009 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#62 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006-2008 University of Zagreb - * Copyright (c) 2006-2008 FreeBSD Foundation + * Copyright (c) 2006-2009 University of Zagreb + * Copyright (c) 2006-2009 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the From owner-p4-projects@FreeBSD.ORG Sat May 16 03:21:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 922E81065673; Sat, 16 May 2009 03:21:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5064D106564A for ; Sat, 16 May 2009 03:21:41 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D7768FC0C for ; Sat, 16 May 2009 03:21:41 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4G3LfWn022463 for ; Sat, 16 May 2009 03:21:41 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4G3LfUP022461 for perforce@freebsd.org; Sat, 16 May 2009 03:21:41 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sat, 16 May 2009 03:21:41 GMT Message-Id: <200905160321.n4G3LfUP022461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Cc: Subject: PERFORCE change 162143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 03:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=162143 Change 162143 by dforsyth@squirrel on 2009/05/16 03:21:27 Updating milstones file. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/Milestones#2 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/Milestones#2 (text+ko) ==== @@ -1,0 +1,34 @@ +- Library idea collection, pkg tools research, intitial +design, redumentary API documentation, and the creation of the library +skeleton. + +- Finish skeleton library (wrap up any initial design +issues). + +- Ship package library skeleton, build basic and important +package database interaction aspects of the library, aswell as basic +package removal aspects. + +* Ship basic pkg_info, pkg_version and pkg_delete that demonstrate new +features + +- Add support for fat packages and package installation +to both the library and pkg tools. + +* Ship basic pkg_add and updated pkg_delete + +- Add versioning and upgrade features to library. Start +work on pkg_create. + +* Ship basic version of pkg_create, aswell as updated pkg_add, pkg_delete, +pkg_info, and pkg_version + +- Catch up on code, fix bugs, add other features that +were thought of and added during the planning and design phase, and work +on completing pkg tools. + +* Ship whatever I've got. + +- Testing and bug fixes. + +* ship commit ready library and pkg tools. From owner-p4-projects@FreeBSD.ORG Sat May 16 06:25:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AD6D1065674; Sat, 16 May 2009 06:25:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DF6F1065673 for ; Sat, 16 May 2009 06:25:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B42A8FC15 for ; Sat, 16 May 2009 06:25:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4G6Pl9O049231 for ; Sat, 16 May 2009 06:25:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4G6PlBU049229 for perforce@freebsd.org; Sat, 16 May 2009 06:25:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 16 May 2009 06:25:47 GMT Message-Id: <200905160625.n4G6PlBU049229@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 162145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 06:25:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=162145 Change 162145 by hselasky@hselasky_laptop001 on 2009/05/16 06:25:17 USB input: - patch for Apple MacBook Pro keyboard. Reported by: Christoph Langguth Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#5 (text+ko) ==== @@ -117,7 +117,6 @@ enum { UKBD_INTR_DT, - UKBD_INTR_CS, UKBD_CTRL_LED, UKBD_N_TRANSFER = 3, }; @@ -147,7 +146,6 @@ #define UKBD_FLAG_COMPOSE 0x0001 #define UKBD_FLAG_POLLING 0x0002 #define UKBD_FLAG_SET_LEDS 0x0004 -#define UKBD_FLAG_INTR_STALL 0x0008 #define UKBD_FLAG_ATTACHED 0x0010 #define UKBD_FLAG_GONE 0x0020 @@ -162,6 +160,7 @@ uint8_t sc_leds; /* store for async led requests */ uint8_t sc_iface_index; uint8_t sc_iface_no; + uint8_t sc_hid_id; }; #define KEY_ERROR 0x01 @@ -452,35 +451,31 @@ } static void -ukbd_clear_stall_callback(struct usb2_xfer *xfer) -{ - struct ukbd_softc *sc = xfer->priv_sc; - struct usb2_xfer *xfer_other = sc->sc_xfer[UKBD_INTR_DT]; - - if (usb2_clear_stall_callback(xfer, xfer_other)) { - DPRINTF("stall cleared\n"); - sc->sc_flags &= ~UKBD_FLAG_INTR_STALL; - usb2_transfer_start(xfer_other); - } -} - -static void ukbd_intr_callback(struct usb2_xfer *xfer) { struct ukbd_softc *sc = xfer->priv_sc; uint16_t len = xfer->actlen; uint8_t i; + uint8_t offset; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: DPRINTF("actlen=%d bytes\n", len); + if ((sc->sc_hid_id != 0) && (len != 0)) { + /* remove HID ID byte */ + offset = 1; + len--; + } else { + offset = 0; + } if (len > sizeof(sc->sc_ndata)) { len = sizeof(sc->sc_ndata); } if (len) { - bzero(&sc->sc_ndata, sizeof(sc->sc_ndata)); - usb2_copy_out(xfer->frbuffers, 0, &sc->sc_ndata, len); + memset(&sc->sc_ndata, 0, sizeof(sc->sc_ndata)); + usb2_copy_out(xfer->frbuffers, offset, + &sc->sc_ndata, len); #if USB_DEBUG if (sc->sc_ndata.modifiers) { DPRINTF("mod: 0x%04x\n", sc->sc_ndata.modifiers); @@ -494,27 +489,24 @@ ukbd_interrupt(sc); } case USB_ST_SETUP: - if (sc->sc_flags & UKBD_FLAG_INTR_STALL) { - usb2_transfer_start(sc->sc_xfer[UKBD_INTR_CS]); - return; - } +tr_setup: if (sc->sc_inputs < UKBD_IN_BUF_FULL) { xfer->frlengths[0] = xfer->max_data_length; usb2_start_hardware(xfer); } else { DPRINTF("input queue is full!\n"); } - return; + break; default: /* Error */ DPRINTF("error=%s\n", usb2_errstr(xfer->error)); if (xfer->error != USB_ERR_CANCELLED) { /* try to clear stall first */ - sc->sc_flags |= UKBD_FLAG_INTR_STALL; - usb2_transfer_start(sc->sc_xfer[UKBD_INTR_CS]); + xfer->flags.stall_pipe = 1; + goto tr_setup; } - return; + break; } } @@ -567,16 +559,6 @@ .callback = &ukbd_intr_callback, }, - [UKBD_INTR_CS] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = UE_DIR_ANY, - .bufsize = sizeof(struct usb2_device_request), - .callback = &ukbd_clear_stall_callback, - .timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ - }, - [UKBD_CTRL_LED] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ @@ -620,8 +602,10 @@ struct usb2_attach_arg *uaa = device_get_ivars(dev); int32_t unit = device_get_unit(dev); keyboard_t *kbd = &sc->sc_kbd; + void *hid_ptr = NULL; usb2_error_t err; uint16_t n; + uint16_t hid_len; mtx_assert(&Giant, MA_OWNED); @@ -669,6 +653,14 @@ */ KBD_PROBE_DONE(kbd); + /* figure out if there is an ID byte in the data */ + err = usb2_req_get_hid_desc(uaa->device, NULL, &hid_ptr, + &hid_len, M_TEMP, uaa->info.bIfaceIndex); + if (err == 0) { + hid_report_size(hid_ptr, hid_len, hid_input, &sc->sc_hid_id); + free(hid_ptr, M_TEMP); + } + /* ignore if SETIDLE fails, hence it is not crucial */ err = usb2_req_set_idle(sc->sc_udev, &Giant, sc->sc_iface_index, 0, 0); From owner-p4-projects@FreeBSD.ORG Sat May 16 08:53:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D17D31065670; Sat, 16 May 2009 08:53:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9192D106566B for ; Sat, 16 May 2009 08:53:17 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F5DC8FC13 for ; Sat, 16 May 2009 08:53:17 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4G8rHB4075250 for ; Sat, 16 May 2009 08:53:17 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4G8rHtN075248 for perforce@freebsd.org; Sat, 16 May 2009 08:53:17 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 16 May 2009 08:53:17 GMT Message-Id: <200905160853.n4G8rHtN075248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 162147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 08:53:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=162147 Change 162147 by lulf@lulf_carrot on 2009/05/16 08:53:06 - Populate sigcontext and mcontext structs. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/signal.h#2 edit .. //depot/projects/avr32/src/sys/avr32/include/ucontext.h#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/signal.h#2 (text+ko) ==== @@ -42,6 +42,20 @@ #if __BSD_VISIBLE struct sigcontext { + /* + * The fields following 'sc_mask' must match the definition + * of struct __mcontext. That way we can support + * struct sigcontext and ucontext_t at the same + * time. + */ + __sigset_t sc_mask; /* signal mask to restore */ + int sc_onstack; /* sigstack state to restore */ + __register_t sc_pc; /* Pc at time of signal. */ + __register_t sc_sr; /* Status register. */ + __register_t sc_sp; /* Original stack pointer. */ + __register_t sc_lr; /* Return reg. */ + __register_t sc_regs[13]; /* Processor registers 0 to 12 */ + int xxx[8]; /* XXX reserved */ }; #endif ==== //depot/projects/avr32/src/sys/avr32/include/ucontext.h#2 (text+ko) ==== @@ -40,7 +40,18 @@ #define _MACHINE_MCONTEXT_H_ typedef struct { - + /* + * These fields must match the corresponding fields in struct + * sigcontext which follow 'sc_mask'. That way we can support + * struct sigcontext and ucontext_t at the same time. + */ + int mc_onstack; /* sigstack state to restore */ + register_t mc_pc; /* Pc at time of signal. */ + register_t mc_sr; /* Status register. */ + register_t mc_sp; /* Original stack pointer. */ + register_t mc_lr; /* Return reg. */ + register_t mc_regs[13]; /* Processor registers 0 to 12 */ + int __spare__[8]; /* XXX reserved */ } mcontext_t; #endif /* !_MACHINE_MCONTEXT_H_ */ From owner-p4-projects@FreeBSD.ORG Sat May 16 09:15:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16E801065675; Sat, 16 May 2009 09:15:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9208106566B for ; Sat, 16 May 2009 09:15:40 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B70318FC18 for ; Sat, 16 May 2009 09:15:40 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4G9Fe9Q078031 for ; Sat, 16 May 2009 09:15:40 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4G9FeMb078029 for perforce@freebsd.org; Sat, 16 May 2009 09:15:40 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 16 May 2009 09:15:40 GMT Message-Id: <200905160915.n4G9FeMb078029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 162148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 09:15:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=162148 Change 162148 by lulf@lulf_carrot on 2009/05/16 09:14:49 - Try using the reg structure instead, as it is simpler, and see how far we can get before it might prove a bad choice. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/signal.h#3 edit .. //depot/projects/avr32/src/sys/avr32/include/ucontext.h#3 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/signal.h#3 (text+ko) ==== @@ -41,6 +41,8 @@ #if __BSD_VISIBLE +#include + struct sigcontext { /* * The fields following 'sc_mask' must match the definition @@ -50,11 +52,7 @@ */ __sigset_t sc_mask; /* signal mask to restore */ int sc_onstack; /* sigstack state to restore */ - __register_t sc_pc; /* Pc at time of signal. */ - __register_t sc_sr; /* Status register. */ - __register_t sc_sp; /* Original stack pointer. */ - __register_t sc_lr; /* Return reg. */ - __register_t sc_regs[13]; /* Processor registers 0 to 12 */ + struct reg sc_regs; /* Context registers. */ int xxx[8]; /* XXX reserved */ }; ==== //depot/projects/avr32/src/sys/avr32/include/ucontext.h#3 (text+ko) ==== @@ -39,6 +39,8 @@ #ifndef _MACHINE_MCONTEXT_H_ #define _MACHINE_MCONTEXT_H_ +#include + typedef struct { /* * These fields must match the corresponding fields in struct @@ -46,11 +48,7 @@ * struct sigcontext and ucontext_t at the same time. */ int mc_onstack; /* sigstack state to restore */ - register_t mc_pc; /* Pc at time of signal. */ - register_t mc_sr; /* Status register. */ - register_t mc_sp; /* Original stack pointer. */ - register_t mc_lr; /* Return reg. */ - register_t mc_regs[13]; /* Processor registers 0 to 12 */ + struct reg mc_regs; /* Context registers. */ int __spare__[8]; /* XXX reserved */ } mcontext_t; From owner-p4-projects@FreeBSD.ORG Sat May 16 12:15:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56D1C106566B; Sat, 16 May 2009 12:15:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F06B2106567B for ; Sat, 16 May 2009 12:15:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D22E38FC12 for ; Sat, 16 May 2009 12:15:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GCFi2v094513 for ; Sat, 16 May 2009 12:15:44 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GCFiVl094511 for perforce@freebsd.org; Sat, 16 May 2009 12:15:44 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 16 May 2009 12:15:44 GMT Message-Id: <200905161215.n4GCFiVl094511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 12:15:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=162153 Change 162153 by pgj@petymeg on 2009/05/16 12:15:06 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#6 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#18 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#25 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#6 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -3311,6 +3311,7 @@ + @@ -3786,6 +3787,7 @@ + ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#25 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.7 2009/05/08 11:54:02 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.8 2009/05/12 12:53:45 pgj Exp $ From owner-p4-projects@FreeBSD.ORG Sat May 16 12:42:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 119A61065675; Sat, 16 May 2009 12:42:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C54C01065674 for ; Sat, 16 May 2009 12:42:11 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B15358FC21 for ; Sat, 16 May 2009 12:42:11 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GCgB84096483 for ; Sat, 16 May 2009 12:42:11 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GCgBCc096481 for perforce@freebsd.org; Sat, 16 May 2009 12:42:11 GMT (envelope-from antab@FreeBSD.org) Date: Sat, 16 May 2009 12:42:11 GMT Message-Id: <200905161242.n4GCgBCc096481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 12:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=162154 Change 162154 by antab@antab_farm on 2009/05/16 12:41:20 Add parentheses Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/pte.h#8 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/pte.h#8 (text+ko) ==== @@ -44,10 +44,10 @@ #define PTE_PFN (PD_MASK | PT_MASK) #define PTE_WRITE_THRU bit_offset(SYS, TLBELO, W) /* Write thru */ -#define PTE_PERM_READ 4 << bit_shift(SYS, TLBELO, AP) -#define PTE_PERM_WRITE 2 << bit_shift(SYS, TLBELO, AP) +#define PTE_PERM_READ (4 << bit_shift(SYS, TLBELO, AP)) +#define PTE_PERM_WRITE (2 << bit_shift(SYS, TLBELO, AP)) #define PTE_PERM_RW (PTE_PERM_READ | PTE_PERM_WRITE) -#define PTE_PERM_EXECUTE 1 << bit_shift(SYS, TLBELO, AP) +#define PTE_PERM_EXECUTE (1 << bit_shift(SYS, TLBELO, AP)) #define PTE_GLOBAL bit_offset(SYS, TLBELO, G) #define PTE_BUFFERABLE bit_offset(SYS, TLBELO, B) /* Bufferable */ #define PTE_CACHEABLE bit_offset(SYS, TLBELO, C) /* Cacheable */ @@ -63,10 +63,10 @@ /* Page size, not set in PTE, always 4K */ -#define PTE_SIZE_1K 0 << bit_shift(SYS, TLBELO, SZ) -#define PTE_SIZE_4K 1 << bit_shift(SYS, TLBELO, SZ) -#define PTE_SIZE_64K 2 << bit_shift(SYS, TLBELO, SZ) -#define PTE_SIZE_1M 3 << bit_shift(SYS, TLBELO, SZ) +#define PTE_SIZE_1K (0 << bit_shift(SYS, TLBELO, SZ)) +#define PTE_SIZE_4K (1 << bit_shift(SYS, TLBELO, SZ)) +#define PTE_SIZE_64K (2 << bit_shift(SYS, TLBELO, SZ)) +#define PTE_SIZE_1M (3 << bit_shift(SYS, TLBELO, SZ)) #define pd_index_from_va(va) \ (((uint32_t)va & PD_MASK) >> PD_SHIFT) From owner-p4-projects@FreeBSD.ORG Sat May 16 12:43:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EF781065676; Sat, 16 May 2009 12:43:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F276106564A for ; Sat, 16 May 2009 12:43:13 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5E6D8FC08 for ; Sat, 16 May 2009 12:43:12 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GChCpU096549 for ; Sat, 16 May 2009 12:43:12 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GChCUI096547 for perforce@freebsd.org; Sat, 16 May 2009 12:43:12 GMT (envelope-from antab@FreeBSD.org) Date: Sat, 16 May 2009 12:43:12 GMT Message-Id: <200905161243.n4GChCUI096547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 12:43:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=162155 Change 162155 by antab@antab_farm on 2009/05/16 12:43:00 Forgot to add. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/db_machdep.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat May 16 14:25:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A62C01065676; Sat, 16 May 2009 14:25:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BCDE1065674 for ; Sat, 16 May 2009 14:25:02 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36FC88FC14 for ; Sat, 16 May 2009 14:25:02 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GEP2Cj016507 for ; Sat, 16 May 2009 14:25:02 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GEP2AP016505 for perforce@freebsd.org; Sat, 16 May 2009 14:25:02 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 16 May 2009 14:25:02 GMT Message-Id: <200905161425.n4GEP2AP016505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 14:25:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=162158 Change 162158 by pgj@petymeg on 2009/05/16 14:24:45 MFen (doc): 1.190 -> 1.192 hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml 1.461 -> 1.463 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.130 -> 1.131 hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml 1.34 -> 1.35 hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#28 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#13 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#12 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -134,8 +134,8 @@ modul elkészítésére. Egy saját rendszermag készítése - azon legfontosabb próbatételek egyike, melyet - majdnem az összes BSD felhasználónak ki kell + azon legfontosabb próbatételek egyike, melyet egy + haladó BSD felhasználónak ki kell állnia. Ez a folyamat, habár némileg idõigényes, számos elõnyt tartogat &os; rendszerünk számára. Eltérõen egy @@ -153,17 +153,22 @@ jelentõs mértékben le tud csökkeni az induláshoz szükséges idõ. + Kisebb memóriahasználat. Egy saját - rendszermag gyakran kevesebb memóriát - emészt fel, mint a GENERIC - rendszermag, ami azért is fontos, mert a rendszermag - mindig benn van a memóriában. Emiatt egy + rendszermag a szükségtelen részek és + eszközmeghajtók elhagyása miatt gyakran + kevesebb memóriát emészt fel, mint a + GENERIC rendszermag. Ez azért is + fontos, mert a rendszermag mindig benn van a fizikai + memóriában, és ezzel az + alkalmazások elöl veszi a helyet. Emiatt egy saját rendszermag elkészítése különösen hasznos lehet egy kevés fizikai memóriával rendelkezõ rendszeren. + További hardverek támogatása. A saját rendszermagunkba olyan eszközök @@ -173,7 +178,6 @@ hangkártyákét. - @@ -694,6 +698,51 @@ opciókat a /usr/src/sys/conf/NOTES állományban találjuk. + A &os; 5.0 megjelenése óta a + konfigurációs állományokban + használható az include + direktíva. Ennek segítségével egy + másik konfigurációs állomány + tartalma logikailag beilleszthetõ az aktuálisba, + így könnyebbé válik egy már + meglevõ állományhoz tartozó kisebb + mennyiségû változtatás + karbantartása. Például ha csupán + pár egyszerû kiegészítést + szeretnénk hozzáadni a + GENERIC rendszermaghoz, akkor elegendõ + a hozzá vett eltéréseket + nyilvántartanunk egy külön + konfigurációs állományban: + + include GENERIC +ident SAJAT + +options IPFIREWALL +options DUMMYNET +options IPFIREWALL_DEFAULT_TO_ACCEPT +options IPDIVERT + + + Valószínûleg sok rendszergazda + számára jelentõs elõnyt jelent ez a + megoldás a konfigurációs + állományok korábbról már + megszokott újraírásával szemben: a + helyi konfigurációs állomány csak a + GENERIC rendszermag helyi rendszerre + vonatkozó eltéréseit tartalmazza. Így + amikor frissítjük a rendszerünket, a + GENERIC rendszermag összes + újítása elérhetõvé + válik, kivéve ha explicit módon le nem + tiltottuk ezeket a noptions vagy a + nodevice megadásával. A fejezet + további részében egy átlagos + konfigurációs állománnyal fogunk + foglalkozni, mind a beállítások, mind pedig + az eszközök tekintetében. + Ha olyan állományt akarunk készíteni, amely tartalmazza az összes ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#28 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.461 + %SRCID% 1.463 --> @@ -3067,6 +3067,16 @@ + RELENG_7_2 + + + A FreeBSD-7.2 kiadás ága, ahová + csak a biztonsági frissítések és a + kritikus hibajavítások kerülnek. + + + + RELENG_7_1 @@ -3792,8 +3802,8 @@ - vol/4/freebsd-core: a &os; FTP szerverének - teljes tükrözése. + FreeBSD: a &os; FTP szerverének teljes + tükrözése. @@ -3837,13 +3847,13 @@ Egyesült Királyság - rsync://rsync.mirror.ac.uk/ + rsync://rsync.mirrorservice.org/ Elérhetõ gyûjtemények: - ftp.FreeBSD.org: a &os; FTP szerverének + sites/ftp.freebsd.org: a &os; FTP szerverének teljes tükrözése. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#6 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -517,16 +517,20 @@ felhasználóként így tehetünk meg: - &prompt.root; sysctl hw.snd.pcm0.vchans=4 + &prompt.root; sysctl dev.pcm.0.play.vchans=4 +&prompt.root; sysctl dev.pcm.0.rec.vchans=4 &prompt.root; sysctl hw.snd.maxautovchans=4 A fenti példa négy virtuális csatornát hoz létre, ami egészen jellemzõ a mindennapi használatban. A - hw.snd.pcm0.vchans - pcm0 virtuális - csatornáinak számát adja meg, amelyet az - eszköz csatlakoztatása után tudunk + dev.pcm.0.play.vchans és + dev.pcm.0.rec.vchans a + pcm0 eszköz + lejátszásra és felvételre + használt virtuális csatornáinak + számát adja meg, amelyet az eszköz + csatlakoztatása után tudunk beállítani. A hw.snd.maxautovchans az új eszközhöz tartozó virtuális @@ -539,7 +543,8 @@ hw.snd.maxautovchans azt tárolja, hogy a késõbb hozzá csatlakozó eszközök mennyi virtuális csatornát - fognak majd kapni. + fognak majd kapni. Errõl részletesebben a + &man.pcm.4; man oldalon olvashatunk. A használatban levõ @@ -558,7 +563,7 @@ eszközre kell mutatnia, ahol az x értéke 0-tól 3-ig terjedhet attól függõen, hogy a - hw.snd.pcm.0.vchans + dev.pcm.0.rec.vchans értékét a fenti példához hasonlóan 4-re állítottuk-e. A &man.devfs.5; megoldását használó ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#13 (text+ko) ==== @@ -33,7 +33,7 @@ From owner-p4-projects@FreeBSD.ORG Sat May 16 14:26:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE3851065688; Sat, 16 May 2009 14:26:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73B301065680 for ; Sat, 16 May 2009 14:26:03 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FD488FC25 for ; Sat, 16 May 2009 14:26:03 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GEQ3JI016866 for ; Sat, 16 May 2009 14:26:03 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GEQ3uB016864 for perforce@freebsd.org; Sat, 16 May 2009 14:26:03 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 16 May 2009 14:26:03 GMT Message-Id: <200905161426.n4GEQ3uB016864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 14:26:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=162159 Change 162159 by pgj@petymeg on 2009/05/16 14:25:46 IFC Affected files ... .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#14 integrate Differences ... ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#14 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.353 2009/04/26 07:16:01 blackend Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.354 2009/05/16 12:12:31 brueffer Exp $ 2000 @@ -898,6 +898,8 @@ &hwlist.ath; + &hwlist.bwi; + [&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network adapter (&man.ipw.4; driver) @@ -922,6 +924,8 @@ &hwlist.ural; + &hwlist.urtw; + [&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent Technologies WaveLAN/IEEE 802.11b wireless network adapters and workalikes using the Lucent Hermes, Intersil PRISM-II, From owner-p4-projects@FreeBSD.ORG Sat May 16 14:33:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 673601065673; Sat, 16 May 2009 14:33:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 270D71065670 for ; Sat, 16 May 2009 14:33:11 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 13F008FC14 for ; Sat, 16 May 2009 14:33:11 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GEXAal017356 for ; Sat, 16 May 2009 14:33:10 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GEXAk5017354 for perforce@freebsd.org; Sat, 16 May 2009 14:33:10 GMT (envelope-from zec@fer.hr) Date: Sat, 16 May 2009 14:33:10 GMT Message-Id: <200905161433.n4GEXAk5017354@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 14:33:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=162160 Change 162160 by zec@zec_tpx32 on 2009/05/16 14:33:10 Reduce diff against head by pruning unused fields in struct ifnet. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#64 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#25 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#64 (text+ko) ==== @@ -688,12 +688,6 @@ #ifdef VIMAGE ifp->if_vnet = curvnet; - /* - * Record in which vnet has this ifnet been attached - * for the first time. - */ - if (ifp->if_home_vnet == NULL) - ifp->if_home_vnet = curvnet; #endif if_addgroup(ifp, IFG_ALL); ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#25 (text+ko) ==== @@ -169,8 +169,6 @@ (struct ifnet *); int (*if_transmit) /* initiate output routine */ (struct ifnet *, struct mbuf *); - void (*if_reassign) /* reassign to vnet routine */ - (struct ifnet *, struct vnet *, char *); struct ifaddr *if_addr; /* pointer to link-level address */ void *if_llsoftc; /* link layer softc */ int if_drv_flags; /* driver-managed status flags */ @@ -196,8 +194,6 @@ void *if_lagg; /* lagg glue */ u_char if_alloctype; /* if_type at time of allocation */ - struct vnet *if_home_vnet; /* where this ifnet originates from */ - /* * Spare fields are added so that we can modify sensitive data * structures without changing the kernel binary interface, and must From owner-p4-projects@FreeBSD.ORG Sat May 16 14:34:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9B45106566C; Sat, 16 May 2009 14:34:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69F001065676 for ; Sat, 16 May 2009 14:34:12 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CBC98FC08 for ; Sat, 16 May 2009 14:34:12 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GEYCSQ017447 for ; Sat, 16 May 2009 14:34:12 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GEYC2d017445 for perforce@freebsd.org; Sat, 16 May 2009 14:34:12 GMT (envelope-from zec@fer.hr) Date: Sat, 16 May 2009 14:34:12 GMT Message-Id: <200905161434.n4GEYC2d017445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 14:34:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=162161 Change 162161 by zec@zec_tpx32 on 2009/05/16 14:34:02 Unbreak VIMAGE build by pruning a no longer used goto label. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#44 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#44 (text+ko) ==== @@ -661,7 +661,6 @@ /* XXX locking */ LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le); -vi_alloc_done: return (vip); } #endif /* VIMAGE */ From owner-p4-projects@FreeBSD.ORG Sat May 16 14:49:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B51F1065673; Sat, 16 May 2009 14:49:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF4BA1065672 for ; Sat, 16 May 2009 14:49:27 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C25EF8FC14 for ; Sat, 16 May 2009 14:49:27 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GEnRD7018563 for ; Sat, 16 May 2009 14:49:27 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GEnR0a018561 for perforce@freebsd.org; Sat, 16 May 2009 14:49:27 GMT (envelope-from zec@fer.hr) Date: Sat, 16 May 2009 14:49:27 GMT Message-Id: <200905161449.n4GEnR0a018561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 14:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=162162 Change 162162 by zec@zec_tpx32 on 2009/05/16 14:48:26 Reduce churn in struct vnet, thereby the diff against head. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#18 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#18 (text+ko) ==== @@ -36,29 +36,28 @@ #include struct vnet_net { + int _if_index; + struct ifindex_entry * _ifindex_table; struct ifnethead _ifnet; struct ifgrouphead _ifg_head; - struct ifnet * _loif; - LIST_HEAD(, lo_softc) _lo_list; + int _if_indexlim; + struct knlist _ifklist; + struct rtstat _rtstat; struct radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1]; - struct rtstat _rtstat; int _rttrash; uma_zone_t _rtzone; - struct ifindex_entry * _ifindex_table; - int _if_index; - int _if_indexlim; - struct knlist _ifklist; + struct ifnet * _loif; + LIST_HEAD(, lo_softc) _lo_list; + struct if_clone * _lo_cloner; - struct if_clone * _lo_cloner; + LIST_HEAD(, rawcb) _rawcb_list; LIST_HEAD(, if_clone) _if_cloners; int _if_cloners_count; - LIST_HEAD(, rawcb) _rawcb_list; - int _ether_ipfw; }; @@ -79,22 +78,22 @@ #define VNET_NET(sym) VSYM(vnet_net, sym) -#define V_ether_ipfw VNET_NET(ether_ipfw) -#define V_if_cloners VNET_NET(if_cloners) -#define V_if_cloners_count VNET_NET(if_cloners_count) -#define V_if_index VNET_NET(if_index) -#define V_if_indexlim VNET_NET(if_indexlim) -#define V_ifg_head VNET_NET(ifg_head) -#define V_ifindex_table VNET_NET(ifindex_table) -#define V_ifklist VNET_NET(ifklist) -#define V_ifnet VNET_NET(ifnet) -#define V_lo_list VNET_NET(lo_list) -#define V_lo_cloner VNET_NET(lo_cloner) -#define V_loif VNET_NET(loif) -#define V_rawcb_list VNET_NET(rawcb_list) -#define V_rt_tables VNET_NET(rt_tables) -#define V_rtstat VNET_NET(rtstat) -#define V_rttrash VNET_NET(rttrash) -#define V_rtzone VNET_NET(rtzone) +#define V_ether_ipfw VNET_NET(ether_ipfw) +#define V_if_index VNET_NET(if_index) +#define V_if_indexlim VNET_NET(if_indexlim) +#define V_if_cloners VNET_NET(if_cloners) +#define V_if_cloners_count VNET_NET(if_cloners_count) +#define V_ifg_head VNET_NET(ifg_head) +#define V_ifindex_table VNET_NET(ifindex_table) +#define V_ifklist VNET_NET(ifklist) +#define V_ifnet VNET_NET(ifnet) +#define V_lo_cloner VNET_NET(lo_cloner) +#define V_lo_list VNET_NET(lo_list) +#define V_loif VNET_NET(loif) +#define V_rawcb_list VNET_NET(rawcb_list) +#define V_rt_tables VNET_NET(rt_tables) +#define V_rtstat VNET_NET(rtstat) +#define V_rttrash VNET_NET(rttrash) +#define V_rtzone VNET_NET(rtzone) #endif /* !_NET_VNET_H_ */ From owner-p4-projects@FreeBSD.ORG Sat May 16 17:56:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E281106566C; Sat, 16 May 2009 17:56:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D09B9106564A for ; Sat, 16 May 2009 17:56:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B582F8FC08 for ; Sat, 16 May 2009 17:56:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GHub50055536 for ; Sat, 16 May 2009 17:56:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GHub4e055534 for perforce@freebsd.org; Sat, 16 May 2009 17:56:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 16 May 2009 17:56:37 GMT Message-Id: <200905161756.n4GHub4e055534@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 162165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 17:56:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=162165 Change 162165 by hselasky@hselasky_laptop001 on 2009/05/16 17:55:40 USB input: - improve patch for Apple MacBook Pro keyboard. Reported by: Christoph Langguth Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#6 (text+ko) ==== @@ -113,12 +113,13 @@ #define MOD_WIN_R 0x80 uint8_t reserved; uint8_t keycode[UKBD_NKEYCODE]; -} __packed; + uint8_t exten[8]; +}; enum { UKBD_INTR_DT, UKBD_CTRL_LED, - UKBD_N_TRANSFER = 3, + UKBD_N_TRANSFER, }; struct ukbd_softc { @@ -126,6 +127,8 @@ keymap_t sc_keymap; accentmap_t sc_accmap; fkeytab_t sc_fkeymap[UKBD_NFKEY]; + struct hid_location sc_loc_apple_eject; + struct hid_location sc_loc_apple_fn; struct usb2_callout sc_callout; struct ukbd_data sc_ndata; struct ukbd_data sc_odata; @@ -143,11 +146,14 @@ uint32_t sc_buffered_char[2]; #endif uint32_t sc_flags; /* flags */ -#define UKBD_FLAG_COMPOSE 0x0001 -#define UKBD_FLAG_POLLING 0x0002 -#define UKBD_FLAG_SET_LEDS 0x0004 -#define UKBD_FLAG_ATTACHED 0x0010 -#define UKBD_FLAG_GONE 0x0020 +#define UKBD_FLAG_COMPOSE 0x0001 +#define UKBD_FLAG_POLLING 0x0002 +#define UKBD_FLAG_SET_LEDS 0x0004 +#define UKBD_FLAG_ATTACHED 0x0010 +#define UKBD_FLAG_GONE 0x0020 +#define UKBD_FLAG_APPLE_EJECT 0x0040 +#define UKBD_FLAG_APPLE_FN 0x0080 +#define UKBD_FLAG_APPLE_SWAP 0x0100 int32_t sc_mode; /* input mode (K_XLATE,K_RAW,K_CODE) */ int32_t sc_state; /* shift/lock key state */ @@ -450,6 +456,28 @@ usb2_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc); } +static uint8_t +ukbd_apple_fn(uint8_t keycode) { + switch (keycode) { + case 0x2a: return 0x4c; /* BACKSPACE -> DEL */ + case 0x2c: return 0x49; /* SPACE -> INSERT */ + case 0x50: return 0x4a; /* LEFT ARROW -> HOME */ + case 0x4f: return 0x4d; /* RIGHT ARROW -> END */ + case 0x52: return 0x4b; /* UP ARROW -> PGUP */ + case 0x51: return 0x4e; /* DOWN ARROW -> PGDN */ + default: return keycode; + } +} + +static uint8_t +ukbd_apple_swap(uint8_t keycode) { + switch (keycode) { + case 0x35: return 0x64; /* 5 -> d */ + case 0x64: return 0x35; /* d -> 5 */ + default: return keycode; + } +} + static void ukbd_intr_callback(struct usb2_xfer *xfer) { @@ -457,26 +485,58 @@ uint16_t len = xfer->actlen; uint8_t i; uint8_t offset; + uint8_t id; + uint8_t apple_fn; + uint8_t apple_eject; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: DPRINTF("actlen=%d bytes\n", len); - if ((sc->sc_hid_id != 0) && (len != 0)) { - /* remove HID ID byte */ + if (len == 0) { + DPRINTF("zero length data\n"); + goto tr_setup; + } + + if (sc->sc_hid_id != 0) { + /* check and remove HID ID byte */ + usb2_copy_out(xfer->frbuffers, 0, &id, 1); + if (id != sc->sc_hid_id) { + DPRINTF("wrong HID ID\n"); + goto tr_setup; + } offset = 1; len--; } else { offset = 0; } + if (len > sizeof(sc->sc_ndata)) { len = sizeof(sc->sc_ndata); } + if (len) { memset(&sc->sc_ndata, 0, sizeof(sc->sc_ndata)); usb2_copy_out(xfer->frbuffers, offset, &sc->sc_ndata, len); + + if ((sc->sc_flags & UKBD_FLAG_APPLE_EJECT) && + hid_get_data((uint8_t *)&sc->sc_ndata, + len, &sc->sc_loc_apple_eject)) + apple_eject = 1; + else + apple_eject = 0; + + if ((sc->sc_flags & UKBD_FLAG_APPLE_FN) && + hid_get_data((uint8_t *)&sc->sc_ndata, + len, &sc->sc_loc_apple_fn)) + apple_fn = 1; + else + apple_fn = 0; #if USB_DEBUG + DPRINTF("apple_eject=%u apple_fn=%u\n", + apple_eject, apple_fn); + if (sc->sc_ndata.modifiers) { DPRINTF("mod: 0x%04x\n", sc->sc_ndata.modifiers); } @@ -486,6 +546,21 @@ } } #endif /* USB_DEBUG */ + + if (apple_fn) { + for (i = 0; i < UKBD_NKEYCODE; i++) { + sc->sc_ndata.keycode[i] = + ukbd_apple_fn(sc->sc_ndata.keycode[i]); + } + } + + if (sc->sc_flags & UKBD_FLAG_APPLE_SWAP) { + for (i = 0; i < UKBD_NKEYCODE; i++) { + sc->sc_ndata.keycode[i] = + ukbd_apple_swap(sc->sc_ndata.keycode[i]); + } + } + ukbd_interrupt(sc); } case USB_ST_SETUP: @@ -604,6 +679,7 @@ keyboard_t *kbd = &sc->sc_kbd; void *hid_ptr = NULL; usb2_error_t err; + uint32_t flags; uint16_t n; uint16_t hid_len; @@ -657,7 +733,30 @@ err = usb2_req_get_hid_desc(uaa->device, NULL, &hid_ptr, &hid_len, M_TEMP, uaa->info.bIfaceIndex); if (err == 0) { - hid_report_size(hid_ptr, hid_len, hid_input, &sc->sc_hid_id); + /* investigate if this is an Apple Keyboard */ + if (hid_locate(hid_ptr, hid_len, + HID_USAGE2(HUP_CONSUMER, HUG_APPLE_EJECT), + hid_input, 0, &sc->sc_loc_apple_eject, &flags, + &sc->sc_hid_id)) { + if (flags & HIO_VARIABLE) + sc->sc_flags |= UKBD_FLAG_APPLE_EJECT | + UKBD_FLAG_APPLE_SWAP; + if (hid_locate(hid_ptr, hid_len, + HID_USAGE2(0xFFFF, 0x0003), + hid_input, 0, &sc->sc_loc_apple_fn, &flags, + &sc->sc_hid_id)) { + if (flags & HIO_VARIABLE) + sc->sc_flags |= UKBD_FLAG_APPLE_FN | + UKBD_FLAG_APPLE_SWAP; + } + } else { + /* + * Assume the first HID ID contains the + * keyboard data + */ + hid_report_size(hid_ptr, hid_len, + hid_input, &sc->sc_hid_id); + } free(hid_ptr, M_TEMP); } ==== //depot/projects/usb/src/sys/dev/usb/usbhid.h#8 (text+ko) ==== @@ -128,6 +128,7 @@ #define HUG_SYSTEM_MENU_LEFT 0x008b #define HUG_SYSTEM_MENU_UP 0x008c #define HUG_SYSTEM_MENU_DOWN 0x008d +#define HUG_APPLE_EJECT 0x00b8 /* Usages Digitizers */ #define HUD_UNDEFINED 0x0000 From owner-p4-projects@FreeBSD.ORG Sat May 16 18:15:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B38BD1065673; Sat, 16 May 2009 18:15:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 740A9106564A for ; Sat, 16 May 2009 18:15:57 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5858E8FC18 for ; Sat, 16 May 2009 18:15:57 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GIFvTX058009 for ; Sat, 16 May 2009 18:15:57 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GIFvCP058007 for perforce@freebsd.org; Sat, 16 May 2009 18:15:57 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 16 May 2009 18:15:57 GMT Message-Id: <200905161815.n4GIFvCP058007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 162167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 18:15:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=162167 Change 162167 by lulf@lulf_carrot on 2009/05/16 18:15:26 - First try at implementing sendsig(). Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#8 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#8 (text+ko) ==== @@ -29,8 +29,13 @@ #include #include +#include +#include +#include +#include +#include +#include #include -#include #include #include #include @@ -41,6 +46,9 @@ #include #include #include +#ifdef KTRACE +#include +#endif #include #include #include @@ -49,6 +57,8 @@ #include #include +#include +#include #include #include @@ -115,8 +125,84 @@ void sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { - panic("sendsig"); - avr32_impl(); + struct thread *td; + struct proc *p; + struct sigframe sf, *sfp; + struct sigacts *psp; + struct trapframe *tf; + struct reg *regs; + int sig; + int oonstack; + + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + sig = ksi->ksi_signo; + psp = p->p_sigacts; + mtx_assert(&psp->ps_mtx, MA_OWNED); + tf = td->td_frame; + regs = &tf->regs; + oonstack = sigonstack(regs->sp); + + /* Save user context. */ + bzero(&sf, sizeof(sf)); + sf.sf_uc.uc_sigmask = *mask; + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) + ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; + sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; + bcopy(regs, &sf.sf_uc.uc_mcontext.mc_regs, + sizeof(sf.sf_uc.uc_mcontext.mc_regs)); + sf.sf_uc.uc_mcontext.mc_len = sizeof(sf.sf_uc.uc_mcontext); + + /* Allocate and validate space for the signal handler context. */ + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && + SIGISMEMBER(psp->ps_sigonstack, sig)) { + sfp = (struct sigframe *)((vm_offset_t)(td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(struct sigframe)) + & ~(sizeof(register_t) - 1)); + } else { + sfp = (struct sigframe *)((vm_offset_t)(regs->sp - + sizeof(struct sigframe)) & ~(sizeof(register_t) - 1)); + } + + /* Translate the signal is appropriate */ + if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize) { + sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)]; + } + + /* POSIX parts */ + sf.sf_si = ksi->ksi_info; + sf.sf_si.si_signo = sig; /* May have changed. */ + + /* Build context. */ + regs->r12 = sig; + regs->r11 = (register_t)&sfp->sf_si; + regs->r10 = (register_t)&sfp->sf_uc; + mtx_unlock(&psp->ps_mtx); + PROC_UNLOCK(p); + + /* + * Copy the sigframe out to the user's stack. + */ + if (copyout(&sf, sfp, sizeof(struct sigframe)) != 0) { + /* Problems with trashed stack. */ + CTR2(KTR_SIG, "sendsig: sigexit td=%p sfp=%p", td, sfp); + PROC_LOCK(p); + sigexit(td, SIGILL); + } + + regs->pc = (register_t)catcher; + regs->sp = (register_t)sfp; + + /* + * Signal trampoline code is at base of user stack. + */ + regs->lr = PS_STRINGS - *(p->p_sysent->sv_szsigcode); + CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, regs->lr, + regs->sp); + PROC_LOCK(p); + mtx_lock(&psp->ps_mtx); } /* From owner-p4-projects@FreeBSD.ORG Sat May 16 18:16:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1A11106567A; Sat, 16 May 2009 18:16:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 922A51065678 for ; Sat, 16 May 2009 18:16:58 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8131A8FC12 for ; Sat, 16 May 2009 18:16:58 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GIGw7v058071 for ; Sat, 16 May 2009 18:16:58 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GIGwrH058069 for perforce@freebsd.org; Sat, 16 May 2009 18:16:58 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 16 May 2009 18:16:58 GMT Message-Id: <200905161816.n4GIGwrH058069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 162168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 18:16:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=162168 Change 162168 by lulf@lulf_carrot on 2009/05/16 18:16:33 - Add mc/sc_len field to be used to set/check magic. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/signal.h#4 edit .. //depot/projects/avr32/src/sys/avr32/include/ucontext.h#4 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/signal.h#4 (text+ko) ==== @@ -53,6 +53,7 @@ __sigset_t sc_mask; /* signal mask to restore */ int sc_onstack; /* sigstack state to restore */ struct reg sc_regs; /* Context registers. */ + long mc_len; /* sizeof(mcontext_t) */ int xxx[8]; /* XXX reserved */ }; ==== //depot/projects/avr32/src/sys/avr32/include/ucontext.h#4 (text+ko) ==== @@ -49,6 +49,7 @@ */ int mc_onstack; /* sigstack state to restore */ struct reg mc_regs; /* Context registers. */ + long mc_len; /* sizeof(mcontext_t) */ int __spare__[8]; /* XXX reserved */ } mcontext_t; From owner-p4-projects@FreeBSD.ORG Sat May 16 18:58:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 100F61065674; Sat, 16 May 2009 18:58:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA1F01065672 for ; Sat, 16 May 2009 18:58:41 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97B918FC1C for ; Sat, 16 May 2009 18:58:41 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GIwfJW061569 for ; Sat, 16 May 2009 18:58:41 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GIwf19061567 for perforce@freebsd.org; Sat, 16 May 2009 18:58:41 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 16 May 2009 18:58:41 GMT Message-Id: <200905161858.n4GIwf19061567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 18:58:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=162172 Change 162172 by pgj@petymeg on 2009/05/16 18:57:49 MFen (doc): 1.86 -> 1.87 hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#16 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#16 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -155,19 +155,38 @@ Csak azt a forgalmat engedik át, amirõl van szabály és minden mást blokkolnak. - Az inkluzív tûzfalak általában - biztonságosabbak az exkluzív - társaiknál, mivel esetükben jelentõs - mértékben visszaszorul a nem kívánatos - átfolyó forgalom. + Az inkluzív tûzfalak alkalmazásával + sokkal jobban kezünkbentudjuk tartani a + hálózatunk kimenõ forgalmát, + ezért leginkább az internetes + szolgáltatásokat futtató rendszerek + esetében bizonyulhat jobb választásnak. + Emellett az internetrõl a hálózatunk + felé irányuló forgalmat is képes + szabályozni. Ekkor az egyetlen szabályra sem + illeszkedõ csomagokat egyszerûen eldobjuk és + naplózzuk. Az inkluzív tûzfalak + általában biztonságosabbak az exkluzív + típusú társaiknál, mivel + esetükben jelentõs mértékben visszaszorul + a nem kívánatos átfolyó + forgalom. + + + Hacsak nem emeljük ki külön, a fejezet + további részében minden + példaként megadott szabályrendszer + inkluzív tûzfalat hoz létre. + Ez a típusú védelem még - tovább fokozható az állapottartó - tûzfalak (stateful firewall) - használatával. Ilyenkor a tûzfal szemmel - tartja a rajta keresztül megnyitott kapcsolatokat, és - vagy csak a már meglevõ kapcsolathoz tartozó - forgalmat engedi át, vagy nyit egy újat. Az + tovább fokozható az + állapottartó tûzfalak (stateful + firewall) használatával. Az ilyen + típusú tûzfalak szemmel tartják a rajtuk + keresztül megnyitott kapcsolatokat, és vagy csak a + már meglevõ kapcsolathoz tartozó forgalmat + engedik át vagy nyitnak egy újat. Az állapottartó tûzfalak hátránya, hogy a Denial of Service (DoS) típusú támadásokkal szemben sokkal @@ -199,10 +218,10 @@ beépített csomagot tartalmaz: ez az &man.altq.4; és a &man.dummynet.4;. Általában a Dummynet az IPFW, míg az ALTQ - a PF partnere. Az IPFILTER - esetében maga az IPFILTER végzi a - címfordítást és a szûrést, - a sávszélességet pedig az + a PF partnere. Az IPFILTER esetében + maga az IPFILTER végzi a címfordítást + és a szûrést, a + sávszélességet pedig az IPFW a &man.dummynet.4; vagy a PF az ALTQ segítségével. Az @@ -232,8 +251,7 @@ fejlécének bizonyos mezõinek alapján dolgozik, ezért a tûzfal szabályrendszerét megalkotó egyénnek - teljesen tisztában kell lennie a - TCP/IP + teljesen tisztában kell lennie a TCP/IP mûködésével, továbbá azzal, hogy ezekben a mezõkben milyen értékek szerepelhetnek és ezeket hogyan használják @@ -387,9 +405,9 @@ megoldásával párosítva így akár hibatûrõ tûzfalak is kialakíthatóak a PF-fel. A - CARP-ról bõvebb - ismertetést a kézikönyv e ad. + CARP megoldásáról a + kézikönyvben bõvebb ismertetést a ad. A PF rendszermag konfigurációs beállításai a @@ -592,10 +610,10 @@ ALTQ rendszert engedélyezi. Az options ALTQ_CBQ engedélyezi a - osztályozás alapú besorolást (Class - Based Queuing, CBQ). A - CBQ használatával a - kapcsolatunkhoz tartozó + osztályozás alapú besorolást + (Class Based Queuing, + CBQ). A CBQ + használatával a kapcsolatunkhoz tartozó sávszélességet különbözõ osztályokra vagy sorokra tudjuk bontani és a szûrési @@ -603,17 +621,18 @@ segítségükkel a forgalmat. Az options ALTQ_RED a véletlen - korai észlelés (Random Early Detection, - RED) használatát - engedélyezi. A RED a - hálózati forgalomban keletkezõ - torlódások elkerülésére - alkalmas. A RED ezt a - problémát úgy oldja meg, hogy méri a - sorok hosszát és összeveti a - hozzátartozó minimális és - maximális küszöbértékekkel. Ha a - sor hossza meghaladja a számára elõírt + korai észlelés (Random Early + Detection, RED) + használatát engedélyezi. A + RED a hálózati forgalomban + keletkezõ torlódások + elkerülésére alkalmas. A + RED ezt a problémát úgy + oldja meg, hogy méri a sorok hosszát és + összeveti a hozzátartozó minimális + és maximális + küszöbértékekkel. Ha a sor hossza + meghaladja a számára elõírt maximális értéket, akkor az új csomagokat eldobja. Nevéhez hûen a RED az eldobásra ítélt @@ -627,18 +646,19 @@ Az options ALTQ_HFSC a pártatlan hierachikus szolgáltatási görbe alapú - csomagütemezõt (Hierarchical Fair Service Curve Packet - Scheduler, HFSC) engedélyezi. Vele - kapcsolatban a + csomagütemezõt (Hierarchical Fair Service + Curve Packet Scheduler, HFSC) + engedélyezi. Vele kapcsolatban a címen találhatunk bõvebben olvasnivalót (angolul). Az options ALTQ_PRIQ a prioritásos - besorolást (Priority Queuing, PRIQ) - teszi elérhetõvé. A PRIQ - mindig elsõként a nagyobb értékû - sorban levõ forgalmat továbbítja. + besorolást (Priority Queuing, + PRIQ) teszi elérhetõvé. A + PRIQ mindig elsõként a nagyobb + értékû sorban levõ forgalmat + továbbítja. Az options ALTQ_NOPCC az ALTQ SMP, vagyis @@ -657,11 +677,6 @@ IPFILTER - - Ez a szakasz fejlesztés alatt áll. Ennek - megfelelõen a tartalma nem minden esetben pontos. - - Az IPFILTER szerzõje Darren Reed. Az IPFILTER nem kötõdik egyik rendszerhez sem: ez egy olyan nyílt forráskódú alkalmazás, amelyet @@ -700,10 +715,10 @@ drámai mértékben korszerûsítették a szabályok feldolgozásának elvét. Az IPF hivatalos - dokumentációja tartalmazza a régi - szabályok létrehozását és azok - feldolgozásának leírását. A - korszerûsített funkciók csak + dokumentációja csak a régi szabályok + létrehozását és azok + feldolgozásának leírását + tartalmazza. A korszerûsített funkciók csak kiegészítésképpen jelennek meg, és az általuk felkínált elõnyök megértése egy sokkal magasabb @@ -718,34 +733,20 @@ tûzfalszabályok létrehozásának alapjai. - Az inkluzív tûzfalak csak olyan csomagokat - engednek keresztül, amelyek megfelelnek a - szabályoknak. Ezen módon képesek vagyunk - megmondani, hogy a tûzfal mögül milyen - szolgáltatások érhetõek el az interneten - és segítségével azt is megadhatjuk, - hogy az internetrõl a belsõ hálózatunkon - milyen szolgáltatásokat érhetnek el. A - tûzfal alapból minden mást visszautasít - és naplóz. Az inkluzív tûzfalak sokkal, - de sokkal megbízhatóbbak az exkluzív - tûzfalaknál, ezért itt most csak ilyenekkel - foglalkozunk. - A régi típusú szabályokról a + url="http://www.obfuscation.org/ipf/ipf-howto.html#TOC_1"> és + url="http://coombs.anu.edu.au/~avalon/ip-filter.html"> címeken olvashatunk (angolul). Az IPF gyakran ismételt kérdései a címen + url="http://www.phildev.net/ipf/index.html"> címen érhetõek el (angolul). A nyílt forrású IPFILTER levelezési lista kereshetõ archívumait a + url="http://marc.theaimsgroup.com/?l=ipfilter"> címen találjuk (angolul). @@ -881,8 +882,8 @@ ipf - Az ipf parancs használható - a szabályokat tartalmazó állomány + Az &man.ipf.8; parancs használható a + szabályokat tartalmazó állomány betöltésére. Általában egy állományba írjuk össze a tûzfal szabályait és ezzel a paranccsal @@ -1049,7 +1050,7 @@ Az ipmon megfelelõ mûködéséhez be kell kapcsolnunk a - rendszermag IPFILTER_LOG + rendszermag IPFILTER_LOG beállítását. Ez a parancs két különbözõ módban használható. Ha parancsot a @@ -1065,7 +1066,7 @@ &os; beépítve tartalmaz olyan lehetõséget, aminek révén magától cseréli a rendszernaplókat. - Ezért ha átküldjük a syslogd + Ezért ha átküldjük a &man.syslogd.8; démonnak a naplózandó üzeneteket, akkor sokkal jobban járunk, mintha egyszerûen csak mezei állományba naplóznánk. Az @@ -1141,12 +1142,13 @@ &prompt.root; touch /var/log/ipfilter.log - A syslog mûködését az + A &man.syslogd.8; mûködését az /etc/syslog.conf állományban szereplõ definíciók vezérlik. A syslog.conf állomány számottevõ mértékben képes - meghatározni azt, ahogy a syslog az IPF és a + meghatározni azt, ahogy a + syslog az IPF és a hozzá hasonló alkalmazásoktól kapott rendszerszintû üzeneteket kezeli. @@ -1167,8 +1169,8 @@ újraindítjuk a számítógépet vagy az /etc/rc.d/syslogd reload paranccsal - megkérjük a syslog programot, hogy olvassa - újra az /etc/syslog.conf + megkérjük a &man.syslogd.8; démont, hogy + olvassa újra az /etc/syslog.conf állományt. Az imént létrehozott naplót ne @@ -1203,7 +1205,7 @@ - Annak a felületnek a neve, ahol a csomag + Azon interfész a neve, ahol a csomag feldolgozásra került, például dc0 @@ -1295,8 +1297,9 @@ következõ példában láthatjuk. - Az itt alkalmazott felírás kompatibilis az sh, - csh és tcsh parancsértelmezõkkel. + Az itt alkalmazott felírás kompatibilis az + &man.sh.1;, &man.csh.1; és &man.tcsh.1; + parancsértelmezõkkel. A szimbolikus helyettesítést egy dollárjellel fejezzük ki: @@ -1314,7 +1317,7 @@ ######### Az IPF szabályait tartalmazó szkript eleje ########### -oif="dc0" # a kimenõ felület neve +oif="dc0" # a kimenõ interfész neve odns="192.0.2.11" # az internet szolgáltató névszerverének IP-címe myip="192.0.2.7" # a szolgáltatótól kapott statikus IP-címünk ks="keep state" @@ -1389,7 +1392,8 @@ állományba. Tegyünk egy, az alábbi szkripthez - hasonlót az /usr/local/etc/rc.d/ + hasonlót az /usr/local/etc/rc.d/ könyvtárba. A szkriptnek adjuk valamilyen értelmes nevet, például ipf.loadrules.sh. Az @@ -1416,24 +1420,29 @@ Szabályrendszerek az IPF-ben - Az ipf esetében a szabályrendszer olyan + Az IPF esetében a szabályrendszer olyan szabályokból áll, amelyek a csomagokról tartalmuk alapján eldöntik, hogy át kell engedni vagy vissza kell tartani. A gépek közt két irányban áramló csomagok egy munkamenet alapú társalgást - képeznek. A tûzfal szabályrendszere minden - csomagot kétszer dolgoz fel: egyszer, amikor befut az - internetrõl, illetve még egyszer, amikor - visszatér az internetre. Mindegyik TCP/IP - szolgáltatást (például telnet, www, - levelezés stb.) elõre meghatározza a - hozzátartozó protokoll, cél és - forrás IP-cím vagy port. Ez az alapja a - szolgáltatások - engedélyezésérõl vagy - tiltásáról szóló - szabályok megfogalmazásának. + képeznek. A tûzfalhoz tartozó + szabályrendszer egyaránt feldolgozza a + internetrõl a hálózatunk felé + igyekvõ csomagokat, illetve a hálózatunk + ezekre adott válaszait. Az egyes + TCP/IP szolgáltatásokat (mint + például telnet, www, levelezés stb.) a + hozzájuk tartozó protokol és + szabványos (fogadó) portszám írja + le. Ezekre a forrásról általában + valamilyen nem szabványos (magasabb + értékû) portról érkeznek + csomagok. Ekkor a kommunikáció összes + paramétere (vagyis a portok és címek) + bármelyike alapján definiálhatunk + blokkolást vagy továbbengedést + leíró szabályokat. IPFILTER @@ -1462,20 +1471,6 @@ létrehozásának egyik alapeszköze. - Az inkluzív tûzfalak csak olyan - szolgáltatásokat engednek át, amelyek - megfelelnek valamelyik szabálynak. Ezzel - lényegében meg tudjuk adni, hogy milyen - szolgáltatások érhetõek el a - tûzfal mögül az internet felé, valamint az - internetrõl a magánhálózatunkon. A - tûzfal minden mást elutasít és - alapértelmezés szerint naplóz. Az - inkluzív tûzfalak sokkal, de sokkal - biztonságosabbak az exkluzív - tûzfalaknál, ezért itt most csak ezzel az - egyetlen típussal foglalkozunk. - A tûzfal szabályainak összeállítása során @@ -1540,7 +1535,7 @@ BE-KI = in | out OPCIÓK = log | quick | on - felületnév + interfész SZÛRÉS = proto érték | @@ -1595,20 +1590,19 @@ esetében kötelezõ egyértelmûen nyilatkozunk arról, hogy a bemenõ vagy a kimenõ forgalomra vonatkozik. Ezért a - következõ kulcsszó vagy az in - vagy pedig az out, de közülük - egyszerre csak az egyiket szabad használni, - máskülönben a szabály hibásnak - minõsül. + következõ kulcsszó vagy az + in vagy pedig az out, de + közülük egyszerre csak az egyiket szabad + használni, máskülönben a + szabály hibásnak minõsül. Az in jelenti, hogy a szabályt - az internet felõl az adott felületen + az internet felõl az adott interfészen beérkezõ csomagokra kell alkalmazni. Az out jelenti, hogy a szabályt - az internet felé az adott felületen + az internet felé az adott interfészen kiküldött csomagokra kell alkalmazni. - @@ -1640,10 +1634,10 @@ Az on használatával a szûrés feltételei közé bevonhatjuk a csomaghoz tartozó hálózati - felületet. Itt a felületek az &man.ifconfig.8; - által megjelenített formában - adhatóak meg. Az opció - megadásával csak az adott felületen az + interfészt. Itt az interfészek az + &man.ifconfig.8; által megjelenített + formában adhatóak meg. Az opció + megadásával csak az adott interfészen az adott irányba (befelé/kifelé) közlekedõ csomagokra fog illeszkedni a szabály. Ez az opció a @@ -1652,12 +1646,12 @@ nélkülözhetetlen. Amikor naplózunk egy csomagot, akkor a - hozzátartozó fejléc az IPL - csomagnaplózó pszeudo eszközhöz - kerül. A log kulcsszó után - közvetlenül a következõ - minõsítõk szerepelhetnek (a - következõ sorrendben): + hozzátartozó fejléc az + IPL csomagnaplózó pszeudo + eszközhöz kerül. A log + kulcsszó után közvetlenül a + következõ minõsítõk szerepelhetnek + (a következõ sorrendben): A body jelzi, hogy a csomag tartalmának elsõ 128 byte-ját még @@ -1665,13 +1659,12 @@ A first minõsítõt akkor érdemes használnunk, amikor a - log kulcsszót a keep - state opcióval együtt alkalmazzuk, mivel + log kulcsszót a keep + state opcióval együtt alkalmazzuk, mivel ilyenkor csak a szabályt kialakító csomag kerül naplózásra és nem minden olyan, ami illeszkedik az állapottartási feltételekre. - @@ -1732,15 +1725,17 @@ felépítése: a from és to kulcsszavak az IP-címek illesztésére használhatóak. - Ilyenkor a szabályokban a forrás ÉS a - cél paramétereknek is szerepelniük kell. - Az any egy olyan speciális + Ilyenkor a szabályokban a forrás + és a cél + paramétereknek is szerepelniük kell. Az + any egy olyan speciális kulcsszó, amely tetszõleges IP-címre illeszkedik. Néhány példa az - alkalmazására: from any to any - vagy from 0.0.0.0/0 to any, from any to - 0.0.0.0/0, from 0.0.0.0/0 to any vagy - from any to 0.0.0.0. + alkalmazására: from any to + any vagy from 0.0.0.0/0 to any, + from any to 0.0.0.0/0, from + 0.0.0.0/0 to any vagy from any to + 0.0.0.0. Az IP-címek megadhatóak pontozott numerikus formában a hálózati maszk bitekben @@ -1749,12 +1744,16 @@ Nincs lehetõség olyan IP-címtartományok illesztésére, - amelyek nem adhatóak meg kényelmesen a maszk - hosszával. A hálózati maszkok - hosszának megállapításban - segíthet a következõ (angol nyelvû) - honlap: . - + amelyek nem adhatóak meg kényelmesen ponttal + elválasztott számok és maszk + hosszával. A net-mgmt/ipcalc port az ilyen + számításokat könnyíti meg. A + hálózati maszkok hosszának + megállapításban segíthet az + említett segédprogram (angol nyelvû) + honlapja: . @@ -1769,18 +1768,19 @@ portok számát vagy az /etc/services állományban szereplõ nevüket. Amikor a port egy - from típusú objektum + from típusú objektum leírásában jelenik meg, akkor automatikusan a forrásportot jelenti, míg a - to objektum leírásában + to objektum leírásában pedig a célportot. A to objektumoknál a port megadása elengedhetetlen a korszerûsített szabályfeldolgozás elõnyeinek kihasználásához. - Példa: from any to any port = 80. + Példa: from any to any port = + 80. - A portokat különbözõ mûveletek - segítségével, numerikusan + Az egyes portokat különbözõ + mûveletek segítségével, numerikusan hasonlíthatjuk össze, ahol akár porttartományt is megadhatunk. @@ -1799,7 +1799,6 @@ korszerûsített szabályfeldolgozás mûködéséhez. - @@ -1884,7 +1883,7 @@ Ami ilyenkor történik: - Az internethez csatlakozó felületen + Az internethez csatlakozó interfészen keresztül kifelé haladó csomagokat elõször egy dinamikus állapottábla alapján illesztjük, és ha a csomag @@ -1892,20 +1891,22 @@ következõként várt csomagra, akkor átmegy a tûzfalon és a dinamikus állapottáblában frissül a kapcsolat - állapota, a fennmaradó csomagok pedig a - kimenõ szabályrendszer szerint kerülnek + állapota. Az aktív munkameneten kívül + csomagok pedig egyszerûen a kimenõ + szabályrendszer szerint kerülnek ellenõrzésre. Hasonlóan az elõzõhöz, az internethez - csatlakozó felületen keresztül befelé - haladó csomagokat elõször egy dinamikus - állapottábla alapján illesztjük, - és ha a csomag illeszkedik az aktív kapcsolatban - következõként várt csomagra, akkor - átmegy a tûzfalon és a dinamikus - állapottáblában frissül a kapcsolat - állapota, a fennmaradó csomagok pedig a - bejövõ szabályrendszer szerint kerülnek + csatlakozó interfészen keresztül + befelé haladó csomagokat elõször egy + dinamikus állapottábla alapján + illesztjük, és ha a csomag illeszkedik az + aktív kapcsolatban következõként + várt csomagra, akkor átmegy a tûzfalon + és a dinamikus állapottáblában + frissül a kapcsolat állapota. Az aktív + munkamenethez nem tartozó csomagok pedig egyszerûen + a bejövõ szabályrendszer szerint kerülnek ellenõrzésre. Amikor egy kapcsolat befejezõdik, automatikusan @@ -1929,7 +1930,6 @@ nyújtani a behatolók részérõl alkalmazott megannyi különbözõ támadási módszer ellen. - @@ -1942,67 +1942,82 @@ inkluzív tûzfalak csak a szabályainak megfelelõ szolgáltatásokat engedik keresztül, és alapértelmezés szerint - minden mást blokkolnak. Minden tûzfal - legalább két felülettel dolgozik, melyek - mindegyikéhez írnunk kell szabályokat a - tûzfal megfelelõ - mûködéséhez. + minden mást blokkolnak. Egy hálózat + gépeit védõ tûzfalnak, amelyet gyakran + hálózati tûzfalnak (network + firewall) is neveznek, legalább két + hálózati interfésszel kell rendelkeznie. + Ezeket az interfészeket általában + úgy állítják be, hogy + tökéletesen megbíznak az egyik oldalban (a + helyi hálózatban), a másikban (az + internetben) pedig egyáltalán nem. A + tûzfalat egyébként úgy is + beállíthatjuk, hogy csak a tûzfalat + mûködtetõ gépet védje — ezt + egyrendszeres tûzfalnak (host based + firewall) nevezik. Az ilyen típusú + megoldásokat nem biztonságos + hálózaton keresztül kommunikáló + szervereknél alkalmaznak. Mindegyik &unix;-típusú rendszert, köztük a &os;-t is úgy alakították ki, hogy az operációs rendszeren belüli kommunikáció az - lo0 felületen és a 127.0.0.1 IP-címen keresztül - történik. A tûzfal szabályai - között feltétlenül szerepelniük kell - olyanoknak, amelyek lehetõvé teszik ezen a - speciális felületen a csomagok zavartalan - mozgását. + lo0 interfészen és a + 127.0.0.1 IP-címen + keresztül történik. A tûzfal + szabályai között feltétlenül + szerepelniük kell olyanoknak, amelyek lehetõvé + teszik ezen a speciális intefészen a csomagok + zavartalan mozgását. - Az internetre csatlakozó felülethez kell - rendelni a kifelé haladó forgalom - hitelesítését és az internetrõl - befelé irányuló - hozzáférés vezérlését. - Ez lehet a felhasználói PPP által - létrehozott tun0 felület - vagy a DSL-, illetve kábelmodemhez csatlakozó + Az internetre csatlakozó interfészhez kell + rendelni a kifelé és befelé haladó + forgalom hitelesítését é a + hozzáférésének + vezérlését. Ez lehet a + felhasználói PPP által létrehozott + tun0 interfész vagy a DSL-, + illetve kábelmodemhez csatlakozó hálózati kártya. Ahol egy vagy több hálózati kártya - is csatlakozik a tûzfal mögött elhelyezkedõ - helyi magánhálózathoz, ott ezeket a - felületeket úgy kell felvenni a tûzfal - szabályai közé, hogy a helyi - hálózaton zajló forgalmat ne - akadályozzuk. + is csatlakozik több különbözõ helyi + hálózathoz, úgy kell + beállítani a hozzájuk tartozó + interfészeket, hogy egymás felé és + az internet felé képesek legyenek küldeni + és fogadni. A szabályokat elõször három nagy - csoportba kell szerveznünk: az összes szabadon - forgalmazó felület, az internet felé - haladó kimenõ forgalom és az internet - felõl befelé haladó forgalom. + csoportba kell szerveznünk: elõször jönnek a + megbízható interfészek, ezeket követik + az internet felé mutató interfészek, + végül internet felõl jövõ, nem + megbízható interfészeke. Az egyes csoportokban szereplõ szabályokat úgy kell megadni, hogy közülük elõre kerüljenek a leggyakrabban alkalmazottak, és a csoport utolsó szabálya blokkoljon és - naplózzon minden csomagot az adott felületen + naplózzon minden csomagot az adott interfészen és irányban. A kimenõ forgalomat vezérlõ - szabályrendszer csak pass (tehát - átengedõ) szabályokat tartalmazhat, amelyek - bentrõl az interneten elérhetõ - szolgáltatásokat azonosítják - egyértelmûen. Az összes ilyen - szabályban meg kell jelenni a quick, - on, proto, port - és keep state - beállításoknak. A proto tcp - szabályok esetében meg kell adni a - flag opciót is, amivel fel tudjuk + szabályrendszer csak pass + (tehát átengedõ) szabályokat + tartalmazhat, amelyek bentrõl az interneten + elérhetõ szolgáltatásokat + azonosítják egyértelmûen. Az + összes ilyen szabályban meg kell jelenni a + quick, on, + proto, port és + keep state + beállításoknak. A proto + tcp szabályok esetében meg kell adni a + flag opciót is, amivel fel tudjuk ismertetni a kapcsolatok keletkezését és ezen keresztül aktiválni az állapottartást. @@ -2010,53 +2025,57 @@ A bejövõ forgalmat vezérlõ szabályrendszerben elõször az eldobni kívánt csomagokat kell megadni, aminek két - eltérõ oka van. Elõször is a blokkolt - elemek lehetnek egy egyébként szabályos - csomag részei, amit a késõbbiekben a - hitelesített szolgáltatások alapján - beengedünk. Másodszor ezzel az olyan - rendszertelenül érkezõ csomagokat tudjuk - blokkolni, amelyeket nem akarunk a naplóban látni, - mivel ilyenkor a csoport utolsójaként megadott - blokkoló és naplózó - szabályhoz már nem jut el. A csoport - utolsó tagjaként megadott szabály blokkolja - és naplózza az illétektelen - hozzáféréseket, amit akár jogi - bizonyítékként is felhasználhatunk a - rendszerünket megtámadók ellen. + eltérõ oka van. Elõször is + elõfordulhat, hogy a veszélyes csomagok + részleges illeszkedés miatt szabályosnak + tûnnek. Az ilyen csomagokat értelemszerûen nem + lenne szabad beengedni a szabályok részleges + megfelelése alapján. A másodszor az eleve + ismerten problémás és értelmetlen + csomagokat csendben el kellene vetni, mielõtt a szakaszhoz + tartozó utolsó szabály fogná meg + és naplózná. Ez az utolsó + szabály egyébként szükség + esetén felhasználható a + támadók elleni bizonyítékok + begyûjtésére. A másik, amire még oda kell figyelnünk, hogy a blokkolt csomagok esetében semmilyen válasz - nem keletkezik, egyszerûen csak eltûnnek. Így - a támadó nem fogja tudni, hogy a csomagjai vajon - elérték-e a rendszerünket. Minél - kevesebb információt tudnak + nem keletkezzen, egyszerûen csak tûnjenek el. + Így a támadó nem fogja tudni, hogy a + csomagjai vajon elérték-e a rendszerünket. + Minél kevesebb információt tudnak összegyûjteni a rendszerünkrõl a támadók, annál több idõt kell szánniuk csínytevéseik - kieszelésére. Javasolt a beérkezõ - OS fingerprint jellegû - kéréseket az elsõ alkalmommal - naplózni, mert ez az elsõ jele annak, amikor valaki - meg akar támadni minket. + kieszelésére. A log first + opciót tartalmazó szabályok csak az + illeszkedésnél fogják naplózni a + hozzájuk tartozó eseményt. Erre + láthatunk példát az nmap OS + fingerprint szabálynál. Az security/nmap segédprogramot + a támadók gyakran alkalmazzák a + megtámadni kívánt szerver + operációs rendszerének + felderítésére. - Amikor a log first szabály - alapján keletkezõ üzeneteket akarjuk - látni, hívjuk meg a ipfstat - -hio parancsot, ahol megjelenik, hogy melyik - szabályra mennyi csomag illeszkedett. Ennek - alapján el tudjuk dönteni, hogy éppen - elárasztanak-e bennünket, tehát meg akarnak-e - támadni. + Minden log first opcióval megadott + szabály illeszkedésénél a + ipfstat -hio parancs + meghatározódik az eddigi illeszkedések + aktuális száma. Nagyobb értékek + esetében következtethetünk arra, hogy a + rendszerünket megtámadták (vagyis csomagokkal + árasztják éppen el). - Ha ismeretlen porthoz tartozó csomagokat - naplózunk, akkor az /etc/services - állományban vagy a - (angol nyelvû) honlap segítségével - tudjuk kideríteni, hogy pontosan melyik portról - van szó. + Az ismeretlen portszámok + felderítésére az + /etc/services állomány, + esetleg a + (angol nyelvû) honlap használható. Érdemes továbbá megnézni a trójai programok által használt portokat a @@ -2066,26 +2085,26 @@ A következõ szabályrendszer egy olyan biztonságos inkluzív - típusú tûzfal, amelyet maga a szerzõ is - használ. Ha ezt átvesszük egy az egyben, - akkor abból semmilyen bajunk nem származhat. - Egyszerûen csak vegyük ki azokat a szabályokat, - amelyek olyan szolgáltatásokra vonatkoznak, amiket - nem akarunk hitelesíteni. + típusú tûzfal, amelyet éles rendszeren + is használnak. Ezt a rendszerünkön nem + használt szolgáltatásokra vonatkozó + pass szabályok + törlésével könnyedén a + saját igényeink szerint + alakíthatjuk. - Ha nem akarunk látni bizonyos üzeneteket a - naplóban, akkor vegyünk fel hozzájuk egy - block típusú szabályt a - befelé irányuló forgalomhoz tartozó + Ha nem akarunk látni bizonyos üzeneteket, akkor + vegyünk fel hozzájuk egy block + típusú szabályt a befelé + irányuló forgalomhoz tartozó szabályok közé. - Ne felejtsük el minden szabályban - átírni a dc0 felület - nevét annak a hálózati - kártyának a felületére, amelyen - keresztül csatlakozunk az internethez. A - felhasználói PPP esetében ez a - tun0 lesz. + A szabályokban írjuk át a + dc0 interfész nevét annak + a hálózati kártyának az + interfészére, amelyen keresztül csatlakozunk + az internethez. A felhasználói PPP + esetében ez a tun0 lesz. Tehát a következõket kell beírni az /etc/ipf.rules @@ -2100,13 +2119,13 @@ #pass in quick on xl0 all ################################################################# -# A belsõ felületen szintén ne korlátozzunk semmit. +# A belsõ interfészen szintén ne korlátozzunk semmit. ################################################################# pass in quick on lo0 all pass out quick on lo0 all ################################################################# -# Az internet felé forgalmazó felület (kimenõ kapcsolatok) +# Az internet felé forgalmazó interfész (kimenõ kapcsolatok) # A saját hálózatunkról belülrõl vagy errõl az átjáróról # kezdeményezett kapcsolatokat vizsgáljuk az internet felé. ################################################################# @@ -2155,14 +2174,14 @@ # mindenképpen szükségünk lesz. pass out quick on dc0 proto tcp from any to any port = 21 flags S keep state -# Kifelé engedélyezzük a biztonságos FTP, telnet és SCP szolgáltatások -# elérését az SSH (secure shell) használatával. +# Kifelé engedélyezzük az ssh/sftp/scp # (biztonságos telnet/rlogin/FTP) +# szolgáltatások # elérését az SSH (secure shell) használatával. pass out quick on dc0 proto tcp from any to any port = 22 flags S keep state # Kifelé engedélyezzük a nem biztonságos telnet elérését. pass out quick on dc0 proto tcp from any to any port = 23 flags S keep state -# Kifelé engedélyezzük FreeBSD CVSUP funkcióját. +# Kifelé engedélyezzük FreeBSD CVSUp funkcióját. pass out quick on dc0 proto tcp from any to any port = 5999 flags S keep state # Kifelé engedélyezzük a pinget. @@ -2172,12 +2191,11 @@ pass out quick on dc0 proto tcp from any to any port = 43 flags S keep state # Minden mást eldobunk és naplózzuk az elsõ elõfordulásukat. -# Ezzel a szabállyal állítjuk be, hogy alapértelmezés szerint minden -# blokkolva legyen. +# Ez a szabály blokkol alapértelmezés szerint mindent. block out log first quick on dc0 all ################################################################# -# Az internet felõli felület (bejövõ kapcsolatok) +# Az internet felõli interfész (bejövõ kapcsolatok) # A saját hálózatunk felé vagy erre az átjáróra # nyitott kapcsolatokat vizsgáljuk az internet felõl. ################################################################# @@ -2248,19 +2266,17 @@ # Töröljük ezt a szabályt, ha nem használunk telnet szervert. #pass in quick on dc0 proto tcp from any to any port = 23 flags S keep state -# Befelé engedélyezzük az internetrõl érkezõ biztonságos FTP, telnet és SCP -# kapcsolatokat az SSH (secure shell) használatával. +# Befelé engedélyezzük az internetrõl # érkezõ ssh/sftp/scp (biztonságos +# telnet/rlogin/FTP) # kapcsolatokat az SSH (secure shell) használatával. pass in quick on dc0 proto tcp from any to any port = 22 flags S keep state # Minden mást dobjuk el és naplózzuk az elsõ elõfordulásukat. # Az elsõ alkalom naplózásával elejét tudjuk venni a "Denial of # Service" típusú támadásoknak, amivel egyébként lehetséges lenne a # napló elárasztása. -# Ez a szabály gondoskodik arról, hogy a rendszer alapértelmezés -# szerint mindent eldobjon. +# Ez a szabály blokkol alapértelmezés szerint mindent. block in log first quick on dc0 all ################### Itt van a szabályok vége ############################## - @@ -2278,8 +2294,8 @@ NAT - A NAT jelentése Network - Address Translation, vagyis hálózati + A NAT jelentése Network + Address Translation, vagyis hálózati címfordítás. A &linux; esetében ezt IP masqueradingnak, vagyis IP maszkolásnak hívják. A hálózati @@ -2301,9 +2317,8 @@ utal, hogy a címünk minden alkalommal változik, amikor betárcsázunk a szolgáltatóhoz vagy amikor ki- és - bekapcsoljuk a modemünket. Ez az IP-cím lesz az, - ami alapján az interneten elérhetõek - leszünk. + bekapcsoljuk a modemünket. Ez a dinamikus IP-cím + fog azonosítani minket az interneten. Most tegyük fel, hogy öt gépünk van otthon, viszont csak egyetlen elõfizetéssel @@ -2329,22 +2344,6 @@ esetében mindez visszafelé történik meg. - A hálózati címfordítás - gyakran a szolgáltató engedélye vagy - éppen tudta nélkül történik, - és ha a szolgáltató rájön, - akkor a legtöbb esetben ez az elõfizetés - megszûntetésével jár. Az üzleti - felhasználók jóval többet fizetnek az >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 16 19:41:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DA0C1065670; Sat, 16 May 2009 19:41:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 047581065675 for ; Sat, 16 May 2009 19:41:25 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6CA08FC12 for ; Sat, 16 May 2009 19:41:24 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GJfObn065935 for ; Sat, 16 May 2009 19:41:24 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GJfOBR065933 for perforce@freebsd.org; Sat, 16 May 2009 19:41:24 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 16 May 2009 19:41:24 GMT Message-Id: <200905161941.n4GJfOBR065933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 162174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 19:41:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=162174 Change 162174 by rene@rene_self on 2009/05/16 19:40:34 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#10 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#28 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#19 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#17 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#10 (text+ko) ==== @@ -11,7 +11,7 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.36 2009/01/07 09:34:58 pav Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.37 2009/05/14 15:33:07 erwin Exp $ 2003 @@ -608,9 +608,9 @@ to identify it. You need to make sure that nothing else important is running in this tty, e.g. ps -t p1 or whatever. If there is not, you can just kill off the whole term easily with - pkill -t p1; otherwise issue a + pkill -t pts/1; otherwise issue a kill -HUP in there by, for example, -ps -t p1 -o pid= | xargs kill -HUP. Replace +ps -t pts/1 -o pid= | xargs kill -HUP. Replace p1 by whatever the tty is, of course. The ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -96,7 +96,7 @@ dynamic loadable kernel module for that functionality. Building a custom kernel is one of the most important rites of - passage nearly every BSD user must endure. This process, while + passage for advanced BSD users. This process, while time consuming, will provide many benefits to your &os; system. Unlike the GENERIC kernel, which must support a wide range of hardware, a custom kernel only contains support for @@ -112,9 +112,11 @@ Lower memory usage. A custom kernel often uses less memory - than the GENERIC kernel, which is important - because the kernel must always be present in real - memory. For this reason, a custom kernel is especially useful + than the GENERIC kernel by omitting unused + features and device drivers. This is important because the kernel + code remains resident in physical memory at all times, preventing + that memory from being used by applications. + For this reason, a custom kernel is especially useful on a system with a small amount of RAM. @@ -231,7 +233,7 @@ page: Alternatively, to load the driver as a module at boot time, place the -following line in &man.loader.conf.5;: +following line in &man.loader.conf.5: if_ath_load="YES" @@ -495,6 +497,34 @@ architecture independent options, see /usr/src/sys/conf/NOTES. + As of &os; 5.0, a new include directive is + available for use in configuration files. This allows another + configuration file to be logically included in the current one, making + it easy to maintain small changes relative to an existing file. For + example, if you require a GENERIC kernel with + only a small number of additional options or drivers, this allows you + to maintain only a delta with respect to GENERIC: + + include GENERIC +ident MYKERNEL + +options IPFIREWALL +options DUMMYNET +options IPFIREWALL_DEFAULT_TO_ACCEPT +options IPDIVERT + + + Many administrators will find that this model offers significant + benefits over the historic writing of configuration files from scratch: + the local configuration file will express only local differences from + a GENERIC kernel and as upgrades are performed, + new features added to GENERIC will be added to the + local kernel unless specifically prevented using + nooptions or nodevice. The + remainder of this chapter addresses the contents of a typical + configuration file and the role various options and devices + play. + To build a file which contains all available options, as normally done for testing purposes, run the following ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2431,6 +2431,15 @@ + RELENG_7_2 + + + The release branch for FreeBSD-7.2, used only for + security advisories and other critical fixes. + + + + RELENG_7_1 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#28 (text+ko) ==== @@ -1,7 +1,7 @@ + 702101 + May 15, 2009 + 7.2-STABLE after ichsmb(4) was changed to + use left-adjused slave addressing to match other + SMBus controller drivers. + + + 800000 October 11, 2007 8.0-CURRENT. Separating wide and single byte @@ -13048,8 +13056,16 @@ 8.0-CURRENT after adding support for input lines of arbitrarily length in patch(1). - - + + 800087 + May 11, 2009 + 8.0-CURRENT after some VFS KPI changes. The thread + argument has been removed from the FSD parts of the VFS. + VFS_* functions do not need the + context any more because it always refers to + curthread. In some special cases, + the old behavior is retained. +

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#19 (text+ko) ==== @@ -1,4 +1,4 @@ - + ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#17 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.485 2009/04/29 15:13:21 hrs Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.486 2009/05/16 10:47:00 brueffer Exp $ --> @@ -3311,6 +3311,7 @@ + @@ -3786,6 +3787,7 @@ + From owner-p4-projects@FreeBSD.ORG Sat May 16 19:50:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3D4C1065672; Sat, 16 May 2009 19:50:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60ED61065670 for ; Sat, 16 May 2009 19:50:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 509B38FC1C for ; Sat, 16 May 2009 19:50:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GJoYnb066716 for ; Sat, 16 May 2009 19:50:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GJoYQH066714 for perforce@freebsd.org; Sat, 16 May 2009 19:50:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 16 May 2009 19:50:34 GMT Message-Id: <200905161950.n4GJoYQH066714@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 162175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 19:50:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=162175 Change 162175 by hselasky@hselasky_laptop001 on 2009/05/16 19:50:30 USB input: - minor keycode swapping fix for Apple Keyboards Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#7 (text+ko) ==== @@ -459,8 +459,8 @@ static uint8_t ukbd_apple_fn(uint8_t keycode) { switch (keycode) { + case 0x28: return 0x49; /* RETURN -> INSERT */ case 0x2a: return 0x4c; /* BACKSPACE -> DEL */ - case 0x2c: return 0x49; /* SPACE -> INSERT */ case 0x50: return 0x4a; /* LEFT ARROW -> HOME */ case 0x4f: return 0x4d; /* RIGHT ARROW -> END */ case 0x52: return 0x4b; /* UP ARROW -> PGUP */ @@ -472,8 +472,8 @@ static uint8_t ukbd_apple_swap(uint8_t keycode) { switch (keycode) { - case 0x35: return 0x64; /* 5 -> d */ - case 0x64: return 0x35; /* d -> 5 */ + case 0x35: return 0x64; + case 0x64: return 0x35; default: return keycode; } } From owner-p4-projects@FreeBSD.ORG Sat May 16 20:26:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 053A8106567C; Sat, 16 May 2009 20:26:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B60DA1065674 for ; Sat, 16 May 2009 20:26:10 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A63458FC08 for ; Sat, 16 May 2009 20:26:10 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GKQAZo070499 for ; Sat, 16 May 2009 20:26:10 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GKQAC2070496 for perforce@freebsd.org; Sat, 16 May 2009 20:26:10 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 16 May 2009 20:26:10 GMT Message-Id: <200905162026.n4GKQAC2070496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 162177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 20:26:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=162177 Change 162177 by rene@rene_self on 2009/05/16 20:25:24 MFen handbook/mirrors 1.462 -> 1.463 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#24 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#24 (text+ko) ==== @@ -3,10 +3,10 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.24 2009/05/09 19:40:36 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.46 2006/08/24 22:42:29 remko Exp $ - Vertaald door: Siebrand Mazeland + Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.462 + %SRCID% 1.463 --> @@ -2546,6 +2546,16 @@ + RELENG_7_2 + + + De uitgavetak voor &os;-7.2, alleen gebruikt voor + beveiligingswaarschuwingen en andere kritische + aanpassingen. + + + + RELENG_7_1 From owner-p4-projects@FreeBSD.ORG Sat May 16 21:03:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01A1A1065676; Sat, 16 May 2009 21:03:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B22D81065672 for ; Sat, 16 May 2009 21:03:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 887058FC17 for ; Sat, 16 May 2009 21:03:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GL3q4j084519 for ; Sat, 16 May 2009 21:03:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GL3qPP084517 for perforce@freebsd.org; Sat, 16 May 2009 21:03:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 16 May 2009 21:03:52 GMT Message-Id: <200905162103.n4GL3qPP084517@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 162180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 21:03:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=162180 Change 162180 by hselasky@hselasky_laptop001 on 2009/05/16 21:03:28 USB CORE: - Don't clear last usage when a new HID item is found. Improves parsing of Apple keyboard HID descriptors. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#32 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#32 (text+ko) ==== @@ -296,9 +296,6 @@ } else { s->ncount = 1; } - /* set default usage */ - /* use the undefined HID PAGE */ - s->usage_last = 0; goto top; case 9: /* Output */ From owner-p4-projects@FreeBSD.ORG Sat May 16 21:21:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B405D106566C; Sat, 16 May 2009 21:21:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 739A8106564A for ; Sat, 16 May 2009 21:21:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59BA58FC18 for ; Sat, 16 May 2009 21:21:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GLLA0O086484 for ; Sat, 16 May 2009 21:21:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GLLADt086482 for perforce@freebsd.org; Sat, 16 May 2009 21:21:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 16 May 2009 21:21:10 GMT Message-Id: <200905162121.n4GLLADt086482@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 162182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 21:21:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=162182 Change 162182 by hselasky@hselasky_laptop001 on 2009/05/16 21:20:10 USB input: - Fix leds for keyboards which require an ID byte for the HID output structures. Reported by: Christoph Langguth Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#8 (text+ko) ==== @@ -166,7 +166,8 @@ uint8_t sc_leds; /* store for async led requests */ uint8_t sc_iface_index; uint8_t sc_iface_no; - uint8_t sc_hid_id; + uint8_t sc_kbd_id; + uint8_t sc_led_id; }; #define KEY_ERROR 0x01 @@ -498,10 +499,10 @@ goto tr_setup; } - if (sc->sc_hid_id != 0) { + if (sc->sc_kbd_id != 0) { /* check and remove HID ID byte */ usb2_copy_out(xfer->frbuffers, 0, &id, 1); - if (id != sc->sc_hid_id) { + if (id != sc->sc_kbd_id) { DPRINTF("wrong HID ID\n"); goto tr_setup; } @@ -589,7 +590,7 @@ ukbd_set_leds_callback(struct usb2_xfer *xfer) { struct usb2_device_request req; - uint8_t buf[1]; + uint8_t buf[2]; struct ukbd_softc *sc = xfer->priv_sc; switch (USB_GET_STATE(xfer)) { @@ -603,15 +604,24 @@ USETW2(req.wValue, UHID_OUTPUT_REPORT, 0); req.wIndex[0] = sc->sc_iface_no; req.wIndex[1] = 0; - USETW(req.wLength, 1); + req.wLength[1] = 0; - buf[0] = sc->sc_leds; + /* check if we need to prefix an ID byte */ + if (sc->sc_led_id != 0) { + req.wLength[0] = 2; + buf[0] = sc->sc_led_id; + buf[1] = sc->sc_leds; + } else { + req.wLength[0] = 1; + buf[0] = sc->sc_leds; + buf[1] = 0; + } usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); usb2_copy_in(xfer->frbuffers + 1, 0, buf, sizeof(buf)); xfer->frlengths[0] = sizeof(req); - xfer->frlengths[1] = sizeof(buf); + xfer->frlengths[1] = req.wLength[0]; xfer->nframes = 2; usb2_start_hardware(xfer); } @@ -638,7 +648,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(struct usb2_device_request) + 1, + .bufsize = sizeof(struct usb2_device_request) + 8, .callback = &ukbd_set_leds_callback, .timeout = 1000, /* 1 second */ }, @@ -737,14 +747,14 @@ if (hid_locate(hid_ptr, hid_len, HID_USAGE2(HUP_CONSUMER, HUG_APPLE_EJECT), hid_input, 0, &sc->sc_loc_apple_eject, &flags, - &sc->sc_hid_id)) { + &sc->sc_kbd_id)) { if (flags & HIO_VARIABLE) sc->sc_flags |= UKBD_FLAG_APPLE_EJECT | UKBD_FLAG_APPLE_SWAP; if (hid_locate(hid_ptr, hid_len, HID_USAGE2(0xFFFF, 0x0003), hid_input, 0, &sc->sc_loc_apple_fn, &flags, - &sc->sc_hid_id)) { + &sc->sc_kbd_id)) { if (flags & HIO_VARIABLE) sc->sc_flags |= UKBD_FLAG_APPLE_FN | UKBD_FLAG_APPLE_SWAP; @@ -755,8 +765,12 @@ * keyboard data */ hid_report_size(hid_ptr, hid_len, - hid_input, &sc->sc_hid_id); + hid_input, &sc->sc_kbd_id); } + + /* investigate if we need an ID-byte for the leds */ + hid_report_size(hid_ptr, hid_len, hid_output, &sc->sc_led_id); + free(hid_ptr, M_TEMP); } From owner-p4-projects@FreeBSD.ORG Sat May 16 22:23:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAE5F1065672; Sat, 16 May 2009 22:23:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63DA7106566C for ; Sat, 16 May 2009 22:23:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A0CA8FC1F for ; Sat, 16 May 2009 22:23:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GMNEdt092876 for ; Sat, 16 May 2009 22:23:14 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GMNDC8092872 for perforce@freebsd.org; Sat, 16 May 2009 22:23:13 GMT (envelope-from zec@fer.hr) Date: Sat, 16 May 2009 22:23:13 GMT Message-Id: <200905162223.n4GMNDC8092872@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 22:23:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=162186 Change 162186 by zec@zec_tpx32 on 2009/05/16 22:22:51 Fix copy / paste typo: we have clonet_iattach() in if_clone.c, not loif_iattach(). Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_clone.c#10 (text+ko) ==== @@ -139,7 +139,7 @@ #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_clone_modinfo); #else - vnet_loif_iattach(NULL); + vnet_clone_iattach(NULL); #endif } From owner-p4-projects@FreeBSD.ORG Sat May 16 22:45:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 967221065689; Sat, 16 May 2009 22:45:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E5481065672 for ; Sat, 16 May 2009 22:45:37 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E2938FC0A for ; Sat, 16 May 2009 22:45:37 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GMjba8095173 for ; Sat, 16 May 2009 22:45:37 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GMjblc095171 for perforce@freebsd.org; Sat, 16 May 2009 22:45:37 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 16 May 2009 22:45:37 GMT Message-Id: <200905162245.n4GMjblc095171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 162189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 22:45:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=162189 Change 162189 by lulf@lulf_carrot on 2009/05/16 22:45:22 - First take on sigreturn. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#9 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#9 (text+ko) ==== @@ -215,7 +215,35 @@ int sigreturn(struct thread *td, struct sigreturn_args *uap) { - avr32_impl(); - return (0); + struct trapframe *tf; + struct reg *regs; + const ucontext_t *ucp; + struct proc *p; + ucontext_t uc; + int error; + + ucp = &uc; + p = td->td_proc; + + error = copyin(uap->sigcntxp, &uc, sizeof(uc)); + if (error != 0) + return (error); + tf = td->td_frame; + regs = &tf->regs; + + /* Check magic */ + if (ucp->uc_mcontext.mc_len != sizeof(ucp->uc_mcontext)) { + CTR2(KTR_SIG, "sigreturn: pid=%d, ucp %p\n", p->p_pid, ucp); + return (EINVAL); + } + bcopy(&ucp->uc_mcontext.mc_regs, regs, + sizeof(ucp->uc_mcontext.mc_regs)); + + PROC_LOCK(p); + td->td_sigmask = ucp->uc_sigmask; + SIG_CANTMASK(td->td_sigmask); + signotify(td); + PROC_UNLOCK(p); + return (EJUSTRETURN); }

	A publication from Tatsumi Hosokawa and @@ -53,7 +53,7 @@
	(Japanese FreeBSD book with 2.0.5, titled "FreeBSD: Fun and easy @@ -61,7 +61,7 @@
	(Japanese FreeBSD book with 2.0.5, titled "FreeBSD Introductory @@ -69,7 +69,7 @@
	This is BSDi's "The Complete FreeBSD" with installation @@ -77,16 +77,16 @@
	This book was recently published (early 1997) in Taiwan. Its title +	This book was published (early 1997) in Taiwan. Its title is "FreeBSD: introduction and applications" and the author is - Jian-Da Li.
	This is the "Getting Started with FreeBSD" from Fuki-Shuppan. @@ -97,7 +97,7 @@
	The "Personal Unix Starter Kit - FreeBSD" from ASCII. Includes @@ -107,7 +107,7 @@
	BSD mit Methode, M. Schulze, B. Roehrig, M. Hoelzer und andere, @@ -117,7 +117,7 @@
	This is the "FreeBSD Install and utilization manual" from Mainichi @@ -128,7 +128,7 @@
	The "FreeBSD User's Reference Manual" from Mainichi @@ -139,7 +139,7 @@
	The "FreeBSD System Administrator's Manual" from Mainichi @@ -150,7 +150,7 @@
	This is "About FreeBSD" from Youngjin.com. It is first FreeBSD @@ -160,7 +160,7 @@
	@@ -174,7 +174,7 @@
		The FreeBSD Handbook 1st Edition is a comprehensive FreeBSD Tutorial and reference. It covers installation, day-to-day use @@ -185,7 +185,7 @@
		The Complete FreeBSD with CDs, 3rd Ed, FreeBSD 4.2. Everything you ever wanted to know about how to get @@ -197,7 +197,7 @@
		The FreeBSD Handbook 2nd Edition is a comprehensive FreeBSD Tutorial and reference. It covers installation, day-to-day use @@ -208,7 +208,7 @@
		"The FreeBSD Corporate Networker's Guide" Mittelstaedt, Ted. Addison Wesley, 2000. @@ -225,7 +225,7 @@
		"FreeBSD, An Open-Source Operating System for Your Personal Computer", Annelise Anderson. An introduction to FreeBSD for users new to both FreeBSD and UNIX. @@ -238,7 +238,7 @@
		Absolute BSD. This book discusses management of FreeBSD-based servers in high-performance enterprise environments. @@ -248,7 +248,7 @@
		Fultus presents FreeBSD Open Documentation Library. This @@ -272,7 +272,21 @@
	+	"Building an Internet Server with FreeBSD 6" is a step-by-step + guide for helping new and experienced users to FreeBSD + install and configure the latest Internet server applications + in a minimum of time. The guide includes descriptions of + many of the Internet's most popular and widely deployed + open source projects, detailed instructions on implementing + each, and maintenance tasks important to an Internet + server. May 2006, Lulu Press, ISBN 1411695747, 228 pages.
	Written by the professionals of EnderUNIX and Huseyin Yuce this book is the first Turkish FreeBSD book. The book is @@ -297,7 +311,7 @@
	Les cahiers de l'Admin: BSD (the BSD sysadmin notebook), @@ -307,6 +321,87 @@ href="http://www.eyrolles.com/">Eyrolles, 2004. ISBN 2-212-11463-X
+	The OpenBSD PF Packet Filter Book covers the PF packet filter + suite, ALTQ, spamd, address translation, and more for FreeBSD, + NetBSD, OpenBSD, and DragonFly. August 2006, Reed Media Services. + ISBN 978-0-9790342-0-6. +
+	FreeBSD 6 Unleashed covers everything you need to know to use + FreeBSD to its fullest potential. + Jun 7, 2006, + Sams. ISBN 0-672-32875-5 +
+	(Traditional Chinese FreeBSD book with 6.0) + December 2005, Drmaster. ISBN 9-575-27878-X +
+	This Romanian language book is a useful guide for people + taking their first steps with FreeBSD. It covers installation + and day-to-day operation of a FreeBSD system, and contains + practical examples illustrating the use of FreeBSD's utilities. + It has two case studies on configuring FreeBSD as a server + and a router. 2005, Polirom Publishing House, ISBN + 973-681-683-4
	The “RadioBSD Crier: 2007/01” is a 24-page article + on managing FreeBSD and NetBSD IPFW, IPFW2, and IP6FW firewalls.
+ +	The Best of FreeBSD Basics by Dru Lavigne provides near 100 + tutorials covering a wide range of FreeBSD and open source Unix + topics. December 2007. + Reed Media Services. + ISBN 978-0-9790342-2-0. +

Introduction

Introductie

FreeBSD Core Team +

&os; Core Team <core@FreeBSD.org>

FreeBSD Documentation Engineering Team +

&os; Documentatie Beheerteam <doceng@FreeBSD.org>

FreeBSD Port Management Team +

&os; Port Beheerteam <portmgr@FreeBSD.org>

Primary Release Engineering Team +

Primaire Uitgave Beheerteam <re@FreeBSD.org>

FreeBSD/alpha Release Engineering Team +

&os;/alpha Uitgave Beheerteam <re-alpha@FreeBSD.org>

FreeBSD/amd64 Release Engineering Team +

&os;/amd64 Uitgave Beheerteam <re-amd64@FreeBSD.org>

FreeBSD/ia64 Release Engineering Team +

&os;/ia64 Uitgave Beheerteam <re-ia64@FreeBSD.org>

FreeBSD/i386 Release Engineering Team +

&os;/i386 Uitgave Beheerteam <re-x86@FreeBSD.org>

FreeBSD/pc98 Release Engineering Team +

&os;/pc98 Uitgave Beheerteam <re-pc98@FreeBSD.org>

FreeBSD/ppc Release Engineering Team +

&os;/ppc Uitgave Beheerteam <re-ppc@FreeBSD.org>

FreeBSD/sparc64 Release Engineering Team +

&os;/sparc64 Uitgave Beheerteam <re-sparc64@FreeBSD.org>

Donations Team +

Donatiesteam <donations@FreeBSD.org>

Marketing Team +

Marketingteam <marketing@FreeBSD.org>

Security Team +

Beveiligingsteam <secteam@FreeBSD.org>

Vendor Relations Team +

Verkoperrelatieteam <vendor-relations@FreeBSD.org>

Core Team Secretary +

Core Team Secretaris <core-secretary@FreeBSD.org>

Port Management Team Secretary +

Port Beheerteam Secretaris <portmgr-secretary@FreeBSD.org>

Security Team Secretary +

Beveiligingsteam Secretaris <secteam-secretary@FreeBSD.org>

Accounts Team +

Accountsteam <accounts@>

Backups Administrators +

Backupbeheerders <backups@>

Bugmeisters & GNATS Administrators +

Bugmeisters & GNATS Beheerders <bugmeister@FreeBSD.org>

Cluster Administrators +

Clusterbeheerders <clusteradm@>

CVS doc/www Repository Managers +

CVS doc/www Reservoir Beheerders <dcvs@FreeBSD.org>

CVS ports Repository Managers +

CVS ports Reservoir Beheerders <pcvs@FreeBSD.org>

CVS src Repository Managers +

CVS src Resrevoir Beheerders <ncvs@FreeBSD.org>

CVSup Mirror Site Coordinators +

CVSup Mirror Site Coördinatoren <cvsup-master@FreeBSD.org>

DNS Administrators +

DNS Beheerders <dnsadm@>

FTP/WWW Mirror Site Coordinators +

FTP/WWW Mirror Site Coördinatoren <mirror-admin@FreeBSD.org>

Perforce Repository Administrators +

Perforce Reservoir Beheerders <perforce-admin@FreeBSD.org>

Postmaster Team +

Postmeesterteam <postmaster@FreeBSD.org>

Reference Systems Administrators +

Referentiesysteem Beheerders <refadm@>

Webmaster Team +

Webmasterteam <webmaster@FreeBSD.org>

Grafisch gebruik

Nieuwste Video's