From owner-p4-projects@FreeBSD.ORG  Tue Aug  5 21:27:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 284C7106573C; Tue,  5 Aug 2008 21:27:00 +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 BF274106567E
	for <perforce@freebsd.org>; Tue,  5 Aug 2008 21:26:59 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AE0258FC1B
	for <perforce@freebsd.org>; Tue,  5 Aug 2008 21:26:59 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m75LQxuC068295
	for <perforce@freebsd.org>; Tue, 5 Aug 2008 21:26:59 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m75LQxPR068293
	for perforce@freebsd.org; Tue, 5 Aug 2008 21:26:59 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 5 Aug 2008 21:26:59 GMT
Message-Id: <200808052126.m75LQxPR068293@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 146732 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 05 Aug 2008 21:27:00 -0000

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

Change 146732 by jhb@jhb_mutex on 2008/08/05 21:26:33

	IFC @146730

Affected files ...

.. //depot/projects/smpng/sys/dev/pci/pci.c#99 integrate

Differences ...

==== //depot/projects/smpng/sys/dev/pci/pci.c#99 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.359 2008/08/05 18:24:41 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.360 2008/08/05 21:04:00 jhb Exp $");
 
 #include "opt_bus.h"
 
@@ -2404,26 +2404,8 @@
 		 */
 		resource_list_delete(rl, type, reg);
 		start = 0;
-	} else {
+	} else
 		start = rman_get_start(res);
-		if ((u_long)start != start) {
-			/*
-			 * Wait a minute!  This platform can't do this
-			 * address.
-			 */
-			device_printf(bus,
-			    "pci%d:%d.%d.%x bar %#x start %#jx, too many bits.",
-			    pci_get_domain(dev), b, s, f, reg,
-			    (uintmax_t)start);
-
-			/*
-			 * Delete this resource and zero the BAR.
-			 */
-			resource_list_release(rl, bus, dev, type, reg, res);
-			resource_list_delete(rl, type, reg);
-			start = 0;
-		}
-	}
 	pci_write_config(dev, reg, start, 4);
 	if (ln2range == 64)
 		pci_write_config(dev, reg + 4, start >> 32, 4);