From 20840b293b2a386c71b8cdee9007d18ca9c18e07 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:25 +0100 Subject: [PATCH] Revert "FROMLIST: firmware/smccc: Call arch-specific hook on discovering KVM services" This reverts commit 8e3a834c92b4aa9110a4b9a5e102bae8d175d3b1. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ifbbb03e1bec289ec469f4baa7064639b4d333612 --- arch/arm/include/asm/hypervisor.h | 1 - arch/arm64/include/asm/hypervisor.h | 1 - drivers/firmware/smccc/kvm_guest.c | 4 ---- 3 files changed, 6 deletions(-) diff --git a/arch/arm/include/asm/hypervisor.h b/arch/arm/include/asm/hypervisor.h index 8133c8c81a35..bd61502b9715 100644 --- a/arch/arm/include/asm/hypervisor.h +++ b/arch/arm/include/asm/hypervisor.h @@ -6,6 +6,5 @@ void kvm_init_hyp_services(void); bool kvm_arm_hyp_service_available(u32 func_id); -void kvm_arm_init_hyp_services(void); #endif diff --git a/arch/arm64/include/asm/hypervisor.h b/arch/arm64/include/asm/hypervisor.h index 8e77f411903f..0ae427f352c8 100644 --- a/arch/arm64/include/asm/hypervisor.h +++ b/arch/arm64/include/asm/hypervisor.h @@ -6,6 +6,5 @@ void kvm_init_hyp_services(void); bool kvm_arm_hyp_service_available(u32 func_id); -void kvm_arm_init_hyp_services(void); #endif diff --git a/drivers/firmware/smccc/kvm_guest.c b/drivers/firmware/smccc/kvm_guest.c index 56169e73252a..2d3e866decaa 100644 --- a/drivers/firmware/smccc/kvm_guest.c +++ b/drivers/firmware/smccc/kvm_guest.c @@ -9,8 +9,6 @@ #include -void __weak kvm_arm_init_hyp_services(void) {} - static DECLARE_BITMAP(__kvm_arm_hyp_services, ARM_SMCCC_KVM_NUM_FUNCS) __ro_after_init = { }; void __init kvm_init_hyp_services(void) @@ -40,8 +38,6 @@ void __init kvm_init_hyp_services(void) pr_info("hypervisor services detected (0x%08lx 0x%08lx 0x%08lx 0x%08lx)\n", res.a3, res.a2, res.a1, res.a0); - - kvm_arm_init_hyp_services(); } bool kvm_arm_hyp_service_available(u32 func_id)