From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g2t4622.austin.hp.com (g2t4622.austin.hp.com [15.73.212.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 790FF21A00AC2 for ; Mon, 3 Jul 2017 22:30:24 -0700 (PDT) Received: from UB16Abner.asiapacific.hpqcorp.net (ub16abner.asiapacific.hpqcorp.net [15.119.158.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by g2t4622.austin.hp.com (Postfix) with ESMTPS id F12F537E; Tue, 4 Jul 2017 05:32:00 +0000 (UTC) From: Abner Chang To: edk2-devel@lists.01.org Date: Tue, 4 Jul 2017 13:29:21 +0800 Message-Id: <1499146164-26231-2-git-send-email-abner.chang@hpe.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499146164-26231-1-git-send-email-abner.chang@hpe.com> References: <1499146164-26231-1-git-send-email-abner.chang@hpe.com> Subject: [staging/branch RISC-V PATCH 1/4] RiscVPkg/Sec: Use MRET in machine trap handler. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jul 2017 05:30:24 -0000 Use MRET(Machine Mode Trap-Return) instead of SRET(Supervisor Mode Trap-Return) to return from machine mode trap handler. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Abner Chang --- RiscVPkg/Universal/Sec/Riscv64/SecEntry.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/RiscVPkg/Universal/Sec/Riscv64/SecEntry.s b/RiscVPkg/Universal/Sec/Riscv64/SecEntry.s index f13596d..cc4ca6d 100644 --- a/RiscVPkg/Universal/Sec/Riscv64/SecEntry.s +++ b/RiscVPkg/Universal/Sec/Riscv64/SecEntry.s @@ -2,7 +2,7 @@ // // RISC-V Sec module. // -// Copyright (c) 2016, Hewlett Packard Enterprise Development LP. All rights reserved.
+// Copyright (c) 2016-2017, Hewlett Packard Enterprise Development LP. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -77,33 +77,33 @@ ASM_PFX(_ModuleEntryPoint): // ASM_PFX(TrapFromUserModeHandler): call RiscVUserModeTrapHandler - eret + mret // //Supervisor mode trap handler. // ASM_PFX(TrapFromSupervisorModeHandler): call RiscVSupervisorModeTrapHandler - eret + mret // // Hypervisor mode trap handler. // ASM_PFX(TrapFromHypervisorModeHandler): call RiscVHypervisorModeTrapHandler - eret + mret // // Machine mode trap handler. // ASM_PFX(TrapFromMachineModeHandler): call RiscVMachineModeTrapHandler - eret + mret // // NMI trap handler. // ASM_PFX(NmiHandler): call RiscVNmiHandler - eret + mret -- 2.7.4