Merge branch 'irq/ipi-as-irq', remote-tracking branches 'origin/irq/dw' and 'origin...
authorMarc Zyngier <maz@kernel.org>
Mon, 28 Sep 2020 10:36:40 +0000 (11:36 +0100)
committerMarc Zyngier <maz@kernel.org>
Mon, 28 Sep 2020 10:36:40 +0000 (11:36 +0100)
Signed-off-by: Marc Zyngier <maz@kernel.org>
Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml [new file with mode: 0644]
Documentation/devicetree/bindings/interrupt-controller/snps,dw-apb-ictl.txt
MAINTAINERS
arch/arm/kernel/smp.c
arch/arm64/kernel/smp.c
drivers/irqchip/Kconfig
drivers/irqchip/Makefile
drivers/irqchip/irq-dw-apb-ictl.c
drivers/irqchip/irq-owl-sirq.c [new file with mode: 0644]
include/linux/irq.h

diff --git a/Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml b/Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
new file mode 100644 (file)
index 0000000..5da333c
--- /dev/null
@@ -0,0 +1,65 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/actions,owl-sirq.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Actions Semi Owl SoCs SIRQ interrupt controller
+
+maintainers:
+  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
+
+description: |
+  This interrupt controller is found in the Actions Semi Owl SoCs (S500, S700
+  and S900) and provides support for handling up to 3 external interrupt lines.
+
+properties:
+  compatible:
+    enum:
+      - actions,s500-sirq
+      - actions,s700-sirq
+      - actions,s900-sirq
+
+  reg:
+    maxItems: 1
+
+  interrupt-controller: true
+
+  '#interrupt-cells':
+    const: 2
+    description:
+      The first cell is the input IRQ number, between 0 and 2, while the second
+      cell is the trigger type as defined in interrupt.txt in this directory.
+
+  'interrupts':
+    description: |
+      Contains the GIC SPI IRQs mapped to the external interrupt lines.
+      They shall be specified sequentially from output 0 to 2.
+    minItems: 3
+    maxItems: 3
+
+required:
+  - compatible
+  - reg
+  - interrupt-controller
+  - '#interrupt-cells'
+  - 'interrupts'
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    sirq: interrupt-controller@b01b0200 {
+      compatible = "actions,s500-sirq";
+      reg = <0xb01b0200 0x4>;
+      interrupt-controller;
+      #interrupt-cells = <2>;
+      interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, /* SIRQ0 */
+                   <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, /* SIRQ1 */
+                   <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; /* SIRQ2 */
+    };
+
+...
index 086ff08322db94fca1053899f705d594f4805c51..2db59df9408f4c690d5bcb3d13893c8fdae9935b 100644 (file)
@@ -2,7 +2,8 @@ Synopsys DesignWare APB interrupt controller (dw_apb_ictl)
 
 Synopsys DesignWare provides interrupt controller IP for APB known as
 dw_apb_ictl. The IP is used as secondary interrupt controller in some SoCs with
-APB bus, e.g. Marvell Armada 1500.
+APB bus, e.g. Marvell Armada 1500. It can also be used as primary interrupt
+controller in some SoCs, e.g. Hisilicon SD5203.
 
 Required properties:
 - compatible: shall be "snps,dw-apb-ictl"
@@ -10,6 +11,8 @@ Required properties:
   region starting with ENABLE_LOW register
 - interrupt-controller: identifies the node as an interrupt controller
 - #interrupt-cells: number of cells to encode an interrupt-specifier, shall be 1
+
+Additional required property when it's used as secondary interrupt controller:
 - interrupts: interrupt reference to primary interrupt controller
 
 The interrupt sources map to the corresponding bits in the interrupt
@@ -21,6 +24,7 @@ registers, i.e.
 - (optional) fast interrupts start at 64.
 
 Example:
