[PATCH] ARM: irq: add a mach/fiq.h inclusion for SPARSE_IRQ build
robherring2 at gmail.com
Wed Jun 13 10:36:45 EDT 2012
On 06/13/2012 07:57 AM, Shawn Guo wrote:
> The commit a2be01b (ARM: only include mach/irqs.h for !SPARSE_IRQ)
> makes mach/irqs.h only be included for !SPARSE_IRQ build. There are
> a nubmer of platforms have FIQ_START defined in mach/irqs.h.
> arch/arm/mach-at91/include/mach/irqs.h:#define FIQ_START AT91_ID_FIQ
This one doesn't appear to actually be used anywhere.
> arch/arm/mach-rpc/include/mach/irqs.h:#define FIQ_START 64
> arch/arm/mach-s3c24xx/include/mach/irqs.h:#define FIQ_START IRQ_EINT0
> arch/arm/plat-mxc/include/mach/irqs.h:#define FIQ_START 0
> arch/arm/plat-omap/include/plat/irqs.h:#define FIQ_START 1024
> If SPARSE_IRQ is enabled for any of these platforms, the following
> compile error will be seen.
> arch/arm/kernel/fiq.c: In function ‘enable_fiq’:
> arch/arm/kernel/fiq.c:127:19: error: ‘FIQ_START’ undeclared (first use in this function)
> arch/arm/kernel/fiq.c:127:19: note: each undeclared identifier is reported only once for each function it appears in
> arch/arm/kernel/fiq.c: In function ‘disable_fiq’:
> arch/arm/kernel/fiq.c:132:20: error: ‘FIQ_START’ undeclared (first use in this function)
> So before we can remove the reference to FIQ_START in fiq.c, we need
> a way out. The patch adds a mach/fiq.h inclusion for SPARSE_IRQ build
> in asm/irq.h, so that platform can have a chance to provide FIQ_START.
The whole point of enabling SPARSE_IRQ was to eliminate a mach include
and now this adds a new one. This is not the right solution.
I think we need to remove FIQ_START from enable_fiq/disable_fiq and make
the platforms add any private offset they need. Only rpc and imx call
enable_fiq/disable_fiq. imx offset is 0, so that leaves only rpc.
The other simple solution is make fiq_start a variable.
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> arch/arm/include/asm/irq.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
> diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
> index 35c21c3..3fa390d 100644
> --- a/arch/arm/include/asm/irq.h
> +++ b/arch/arm/include/asm/irq.h
> @@ -7,6 +7,7 @@
> #include <mach/irqs.h>
> #define NR_IRQS NR_IRQS_LEGACY
> +#include <mach/fiq.h>
> #ifndef irq_canonicalize
More information about the linux-arm-kernel