diff options
| author | Marc Zyngier <maz@kernel.org> | 2026-03-21 21:24:17 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2026-03-23 11:03:53 +0000 |
| commit | ba64e273eac3d7ec4a2b621b3620c4d3b0399858 (patch) | |
| tree | 7952fbb31316bd9992cba78a763083824a0f9dda /arch | |
| parent | 1536a0b1386850b67a9ea840e57b7b475e895fed (diff) | |
| download | lwn-ba64e273eac3d7ec4a2b621b3620c4d3b0399858.tar.gz lwn-ba64e273eac3d7ec4a2b621b3620c4d3b0399858.zip | |
KVM: arm64: pkvm: Turn __kvm_hyp_init_cpu into an inner label
__kvm_hyp_init_cpu really is an internal label for kvm_hyp_cpu_entry
and kvm_hyp_cpu_resume.
Make it clear that this is what it is, and drop a pointless branch
in kvm_hyp_cpu_resume.
Reviewed-by: Fuad Tabba <tabba@google.com>
Tested-by: Fuad Tabba <tabba@google.com>
Link: https://patch.msgid.link/20260321212419.2803972-4-maz@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/hyp-init.S | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/hyp-init.S index 55e0dce65dc5..2e80fcbff2df 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S @@ -175,7 +175,6 @@ SYM_CODE_END(___kvm_hyp_init) SYM_CODE_START(kvm_hyp_cpu_entry) mov x1, #1 // is_cpu_on = true b __kvm_hyp_init_cpu -SYM_CODE_END(kvm_hyp_cpu_entry) /* * PSCI CPU_SUSPEND / SYSTEM_SUSPEND entry point @@ -184,17 +183,8 @@ SYM_CODE_END(kvm_hyp_cpu_entry) */ SYM_CODE_START(kvm_hyp_cpu_resume) mov x1, #0 // is_cpu_on = false - b __kvm_hyp_init_cpu -SYM_CODE_END(kvm_hyp_cpu_resume) -/* - * Common code for CPU entry points. Initializes EL2 state and - * installs the hypervisor before handing over to a C handler. - * - * x0: struct kvm_nvhe_init_params PA - * x1: bool is_cpu_on - */ -SYM_CODE_START_LOCAL(__kvm_hyp_init_cpu) +SYM_INNER_LABEL(__kvm_hyp_init_cpu, SYM_L_LOCAL) mov x28, x0 // Stash arguments mov x29, x1 @@ -223,7 +213,8 @@ SYM_CODE_START_LOCAL(__kvm_hyp_init_cpu) 1: wfe wfi b 1b -SYM_CODE_END(__kvm_hyp_init_cpu) +SYM_CODE_END(kvm_hyp_cpu_resume) +SYM_CODE_END(kvm_hyp_cpu_entry) SYM_CODE_START(__kvm_handle_stub_hvc) /* |