|
|
@@ -435,6 +435,12 @@ out:
|
|
|
|
|
|
DEFINE_STATIC_KEY_FALSE(vgic_v3_cpuif_trap);
|
|
|
|
|
|
+static int __init early_group1_trap_cfg(char *buf)
|
|
|
+{
|
|
|
+ return strtobool(buf, &group1_trap);
|
|
|
+}
|
|
|
+early_param("kvm-arm.vgic_v3_group1_trap", early_group1_trap_cfg);
|
|
|
+
|
|
|
/**
|
|
|
* vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT
|
|
|
* @node: pointer to the DT node
|
|
|
@@ -486,6 +492,11 @@ int vgic_v3_probe(const struct gic_kvm_info *info)
|
|
|
if (kvm_vgic_global_state.vcpu_base == 0)
|
|
|
kvm_info("disabling GICv2 emulation\n");
|
|
|
|
|
|
+ if (group1_trap) {
|
|
|
+ kvm_info("GICv3 sysreg trapping enabled (reduced performance)\n");
|
|
|
+ static_branch_enable(&vgic_v3_cpuif_trap);
|
|
|
+ }
|
|
|
+
|
|
|
kvm_vgic_global_state.vctrl_base = NULL;
|
|
|
kvm_vgic_global_state.type = VGIC_V3;
|
|
|
kvm_vgic_global_state.max_gic_vcpus = VGIC_V3_MAX_CPUS;
|