All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH v2 11/19] powerpc: handle irq_enter/irq_exit in interrupt handler wrappers
Date: Wed, 11 Nov 2020 19:44:02 +1000	[thread overview]
Message-ID: <20201111094410.3038123-12-npiggin@gmail.com> (raw)
In-Reply-To: <20201111094410.3038123-1-npiggin@gmail.com>

Move irq_enter/irq_exit into asynchronous interrupt handler wrappers.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/include/asm/interrupt.h | 2 ++
 arch/powerpc/kernel/dbell.c          | 3 +--
 arch/powerpc/kernel/irq.c            | 4 ----
 arch/powerpc/kernel/tau_6xx.c        | 3 ---
 arch/powerpc/kernel/time.c           | 4 ++--
 arch/powerpc/kernel/traps.c          | 6 ------
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index ef1f6b595ffd..a354da1353ec 100644
--- a/arch/powerpc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
@@ -43,10 +43,12 @@ static inline void interrupt_exit_prepare(struct pt_regs *regs, struct interrupt
 static inline void interrupt_async_enter_prepare(struct pt_regs *regs, struct interrupt_state *state)
 {
 	interrupt_enter_prepare(regs, state);
+	irq_enter();
 }
 
 static inline void interrupt_async_exit_prepare(struct pt_regs *regs, struct interrupt_state *state)
 {
+	irq_exit();
 	interrupt_exit_prepare(regs, state);
 }
 
diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c
index c0f99f8ffa7d..84ee9c511459 100644
--- a/arch/powerpc/kernel/dbell.c
+++ b/arch/powerpc/kernel/dbell.c
@@ -22,7 +22,6 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(doorbell_exception)
 #ifdef CONFIG_SMP
 	struct pt_regs *old_regs = set_irq_regs(regs);
 
-	irq_enter();
 	trace_doorbell_entry(regs);
 
 	ppc_msgsync();
@@ -35,7 +34,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(doorbell_exception)
 	smp_ipi_demux_relaxed(); /* already performed the barrier */
 
 	trace_doorbell_exit(regs);
-	irq_exit();
+
 	set_irq_regs(old_regs);
 #else /* CONFIG_SMP */
 	printk(KERN_WARNING "Received doorbell on non-smp system\n");
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 2055d204d08e..681abb7c0507 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -641,8 +641,6 @@ void __do_irq(struct pt_regs *regs)
 {
 	unsigned int irq;
 
-	irq_enter();
-
 	trace_irq_entry(regs);
 
 	/*
@@ -662,8 +660,6 @@ void __do_irq(struct pt_regs *regs)
 		generic_handle_irq(irq);
 
 	trace_irq_exit(regs);
-
-	irq_exit();
 }
 
 DEFINE_INTERRUPT_HANDLER_ASYNC(do_IRQ)
diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c
index 46b2e5de4ef5..d864f07bab74 100644
--- a/arch/powerpc/kernel/tau_6xx.c
+++ b/arch/powerpc/kernel/tau_6xx.c
@@ -104,12 +104,9 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(TAUException)
 {
 	int cpu = smp_processor_id();
 
-	irq_enter();
 	tau[cpu].interrupts++;
 
 	TAUupdate(cpu);
-
-	irq_exit();
 }
 #endif /* CONFIG_TAU_INT */
 
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 0089df57bb49..7dd0ab55e700 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -585,7 +585,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt)
 #endif
 
 	old_regs = set_irq_regs(regs);
-	irq_enter();
+
 	trace_timer_interrupt_entry(regs);
 
 	if (test_irq_work_pending()) {
@@ -610,7 +610,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt)
 	}
 
 	trace_timer_interrupt_exit(regs);
-	irq_exit();
+
 	set_irq_regs(old_regs);
 }
 EXPORT_SYMBOL(timer_interrupt);
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 31b491d8937a..7baa5ba5cfb3 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1082,7 +1082,6 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(handle_hmi_exception)
 	struct pt_regs *old_regs;
 
 	old_regs = set_irq_regs(regs);
-	irq_enter();
 
 #ifdef CONFIG_VSX
 	/* Real mode flagged P9 special emu is needed */
@@ -1102,7 +1101,6 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(handle_hmi_exception)
 	if (ppc_md.handle_hmi_exception)
 		ppc_md.handle_hmi_exception(regs);
 
-	irq_exit();
 	set_irq_regs(old_regs);
 }
 
@@ -1916,13 +1914,9 @@ DEFINE_INTERRUPT_HANDLER_NMI(performance_monitor_exception_nmi)
 
 DEFINE_INTERRUPT_HANDLER_ASYNC(performance_monitor_exception_async)
 {
-	irq_enter();
-
 	__this_cpu_inc(irq_stat.pmu_irqs);
 
 	perf_irq(regs);
-
-	irq_exit();
 }
 
 void performance_monitor_exception(struct pt_regs *regs)
-- 
2.23.0


  parent reply	other threads:[~2020-11-11 10:26 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-11  9:43 [PATCH v2 00/19] powerpc: interrupt wrappers Nicholas Piggin
2020-11-11  9:43 ` [PATCH v2 01/19] powerpc/64s: move the last of the page fault handling logic to C Nicholas Piggin
2020-11-11  9:43 ` [PATCH v2 02/19] powerpc: remove arguments from fault handler functions Nicholas Piggin
2020-11-11  9:43 ` [PATCH v2 03/19] powerpc: bad_page_fault, do_break get registers from regs Nicholas Piggin
2020-11-14 19:07   ` Christophe Leroy
2020-11-16  1:52     ` Nicholas Piggin
2020-11-11  9:43 ` [PATCH v2 04/19] powerpc/perf: move perf irq/nmi handling details into traps.c Nicholas Piggin
2020-11-23 17:54   ` Athira Rajeev
2020-11-11  9:43 ` [PATCH v2 05/19] powerpc: interrupt handler wrapper functions Nicholas Piggin
2020-11-13 21:52   ` kernel test robot
2020-11-13 21:52     ` kernel test robot
2020-11-14 19:12   ` kernel test robot
2020-11-14 19:12     ` kernel test robot
2020-11-11  9:43 ` [PATCH v2 06/19] powerpc: add interrupt wrapper entry / exit stub functions Nicholas Piggin
2020-11-11  9:43 ` [PATCH v2 07/19] powerpc: add interrupt_cond_local_irq_enable helper Nicholas Piggin
2020-11-11  9:43 ` [PATCH v2 08/19] powerpc/64: context tracking remove _TIF_NOHZ Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 09/19] powerpc/64: context tracking move to interrupt wrappers Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 10/19] powerpc/64: add context tracking to asynchronous interrupts Nicholas Piggin
2020-11-11  9:44 ` Nicholas Piggin [this message]
2020-11-11  9:44 ` [PATCH v2 12/19] powerpc/64s: move context tracking exit to interrupt exit path Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 13/19] powerpc/64s: reconcile interrupts in C Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 14/19] powerpc/64: move account_stolen_time into its own function Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 15/19] powerpc/64: entry cpu time accounting in C Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 16/19] powerpc: move NMI entry/exit code into wrapper Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 17/19] powerpc/64s: move NMI soft-mask handling to C Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 18/19] powerpc/64s: runlatch interrupt handling in C Nicholas Piggin
2020-11-11  9:44 ` [PATCH v2 19/19] powerpc/64s: power4 nap fixup " Nicholas Piggin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201111094410.3038123-12-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.