From owner-p4-projects@FreeBSD.ORG  Thu Aug 23 19:27:31 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7536416A469; Thu, 23 Aug 2007 19:27:31 +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 1C4B116A420
	for <perforce@freebsd.org>; Thu, 23 Aug 2007 19:27:31 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 07E7113C494
	for <perforce@freebsd.org>; Thu, 23 Aug 2007 19:27:31 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7NJRUeE054121
	for <perforce@freebsd.org>; Thu, 23 Aug 2007 19:27:30 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7NJRUuU054118
	for perforce@freebsd.org; Thu, 23 Aug 2007 19:27:30 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 23 Aug 2007 19:27:30 GMT
Message-Id: <200708231927.l7NJRUuU054118@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 125593 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: Thu, 23 Aug 2007 19:27:31 -0000

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

Change 125593 by peter@peter_overcee on 2007/08/23 19:27:17

	Actually change the PLX register to the good value.

Affected files ...

.. //depot/projects/hammer/sys/dev/si/si_pci.c#9 edit

Differences ...

==== //depot/projects/hammer/sys/dev/si/si_pci.c#9 (text+ko) ====

@@ -106,16 +106,24 @@
 	}
 
 	if (pci_get_devid(dev) == 0x200011cb) {
+		int rid;
+		struct resource *plx_res;
+		uint32_t *addr;
+		uint32_t oldvalue;
+
 		/* Perform a PLX control register fixup */
-		int rid = PCIR_BAR(0);
-		plx_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-						&rid, RF_ACTIVE);
+		rid = PCIR_BAR(0);
+		plx_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+		    RF_ACTIVE);
 		if (plx_res == NULL) {
 			device_printf(dev, "couldn't map plx registers\n");
 		} else {
-			uint32_t *maddr;
 			addr = rman_get_virtual(plx_res);
-			device_printf(dev, "PLX register 0x50: 0x%08x\n", addr[0x50 / 4]);
+			oldvalue = addr[0x50 / 4];
+			if (oldvalue != 0x18260000) {
+				device_printf(dev, "PLX register 0x50: 0x%08x changed to 0x%08x\n", oldvalue, 0x18260000);
+				addr[0x50 / 4] = 0x18260000;
+			}
 			bus_release_resource(dev, SYS_RES_MEMORY, rid, plx_res);
 		}
 	}