linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: Allow machine to specify it's own IRQ handlers at run-time
Date: Wed, 8 Dec 2010 13:41:41 +0000	[thread overview]
Message-ID: <20101208134140.GB9777@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <AANLkTinuQWszBuA01zDkXBM5gWOsxYufWQFyqYQmOcbP@mail.gmail.com>

On Tue, Dec 07, 2010 at 09:31:11PM +0800, Eric Miao wrote:
> Ah silly me, the patch below fixed this, and tested on Marvell Dove:
...
> diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h
> index ce3eee9..6ecdad9 100644
> --- a/arch/arm/include/asm/mach/irq.h
> +++ b/arch/arm/include/asm/mach/irq.h
> @@ -22,6 +22,10 @@ extern void (*init_arch_irq)(void);
>  extern void init_FIQ(void);
>  extern int show_fiq_list(struct seq_file *, void *);
> 
> +#ifdef CONFIG_MULTI_IRQ_HANDLER
> +extern void (*handle_arch_irq)(struct pt_regs *);
> +#endif
> +
>  /*
>   * This is for easy migration, but should be changed in the source
>   */
> diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
> index c09e357..d29e31b 100644
> --- a/arch/arm/kernel/entry-armv.S
> +++ b/arch/arm/kernel/entry-armv.S
> @@ -30,6 +30,14 @@
>   * Interrupt handling.  Preserves r7, r8, r9
>   */
>  	.macro	irq_handler
> +#ifdef CONFIG_MULTI_IRQ_HANDLER
> +	ldr	r1, =handle_arch_irq
> +	ldr	r0, [r1]
> +	cmp	r0, #0
> +	movne	r0, sp
> +	adrne	lr, BSYM(9997f)
> +	ldrne	pc, [r1]
> +#endif

You might as well do this:

	ldr	r5, =handle_arch_irq
	mov	r0, sp
	ldr	r5, [r5]
	adr	lr, BSYM(9997f)
	teq	r5, #0
	movne	pc, r5

which also helps to fill the load delay slots with useful work.

>  	get_irqnr_preamble r5, lr
>  1:	get_irqnr_and_base r0, r6, r5, lr
>  	movne	r1, sp
> @@ -58,9 +66,8 @@
>  	adrne	lr, BSYM(1b)
>  	bne	do_local_timer
>  #endif
> -9997:
>  #endif
> -
> +9997:
>  	.endm
> 
>  #ifdef CONFIG_KPROBES
> @@ -1245,3 +1252,9 @@ cr_alignment:
>  	.space	4
>  cr_no_alignment:
>  	.space	4
> +
> +#ifdef CONFIG_MULTI_IRQ_HANDLER
> +	.globl	handle_arch_irq
> +handle_arch_irq:
> +	.long	0

	.space 4

as above please

  reply	other threads:[~2010-12-08 13:41 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-22  8:26 [PATCH] ARM: Allow machine to specify it's own IRQ handlers at run-time Eric Miao
2010-12-05  9:23 ` Russell King - ARM Linux
2010-12-06  6:12   ` Eric Miao
2010-12-06  8:06     ` Russell King - ARM Linux
2010-12-06  9:31       ` Eric Miao
2010-12-06 10:11         ` Russell King - ARM Linux
2010-12-07 13:31           ` Eric Miao
2010-12-08 13:41             ` Russell King - ARM Linux [this message]
2010-12-12 14:33               ` Eric Miao
2010-12-12 14:49                 ` Russell King - ARM Linux
2010-12-12 14:50                   ` Eric Miao
2010-12-13  8:45                     ` Eric Miao
2010-12-13 12:55                       ` Magnus Damm
2010-12-12 14:50                 ` Eric Miao

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=20101208134140.GB9777@n2100.arm.linux.org.uk \
    --to=linux@arm.linux.org.uk \
    --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).