Skip to content

Commit

Permalink
powerpc/64: Disable irq restore warning for now
Browse files Browse the repository at this point in the history
We recently added a warning in arch_local_irq_restore() to check that
the soft masking state matches reality.

Unfortunately it trips in a few places, which are not entirely trivial
to fix. The key problem is if we're doing function_graph tracing of
restore_math(), the warning pops and then seems to recurse. It's not
entirely clear because the system continuously oopses on all CPUs,
with the output interleaved and unreadable.

It's also been observed on a G5 coming out of idle.

Until we can fix those cases disable the warning for now.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Michael Ellerman committed Aug 7, 2018
1 parent 9eab990 commit 4da1f79
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions arch/powerpc/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,16 @@ notrace void arch_local_irq_restore(unsigned long mask)
*/
irq_happened = get_irq_happened();
if (!irq_happened) {
#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG
WARN_ON(!(mfmsr() & MSR_EE));
#endif
/*
* FIXME. Here we'd like to be able to do:
*
* #ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG
* WARN_ON(!(mfmsr() & MSR_EE));
* #endif
*
* But currently it hits in a few paths, we should fix those and
* enable the warning.
*/
return;
}

Expand Down

0 comments on commit 4da1f79

Please sign in to comment.