Skip to contentSkip to conversation

irqchip: irq-dove: Add PMU interrupt controller.

PATCH RESEND New Andrew Lunn 3 participants 9 messages Nov 7, 2013 – Nov 26, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND v2 1/3 irqchip: irq-dove: Add PMU interrupt controller.

Dove has a Power Management Unit with its own interrupt controller. This is chained on the main interrupt controller. Add a driver, making use of generic chip where possible.

cc devicetree at vger.kernel.org
cc pawel.moll at arm.com
cc mark.rutland at arm.com
cc swarren at wwwdotorg.org
cc ian.campbell at citrix.com
---
 .../interrupt-controller/marvell,dove-pmu-intc.txt |  17 +++
 drivers/irqchip/Makefile                           |   1 +
 drivers/irqchip/irq-dove.c                         | 126 +++++++++++++++++++++
 3 files changed, 144 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
 create mode 100644 drivers/irqchip/irq-dove.c
Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt new file +17 -0
new file mode 100644
index 000000000000..1feb5825d372
@@ -0,0 +1,17 @@
+Marvell Dove Power Management Unit interrupt controller
+
+Required properties:
+- compatible: shall be "marvell,dove-pmu-intc"
+- reg: base address of PMU interrupt registers starting with CAUSE register
+- interrupts: PMU interrupt of the main interrupt controller
+- interrupt-controller: identifies the node as an interrupt controller
+- #interrupt-cells: number of cells to encode an interrupt source, shall be 1
+
+Example:
+	pmu_intc: pmu-interrupt-ctrl at d0050 {
+		compatible = "marvell,dove-pmu-intc";
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		reg = <0xd0050 0x8>;
+		interrupts = <33>;
+	};
drivers/irqchip/Makefile +1 -0
index c60b9010b152..f743006ce7ad 100644
@@ -1,6 +1,7 @@
 obj-$(CONFIG_IRQCHIP)			+= irqchip.o
 
 obj-$(CONFIG_ARCH_BCM2835)		+= irq-bcm2835.o
+obj-$(CONFIG_ARCH_DOVE)			+= irq-dove.o
 obj-$(CONFIG_ARCH_EXYNOS)		+= exynos-combiner.o
 obj-$(CONFIG_ARCH_MMP)			+= irq-mmp.o
 obj-$(CONFIG_ARCH_MVEBU)		+= irq-armada-370-xp.o
drivers/irqchip/irq-dove.c new file +126 -0

126 lines not on this page · raw message

Signature · 1 line
1.8.4.rc3
#1 lore raw

PATCH RESEND v2 2/3 ARM: Dove: Add DT node for PMU interrupt controller.

Instantiate the PMU interrupt controller which Dove has.

---
 arch/arm/boot/dts/dove.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/dove.dtsi +9 -0
index cc279166646f..52b992a5c120 100644
@@ -66,6 +66,15 @@
 			marvell,#interrupts = <5>;
 		};
 
