[RFC PATCH 20/36] arm64: irqflags: Switch to CONFIG_DEBUG_IRQFLAGS

[Jinjie Ruan]

On 7/9/2026 8:13 PM, Vladimir Murzin wrote:
> All exception state debug logic now lives under the generic
> CONFIG_DEBUG_IRQFLAGS. Move the two remaining cases from the dedicated
> config option to CONFIG_DEBUG_IRQFLAGS as well, keeping all related
> debug logic under a single configuration option.
> 
> Signed-off-by: Vladimir Murzin <vladimir.murzin at arm.com>
> ---
>  arch/arm64/include/asm/irqflags.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h
> index 62f047702493..585d3ce15d80 100644
> --- a/arch/arm64/include/asm/irqflags.h
> +++ b/arch/arm64/include/asm/irqflags.h
> @@ -47,7 +47,7 @@ static __always_inline void __daif_local_irq_enable(void)
>  
>  static __always_inline void __pmr_local_irq_enable(void)
>  {
> -	if (IS_ENABLED(CONFIG_ARM64_DEBUG_PRIORITY_MASKING)) {
> +	if (IS_ENABLED(CONFIG_DEBUG_IRQFLAGS)) {
>  		u32 pmr = read_sysreg_s(SYS_ICC_PMR_EL1);
>  		WARN_ON_ONCE(pmr != GIC_PRIO_IRQON && pmr != GIC_PRIO_IRQOFF);
>  	}
> @@ -76,7 +76,7 @@ static __always_inline void __daif_local_irq_disable(void)
>  
>  static __always_inline void __pmr_local_irq_disable(void)
>  {
> -	if (IS_ENABLED(CONFIG_ARM64_DEBUG_PRIORITY_MASKING)) {
> +	if (IS_ENABLED(CONFIG_DEBUG_IRQFLAGS)) {
Reviewed-by: Jinjie Ruan <ruanjinjie at huawei.com>

>  		u32 pmr = read_sysreg_s(SYS_ICC_PMR_EL1);
>  		WARN_ON_ONCE(pmr != GIC_PRIO_IRQON && pmr != GIC_PRIO_IRQOFF);
>  	}