shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FROMLIST: KVM: arm64: pkvm: Disable GICv2 support"

Browse Source 
This reverts commit 0a398e8a31.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I63d061713e749e62c9d5b6632e8e14bf81b9c333
This commit is contained in:
Will Deacon
2022-07-07 15:52:04 +01:00
parent 288ae10367
commit b076e3261e
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/kvm/vgic/vgic-v2.c
View File

@@ -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;

2
arch/arm64/kvm/vgic/vgic-v3.c
View File

@@ -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);