From owner-svn-src-projects@FreeBSD.ORG  Fri Jul 31 14:43:05 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CDD03106564A;
	Fri, 31 Jul 2009 14:43:05 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 863868FC17;
	Fri, 31 Jul 2009 14:43:05 +0000 (UTC)
	(envelope-from nwhitehorn@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 n6VEh5E2072184;
	Fri, 31 Jul 2009 14:43:05 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6VEh57Y072181;
	Fri, 31 Jul 2009 14:43:05 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200907311443.n6VEh57Y072181@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 31 Jul 2009 14:43:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195999 - projects/ppc64/sys/powerpc/aim
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Jul 2009 14:43:06 -0000

Author: nwhitehorn
Date: Fri Jul 31 14:43:05 2009
New Revision: 195999
URL: http://svn.freebsd.org/changeset/base/195999

Log:
  Make copyin()/copyout() work.

Modified:
  projects/ppc64/sys/powerpc/aim/copyinout.c
  projects/ppc64/sys/powerpc/aim/trap.c

Modified: projects/ppc64/sys/powerpc/aim/copyinout.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/copyinout.c	Fri Jul 31 14:30:06 2009	(r195998)
+++ projects/ppc64/sys/powerpc/aim/copyinout.c	Fri Jul 31 14:43:05 2009	(r195999)
@@ -279,7 +279,7 @@ suword32(void *addr, int word)
 		return (-1);
 	}
 
-	set_user_sr(pm->pm_sr[(uintptr_t)addr >> ADDR_SR_SHFT]);
+	set_user_sr(va_to_vsid(pm,addr));
 
 	*p = word;
 

Modified: projects/ppc64/sys/powerpc/aim/trap.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/trap.c	Fri Jul 31 14:30:06 2009	(r195998)
+++ projects/ppc64/sys/powerpc/aim/trap.c	Fri Jul 31 14:43:05 2009	(r195999)
@@ -522,6 +522,12 @@ trap_pfault(struct trapframe *frame, int
 			__asm ("slbmfev %0, %1"
 			    : "=r"(user_sr)
 			    : "r"(USER_SR));
+
+			user_sr >>= 12;
+
+			/* XXX - limit to 46 byte EA space */
+			user_sr &= (1UL << 17) - 1UL;
+
 			#else
 			__asm ("mfsr %0, %1"
 			    : "=r"(user_sr)