svn commit: r224193 - stable/8/sys/dev/pci

[John Baldwin]

Author: jhb
Date: Mon Jul 18 18:29:39 2011
New Revision: 224193
URL: http://svn.freebsd.org/changeset/base/224193

Log:
  MFC 223952:
  Properly align the end of a candidate back region based on the window's
  granularity when growing a PCI-PCI window up.

Modified:
  stable/8/sys/dev/pci/pci_pci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/pci/pci_pci.c
==============================================================================
--- stable/8/sys/dev/pci/pci_pci.c	Mon Jul 18 18:25:25 2011	(r224192)
+++ stable/8/sys/dev/pci/pci_pci.c	Mon Jul 18 18:29:39 2011	(r224193)
@@ -822,7 +822,7 @@ pcib_grow_window(struct pcib_softc *sc, 
 			if (bootverbose)
 				printf("\tback candidate range: %#lx-%#lx\n",
 				    start_free, back);
-			back = roundup2(back + 1, w->step) - 1;
+			back = roundup2(back + 1, 1ul << w->step) - 1;
 			back -= rman_get_end(w->res);
 		} else
 			back = 0;