[Qemu-devel] [RFC PATCH 3/7] devicetree: add helper for determining IRQ properties in the device tree

[Grant Likely]

This patch adds the qbus_fdt_irq_to_number() helper to determine the
interrupt number and phandle needed for adding the interrupts property
to a device node in the device tree.

Signed-off-by: Grant Likely <address@hidden>
---

 hw/qdev.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 hw/qdev.h |    1 +
 2 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index b177c3d..ed68a70 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -751,6 +751,54 @@ void do_device_del(Monitor *mon, const QDict *qdict)
 
 #ifdef CONFIG_FDT
 #include <libfdt.h>
+/* Iterate over entire device list looking for the interrupt parent */
+static int __qbus_fdt_irq_to_number(qemu_irq irq, BusState *bus,
+                                    uint32_t *phandle);
+static int __qbus_fdt_irq_to_number_dev(qemu_irq irq, DeviceState *dev,
+                                        uint32_t *phandle)
+{
+    BusState *child;
+    int rc, i;
+
+    for (i = 0; i < dev->num_gpio_in; i++) {
+        if (irq == qdev_get_gpio_in(dev, i)) {
+            if (phandle)
+                *phandle = (uint64_t)dev;
+            return i;
+        }
+    }
+
+    QLIST_FOREACH(child, &dev->child_bus, sibling) {
+        rc = __qbus_fdt_irq_to_number(irq, child, phandle);
+        if (rc >= 0)
+            return rc;
+    }
+
+    return -1;
+}
+
+static int __qbus_fdt_irq_to_number(qemu_irq irq, BusState *bus,
+                                    uint32_t *phandle)
+{
+    struct DeviceState *dev;
+    int rc;
+
+    QLIST_FOREACH(dev, &bus->children, sibling) {
+        rc = __qbus_fdt_irq_to_number_dev(irq, dev, phandle);
+        if (rc >= 0)
+            return rc;
+    }
+
+    return -1;
+}
+
+int qbus_fdt_irq_to_number(qemu_irq irq, uint32_t *phandle)
+{
+    return __qbus_fdt_irq_to_number(irq, main_system_bus, phandle);
+}
+
+
+
 static int qbus_fdt_add_bus(void *fdt, BusState *bus, int dev_offset);
 static int qdev_fdt_add_device(void *fdt, DeviceState *dev, int bus_offset)
 {
diff --git a/hw/qdev.h b/hw/qdev.h
index d549d43..84544c7 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -277,6 +277,7 @@ void qdev_prop_set_compat(DeviceState *dev);
 extern struct BusInfo system_bus_info;
 
 #ifdef CONFIG_FDT
+int qbus_fdt_irq_to_number(qemu_irq irq, uint32_t *phandle);
 int qdev_fdt_populate(void *fdt);
 #endif