From owner-svn-src-projects@FreeBSD.ORG Wed Aug 27 09:26:22 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 930088DF; Wed, 27 Aug 2014 09:26:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6506A38E9; Wed, 27 Aug 2014 09:26:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R9QMvs058250; Wed, 27 Aug 2014 09:26:22 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R9QMgh058249; Wed, 27 Aug 2014 09:26:22 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201408270926.s7R9QMgh058249@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 27 Aug 2014 09:26:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r270699 - projects/arm64/sys/arm64/arm64 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.18-1 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: Wed, 27 Aug 2014 09:26:22 -0000 Author: andrew Date: Wed Aug 27 09:26:21 2014 New Revision: 270699 URL: http://svnweb.freebsd.org/changeset/base/270699 Log: Save the sp_el0 register when coming from el0, it holds the userland stack pointer where sp is for the current execution level. Modified: projects/arm64/sys/arm64/arm64/exception.S Modified: projects/arm64/sys/arm64/arm64/exception.S ============================================================================== --- projects/arm64/sys/arm64/arm64/exception.S Wed Aug 27 09:19:22 2014 (r270698) +++ projects/arm64/sys/arm64/arm64/exception.S Wed Aug 27 09:26:21 2014 (r270699) @@ -50,7 +50,7 @@ sintrcnt: mov x1, 0x1c090000; \ str x0, [x1]; -.macro save_registers +.macro save_registers el stp x28, x29, [sp, #-16]! stp x26, x27, [sp, #-16]! stp x24, x25, [sp, #-16]! @@ -68,15 +68,23 @@ sintrcnt: stp x0, x1, [sp, #-16]! mrs x10, elr_el1 mrs x11, spsr_el1 +.if \el == 0 + mrs x12, sp_el0 +.else mov x12, sp +.endif stp x10, x11, [sp, #-16]! stp x12, lr, [sp, #-16]! .endm -.macro restore_registers +.macro restore_registers el ldp x12, lr, [sp], #16 ldp x10, x11, [sp], #16 +.if \el == 0 + msr sp_el0, x12 +.else mov sp, x12 +.endif msr spsr_el1, x11 msr elr_el1, x10 ldp x0, x1, [sp], #16 @@ -97,38 +105,38 @@ sintrcnt: .endm handle_el1h_sync: - save_registers + save_registers 1 mov x0, sp bl do_el1h_sync - restore_registers + restore_registers 1 eret handle_el1h_irq: - save_registers + save_registers 1 mov x0, sp bl cpu_intr - restore_registers + restore_registers 1 eret handle_el1h_error: brk 0xf13 handle_el0_sync: - save_registers + save_registers 0 mov x0, sp bl do_el0_sync - restore_registers + restore_registers 0 eret handle_el0_irq: - save_registers + save_registers 0 mov x0, sp bl cpu_intr - restore_registers + restore_registers 0 eret handle_el0_error: - save_registers + save_registers 0 mov x0, sp bl do_el0_error brk 0xf23