From owner-svn-src-projects@FreeBSD.ORG Tue Mar 16 16:11:17 2010 Return-Path: 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 316731065676; Tue, 16 Mar 2010 16:11:17 +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 16C0F8FC1C; Tue, 16 Mar 2010 16:11:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2GGBG5K030807; Tue, 16 Mar 2010 16:11:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2GGBGfY030801; Tue, 16 Mar 2010 16:11:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201003161611.o2GGBGfY030801@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 16 Mar 2010 16:11:16 +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: r205215 - in projects/ppc64/sys/powerpc: aim powerpc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2010 16:11:17 -0000 Author: nwhitehorn Date: Tue Mar 16 16:11:16 2010 New Revision: 205215 URL: http://svn.freebsd.org/changeset/base/205215 Log: Correct a final nit with USER_SR handling: USER_ADDR is no longer at USER_SR << 28 on powerpc64, so make sure to invalidate the correct SLB entry when switching threads. Modified: projects/ppc64/sys/powerpc/aim/locore32.S projects/ppc64/sys/powerpc/aim/locore64.S projects/ppc64/sys/powerpc/aim/swtch32.S projects/ppc64/sys/powerpc/aim/swtch64.S projects/ppc64/sys/powerpc/powerpc/genassym.c Modified: projects/ppc64/sys/powerpc/aim/locore32.S ============================================================================== --- projects/ppc64/sys/powerpc/aim/locore32.S Tue Mar 16 16:01:19 2010 (r205214) +++ projects/ppc64/sys/powerpc/aim/locore32.S Tue Mar 16 16:11:16 2010 (r205215) @@ -62,7 +62,6 @@ #include #include -#include #include #include #include Modified: projects/ppc64/sys/powerpc/aim/locore64.S ============================================================================== --- projects/ppc64/sys/powerpc/aim/locore64.S Tue Mar 16 16:01:19 2010 (r205214) +++ projects/ppc64/sys/powerpc/aim/locore64.S Tue Mar 16 16:11:16 2010 (r205215) @@ -62,7 +62,6 @@ #include #include -#include #include #include #include Modified: projects/ppc64/sys/powerpc/aim/swtch32.S ============================================================================== --- projects/ppc64/sys/powerpc/aim/swtch32.S Tue Mar 16 16:01:19 2010 (r205214) +++ projects/ppc64/sys/powerpc/aim/swtch32.S Tue Mar 16 16:11:16 2010 (r205215) @@ -63,7 +63,6 @@ #include #include -#include #include #include Modified: projects/ppc64/sys/powerpc/aim/swtch64.S ============================================================================== --- projects/ppc64/sys/powerpc/aim/swtch64.S Tue Mar 16 16:01:19 2010 (r205214) +++ projects/ppc64/sys/powerpc/aim/swtch64.S Tue Mar 16 16:11:16 2010 (r205215) @@ -63,7 +63,6 @@ #include #include -#include #include #include @@ -223,8 +222,10 @@ blocked_loop: ld %r1,PCB_SP(%r3) /* Load the stack pointer */ ld %r2,PCB_TOC(%r3) /* Load the TOC pointer */ - li %r5,USER_SR /* Load the USER_SR segment reg */ - sldi %r5,%r5,28 + lis %r5,USER_ADDR@highesta /* Load the USER_SR segment reg */ + ori %r5,%r5,USER_ADDR@highera + sldi %r5,%r5,32 + oris %r5,%r5,USER_ADDR@ha slbie %r5 ld %r5,PCB_AIM_USR_VSID(%r3) ld %r6,PCB_AIM_USR_ESID(%r3) Modified: projects/ppc64/sys/powerpc/powerpc/genassym.c ============================================================================== --- projects/ppc64/sys/powerpc/powerpc/genassym.c Tue Mar 16 16:01:19 2010 (r205214) +++ projects/ppc64/sys/powerpc/powerpc/genassym.c Tue Mar 16 16:11:16 2010 (r205215) @@ -102,6 +102,8 @@ ASSYM(TLBSAVE_BOOKE_R31, TLBSAVE_BOOKE_R ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); #if defined(AIM) +ASSYM(USER_SR, USER_SR); +ASSYM(USER_ADDR, USER_ADDR); #ifdef __powerpc64__ ASSYM(PM_SLB, offsetof(struct pmap, pm_slb)); #else