From 14d38827acb6435f678d5fcd8035bc73211641d0 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:56 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Explicitely map kvm_vgic_global_state at EL2" This reverts commit fa96b5be92e5639f34b0e0509788a1e23909195e. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I669c57a28410308ed0f17d553e8564c6121da56e --- arch/arm64/kvm/hyp/nvhe/setup.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index cc2dc27488e0..18638652f06d 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -150,10 +150,6 @@ static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size, if (ret) return ret; - ret = pkvm_create_mappings(&kvm_vgic_global_state, &kvm_vgic_global_state + 1, prot); - if (ret) - return ret; - start = hyp_phys_to_virt(pvmfw_base); end = start + pvmfw_size; prot = pkvm_mkstate(PAGE_HYP, PKVM_PAGE_OWNED);