From b076e3261eab2d4ecbb0476287bf4635aa52c067 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:52:04 +0100 Subject: [PATCH] Revert "FROMLIST: KVM: arm64: pkvm: Disable GICv2 support" This reverts commit 0a398e8a312ee87db3977c00be5346942a0f4453. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I63d061713e749e62c9d5b6632e8e14bf81b9c333 --- arch/arm64/kvm/vgic/vgic-v2.c | 5 ----- arch/arm64/kvm/vgic/vgic-v3.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-v2.c b/arch/arm64/kvm/vgic/vgic-v2.c index 8e337a0d7817..95a18cec14a3 100644 --- a/arch/arm64/kvm/vgic/vgic-v2.c +++ b/arch/arm64/kvm/vgic/vgic-v2.c @@ -345,11 +345,6 @@ int vgic_v2_probe(const struct gic_kvm_info *info) int ret; u32 vtr; - if (is_protected_kvm_enabled()) { - kvm_err("GICv2 not supported in protected mode\n"); - return -ENXIO; - } - if (!info->vctrl.start) { kvm_err("GICH not present in the firmware table\n"); return -ENXIO; diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c index debad4e6e6c9..04f62c4b07fb 100644 --- a/arch/arm64/kvm/vgic/vgic-v3.c +++ b/arch/arm64/kvm/vgic/vgic-v3.c @@ -651,7 +651,7 @@ int vgic_v3_probe(const struct gic_kvm_info *info) } else if (!PAGE_ALIGNED(info->vcpu.start)) { pr_warn("GICV physical address 0x%llx not page aligned\n", (unsigned long long)info->vcpu.start); - } else if (kvm_get_mode() != KVM_MODE_PROTECTED) { + } else { kvm_vgic_global_state.vcpu_base = info->vcpu.start; kvm_vgic_global_state.can_emulate_gicv2 = true; ret = kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V2);