This patch is part of a series which builds KVM's non-VHE hyp code separately from VHE and the rest of the kernel. The following files in hyp/ contain only code shared by VHE/nVHE: vgic-v3-sr.c, aarch32.c, vgic-v2-cpuif-proxy.c, entry.S, fpsimd.S Compile them under both configurations. Deletions in image-vars.h reflect eliminated dependencies of nVHE code on the rest of the kernel. Signed-off-by: David Brazdil <dbrazdil@xxxxxxxxxx> --- arch/arm64/kernel/image-vars.h | 19 ------------------- arch/arm64/kvm/hyp/nvhe/Makefile | 5 +++-- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index b3de24d7ecd1..e272eedfe19a 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -61,26 +61,8 @@ __efistub__ctype = _ctype; * memory mappings. */ -__hyp_text___fpsimd_restore_state = __fpsimd_restore_state; -__hyp_text___fpsimd_save_state = __fpsimd_save_state; -__hyp_text___guest_enter = __guest_enter; -__hyp_text___guest_exit = __guest_exit; __hyp_text___icache_flags = __icache_flags; __hyp_text___kvm_handle_stub_hvc = __kvm_handle_stub_hvc; -__hyp_text___vgic_v2_perform_cpuif_access = __vgic_v2_perform_cpuif_access; -__hyp_text___vgic_v3_activate_traps = __vgic_v3_activate_traps; -__hyp_text___vgic_v3_deactivate_traps = __vgic_v3_deactivate_traps; -__hyp_text___vgic_v3_get_ich_vtr_el2 = __vgic_v3_get_ich_vtr_el2; -__hyp_text___vgic_v3_init_lrs = __vgic_v3_init_lrs; -__hyp_text___vgic_v3_perform_cpuif_access = __vgic_v3_perform_cpuif_access; -__hyp_text___vgic_v3_read_vmcr = __vgic_v3_read_vmcr; -__hyp_text___vgic_v3_restore_aprs = __vgic_v3_restore_aprs; -__hyp_text___vgic_v3_restore_state = __vgic_v3_restore_state; -__hyp_text___vgic_v3_save_aprs = __vgic_v3_save_aprs; -__hyp_text___vgic_v3_save_state = __vgic_v3_save_state; -__hyp_text___vgic_v3_write_vmcr = __vgic_v3_write_vmcr; -__hyp_text_abort_guest_exit_end = abort_guest_exit_end; -__hyp_text_abort_guest_exit_start = abort_guest_exit_start; __hyp_text_arm64_const_caps_ready = arm64_const_caps_ready; __hyp_text_arm64_enable_wa2_handling = arm64_enable_wa2_handling; __hyp_text_arm64_ssbd_callback_required = arm64_ssbd_callback_required; @@ -89,7 +71,6 @@ __hyp_text_cpu_hwcaps = cpu_hwcaps; __hyp_text_kimage_voffset = kimage_voffset; __hyp_text_kvm_host_data = kvm_host_data; __hyp_text_kvm_patch_vector_branch = kvm_patch_vector_branch; -__hyp_text_kvm_skip_instr32 = kvm_skip_instr32; __hyp_text_kvm_update_va_mask = kvm_update_va_mask; __hyp_text_kvm_vgic_global_state = kvm_vgic_global_state; __hyp_text_panic = panic; diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 2b8286ee8138..41018d25118c 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -7,8 +7,9 @@ asflags-y := -D__HYPERVISOR__ ccflags-y := -D__HYPERVISOR__ -fno-stack-protector -DDISABLE_BRANCH_PROFILING \ $(DISABLE_STACKLEAK_PLUGIN) -obj-y := ../timer-sr.o timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o \ - host_hypercall.o ../hyp-entry.o +obj-y := ../vgic-v3-sr.o ../timer-sr.o timer-sr.o ../aarch32.o \ + ../vgic-v2-cpuif-proxy.o sysreg-sr.o debug-sr.o ../entry.o switch.o \ + ../fpsimd.o tlb.o host_hypercall.o ../hyp-entry.o obj-y := $(patsubst %.o,%.hyp.o,$(obj-y)) extra-y := $(patsubst %.hyp.o,%.hyp.tmp.o,$(obj-y)) -- 2.26.1 _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
