Commit 467f97b7 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall

ARM: KVM: Convert KVM to use HVC_GET_VECTORS

The conversion of the HYP stub ABI to something similar to arm64
left the KVM code broken, as it doesn't know about the new
stub numbering. Let's move the various #defines to virt.h, and
let KVM use HVC_GET_VECTORS.
Tested-by: default avatarKeerthy <j-keerthy@ti.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 9da5ac23
...@@ -94,6 +94,14 @@ extern char __hyp_text_start[]; ...@@ -94,6 +94,14 @@ extern char __hyp_text_start[];
extern char __hyp_text_end[]; extern char __hyp_text_end[];
#endif #endif
#else
/* Only assembly code should need those */
#define HVC_GET_VECTORS 0
#define HVC_SET_VECTORS 1
#define HVC_SOFT_RESTART 2
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* ! VIRT_H */ #endif /* ! VIRT_H */
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/virt.h> #include <asm/virt.h>
#define HVC_GET_VECTORS 0
#define HVC_SET_VECTORS 1
#define HVC_SOFT_RESTART 2
#ifndef ZIMAGE #ifndef ZIMAGE
/* /*
* For the kernel proper, we need to find out the CPU boot mode long after * For the kernel proper, we need to find out the CPU boot mode long after
......
...@@ -127,7 +127,7 @@ hyp_hvc: ...@@ -127,7 +127,7 @@ hyp_hvc:
pop {r0, r1, r2} pop {r0, r1, r2}
/* Check for __hyp_get_vectors */ /* Check for __hyp_get_vectors */
cmp r0, #-1 cmp r0, #HVC_GET_VECTORS
mrceq p15, 4, r0, c12, c0, 0 @ get HVBAR mrceq p15, 4, r0, c12, c0, 0 @ get HVBAR
beq 1f beq 1f
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment