Commit aac94968 authored by Oliver Upton's avatar Oliver Upton Committed by Marc Zyngier

KVM: arm64: Rename SMC/HVC call handler to reflect reality

KVM handles SMCCC calls from virtual EL2 that use the SMC instruction
since commit bd36b1a9 ("KVM: arm64: nv: Handle SMCs taken from
virtual EL2"). Thus, the function name of the handler no longer reflects
reality.

Normalize the name on SMCCC, since that's the only hypercall interface
KVM supports in the first place. No fuctional change intended.
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230404154050.2270077-5-oliver.upton@linux.dev
parent e0fc6b21
...@@ -52,7 +52,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu) ...@@ -52,7 +52,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu)
return 1; return 1;
} }
ret = kvm_hvc_call_handler(vcpu); ret = kvm_smccc_call_handler(vcpu);
if (ret < 0) { if (ret < 0) {
vcpu_set_reg(vcpu, 0, ~0UL); vcpu_set_reg(vcpu, 0, ~0UL);
return 1; return 1;
...@@ -89,7 +89,7 @@ static int handle_smc(struct kvm_vcpu *vcpu) ...@@ -89,7 +89,7 @@ static int handle_smc(struct kvm_vcpu *vcpu)
* at Non-secure EL1 is trapped to EL2 if HCR_EL2.TSC==1, rather than * at Non-secure EL1 is trapped to EL2 if HCR_EL2.TSC==1, rather than
* being treated as UNDEFINED. * being treated as UNDEFINED.
*/ */
ret = kvm_hvc_call_handler(vcpu); ret = kvm_smccc_call_handler(vcpu);
if (ret < 0) if (ret < 0)
vcpu_set_reg(vcpu, 0, ~0UL); vcpu_set_reg(vcpu, 0, ~0UL);
......
...@@ -121,7 +121,7 @@ static bool kvm_hvc_call_allowed(struct kvm_vcpu *vcpu, u32 func_id) ...@@ -121,7 +121,7 @@ static bool kvm_hvc_call_allowed(struct kvm_vcpu *vcpu, u32 func_id)
} }
} }
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) int kvm_smccc_call_handler(struct kvm_vcpu *vcpu)
{ {
struct kvm_smccc_features *smccc_feat = &vcpu->kvm->arch.smccc_feat; struct kvm_smccc_features *smccc_feat = &vcpu->kvm->arch.smccc_feat;
u32 func_id = smccc_get_function(vcpu); u32 func_id = smccc_get_function(vcpu);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <asm/kvm_emulate.h> #include <asm/kvm_emulate.h>
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu); int kvm_smccc_call_handler(struct kvm_vcpu *vcpu);
static inline u32 smccc_get_function(struct kvm_vcpu *vcpu) static inline u32 smccc_get_function(struct kvm_vcpu *vcpu)
{ {
......
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