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,
	Philippe Gerum <rpm@xenomai.org>
Subject: [PATCH 13/25] Blackfin: allow CONFIG_TICKSOURCE_GPTMR0 with interrupt pipeline
Date: Sat, 20 Jun 2009 14:44:36 -0400	[thread overview]
Message-ID: <1245523488-26536-14-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1245523488-26536-1-git-send-email-vapier@gentoo.org>

From: Philippe Gerum <rpm@xenomai.org>

Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 arch/blackfin/Kconfig                     |    1 -
 arch/blackfin/include/asm/ipipe.h         |    7 ++++-
 arch/blackfin/mach-common/ints-priority.c |   47 +++++++++++++---------------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index c2c4a62..8140a2f 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -623,7 +623,6 @@ choice
 config TICKSOURCE_GPTMR0
 	bool "Gptimer0 (SCLK domain)"
 	select BFIN_GPTIMERS
-	depends on !IPIPE
 
 config TICKSOURCE_CORETMR
 	bool "Core timer (CCLK domain)"
diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h
index bbe1c37..ffa5e60 100644
--- a/arch/blackfin/include/asm/ipipe.h
+++ b/arch/blackfin/include/asm/ipipe.h
@@ -207,7 +207,7 @@ void ipipe_init_irq_threads(void);
 
 int ipipe_start_irq_thread(unsigned irq, struct irq_desc *desc);
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
+#ifdef CONFIG_TICKSOURCE_CORETMR
 #define IRQ_SYSTMR		IRQ_CORETMR
 #define IRQ_PRIOTMR		IRQ_CORETMR
 #else
@@ -240,8 +240,13 @@ int ipipe_start_irq_thread(unsigned irq, struct irq_desc *desc);
 #define ipipe_init_irq_threads()		do { } while (0)
 #define ipipe_start_irq_thread(irq, desc)	0
 
+#ifndef CONFIG_TICKSOURCE_GPTMR0
 #define IRQ_SYSTMR		IRQ_CORETMR
 #define IRQ_PRIOTMR		IRQ_CORETMR
+#else
+#define IRQ_SYSTMR		IRQ_TIMER0
+#define IRQ_PRIOTMR		CONFIG_IRQ_TIMER0
+#endif
 
 #define __ipipe_root_tick_p(regs)	1
 
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index af70f09..b421501 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -1052,35 +1052,34 @@ int __init init_arch_irq(void)
 			set_irq_chained_handler(irq, bfin_demux_error_irq);
 			break;
 #endif
-#if defined(CONFIG_TICKSOURCE_GPTMR0)
-		case IRQ_TIMER0:
-			set_irq_handler(irq, handle_percpu_irq);
-			break;
-#endif
 #ifdef CONFIG_SMP
 		case IRQ_SUPPLE_0:
 		case IRQ_SUPPLE_1:
 			set_irq_handler(irq, handle_percpu_irq);
 			break;
 #endif
-		default:
 #ifdef CONFIG_IPIPE
-			/*
-			 * We want internal interrupt sources to be
-			 * masked, because ISRs may trigger interrupts
-			 * recursively (e.g. DMA), but interrupts are
-			 * _not_ masked at CPU level. So let's handle
-			 * most of them as level interrupts, except
-			 * the timer interrupt which is special.
-			 */
-			if (irq == IRQ_SYSTMR || irq == IRQ_CORETMR)
-				set_irq_handler(irq, handle_simple_irq);
-			else
-				set_irq_handler(irq, handle_level_irq);
+#ifndef CONFIG_TICKSOURCE_CORETMR
+		case IRQ_TIMER0:
+			set_irq_handler(irq, handle_simple_irq);
+			break;
+#endif /* !CONFIG_TICKSOURCE_CORETMR */
+		case IRQ_CORETMR:
+			set_irq_handler(irq, handle_simple_irq);
+			break;
+		default:
+			set_irq_handler(irq, handle_level_irq);
+			break;
 #else /* !CONFIG_IPIPE */
+#ifdef CONFIG_TICKSOURCE_GPTMR0
+		case IRQ_TIMER0:
+			set_irq_handler(irq, handle_percpu_irq);
+			break;
+#endif /* CONFIG_TICKSOURCE_GPTMR0 */
+		default:
 			set_irq_handler(irq, handle_simple_irq);
-#endif /* !CONFIG_IPIPE */
 			break;
+#endif	/* !CONFIG_IPIPE */
 		}
 	}
 
@@ -1224,15 +1223,14 @@ __attribute__((l1_text))
 asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs)
 {
 	struct ipipe_percpu_domain_data *p = ipipe_root_cpudom_ptr();
-	struct ipipe_domain *this_domain = ipipe_current_domain;
+	struct ipipe_domain *this_domain = __ipipe_current_domain;
 	struct ivgx *ivg_stop = ivg7_13[vec-IVG7].istop;
 	struct ivgx *ivg = ivg7_13[vec-IVG7].ifirst;
 	int irq, s;
 
-	if (likely(vec == EVT_IVTMR_P)) {
+	if (likely(vec == EVT_IVTMR_P))
 		irq = IRQ_CORETMR;
-
-	} else {
+	else {
 #if defined(SIC_ISR0) || defined(SICA_ISR0)
 		unsigned long sic_status[3];
 
@@ -1262,12 +1260,11 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs)
 				break;
 		}
 #endif
-
 		irq = ivg->irqno;
 	}
 
 	if (irq == IRQ_SYSTMR) {
-#ifndef CONFIG_GENERIC_CLOCKEVENTS
+#if !defined(CONFIG_GENERIC_CLOCKEVENTS) || defined(CONFIG_TICKSOURCE_GPTMR0)
 		bfin_write_TIMER_STATUS(1); /* Latch TIMIL0 */
 #endif
 		/* This is basically what we need from the register frame. */
-- 
1.6.3.1


  parent reply	other threads:[~2009-06-20 18:48 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 ` [PATCH 08/25] Blackfin: abstract irq14 lowering in do_irq Mike Frysinger
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 ` Mike Frysinger [this message]
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-14-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rpm@xenomai.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®