aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-06-25 09:10:46 -0400
committerMarc Zyngier <marc.zyngier@arm.com>2017-08-31 10:31:42 -0400
commit4bdf502517288662d883fbaa915874790f51a2cd (patch)
treed27a0e72dc5d68d6a97b73b52db9e75b879e55e8
parent3d63cb53e221d8ab347e94aeac0b5511857beb7f (diff)
irqchip/gic-v3: Advertise GICv4 support to KVM
As KVM needs to know about the availability of GICv4 to enable direct injection of interrupts, let's advertise the feature in the gic_kvm_info structure. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r--drivers/irqchip/irq-gic-v3.c2
-rw-r--r--include/linux/irqchip/arm-gic-common.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 65fabd5f2ec6..cc968eae6c36 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1159,6 +1159,7 @@ static void __init gic_of_setup_kvm_info(struct device_node *node)
1159 if (!ret) 1159 if (!ret)
1160 gic_v3_kvm_info.vcpu = r; 1160 gic_v3_kvm_info.vcpu = r;
1161 1161
1162 gic_v3_kvm_info.has_v4 = gic_data.rdists.has_vlpis;
1162 gic_set_kvm_info(&gic_v3_kvm_info); 1163 gic_set_kvm_info(&gic_v3_kvm_info);
1163} 1164}
1164 1165
@@ -1452,6 +1453,7 @@ static void __init gic_acpi_setup_kvm_info(void)
1452 vcpu->end = vcpu->start + ACPI_GICV2_VCPU_MEM_SIZE - 1; 1453 vcpu->end = vcpu->start + ACPI_GICV2_VCPU_MEM_SIZE - 1;
1453 } 1454 }
1454 1455
1456 gic_v3_kvm_info.has_v4 = gic_data.rdists.has_vlpis;
1455 gic_set_kvm_info(&gic_v3_kvm_info); 1457 gic_set_kvm_info(&gic_v3_kvm_info);
1456} 1458}
1457 1459
diff --git a/include/linux/irqchip/arm-gic-common.h b/include/linux/irqchip/arm-gic-common.h
index c647b0547bcd..0a83b4379f34 100644
--- a/include/linux/irqchip/arm-gic-common.h
+++ b/include/linux/irqchip/arm-gic-common.h
@@ -27,6 +27,8 @@ struct gic_kvm_info {
27 unsigned int maint_irq; 27 unsigned int maint_irq;
28 /* Virtual control interface */ 28 /* Virtual control interface */
29 struct resource vctrl; 29 struct resource vctrl;
30 /* vlpi support */
31 bool has_v4;
30}; 32};
31 33
32const struct gic_kvm_info *gic_get_kvm_info(void); 34const struct gic_kvm_info *gic_get_kvm_info(void);