From owner-freebsd-current@FreeBSD.ORG  Fri Sep  9 19:22:10 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 65838106564A;
	Fri,  9 Sep 2011 19:22:10 +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 16CCE8FC12;
	Fri,  9 Sep 2011 19:22:09 +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
	p89JM8nr019397; Fri, 9 Sep 2011 15:22:08 -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]);
	Fri, 09 Sep 2011 15:22:09 -0400 (EDT)
Date: Fri, 9 Sep 2011 15:22:08 -0400 (EDT)
From: Daniel Eischen <deischen@freebsd.org>
X-X-Sender: eischen@sea.ntplx.net
To: John Baldwin <jhb@freebsd.org>
In-Reply-To: <Pine.GSO.4.64.1109081638370.10964@sea.ntplx.net>
Message-ID: <Pine.GSO.4.64.1109091511450.16436@sea.ntplx.net>
References: <Pine.GSO.4.64.1108242007100.23746@sea.ntplx.net>
	<201109080942.03413.jhb@freebsd.org>
	<Pine.GSO.4.64.1109081243320.10252@sea.ntplx.net>
	<201109081359.56584.jhb@freebsd.org>
	<Pine.GSO.4.64.1109081638370.10964@sea.ntplx.net>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: adrian@freebsd.org, freebsd-current@freebsd.org,
	Warner Losh <imp@freebsd.org>
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 <deischen@freebsd.org>
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Sep 2011 19:22:10 -0000

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?


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);
  	}
  }

@@ -477,7 +478,11 @@
  	}

  	/* allocate the memory space to read CIS */
+#if 0
  	res = bus_alloc_resource_any(child, SYS_RES_MEMORY, rid,
+#else
+	res = bus_alloc_resource(child, SYS_RES_MEMORY, rid, 0, ~0, 1,
+#endif
  	    rman_make_alignment_flags(4096) | RF_ACTIVE);
  	if (res == NULL) {
  		device_printf(cbdev, "Unable to allocate resource "

-- 
DE