Skip to content

Commit 5c5db9e

Browse files
Sticklyman1936Marc Zyngier
authored andcommitted
irqchip/gic-v5: Drop has_gcie_v3_compat from gic_kvm_info
The presence of FEAT_GCIE_LEGACY is now handled as a CPU feature. Therefore, drop the check and flag from the GIC driver and gic_kvm_info as it is no longer required or used by KVM. Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 754e43b commit 5c5db9e

2 files changed

Lines changed: 0 additions & 9 deletions

File tree

drivers/irqchip/irq-gic-v5.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,16 +1062,9 @@ static void gicv5_set_cpuif_idbits(void)
10621062
#ifdef CONFIG_KVM
10631063
static struct gic_kvm_info gic_v5_kvm_info __initdata;
10641064

1065-
static bool __init gicv5_cpuif_has_gcie_legacy(void)
1066-
{
1067-
u64 idr0 = read_sysreg_s(SYS_ICC_IDR0_EL1);
1068-
return !!FIELD_GET(ICC_IDR0_EL1_GCIE_LEGACY, idr0);
1069-
}
1070-
10711065
static void __init gic_of_setup_kvm_info(struct device_node *node)
10721066
{
10731067
gic_v5_kvm_info.type = GIC_V5;
1074-
gic_v5_kvm_info.has_gcie_v3_compat = gicv5_cpuif_has_gcie_legacy();
10751068

10761069
/* GIC Virtual CPU interface maintenance interrupt */
10771070
gic_v5_kvm_info.no_maint_irq_mask = false;

include/linux/irqchip/arm-vgic-info.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ struct gic_kvm_info {
3636
bool has_v4_1;
3737
/* Deactivation impared, subpar stuff */
3838
bool no_hw_deactivation;
39-
/* v3 compat support (GICv5 hosts, only) */
40-
bool has_gcie_v3_compat;
4139
};
4240

4341
#ifdef CONFIG_KVM

0 commit comments

Comments
 (0)