From owner-svn-src-all@FreeBSD.ORG  Tue Jul 21 08:38:45 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 CCD25106564A;
	Tue, 21 Jul 2009 08:38:45 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B8B668FC14;
	Tue, 21 Jul 2009 08:38:45 +0000 (UTC) (envelope-from raj@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 n6L8cjxK004426;
	Tue, 21 Jul 2009 08:38:45 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6L8cjUi004424;
	Tue, 21 Jul 2009 08:38:45 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <200907210838.n6L8cjUi004424@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Tue, 21 Jul 2009 08:38:45 +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: r195799 - head/sys/powerpc/mpc85xx
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, 21 Jul 2009 08:38:46 -0000

Author: raj
Date: Tue Jul 21 08:38:45 2009
New Revision: 195799
URL: http://svn.freebsd.org/changeset/base/195799

Log:
  Do not use OCP85XX_LBC_OFF twice when accessing LBC registers on MPC85XX.
  
  It turns LBC control registers were not programmed correctly on MPC85XX. We
  were accessing bogus addresses as the base offset (OCP85XX_LBC_OFF) was
  erroneously added during offset calculations.  Effectively the state of LBC
  control registers was not altered by the kernel initialization code, but
  everything worked as long as we coincided to use the same settings (LBC decode
  windows) as firmware has initialized.
  
  Submitted by:	Lukasz Wojcik
  Reviewed by:	marcel
  Approved by:	re (kensmith)
  Obtained from:	Semihalf

Modified:
  head/sys/powerpc/mpc85xx/lbc.h

Modified: head/sys/powerpc/mpc85xx/lbc.h
==============================================================================
--- head/sys/powerpc/mpc85xx/lbc.h	Tue Jul 21 08:29:19 2009	(r195798)
+++ head/sys/powerpc/mpc85xx/lbc.h	Tue Jul 21 08:38:45 2009	(r195799)
@@ -39,10 +39,10 @@
 #define	LBC_DEVTYPE_RTC		2
 
 /* Local access registers */
-#define	LBC85XX_BR(n)	(OCP85XX_LBC_OFF + (8 * n))
-#define	LBC85XX_OR(n)	(OCP85XX_LBC_OFF + 4 + (8 * n))
-#define	LBC85XX_LBCR	(OCP85XX_LBC_OFF + 0xd0)
-#define	LBC85XX_LCRR	(OCP85XX_LBC_OFF + 0xd4)
+#define	LBC85XX_BR(n)	(8 * n)
+#define	LBC85XX_OR(n)	(4 + (8 * n))
+#define	LBC85XX_LBCR	(0xd0)
+#define	LBC85XX_LCRR	(0xd4)
 
 /* LBC machine select */
 #define	LBCRES_MSEL_GPCM	0