From owner-freebsd-current@FreeBSD.ORG Sat Sep 10 12:13:26 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA6FD106564A; Sat, 10 Sep 2011 12:13:26 +0000 (UTC) (envelope-from deischen@freebsd.org) Received: from mail.netplex.net (mail.netplex.net [204.213.176.10]) by mx1.freebsd.org (Postfix) with ESMTP id 759368FC0A; Sat, 10 Sep 2011 12:13:26 +0000 (UTC) Received: from sea.ntplx.net (sea.ntplx.net [204.213.176.11]) by mail.netplex.net (8.14.4/8.14.4/NETPLEX) with ESMTP id p8ACDNk6024641; Sat, 10 Sep 2011 08:13:23 -0400 X-Virus-Scanned: by AMaViS and Clam AntiVirus (mail.netplex.net) X-Greylist: Message whitelisted by DRAC access database, not delayed by milter-greylist-4.2.6 (mail.netplex.net [204.213.176.10]); Sat, 10 Sep 2011 08:13:23 -0400 (EDT) Date: Sat, 10 Sep 2011 08:13:23 -0400 (EDT) From: Daniel Eischen X-X-Sender: eischen@sea.ntplx.net To: Warner Losh In-Reply-To: <054D42C8-E7CD-4F4A-88CB-40841CF972EE@bsdimp.com> Message-ID: References: <201109080942.03413.jhb@freebsd.org> <201109081359.56584.jhb@freebsd.org> <054D42C8-E7CD-4F4A-88CB-40841CF972EE@bsdimp.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: adrian@freebsd.org, freebsd-current@freebsd.org, Warner Losh Subject: Re: ath0 no longer attaches, cardbus problems? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Eischen List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2011 12:13:26 -0000 On Fri, 9 Sep 2011, Warner Losh wrote: > > On Sep 9, 2011, at 1:22 PM, Daniel Eischen wrote: > >> I found the commit that broke ath for me, r222753, >> specifically, the change to /dev/cardbus/cardbus_cis.c. >> >> To be sure, I updated to head using svn, and applied >> the patch included below. ath attaches and works. Without >> the patch, ath does not attach. >> >> On another note, I've no idea why updating from a local >> CVS repo lead me down a wrong path. It seems wrong that >> a 'cvs update -P -d -A -D "31 Mar 2011"' works and >> a 'cvs update -P -d -A -D "1 Apr 2011"' does not work. >> r222753 did not occur until much later (June 6). >> Once John asked me to try r220195, I switched to using >> svn. When that worked, it seemed strange to me because >> nothing else committed after that on Mar 31 should have >> broke ath. >> >> Anyway, culprit found. Now what is the correct fix? > > Do you need both chunks? The second one seems redundant given the definition of bus_alloc_reosurce_any does exactly that. I tried it separately with the 2 chunks, and only the first chunk is needed. To be pedantic, this was the change that made ath work again. Index: sys/dev/cardbus/cardbus_cis.c =================================================================== --- sys/dev/cardbus/cardbus_cis.c (revision 225463) +++ sys/dev/cardbus/cardbus_cis.c (working copy) @@ -441,6 +441,7 @@ { if (res != CIS_CONFIG_SPACE) { bus_release_resource(child, SYS_RES_MEMORY, rid, res); + bus_delete_resource(child, SYS_RES_MEMORY, rid); } } While debugging the problem a couple of weeks ago, I did seem to notice ath was trying to attach twice. I seem to recall it was at different addresses. Could this possibly cause the problem without the above patch? -- DE