From owner-svn-src-projects@FreeBSD.ORG  Sun Aug  2 04:23:12 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 5BCCB106566B;
	Sun,  2 Aug 2009 04:23:12 +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 4A4968FC0A;
	Sun,  2 Aug 2009 04:23:12 +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 n724NCLo002162;
	Sun, 2 Aug 2009 04:23:12 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n724NCbl002160;
	Sun, 2 Aug 2009 04:23:12 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200908020423.n724NCbl002160@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 2 Aug 2009 04:23:12 +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: r196030 - 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: Sun, 02 Aug 2009 04:23:12 -0000

Author: nwhitehorn
Date: Sun Aug  2 04:23:12 2009
New Revision: 196030
URL: http://svn.freebsd.org/changeset/base/196030

Log:
  Fix the onfault handler by bringing it into the new SLB world order. This
  brings the kernel to the same level of functionality as before I decided
  to redo the SLB handling.

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

Modified: projects/ppc64/sys/powerpc/aim/trap.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/trap.c	Sun Aug  2 02:10:27 2009	(r196029)
+++ projects/ppc64/sys/powerpc/aim/trap.c	Sun Aug  2 04:23:12 2009	(r196030)
@@ -486,6 +486,27 @@ syscall(struct trapframe *frame)
 	PTRACESTOP_SC(p, td, S_PT_SCX);
 }
 
+#ifdef __powerpc64__
+static uint64_t
+slb_esid_lookup(pmap_t pm, uint64_t vsid)
+{
+	uint64_t esid;
+	int i;
+
+	vsid <<= SLBV_VSID_SHIFT;
+
+	for (i = 0; i < sizeof(pm->pm_slb)/sizeof(pm->pm_slb[0]); i++) {
+		if ((pm->pm_slb[i].slbv & SLBV_VSID_MASK) == vsid) {
+			esid = pm->pm_slb[i].slbe & SLBE_ESID_MASK;
+			esid >>= SLBE_ESID_SHIFT;
+			return (esid);
+		}
+	}
+
+	return (0);
+}
+#endif
+
 static int
 trap_pfault(struct trapframe *frame, int user)
 {
@@ -523,12 +544,8 @@ trap_pfault(struct trapframe *frame, int
 			    : "=r"(user_sr)
 			    : "r"(USER_SR));
 
-			/* XXX: THIS DOES NOT WORK */
-
-			user_sr >>= 12;
-
-			/* XXX - limit to 46 byte EA space */
-			user_sr &= (1UL << 17) - 1UL;
+			user_sr >>= SLBV_VSID_SHIFT;
+			user_sr = slb_esid_lookup(&p->p_vmspace->vm_pmap, user_sr);
 
 			#else
 			__asm ("mfsr %0, %1"