+       /* dw_apb_ictl is used as secondary interrupt controller */
        aic: interrupt-controller@3000 {
                compatible = "snps,dw-apb-ictl";
                reg = <0x3000 0xc00>;
@@ -29,3 +33,11 @@ Example:
                interrupt-parent = <&gic>;
                interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
        };
+
+       /* dw_apb_ictl is used as primary interrupt controller */
+       vic: interrupt-controller@10130000 {
+               compatible = "snps,dw-apb-ictl";
+               reg = <0x10130000 0x1000>;
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
index b5cfab015bd61ae2e9dee46b02dec49da524016b..250c3db997c996c7c16b1da2fbd63be42a87c4de 100644 (file)
@@ -1525,6 +1525,7 @@ F:        Documentation/devicetree/bindings/arm/actions.yaml
 F:     Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 F:     Documentation/devicetree/bindings/dma/owl-dma.txt
 F:     Documentation/devicetree/bindings/i2c/i2c-owl.txt
+F:     Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
 F:     Documentation/devicetree/bindings/mmc/owl-mmc.yaml
 F:     Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
 F:     Documentation/devicetree/bindings/power/actions,owl-sps.txt
@@ -1536,6 +1537,7 @@ F:        drivers/clk/actions/
 F:     drivers/clocksource/timer-owl*
 F:     drivers/dma/owl-dma.c
 F:     drivers/i2c/busses/i2c-owl.c
+F:     drivers/irqchip/irq-owl-sirq.c
 F:     drivers/mmc/host/owl-mmc.c
 F:     drivers/pinctrl/actions/*
 F:     drivers/soc/actions/
index 00327fa74b010ba7ba63690c98009ed872fc458e..48099c6e1e4a631f1269faba4f9cf96bb666b938 100644 (file)
@@ -85,7 +85,6 @@ static int nr_ipi __read_mostly = NR_IPI;
 static struct irq_desc *ipi_desc[MAX_IPI] __read_mostly;
 
 static void ipi_setup(int cpu);
-static void ipi_teardown(int cpu);
 
 static DECLARE_COMPLETION(cpu_running);
 
@@ -236,6 +235,17 @@ int platform_can_hotplug_cpu(unsigned int cpu)
        return cpu != 0;
 }
 
+static void ipi_teardown(int cpu)
+{
+       int i;
+
+       if (WARN_ON_ONCE(!ipi_irq_base))
+               return;
+
+       for (i = 0; i < nr_ipi; i++)
+               disable_percpu_irq(ipi_irq_base + i);
+}
+
 /*
  * __cpu_disable runs on the processor to be shutdown.
  */
@@ -531,7 +541,12 @@ void show_ipi_list(struct seq_file *p, int prec)
        unsigned int cpu, i;
 
        for (i = 0; i < NR_IPI; i++) {
-               unsigned int irq = irq_desc_get_irq(ipi_desc[i]);
+               unsigned int irq;
+
+               if (!ipi_desc[i])
+                       continue;
+
+               irq = irq_desc_get_irq(ipi_desc[i]);
                seq_printf(p, "%*s%u: ", prec - 1, "IPI", i);
 
                for_each_online_cpu(cpu)
@@ -707,17 +722,6 @@ static void ipi_setup(int cpu)
                enable_percpu_irq(ipi_irq_base + i, 0);
 }
 
-static void ipi_teardown(int cpu)
-{
-       int i;
-
-       if (WARN_ON_ONCE(!ipi_irq_base))
-               return;
-
-       for (i = 0; i < nr_ipi; i++)
-               disable_percpu_irq(ipi_irq_base + i);
-}
-
 void __init set_smp_ipi_range(int ipi_base, int n)
 {
        int i;
index b6bde2675cccc6a1c6d7a9514a2dbab2689ec091..82e75fc2c903f7fe330200f6e0793480dd05ba7f 100644 (file)
@@ -82,9 +82,9 @@ static int nr_ipi __read_mostly = NR_IPI;
 static struct irq_desc *ipi_desc[NR_IPI] __read_mostly;
 
 static void ipi_setup(int cpu);
-static void ipi_teardown(int cpu);
 
 #ifdef CONFIG_HOTPLUG_CPU
+static void ipi_teardown(int cpu);
 static int op_cpu_kill(unsigned int cpu);
 #else
 static inline int op_cpu_kill(unsigned int cpu)
@@ -964,6 +964,7 @@ static void ipi_setup(int cpu)
                enable_percpu_irq(ipi_irq_base + i, 0);
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void ipi_teardown(int cpu)
 {
        int i;
@@ -974,6 +975,7 @@ static void ipi_teardown(int cpu)
        for (i = 0; i < nr_ipi; i++)
                disable_percpu_irq(ipi_irq_base + i);
 }
+#endif
 
 void __init set_smp_ipi_range(int ipi_base, int n)
 {
index 06d5cfa8dc008a8cc62cf586ce5d3719b9fa9527..0624f77b854c55f64c60a27469bcdd3889ff79ed 100644 (file)
@@ -148,7 +148,7 @@ config DAVINCI_CP_INTC
 config DW_APB_ICTL
        bool
        select GENERIC_IRQ_CHIP
-       select IRQ_DOMAIN
+       select IRQ_DOMAIN_HIERARCHY
 
 config FARADAY_FTINTC010
        bool
index 990a1069157f8e110f2dee96d0de77cd11a206ed..bfb53dafa35824e6a4517409fc0d0bcfebd091fc 100644 (file)
@@ -7,6 +7,7 @@ obj-$(CONFIG_ATH79)                     += irq-ath79-cpu.o
 obj-$(CONFIG_ATH79)                    += irq-ath79-misc.o
 obj-$(CONFIG_ARCH_BCM2835)             += irq-bcm2835.o
 obj-$(CONFIG_ARCH_BCM2835)             += irq-bcm2836.o
+obj-$(CONFIG_ARCH_ACTIONS)             += irq-owl-sirq.o
 obj-$(CONFIG_DAVINCI_AINTC)            += irq-davinci-aintc.o
 obj-$(CONFIG_DAVINCI_CP_INTC)          += irq-davinci-cp-intc.o
 obj-$(CONFIG_EXYNOS_IRQ_COMBINER)      += exynos-combiner.o
index e4550e9c810ba94428a1075e912a9316fcc45aea..54b09d6c407cdb8928039437991a09c247778694 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/irqchip/chained_irq.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <linux/interrupt.h>
 
 #define APB_INT_ENABLE_L       0x00
 #define APB_INT_ENABLE_H       0x04
 #define APB_INT_FINALSTATUS_H  0x34
 #define APB_INT_BASE_OFFSET    0x04
 
-static void dw_apb_ictl_handler(struct irq_desc *desc)
+/* 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)
 {
        struct irq_domain *d = irq_desc_get_handler_data(desc);
        struct irq_chip *chip = irq_desc_get_chip(desc);
@@ -43,13 +65,37 @@ static void dw_apb_ictl_handler(struct irq_desc *desc)
                        u32 virq = irq_find_mapping(d, gc->irq_base + hwirq);
 
                        generic_handle_irq(virq);
-                       stat &= ~(1 << hwirq);
+                       stat &= ~BIT(hwirq);
                }
        }
 
        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
 static void dw_apb_ictl_resume(struct irq_data *d)
 {
@@ -68,19 +114,27 @@ static void dw_apb_ictl_resume(struct irq_data *d)
 static int __init dw_apb_ictl_init(struct device_node *np,
                                   struct device_node *parent)
 {
+       const struct irq_domain_ops *domain_ops;
        unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
        struct resource r;
        struct irq_domain *domain;
        struct irq_chip_generic *gc;
        void __iomem *iobase;
-       int ret, nrirqs, irq, i;
+       int ret, nrirqs, parent_irq, i;
        u32 reg;
 
-       /* Map the parent interrupt for the chained handler */
-       irq = irq_of_parse_and_map(np, 0);
-       if (irq <= 0) {
-               pr_err("%pOF: unable to parse irq\n", np);
-               return -EINVAL;
+       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 */
+               parent_irq = irq_of_parse_and_map(np, 0);
+               if (parent_irq <= 0) {
+                       pr_err("%pOF: unable to parse irq\n", np);
+                       return -EINVAL;
+               }
+               domain_ops = &irq_generic_chip_ops;
        }
 
        ret = of_address_to_resource(np, 0, &r);
@@ -120,8 +174,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,
        else
                nrirqs = fls(readl_relaxed(iobase + APB_INT_ENABLE_L));
 
-       domain = irq_domain_add_linear(np, nrirqs,
-                                      &irq_generic_chip_ops, NULL);
+       domain = irq_domain_add_linear(np, nrirqs, domain_ops, NULL);
        if (!domain) {
                pr_err("%pOF: unable to add irq domain\n", np);
                ret = -ENOMEM;
@@ -146,7 +199,13 @@ static int __init dw_apb_ictl_init(struct device_node *np,
                gc->chip_types[0].chip.irq_resume = dw_apb_ictl_resume;
        }
 
-       irq_set_chained_handler_and_data(irq, dw_apb_ictl_handler, domain);
+       if (parent_irq) {
+               irq_set_chained_handler_and_data(parent_irq,
+                               dw_apb_ictl_handle_irq_cascaded, domain);
+       } else {
+               dw_apb_ictl_irq_domain = domain;
+               set_handle_irq(dw_apb_ictl_handle_irq);
+       }
 
        return 0;
 
diff --git a/drivers/irqchip/irq-owl-sirq.c b/drivers/irqchip/irq-owl-sirq.c
new file mode 100644 (file)
index 0000000..6e41274
--- /dev/null
@@ -0,0 +1,359 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Actions Semi Owl SoCs SIRQ interrupt controller driver
+ *
+ * Copyright (C) 2014 Actions Semi Inc.
+ * David Liu <liuwei@actions-semi.com>
+ *
+ * Author: Parthiban Nallathambi <pn@denx.de>
+ * Author: Saravanan Sekar <sravanhome@gmail.com>
+ * Author: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
+ */
+
+#include <linux/bitfield.h>
+#include <linux/interrupt.h>
+#include <linux/irqchip.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+#define NUM_SIRQ                       3
+
+#define INTC_EXTCTL_PENDING            BIT(0)
+#define INTC_EXTCTL_CLK_SEL            BIT(4)
+#define INTC_EXTCTL_EN                 BIT(5)
+#define INTC_EXTCTL_TYPE_MASK          GENMASK(7, 6)
+#define INTC_EXTCTL_TYPE_HIGH          0
+#define INTC_EXTCTL_TYPE_LOW           BIT(6)
+#define INTC_EXTCTL_TYPE_RISING                BIT(7)
+#define INTC_EXTCTL_TYPE_FALLING       (BIT(6) | BIT(7))
+
+/* S500 & S700 SIRQ control register masks */
+#define INTC_EXTCTL_SIRQ0_MASK         GENMASK(23, 16)
+#define INTC_EXTCTL_SIRQ1_MASK         GENMASK(15, 8)
+#define INTC_EXTCTL_SIRQ2_MASK         GENMASK(7, 0)
+
+/* S900 SIRQ control register offsets, relative to controller base address */
+#define INTC_EXTCTL0                   0x0000
+#define INTC_EXTCTL1                   0x0328
+#define INTC_EXTCTL2                   0x032c
+
+struct owl_sirq_params {
+       /* INTC_EXTCTL reg shared for all three SIRQ lines */
+       bool reg_shared;
+       /* INTC_EXTCTL reg offsets relative to controller base address */
+       u16 reg_offset[NUM_SIRQ];
+};
+
+struct owl_sirq_chip_data {
+       const struct owl_sirq_params    *params;
+       void __iomem                    *base;
+       raw_spinlock_t                  lock;
+       u32                             ext_irqs[NUM_SIRQ];
+};
+
+/* S500 & S700 SoCs */
+static const struct owl_sirq_params owl_sirq_s500_params = {
+       .reg_shared = true,
+       .reg_offset = { 0, 0, 0 },
+};
+
+/* S900 SoC */
+static const struct owl_sirq_params owl_sirq_s900_params = {
+       .reg_shared = false,
+       .reg_offset = { INTC_EXTCTL0, INTC_EXTCTL1, INTC_EXTCTL2 },
+};
+
+static u32 owl_field_get(u32 val, u32 index)
+{
+       switch (index) {
+       case 0:
+               return FIELD_GET(INTC_EXTCTL_SIRQ0_MASK, val);
+       case 1:
+               return FIELD_GET(INTC_EXTCTL_SIRQ1_MASK, val);
+       case 2:
+       default:
+               return FIELD_GET(INTC_EXTCTL_SIRQ2_MASK, val);
+       }
+}
+
+static u32 owl_field_prep(u32 val, u32 index)
+{
+       switch (index) {
+       case 0:
+               return FIELD_PREP(INTC_EXTCTL_SIRQ0_MASK, val);
+       case 1:
+               return FIELD_PREP(INTC_EXTCTL_SIRQ1_MASK, val);
+       case 2:
+       default:
+               return FIELD_PREP(INTC_EXTCTL_SIRQ2_MASK, val);
+       }
+}
+
+static u32 owl_sirq_read_extctl(struct owl_sirq_chip_data *data, u32 index)
+{
+       u32 val;
+
+       val = readl_relaxed(data->base + data->params->reg_offset[index]);
+       if (data->params->reg_shared)
+               val = owl_field_get(val, index);
+
+       return val;
+}
+
+static void owl_sirq_write_extctl(struct owl_sirq_chip_data *data,
+                                 u32 extctl, u32 index)
+{
+       u32 val;
+
+       if (data->params->reg_shared) {
+               val = readl_relaxed(data->base + data->params->reg_offset[index]);
+               val &= ~owl_field_prep(0xff, index);
+               extctl = owl_field_prep(extctl, index) | val;
+       }
+
+       writel_relaxed(extctl, data->base + data->params->reg_offset[index]);
+}
+
+static void owl_sirq_clear_set_extctl(struct owl_sirq_chip_data *d,
+                                     u32 clear, u32 set, u32 index)
+{
+       unsigned long flags;
+       u32 val;
+
+       raw_spin_lock_irqsave(&d->lock, flags);
+       val = owl_sirq_read_extctl(d, index);
+       val &= ~clear;
+       val |= set;
+       owl_sirq_write_extctl(d, val, index);
+       raw_spin_unlock_irqrestore(&d->lock, flags);
+}
+
+static void owl_sirq_eoi(struct irq_data *data)
+{
+       struct owl_sirq_chip_data *chip_data = irq_data_get_irq_chip_data(data);
+
+       /*
+        * Software must clear external interrupt pending, when interrupt type
+        * is edge triggered, so we need per SIRQ based clearing.
+        */
+       if (!irqd_is_level_type(data))
+               owl_sirq_clear_set_extctl(chip_data, 0, INTC_EXTCTL_PENDING,
+                                         data->hwirq);
+
+       irq_chip_eoi_parent(data);
+}
+
+static void owl_sirq_mask(struct irq_data *data)
+{
+       struct owl_sirq_chip_data *chip_data = irq_data_get_irq_chip_data(data);
+
+       owl_sirq_clear_set_extctl(chip_data, INTC_EXTCTL_EN, 0, data->hwirq);
+       irq_chip_mask_parent(data);
+}
+
+static void owl_sirq_unmask(struct irq_data *data)
+{
+       struct owl_sirq_chip_data *chip_data = irq_data_get_irq_chip_data(data);
+
+       owl_sirq_clear_set_extctl(chip_data, 0, INTC_EXTCTL_EN, data->hwirq);
+       irq_chip_unmask_parent(data);
+}
+
+/*
+ * GIC does not handle falling edge or active low, hence SIRQ shall be
+ * programmed to convert falling edge to rising edge signal and active
+ * low to active high signal.
+ */
+static int owl_sirq_set_type(struct irq_data *data, unsigned int type)
+{
+       struct owl_sirq_chip_data *chip_data = irq_data_get_irq_chip_data(data);
+       u32 sirq_type;
+
+       switch (type) {
+       case IRQ_TYPE_LEVEL_LOW:
+               sirq_type = INTC_EXTCTL_TYPE_LOW;
+               type = IRQ_TYPE_LEVEL_HIGH;
+               break;
+       case IRQ_TYPE_LEVEL_HIGH:
+               sirq_type = INTC_EXTCTL_TYPE_HIGH;
+               break;
+       case IRQ_TYPE_EDGE_FALLING:
+               sirq_type = INTC_EXTCTL_TYPE_FALLING;
+               type = IRQ_TYPE_EDGE_RISING;
+               break;
+       case IRQ_TYPE_EDGE_RISING:
+               sirq_type = INTC_EXTCTL_TYPE_RISING;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       owl_sirq_clear_set_extctl(chip_data, INTC_EXTCTL_TYPE_MASK, sirq_type,
+                                 data->hwirq);
+
+       return irq_chip_set_type_parent(data, type);
+}
+
+static struct irq_chip owl_sirq_chip = {
+       .name           = "owl-sirq",
+       .irq_mask       = owl_sirq_mask,
+       .irq_unmask     = owl_sirq_unmask,
+       .irq_eoi        = owl_sirq_eoi,
+       .irq_set_type   = owl_sirq_set_type,
+       .irq_retrigger  = irq_chip_retrigger_hierarchy,
+#ifdef CONFIG_SMP
+       .irq_set_affinity = irq_chip_set_affinity_parent,
+#endif
+};
+
+static int owl_sirq_domain_translate(struct irq_domain *d,
+                                    struct irq_fwspec *fwspec,
+                                    unsigned long *hwirq,
+                                    unsigned int *type)
+{
+       if (!is_of_node(fwspec->fwnode))
+               return -EINVAL;
+
+       if (fwspec->param_count != 2 || fwspec->param[0] >= NUM_SIRQ)
+               return -EINVAL;
+
+       *hwirq = fwspec->param[0];
+       *type = fwspec->param[1];
+
+       return 0;
+}
+
+static int owl_sirq_domain_alloc(struct irq_domain *domain, unsigned int virq,
+                                unsigned int nr_irqs, void *data)
+{
+       struct owl_sirq_chip_data *chip_data = domain->host_data;
+       struct irq_fwspec *fwspec = data;
+       struct irq_fwspec parent_fwspec;
+       irq_hw_number_t hwirq;
+       unsigned int type;
+       int ret;
+
+       if (WARN_ON(nr_irqs != 1))
+               return -EINVAL;
+
+       ret = owl_sirq_domain_translate(domain, fwspec, &hwirq, &type);
+       if (ret)
+               return ret;
+
+       switch (type) {
+       case IRQ_TYPE_EDGE_RISING:
+       case IRQ_TYPE_LEVEL_HIGH:
+               break;
+       case IRQ_TYPE_EDGE_FALLING:
+               type = IRQ_TYPE_EDGE_RISING;
+               break;
+       case IRQ_TYPE_LEVEL_LOW:
+               type = IRQ_TYPE_LEVEL_HIGH;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       irq_domain_set_hwirq_and_chip(domain, virq, hwirq, &owl_sirq_chip,
+                                     chip_data);
+
+       parent_fwspec.fwnode = domain->parent->fwnode;
+       parent_fwspec.param_count = 3;
+       parent_fwspec.param[0] = GIC_SPI;
+       parent_fwspec.param[1] = chip_data->ext_irqs[hwirq];
+       parent_fwspec.param[2] = type;
+
+       return irq_domain_alloc_irqs_parent(domain, virq, 1, &parent_fwspec);
+}
+
+static const struct irq_domain_ops owl_sirq_domain_ops = {
+       .translate      = owl_sirq_domain_translate,
+       .alloc          = owl_sirq_domain_alloc,
+       .free           = irq_domain_free_irqs_common,
+};
+
+static int __init owl_sirq_init(const struct owl_sirq_params *params,
+                               struct device_node *node,
+                               struct device_node *parent)
+{
+       struct irq_domain *domain, *parent_domain;
+       struct owl_sirq_chip_data *chip_data;
+       int ret, i;
+
+       parent_domain = irq_find_host(parent);
+       if (!parent_domain) {
+               pr_err("%pOF: failed to find sirq parent domain\n", node);
+               return -ENXIO;
+       }
+
+       chip_data = kzalloc(sizeof(*chip_data), GFP_KERNEL);
+       if (!chip_data)
+               return -ENOMEM;
+
+       raw_spin_lock_init(&chip_data->lock);
+
+       chip_data->params = params;
+
+       chip_data->base = of_iomap(node, 0);
+       if (!chip_data->base) {
+               pr_err("%pOF: failed to map sirq registers\n", node);
+               ret = -ENXIO;
+               goto out_free;
+       }
+
+       for (i = 0; i < NUM_SIRQ; i++) {
+               struct of_phandle_args irq;
+
+               ret = of_irq_parse_one(node, i, &irq);
+               if (ret) {
+                       pr_err("%pOF: failed to parse interrupt %d\n", node, i);
+                       goto out_unmap;
+               }
+
+               if (WARN_ON(irq.args_count != 3)) {
+                       ret = -EINVAL;
+                       goto out_unmap;
+               }
+
+               chip_data->ext_irqs[i] = irq.args[1];
+
+               /* Set 24MHz external interrupt clock freq */
+               owl_sirq_clear_set_extctl(chip_data, 0, INTC_EXTCTL_CLK_SEL, i);
+       }
+
+       domain = irq_domain_add_hierarchy(parent_domain, 0, NUM_SIRQ, node,
+                                         &owl_sirq_domain_ops, chip_data);
+       if (!domain) {
+               pr_err("%pOF: failed to add domain\n", node);
+               ret = -ENOMEM;
+               goto out_unmap;
+       }
+
+       return 0;
+
+out_unmap:
+       iounmap(chip_data->base);
+out_free:
+       kfree(chip_data);
+
+       return ret;
+}
+
+static int __init owl_sirq_s500_of_init(struct device_node *node,
+                                       struct device_node *parent)
+{
+       return owl_sirq_init(&owl_sirq_s500_params, node, parent);
+}
+
+IRQCHIP_DECLARE(owl_sirq_s500, "actions,s500-sirq", owl_sirq_s500_of_init);
+IRQCHIP_DECLARE(owl_sirq_s700, "actions,s700-sirq", owl_sirq_s500_of_init);
+
+static int __init owl_sirq_s900_of_init(struct device_node *node,
+                                       struct device_node *parent)
+{
+       return owl_sirq_init(&owl_sirq_s900_params, node, parent);
+}
+
+IRQCHIP_DECLARE(owl_sirq_s900, "actions,s900-sirq", owl_sirq_s900_of_init);
index 63b9d962ee6729d001562e0111b3e4520b24408f..7be64014cf8f7ec17e5665c9bc93ba4a50c044e4 100644 (file)
@@ -1255,6 +1255,12 @@ int __init set_handle_irq(void (*handle_irq)(struct pt_regs *));
  * top-level IRQ handler.
  */
 extern void (*handle_arch_irq)(struct pt_regs *) __ro_after_init;
+#else
+#define set_handle_irq(handle_irq)             \
+       do {                                    \
+               (void)handle_irq;               \
+               WARN_ON(1);                     \
+       } while (0)
 #endif
 
 #endif /* _LINUX_IRQ_H */