diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-06-06 11:15:11 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-06-06 11:15:11 +0100 |
| commit | 32e92b71b32ad08e8d85aba6e10709b10f32d90a (patch) | |
| tree | 64e07a2022b7d00b67481c0bd518dd104775ac18 /drivers/irqchip/irq-gic.c | |
| parent | 8124c8a6b35386f73523d27eacb71b5364a68c4c (diff) | |
| parent | b6ca556c352979d09659027dc1559fad15b72649 (diff) | |
Merge branch kvm-arm64/m1 into kvmarm-master/next
Rework the KVM GIC and timer to cope with lesser HW such as
the Apple M1 SoC.
* kvm-arm64/m1:
irqchip/apple-aic: Advertise some level of vGICv3 compatibility
KVM: arm64: timer: Add support for SW-based deactivation
KVM: arm64: timer: Refactor IRQ configuration
KVM: arm64: vgic: Implement SW-driven deactivation
KVM: arm64: vgic: move irq->get_input_level into an ops structure
KVM: arm64: vgic: Let an interrupt controller advertise lack of HW deactivation
KVM: arm64: vgic: Be tolerant to the lack of maintenance interrupt masking
KVM: arm64: Handle physical FIQ as an IRQ while running a guest
irqchip/gic: Split vGIC probing information from the GIC code
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index b1d9c22caf2e..2de9ec8ece0c 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -119,7 +119,7 @@ static DEFINE_STATIC_KEY_TRUE(supports_deactivate_key); static struct gic_chip_data gic_data[CONFIG_ARM_GIC_MAX_NR] __read_mostly; -static struct gic_kvm_info gic_v2_kvm_info; +static struct gic_kvm_info gic_v2_kvm_info __initdata; static DEFINE_PER_CPU(u32, sgi_intid); @@ -1451,7 +1451,7 @@ static void __init gic_of_setup_kvm_info(struct device_node *node) return; if (static_branch_likely(&supports_deactivate_key)) - gic_set_kvm_info(&gic_v2_kvm_info); + vgic_set_kvm_info(&gic_v2_kvm_info); } int __init @@ -1618,7 +1618,7 @@ static void __init gic_acpi_setup_kvm_info(void) gic_v2_kvm_info.maint_irq = irq; - gic_set_kvm_info(&gic_v2_kvm_info); + vgic_set_kvm_info(&gic_v2_kvm_info); } static int __init gic_v2_acpi_init(union acpi_subtable_headers *header, |