From owner-p4-projects@FreeBSD.ORG  Thu Jul 11 03:05:33 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 883AF1F7; Thu, 11 Jul 2013 03:05: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 493C21F3
 for <perforce@freebsd.org>; Thu, 11 Jul 2013 03:05:33 +0000 (UTC)
 (envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 39FF31CA9
 for <perforce@freebsd.org>; Thu, 11 Jul 2013 03:05: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 r6B35Xot029142
 for <perforce@freebsd.org>; Thu, 11 Jul 2013 03:05:33 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6B35XN4029139
 for perforce@freebsd.org; Thu, 11 Jul 2013 03:05:33 GMT
 (envelope-from jhb@freebsd.org)
Date: Thu, 11 Jul 2013 03:05:33 GMT
Message-Id: <201307110305.r6B35XN4029139@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 230994 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: Thu, 11 Jul 2013 03:05:33 -0000

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

Change 230994 by jhb@jhb_pippin on 2013/07/11 03:04:55

	Fix the PCI bus driver to permit immediate child bridges to
	allocate a single bus number resource.

Affected files ...

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

Differences ...

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

@@ -4292,6 +4292,20 @@
 	rl = &dinfo->resources;
 	cfg = &dinfo->cfg;
 	switch (type) {
+#if defined(NEW_PCIB) && defined(PCI_RES_BUS)
+	case PCI_RES_BUS:
+		/*
+		 * If rid 0 is not already allocated, create a new
+		 * resource list entry.
+		 */
+		if (*rid != 0)
+			return (NULL);
+		rle = resource_list_find(rl, type, *rid);
+		if (rle != NULL && rle->res != NULL)
+			return (NULL);
+		resource_list_add(rl, type, *rid, start, end, count);
+		break;
+#endif
 	case SYS_RES_IRQ:
 		/*
 		 * Can't alloc legacy interrupt once MSI messages have