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 for FIQ
support.
  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
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)
The patch changes fiq code to have init_FIQ take FIQ_START from
platforms as a parameter and assign it to variable fiq_start which
is to replace FIQ_START uses in enable_fiq/disable_fiq.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Rob Herring <rob.herring@calxeda.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
		
	
			
		
			
				
	
	
		
			168 lines
		
	
	
	
		
			3.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			168 lines
		
	
	
	
		
			3.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
#include <linux/init.h>
 | 
						|
#include <linux/list.h>
 | 
						|
#include <linux/io.h>
 | 
						|
 | 
						|
#include <asm/mach/irq.h>
 | 
						|
#include <asm/hardware/iomd.h>
 | 
						|
#include <asm/irq.h>
 | 
						|
#include <asm/fiq.h>
 | 
						|
 | 
						|
static void iomd_ack_irq_a(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << d->irq;
 | 
						|
	val = iomd_readb(IOMD_IRQMASKA);
 | 
						|
	iomd_writeb(val & ~mask, IOMD_IRQMASKA);
 | 
						|
	iomd_writeb(mask, IOMD_IRQCLRA);
 | 
						|
}
 | 
						|
 | 
						|
static void iomd_mask_irq_a(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << d->irq;
 | 
						|
	val = iomd_readb(IOMD_IRQMASKA);
 | 
						|
	iomd_writeb(val & ~mask, IOMD_IRQMASKA);
 | 
						|
}
 | 
						|
 | 
						|
static void iomd_unmask_irq_a(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << d->irq;
 | 
						|
	val = iomd_readb(IOMD_IRQMASKA);
 | 
						|
	iomd_writeb(val | mask, IOMD_IRQMASKA);
 | 
						|
}
 | 
						|
 | 
						|
static struct irq_chip iomd_a_chip = {
 | 
						|
	.irq_ack	= iomd_ack_irq_a,
 | 
						|
	.irq_mask	= iomd_mask_irq_a,
 | 
						|
	.irq_unmask	= iomd_unmask_irq_a,
 | 
						|
};
 | 
						|
 | 
						|
static void iomd_mask_irq_b(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << (d->irq & 7);
 | 
						|
	val = iomd_readb(IOMD_IRQMASKB);
 | 
						|
	iomd_writeb(val & ~mask, IOMD_IRQMASKB);
 | 
						|
}
 | 
						|
 | 
						|
static void iomd_unmask_irq_b(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << (d->irq & 7);
 | 
						|
	val = iomd_readb(IOMD_IRQMASKB);
 | 
						|
	iomd_writeb(val | mask, IOMD_IRQMASKB);
 | 
						|
}
 | 
						|
 | 
						|
static struct irq_chip iomd_b_chip = {
 | 
						|
	.irq_ack	= iomd_mask_irq_b,
 | 
						|
	.irq_mask	= iomd_mask_irq_b,
 | 
						|
	.irq_unmask	= iomd_unmask_irq_b,
 | 
						|
};
 | 
						|
 | 
						|
static void iomd_mask_irq_dma(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << (d->irq & 7);
 | 
						|
	val = iomd_readb(IOMD_DMAMASK);
 | 
						|
	iomd_writeb(val & ~mask, IOMD_DMAMASK);
 | 
						|
}
 | 
						|
 | 
						|
static void iomd_unmask_irq_dma(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << (d->irq & 7);
 | 
						|
	val = iomd_readb(IOMD_DMAMASK);
 | 
						|
	iomd_writeb(val | mask, IOMD_DMAMASK);
 | 
						|
}
 | 
						|
 | 
						|
static struct irq_chip iomd_dma_chip = {
 | 
						|
	.irq_ack	= iomd_mask_irq_dma,
 | 
						|
	.irq_mask	= iomd_mask_irq_dma,
 | 
						|
	.irq_unmask	= iomd_unmask_irq_dma,
 | 
						|
};
 | 
						|
 | 
						|
static void iomd_mask_irq_fiq(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << (d->irq & 7);
 | 
						|
	val = iomd_readb(IOMD_FIQMASK);
 | 
						|
	iomd_writeb(val & ~mask, IOMD_FIQMASK);
 | 
						|
}
 | 
						|
 | 
						|
static void iomd_unmask_irq_fiq(struct irq_data *d)
 | 
						|
{
 | 
						|
	unsigned int val, mask;
 | 
						|
 | 
						|
	mask = 1 << (d->irq & 7);
 | 
						|
	val = iomd_readb(IOMD_FIQMASK);
 | 
						|
	iomd_writeb(val | mask, IOMD_FIQMASK);
 | 
						|
}
 | 
						|
 | 
						|
static struct irq_chip iomd_fiq_chip = {
 | 
						|
	.irq_ack	= iomd_mask_irq_fiq,
 | 
						|
	.irq_mask	= iomd_mask_irq_fiq,
 | 
						|
	.irq_unmask	= iomd_unmask_irq_fiq,
 | 
						|
};
 | 
						|
 | 
						|
extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end;
 | 
						|
 | 
						|
void __init rpc_init_irq(void)
 | 
						|
{
 | 
						|
	unsigned int irq, flags;
 | 
						|
 | 
						|
	iomd_writeb(0, IOMD_IRQMASKA);
 | 
						|
	iomd_writeb(0, IOMD_IRQMASKB);
 | 
						|
	iomd_writeb(0, IOMD_FIQMASK);
 | 
						|
	iomd_writeb(0, IOMD_DMAMASK);
 | 
						|
 | 
						|
	set_fiq_handler(&rpc_default_fiq_start,
 | 
						|
		&rpc_default_fiq_end - &rpc_default_fiq_start);
 | 
						|
 | 
						|
	for (irq = 0; irq < NR_IRQS; irq++) {
 | 
						|
		flags = IRQF_VALID;
 | 
						|
 | 
						|
		if (irq <= 6 || (irq >= 9 && irq <= 15))
 | 
						|
			flags |= IRQF_PROBE;
 | 
						|
 | 
						|
		if (irq == 21 || (irq >= 16 && irq <= 19) ||
 | 
						|
		    irq == IRQ_KEYBOARDTX)
 | 
						|
			flags |= IRQF_NOAUTOEN;
 | 
						|
 | 
						|
		switch (irq) {
 | 
						|
		case 0 ... 7:
 | 
						|
			irq_set_chip_and_handler(irq, &iomd_a_chip,
 | 
						|
						 handle_level_irq);
 | 
						|
			set_irq_flags(irq, flags);
 | 
						|
			break;
 | 
						|
 | 
						|
		case 8 ... 15:
 | 
						|
			irq_set_chip_and_handler(irq, &iomd_b_chip,
 | 
						|
						 handle_level_irq);
 | 
						|
			set_irq_flags(irq, flags);
 | 
						|
			break;
 | 
						|
 | 
						|
		case 16 ... 21:
 | 
						|
			irq_set_chip_and_handler(irq, &iomd_dma_chip,
 | 
						|
						 handle_level_irq);
 | 
						|
			set_irq_flags(irq, flags);
 | 
						|
			break;
 | 
						|
 | 
						|
		case 64 ... 71:
 | 
						|
			irq_set_chip(irq, &iomd_fiq_chip);
 | 
						|
			set_irq_flags(irq, IRQF_VALID);
 | 
						|
			break;
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	init_FIQ(FIQ_START);
 | 
						|
}
 | 
						|
 |