Extend irqchip ocelot driver to support other SoCs
Subsystems (2)
v5 cover Extend irqchip ocelot driver to support other SoCs
Ocelot SoC belongs to a larger family of SoCs which use the same interrupt controller with a few variation.
This series of patches add support for Luton, Serval and Jaguar2, they are all MIPS based.
The first patches of the series also updates the binding documentation with the new compatible strings.
Gregory
Changelog:
v4 -> v5:
- Fix yaml binding description by removing the tab and using space instead.
- Add acked-by from Alexandre on the patches 3 and 4.
v3 -> v4
- Fix example in binding adding #address-cells property.
- Split the intial "irqchip: ocelot: Add support for Luton platforms" patch with a new patch "irqchip: ocelot: prepare to support more SoC"
- Move from u32 to u8 the type used inside the "struct chip_props"
- Keep the function ocelot_irq_unmask as is and use generic function irq_gc_mask_disable_reg and irq_gc_unmask_enable_reg for Luton.
- Removed the irq_set_irqchip_state callback, actually this function was never called on this platform and seemed in the end useless.
- Add acked-by from Alexandre on the last 2 patches.
v2 -> v3
- Fix new-line-at-end-of-file error in the yaml file
v1 -> v2:
- Convert the binding to yaml
- Squashed the patches adding new binding in a single one
Gregory CLEMENT (6):
dt-bindings: interrupt-controller: convert icpu intr bindings to
json-schema
dt-bindings: interrupt-controller: Add binding for few Microsemi
interrupt controllers
irqchip: ocelot: prepare to support more SoC
irqchip: ocelot: Add support for Luton platforms
irqchip: ocelot: Add support for Serval platforms
irqchip: ocelot: Add support for Jaguar2 platforms
.../mscc,ocelot-icpu-intr.txt | 21 --- .../mscc,ocelot-icpu-intr.yaml | 64 ++++++++ drivers/irqchip/irq-mscc-ocelot.c | 146 +++++++++++++++--- 3 files changed, 187 insertions(+), 44 deletions(-) delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml
Signature · 1 line
2.29.2
PATCH v5 1/6 dt-bindings: interrupt-controller: convert icpu intr bindings to json-schema
Convert device tree bindings for Microsemi Ocelot SoC ICPU Interrupt Controller to YAML format
--- .../mscc,ocelot-icpu-intr.txt | 21 ------- .../mscc,ocelot-icpu-intr.yaml | 60 +++++++++++++++++++ 2 files changed, 60 insertions(+), 21 deletions(-) delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml
Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt deleted +0 -21
@@ -1,21 +0,0 @@ -Microsemi Ocelot SoC ICPU Interrupt Controller - -Required properties: - -- compatible : should be "mscc,ocelot-icpu-intr" -- reg : Specifies base physical address and size of the registers. -- interrupt-controller : Identifies the node as an interrupt controller -- #interrupt-cells : Specifies the number of cells needed to encode an - interrupt source. The value shall be 1. -- interrupts : Specifies the CPU interrupt the controller is connected to. - -Example: - - intc: interrupt-controller@70000070 { - compatible = "mscc,ocelot-icpu-intr"; - reg = <0x70000070 0x70>; - #interrupt-cells = <1>; - interrupt-controller; - interrupt-parent = <&cpuintc>; - interrupts = <2>; - };
Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml new file +60 -0
60 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH v5 1/6] dt-bindings: interrupt-controller: convert icpu intr bindings to json-schema
Quoted 11 lines · Gregory CLEMENT
Convert device tree bindings for Microsemi Ocelot SoC ICPU Interrupt Controller to YAML format
Signed-off-by Gregory CLEMENT <[email protected]>--- .../mscc,ocelot-icpu-intr.txt | 21 ------- .../mscc,ocelot-icpu-intr.yaml | 60 +++++++++++++++++++ 2 files changed, 60 insertions(+), 21 deletions(-) delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml
[irqchip: irq/irqchip-next] dt-bindings: interrupt-controller: convert icpu intr bindings to json-schema
In reply to Gregory CLEMENTThe following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 47d5e0b0e1c151c06885a78a108001ead96adc75 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/47d5e0b0e1c151c06885a78a108001ead96adc75 Author: Gregory CLEMENT <[email protected]> AuthorDate: Wed, 25 Nov 2020 11:32:01 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Fri, 11 Dec 2020 14:47:49
dt-bindings: interrupt-controller: convert icpu intr bindings to json-schema
Convert device tree bindings for Microsemi Ocelot SoC ICPU Interrupt Controller to YAML format
--- Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt | 21 --------------------- Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 21 deletions(-) delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml
Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt deleted +0 -21
@@ -1,21 +0,0 @@ -Microsemi Ocelot SoC ICPU Interrupt Controller - -Required properties: - -- compatible : should be "mscc,ocelot-icpu-intr" -- reg : Specifies base physical address and size of the registers. -- interrupt-controller : Identifies the node as an interrupt controller -- #interrupt-cells : Specifies the number of cells needed to encode an - interrupt source. The value shall be 1. -- interrupts : Specifies the CPU interrupt the controller is connected to. - -Example: - - intc: interrupt-controller@70000070 { - compatible = "mscc,ocelot-icpu-intr"; - reg = <0x70000070 0x70>; - #interrupt-cells = <1>; - interrupt-controller; - interrupt-parent = <&cpuintc>; - interrupts = <2>; - };
Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml new file +60 -0
60 lines not on this page · raw message
PATCH v5 2/6 dt-bindings: interrupt-controller: Add binding for few Microsemi interrupt controllers
In reply to Gregory CLEMENTAdd the Device Tree binding documentation for the Microsemi Jaguar2, Luton and Serval interrupt controller that is part of the ICPU. It is connected directly to the MIPS core interrupt controller.
--- .../bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml +4 -0
@@ -21,7 +21,11 @@ properties: compatible: items: - enum: + - mscc,jaguar2-icpu-intr + - mscc,luton-icpu-intr - mscc,ocelot-icpu-intr + - mscc,serval-icpu-intr + '#interrupt-cells': const: 1
Signature · 1 line
2.29.2
Re: [PATCH v5 2/6] dt-bindings: interrupt-controller: Add binding for few Microsemi interrupt controllers
Quoted 9 lines · Gregory CLEMENT
Add the Device Tree binding documentation for the Microsemi Jaguar2, Luton and Serval interrupt controller that is part of the ICPU. It is connected directly to the MIPS core interrupt controller.
Signed-off-by Gregory CLEMENT <[email protected]>--- .../bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml | 4 ++++ 1 file changed, 4 insertions(+)
[irqchip: irq/irqchip-next] dt-bindings: interrupt-controller: Add binding for few Microsemi interrupt controllers
In reply to Gregory CLEMENTThe following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: b307ee828f61bc65d918e820a93b5c547a73dda3 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/b307ee828f61bc65d918e820a93b5c547a73dda3 Author: Gregory CLEMENT <[email protected]> AuthorDate: Wed, 25 Nov 2020 11:32:02 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Fri, 11 Dec 2020 14:47:49
dt-bindings: interrupt-controller: Add binding for few Microsemi interrupt controllers
Add the Device Tree binding documentation for the Microsemi Jaguar2, Luton and Serval interrupt controller that is part of the ICPU. It is connected directly to the MIPS core interrupt controller.
--- Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml +4 -0
@@ -21,7 +21,11 @@ properties: compatible: items: - enum: + - mscc,jaguar2-icpu-intr + - mscc,luton-icpu-intr - mscc,ocelot-icpu-intr + - mscc,serval-icpu-intr + '#interrupt-cells': const: 1
PATCH v5 3/6 irqchip: ocelot: prepare to support more SoC
In reply to Gregory CLEMENTThis patch extends irqchip driver for oceleot to be used with other vcoreiii base platforms.
--- drivers/irqchip/irq-mscc-ocelot.c | 76 ++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 22 deletions(-)
drivers/irqchip/irq-mscc-ocelot.c +54 -22
@@ -12,30 +12,51 @@#include <linux/irqchip/chained_irq.h> #include <linux/interrupt.h> -#define ICPU_CFG_INTR_INTR_STICKY 0x10 -#define ICPU_CFG_INTR_INTR_ENA 0x18 -#define ICPU_CFG_INTR_INTR_ENA_CLR 0x1c -#define ICPU_CFG_INTR_INTR_ENA_SET 0x20 -#define ICPU_CFG_INTR_DST_INTR_IDENT (x) (0x38 + 0x4 * (x)) -#define ICPU_CFG_INTR_INTR_TRIGGER (x) (0x5c + 0x4 * (x)) - -#define OCELOT_NR_IRQ 24 +#define ICPU_CFG_INTR_DST_INTR_IDENT (_p, x) ((_p)->reg_off_ident + 0x4 * (x)) +#define ICPU_CFG_INTR_INTR_TRIGGER (_p, x) ((_p)->reg_off_trigger + 0x4 * (x)) + +#define FLAGS_HAS_TRIGGER BIT(0) + +struct chip_props { +u8 flags; +u8 reg_off_sticky; +u8 reg_off_ena; +u8 reg_off_ena_clr; +u8 reg_off_ena_set; +u8 reg_off_ident; +u8 reg_off_trigger; +u8 reg_off_ena_irq0; +u8 n_irq; +}; + +static struct chip_props ocelot_props = { + .flags =FLAGS_HAS_TRIGGER , + .reg_off_sticky =0x10 , + .reg_off_ena =0x18 , + .reg_off_ena_clr =0x1c , + .reg_off_ena_set =0x20 , + .reg_off_ident =0x38 , + .reg_off_trigger =0x5c , + .n_irq =24 , +};static void ocelot_irq_unmask (struct irq_data *data) {struct irq_chip_generic *gc =irq_data_get_irq_chip_data (data); +struct irq_domain *d = data->domain; +struct chip_props *p = d->host_data;struct irq_chip_type *ct =irq_data_get_chip_type (data);unsigned int mask = data->mask;u32 val;irq_gc_lock (gc); - val =irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (0 )) | -irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (1 )); + val =irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (p,0 )) | +irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (p,1 ));if (!(val & mask)) -irq_reg_writel (gc, mask,ICPU_CFG_INTR_INTR_STICKY ); +irq_reg_writel (gc, mask, p->reg_off_sticky); *ct->mask_cache &= ~mask; -irq_reg_writel (gc, mask,ICPU_CFG_INTR_INTR_ENA_SET ); +irq_reg_writel (gc, mask, p->reg_off_ena_set);irq_gc_unlock (gc); }
@@ -43,8 +64,9 @@ static void ocelot_irq_handler(struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct irq_domain *d =irq_desc_get_handler_data (desc); +struct chip_props *p = d->host_data;struct irq_chip_generic *gc =irq_get_domain_generic_chip (d,0 ); -u32 reg =irq_reg_readl (gc,ICPU_CFG_INTR_DST_INTR_IDENT (0 )); +u32 reg =irq_reg_readl (gc,ICPU_CFG_INTR_DST_INTR_IDENT (p,0 ));chained_irq_enter (chip, desc);
@@ -58,8 +80,9 @@ static void ocelot_irq_handler(struct irq_desc *desc)chained_irq_exit (chip, desc); } -static int __init ocelot_irq_init (struct device_node *node, -struct device_node *parent) +static int __init vcoreiii_irq_init (struct device_node *node, +struct device_node *parent, +struct chip_props *p) {struct irq_domain *domain;struct irq_chip_generic *gc;
@@ -69,14 +92,14 @@ static int __init ocelot_irq_init(struct device_node *node,if (!parent_irq)return -EINVAL ; - domain =irq_domain_add_linear (node,OCELOT_NR_IRQ , + domain =irq_domain_add_linear (node, p->n_irq, &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , node);return -ENOMEM ; } - ret =irq_alloc_domain_generic_chips (domain,OCELOT_NR_IRQ ,1 , + ret =irq_alloc_domain_generic_chips (domain, p->n_irq,1 ,"icpu" , handle_level_irq,0 ,0 ,0 );if (ret) {
@@ -92,16 +115,18 @@ static int __init ocelot_irq_init(struct device_node *node, goto err_gc_free; } - gc->chip_types[0 ].regs.ack =ICPU_CFG_INTR_INTR_STICKY ; - gc->chip_types[0 ].regs.mask =ICPU_CFG_INTR_INTR_ENA_CLR ; + gc->chip_types[0 ].regs.ack = p->reg_off_sticky; + gc->chip_types[0 ].regs.mask = p->reg_off_ena_clr; gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; - gc->chip_types[0 ].chip.irq_unmask = ocelot_irq_unmask; +if (p->flags &FLAGS_HAS_TRIGGER ) + gc->chip_types[0 ].chip.irq_unmask = ocelot_irq_unmask;/* Mask and ack all interrupts */ -irq_reg_writel (gc,0 ,ICPU_CFG_INTR_INTR_ENA ); -irq_reg_writel (gc,0xffffffff ,ICPU_CFG_INTR_INTR_STICKY ); +irq_reg_writel (gc,0 , p->reg_off_ena); +irq_reg_writel (gc,0xffffffff , p->reg_off_sticky); + domain->host_data = p;irq_set_chained_handler_and_data (parent_irq, ocelot_irq_handler, domain);
@@ -115,4 +140,11 @@ static int __init ocelot_irq_init(struct device_node *node,return ret; } + +static int __init ocelot_irq_init (struct device_node *node, +struct device_node *parent) +{ +return vcoreiii_irq_init (node, parent, &ocelot_props); +} +IRQCHIP_DECLARE (ocelot_icpu,"mscc,ocelot-icpu-intr" , ocelot_irq_init);
Signature · 1 line
2.29.2
[irqchip: irq/irqchip-next] irqchip/ocelot: prepare to support more SoC
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 5f0c75e7a1333f5ebb5303af55d8c863ea292c23 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/5f0c75e7a1333f5ebb5303af55d8c863ea292c23 Author: Gregory CLEMENT <[email protected]> AuthorDate: Wed, 25 Nov 2020 11:32:03 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Fri, 11 Dec 2020 14:47:49
irqchip/ocelot: prepare to support more SoC
This patch extends irqchip driver for oceleot to be used with other vcoreiii base platforms.
--- drivers/irqchip/irq-mscc-ocelot.c | 76 +++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 22 deletions(-)
drivers/irqchip/irq-mscc-ocelot.c +54 -22
@@ -12,30 +12,51 @@#include <linux/irqchip/chained_irq.h> #include <linux/interrupt.h> -#define ICPU_CFG_INTR_INTR_STICKY 0x10 -#define ICPU_CFG_INTR_INTR_ENA 0x18 -#define ICPU_CFG_INTR_INTR_ENA_CLR 0x1c -#define ICPU_CFG_INTR_INTR_ENA_SET 0x20 -#define ICPU_CFG_INTR_DST_INTR_IDENT (x) (0x38 + 0x4 * (x)) -#define ICPU_CFG_INTR_INTR_TRIGGER (x) (0x5c + 0x4 * (x)) - -#define OCELOT_NR_IRQ 24 +#define ICPU_CFG_INTR_DST_INTR_IDENT (_p, x) ((_p)->reg_off_ident + 0x4 * (x)) +#define ICPU_CFG_INTR_INTR_TRIGGER (_p, x) ((_p)->reg_off_trigger + 0x4 * (x)) + +#define FLAGS_HAS_TRIGGER BIT(0) + +struct chip_props { +u8 flags; +u8 reg_off_sticky; +u8 reg_off_ena; +u8 reg_off_ena_clr; +u8 reg_off_ena_set; +u8 reg_off_ident; +u8 reg_off_trigger; +u8 reg_off_ena_irq0; +u8 n_irq; +}; + +static struct chip_props ocelot_props = { + .flags =FLAGS_HAS_TRIGGER , + .reg_off_sticky =0x10 , + .reg_off_ena =0x18 , + .reg_off_ena_clr =0x1c , + .reg_off_ena_set =0x20 , + .reg_off_ident =0x38 , + .reg_off_trigger =0x5c , + .n_irq =24 , +};static void ocelot_irq_unmask (struct irq_data *data) {struct irq_chip_generic *gc =irq_data_get_irq_chip_data (data); +struct irq_domain *d = data->domain; +struct chip_props *p = d->host_data;struct irq_chip_type *ct =irq_data_get_chip_type (data);unsigned int mask = data->mask;u32 val;irq_gc_lock (gc); - val =irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (0 )) | -irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (1 )); + val =irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (p,0 )) | +irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (p,1 ));if (!(val & mask)) -irq_reg_writel (gc, mask,ICPU_CFG_INTR_INTR_STICKY ); +irq_reg_writel (gc, mask, p->reg_off_sticky); *ct->mask_cache &= ~mask; -irq_reg_writel (gc, mask,ICPU_CFG_INTR_INTR_ENA_SET ); +irq_reg_writel (gc, mask, p->reg_off_ena_set);irq_gc_unlock (gc); }
@@ -43,8 +64,9 @@ static void ocelot_irq_handler(struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct irq_domain *d =irq_desc_get_handler_data (desc); +struct chip_props *p = d->host_data;struct irq_chip_generic *gc =irq_get_domain_generic_chip (d,0 ); -u32 reg =irq_reg_readl (gc,ICPU_CFG_INTR_DST_INTR_IDENT (0 )); +u32 reg =irq_reg_readl (gc,ICPU_CFG_INTR_DST_INTR_IDENT (p,0 ));chained_irq_enter (chip, desc);
@@ -58,8 +80,9 @@ static void ocelot_irq_handler(struct irq_desc *desc)chained_irq_exit (chip, desc); } -static int __init ocelot_irq_init (struct device_node *node, -struct device_node *parent) +static int __init vcoreiii_irq_init (struct device_node *node, +struct device_node *parent, +struct chip_props *p) {struct irq_domain *domain;struct irq_chip_generic *gc;
@@ -69,14 +92,14 @@ static int __init ocelot_irq_init(struct device_node *node,if (!parent_irq)return -EINVAL ; - domain =irq_domain_add_linear (node,OCELOT_NR_IRQ , + domain =irq_domain_add_linear (node, p->n_irq, &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , node);return -ENOMEM ; } - ret =irq_alloc_domain_generic_chips (domain,OCELOT_NR_IRQ ,1 , + ret =irq_alloc_domain_generic_chips (domain, p->n_irq,1 ,"icpu" , handle_level_irq,0 ,0 ,0 );if (ret) {
@@ -92,16 +115,18 @@ static int __init ocelot_irq_init(struct device_node *node, goto err_gc_free; } - gc->chip_types[0 ].regs.ack =ICPU_CFG_INTR_INTR_STICKY ; - gc->chip_types[0 ].regs.mask =ICPU_CFG_INTR_INTR_ENA_CLR ; + gc->chip_types[0 ].regs.ack = p->reg_off_sticky; + gc->chip_types[0 ].regs.mask = p->reg_off_ena_clr; gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; - gc->chip_types[0 ].chip.irq_unmask = ocelot_irq_unmask; +if (p->flags &FLAGS_HAS_TRIGGER ) + gc->chip_types[0 ].chip.irq_unmask = ocelot_irq_unmask;/* Mask and ack all interrupts */ -irq_reg_writel (gc,0 ,ICPU_CFG_INTR_INTR_ENA ); -irq_reg_writel (gc,0xffffffff ,ICPU_CFG_INTR_INTR_STICKY ); +irq_reg_writel (gc,0 , p->reg_off_ena); +irq_reg_writel (gc,0xffffffff , p->reg_off_sticky); + domain->host_data = p;irq_set_chained_handler_and_data (parent_irq, ocelot_irq_handler, domain);
@@ -115,4 +140,11 @@ err_domain_remove:return ret; } + +static int __init ocelot_irq_init (struct device_node *node, +struct device_node *parent) +{ +return vcoreiii_irq_init (node, parent, &ocelot_props); +} +IRQCHIP_DECLARE (ocelot_icpu,"mscc,ocelot-icpu-intr" , ocelot_irq_init);
PATCH v5 4/6 irqchip: ocelot: Add support for Luton platforms
In reply to Gregory CLEMENTThis patch extends irqchip driver for oceleot to be used with an other vcoreiii base platform: Luton.
For this platform there is a few differences:
- the interrupt must be enabled for the parent controller
- there is no trigger register needed to be managed
--- drivers/irqchip/irq-mscc-ocelot.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-)
drivers/irqchip/irq-mscc-ocelot.c +34 -4
@@ -16,6 +16,7 @@#define ICPU_CFG_INTR_INTR_TRIGGER (_p, x) ((_p)->reg_off_trigger + 0x4 * (x))#define FLAGS_HAS_TRIGGER BIT(0) +#define FLAGS_NEED_INIT_ENABLE BIT(1)struct chip_props {u8 flags;
@@ -40,6 +41,17 @@ static struct chip_props ocelot_props = { .n_irq = 24, }; +static struct chip_props luton_props = { + .flags =FLAGS_NEED_INIT_ENABLE , + .reg_off_sticky =0 , + .reg_off_ena =0x4 , + .reg_off_ena_clr =0x8 , + .reg_off_ena_set =0xc , + .reg_off_ident =0x18 , + .reg_off_ena_irq0 =0x14 , + .n_irq =28 , +}; +static void ocelot_irq_unmask (struct irq_data *data) {struct irq_chip_generic *gc =irq_data_get_irq_chip_data (data);
@@ -115,17 +127,27 @@ static int __init vcoreiii_irq_init(struct device_node *node, goto err_gc_free; } - gc->chip_types[0 ].regs.ack = p->reg_off_sticky; - gc->chip_types[0 ].regs.mask = p->reg_off_ena_clr; gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; - gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; -if (p->flags &FLAGS_HAS_TRIGGER ) + gc->chip_types[0 ].regs.ack = p->reg_off_sticky; +if (p->flags &FLAGS_HAS_TRIGGER ) { + gc->chip_types[0 ].regs.mask = p->reg_off_ena_clr; gc->chip_types[0 ].chip.irq_unmask = ocelot_irq_unmask; + gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; + }else { + gc->chip_types[0 ].regs.enable = p->reg_off_ena_set; + gc->chip_types[0 ].regs.disable = p->reg_off_ena_clr; + gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_disable_reg; + gc->chip_types[0 ].chip.irq_unmask = irq_gc_unmask_enable_reg; + }/* Mask and ack all interrupts */ irq_reg_writel (gc,0 , p->reg_off_ena);irq_reg_writel (gc,0xffffffff , p->reg_off_sticky); +/* Overall init */ +if (p->flags &FLAGS_NEED_INIT_ENABLE ) +irq_reg_writel (gc,BIT (0 ), p->reg_off_ena_irq0); + domain->host_data = p;irq_set_chained_handler_and_data (parent_irq, ocelot_irq_handler, domain);
@@ -148,3 +170,11 @@ static int __init ocelot_irq_init(struct device_node *node, }IRQCHIP_DECLARE (ocelot_icpu,"mscc,ocelot-icpu-intr" , ocelot_irq_init); + +static int __init luton_irq_init (struct device_node *node, +struct device_node *parent) +{ +return vcoreiii_irq_init (node, parent, &luton_props); +} + +IRQCHIP_DECLARE (luton_icpu,"mscc,luton-icpu-intr" , luton_irq_init);
Signature · 1 line
2.29.2
[irqchip: irq/irqchip-next] irqchip/ocelot: Add support for Luton platforms
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: ffce73d4415391b2d6da4878bf04d6610edf56db Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/ffce73d4415391b2d6da4878bf04d6610edf56db Author: Gregory CLEMENT <[email protected]> AuthorDate: Wed, 25 Nov 2020 11:32:04 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Fri, 11 Dec 2020 14:47:49
irqchip/ocelot: Add support for Luton platforms
This patch extends irqchip driver for oceleot to be used with an other vcoreiii base platform: Luton.
For this platform there is a few differences:
- the interrupt must be enabled for the parent controller
- there is no trigger register needed to be managed
--- drivers/irqchip/irq-mscc-ocelot.c | 38 ++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-)
drivers/irqchip/irq-mscc-ocelot.c +34 -4
@@ -16,6 +16,7 @@#define ICPU_CFG_INTR_INTR_TRIGGER (_p, x) ((_p)->reg_off_trigger + 0x4 * (x))#define FLAGS_HAS_TRIGGER BIT(0) +#define FLAGS_NEED_INIT_ENABLE BIT(1)struct chip_props {u8 flags;
@@ -40,6 +41,17 @@ static struct chip_props ocelot_props = { .n_irq = 24, }; +static struct chip_props luton_props = { + .flags =FLAGS_NEED_INIT_ENABLE , + .reg_off_sticky =0 , + .reg_off_ena =0x4 , + .reg_off_ena_clr =0x8 , + .reg_off_ena_set =0xc , + .reg_off_ident =0x18 , + .reg_off_ena_irq0 =0x14 , + .n_irq =28 , +}; +static void ocelot_irq_unmask (struct irq_data *data) {struct irq_chip_generic *gc =irq_data_get_irq_chip_data (data);
@@ -115,17 +127,27 @@ static int __init vcoreiii_irq_init(struct device_node *node, goto err_gc_free; } - gc->chip_types[0 ].regs.ack = p->reg_off_sticky; - gc->chip_types[0 ].regs.mask = p->reg_off_ena_clr; gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; - gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; -if (p->flags &FLAGS_HAS_TRIGGER ) + gc->chip_types[0 ].regs.ack = p->reg_off_sticky; +if (p->flags &FLAGS_HAS_TRIGGER ) { + gc->chip_types[0 ].regs.mask = p->reg_off_ena_clr; gc->chip_types[0 ].chip.irq_unmask = ocelot_irq_unmask; + gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; + }else { + gc->chip_types[0 ].regs.enable = p->reg_off_ena_set; + gc->chip_types[0 ].regs.disable = p->reg_off_ena_clr; + gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_disable_reg; + gc->chip_types[0 ].chip.irq_unmask = irq_gc_unmask_enable_reg; + }/* Mask and ack all interrupts */ irq_reg_writel (gc,0 , p->reg_off_ena);irq_reg_writel (gc,0xffffffff , p->reg_off_sticky); +/* Overall init */ +if (p->flags &FLAGS_NEED_INIT_ENABLE ) +irq_reg_writel (gc,BIT (0 ), p->reg_off_ena_irq0); + domain->host_data = p;irq_set_chained_handler_and_data (parent_irq, ocelot_irq_handler, domain);
@@ -148,3 +170,11 @@ static int __init ocelot_irq_init(struct device_node *node, }IRQCHIP_DECLARE (ocelot_icpu,"mscc,ocelot-icpu-intr" , ocelot_irq_init); + +static int __init luton_irq_init (struct device_node *node, +struct device_node *parent) +{ +return vcoreiii_irq_init (node, parent, &luton_props); +} + +IRQCHIP_DECLARE (luton_icpu,"mscc,luton-icpu-intr" , luton_irq_init);
PATCH v5 5/6 irqchip: ocelot: Add support for Serval platforms
In reply to Gregory CLEMENTThis patch extends irqchip driver for ocelot to be used with an other vcoreiii base platform: Serval.
Based on a larger patch from Lars Povlsen <[email protected]>
--- drivers/irqchip/irq-mscc-ocelot.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/irqchip/irq-mscc-ocelot.c +19 -0
@@ -41,6 +41,17 @@ static struct chip_props ocelot_props = { .n_irq = 24, }; +static struct chip_props serval_props = { + .flags =FLAGS_HAS_TRIGGER , + .reg_off_sticky =0xc , + .reg_off_ena =0x14 , + .reg_off_ena_clr =0x18 , + .reg_off_ena_set =0x1c , + .reg_off_ident =0x20 , + .reg_off_trigger =0x4 , + .n_irq =24 , +}; +static struct chip_props luton_props = { .flags =FLAGS_NEED_INIT_ENABLE , .reg_off_sticky =0 ,
@@ -171,6 +182,14 @@ static int __init ocelot_irq_init(struct device_node *node,IRQCHIP_DECLARE (ocelot_icpu,"mscc,ocelot-icpu-intr" , ocelot_irq_init); +static int __init serval_irq_init (struct device_node *node, +struct device_node *parent) +{ +return vcoreiii_irq_init (node, parent, &serval_props); +} + +IRQCHIP_DECLARE (serval_icpu,"mscc,serval-icpu-intr" , serval_irq_init); +static int __init luton_irq_init (struct device_node *node,struct device_node *parent) {
Signature · 1 line
2.29.2
[irqchip: irq/irqchip-next] irqchip/ocelot: Add support for Serval platforms
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 7efdfbd15a21788de8c0743590e777f151a3031b Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/7efdfbd15a21788de8c0743590e777f151a3031b Author: Gregory CLEMENT <[email protected]> AuthorDate: Wed, 25 Nov 2020 11:32:05 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Fri, 11 Dec 2020 14:47:49
irqchip/ocelot: Add support for Serval platforms
This patch extends irqchip driver for ocelot to be used with an other vcoreiii base platform: Serval.
Based on a larger patch from Lars Povlsen <[email protected]>
--- drivers/irqchip/irq-mscc-ocelot.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/irqchip/irq-mscc-ocelot.c +19 -0
@@ -41,6 +41,17 @@ static struct chip_props ocelot_props = { .n_irq = 24, }; +static struct chip_props serval_props = { + .flags =FLAGS_HAS_TRIGGER , + .reg_off_sticky =0xc , + .reg_off_ena =0x14 , + .reg_off_ena_clr =0x18 , + .reg_off_ena_set =0x1c , + .reg_off_ident =0x20 , + .reg_off_trigger =0x4 , + .n_irq =24 , +}; +static struct chip_props luton_props = { .flags =FLAGS_NEED_INIT_ENABLE , .reg_off_sticky =0 ,
@@ -171,6 +182,14 @@ static int __init ocelot_irq_init(struct device_node *node,IRQCHIP_DECLARE (ocelot_icpu,"mscc,ocelot-icpu-intr" , ocelot_irq_init); +static int __init serval_irq_init (struct device_node *node, +struct device_node *parent) +{ +return vcoreiii_irq_init (node, parent, &serval_props); +} + +IRQCHIP_DECLARE (serval_icpu,"mscc,serval-icpu-intr" , serval_irq_init); +static int __init luton_irq_init (struct device_node *node,struct device_node *parent) {
PATCH v5 6/6 irqchip: ocelot: Add support for Jaguar2 platforms
In reply to Gregory CLEMENTThis patch extends irqchip driver for ocelot to be used with an other vcoreiii base platform: Jaguar2.
Based on a larger patch from Lars Povlsen <[email protected]>
--- drivers/irqchip/irq-mscc-ocelot.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/irqchip/irq-mscc-ocelot.c +19 -0
@@ -63,6 +63,17 @@ static struct chip_props luton_props = { .n_irq = 28, }; +static struct chip_props jaguar2_props = { + .flags =FLAGS_HAS_TRIGGER , + .reg_off_sticky =0x10 , + .reg_off_ena =0x18 , + .reg_off_ena_clr =0x1c , + .reg_off_ena_set =0x20 , + .reg_off_ident =0x38 , + .reg_off_trigger =0x5c , + .n_irq =29 , +}; +static void ocelot_irq_unmask (struct irq_data *data) {struct irq_chip_generic *gc =irq_data_get_irq_chip_data (data);
@@ -197,3 +208,11 @@ static int __init luton_irq_init(struct device_node *node, }IRQCHIP_DECLARE (luton_icpu,"mscc,luton-icpu-intr" , luton_irq_init); + +static int __init jaguar2_irq_init (struct device_node *node, +struct device_node *parent) +{ +return vcoreiii_irq_init (node, parent, &jaguar2_props); +} + +IRQCHIP_DECLARE (jaguar2_icpu,"mscc,jaguar2-icpu-intr" , jaguar2_irq_init);
Signature · 1 line
2.29.2
[irqchip: irq/irqchip-next] irqchip/ocelot: Add support for Jaguar2 platforms
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 550c1424acf0123ba0c17e22dfcac92d152b2f0e Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/550c1424acf0123ba0c17e22dfcac92d152b2f0e Author: Gregory CLEMENT <[email protected]> AuthorDate: Wed, 25 Nov 2020 11:32:06 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Fri, 11 Dec 2020 14:47:49
irqchip/ocelot: Add support for Jaguar2 platforms
This patch extends irqchip driver for ocelot to be used with an other vcoreiii base platform: Jaguar2.
Based on a larger patch from Lars Povlsen <[email protected]>
--- drivers/irqchip/irq-mscc-ocelot.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/irqchip/irq-mscc-ocelot.c +19 -0
@@ -63,6 +63,17 @@ static struct chip_props luton_props = { .n_irq = 28, }; +static struct chip_props jaguar2_props = { + .flags =FLAGS_HAS_TRIGGER , + .reg_off_sticky =0x10 , + .reg_off_ena =0x18 , + .reg_off_ena_clr =0x1c , + .reg_off_ena_set =0x20 , + .reg_off_ident =0x38 , + .reg_off_trigger =0x5c , + .n_irq =29 , +}; +static void ocelot_irq_unmask (struct irq_data *data) {struct irq_chip_generic *gc =irq_data_get_irq_chip_data (data);
@@ -197,3 +208,11 @@ static int __init luton_irq_init(struct device_node *node, }IRQCHIP_DECLARE (luton_icpu,"mscc,luton-icpu-intr" , luton_irq_init); + +static int __init jaguar2_irq_init (struct device_node *node, +struct device_node *parent) +{ +return vcoreiii_irq_init (node, parent, &jaguar2_props); +} + +IRQCHIP_DECLARE (jaguar2_icpu,"mscc,jaguar2-icpu-intr" , jaguar2_irq_init);
Marc Zyngier
AppliedQuoted 10 lines · Gregory CLEMENT
Ocelot SoC belongs to a larger family of SoCs which use the same interrupt controller with a few variation.
This series of patches add support for Luton, Serval and Jaguar2, they are all MIPS based.
The first patches of the series also updates the binding documentation with the new compatible strings.
[...]
Applied to irq/irqchip-next, thanks!
[1/6] dt-bindings: interrupt-controller: convert icpu intr bindings to json-schema
commit: 47d5e0b0e1c151c06885a78a108001ead96adc75
[2/6] dt-bindings: interrupt-controller: Add binding for few Microsemi interrupt controllers
commit: b307ee828f61bc65d918e820a93b5c547a73dda3
[3/6] irqchip: ocelot: prepare to support more SoC
commit: 5f0c75e7a1333f5ebb5303af55d8c863ea292c23
[4/6] irqchip: ocelot: Add support for Luton platforms
commit: ffce73d4415391b2d6da4878bf04d6610edf56db
[5/6] irqchip: ocelot: Add support for Serval platforms
commit: 7efdfbd15a21788de8c0743590e777f151a3031b
[6/6] irqchip: ocelot: Add support for Jaguar2 platforms
commit: 550c1424acf0123ba0c17e22dfcac92d152b2f0eCheers,
M.
Signature · 8 lines
Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel