Re: [RFC PATCH v4 11/12] powerpc: Add a Kconfig and a function to set new soft_enabled mask
flat view
From: Nicholas Piggin <npiggin@gmail.com>
Date: 2016-08-29 00:23:41
On Mon, 29 Aug 2016 00:07:27 +0530 Madhavan Srinivasan [off-list ref] wrote:
quoted hunk ↗ jump to hunk
New Kconfig is added "CONFIG_IRQ_DEBUG_SUPPORT" to add a warn_on to alert the usage of soft_irq_set_mask() for disabling lower bitmask interrupts. Have also moved the code under the CONFIG_TRACE_IRQFLAGS in arch_local_irq_restore() to new Kconfig as suggested. Patch also adds a new soft_irq_set_mask() to update paca->soft_enabled. Signed-off-by: Madhavan Srinivasan <redacted> --- arch/powerpc/Kconfig | 4 ++++ arch/powerpc/include/asm/hw_irq.h | 17 +++++++++++++++++ arch/powerpc/kernel/irq.c | 4 ++-- 3 files changed, 23 insertions(+), 2 deletions(-)diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 927d2ab2ce08..878f05925340 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig@@ -51,6 +51,10 @@ config TRACE_IRQFLAGS_SUPPORT bool default y +config IRQ_DEBUG_SUPPORT + bool + default n + config LOCKDEP_SUPPORT bool default ydiff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index 415734c07cfa..9f71559ce868 100644 --- a/arch/powerpc/include/asm/hw_irq.h +++ b/arch/powerpc/include/asm/hw_irq.h@@ -81,6 +81,23 @@ static inline unsigned long arch_local_irq_disable(void) return flags; } +static inline unsigned long soft_irq_set_mask(int value) +{ + unsigned long flags, zero; + +#ifdef CONFIG_IRQ_DEBUG_SUPPORT + WARN_ON(value <= IRQ_DISABLE_MASK_LINUX); +#endif + asm volatile( + "li %1,%3; lbz %0,%2(13); stb %1,%2(13)" + : "=r" (flags), "=&r" (zero) + : "i" (offsetof(struct paca_struct, soft_enabled)),\ + "i" (value) + : "memory"); + + return flags; +}
I think the warning condition should be something like WARN_ON((value & local_paca->soft_enabled) != local_paca->soft_enabled); We never want to re-enable an irq bit, because this function does not do the necessary replay. A small comment may be in order too. Thanks, Nick