Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64: rename ARM64_HAS_SYSREG_GIC_CPUIF to ARM64_HAS_GIC_CPUIF_SYSREGS

Subsequent patches will add more GIC-related cpucaps. When we do so, it
would be nice to give them a consistent HAS_GIC_* prefix.

In preparation for doing so, this patch renames the existing
ARM64_HAS_SYSREG_GIC_CPUIF cap to ARM64_HAS_GIC_CPUIF_SYSREGS.

The 'CPUIF_SYSREGS' suffix is chosen so that this will be ordered ahead
of other ARM64_HAS_GIC_* definitions in subsequent patches.

The cpucaps file was hand-modified; all other changes were scripted
with:

find . -type f -name '*.[chS]' -print0 | \
xargs -0 sed -i
's/ARM64_HAS_SYSREG_GIC_CPUIF/ARM64_HAS_GIC_CPUIF_SYSREGS/'

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20230130145429.903791-2-mark.rutland@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

authored by

Mark Rutland and committed by
Catalin Marinas
0e62ccb9 b7bfaa76

+3 -3
+1 -1
arch/arm64/kernel/cpufeature.c
··· 2142 2142 }, 2143 2143 { 2144 2144 .desc = "GIC system register CPU interface", 2145 - .capability = ARM64_HAS_SYSREG_GIC_CPUIF, 2145 + .capability = ARM64_HAS_GIC_CPUIF_SYSREGS, 2146 2146 .type = ARM64_CPUCAP_STRICT_BOOT_CPU_FEATURE, 2147 2147 .matches = has_useable_gicv3_cpuif, 2148 2148 .sys_reg = SYS_ID_AA64PFR0_EL1,
+1 -1
arch/arm64/tools/cpucaps
··· 28 28 HAS_GENERIC_AUTH_ARCH_QARMA3 29 29 HAS_GENERIC_AUTH_ARCH_QARMA5 30 30 HAS_GENERIC_AUTH_IMP_DEF 31 + HAS_GIC_CPUIF_SYSREGS 31 32 HAS_IRQ_PRIO_MASKING 32 33 HAS_LDAPR 33 34 HAS_LSE_ATOMICS ··· 39 38 HAS_RNG 40 39 HAS_SB 41 40 HAS_STAGE2_FWB 42 - HAS_SYSREG_GIC_CPUIF 43 41 HAS_TIDCP1 44 42 HAS_TLB_RANGE 45 43 HAS_VIRT_HOST_EXTN
+1 -1
drivers/irqchip/irq-gic.c
··· 54 54 55 55 static void gic_check_cpu_features(void) 56 56 { 57 - WARN_TAINT_ONCE(this_cpu_has_cap(ARM64_HAS_SYSREG_GIC_CPUIF), 57 + WARN_TAINT_ONCE(this_cpu_has_cap(ARM64_HAS_GIC_CPUIF_SYSREGS), 58 58 TAINT_CPU_OUT_OF_SPEC, 59 59 "GICv3 system registers enabled, broken firmware!\n"); 60 60 }