mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: linux-kernel@vger.kernel.org
Cc: uclinux-dist-devel@blackfin.uclinux.org
Subject: [PATCH 08/25] Blackfin: abstract irq14 lowering in do_irq
Date: Sat, 20 Jun 2009 14:44:31 -0400	[thread overview]
Message-ID: <1245523488-26536-9-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1245523488-26536-1-git-send-email-vapier@gentoo.org>

Split out the optional IRQ14 lowering code to further simplify the
asm_do_IRQ() function and keep the ifdef nest under control.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 arch/blackfin/kernel/irqchip.c |   43 +++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index 7378440..4b5fd36 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -104,6 +104,29 @@ static void check_stack_overflow(int irq)
 static inline void check_stack_overflow(int irq) { }
 #endif
 
+#ifndef CONFIG_IPIPE
+static void maybe_lower_to_irq14(void)
+{
+	unsigned short pending, other_ints;
+
+	/*
+	 * If we're the only interrupt running (ignoring IRQ15 which
+	 * is for syscalls), lower our priority to IRQ14 so that
+	 * softirqs run at that level.  If there's another,
+	 * lower-level interrupt, irq_exit will defer softirqs to
+	 * that. If the interrupt pipeline is enabled, we are already
+	 * running at IRQ14 priority, so we don't need this code.
+	 */
+	CSYNC();
+	pending = bfin_read_IPEND() & ~0x8000;
+	other_ints = pending & (pending - 1);
+	if (other_ints == 0)
+		lower_to_irq14();
+}
+#else
+static inline void maybe_lower_to_irq14(void) { }
+#endif
+
 /*
  * do_IRQ handles all hardware IRQs.  Decoded IRQs should not
  * come via this function.  Instead, they should provide their
@@ -114,9 +137,6 @@ __attribute__((l1_text))
 #endif
 asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 {
-#ifndef CONFIG_IPIPE
-	unsigned short pending, other_ints;
-#endif
 	struct pt_regs *old_regs = set_irq_regs(regs);
 
 	irq_enter();
@@ -132,21 +152,8 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 	else
 		generic_handle_irq(irq);
 
-#ifndef CONFIG_IPIPE
-	/*
-	 * If we're the only interrupt running (ignoring IRQ15 which
-	 * is for syscalls), lower our priority to IRQ14 so that
-	 * softirqs run at that level.  If there's another,
-	 * lower-level interrupt, irq_exit will defer softirqs to
-	 * that. If the interrupt pipeline is enabled, we are already
-	 * running at IRQ14 priority, so we don't need this code.
-	 */
-	CSYNC();
-	pending = bfin_read_IPEND() & ~0x8000;
-	other_ints = pending & (pending - 1);
-	if (other_ints == 0)
-		lower_to_irq14();
-#endif /* !CONFIG_IPIPE */
+	maybe_lower_to_irq14();
+
 	irq_exit();
 
 	set_irq_regs(old_regs);
-- 
1.6.3.1


  parent reply	other threads:[~2009-06-20 18:47 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-20 18:44 [PATCH 00/25] Blackfin arch updates for 2.6.31 (part 3) Mike Frysinger
2009-06-20 18:44 ` [PATCH 01/25] Blackfin: unify memory region checks between kgdb and traps Mike Frysinger
2009-06-20 18:44 ` [PATCH 02/25] Blackfin: bf518f-ezbrd: update DSA resources Mike Frysinger
2009-06-20 18:44 ` [PATCH 03/25] Blackfin: bf533-ezkit: add resources for FISP devices Mike Frysinger
2009-06-20 18:44 ` [PATCH 04/25] Blackfin: update anomaly lists Mike Frysinger
2009-06-20 18:44 ` [PATCH 05/25] Blackfin: redo handling of bad irqs Mike Frysinger
2009-06-20 18:44 ` [PATCH 06/25] Blackfin: only build show_interrupts() when procfs is enabled Mike Frysinger
2009-06-20 18:44 ` [PATCH 07/25] Blackfin: simplify irq stack overflow checking Mike Frysinger
2009-06-20 18:44 ` Mike Frysinger [this message]
2009-06-20 18:44 ` [PATCH 09/25] Blackfin: fix accidental reset in some boot modes Mike Frysinger
2009-06-20 18:44 ` [PATCH 10/25] Blackfin: bf526-ezbrd: set SPI flash resources to SST device Mike Frysinger
2009-06-20 18:44 ` [PATCH 11/25] Blackfin: allow people to select BF51x-0.1 silicon rev Mike Frysinger
2009-06-20 18:44 ` [PATCH 12/25] Blackfin: convert interrupt pipeline to irqflags Mike Frysinger
2009-06-20 18:44 ` [PATCH 13/25] Blackfin: allow CONFIG_TICKSOURCE_GPTMR0 with interrupt pipeline Mike Frysinger
2009-06-20 18:44 ` [PATCH 14/25] Blackfin: remove obsolete mcount support from I-pipe code Mike Frysinger
2009-06-20 18:44 ` [PATCH 15/25] Blackfin: update I-pipe patch level Mike Frysinger
2009-06-20 18:44 ` [PATCH 16/25] Blackfin: decouple unrelated cache settings to get exact behavior Mike Frysinger
2009-06-20 18:44 ` [PATCH 17/25] Blackfin: update defconfigs Mike Frysinger
2009-06-20 18:44 ` [PATCH 18/25] Blackfin: stick the CPU name into boot image name Mike Frysinger
2009-06-20 18:44 ` [PATCH 19/25] Blackfin: unify memory map headers Mike Frysinger
2009-06-20 18:44 ` [PATCH 20/25] Blackfin: fix typo in TRAS define in mem_init.h header Mike Frysinger
2009-06-20 18:44 ` [PATCH 21/25] Blackfin: bf526-ezbrd: handle different SDRAM chips Mike Frysinger
2009-06-20 18:44 ` [PATCH 22/25] Blackfin: drop unused ISP1760 port1_disable from board resources Mike Frysinger
2009-06-20 18:44 ` [PATCH 23/25] Blackfin: fix GPTMR0_CLOCKSOURCE dependency on BFIN_GPTIMERS Mike Frysinger
2009-06-20 18:44 ` [PATCH 24/25] Blackfin: fix early crash when booting on wrong cpu Mike Frysinger
2009-06-20 18:44 ` [PATCH 25/25] Blackfin: drop BF535-specific text for exception 0x2A (unaligned instruction) Mike Frysinger

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=1245523488-26536-9-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=uclinux-dist-devel@blackfin.uclinux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®