From owner-svn-src-stable-8@FreeBSD.ORG  Mon Jul 18 18:29:39 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7D02E106564A;
	Mon, 18 Jul 2011 18:29:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BA518FC14;
	Mon, 18 Jul 2011 18:29:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6IITdaj034311;
	Mon, 18 Jul 2011 18:29:39 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6IITdlI034309;
	Mon, 18 Jul 2011 18:29:39 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201107181829.p6IITdlI034309@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 18 Jul 2011 18:29:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224193 - stable/8/sys/dev/pci
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jul 2011 18:29:39 -0000

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;