From: Abner Chang <abner.chang@hpe.com>
To: edk2-devel@lists.01.org
Subject: [staging/branch RISC-V PATCH 1/4] RiscVPkg/Sec: Use MRET in machine trap handler.
Date: Tue, 4 Jul 2017 13:29:21 +0800 [thread overview]
Message-ID: <1499146164-26231-2-git-send-email-abner.chang@hpe.com> (raw)
In-Reply-To: <1499146164-26231-1-git-send-email-abner.chang@hpe.com>
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 <abner.chang@hpe.com>
---
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.<BR>
+// Copyright (c) 2016-2017, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
//
// 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
next prev parent reply other threads:[~2017-07-04 5:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-04 5:29 [staging/branch RISC-V PATCH 0/4] RISC-V edk2 port GCC 7.1.1 Abner Chang
2017-07-04 5:29 ` Abner Chang [this message]
2017-07-04 5:29 ` [staging/branch RISC-V PATCH 2/4] BaseTools: Support RISC-V " Abner Chang
2017-07-04 5:29 ` [staging/branch RISC-V PATCH 3/4] BaseTools: Add more RISC-V relocation types Abner Chang
2017-07-04 5:29 ` [staging/branch RISC-V PATCH 4/4] RiscVVirtPkg: Update README file Abner Chang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499146164-26231-2-git-send-email-abner.chang@hpe.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox