-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
xtensa: move built-in PIC to drivers/irqchip
Extract xtensa built-in interrupt controller implementation from xtensa/kernel/irq.c and move it to other irqchips, providing way to instantiate it from the device tree. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
- Loading branch information
Max Filippov
authored and
Chris Zankel
committed
Jan 14, 2014
1 parent
c8f3a7d
commit cbd1de2
Showing
6 changed files
with
165 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * Xtensa built-in interrupt controller | ||
| * | ||
| * Copyright (C) 2002 - 2013 Tensilica, Inc. | ||
| * Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar | ||
| * | ||
| * This file is subject to the terms and conditions of the GNU General Public | ||
| * License. See the file "COPYING" in the main directory of this archive | ||
| * for more details. | ||
| * | ||
| * Chris Zankel <chris@zankel.net> | ||
| * Kevin Chea | ||
| */ | ||
|
|
||
| #include <linux/interrupt.h> | ||
| #include <linux/irqdomain.h> | ||
| #include <linux/irq.h> | ||
| #include <linux/of.h> | ||
|
|
||
| #include "irqchip.h" | ||
|
|
||
| unsigned int cached_irq_mask; | ||
|
|
||
| /* | ||
| * Device Tree IRQ specifier translation function which works with one or | ||
| * two cell bindings. First cell value maps directly to the hwirq number. | ||
| * Second cell if present specifies whether hwirq number is external (1) or | ||
| * internal (0). | ||
| */ | ||
| static int xtensa_pic_irq_domain_xlate(struct irq_domain *d, | ||
| struct device_node *ctrlr, | ||
| const u32 *intspec, unsigned int intsize, | ||
| unsigned long *out_hwirq, unsigned int *out_type) | ||
| { | ||
| return xtensa_irq_domain_xlate(intspec, intsize, | ||
| intspec[0], intspec[0], | ||
| out_hwirq, out_type); | ||
| } | ||
|
|
||
| static const struct irq_domain_ops xtensa_irq_domain_ops = { | ||
| .xlate = xtensa_pic_irq_domain_xlate, | ||
| .map = xtensa_irq_map, | ||
| }; | ||
|
|
||
| static void xtensa_irq_mask(struct irq_data *d) | ||
| { | ||
| cached_irq_mask &= ~(1 << d->hwirq); | ||
| set_sr(cached_irq_mask, intenable); | ||
| } | ||
|
|
||
| static void xtensa_irq_unmask(struct irq_data *d) | ||
| { | ||
| cached_irq_mask |= 1 << d->hwirq; | ||
| set_sr(cached_irq_mask, intenable); | ||
| } | ||
|
|
||
| static void xtensa_irq_enable(struct irq_data *d) | ||
| { | ||
| variant_irq_enable(d->hwirq); | ||
| xtensa_irq_unmask(d); | ||
| } | ||
|
|
||
| static void xtensa_irq_disable(struct irq_data *d) | ||
| { | ||
| xtensa_irq_mask(d); | ||
| variant_irq_disable(d->hwirq); | ||
| } | ||
|
|
||
| static void xtensa_irq_ack(struct irq_data *d) | ||
| { | ||
| set_sr(1 << d->hwirq, intclear); | ||
| } | ||
|
|
||
| static int xtensa_irq_retrigger(struct irq_data *d) | ||
| { | ||
| set_sr(1 << d->hwirq, intset); | ||
| return 1; | ||
| } | ||
|
|
||
| static struct irq_chip xtensa_irq_chip = { | ||
| .name = "xtensa", | ||
| .irq_enable = xtensa_irq_enable, | ||
| .irq_disable = xtensa_irq_disable, | ||
| .irq_mask = xtensa_irq_mask, | ||
| .irq_unmask = xtensa_irq_unmask, | ||
| .irq_ack = xtensa_irq_ack, | ||
| .irq_retrigger = xtensa_irq_retrigger, | ||
| }; | ||
|
|
||
| int __init xtensa_pic_init_legacy(struct device_node *interrupt_parent) | ||
| { | ||
| struct irq_domain *root_domain = | ||
| irq_domain_add_legacy(NULL, NR_IRQS, 0, 0, | ||
| &xtensa_irq_domain_ops, &xtensa_irq_chip); | ||
| irq_set_default_host(root_domain); | ||
| return 0; | ||
| } | ||
|
|
||
| static int __init xtensa_pic_init(struct device_node *np, | ||
| struct device_node *interrupt_parent) | ||
| { | ||
| struct irq_domain *root_domain = | ||
| irq_domain_add_linear(np, NR_IRQS, &xtensa_irq_domain_ops, | ||
| &xtensa_irq_chip); | ||
| irq_set_default_host(root_domain); | ||
| return 0; | ||
| } | ||
| IRQCHIP_DECLARE(xtensa_irq_chip, "cdns,xtensa-pic", xtensa_pic_init); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| /* | ||
| * Xtensa built-in interrupt controller | ||
| * | ||
| * Copyright (C) 2002 - 2013 Tensilica, Inc. | ||
| * Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar | ||
| * | ||
| * This file is subject to the terms and conditions of the GNU General Public | ||
| * License. See the file "COPYING" in the main directory of this archive | ||
| * for more details. | ||
| */ | ||
|
|
||
| #ifndef __LINUX_IRQCHIP_XTENSA_PIC_H | ||
| #define __LINUX_IRQCHIP_XTENSA_PIC_H | ||
|
|
||
| struct device_node; | ||
| int xtensa_pic_init_legacy(struct device_node *interrupt_parent); | ||
|
|
||
| #endif /* __LINUX_IRQCHIP_XTENSA_PIC_H */ |