[PATCH V2] irqchip/gic-v4.1: Replace GIC version with ID_AA64PFR0_EL1_GIC_V4P1

From: Anshuman Khandual
Date: Fri Aug 02 2024 - 04:56:20 EST


Replace open encoding for GIC version code with ID_AA64PFR0_EL1_GIC_V4P1 in
gic_cpuif_has_vsgi().

Cc: Marc Zyngier <maz@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Will Deacon <will@xxxxxxxxxx>
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Reviewed-by: Zenghui Yu <yuzenghui@xxxxxxxxxx>
Acked-by: Marc Zyngier <maz@xxxxxxxxxx>
Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
---
This patch applies on v6.11-rc1.

ID_AA64PFR0_EL1.GIC field value for V4P1 has been fixed via a recent
commit f3dfcd25455b ("arm64/sysreg: Correct the values for GICv4.1").

Changes in V2:

- Updated the subject line per Marc

Changes in V1:

https://lore.kernel.org/all/20240724054623.667595-1-anshuman.khandual@xxxxxxx/

drivers/irqchip/irq-gic-v4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-gic-v4.c b/drivers/irqchip/irq-gic-v4.c
index ca32ac19d284..58c28895f8c4 100644
--- a/drivers/irqchip/irq-gic-v4.c
+++ b/drivers/irqchip/irq-gic-v4.c
@@ -97,7 +97,7 @@ bool gic_cpuif_has_vsgi(void)

fld = cpuid_feature_extract_unsigned_field(reg, ID_AA64PFR0_EL1_GIC_SHIFT);

- return fld >= 0x3;
+ return fld >= ID_AA64PFR0_EL1_GIC_V4P1;
}
#else
bool gic_cpuif_has_vsgi(void)
--
2.30.2