Commit 54a38440 authored by Zhen Lei's avatar Zhen Lei Committed by Marc Zyngier

irqchip/dw-apb-ictl: Add primary interrupt controller support

Add support to use dw-apb-ictl as primary interrupt controller.
Suggested-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
[maz: minor fixups]
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Tested-by: default avatarHaoyu Lv <lvhaoyu@huawei.com>
Link: https://lore.kernel.org/r/20200924071754.4509-4-thunder.leizhen@huawei.com
parent d59f7d15
...@@ -148,7 +148,7 @@ config DAVINCI_CP_INTC ...@@ -148,7 +148,7 @@ config DAVINCI_CP_INTC
config DW_APB_ICTL config DW_APB_ICTL
bool bool
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select IRQ_DOMAIN select IRQ_DOMAIN_HIERARCHY
config FARADAY_FTINTC010 config FARADAY_FTINTC010
bool bool
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/irqchip/chained_irq.h> #include <linux/irqchip/chained_irq.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/interrupt.h>
#define APB_INT_ENABLE_L 0x00 #define APB_INT_ENABLE_L 0x00
#define APB_INT_ENABLE_H 0x04 #define APB_INT_ENABLE_H 0x04
...@@ -26,6 +27,27 @@ ...@@ -26,6 +27,27 @@
#define APB_INT_FINALSTATUS_H 0x34 #define APB_INT_FINALSTATUS_H 0x34
#define APB_INT_BASE_OFFSET 0x04 #define APB_INT_BASE_OFFSET 0x04
/* irq domain of the primary interrupt controller. */
static struct irq_domain *dw_apb_ictl_irq_domain;
static void __irq_entry dw_apb_ictl_handle_irq(struct pt_regs *regs)
{
struct irq_domain *d = dw_apb_ictl_irq_domain;
int n;
for (n = 0; n < d->revmap_size; n += 32) {
struct irq_chip_generic *gc = irq_get_domain_generic_chip(d, n);
u32 stat = readl_relaxed(gc->reg_base + APB_INT_FINALSTATUS_L);
while (stat) {
u32 hwirq = ffs(stat) - 1;
handle_domain_irq(d, hwirq, regs);
stat &= ~BIT(hwirq);
}
}
}
static void dw_apb_ictl_handle_irq_cascaded(struct irq_desc *desc) static void dw_apb_ictl_handle_irq_cascaded(struct irq_desc *desc)
{ {
struct irq_domain *d = irq_desc_get_handler_data(desc); struct irq_domain *d = irq_desc_get_handler_data(desc);
...@@ -50,6 +72,30 @@ static void dw_apb_ictl_handle_irq_cascaded(struct irq_desc *desc) ...@@ -50,6 +72,30 @@ static void dw_apb_ictl_handle_irq_cascaded(struct irq_desc *desc)
chained_irq_exit(chip, desc); chained_irq_exit(chip, desc);
} }
static int dw_apb_ictl_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
unsigned int nr_irqs, void *arg)
{
int i, ret;
irq_hw_number_t hwirq;
unsigned int type = IRQ_TYPE_NONE;
struct irq_fwspec *fwspec = arg;
ret = irq_domain_translate_onecell(domain, fwspec, &hwirq, &type);
if (ret)
return ret;
for (i = 0; i < nr_irqs; i++)
irq_map_generic_chip(domain, virq + i, hwirq + i);
return 0;
}
static const struct irq_domain_ops dw_apb_ictl_irq_domain_ops = {
.translate = irq_domain_translate_onecell,
.alloc = dw_apb_ictl_irq_domain_alloc,
.free = irq_domain_free_irqs_top,
};
#ifdef CONFIG_PM #ifdef CONFIG_PM
static void dw_apb_ictl_resume(struct irq_data *d) static void dw_apb_ictl_resume(struct irq_data *d)
{ {
...@@ -77,14 +123,19 @@ static int __init dw_apb_ictl_init(struct device_node *np, ...@@ -77,14 +123,19 @@ static int __init dw_apb_ictl_init(struct device_node *np,
int ret, nrirqs, parent_irq, i; int ret, nrirqs, parent_irq, i;
u32 reg; u32 reg;
domain_ops = &irq_generic_chip_ops; if (!parent) {
/* Used as the primary interrupt controller */
parent_irq = 0;
domain_ops = &dw_apb_ictl_irq_domain_ops;
} else {
/* Map the parent interrupt for the chained handler */ /* Map the parent interrupt for the chained handler */
parent_irq = irq_of_parse_and_map(np, 0); parent_irq = irq_of_parse_and_map(np, 0);
if (parent_irq <= 0) { if (parent_irq <= 0) {
pr_err("%pOF: unable to parse irq\n", np); pr_err("%pOF: unable to parse irq\n", np);
return -EINVAL; return -EINVAL;
} }
domain_ops = &irq_generic_chip_ops;
}
ret = of_address_to_resource(np, 0, &r); ret = of_address_to_resource(np, 0, &r);
if (ret) { if (ret) {
...@@ -148,8 +199,13 @@ static int __init dw_apb_ictl_init(struct device_node *np, ...@@ -148,8 +199,13 @@ static int __init dw_apb_ictl_init(struct device_node *np,
gc->chip_types[0].chip.irq_resume = dw_apb_ictl_resume; gc->chip_types[0].chip.irq_resume = dw_apb_ictl_resume;
} }
if (parent_irq) {
irq_set_chained_handler_and_data(parent_irq, irq_set_chained_handler_and_data(parent_irq,
dw_apb_ictl_handle_irq_cascaded, domain); dw_apb_ictl_handle_irq_cascaded, domain);
} else {
dw_apb_ictl_irq_domain = domain;
set_handle_irq(dw_apb_ictl_handle_irq);
}
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment