The function not only disables the MMU for EL2, it completely leaves EL2 and restores the original hyp stub of Linux. Reflect that via better naming.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm64/entry.S | 4 ++-- hypervisor/arch/arm64/include/asm/control.h | 2 +- hypervisor/arch/arm64/setup.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hypervisor/arch/arm64/entry.S b/hypervisor/arch/arm64/entry.S index f155407..9dd7ea6 100644 --- a/hypervisor/arch/arm64/entry.S +++ b/hypervisor/arch/arm64/entry.S @@ -123,8 +123,8 @@ el2_entry: b . - .globl arch_shutdown_mmu -arch_shutdown_mmu: + .globl shutdown_el2 +shutdown_el2: /* x0: struct percpu* */ mov x19, x0 diff --git a/hypervisor/arch/arm64/include/asm/control.h b/hypervisor/arch/arm64/include/asm/control.h index d7cd82c..014c3d7 100644 --- a/hypervisor/arch/arm64/include/asm/control.h +++ b/hypervisor/arch/arm64/include/asm/control.h @@ -33,7 +33,7 @@ void arch_shutdown_self(struct per_cpu *cpu_data); unsigned int arm_cpu_by_mpidr(struct cell *cell, unsigned long mpidr); void __attribute__((noreturn)) vmreturn(struct registers *guest_regs); -void __attribute__((noreturn)) arch_shutdown_mmu(struct per_cpu *cpu_data); +void __attribute__((noreturn)) shutdown_el2(struct per_cpu *cpu_data); void arm_cpu_reset(unsigned long pc); void arm_cpu_park(void); diff --git a/hypervisor/arch/arm64/setup.c b/hypervisor/arch/arm64/setup.c index c2ccee6..1c9f212 100644 --- a/hypervisor/arch/arm64/setup.c +++ b/hypervisor/arch/arm64/setup.c @@ -115,7 +115,7 @@ void arch_shutdown_self(struct per_cpu *cpu_data) dsb(ish); /* Return to EL1 */ - arch_shutdown_mmu(cpu_data); + shutdown_el2(cpu_data); } void arch_cpu_restore(struct per_cpu *cpu_data, int return_code) -- 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
