From 14283663e39dbf047bca001dac94c45e44bbb47f Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:26 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Advertise KVM vendor hypercalls to protected guests" This reverts commit dfd60e8e53e620fb5d39019c443c4663a6e99aaa. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I5f4fdc27bbd4d80d9c459061df087680959803a9 --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 4b71cac88891..dd4ad41dc5cc 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -960,26 +960,14 @@ static bool pkvm_handle_psci(struct kvm_vcpu *vcpu) bool pkvm_handle_hvc64(struct kvm_vcpu *vcpu) { u32 fn = smccc_get_function(vcpu); - u64 val[4] = { SMCCC_RET_NOT_SUPPORTED }; switch (fn) { case ARM_SMCCC_VERSION_FUNC_ID: /* Nothing to be handled by the host. Go back to the guest. */ - val[0] = ARM_SMCCC_VERSION_1_1; - break; - case ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID: - val[0] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0; - val[1] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1; - val[2] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2; - val[3] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3; - break; - case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID: - val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES); - break; + smccc_set_retval(vcpu, ARM_SMCCC_VERSION_1_1, 0, 0, 0); + return true; + default: return pkvm_handle_psci(vcpu); } - - smccc_set_retval(vcpu, val[0], val[1], val[2], val[3]); - return true; }