From: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> To: qemu-devel-qX2TKyscuCcdnm+yROfE0A@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org Subject: [RFC PATCH 3/7] devicetree: add helper for determining IRQ properties in the device tree Date: Tue, 06 Apr 2010 22:10:13 -0600 [thread overview] Message-ID: <20100407041013.20274.26545.stgit@angua> (raw) In-Reply-To: <20100407040129.20274.44284.stgit@angua> 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 <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Grant Likely <grant.likely@secretlab.ca> To: qemu-devel@nongnu.org, devicetree-discuss@lists.ozlabs.org, jeremy.kerr@canonical.com Subject: [Qemu-devel] [RFC PATCH 3/7] devicetree: add helper for determining IRQ properties in the device tree Date: Tue, 06 Apr 2010 22:10:13 -0600 [thread overview] Message-ID: <20100407041013.20274.26545.stgit@angua> (raw) In-Reply-To: <20100407040129.20274.44284.stgit@angua> 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 <grant.likely@secretlab.ca> --- 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
next prev parent reply other threads:[~2010-04-07 4:10 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-04-07 4:09 [RFC PATCH 0/7] QEMU patches to generate FDT from qdevs Grant Likely 2010-04-07 4:09 ` [Qemu-devel] " Grant Likely 2010-04-07 4:10 ` [RFC PATCH 1/7] devicetree: Add 8k instead of double dtb size when reserving extra memory Grant Likely 2010-04-07 4:10 ` [Qemu-devel] " Grant Likely 2010-04-09 12:00 ` Paul Brook 2010-04-09 12:00 ` Paul Brook [not found] ` <201004091300.57740.paul-qD8j1LwMmJjtCj0u4l0SBw@public.gmane.org> 2010-04-09 14:55 ` Grant Likely 2010-04-09 14:55 ` Grant Likely 2010-04-07 4:10 ` [RFC PATCH 2/7] devicetree: auto-populate the device tree with qdev data Grant Likely 2010-04-07 4:10 ` [Qemu-devel] " Grant Likely 2010-04-07 4:10 ` Grant Likely [this message] 2010-04-07 4:10 ` [Qemu-devel] [RFC PATCH 3/7] devicetree: add helper for determining IRQ properties in the device tree Grant Likely 2010-04-07 4:10 ` [RFC PATCH 4/7] devicetree: Add sysbus fdt populate hooks Grant Likely 2010-04-07 4:10 ` [Qemu-devel] " Grant Likely 2010-04-07 4:10 ` [RFC PATCH 5/7] devicetree: Add helper to register devices with an fdt_populate hook Grant Likely 2010-04-07 4:10 ` [Qemu-devel] " Grant Likely 2010-04-07 4:10 ` [RFC PATCH 6/7] devicetree: Add fdt_populate hook to pl011 device Grant Likely 2010-04-07 4:10 ` [Qemu-devel] " Grant Likely 2010-04-07 4:10 ` [RFC PATCH 7/7] devicetree: Add fdt_populate hook to smc91x device Grant Likely 2010-04-07 4:10 ` [Qemu-devel] " Grant Likely 2010-04-07 7:01 ` [RFC PATCH 0/7] QEMU patches to generate FDT from qdevs Jeremy Kerr 2010-04-07 7:01 ` [Qemu-devel] " Jeremy Kerr [not found] ` <201004071501.34711.jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> 2010-04-07 20:58 ` Grant Likely 2010-04-07 20:58 ` [Qemu-devel] " Grant Likely 2010-04-07 19:10 ` [Qemu-devel] " Blue Swirl 2010-04-07 19:10 ` Blue Swirl [not found] ` <k2kf43fc5581004071210v810be251nf77b7ab469004e5c-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2010-04-07 20:57 ` Grant Likely 2010-04-07 20:57 ` Grant Likely 2010-04-09 12:07 ` Paul Brook 2010-04-09 12:07 ` Paul Brook [not found] ` <201004091307.22473.paul-qD8j1LwMmJjtCj0u4l0SBw@public.gmane.org> 2010-04-09 14:47 ` Grant Likely 2010-04-09 14:47 ` Grant Likely [not found] ` <h2ofa686aa41004090747w2422cedasb6f4b51633637816-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2010-04-09 15:57 ` Paul Brook 2010-04-09 15:57 ` Paul Brook [not found] ` <201004091657.10684.paul-qD8j1LwMmJjtCj0u4l0SBw@public.gmane.org> 2010-04-09 16:35 ` Grant Likely 2010-04-09 16:35 ` Grant Likely
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20100407041013.20274.26545.stgit@angua \ --to=grant.likely-s3s/wqlpoipyb63q8fvjnq@public.gmane.org \ --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org \ --cc=qemu-devel-qX2TKyscuCcdnm+yROfE0A@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.