From owner-svn-src-head@FreeBSD.ORG  Thu May 21 11:37:57 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6D905106564A;
	Thu, 21 May 2009 11:37:57 +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 5B5148FC22;
	Thu, 21 May 2009 11:37:57 +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 n4LBbvSe065532;
	Thu, 21 May 2009 11:37:57 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4LBbvp6065531;
	Thu, 21 May 2009 11:37:57 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <200905211137.n4LBbvp6065531@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Thu, 21 May 2009 11:37:57 +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: r192531 - head/sys/powerpc/mpc85xx
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 May 2009 11:37:57 -0000

Author: raj
Date: Thu May 21 11:37:56 2009
New Revision: 192531
URL: http://svn.freebsd.org/changeset/base/192531

Log:
  Skip interleaved RAM target on MPC85xx during renitialization of the local
  access windows. This eliminates hangs on systems which are configured to use
  interleaved mode: prior to this fix we were simply cutting ourselves from
  access to the main memory in this case.
  
  Obtained from:	Freescale, Semihalf

Modified:
  head/sys/powerpc/mpc85xx/ocpbus.c

Modified: head/sys/powerpc/mpc85xx/ocpbus.c
==============================================================================
--- head/sys/powerpc/mpc85xx/ocpbus.c	Thu May 21 10:04:51 2009	(r192530)
+++ head/sys/powerpc/mpc85xx/ocpbus.c	Thu May 21 11:37:56 2009	(r192531)
@@ -255,7 +255,8 @@ ocpbus_attach(device_t dev)
 		if ((sr & 0x80000000) == 0)
 			continue;
 		tgt = (sr & 0x01f00000) >> 20;
-		if (tgt == OCP85XX_TGTIF_RAM1 || tgt == OCP85XX_TGTIF_RAM2)
+		if (tgt == OCP85XX_TGTIF_RAM1 || tgt == OCP85XX_TGTIF_RAM2 ||
+		    tgt == OCP85XX_TGTIF_RAM_INTL)
 			continue;
 
 		ccsr_write4(OCP85XX_LAWSR(i), sr & 0x7fffffff);