psci_low.S is going to be obsoleted.
Comes with two indention adjustments that didn't deserve a separate
commit.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
hypervisor/arch/arm/exception.S | 10 ++++++++--
hypervisor/arch/arm/psci_low.S | 11 -----------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/hypervisor/arch/arm/exception.S b/hypervisor/arch/arm/exception.S
index 6701aac..4ae57c7 100644
--- a/hypervisor/arch/arm/exception.S
+++ b/hypervisor/arch/arm/exception.S
@@ -61,7 +61,7 @@ vmexit_common:
* Because the hypervisor may call vmreturn to reset the stack,
* arch_handle_exit has to return with the guest registers in r0
*/
-.globl vmreturn
+ .globl vmreturn
vmreturn:
mov sp, r0
add sp, #4
@@ -75,7 +75,13 @@ vmreturn:
* r0-r3: arguments
* r0: return value
*/
-.globl hvc
+ .globl hvc
hvc:
hvc #0
bx lr
+
+ .arch_extension sec
+ .globl smc
+smc:
+ smc #0
+ bx lr
diff --git a/hypervisor/arch/arm/psci_low.S b/hypervisor/arch/arm/psci_low.S
index 58bdc0a..76eeaba 100644
--- a/hypervisor/arch/arm/psci_low.S
+++ b/hypervisor/arch/arm/psci_low.S
@@ -13,17 +13,6 @@
#include <asm/head.h>
#include <asm/psci.h>
- .arch_extension sec
- .globl smc
- /*
- * Since we trap all SMC instructions, it may be useful to forward them
- * when it isn't a PSCI call. The shutdown code will also have to issue
- * a real PSCI_OFF call on secondary CPUs.
- */
-smc:
- smc #0
- bx lr
-
.global _psci_cpu_off
/* r0: struct psci_mbox* */
_psci_cpu_off:
--
2.1.4
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