+		pmu_intc: pmu-interrupt-ctrl at d0050 {
+			compatible = "marvell,dove-pmu-intc";
+			interrupt-controller;
+			#interrupt-cells = <1>;
+			reg = <0xd0050 0x8>;
+			interrupts = <33>;
+			marvell,#interrupts = <7>;
+		};
+
 		core_clk: core-clocks at d0214 {
 			compatible = "marvell,dove-core-clock";
 			reg = <0xd0214 0x4>;
Signature · 1 line
1.8.4.rc3
#2 lore raw

PATCH RESEND v2 2/3 ARM: Dove: Add DT node for PMU interrupt controller.

Quoted 7 lines · Andrew Lunn

Instantiate the PMU interrupt controller which Dove has.

---
 arch/arm/boot/dts/dove.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

Andrew,

Could you rebase #2 and #3 on v3.13-rc1? The dove.dtsi reshuffle last window is annoying the piss out of me :)

thx,

Jason.

#3 lore raw

PATCH RESEND v2 2/3 ARM: Dove: Add DT node for PMU interrupt controller.

Quoted 11 lines · Jason Cooper
Quoted 7 lines · Andrew Lunn

Instantiate the PMU interrupt controller which Dove has.

---
  arch/arm/boot/dts/dove.dtsi | 9 +++++++++
  1 file changed, 9 insertions(+)

Could you rebase #2 and #3 on v3.13-rc1? The dove.dtsi reshuffle last window is annoying the piss out of me :)

Jason,

IIRC Andrew isn't available till beginning of Dec. I can rebase if you want.

Sebastian

#4 lore raw

PATCH RESEND v2 2/3 ARM: Dove: Add DT node for PMU interrupt controller.

Quoted 10 lines · Sebastian Hesselbarth
Quoted 9 lines · Jason Cooper
Quoted 7 lines · Andrew Lunn

Instantiate the PMU interrupt controller which Dove has.

---
 arch/arm/boot/dts/dove.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
Quoted 7 lines
Quoted 2 lines

Could you rebase #2 and #3 on v3.13-rc1? The dove.dtsi reshuffle last window is annoying the piss out of me :)

Jason,

IIRC Andrew isn't available till beginning of Dec. I can rebase if you want.

Ahh, ok. No problem, I'll knock it out.

thx,

Jason.

#5 lore raw

PATCH RESEND v2 2/3 ARM: Dove: Add DT node for PMU interrupt controller.

Quoted 14 lines · Jason Cooper
Quoted 13 lines · Sebastian Hesselbarth
Quoted 11 lines · Jason Cooper
Quoted 7 lines · Andrew Lunn

Instantiate the PMU interrupt controller which Dove has.

---
 arch/arm/boot/dts/dove.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

Could you rebase #2 and #3 on v3.13-rc1? The dove.dtsi reshuffle last window is annoying the piss out of me :)

Quoted 6 lines
Quoted 4 lines

Jason,

IIRC Andrew isn't available till beginning of Dec. I can rebase if you want.

Ahh, ok. No problem, I'll knock it out.

Andrew,

#2 and #3 applied to mvebu/dt.

thx,

Jason.

#6 lore raw

PATCH RESEND v2 3/3 ARM: Dove: Add RTC interrupt via PMU interrupt controller.

In reply to Andrew Lunn

The RTC on Dove has an interrupt on the PMU interrupt controller. Add this interrupt to the RTC node. Tested using the "RTC Driver Test Example"

---
 arch/arm/boot/dts/dove.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/dove.dtsi +2 -0
index 52b992a5c120..1fd615d27532 100644
@@ -426,6 +426,8 @@
 		rtc: real-time-clock at d8500 {
 			compatible = "marvell,orion-rtc";
 			reg = <0xd8500 0x20>;
+			interrupt-parent = <&pmu_intc>;
+			interrupts = <5>;
 		};
 
 		crypto: crypto-engine at 30000 {
Signature · 1 line
1.8.4.rc3
#7 lore raw

PATCH RESEND v2 1/3 irqchip: irq-dove: Add PMU interrupt controller.

In reply to Andrew Lunn

Thomas (tglx),

Quoted 12 lines · Andrew Lunn

Dove has a Power Management Unit with its own interrupt controller. This is chained on the main interrupt controller. Add a driver, making use of generic chip where possible.

cc devicetree at vger.kernel.org
cc pawel.moll at arm.com
cc mark.rutland at arm.com
cc swarren at wwwdotorg.org
cc ian.campbell at citrix.com
Quoted 7 lines
---
 .../interrupt-controller/marvell,dove-pmu-intc.txt |  17 +++
 drivers/irqchip/Makefile                           |   1 +
 drivers/irqchip/irq-dove.c                         | 126 +++++++++++++++++++++
 3 files changed, 144 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
 create mode 100644 drivers/irqchip/irq-dove.c

Are you ok with this driver? If so, would you like me to create a branch you can pull from? Otherwise,

thx,

Jason.

Quoted 175 lines
Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt new file +17 -0
new file mode 100644
index 000000000000..1feb5825d372
@@ -0,0 +1,17 @@
+Marvell Dove Power Management Unit interrupt controller
+
+Required properties:
+- compatible: shall be "marvell,dove-pmu-intc"
+- reg: base address of PMU interrupt registers starting with CAUSE register
+- interrupts: PMU interrupt of the main interrupt controller
+- interrupt-controller: identifies the node as an interrupt controller
+- #interrupt-cells: number of cells to encode an interrupt source, shall be 1
+
+Example:
+	pmu_intc: pmu-interrupt-ctrl at d0050 {
+		compatible = "marvell,dove-pmu-intc";
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		reg = <0xd0050 0x8>;
+		interrupts = <33>;
+	};
drivers/irqchip/Makefile +1 -0
index c60b9010b152..f743006ce7ad 100644
@@ -1,6 +1,7 @@
 obj-$(CONFIG_IRQCHIP)			+= irqchip.o
 
 obj-$(CONFIG_ARCH_BCM2835)		+= irq-bcm2835.o
+obj-$(CONFIG_ARCH_DOVE)			+= irq-dove.o
 obj-$(CONFIG_ARCH_EXYNOS)		+= exynos-combiner.o
 obj-$(CONFIG_ARCH_MMP)			+= irq-mmp.o
 obj-$(CONFIG_ARCH_MVEBU)		+= irq-armada-370-xp.o
drivers/irqchip/irq-dove.c new file +126 -0
new file mode 100644
index 000000000000..788acd89848a
@@ -0,0 +1,126 @@
+/*
+ * Marvell Dove SoCs PMU IRQ chip driver.
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <asm/exception.h>
+#include <asm/mach/irq.h>
+
+#include "irqchip.h"
+
+#define DOVE_PMU_IRQ_CAUSE	0x00
+#define DOVE_PMU_IRQ_MASK	0x04
+
+static void dove_pmu_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+	struct irq_domain *d = irq_get_handler_data(irq);
+	struct irq_chip_generic *gc = irq_get_domain_generic_chip(d, 0);
+	u32 stat = readl_relaxed(gc->reg_base + DOVE_PMU_IRQ_CAUSE) &
+		   gc->mask_cache;
+
+	while (stat) {
+		u32 hwirq = ffs(stat) - 1;
+
+		generic_handle_irq(irq_find_mapping(d, gc->irq_base + hwirq));
+		stat &= ~(1 << hwirq);
+	}
+}
+
+static void pmu_irq_ack(struct irq_data *d)
+{
+	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+	struct irq_chip_type *ct = irq_data_get_chip_type(d);
+	u32 mask = ~d->mask;
+
+	/*
+	 * The PMU mask register is not RW0C: it is RW.	 This means that
+	 * the bits take whatever value is written to them; if you write
+	 * a '1', you will set the interrupt.
+	 *
+	 * Unfortunately this means there is NO race free way to clear
+	 * these interrupts.
+	 *
+	 * So, let's structure the code so that the window is as small as
+	 * possible.
+	 */
+	irq_gc_lock(gc);
+	mask &= irq_reg_readl(gc->reg_base +  ct->regs.ack);
+	irq_reg_writel(mask, gc->reg_base +  ct->regs.ack);
+	irq_gc_unlock(gc);
+}
+
+static int __init dove_pmu_irq_init(struct device_node *np,
+				    struct device_node *parent)
+{
+	unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
+	struct resource r;
+	struct irq_domain *domain;
+	struct irq_chip_generic *gc;
+	int ret, irq, nrirqs = 7;
+
+	domain = irq_domain_add_linear(np, nrirqs,
+				       &irq_generic_chip_ops, NULL);
+	if (!domain) {
+		pr_err("%s: unable to add irq domain\n", np->name);
+		return -ENOMEM;
+	}
+
+	ret = irq_alloc_domain_generic_chips(domain, nrirqs, 1, np->name,
+			     handle_level_irq, clr, 0, IRQ_GC_INIT_MASK_CACHE);
+	if (ret) {
+		pr_err("%s: unable to alloc irq domain gc\n", np->name);
+		return ret;
+	}
+
+	ret = of_address_to_resource(np, 0, &r);
+	if (ret) {
+		pr_err("%s: unable to get resource\n", np->name);
+		return ret;
+	}
+
+	if (!request_mem_region(r.start, resource_size(&r), np->name)) {
+		pr_err("%s: unable to request mem region\n", np->name);
+		return -ENOMEM;
+	}
+
+	/* Map the parent interrupt for the chained handler */
+	irq = irq_of_parse_and_map(np, 0);
+	if (irq <= 0) {
+		pr_err("%s: unable to parse irq\n", np->name);
+		return -EINVAL;
+	}
+
+	gc = irq_get_domain_generic_chip(domain, 0);
+	gc->reg_base = ioremap(r.start, resource_size(&r));
+	if (!gc->reg_base) {
+		pr_err("%s: unable to map resource\n", np->name);
+		return -ENOMEM;
+	}
+
+	gc->chip_types[0].regs.ack = DOVE_PMU_IRQ_CAUSE;
+	gc->chip_types[0].regs.mask = DOVE_PMU_IRQ_MASK;
+	gc->chip_types[0].chip.irq_ack = pmu_irq_ack;
+	gc->chip_types[0].chip.irq_mask = irq_gc_mask_clr_bit;
+	gc->chip_types[0].chip.irq_unmask = irq_gc_mask_set_bit;
+
+	/* mask and clear all interrupts */
+	writel(0, gc->reg_base + DOVE_PMU_IRQ_MASK);
+	writel(0, gc->reg_base + DOVE_PMU_IRQ_CAUSE);
+
+	irq_set_handler_data(irq, domain);
+	irq_set_chained_handler(irq, dove_pmu_irq_handler);
+
+	return 0;
+}
+IRQCHIP_DECLARE(dove_pmu_intc,
+		"marvell,dove-pmu-intc", dove_pmu_irq_init);
Signature · 7 lines
1.8.4.rc3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Applied
#8 lore raw

PATCH RESEND v2 1/3 irqchip: irq-dove: Add PMU interrupt controller.

In reply to Andrew Lunn
Quoted 12 lines · Andrew Lunn

Dove has a Power Management Unit with its own interrupt controller. This is chained on the main interrupt controller. Add a driver, making use of generic chip where possible.

cc devicetree at vger.kernel.org
cc pawel.moll at arm.com
cc mark.rutland at arm.com
cc swarren at wwwdotorg.org
cc ian.campbell at citrix.com
Quoted 7 lines
---
 .../interrupt-controller/marvell,dove-pmu-intc.txt |  17 +++
 drivers/irqchip/Makefile                           |   1 +
 drivers/irqchip/irq-dove.c                         | 126 +++++++++++++++++++++
 3 files changed, 144 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
 create mode 100644 drivers/irqchip/irq-dove.c

Applied to mvebu/irqchip for tglx once it's stewed in -next for a bit.

thx,

Jason.