Merge branch 'irq/for-arm' into irq/core

Pull in the branch which can be consumed by ARM to build their changes
on top.

8 files changed, 102 insertions, 14 deletions

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 6de62a96e79c..99b9a9792975 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -30,6 +30,7 @@ config ARM_GIC_V3_ITS
 config ARM_NVIC
         bool
         select IRQ_DOMAIN
+        select IRQ_DOMAIN_HIERARCHY
         select GENERIC_IRQ_CHIP
 
 config ARM_VIC
diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c
index 4ff0805fca01..5fac9100f6cb 100644
--- a/drivers/irqchip/irq-nvic.c
+++ b/drivers/irqchip/irq-nvic.c
@@ -49,6 +49,31 @@ nvic_handle_irq(irq_hw_number_t hwirq, struct pt_regs *regs)
         handle_IRQ(irq, regs);
 }
 
+static int nvic_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 of_phandle_args *irq_data = arg;
+
+        ret = irq_domain_xlate_onecell(domain, irq_data->np, irq_data->args,
+                                   irq_data->args_count, &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 nvic_irq_domain_ops = {
+        .xlate = irq_domain_xlate_onecell,
+        .alloc = nvic_irq_domain_alloc,
+        .free = irq_domain_free_irqs_top,
+};
+
 static int __init nvic_of_init(struct device_node *node,
                                struct device_node *parent)
 {
@@ -70,7 +95,8 @@ static int __init nvic_of_init(struct device_node *node,
                 irqs = NVIC_MAX_IRQ;
 
         nvic_irq_domain =
-                irq_domain_add_linear(node, irqs, &irq_generic_chip_ops, NULL);
+                irq_domain_add_linear(node, irqs, &nvic_irq_domain_ops, NULL);
+
         if (!nvic_irq_domain) {
                 pr_warn("Failed to allocate irq domain\n");
                 return -ENOMEM;
diff --git a/drivers/irqchip/irq-vf610-mscm-ir.c b/drivers/irqchip/irq-vf610-mscm-ir.c
index d0f940a3516d..f5c01cbcc73a 100644
--- a/drivers/irqchip/irq-vf610-mscm-ir.c
+++ b/drivers/irqchip/irq-vf610-mscm-ir.c
@@ -47,6 +47,7 @@ struct vf610_mscm_ir_chip_data {
         void __iomem *mscm_ir_base;
         u16 cpu_mask;
         u16 saved_irsprc[MSCM_IRSPRC_NUM];
+        bool is_nvic;
 };
 
 static struct vf610_mscm_ir_chip_data *mscm_ir_data;
@@ -101,7 +102,7 @@ static void vf610_mscm_ir_enable(struct irq_data *data)
         writew_relaxed(chip_data->cpu_mask,
                        chip_data->mscm_ir_base + MSCM_IRSPRC(hwirq));
 
-        irq_chip_unmask_parent(data);
+        irq_chip_enable_parent(data);
 }
 
 static void vf610_mscm_ir_disable(struct irq_data *data)
@@ -111,7 +112,7 @@ static void vf610_mscm_ir_disable(struct irq_data *data)
 
         writew_relaxed(0x0, chip_data->mscm_ir_base + MSCM_IRSPRC(hwirq));
 
-        irq_chip_mask_parent(data);
+        irq_chip_disable_parent(data);
 }
 
 static struct irq_chip vf610_mscm_ir_irq_chip = {
@@ -143,10 +144,17 @@ static int vf610_mscm_ir_domain_alloc(struct irq_domain *domain, unsigned int vi
                                               domain->host_data);
 
         gic_data.np = domain->parent->of_node;
-        gic_data.args_count = 3;
-        gic_data.args[0] = GIC_SPI;
-        gic_data.args[1] = irq_data->args[0];
-        gic_data.args[2] = irq_data->args[1];
+
+        if (mscm_ir_data->is_nvic) {
+                gic_data.args_count = 1;
+                gic_data.args[0] = irq_data->args[0];
+        } else {
+                gic_data.args_count = 3;
+                gic_data.args[0] = GIC_SPI;
+                gic_data.args[1] = irq_data->args[0];
+                gic_data.args[2] = irq_data->args[1];
+        }
+
         return irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, &gic_data);
 }
 
@@ -198,6 +206,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node,
                 goto out_unmap;
         }
 
+        if (of_device_is_compatible(domain->parent->of_node, "arm,armv7m-nvic"))
+                mscm_ir_data->is_nvic = true;
+
         cpu_pm_register_notifier(&mscm_ir_notifier_block);
 
         return 0;
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 62c6901cab55..2633061364b1 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -458,6 +458,8 @@ extern void handle_nested_irq(unsigned int irq);
 
 extern int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg);
 #ifdef  CONFIG_IRQ_DOMAIN_HIERARCHY
