From owner-freebsd-current@FreeBSD.ORG Sun May 23 22:47:45 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2118116A4CE for ; Sun, 23 May 2004 22:47:45 -0700 (PDT) Received: from cmsrelay03.mx.net (cmsrelay03.mx.net [165.212.11.112]) by mx1.FreeBSD.org (Postfix) with SMTP id B6A2543D31 for ; Sun, 23 May 2004 22:47:44 -0700 (PDT) (envelope-from noackjr@alumni.rice.edu) Received: from uadvg131.cms.usa.net (165.212.11.131) by cmsoutbound.mx.net with SMTP; 24 May 2004 05:46:54 -0000 Received: from optimator.noacks.org [70.240.201.34] by uadvg131.cms.usa.net (ASMTP/noackjr@usa.net) via mtad (C8.MAIN.3.13N) with ESMTP id 630ieXFUY0210M31; Mon, 24 May 2004 05:46:50 GMT X-USANET-Auth: 70.240.201.34 AUTH noackjr@usa.net optimator.noacks.org Received: from localhost (localhost [127.0.0.1]) by optimator.noacks.org (Postfix) with ESMTP id 8122B616D; Mon, 24 May 2004 00:46:49 -0500 (CDT) Received: from optimator.noacks.org ([127.0.0.1]) by localhost (optimator.noacks.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 85739-05-2; Mon, 24 May 2004 00:46:48 -0500 (CDT) Received: from compgeek.noacks.org (compgeek [192.168.1.10]) by optimator.noacks.org (Postfix) with ESMTP id 552756193; Mon, 24 May 2004 00:46:48 -0500 (CDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by compgeek.noacks.org (8.12.11/8.12.11) with ESMTP id i4O5klY2008902; Mon, 24 May 2004 00:46:47 -0500 (CDT) (envelope-from noackjr@alumni.rice.edu) Message-ID: <40B18C47.9080102@alumni.rice.edu> Date: Mon, 24 May 2004 00:46:47 -0500 From: Jon Noack User-Agent: Mozilla Thunderbird 0.6 (X11/20040518) X-Accept-Language: en-us, en MIME-Version: 1.0 To: LukeD@pobox.com References: <200405232109.aa46210@salmon.maths.tcd.ie> In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at noacks.org cc: Ian Dowse cc: current@freebsd.org Subject: Re: USB patch for better bus_dma and detachment support X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: noackjr@alumni.rice.edu List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2004 05:47:45 -0000 On 05/23/04 22:31, Luke wrote: > On Sun, 23 May 2004, Ian Dowse wrote: > >> In case anybody is interested in testing or helping with this, >> there's a patch at >> >> http://people.freebsd.org/~iedowse/usb.diff >> >> that attempts to begin addressing a number of problems with our >> current USB code: > > I'd love to try this out. I'm using a Netgear FA120 USB ethernet > adapter with the axe driver, and my kernel panics with a page fault > in usb_transfer_complete every time I attempt to bring the interface > down. This means I can't reboot without a panic. It looks like this > code might address my problem. > > I've never tested a patch in this manner before though. I assume > there's some utility like mergemaster to merge this into my existing > code. If somebody can tell me how to merge in these changes I'll try > them out this week and let you know how it goes. The utility 'patch' is what you need to use. Check out the patch(1) man page. Something like the following should work (I haven't tried this): cd /usr/src/sys/dev/usb patch -p0 < usb.diff After applying the diff just rebuild and test. NOTE: you will have to reapply the diff after every CVSup (and possibly other update schemes). Jon Noack