Commit c888b7bd authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas

arm64: rename ARM64_HAS_IRQ_PRIO_MASKING to ARM64_HAS_GIC_PRIO_MASKING

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_IRQ_PRIO_MASKING cap to ARM64_HAS_GIC_PRIO_MASKING.

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_IRQ_PRIO_MASKING/ARM64_HAS_GIC_PRIO_MASKING/'

There should be no functional change as a result of this patch.
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20230130145429.903791-3-mark.rutland@arm.comSigned-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 0e62ccb9
...@@ -806,7 +806,7 @@ static inline bool system_has_full_ptr_auth(void) ...@@ -806,7 +806,7 @@ static inline bool system_has_full_ptr_auth(void)
static __always_inline bool system_uses_irq_prio_masking(void) static __always_inline bool system_uses_irq_prio_masking(void)
{ {
return IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) && return IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) &&
cpus_have_const_cap(ARM64_HAS_IRQ_PRIO_MASKING); cpus_have_const_cap(ARM64_HAS_GIC_PRIO_MASKING);
} }
static inline bool system_supports_mte(void) static inline bool system_supports_mte(void)
......
...@@ -35,7 +35,7 @@ static inline void arch_local_irq_enable(void) ...@@ -35,7 +35,7 @@ static inline void arch_local_irq_enable(void)
asm volatile(ALTERNATIVE( asm volatile(ALTERNATIVE(
"msr daifclr, #3 // arch_local_irq_enable", "msr daifclr, #3 // arch_local_irq_enable",
__msr_s(SYS_ICC_PMR_EL1, "%0"), __msr_s(SYS_ICC_PMR_EL1, "%0"),
ARM64_HAS_IRQ_PRIO_MASKING) ARM64_HAS_GIC_PRIO_MASKING)
: :
: "r" ((unsigned long) GIC_PRIO_IRQON) : "r" ((unsigned long) GIC_PRIO_IRQON)
: "memory"); : "memory");
...@@ -54,7 +54,7 @@ static inline void arch_local_irq_disable(void) ...@@ -54,7 +54,7 @@ static inline void arch_local_irq_disable(void)
asm volatile(ALTERNATIVE( asm volatile(ALTERNATIVE(
"msr daifset, #3 // arch_local_irq_disable", "msr daifset, #3 // arch_local_irq_disable",
__msr_s(SYS_ICC_PMR_EL1, "%0"), __msr_s(SYS_ICC_PMR_EL1, "%0"),
ARM64_HAS_IRQ_PRIO_MASKING) ARM64_HAS_GIC_PRIO_MASKING)
: :
: "r" ((unsigned long) GIC_PRIO_IRQOFF) : "r" ((unsigned long) GIC_PRIO_IRQOFF)
: "memory"); : "memory");
...@@ -70,7 +70,7 @@ static inline unsigned long arch_local_save_flags(void) ...@@ -70,7 +70,7 @@ static inline unsigned long arch_local_save_flags(void)
asm volatile(ALTERNATIVE( asm volatile(ALTERNATIVE(
"mrs %0, daif", "mrs %0, daif",
__mrs_s("%0", SYS_ICC_PMR_EL1), __mrs_s("%0", SYS_ICC_PMR_EL1),
ARM64_HAS_IRQ_PRIO_MASKING) ARM64_HAS_GIC_PRIO_MASKING)
: "=&r" (flags) : "=&r" (flags)
: :
: "memory"); : "memory");
...@@ -85,7 +85,7 @@ static inline int arch_irqs_disabled_flags(unsigned long flags) ...@@ -85,7 +85,7 @@ static inline int arch_irqs_disabled_flags(unsigned long flags)
asm volatile(ALTERNATIVE( asm volatile(ALTERNATIVE(
"and %w0, %w1, #" __stringify(PSR_I_BIT), "and %w0, %w1, #" __stringify(PSR_I_BIT),
"eor %w0, %w1, #" __stringify(GIC_PRIO_IRQON), "eor %w0, %w1, #" __stringify(GIC_PRIO_IRQON),
ARM64_HAS_IRQ_PRIO_MASKING) ARM64_HAS_GIC_PRIO_MASKING)
: "=&r" (res) : "=&r" (res)
: "r" ((int) flags) : "r" ((int) flags)
: "memory"); : "memory");
...@@ -122,7 +122,7 @@ static inline void arch_local_irq_restore(unsigned long flags) ...@@ -122,7 +122,7 @@ static inline void arch_local_irq_restore(unsigned long flags)
asm volatile(ALTERNATIVE( asm volatile(ALTERNATIVE(
"msr daif, %0", "msr daif, %0",
__msr_s(SYS_ICC_PMR_EL1, "%0"), __msr_s(SYS_ICC_PMR_EL1, "%0"),
ARM64_HAS_IRQ_PRIO_MASKING) ARM64_HAS_GIC_PRIO_MASKING)
: :
: "r" (flags) : "r" (flags)
: "memory"); : "memory");
......
...@@ -194,7 +194,7 @@ struct pt_regs { ...@@ -194,7 +194,7 @@ struct pt_regs {
u32 unused2; u32 unused2;
#endif #endif
u64 sdei_ttbr1; u64 sdei_ttbr1;
/* Only valid when ARM64_HAS_IRQ_PRIO_MASKING is enabled. */ /* Only valid when ARM64_HAS_GIC_PRIO_MASKING is enabled. */
u64 pmr_save; u64 pmr_save;
u64 stackframe[2]; u64 stackframe[2];
......
...@@ -2534,7 +2534,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { ...@@ -2534,7 +2534,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = {
* Depends on having GICv3 * Depends on having GICv3
*/ */
.desc = "IRQ priority masking", .desc = "IRQ priority masking",
.capability = ARM64_HAS_IRQ_PRIO_MASKING, .capability = ARM64_HAS_GIC_PRIO_MASKING,
.type = ARM64_CPUCAP_STRICT_BOOT_CPU_FEATURE, .type = ARM64_CPUCAP_STRICT_BOOT_CPU_FEATURE,
.matches = can_use_gic_priorities, .matches = can_use_gic_priorities,
.sys_reg = SYS_ID_AA64PFR0_EL1, .sys_reg = SYS_ID_AA64PFR0_EL1,
......
...@@ -312,7 +312,7 @@ alternative_else_nop_endif ...@@ -312,7 +312,7 @@ alternative_else_nop_endif
#ifdef CONFIG_ARM64_PSEUDO_NMI #ifdef CONFIG_ARM64_PSEUDO_NMI
/* Save pmr */ /* Save pmr */
alternative_if ARM64_HAS_IRQ_PRIO_MASKING alternative_if ARM64_HAS_GIC_PRIO_MASKING
mrs_s x20, SYS_ICC_PMR_EL1 mrs_s x20, SYS_ICC_PMR_EL1
str x20, [sp, #S_PMR_SAVE] str x20, [sp, #S_PMR_SAVE]
mov x20, #GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET mov x20, #GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET
...@@ -337,7 +337,7 @@ alternative_else_nop_endif ...@@ -337,7 +337,7 @@ alternative_else_nop_endif
#ifdef CONFIG_ARM64_PSEUDO_NMI #ifdef CONFIG_ARM64_PSEUDO_NMI
/* Restore pmr */ /* Restore pmr */
alternative_if ARM64_HAS_IRQ_PRIO_MASKING alternative_if ARM64_HAS_GIC_PRIO_MASKING
ldr x20, [sp, #S_PMR_SAVE] ldr x20, [sp, #S_PMR_SAVE]
msr_s SYS_ICC_PMR_EL1, x20 msr_s SYS_ICC_PMR_EL1, x20
mrs_s x21, SYS_ICC_CTLR_EL1 mrs_s x21, SYS_ICC_CTLR_EL1
......
...@@ -29,7 +29,7 @@ HAS_GENERIC_AUTH_ARCH_QARMA3 ...@@ -29,7 +29,7 @@ HAS_GENERIC_AUTH_ARCH_QARMA3
HAS_GENERIC_AUTH_ARCH_QARMA5 HAS_GENERIC_AUTH_ARCH_QARMA5
HAS_GENERIC_AUTH_IMP_DEF HAS_GENERIC_AUTH_IMP_DEF
HAS_GIC_CPUIF_SYSREGS HAS_GIC_CPUIF_SYSREGS
HAS_IRQ_PRIO_MASKING HAS_GIC_PRIO_MASKING
HAS_LDAPR HAS_LDAPR
HAS_LSE_ATOMICS HAS_LSE_ATOMICS
HAS_NO_FPSIMD HAS_NO_FPSIMD
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment