From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] ARM: orion: always use MULTI_IRQ_HANDLER
Date: Mon, 2 Mar 2015 22:37:49 +0100 [thread overview]
Message-ID: <20150302213749.GD2375@lunn.ch> (raw)
In-Reply-To: <1425328618-894030-3-git-send-email-arnd@arndb.de>
On Mon, Mar 02, 2015 at 09:36:55PM +0100, Arnd Bergmann wrote:
> As a preparation for multiplatform support, this enables
> the MULTI_IRQ_HANDLER code unconditionally on dove and
> orion5x, and introduces the respective code on mv78xx0,
> which did not have it so far. The classic entry-macro.S
> files are removed as they are now obsolete.
Hi Arnd
I don't know if it is relevant or not, but mach-dove IRQ handling is
slightly broken. It uses IRQ 0. Russell King did provide a patch to
move all the interrupts up by one, but it did not apply. I asked for a
new version, rebased on the -rc1 of the time, but it never appeared.
Andrew
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/Kconfig | 3 ++
> arch/arm/mach-dove/include/mach/entry-macro.S | 33 -------------------
> arch/arm/mach-dove/irq.c | 11 -------
> arch/arm/mach-mv78xx0/include/mach/entry-macro.S | 41 ------------------------
> arch/arm/mach-mv78xx0/irq.c | 33 +++++++++++++++++++
> arch/arm/mach-orion5x/include/mach/entry-macro.S | 25 ---------------
> arch/arm/mach-orion5x/irq.c | 12 -------
> 7 files changed, 36 insertions(+), 122 deletions(-)
> delete mode 100644 arch/arm/mach-dove/include/mach/entry-macro.S
> delete mode 100644 arch/arm/mach-mv78xx0/include/mach/entry-macro.S
> delete mode 100644 arch/arm/mach-orion5x/include/mach/entry-macro.S
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 0f7dd89b5eee..39a625df6f75 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -501,6 +501,7 @@ config ARCH_DOVE
> select CPU_PJ4
> select GENERIC_CLOCKEVENTS
> select MIGHT_HAVE_PCI
> + select MULTI_IRQ_HANDLER
> select MVEBU_MBUS
> select PINCTRL
> select PINCTRL_DOVE
> @@ -514,6 +515,7 @@ config ARCH_MV78XX0
> select CPU_FEROCEON
> select GENERIC_CLOCKEVENTS
> select MVEBU_MBUS
> + select MULTI_IRQ_HANDLER
> select PCI
> select PLAT_ORION_LEGACY
> help
> @@ -527,6 +529,7 @@ config ARCH_ORION5X
> select CPU_FEROCEON
> select GENERIC_CLOCKEVENTS
> select MVEBU_MBUS
> + select MULTI_IRQ_HANDLER
> select PCI
> select PLAT_ORION_LEGACY
> help
> diff --git a/arch/arm/mach-dove/include/mach/entry-macro.S b/arch/arm/mach-dove/include/mach/entry-macro.S
> deleted file mode 100644
> index 72d622baaad3..000000000000
> --- a/arch/arm/mach-dove/include/mach/entry-macro.S
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -/*
> - * arch/arm/mach-dove/include/mach/entry-macro.S
> - *
> - * Low-level IRQ helper macros for Marvell Dove platforms
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
> - */
> -
> -#include <mach/bridge-regs.h>
> -
> - .macro get_irqnr_preamble, base, tmp
> - ldr \base, =IRQ_VIRT_BASE
> - .endm
> -
> - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
> - @ check low interrupts
> - ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF]
> - ldr \tmp, [\base, #IRQ_MASK_LOW_OFF]
> - mov \irqnr, #31
> - ands \irqstat, \irqstat, \tmp
> -
> - @ if no low interrupts set, check high interrupts
> - ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]
> - ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF]
> - moveq \irqnr, #63
> - andeqs \irqstat, \irqstat, \tmp
> -
> - @ find first active interrupt source
> - clzne \irqstat, \irqstat
> - subne \irqnr, \irqnr, \irqstat
> - .endm
> diff --git a/arch/arm/mach-dove/irq.c b/arch/arm/mach-dove/irq.c
> index 4a5a7aedcb76..1b1bc04346cf 100644
> --- a/arch/arm/mach-dove/irq.c
> +++ b/arch/arm/mach-dove/irq.c
> @@ -108,14 +108,6 @@ static int __initdata gpio2_irqs[4] = {
> 0,
> };
>
> -#ifdef CONFIG_MULTI_IRQ_HANDLER
> -/*
> - * Compiling with both non-DT and DT support enabled, will
> - * break asm irq handler used by non-DT boards. Therefore,
> - * we provide a C-style irq handler even for non-DT boards,
> - * if MULTI_IRQ_HANDLER is set.
> - */
> -
> static void __iomem *dove_irq_base = IRQ_VIRT_BASE;
>
> static asmlinkage void
> @@ -138,7 +130,6 @@ __exception_irq_entry dove_legacy_handle_irq(struct pt_regs *regs)
> return;
> }
> }
> -#endif
>
> void __init dove_init_irq(void)
> {
> @@ -147,9 +138,7 @@ void __init dove_init_irq(void)
> orion_irq_init(0, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF);
> orion_irq_init(32, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF);
>
> -#ifdef CONFIG_MULTI_IRQ_HANDLER
> set_handle_irq(dove_legacy_handle_irq);
> -#endif
>
> /*
> * Initialize gpiolib for GPIOs 0-71.
> diff --git a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S
> deleted file mode 100644
> index 6b1f088e0597..000000000000
> --- a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -/*
> - * arch/arm/mach-mv78xx0/include/mach/entry-macro.S
> - *
> - * Low-level IRQ helper macros for Marvell MV78xx0 platforms
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
> - */
> -
> -#include <mach/bridge-regs.h>
> -
> - .macro get_irqnr_preamble, base, tmp
> - ldr \base, =IRQ_VIRT_BASE
> - .endm
> -
> - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
> - @ check low interrupts
> - ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF]
> - ldr \tmp, [\base, #IRQ_MASK_LOW_OFF]
> - mov \irqnr, #31
> - ands \irqstat, \irqstat, \tmp
> - bne 1001f
> -
> - @ if no low interrupts set, check high interrupts
> - ldr \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]
> - ldr \tmp, [\base, #IRQ_MASK_HIGH_OFF]
> - mov \irqnr, #63
> - ands \irqstat, \irqstat, \tmp
> - bne 1001f
> -
> - @ if no high interrupts set, check error interrupts
> - ldr \irqstat, [\base, #IRQ_CAUSE_ERR_OFF]
> - ldr \tmp, [\base, #IRQ_MASK_ERR_OFF]
> - mov \irqnr, #95
> - ands \irqstat, \irqstat, \tmp
> -
> - @ find first active interrupt source
> -1001: clzne \irqstat, \irqstat
> - subne \irqnr, \irqnr, \irqstat
> - .endm
> diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c
> index 32073444024b..2453c33faccf 100644
> --- a/arch/arm/mach-mv78xx0/irq.c
> +++ b/arch/arm/mach-mv78xx0/irq.c
> @@ -11,6 +11,7 @@
> #include <linux/kernel.h>
> #include <linux/irq.h>
> #include <linux/io.h>
> +#include <asm/exception.h>
> #include <mach/bridge-regs.h>
> #include <plat/orion-gpio.h>
> #include <plat/irq.h>
> @@ -23,12 +24,44 @@ static int __initdata gpio0_irqs[4] = {
> IRQ_MV78XX0_GPIO_24_31,
> };
>
> +static void __iomem *mv78xx0_irq_base = IRQ_VIRT_BASE;
> +
> +static asmlinkage void
> +__exception_irq_entry mv78xx0_legacy_handle_irq(struct pt_regs *regs)
> +{
> + u32 stat;
> +
> + stat = readl_relaxed(mv78xx0_irq_base + IRQ_CAUSE_LOW_OFF);
> + stat &= readl_relaxed(mv78xx0_irq_base + IRQ_MASK_LOW_OFF);
> + if (stat) {
> + unsigned int hwirq = __fls(stat);
> + handle_IRQ(hwirq, regs);
> + return;
> + }
> + stat = readl_relaxed(mv78xx0_irq_base + IRQ_CAUSE_HIGH_OFF);
> + stat &= readl_relaxed(mv78xx0_irq_base + IRQ_MASK_HIGH_OFF);
> + if (stat) {
> + unsigned int hwirq = 32 + __fls(stat);
> + handle_IRQ(hwirq, regs);
> + return;
> + }
> + stat = readl_relaxed(mv78xx0_irq_base + IRQ_CAUSE_ERR_OFF);
> + stat &= readl_relaxed(mv78xx0_irq_base + IRQ_MASK_ERR_OFF);
> + if (stat) {
> + unsigned int hwirq = 64 + __fls(stat);
> + handle_IRQ(hwirq, regs);
> + return;
> + }
> +}
> +
> void __init mv78xx0_init_irq(void)
> {
> orion_irq_init(0, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF);
> orion_irq_init(32, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF);
> orion_irq_init(64, IRQ_VIRT_BASE + IRQ_MASK_ERR_OFF);
>
> + set_handle_irq(mv78xx0_legacy_handle_irq);
> +
> /*
> * Initialize gpiolib for GPIOs 0-31. (The GPIO interrupt mask
> * registers for core #1 are at an offset of 0x18 from those of
> diff --git a/arch/arm/mach-orion5x/include/mach/entry-macro.S b/arch/arm/mach-orion5x/include/mach/entry-macro.S
> deleted file mode 100644
> index 79eb502a1e64..000000000000
> --- a/arch/arm/mach-orion5x/include/mach/entry-macro.S
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -/*
> - * arch/arm/mach-orion5x/include/mach/entry-macro.S
> - *
> - * Low-level IRQ helper macros for Orion platforms
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
> - */
> -
> -#include <mach/bridge-regs.h>
> -
> - .macro get_irqnr_preamble, base, tmp
> - ldr \base, =MAIN_IRQ_CAUSE
> - .endm
> -
> - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
> - ldr \irqstat, [\base, #0] @ main cause
> - ldr \tmp, [\base, #(MAIN_IRQ_MASK - MAIN_IRQ_CAUSE)] @ main mask
> - mov \irqnr, #0 @ default irqnr
> - @ find cause bits that are unmasked
> - ands \irqstat, \irqstat, \tmp @ clear Z flag if any
> - clzne \irqnr, \irqstat @ calc irqnr
> - rsbne \irqnr, \irqnr, #31
> - .endm
> diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c
> index cd4bac4d7e43..a3f615801d27 100644
> --- a/arch/arm/mach-orion5x/irq.c
> +++ b/arch/arm/mach-orion5x/irq.c
> @@ -26,14 +26,6 @@ static int __initdata gpio0_irqs[4] = {
> IRQ_ORION5X_GPIO_24_31,
> };
>
> -#ifdef CONFIG_MULTI_IRQ_HANDLER
> -/*
> - * Compiling with both non-DT and DT support enabled, will
> - * break asm irq handler used by non-DT boards. Therefore,
> - * we provide a C-style irq handler even for non-DT boards,
> - * if MULTI_IRQ_HANDLER is set.
> - */
> -
> asmlinkage void
> __exception_irq_entry orion5x_legacy_handle_irq(struct pt_regs *regs)
> {
> @@ -47,15 +39,11 @@ __exception_irq_entry orion5x_legacy_handle_irq(struct pt_regs *regs)
> return;
> }
> }
> -#endif
>
> void __init orion5x_init_irq(void)
> {
> orion_irq_init(0, MAIN_IRQ_MASK);
> -
> -#ifdef CONFIG_MULTI_IRQ_HANDLER
> set_handle_irq(orion5x_legacy_handle_irq);
> -#endif
>
> /*
> * Initialize gpiolib for GPIOs 0-31.
> --
> 2.1.0.rc2
>
next prev parent reply other threads:[~2015-03-02 21:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-02 20:36 [PATCH 0/5] ARM: orion5k/mv78xx0/dove multiplatform support Arnd Bergmann
2015-03-02 20:36 ` [PATCH 1/5] ARM: orion: move watchdog setup to mach-orion5x Arnd Bergmann
2015-03-02 21:33 ` Andrew Lunn
2015-03-02 21:49 ` Arnd Bergmann
2015-03-02 23:18 ` Russell King - ARM Linux
2015-03-02 20:36 ` [PATCH 2/5] ARM: orion: always use MULTI_IRQ_HANDLER Arnd Bergmann
2015-03-02 21:37 ` Andrew Lunn [this message]
2015-03-02 21:44 ` Arnd Bergmann
2015-03-02 23:09 ` Russell King - ARM Linux
2015-03-02 20:36 ` [PATCH 3/5] ARM: orion: use SPARSE_IRQ everywhere Arnd Bergmann
2015-03-02 20:40 ` [PATCH 0/5] ARM: orion5k/mv78xx0/dove multiplatform support Arnd Bergmann
2015-03-02 21:17 ` [PATCH 4/5] ARM: orion: clean up mach/*.h headers Arnd Bergmann
2015-03-02 21:17 ` [PATCH 5/5] ARM: orion: multiplatform support Arnd Bergmann
2015-03-02 21:30 ` [PATCH 0/5] ARM: orion5k/mv78xx0/dove " Andrew Lunn
2015-03-02 21:39 ` Arnd Bergmann
2015-03-02 23:08 ` Russell King - ARM Linux
-- strict thread matches above, loose matches on Subject: below --
2015-11-25 15:49 [PATCH 0/5] ARM: orion5x/dove/mv78xx0 multiplatform Arnd Bergmann
2015-11-25 15:49 ` [PATCH 2/5] ARM: orion: always use MULTI_IRQ_HANDLER Arnd Bergmann
2015-11-25 15:49 ` Arnd Bergmann
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=20150302213749.GD2375@lunn.ch \
--to=andrew@lunn.ch \
--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 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.