From owner-p4-projects@FreeBSD.ORG  Tue Jul 23 13:09:34 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id DD073B4F; Tue, 23 Jul 2013 13:09:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A0168B4D
 for <perforce@freebsd.org>; Tue, 23 Jul 2013 13:09:33 +0000 (UTC)
 (envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F9EC2D9A
 for <perforce@freebsd.org>; Tue, 23 Jul 2013 13:09:33 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6ND9XGh022783
 for <perforce@freebsd.org>; Tue, 23 Jul 2013 13:09:33 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6ND9XSJ022780
 for perforce@freebsd.org; Tue, 23 Jul 2013 13:09:33 GMT
 (envelope-from jhb@freebsd.org)
Date: Tue, 23 Jul 2013 13:09:33 GMT
Message-Id: <201307231309.r6ND9XSJ022780@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 231370 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Tue, 23 Jul 2013 13:09:34 -0000

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

Change 231370 by jhb@jhb_pippin on 2013/07/23 13:09:33

	- Get correct ivars.
	- Debug.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci.c#46 edit

Differences ...

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

@@ -3246,7 +3246,7 @@
 	 */
 	sec_bus = PCI_READ_CONFIG(bus, dev, sec_reg, 1);
 	sub_bus = PCI_READ_CONFIG(bus, dev, sub_reg, 1);
-	if (bootverbose)
+	if (bootverbose || 1)
 		printf("\tsecbus=%d, subbus=%d\n", sec_bus, sub_bus);
 	if (sec_bus > 0 && sub_bus >= sec_bus) {
 		start = sec_bus;
@@ -3258,13 +3258,15 @@
 		res = resource_list_reserve(rl, bus, dev, PCI_RES_BUS, &rid,
 		    start, end, count, 0);
 		if (res == NULL) {
-			if (bootverbose)
+			if (bootverbose || 1)
 				device_printf(bus,
 			    "pci%d:%d:%d:%d secbus failed to allocate\n",
 				    pci_get_domain(dev), pci_get_bus(dev),
 				    pci_get_slot(dev), pci_get_function(dev));
 			resource_list_delete(rl, PCI_RES_BUS, 0);
-		}
+		} else
+			/* XXX */
+			pci_printf(cfg, "allocated initial secbus range\n");
 	} else
 		res = NULL;
 	if (res == NULL) {
@@ -3283,7 +3285,7 @@
 	struct resource *res;
 	int sec_reg, sub_reg;
 
-	dinfo = device_get_ivars(dev);
+	dinfo = device_get_ivars(child);
 	cfg = &dinfo->cfg;
 	rl = &dinfo->resources;
 	switch (cfg->hdrtype & PCIM_HDRTYPE) {