Date: Mon, 12 Mar 2012 00:48:20 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r232843 - in projects/pseries/powerpc: aim pseries Message-ID: <201203120048.q2C0mK2p034327@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203120048.q2C0mK2p034327>