Commit ecb5d61d authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall

ARM: hyp-stub/KVM: Kill __hyp_get_vectors

Nobody is using __hyp_get_vectors anymore, so let's remove both
implementations (hyp-stub and KVM).
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 4897e36c
...@@ -53,7 +53,6 @@ static inline void sync_boot_mode(void) ...@@ -53,7 +53,6 @@ static inline void sync_boot_mode(void)
} }
void __hyp_set_vectors(unsigned long phys_vector_base); void __hyp_set_vectors(unsigned long phys_vector_base);
unsigned long __hyp_get_vectors(void);
void __hyp_reset_vectors(void); void __hyp_reset_vectors(void);
#else #else
#define __boot_cpu_mode (SVC_MODE) #define __boot_cpu_mode (SVC_MODE)
...@@ -99,12 +98,11 @@ extern char __hyp_text_end[]; ...@@ -99,12 +98,11 @@ extern char __hyp_text_end[];
/* Only assembly code should need those */ /* Only assembly code should need those */
#define HVC_GET_VECTORS 0 #define HVC_SET_VECTORS 0
#define HVC_SET_VECTORS 1 #define HVC_SOFT_RESTART 1
#define HVC_SOFT_RESTART 2 #define HVC_RESET_VECTORS 2
#define HVC_RESET_VECTORS 3
#define HVC_STUB_HCALL_NR 4 #define HVC_STUB_HCALL_NR 3
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
...@@ -202,12 +202,7 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE ...@@ -202,12 +202,7 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE
ENDPROC(__hyp_stub_install_secondary) ENDPROC(__hyp_stub_install_secondary)
__hyp_stub_do_trap: __hyp_stub_do_trap:
teq r0, #HVC_GET_VECTORS teq r0, #HVC_SET_VECTORS
bne 1f
mrc p15, 4, r0, c12, c0, 0 @ get HVBAR
b __hyp_stub_exit
1: teq r0, #HVC_SET_VECTORS
bne 1f bne 1f
mcr p15, 4, r1, c12, c0, 0 @ set HVBAR mcr p15, 4, r1, c12, c0, 0 @ set HVBAR
b __hyp_stub_exit b __hyp_stub_exit
...@@ -247,12 +242,6 @@ ENDPROC(__hyp_stub_do_trap) ...@@ -247,12 +242,6 @@ ENDPROC(__hyp_stub_do_trap)
* so you will need to set that to something sensible at the new hypervisor's * so you will need to set that to something sensible at the new hypervisor's
* initialisation entry point. * initialisation entry point.
*/ */
ENTRY(__hyp_get_vectors)
mov r0, #HVC_GET_VECTORS
__HVC(0)
ret lr
ENDPROC(__hyp_get_vectors)
ENTRY(__hyp_set_vectors) ENTRY(__hyp_set_vectors)
mov r1, r0 mov r1, r0
mov r0, #HVC_SET_VECTORS mov r0, #HVC_SET_VECTORS
......
...@@ -122,12 +122,7 @@ __do_hyp_init: ...@@ -122,12 +122,7 @@ __do_hyp_init:
eret eret
ENTRY(__kvm_handle_stub_hvc) ENTRY(__kvm_handle_stub_hvc)
cmp r0, #HVC_GET_VECTORS cmp r0, #HVC_SOFT_RESTART
bne 1f
mrc p15, 4, r0, c12, c0, 0 @ get HVBAR
b exit
1: cmp r0, #HVC_SOFT_RESTART
bne 1f bne 1f
/* The target is expected in r1 */ /* The target is expected in r1 */
......
...@@ -37,10 +37,6 @@ ...@@ -37,10 +37,6 @@
* in Hyp mode (see init_hyp_mode in arch/arm/kvm/arm.c). Return values are * in Hyp mode (see init_hyp_mode in arch/arm/kvm/arm.c). Return values are
* passed in r0 (strictly 32bit). * passed in r0 (strictly 32bit).
* *
* A function pointer with a value of 0xffffffff has a special meaning,
* and is used to implement __hyp_get_vectors in the same way as in
* arch/arm/kernel/hyp_stub.S.
*
* The calling convention follows the standard AAPCS: * The calling convention follows the standard AAPCS:
* r0 - r3: caller save * r0 - r3: caller save
* r12: caller save * r12: caller save
......
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