|
@@ -23,6 +23,7 @@
|
|
|
|
|
|
static bool group0_trap;
|
|
|
static bool group1_trap;
|
|
|
+static bool common_trap;
|
|
|
|
|
|
void vgic_v3_set_underflow(struct kvm_vcpu *vcpu)
|
|
|
{
|
|
@@ -265,6 +266,8 @@ void vgic_v3_enable(struct kvm_vcpu *vcpu)
|
|
|
vgic_v3->vgic_hcr |= ICH_HCR_TALL0;
|
|
|
if (group1_trap)
|
|
|
vgic_v3->vgic_hcr |= ICH_HCR_TALL1;
|
|
|
+ if (common_trap)
|
|
|
+ vgic_v3->vgic_hcr |= ICH_HCR_TC;
|
|
|
}
|
|
|
|
|
|
int vgic_v3_lpi_sync_pending_status(struct kvm *kvm, struct vgic_irq *irq)
|
|
@@ -450,6 +453,12 @@ static int __init early_group1_trap_cfg(char *buf)
|
|
|
}
|
|
|
early_param("kvm-arm.vgic_v3_group1_trap", early_group1_trap_cfg);
|
|
|
|
|
|
+static int __init early_common_trap_cfg(char *buf)
|
|
|
+{
|
|
|
+ return strtobool(buf, &common_trap);
|
|
|
+}
|
|
|
+early_param("kvm-arm.vgic_v3_common_trap", early_common_trap_cfg);
|
|
|
+
|
|
|
/**
|
|
|
* vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT
|
|
|
* @node: pointer to the DT node
|
|
@@ -508,7 +517,7 @@ int vgic_v3_probe(const struct gic_kvm_info *info)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
- if (group0_trap || group1_trap) {
|
|
|
+ if (group0_trap || group1_trap || common_trap) {
|
|
|
kvm_info("GICv3 sysreg trapping enabled (reduced performance)\n");
|
|
|
static_branch_enable(&vgic_v3_cpuif_trap);
|
|
|
}
|