powerpc/interrupt: Also use exit_must_hard_disable() on PPC32

chleroy · mpe · commit 767e6e7130b2 · 2021-06-26T09:43:34.000+10:00
Reduce #ifdefs a bit by making exit_must_hard_disable() return true on PPC32. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/52531029563c1fc823b790058e799d0ca71b028c.1624631463.git.christophe.leroy@csgroup.eu
diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c
@@ -33,10 +33,10 @@ static inline bool exit_must_hard_disable(void)
 {
 	return static_branch_unlikely(&interrupt_exit_not_reentrant);
 }
-#elif defined(CONFIG_PPC64)
+#else
 static inline bool exit_must_hard_disable(void)
 {
-	return false;
+	return IS_ENABLED(CONFIG_PPC32);
 }
 #endif
 
@@ -56,12 +56,10 @@ static notrace __always_inline bool prep_irq_for_enabled_exit(bool restartable)
 	/* This must be done with RI=1 because tracing may touch vmaps */
 	trace_hardirqs_on();
 
-#ifdef CONFIG_PPC32
-	__hard_EE_RI_disable();
-#else
 	if (exit_must_hard_disable() || !restartable)
 		__hard_EE_RI_disable();
 
+#ifdef CONFIG_PPC64
 	/* This pattern matches prep_irq_for_idle */
 	if (unlikely(lazy_irq_pending_nocheck())) {
 		if (exit_must_hard_disable() || !restartable) {

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ static inline bool exit_must_hard_disable(void)`
`33`	`33`	`{`
`34`	`34`	`return static_branch_unlikely(&interrupt_exit_not_reentrant);`
`35`	`35`	`}`
`36`		`-#elif defined(CONFIG_PPC64)`
	`36`	`+#else`
`37`	`37`	`static inline bool exit_must_hard_disable(void)`
`38`	`38`	`{`
`39`		`- return false;`
	`39`	`+ return IS_ENABLED(CONFIG_PPC32);`
`40`	`40`	`}`
`41`	`41`	`#endif`
`42`	`42`
`@@ -56,12 +56,10 @@ static notrace __always_inline bool prep_irq_for_enabled_exit(bool restartable)`
`56`	`56`	`/* This must be done with RI=1 because tracing may touch vmaps */`
`57`	`57`	`trace_hardirqs_on();`
`58`	`58`
`59`		`-#ifdef CONFIG_PPC32`
`60`		`- __hard_EE_RI_disable();`
`61`		`-#else`
`62`	`59`	`if (exit_must_hard_disable() \|\| !restartable)`
`63`	`60`	`__hard_EE_RI_disable();`
`64`	`61`
	`62`	`+#ifdef CONFIG_PPC64`
`65`	`63`	`/* This pattern matches prep_irq_for_idle */`
`66`	`64`	`if (unlikely(lazy_irq_pending_nocheck())) {`
`67`	`65`	`if (exit_must_hard_disable() \|\| !restartable) {`