[PATCH 4/9] omap2/3/4: Clean up entry-macro.s for adding support for omap4 multiboot

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/9] omap2/3/4: Clean up entry-macro.s for adding support for omap4 multiboot
Date: Fri, 29 Jan 2010 18:01:32 -0800	[thread overview]
Message-ID: <20100130020132.10590.94667.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100130020036.10590.78028.stgit@baageli.muru.com>

Move defines around and set up handlers based on MULTI_OMAP2.

Note that this will only allow compiling in omap4 with omap2 and
omap3. It will not yet make omap4 boot with multi-omap.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/include/mach/entry-macro.S |   38 +++++++++++++++++++++---
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S b/arch/arm/mach-omap2/include/mach/entry-macro.S
index 101ed79..fe3c9ad 100644
--- a/arch/arm/mach-omap2/include/mach/entry-macro.S
+++ b/arch/arm/mach-omap2/include/mach/entry-macro.S
@@ -19,6 +19,8 @@
 #include <plat/omap34xx.h>
 #include <plat/omap44xx.h>
 
+#include <plat/multi.h>
+
 #define OMAP2_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE)
 #define OMAP3_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE)
 #define OMAP4_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE)
@@ -31,13 +33,15 @@
 		.macro  arch_ret_to_user, tmp1, tmp2
 		.endm
 
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
+/*
+ * Unoptimized irq functions for multi-omap2, 3 and 4
+ */
 
+#ifdef MULTI_OMAP2
 		.pushsection .data
 omap_irq_base:	.word	0
 		.popsection
 
-#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_ARCH_OMAP3)
 		/* Configure the interrupt base on the first interrupt */
 		.macro  get_irqnr_preamble, base, tmp
 9:
@@ -62,7 +66,32 @@ omap_irq_base:	.word	0
 		b	9b
 9998:
 		.endm
-#else
+
+		/* Check the pending interrupts. Note that base already set */
+		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
+		ldr	\irqnr, [\base, #0x98] /* IRQ pending reg 1 */
+		cmp	\irqnr, #0x0
+		bne	9999f
+		ldr	\irqnr, [\base, #0xb8] /* IRQ pending reg 2 */
+		cmp	\irqnr, #0x0
+		bne	9999f
+		ldr	\irqnr, [\base, #0xd8] /* IRQ pending reg 3 */
+		cmp	\irqnr, #0x0
+9999:
+		ldrne	\irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]
+		and	\irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */
+
+		.endm
+
+
+#else	/* MULTI_OMAP2 */
+
+
+/*
+ * Optimized irq functions for omap2, 3 and 4
+ */
+
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 		.macro  get_irqnr_preamble, base, tmp
 #ifdef CONFIG_ARCH_OMAP2
 		ldr	\base, =OMAP2_IRQ_BASE
@@ -70,7 +99,7 @@ omap_irq_base:	.word	0
 		ldr	\base, =OMAP3_IRQ_BASE
 #endif
 		.endm
-#endif
+
 		/* Check the pending interrupts. Note that base already set */
 		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
 		ldr	\irqnr, [\base, #0x98] /* IRQ pending reg 1 */
@@ -155,6 +184,7 @@ omap_irq_base:	.word	0
 		cmp	\tmp, #0
 		.endm
 #endif
+#endif	/* MULTI_OMAP2 */
 
 		.macro	irq_prio_table
 		.endm

next prev parent reply	other threads:[~2010-01-30  2:01 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-30  2:01 [PATCH 0/9] Initial multi-omap support for omap4 Tony Lindgren
2010-01-30  2:01 ` [PATCH 1/9] omap: Move multi-omap ifdeffery into it's own header file Tony Lindgren
2010-01-30  2:01 ` [PATCH 2/9] omap2/3/4: Clean up defines for entry-macro.S Tony Lindgren
2010-01-30  2:01 ` [PATCH 3/9] omap4: Use get_irqnr_preamble Tony Lindgren
2010-01-30  2:01 ` Tony Lindgren [this message]
2010-01-30  2:01 ` [PATCH 5/9] omap2/3/4: Allow booting omap4 with multi-omap configuration Tony Lindgren
2010-01-30  2:01 ` [PATCH 6/9] omap3/4: Fix compile for multi-omap for clkops_noncore_dpll_ops Tony Lindgren
2010-02-01 20:20   ` Paul Walmsley
2010-01-30  2:01 ` [PATCH 7/9] omap: Fix gpio.c for multi-omap for omap4 Tony Lindgren
2010-01-30  2:01 ` [PATCH 8/9] omap2/3/4: Fix mach-omap2/serial.c for multiboot Tony Lindgren
2010-01-30  2:01 ` [PATCH 9/9] omap2/3/4: Add omap4 into omap3_defconfnig Tony Lindgren
2010-01-30 11:09 ` [PATCH 0/9] Initial multi-omap support for omap4 Shilimkar, Santosh
2010-01-30 16:18   ` Tony Lindgren
2010-01-30 12:51 ` Shilimkar, Santosh
2010-01-30 16:24   ` Tony Lindgren
2010-01-30 17:54     ` Shilimkar, Santosh
2010-02-01 19:11       ` Tony Lindgren

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:101ed79 dfblob:fe3c9ad )
 OR (
bs:"[PATCH 4/9] omap2/3/4: Clean up entry-macro.s for adding support for omap4 multiboot" )
	(help)

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=20100130020132.10590.94667.stgit@baageli.muru.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).