From owner-svn-src-projects@freebsd.org Sat Aug 20 23:56:17 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13835BC106B for ; Sat, 20 Aug 2016 23:56:17 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D38B6168B; Sat, 20 Aug 2016 23:56:16 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7KNuGjn002312; Sat, 20 Aug 2016 23:56:16 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7KNuGf0002311; Sat, 20 Aug 2016 23:56:16 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201608202356.u7KNuGf0002311@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sat, 20 Aug 2016 23:56:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r304549 - projects/powernv/powerpc/aim X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 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: Sat, 20 Aug 2016 23:56:17 -0000 Author: nwhitehorn Date: Sat Aug 20 23:56:15 2016 New Revision: 304549 URL: https://svnweb.freebsd.org/changeset/base/304549 Log: Revert r304044. The usage of SPRG2 conflicted with the SLB miss handler. Modified: projects/powernv/powerpc/aim/trap_subr64.S Modified: projects/powernv/powerpc/aim/trap_subr64.S ============================================================================== --- projects/powernv/powerpc/aim/trap_subr64.S Sat Aug 20 22:12:26 2016 (r304548) +++ projects/powernv/powerpc/aim/trap_subr64.S Sat Aug 20 23:56:15 2016 (r304549) @@ -720,13 +720,11 @@ u_trap: * Now the common trap catching code. */ k_trap: - GET_TOCBASE(%r31) /* Get TOC base while we can */ - mtsprg2 %r31 FRAME_SETUP(PC_TEMPSAVE) - - /* Call C interrupt dispatcher: */ +/* Call C interrupt dispatcher: */ +trapagain: + GET_TOCBASE(%r2) addi %r3,%r1,48 - mfsprg2 %r2 bl CNAME(powerpc_interrupt) nop @@ -752,6 +750,7 @@ CNAME(trapexit): ori %r3,%r3,PSL_EE@l mtmsr %r3 isync + GET_TOCBASE(%r2) addi %r3,%r1,48 bl CNAME(ast) nop @@ -798,11 +797,9 @@ dbtrap: ld %r1,TOC_REF(tmpstk)(%r1) addi %r1,%r1,(TMPSTKSZ-48) - GET_TOCBASE(%r31) - mtsprg2 %r31 FRAME_SETUP(PC_DBSAVE) /* Call C trap code: */ - mfsprg2 %r2 + GET_TOCBASE(%r2) addi %r3,%r1,48 bl CNAME(db_trap_glue) nop