From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 19:19:44 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0391D16A4D1; Sun, 11 Jan 2004 19:19:44 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D24D316A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:19:43 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 09F8043D1F
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:19:43 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0C3Jg0B099661
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:19:42 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0C3JgK9099658
	for perforce@freebsd.org; Sun, 11 Jan 2004 19:19:42 -0800 (PST)
	(envelope-from imp@freebsd.org)
Date: Sun, 11 Jan 2004 19:19:42 -0800 (PST)
Message-Id: <200401120319.i0C3JgK9099658@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45187 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
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, 12 Jan 2004 03:19:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=45187

Change 45187 by imp@imp_pacopaco on 2004/01/11 19:19:05

	integrate from newcard: fix the alignment issues.

Affected files ...

.. //depot/projects/power/sys/dev/pci/pci.c#9 integrate

Differences ...

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

@@ -1443,6 +1443,7 @@
 	struct resource_list_entry *rle;
 	struct resource *res;
 	uint32_t map, testval;
+	int mapsize;
 
 	/*
 	 * Weed out the bogons, and figure out how large the BAR/map is.
@@ -1467,7 +1468,10 @@
 	 * appropriate bar for that resource (this is the part
 	 * I'm not sure is good for 64-bit bars).
 	 */
-	count = 1 << pci_mapsize(testval);
+	mapsize = pci_mapsize(testval);
+	count = 1 << mapsize;
+	if (RF_ALIGNMENT(flags) < mapsize)
+	    flags = (flags & ~RF_ALIGNMENT_MASK) | RF_ALIGNMENT_LOG2(mapsize);
 	res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child, type, rid,
 	    start, end, count, flags);
 	if (res == NULL) {