From owner-p4-projects@FreeBSD.ORG  Thu Apr 14 13:50:15 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF57A1065678; Thu, 14 Apr 2011 13:50:15 +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 724EB1065675
	for <perforce@freebsd.org>; Thu, 14 Apr 2011 13:50:15 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B89E8FC16
	for <perforce@freebsd.org>; Thu, 14 Apr 2011 13:50:15 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3EDoF3q075080
	for <perforce@freebsd.org>; Thu, 14 Apr 2011 13:50:15 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3EDoFdT075077
	for perforce@freebsd.org; Thu, 14 Apr 2011 13:50:15 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 14 Apr 2011 13:50:15 GMT
Message-Id: <201104141350.p3EDoFdT075077@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 191480 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Apr 2011 13:50:16 -0000

http://p4web.freebsd.org/@@191480?ac=10

Change 191480 by jhb@jhb_fiver on 2011/04/14 13:49:26

	Handle the case where a CardBus card's CIS is stored in a BAR.

Affected files ...

.. //depot/projects/pci/sys/dev/cardbus/cardbus_cis.c#2 edit
.. //depot/projects/pci/sys/dev/pci/pci.c#14 edit

Differences ...

==== //depot/projects/pci/sys/dev/cardbus/cardbus_cis.c#2 (text+ko) ====

@@ -430,7 +430,10 @@
 {
 	if (res != CIS_CONFIG_SPACE) {
 		bus_release_resource(child, SYS_RES_MEMORY, rid, res);
+#if 0
+		/* XXX: Not anymore. */
 		bus_delete_resource(child, SYS_RES_MEMORY, rid);
+#endif
 	}
 }
 

==== //depot/projects/pci/sys/dev/pci/pci.c#14 (text+ko) ====

@@ -2576,6 +2576,17 @@
 	uint16_t cmd;
 	struct resource *res;
 
+	/*
+	 * The BAR may already exist if the device is a CardBus card
+	 * whose CIS is stored in this BAR.
+	 */
+	pm = pci_find_bar(dev, reg);
+	if (pm != NULL) {
+		maprange = pci_maprange(pm->value);
+		barlen = maprange == 64 ? 2 : 1;
+		return (barlen);
+	}
+
 	pci_read_bar(dev, reg, &map, &testval);
 	if (PCI_BAR_MEM(map)) {
 		type = SYS_RES_MEMORY;