+extern void irq_chip_enable_parent(struct irq_data *data);
+extern void irq_chip_disable_parent(struct irq_data *data);
 extern void irq_chip_ack_parent(struct irq_data *data);
 extern int irq_chip_retrigger_hierarchy(struct irq_data *data);
 extern void irq_chip_mask_parent(struct irq_data *data);
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 676d7306a360..744ac0ec98eb 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -258,6 +258,10 @@ int irq_domain_xlate_onetwocell(struct irq_domain *d, struct device_node *ctrlr,
 /* V2 interfaces to support hierarchy IRQ domains. */
 extern struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain,
                                                 unsigned int virq);
+extern void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,
+                                irq_hw_number_t hwirq, struct irq_chip *chip,
+                                void *chip_data, irq_flow_handler_t handler,
+                                void *handler_data, const char *handler_name);
 #ifdef  CONFIG_IRQ_DOMAIN_HIERARCHY
 extern struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *parent,
                         unsigned int flags, unsigned int size,
@@ -281,10 +285,6 @@ extern int irq_domain_set_hwirq_and_chip(struct irq_domain *domain,
                                          irq_hw_number_t hwirq,
                                          struct irq_chip *chip,
                                          void *chip_data);
-extern void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,
-                                irq_hw_number_t hwirq, struct irq_chip *chip,
-                                void *chip_data, irq_flow_handler_t handler,
-                                void *handler_data, const char *handler_name);
 extern void irq_domain_reset_irq_data(struct irq_data *irq_data);
 extern void irq_domain_free_irqs_common(struct irq_domain *domain,
                                         unsigned int virq,
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index eb9a4ea394ab..2456fe89719c 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -876,6 +876,34 @@ void irq_cpu_offline(void)
 
 #ifdef  CONFIG_IRQ_DOMAIN_HIERARCHY
 /**
+ * irq_chip_enable_parent - Enable the parent interrupt (defaults to unmask if
+ * NULL)
+ * @data:       Pointer to interrupt specific data
+ */
+void irq_chip_enable_parent(struct irq_data *data)
+{
+        data = data->parent_data;
+        if (data->chip->irq_enable)
+                data->chip->irq_enable(data);
+        else
+                data->chip->irq_unmask(data);
+}
+
+/**
+ * irq_chip_disable_parent - Disable the parent interrupt (defaults to mask if
+ * NULL)
+ * @data:       Pointer to interrupt specific data
+ */
+void irq_chip_disable_parent(struct irq_data *data)
+{
+        data = data->parent_data;
+        if (data->chip->irq_disable)
+                data->chip->irq_disable(data);
+        else
+                data->chip->irq_mask(data);
+}
+
+/**
  * irq_chip_ack_parent - Acknowledge the parent interrupt
  * @data:       Pointer to interrupt specific data
  */
diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c
index 61024e8abdef..15b370daf234 100644
--- a/kernel/irq/generic-chip.c
+++ b/kernel/irq/generic-chip.c
@@ -360,7 +360,7 @@ static struct lock_class_key irq_nested_lock_class;
 int irq_map_generic_chip(struct irq_domain *d, unsigned int virq,
                          irq_hw_number_t hw_irq)
 {
-        struct irq_data *data = irq_get_irq_data(virq);
+        struct irq_data *data = irq_domain_get_irq_data(d, virq);
         struct irq_domain_chip_generic *dgc = d->gc;
         struct irq_chip_generic *gc;
         struct irq_chip_type *ct;
@@ -405,8 +405,7 @@ int irq_map_generic_chip(struct irq_domain *d, unsigned int virq,
         else
                 data->mask = 1 << idx;
 
-        irq_set_chip_and_handler(virq, chip, ct->handler);
-        irq_set_chip_data(virq, gc);
+        irq_domain_set_info(d, virq, hw_irq, chip, gc, ct->handler, NULL, NULL);
         irq_modify_status(virq, dgc->irq_flags_to_clear, dgc->irq_flags_to_set);
         return 0;
 }
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 7fac311057b8..41bf6dc49f59 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1232,6 +1232,27 @@ struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain,
         return (irq_data && irq_data->domain == domain) ? irq_data : NULL;
 }
 
+/**
+ * irq_domain_set_info - Set the complete data for a @virq in @domain
+ * @domain:             Interrupt domain to match
+ * @virq:               IRQ number
+ * @hwirq:              The hardware interrupt number
+ * @chip:               The associated interrupt chip
+ * @chip_data:          The associated interrupt chip data
+ * @handler:            The interrupt flow handler
+ * @handler_data:       The interrupt flow handler data
+ * @handler_name:       The interrupt handler name
+ */
+void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,
+                         irq_hw_number_t hwirq, struct irq_chip *chip,
+                         void *chip_data, irq_flow_handler_t handler,
+                         void *handler_data, const char *handler_name)
+{
+        irq_set_chip_and_handler_name(virq, chip, handler, handler_name);
+        irq_set_chip_data(virq, chip_data);
+        irq_set_handler_data(virq, handler_data);
+}
+
 static void irq_domain_check_hierarchy(struct irq_domain *domain)
 {
 }