leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARC: [intc] mask/unmask can be hidden again

Browse Source 
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
This commit is contained in:
Vineet Gupta
2014-06-25 17:25:46 +05:30
parent 25c7c11fa5
commit 590892deb6
2 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arc/include/asm/irqflags.h
View File

@@ -131,24 +131,6 @@ static inline int arch_irqs_disabled(void)
return arch_irqs_disabled_flags(arch_local_save_flags()); return arch_irqs_disabled_flags(arch_local_save_flags());
} }
static inline void arch_mask_irq(unsigned int irq)
{
unsigned int ienb;
ienb = read_aux_reg(AUX_IENABLE);
ienb &= ~(1 << irq);
write_aux_reg(AUX_IENABLE, ienb);
}
static inline void arch_unmask_irq(unsigned int irq)
{
unsigned int ienb;
ienb = read_aux_reg(AUX_IENABLE);
ienb |= (1 << irq);
write_aux_reg(AUX_IENABLE, ienb);
}
#else #else
#ifdef CONFIG_TRACE_IRQFLAGS #ifdef CONFIG_TRACE_IRQFLAGS

20
arch/arc/kernel/irq.c
View File

@@ -55,20 +55,28 @@ void arc_init_IRQ(void)
* below, per IRQ. * below, per IRQ.
*/ */
static void arc_mask_irq(struct irq_data *data) static void arc_irq_mask(struct irq_data *data)
{ {
arch_mask_irq(data->irq); unsigned int ienb;
ienb = read_aux_reg(AUX_IENABLE);
ienb &= ~(1 << data->irq);
write_aux_reg(AUX_IENABLE, ienb);
} }
static void arc_unmask_irq(struct irq_data *data) static void arc_irq_unmask(struct irq_data *data)
{ {
arch_unmask_irq(data->irq); unsigned int ienb;
ienb = read_aux_reg(AUX_IENABLE);
ienb |= (1 << data->irq);
write_aux_reg(AUX_IENABLE, ienb);
} }
static struct irq_chip onchip_intc = { static struct irq_chip onchip_intc = {
.name = "ARC In-core Intc", .name = "ARC In-core Intc",
.irq_mask = arc_mask_irq, .irq_mask = arc_irq_mask,
.irq_unmask = arc_unmask_irq, .irq_unmask = arc_irq_unmask,
}; };
static int arc_intc_domain_map(struct irq_domain *d, unsigned int irq, static int arc_intc_domain_map(struct irq_domain *d, unsigned int irq,