From owner-svn-src-all@FreeBSD.ORG  Tue Mar 10 06:21:53 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10AC1106564A;
	Tue, 10 Mar 2009 06:21:53 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F3D9E8FC19;
	Tue, 10 Mar 2009 06:21:52 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2A6LqfX049001;
	Tue, 10 Mar 2009 06:21:52 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2A6LqdZ049000;
	Tue, 10 Mar 2009 06:21:52 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200903100621.n2A6LqdZ049000@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 10 Mar 2009 06:21:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189611 - head/sys/dev/pci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Mar 2009 06:21:53 -0000

Author: marcel
Date: Tue Mar 10 06:21:52 2009
New Revision: 189611
URL: http://svn.freebsd.org/changeset/base/189611

Log:
  Fix a buglet in revision 189401: when restoring a 64-bit BAR,
  write the upper 32-bits in the adjacent bar. The consequences
  of the buglet were severe enough though: a machine check.

Modified:
  head/sys/dev/pci/pci.c

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Tue Mar 10 02:12:03 2009	(r189610)
+++ head/sys/dev/pci/pci.c	Tue Mar 10 06:21:52 2009	(r189611)
@@ -3464,7 +3464,7 @@ pci_alloc_map(device_t dev, device_t chi
 	 */
 	pci_write_config(child, *rid, map, 4);
 	if (maprange == 64)
-		pci_write_config(child, *rid + 4, map, 4);
+		pci_write_config(child, *rid + 4, map >> 32, 4);
 	pci_write_config(child, PCIR_COMMAND, cmd, 2);
 
 	/* Ignore a BAR with a base of 0. */