ARM: Common GIC entry macro code
Subsystems (5)
PATCH 1/1 ARM: Common GIC entry macro code
From: Magnus Damm <[email protected]>
This patch merges identical GIC demux implementations in the file entry-macro-gic.S. The shared code in the header file is based on the realview implementation.
Each GIC demux instance still has to setup the base address of the controller using the get_irqnr_preamble macro. The rest of the GIC specific code can be shared.
The omap code is excluded due to multi-omap complexity and s5pv310 is excluded as well due to the special "addne" instruction in the get_irqnr_and_base macro.
---
arch/arm/include/asm/hardware/entry-macro-gic.S | 68 +++++++++++++++++++++ arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 61 ------------------ arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 67 -------------------- arch/arm/mach-realview/include/mach/entry-macro.S | 60 ------------------ arch/arm/mach-tegra/include/mach/entry-macro.S | 64 ------------------- arch/arm/mach-ux500/include/mach/entry-macro.S | 67 -------------------- arch/arm/mach-vexpress/include/mach/entry-macro.S | 57 ----------------- 7 files changed, 74 insertions(+), 370 deletions(-)
arch/arm/include/asm/hardware/entry-macro-gic.S new file +68 -0
@@ -0,0 +1,68 @@ +/* + * arch/arm/include/asm/hardware/entry-macro-gic.S + * + * Low-level IRQ helper macros for GIC + * + * 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 <asm/hardware/gic.h> + +/* + * The interrupt numbering scheme is defined in the + * interrupt controller spec. To wit: + * + * Interrupts 0-15 are IPI + * 16-28 are reserved + * 29-31 are local. We allow 30 to be used for the watchdog. + * 32-1020 are global + * 1021-1022 are reserved + * 1023 is "spurious" (no interrupt) + * + * For now, we ignore all local interrupts so only return an interrupt if it's + * between 30 and 1020. The test_for_ipi routine below will pick up on IPIs. + * + * A simple read from the controller will tell us the number of the highest + * priority enabled interrupt. We then just need to check whether it is in the + * valid range for an IRQ (30-1020 inclusive). + */ + + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp + + ldr \irqstat, [\base, #GIC_CPU_INTACK] + /* bits 12-10 = src CPU, 9-0 = int # */ + + ldr \tmp, =1021 + bic \irqnr, \irqstat, #0x1c00 + cmp \irqnr, #29 + cmpcc \irqnr, \irqnr + cmpne \irqnr, \tmp + cmpcs \irqnr, \irqnr + .endm + +/* We assume that irqstat (the raw value of the IRQ acknowledge + * register) is preserved from the macro above. + * If there is an IPI, we immediately signal end of interrupt on the + * controller, since this requires the original irqstat value which + * we won't easily be able to recreate later. + */ + + .macro test_for_ipi, irqnr, irqstat, base, tmp + bic \irqnr, \irqstat, #0x1c00 + cmp \irqnr, #16 + strcc \irqstat, [\base, #GIC_CPU_EOI] + cmpcs \irqnr, \irqnr + .endm + +/* As above, this assumes that irqstat and base are preserved.. */ + + .macro test_for_ltirq, irqnr, irqstat, base, tmp + bic \irqnr, \irqstat, #0x1c00 + mov \tmp, #0 + cmp \irqnr, #29 + moveq \tmp, #1 + streq \irqstat, [\base, #GIC_CPU_EOI] + cmp \tmp, #0 + .endm
arch/arm/mach-cns3xxx/include/mach/entry-macro.S +1 -60
70 lines not on this page · raw message
arch/arm/mach-msm/include/mach/entry-macro-qgic.S +1 -66
76 lines not on this page · raw message
arch/arm/mach-realview/include/mach/entry-macro.S +1 -59
69 lines not on this page · raw message
arch/arm/mach-tegra/include/mach/entry-macro.S +1 -63
76 lines not on this page · raw message
arch/arm/mach-ux500/include/mach/entry-macro.S +1 -66
76 lines not on this page · raw message
arch/arm/mach-vexpress/include/mach/entry-macro.S +1 -56
63 lines not on this page · raw message
PATCH 1/1 ARM: Common GIC entry macro code
Quoted 15 lines
-----Original Message-----
From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-arm- kernel-bounces at lists.infradead.org] On Behalf Of Magnus Damm
Sent: Wednesday, November 10, 2010 12:31 PM
To: linux at arm.linux.org.uk
Cc: tony at atomide.com; kgene.kim at samsung.com; Magnus Damm; linux-arm- kernel at lists.infradead.org
Subject: [PATCH] ARM: Common GIC entry macro codeFrom: Magnus Damm <[email protected]>
This patch merges identical GIC demux implementations in the file
entry-macro-gic.S. The shared code in the header file is based on the realview implementation.
Quoted 8 lines
Each GIC demux instance still has to setup the base address of the controller using the
get_irqnr_preamblemacro. The rest of the GIC specific code can be shared.The omap code is excluded due to multi-omap complexity and s5pv310 is excluded as well due to the special "addne" instruction in the
get_irqnr_and_basemacro.
I guess this was attempted by below patch as well.
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=6284%2F1
6284/1 in the RMKs patch system. This was also addressing OMAP and the patch was tested OK.
Looks like it needs to be rebased because the state I see in the patch System is
- - Note 2 submitted by Russell King on 02 Sep 2010 15:43:12 (UTC) - - - Moved to Discarded.
Doesn't apply:
Quoted 587 lines
Signed-off-by Magnus Damm <[email protected]>---
arch/arm/include/asm/hardware/entry-macro-gic.S | 68 +++++++++++++++++++++ arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 61 ---------------- -- arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 67 ---------------- ---- arch/arm/mach-realview/include/mach/entry-macro.S | 60 ---------------- -- arch/arm/mach-tegra/include/mach/entry-macro.S | 64 ---------------- --- arch/arm/mach-ux500/include/mach/entry-macro.S | 67 ---------------- ---- arch/arm/mach-vexpress/include/mach/entry-macro.S | 57 ----------------(quoted diff) +0
-1- 7 files changed, 74 insertions(+), 370 deletions(-)arch/arm/include/asm/hardware/entry-macro-gic.S 2010-11-10 new file +0
-015:20:15.000000000 +0900
arch/arm/include/asm/hardware/entry-macro-gic.S 2010-11-10 new file +24
-0@@ -0,0 +1,68 @@ +/* + * arch/arm/include/asm/hardware/entry-macro-gic.S + * + * Low-level IRQ helper macros for GIC + * + * 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 <asm/hardware/gic.h> + +/* + * The interrupt numbering scheme is defined in the + * interrupt controller spec. To wit: + * + * Interrupts 0-15 are IPI + * 16-28 are reserved + * 29-31 are local. We allow 30 to be used for the watchdog. + * 32-1020 are global + * 1021-1022 are reserved + * 1023 is "spurious" (no interrupt) + * + * For now, we ignore all local interrupts so only return an interrupt ifit's
+ * between 30 and 1020. Thetest_for_ipiroutine below will pick up on IPIs.
+ *
+ * A simple read from the controller will tell us the number of the highest
+ * priority enabled interrupt. We then just need to check whether it is in the
+ * valid range for an IRQ (30-1020 inclusive).
+ */arch/arm/include/asm/hardware/entry-macro-gic.S 2010-11-10 new file +38
-0+ + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp + + ldr \irqstat, [\base, #GIC_CPU_INTACK] + /* bits 12-10 = src CPU, 9-0 = int # */ + + ldr \tmp, =1021 + bic \irqnr, \irqstat, #0x1c00 + cmp \irqnr, #29 + cmpcc \irqnr, \irqnr + cmpne \irqnr, \tmp + cmpcs \irqnr, \irqnr + .endm + +/* We assume that irqstat (the raw value of the IRQ acknowledge + * register) is preserved from the macro above. + * If there is an IPI, we immediately signal end of interrupt on the + * controller, since this requires the original irqstat value which + * we won't easily be able to recreate later. + */ + + .macro test_for_ipi, irqnr, irqstat, base, tmp + bic \irqnr, \irqstat, #0x1c00 + cmp \irqnr, #16 + strcc \irqstat, [\base, #GIC_CPU_EOI] + cmpcs \irqnr, \irqnr + .endm + +/* As above, this assumes that irqstat and base are preserved.. */ + + .macro test_for_ltirq, irqnr, irqstat, base, tmp + bic \irqnr, \irqstat, #0x1c00 + mov \tmp, #0 + cmp \irqnr, #29 + moveq \tmp, #1 + streq \irqstat, [\base, #GIC_CPU_EOI] + cmp \tmp, #0 + .endmarch/arm/mach-cns3xxx/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-cns3xxx/include/mach/entry-macro.S +0
-015:24:56.000000000 +0900
arch/arm/mach-cns3xxx/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-cns3xxx/include/mach/entry-macro.S +1
-14@@ -9,7 +9,7 @@ */ #include <mach/hardware.h> -#include <asm/hardware/gic.h> +#include <asm/hardware/entry-macro-gic.S> .macro disable_fiq .endm@@ -21,62 +21,3 @@ .macro arch_ret_to_user, tmp1, tmp2 .endm - - /* - * The interrupt numbering scheme is defined in the - * interrupt controller spec. To wit: - * - * Interrupts 0-15 are IPI - * 16-28 are reserved - * 29-31 are local. We allow 30 to be used for the watchdog. - * 32-1020 are global - * 1021-1022 are reserved - * 1023 is "spurious" (no interrupt) - * - * For now, we ignore all local interrupts so only return aninterrupt if it's
- * between 30 and 1020. Thetest_for_ipiroutine below will
pick up on IPIs.arch/arm/mach-cns3xxx/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-cns3xxx/include/mach/entry-macro.S +0
-2- * - * A simple read from the controller will tell us the numberof the highest
- * priority enabled interrupt. We then just need to
check whether it is in thearch/arm/mach-cns3xxx/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-cns3xxx/include/mach/entry-macro.S +0
-6- * valid range for an IRQ (30-1020 inclusive). - */ - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - - ldr \irqstat, [\base, #GIC_CPU_INTACK] /* bits 12-10 = srcCPU, 9-0 = int # */
arch/arm/mach-cns3xxx/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-cns3xxx/include/mach/entry-macro.S +0
-13- - ldr \tmp, =1021 - - bic \irqnr, \irqstat, #0x1c00 - - cmp \irqnr, #29 - cmpcc \irqnr, \irqnr - cmpne \irqnr, \tmp - cmpcs \irqnr, \irqnr - - .endm - - /* We assume that irqstat (the raw value of the IRQacknowledge
arch/arm/mach-cns3xxx/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-cns3xxx/include/mach/entry-macro.S +0
-2- * register) is preserved from the macro above. - * If there is an IPI, we immediately signal end of interrupton the
- * controller, since this requires the original irqstat value
whicharch/arm/mach-cns3xxx/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-cns3xxx/include/mach/entry-macro.S +0
-11- * we won't easily be able to recreate later. - */ - - .macro test_for_ipi, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #16 - strcc \irqstat, [\base, #GIC_CPU_EOI] - cmpcs \irqnr, \irqnr - .endm - - /* As above, this assumes that irqstat and base are preserved..*/
arch/arm/mach-cns3xxx/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-cns3xxx/include/mach/entry-macro.S +0
-9- - .macro test_for_ltirq, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - mov \tmp, #0 - cmp \irqnr, #29 - moveq \tmp, #1 - streq \irqstat, [\base, #GIC_CPU_EOI] - cmp \tmp, #0 - .endmarch/arm/mach-msm/include/mach/entry-macro-qgic.S 2010-11-10 renamed from arch/arm/mach-msm/include/mach/entry-macro-qgic.S +0
-015:27:06.000000000 +0900
arch/arm/mach-msm/include/mach/entry-macro-qgic.S 2010-11-10 renamed from arch/arm/mach-msm/include/mach/entry-macro-qgic.S +1
-23@@ -9,7 +9,7 @@ */ #include <mach/hardware.h> -#include <asm/hardware/gic.h> +#include <asm/hardware/entry-macro-gic.S> .macro disable_fiq .endm@@ -21,68 +21,3 @@ .macro arch_ret_to_user, tmp1, tmp2 .endm - - /* - * The interrupt numbering scheme is defined in the - * interrupt controller spec. To wit: - * - * Migrated the code from ARM MP port to be more consistant - * with interrupt processing , the following still holds true - * however, all interrupts are treated the same regardless of - * if they are local IPI or PPI - * - * Interrupts 0-15 are IPI - * 16-31 are PPI - * (16-18 are the timers) - * 32-1020 are global - * 1021-1022 are reserved - * 1023 is "spurious" (no interrupt) - * - * A simple read from the controller will tell us the number of the - * highest priority enabled interrupt. We then just need to check - * whether it is in the valid range for an IRQ (0-1020 inclusive). - * - * Base ARM code assumes that the local (private) peripheralinterrupts
- * are not valid, we treat them differently, in that the privates
are
- * handled like normal shared interrupts with the exception that
onlyarch/arm/mach-msm/include/mach/entry-macro-qgic.S 2010-11-10 renamed from arch/arm/mach-msm/include/mach/entry-macro-qgic.S +0
-41- * one processor can register the interrupt and the handler must be - * the same for all processors. - */ - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - - ldr \irqstat, [\base, #GIC_CPU_INTACK] /* bits 12-10 =srcCPU, - 9-0 =int # */ - - bic \irqnr, \irqstat, #0x1c00 @mask src - cmp \irqnr, #15 - ldr \tmp, =1021 - cmpcc \irqnr, \irqnr - cmpne \irqnr, \tmp - cmpcs \irqnr, \irqnr - - .endm - - /* We assume that irqstat (the raw value of the IRQ acknowledge - * register) is preserved from the macro above. - * If there is an IPI, we immediately signal end of interrupt on the - * controller, since this requires the original irqstat value which - * we won't easily be able to recreate later. - */ - .macro test_for_ipi, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #16 - strcc \irqstat, [\base, #GIC_CPU_EOI] - cmpcs \irqnr, \irqnr - .endm - - /* As above, this assumes that irqstat and base are preserved.. */ - - .macro test_for_ltirq, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - mov \tmp, #0 - cmp \irqnr, #16 - moveq \tmp, #1 - streq \irqstat, [\base, #GIC_CPU_EOI] - cmp \tmp, #0 - .endmarch/arm/mach-realview/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-realview/include/mach/entry-macro.S +0
-015:14:41.000000000 +0900
arch/arm/mach-realview/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-realview/include/mach/entry-macro.S +1
-13@@ -8,7 +8,7 @@ * warranty of any kind, whether express or implied. */ #include <mach/hardware.h> -#include <asm/hardware/gic.h> +#include <asm/hardware/entry-macro-gic.S> .macro disable_fiq .endm@@ -21,61 +21,3 @@ .macro arch_ret_to_user, tmp1, tmp2 .endm - /* - * The interrupt numbering scheme is defined in the - * interrupt controller spec. To wit: - * - * Interrupts 0-15 are IPI - * 16-28 are reserved - * 29-31 are local. We allow 30 to be used for the watchdog. - * 32-1020 are global - * 1021-1022 are reserved - * 1023 is "spurious" (no interrupt) - * - * For now, we ignore all local interrupts so only return aninterrupt if it's
- * between 30 and 1020. Thetest_for_ipiroutine below will
pick up on IPIs.arch/arm/mach-realview/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-realview/include/mach/entry-macro.S +0
-2- * - * A simple read from the controller will tell us the numberof the highest
- * priority enabled interrupt. We then just need to
check whether it is in thearch/arm/mach-realview/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-realview/include/mach/entry-macro.S +0
-6- * valid range for an IRQ (30-1020 inclusive). - */ - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - - ldr \irqstat, [\base, #GIC_CPU_INTACK] /* bits 12-10 = srcCPU, 9-0 = int # */
arch/arm/mach-realview/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-realview/include/mach/entry-macro.S +0
-13- - ldr \tmp, =1021 - - bic \irqnr, \irqstat, #0x1c00 - - cmp \irqnr, #29 - cmpcc \irqnr, \irqnr - cmpne \irqnr, \tmp - cmpcs \irqnr, \irqnr - - .endm - - /* We assume that irqstat (the raw value of the IRQacknowledge
arch/arm/mach-realview/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-realview/include/mach/entry-macro.S +0
-2- * register) is preserved from the macro above. - * If there is an IPI, we immediately signal end of interrupton the
- * controller, since this requires the original irqstat value
whicharch/arm/mach-realview/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-realview/include/mach/entry-macro.S +0
-11- * we won't easily be able to recreate later. - */ - - .macro test_for_ipi, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #16 - strcc \irqstat, [\base, #GIC_CPU_EOI] - cmpcs \irqnr, \irqnr - .endm - - /* As above, this assumes that irqstat and base are preserved..*/
arch/arm/mach-realview/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-realview/include/mach/entry-macro.S +0
-9- - .macro test_for_ltirq, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - mov \tmp, #0 - cmp \irqnr, #29 - moveq \tmp, #1 - streq \irqstat, [\base, #GIC_CPU_EOI] - cmp \tmp, #0 - .endmarch/arm/mach-tegra/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-tegra/include/mach/entry-macro.S +0
-015:28:39.000000000 +0900
arch/arm/mach-tegra/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-tegra/include/mach/entry-macro.S +1
-14@@ -17,7 +17,7 @@ #if defined(CONFIG_ARM_GIC) -#include <asm/hardware/gic.h> +#include <asm/hardware/entry-macro-gic.S> /* Uses the GIC interrupt controller built into the cpu */ #define ICTRL_BASE (IO_CPU_VIRT + 0x100)@@ -32,68 +32,6 @@ .macro arch_ret_to_user, tmp1, tmp2 .endm - - /* - * The interrupt numbering scheme is defined in the - * interrupt controller spec. To wit: - * - * Interrupts 0-15 are IPI - * 16-28 are reserved - * 29-31 are local. We allow 30 to be used for the watchdog. - * 32-1020 are global - * 1021-1022 are reserved - * 1023 is "spurious" (no interrupt) - * - * For now, we ignore all local interrupts so only return aninterrupt
arch/arm/mach-tegra/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-tegra/include/mach/entry-macro.S +0
-49- * if it's between 30 and 1020. The test_for_ipi routine below will - * pick up on IPIs. - * - * A simple read from the controller will tell us the number of the - * highest priority enabled interrupt. We then just need to check - * whether it is in the valid range for an IRQ (30-1020 inclusive). - */ - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - - /* bits 12-10 = src CPU, 9-0 = int # */ - ldr \irqstat, [\base, #GIC_CPU_INTACK] - - ldr \tmp, =1021 - - bic \irqnr, \irqstat, #0x1c00 - - cmp \irqnr, #29 - cmpcc \irqnr, \irqnr - cmpne \irqnr, \tmp - cmpcs \irqnr, \irqnr - - .endm - - /* We assume that irqstat (the raw value of the IRQ acknowledge - * register) is preserved from the macro above. - * If there is an IPI, we immediately signal end of interrupt on the - * controller, since this requires the original irqstat value which - * we won't easily be able to recreate later. - */ - - .macro test_for_ipi, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #16 - strcc \irqstat, [\base, #GIC_CPU_EOI] - cmpcs \irqnr, \irqnr - .endm - - /* As above, this assumes that irqstat and base are preserved.. */ - - .macro test_for_ltirq, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - mov \tmp, #0 - cmp \irqnr, #29 - moveq \tmp, #1 - streq \irqstat, [\base, #GIC_CPU_EOI] - cmp \tmp, #0 - .endm - #else /* legacy interrupt controller for AP16 */ .macro disable_fiqarch/arm/mach-ux500/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-ux500/include/mach/entry-macro.S +0
-015:23:50.000000000 +0900
arch/arm/mach-ux500/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-ux500/include/mach/entry-macro.S +1
-66@@ -11,7 +11,7 @@ * warranty of any kind, whether express or implied. */ #include <mach/hardware.h> -#include <asm/hardware/gic.h> +#include <asm/hardware/entry-macro-gic.S> .macro disable_fiq .endm@@ -22,68 +22,3 @@ .macro arch_ret_to_user, tmp1, tmp2 .endm - - /* - * The interrupt numbering scheme is defined in the - * interrupt controller spec. To wit: - * - * Interrupts 0-15 are IPI - * 16-28 are reserved - * 29-31 are local. We allow 30 to be used for the watchdog. - * 32-1020 are global - * 1021-1022 are reserved - * 1023 is "spurious" (no interrupt) - * - * For now, we ignore all local interrupts so only return an - * interrupt if it's between 30 and 1020. The test_for_ipi - * routine below will pick up on IPIs. - * - * A simple read from the controller will tell us the number - * of the highest priority enabled interrupt. We then just - * need to check whether it is in the valid range for an - * IRQ (30-1020 inclusive). - */ - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - - /* bits 12-10 = src CPU, 9-0 = int # */ - ldr \irqstat, [\base, #GIC_CPU_INTACK] - - ldr \tmp, =1021 - - bic \irqnr, \irqstat, #0x1c00 - - cmp \irqnr, #29 - cmpcc \irqnr, \irqnr - cmpne \irqnr, \tmp - cmpcs \irqnr, \irqnr - - .endm - - /* We assume that irqstat (the raw value of the IRQ - * acknowledge register) is preserved from the macro above. - * If there is an IPI, we immediately signal end of - * interrupt on the controller, since this requires the - * original irqstat value which we won't easily be able - * to recreate later. - */ - - .macro test_for_ipi, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #16 - strcc \irqstat, [\base, #GIC_CPU_EOI] - cmpcs \irqnr, \irqnr - .endm - - /* As above, this assumes that irqstat and base - * are preserved.. - */ - - .macro test_for_ltirq, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - mov \tmp, #0 - cmp \irqnr, #29 - moveq \tmp, #1 - streq \irqstat, [\base, #GIC_CPU_EOI] - cmp \tmp, #0 - .endmarch/arm/mach-vexpress/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-vexpress/include/mach/entry-macro.S +0
-015:22:09.000000000 +0900
arch/arm/mach-vexpress/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-vexpress/include/mach/entry-macro.S +1
-14@@ -1,4 +1,4 @@ -#include <asm/hardware/gic.h> +#include <asm/hardware/entry-macro-gic.S> .macro disable_fiq .endm@@ -10,58 +10,3 @@ .macro arch_ret_to_user, tmp1, tmp2 .endm - - /* - * The interrupt numbering scheme is defined in the - * interrupt controller spec. To wit: - * - * Interrupts 0-15 are IPI - * 16-28 are reserved - * 29-31 are local. We allow 30 to be used for the watchdog. - * 32-1020 are global - * 1021-1022 are reserved - * 1023 is "spurious" (no interrupt) - * - * For now, we ignore all local interrupts so only return aninterrupt if it's
- * between 30 and 1020. Thetest_for_ipiroutine below will pick up
on IPIs.arch/arm/mach-vexpress/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-vexpress/include/mach/entry-macro.S +0
-2- * - * A simple read from the controller will tell us the number of thehighest
- * priority enabled interrupt. We then just need to check whether
it is in thearch/arm/mach-vexpress/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-vexpress/include/mach/entry-macro.S +0
-5- * valid range for an IRQ (30-1020 inclusive). - */ - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - ldr \irqstat, [\base, #GIC_CPU_INTACK] /* bits 12-10 = src CPU,9-0 = int # */
arch/arm/mach-vexpress/include/mach/entry-macro.S 2010-11-10 renamed from arch/arm/mach-vexpress/include/mach/entry-macro.S +0
-33- ldr \tmp, =1021 - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #29 - cmpcc \irqnr, \irqnr - cmpne \irqnr, \tmp - cmpcs \irqnr, \irqnr - .endm - - /* We assume that irqstat (the raw value of the IRQ acknowledge - * register) is preserved from the macro above. - * If there is an IPI, we immediately signal end of interrupt on the - * controller, since this requires the original irqstat value which - * we won't easily be able to recreate later. - */ - - .macro test_for_ipi, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #16 - strcc \irqstat, [\base, #GIC_CPU_EOI] - cmpcs \irqnr, \irqnr - .endm - - /* As above, this assumes that irqstat and base are preserved.. */ - - .macro test_for_ltirq, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - mov \tmp, #0 - cmp \irqnr, #29 - moveq \tmp, #1 - streq \irqstat, [\base, #GIC_CPU_EOI] - cmp \tmp, #0 - .endm -_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/1 ARM: Common GIC entry macro code
Quoted 7 lines · Santosh
Quoted 2 lines
Subject: [PATCH] ARM: Common GIC entry macro code
I guess this was attempted by below patch as well.
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=6284%2F16284/1 in the RMKs patch system. This was also addressing OMAP and the patch was tested OK.
Thanks for the pointer! Looks almost identical to what I just hacked up. The main difference seems to be that the implementation in the tracker depends on "gic_cpu_base_addr" which isn't used by all sub-architectures.
Quoted 7 lines
Looks like it needs to be rebased because the state I see in the patch System is
- - Note 2 submitted by Russell King on 02 Sep 2010 15:43:12 (UTC) - - - Moved to Discarded.
Doesn't apply:
Ironically enough it looks like it was the omap2 bits that didn't apply properly.
If I don't hear anything then I'll just resend my patch to the tracker. If the other implementation gets merged sooner then that's even better - having some code to share is much better than duplicating the same code again and again.
Russell, do you have any preference?
Thank you!
Cheers,
/ magnus
PATCH 1/1 ARM: Common GIC entry macro code
Quoted 23 lines · Magnus Damm
Quoted 7 lines · Santosh
Quoted 2 lines
Subject: [PATCH] ARM: Common GIC entry macro code
I guess this was attempted by below patch as well.
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=6284%2F16284/1 in the RMKs patch system. This was also addressing OMAP and the patch was tested OK.
Thanks for the pointer! Looks almost identical to what I just hacked up. The main difference seems to be that the implementation in the tracker depends on "
gic_cpu_base_addr" which isn't used by all sub-architectures.Quoted 7 lines
Looks like it needs to be rebased because the state I see in the patch System is
- - Note 2 submitted by Russell King on 02 Sep 2010 15:43:12 (UTC) - - - Moved to Discarded.
Doesn't apply:
Quoted 7 lines
Ironically enough it looks like it was the omap2 bits that didn't apply properly.
If I don't hear anything then I'll just resend my patch to the tracker. If the other implementation gets merged sooner then that's even better - having some code to share is much better than duplicating the same code again and again.
If you rebase to the discarded one in tracker, I would be happy.
Anyway Acked-by: Srinidhi Kasagar<[email protected]>
Srinidhi
PATCH 1/1 ARM: Common GIC entry macro code
In reply to Magnus DammMagnus,
The patch assumes that PPI's could be nothing but timers. On msm we
have other interrupts which are PPI's.
I have tested this and doesn't work for msm. The reason being we treat
PPI timer interrupts as usual interrupts, meaning use do_asm_IRQ() instead of do_local_timer(). Besides there are other non timer interrupts that are PPIs and we need do_asm_IRQ() to be called for them.
You might want to exclude msm from this patch.
arch/arm/include/asm/hardware/entry-macro-gic.S line 39
Quoted 10 lines
+++
work/arch/arm/include/asm/hardware/entry-macro-gic.S2010-11-10 15:20:15.000000000 +0900arch/arm/include/asm/hardware/entry-macro-gic.S new file +8
-0+ .macro get_irqnr_and_base, irqnr, irqstat, base, tmp + + ldr \irqstat, [\base, #GIC_CPU_INTACK] + /* bits 12-10 = src CPU, 9-0 = int # */ + + ldr \tmp, =1021 + bic \irqnr, \irqstat, #0x1c00 + cmp \irqnr, #29
Not all the PPI's are timer interrupts on MSM. MSM would need this to be compared to 15 rather than 29.
arch/arm/mach-msm/include/mach/entry-macro-qgic.S line 58
Quoted 11 lines
arch/arm/mach-msm/include/mach/entry-macro-qgic.S +0
-9- */ - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - - ldr \irqstat, [\base, #GIC_CPU_INTACK] /* bits 12-10 =srcCPU, - 9-0 =int # */ - - bic \irqnr, \irqstat, #0x1c00 @mask src - cmp \irqnr, #15
See above line
Thanks,
Abhijeet
--
Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. --