From owner-p4-projects@FreeBSD.ORG  Mon May  2 15:23:21 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DBC661065674; Mon,  2 May 2011 15:23:20 +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 914A8106564A
	for <perforce@freebsd.org>; Mon,  2 May 2011 15:23:20 +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 640218FC14
	for <perforce@freebsd.org>; Mon,  2 May 2011 15:23:20 +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 p42FNK7k056706
	for <perforce@freebsd.org>; Mon, 2 May 2011 15:23:20 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p42FNKUs056703
	for perforce@freebsd.org; Mon, 2 May 2011 15:23:20 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 2 May 2011 15:23:20 GMT
Message-Id: <201105021523.p42FNKUs056703@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 192463 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: Mon, 02 May 2011 15:23:21 -0000

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

Change 192463 by jhb@jhb_jhbbsd on 2011/05/02 15:22:47

	Tidy, always enable SUBTRACTIVE_GROW_WINDOWS.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#19 edit

Differences ...

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

@@ -110,14 +110,11 @@
 #ifdef NEW_PCIB
 /*
  * NEW_PCIB todo:
- * - test SUBTRACTIVE_GROW_WINDOWS and see if that should be the default
- *   behavior
  * - properly handle the ISA enable bit.  If it is set, we should change
  *   the behavior of the I/O window resource and rman to not allocate the
  *   blocked ranges (upper 768 bytes of each 1K in the first 64k of the
  *   I/O port address space).
  */
-#define SUBTRACTIVE_GROW_WINDOWS
 
 /*
  * Is a resource from a child device sub-allocated from one of our
@@ -1074,11 +1071,6 @@
 		    end, count, flags);
 		if (r != NULL)
 			break;
-#ifndef SUBTRACTIVE_GROW_WINDOWS
-		if (sc->flags & PCIB_SUBTRACTIVE)
-			return (bus_generic_alloc_resource(dev, child, type,
-			    rid, start, end, count, flags));
-#endif
 		if (pcib_grow_window(sc, &sc->io, type, start, end, count,
 		    flags) == 0)
 			r = pcib_suballoc_resource(sc, &sc->io, child, type,
@@ -1103,11 +1095,6 @@
 		    start, end, count, flags);
 		if (r != NULL)
 			break;
-#ifndef SUBTRACTIVE_GROW_WINDOWS
-		if (sc->flags & PCIB_SUBTRACTIVE)
-			return (bus_generic_alloc_resource(dev, child, type,
-			    rid, start, end, count, flags));
-#endif
 		if (flags & RF_PREFETCHABLE) {
 			if (pcib_grow_window(sc, &sc->pmem, type, start, end,
 			    count, flags) == 0) {
@@ -1127,7 +1114,6 @@
 		    start, end, count, flags));
 	}
 
-#ifdef SUBTRACTIVE_GROW_WINDOWS
 	/*
 	 * If attempts to suballocate from the window fail but this is a
 	 * subtractive bridge, pass the request up the tree.
@@ -1135,7 +1121,6 @@
 	if (sc->flags & PCIB_SUBTRACTIVE && r == NULL)
 		return (bus_generic_alloc_resource(dev, child, type, rid,
 		    start, end, count, flags));
-#endif
 	return (r);
 }