From owner-svn-src-projects@FreeBSD.ORG  Mon Mar 12 00:48:21 2012
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 05DA3106566C;
	Mon, 12 Mar 2012 00:48:21 +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 E540E8FC1C;
	Mon, 12 Mar 2012 00:48:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2C0mKTD034330;
	Mon, 12 Mar 2012 00:48:20 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2C0mK2p034327;
	Mon, 12 Mar 2012 00:48:20 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201203120048.q2C0mK2p034327@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 12 Mar 2012 00:48:20 +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: r232843 - in projects/pseries/powerpc: aim pseries
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: Mon, 12 Mar 2012 00:48:21 -0000

Author: nwhitehorn
Date: Mon Mar 12 00:48:20 2012
New Revision: 232843
URL: http://svn.freebsd.org/changeset/base/232843

Log:
  Remove work arounds for bugs in QEMU now that they have been fixed.

Modified:
  projects/pseries/powerpc/aim/mmu_oea64.c
  projects/pseries/powerpc/pseries/mmu_phyp.c

Modified: projects/pseries/powerpc/aim/mmu_oea64.c
==============================================================================
--- projects/pseries/powerpc/aim/mmu_oea64.c	Mon Mar 12 00:47:13 2012	(r232842)
+++ projects/pseries/powerpc/aim/mmu_oea64.c	Mon Mar 12 00:48:20 2012	(r232843)
@@ -555,9 +555,6 @@ moea64_probe_large_page(void)
 	uint16_t pvr = mfpvr() >> 16;
 
 	switch (pvr) {
-	case IBMPOWER7:
-		moea64_large_page_size = 0;
-		break;
 	case IBM970:
 	case IBM970FX:
 	case IBM970MP:

Modified: projects/pseries/powerpc/pseries/mmu_phyp.c
==============================================================================
--- projects/pseries/powerpc/pseries/mmu_phyp.c	Mon Mar 12 00:47:13 2012	(r232842)
+++ projects/pseries/powerpc/pseries/mmu_phyp.c	Mon Mar 12 00:48:20 2012	(r232843)
@@ -236,6 +236,8 @@ mphyp_pte_change(mmu_t mmu, uintptr_t sl
 	 * is safe, except for the scratch-page case. No CPUs on which we run
 	 * this code should be using scratch pages.
 	 */
+	KASSERT(!(pvo_pt->pte_hi & LPTE_LOCKED),
+	    ("Locked pages not supported on PHYP"));
 
 	/* XXX: optimization using H_PROTECT for common case? */
 	result = phyp_hcall(H_REMOVE, 0, slot, vpn);
@@ -289,6 +291,11 @@ mphyp_pte_insert(mmu_t mmu, u_int ptegid
 	uint64_t index, junk;
 	u_int pteg_bktidx;
 
+	/* Check for locked pages, which we can't support on this system */
+	KASSERT(!(pvo_pt->pte_hi & LPTE_LOCKED),
+	    ("Locked pages not supported on PHYP"));
+
+	/* Initialize PTE */
 	pvo_pt->pte_hi |= LPTE_VALID;
 	pvo_pt->pte_hi &= ~LPTE_HID;
 	evicted.pte_hi = 0;