kernel: bump 5.4 to 5.4.111
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 809-jailhouse-0021-arm64-export-__hyp_stub_vectors.patch
1 From a6445874f3371aee451f79c67168f8c4f95d6438 Mon Sep 17 00:00:00 2001
2 From: Peng Fan <peng.fan@nxp.com>
3 Date: Fri, 15 Nov 2019 17:07:52 +0800
4 Subject: [PATCH] arm64: export __hyp_stub_vectors
5
6 External hypervisors, like Jailhouse, need this address when they are
7 deactivated, in order to restore original state.
8
9 Signed-off-by: Peng Fan <peng.fan@nxp.com>
10 ---
11 arch/arm64/include/asm/virt.h | 2 ++
12 arch/arm64/kernel/hyp-stub.S | 1 +
13 2 files changed, 3 insertions(+)
14
15 --- a/arch/arm64/include/asm/virt.h
16 +++ b/arch/arm64/include/asm/virt.h
17 @@ -62,6 +62,8 @@
18 */
19 extern u32 __boot_cpu_mode[2];
20
21 +extern char __hyp_stub_vectors[];
22 +
23 void __hyp_set_vectors(phys_addr_t phys_vector_base);
24 void __hyp_reset_vectors(void);
25
26 --- a/arch/arm64/kernel/hyp-stub.S
27 +++ b/arch/arm64/kernel/hyp-stub.S
28 @@ -42,6 +42,7 @@ ENTRY(__hyp_stub_vectors)
29 ventry el1_fiq_invalid // FIQ 32-bit EL1
30 ventry el1_error_invalid // Error 32-bit EL1
31 ENDPROC(__hyp_stub_vectors)
32 +EXPORT_SYMBOL(__hyp_stub_vectors);
33
34 .align 11
35