From: Nicholas Piggin Date: Fri, 4 May 2018 17:19:26 +0000 (+1000) Subject: powerpc/pseries: put cede MSR[EE] check under IRQ_SOFT_MASK_DEBUG X-Git-Tag: v4.18-rc1~108^2~108 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f4b61b2777dfd1692189ab3e38f8eb7dc669512;p=thirdparty%2Fkernel%2Flinux.git powerpc/pseries: put cede MSR[EE] check under IRQ_SOFT_MASK_DEBUG This check does not catch IRQ soft mask bugs, but this option is slightly more suitable than TRACE_IRQFLAGS. Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/include/asm/plpar_wrappers.h b/arch/powerpc/include/asm/plpar_wrappers.h index 96c1a46acbd06..cff5a411e5954 100644 --- a/arch/powerpc/include/asm/plpar_wrappers.h +++ b/arch/powerpc/include/asm/plpar_wrappers.h @@ -39,10 +39,10 @@ static inline long extended_cede_processor(unsigned long latency_hint) set_cede_latency_hint(latency_hint); rc = cede_processor(); -#ifdef CONFIG_TRACE_IRQFLAGS - /* Ensure that H_CEDE returns with IRQs on */ - if (WARN_ON(!(mfmsr() & MSR_EE))) - __hard_irq_enable(); +#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG + /* Ensure that H_CEDE returns with IRQs on */ + if (WARN_ON(!(mfmsr() & MSR_EE))) + __hard_irq_enable(); #endif set_cede_latency_hint(old_latency_hint);