From owner-p4-projects@FreeBSD.ORG  Wed May  4 17:23:05 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADC7C1065673; Wed,  4 May 2011 17:23:05 +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 70897106566B
	for <perforce@freebsd.org>; Wed,  4 May 2011 17:23:05 +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 5FE288FC08
	for <perforce@freebsd.org>; Wed,  4 May 2011 17:23:05 +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 p44HN5Ah066815
	for <perforce@freebsd.org>; Wed, 4 May 2011 17:23:05 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p44HN5mI066812
	for perforce@freebsd.org; Wed, 4 May 2011 17:23:05 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 4 May 2011 17:23:05 GMT
Message-Id: <201105041723.p44HN5mI066812@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 192602 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: Wed, 04 May 2011 17:23:05 -0000

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

Change 192602 by jhb@jhb_jhbbsd on 2011/05/04 17:22:09

	Fix an off-by-one, trim debugging.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_domain.c#6 edit

Differences ...

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

@@ -350,6 +350,9 @@
     u_long end)
 {
 
+	if (bootverbose)
+		device_printf(hr->hr_pcib, "decoding %d range %#lx-%#lx\n",
+		    type, start, end);
 	resource_list_add_next(&hr->hr_rl, type, start, end, end - start + 1);
 	return (0);
 }
@@ -373,26 +376,25 @@
 	}
 		   
 	/* Try to allocate from each decoded range. */
-	device_printf(hr->hr_pcib,
-	    "trying to allocate %#lx-%#lx for rid %x type %d\n", start, end,
-	    *rid, type);
 	for (; rle != NULL; rle = STAILQ_NEXT(rle, link)) {
 		if (rle->type != type)
 			continue;
 		new_start = ulmax(start, rle->start);
 		new_end = ulmin(end, rle->end);
 		if (new_start > new_end ||
-		    new_start + count > new_end ||
-		    new_start + count < new_start) {
-			printf("\tskipping range %#lx-%#lx\n", new_start,
-			    new_end);
+		    new_start + count - 1 > new_end ||
+		    new_start + count < new_start)
 			continue;
-		}
-		printf("\ttrying range %#lx-%#lx\n", new_start, new_end);
 		r = bus_generic_alloc_resource(hr->hr_pcib, dev, type, rid,
 		    new_start, new_end, count, flags);
-		if (r != NULL)
+		if (r != NULL) {
+			if (bootverbose)
+				device_printf(hr->hr_pcib,
+			    "allocated type %d (%#lx-%#lx) for rid %x of %s\n",
+				    type, rman_get_start(r), rman_get_end(r),
+				    *rid, pcib_child_name(dev));
 			return (r);
+		}
 	}
 
 	return (NULL);