lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xtensa: variant irq set callbacks

Browse Source 
Allow the core variant code to provide irq enable/disable callbacks.

Signed-off-by: Johannes Weiner <jw@emlix.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
This commit is contained in:
Johannes Weiner
2009-03-04 16:21:31 +01:00
committed by Chris Zankel
parent 72197b18bc
commit 4c0d214144
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/xtensa/Kconfig
View File

@@ -51,6 +51,9 @@ source "kernel/Kconfig.freezer"
config MMU config MMU
def_bool n def_bool n
config VARIANT_IRQ_SWITCH
def_bool n
menu "Processor type and features" menu "Processor type and features"
choice choice

7
arch/xtensa/include/asm/irq.h
View File

@@ -14,6 +14,13 @@
#include <platform/hardware.h> #include <platform/hardware.h>
#include <variant/core.h> #include <variant/core.h>
#ifdef CONFIG_VARIANT_IRQ_SWITCH
#include <variant/irq.h>
#else
static inline void variant_irq_enable(unsigned int irq) { }
static inline void variant_irq_disable(unsigned int irq) { }
#endif
#ifndef PLATFORM_NR_IRQS #ifndef PLATFORM_NR_IRQS
# define PLATFORM_NR_IRQS 0 # define PLATFORM_NR_IRQS 0
#endif #endif

14
arch/xtensa/kernel/irq.c
View File

@@ -132,6 +132,18 @@ static void xtensa_irq_unmask(unsigned int irq)
set_sr (cached_irq_mask, INTENABLE); set_sr (cached_irq_mask, INTENABLE);
} }
static void xtensa_irq_enable(unsigned int irq)
{
variant_irq_enable(irq);
xtensa_irq_unmask(irq);
}
static void xtensa_irq_disable(unsigned int irq)
{
xtensa_irq_mask(irq);
variant_irq_disable(irq);
}
static void xtensa_irq_ack(unsigned int irq) static void xtensa_irq_ack(unsigned int irq)
{ {
set_sr(1 << irq, INTCLEAR); set_sr(1 << irq, INTCLEAR);
@@ -146,6 +158,8 @@ static int xtensa_irq_retrigger(unsigned int irq)
static struct irq_chip xtensa_irq_chip = { static struct irq_chip xtensa_irq_chip = {
.name = "xtensa", .name = "xtensa",
.enable = xtensa_irq_enable,
.disable = xtensa_irq_disable,
.mask = xtensa_irq_mask, .mask = xtensa_irq_mask,
.unmask = xtensa_irq_unmask, .unmask = xtensa_irq_unmask,
.ack = xtensa_irq_ack, .ack = xtensa_irq_ack,