Skip to contentSkip to conversation

ARM: plat-versatile: add DT support to FPGA IRQ controller

PATCH New Linus Walleij 2 participants 4 messages Aug 16, 2012 – Sep 1, 2012

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

PATCH 3/6 ARM: plat-versatile: add DT support to FPGA IRQ controller

This adds Device Tree probing support to the Versatile FPGA IRQ controller.

---
 .../devicetree/bindings/arm/versatile-fpga-irq.txt | 35 ++++++++++++++++++
 arch/arm/plat-versatile/fpga-irq.c                 | 41 ++++++++++++++++++++++
 arch/arm/plat-versatile/include/plat/fpga-irq.h    |  2 ++
 3 files changed, 78 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt
Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt new file +35 -0
new file mode 100644
index 0000000..d20242a
@@ -0,0 +1,35 @@
+* ARM Versatile FPGA interrupt controller
+
+One or more FPGA IRQ controllers can be synthesized in an ARM reference board
+such as the Integrator or Versatile family. The output of these different
+controllers are OR:ed together and fed to the CPU tile's IRQ input. Each
+instance can handle up to 32 interrupts.
+
+Required properties:
+- compatible: "arm,versatile-fpga-irq"
+- interrupt-controller: Identifies the node as an interrupt controller
+- #interrupt-cells: The number of cells to define the interrupts.  Must be 1
+  as the FPGA IRQ controller has no configuration options for interrupt
+  sources.  The cell is a u32 and defines the interrupt number.
+- reg: The register bank for the FPGA interrupt controller.
+- irq-start: the u32 hardware IRQ number of the first interrupt handled by
+  this FPGA IRQ instance - since there may be many FPGA IRQ controller
+  instances, each will have its unique hardware offset number.
+- clear-mask: a u32 number representing the mask written to clear all IRQs
+  on the controller at boot for example.
+- valid-mask: a u32 number representing a bit mask determining which of
+  the interrupts are valid. Unconnected/unused lines are set to 0, and
+  the system till not make it possible for devices to request these
+  interrupts.
+
+Example:
+
+pic: pic at 14000000 {
+        compatible = "arm,versatile-fpga-irq";
+        #interrupt-cells = <1>;
+        interrupt-controller;
+        reg = <0x14000000 0x100>;
+        irq-start = <1>;
+        clear-mask = <0xffffffff>;
+        valid-mask = <0x003fffff>;
+};
arch/arm/plat-versatile/fpga-irq.c +41 -0

56 lines not on this page · raw message

arch/arm/plat-versatile/include/plat/fpga-irq.h +2 -0
index 91bcfb6..1fac965 100644
@@ -7,5 +7,7 @@ struct pt_regs;
 void fpga_handle_irq(struct pt_regs *regs);
 void fpga_irq_init(void __iomem *, const char *, int, int, u32,
 		struct device_node *node);
+int fpga_irq_of_init(struct device_node *node,
+		     struct device_node *parent);
 
 #endif
Signature · 1 line
1.7.11.2
#1 lore raw

PATCH 3/6 ARM: plat-versatile: add DT support to FPGA IRQ controller

Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt line 17

Quoted 3 lines · Linus Walleij

+- irq-start: the u32 hardware IRQ number of the first interrupt handled by

Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt new file +2 -0
+  this FPGA IRQ instance - since there may be many FPGA IRQ controller
+  instances, each will have its unique hardware offset number.

The irq-start value is a Linux specific invention, the hardware doesn't know anything about these. As long as you depend on specific IRQ numbers to get assigned, I would use something like auxdata to find the start number. When all devices get their IRQ numbers from the device tree, you can move to linear IRQ domains instead of legacy, and let the irq domain code pick the numbers.

Arnd

#2 lore raw

PATCH 3/6 ARM: plat-versatile: add DT support to FPGA IRQ controller

Quoted 9 lines · Arnd Bergmann

Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt line 17

Quoted 3 lines · Linus Walleij

+- irq-start: the u32 hardware IRQ number of the first interrupt handled by

Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt new file +2 -0
+  this FPGA IRQ instance - since there may be many FPGA IRQ controller
+  instances, each will have its unique hardware offset number.

The irq-start value is a Linux specific invention, the hardware doesn't know anything about these. As long as you depend on specific IRQ numbers to get assigned, I would use something like auxdata to find the start number.

Sorry that does not work. Auxdata is not used with IRQ controllers, only with devices.

of_irq_init() will dereference the .data field of struct of_device_id and use as a callback function to initialize the IRQ controller, no chance to pass any other data that way.

Quoted 3 lines

When all devices get their IRQ numbers from the device tree, you can move to linear IRQ domains instead of legacy, and let the irq domain code pick the numbers.

It seems I have no other choice here than to move directly to linear numbers or atleast dynamically allocated descriptors.

Yours,
Linus Walleij

#3 lore raw

PATCH 3/6 ARM: plat-versatile: add DT support to FPGA IRQ controller

Quoted 6 lines · Linus Walleij
Quoted 3 lines

When all devices get their IRQ numbers from the device tree, you can move to linear IRQ domains instead of legacy, and let the irq domain code pick the numbers.

It seems I have no other choice here than to move directly to linear numbers or atleast dynamically allocated descriptors.

You could also do a hack and keep the number hardcoded, or dependent on the "compatible" value of the root node, but moving to linear domains would be nicer because then you don't have to change this code again.

Arnd