From: Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
Subject: [PATCH 3/5] of/irq: introduce of_irq_init
Date: Wed, 14 Sep 2011 11:31:38 -0500 [thread overview]
Message-ID: <1316017900-19918-4-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1316017900-19918-1-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
From: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
of_irq_init will scan the devicetree for matching interrupt controller
nodes. Then it calls an initialization function for each found controller
in the proper order with parent nodes initialized before child nodes.
Based on initial pseudo code from Grant Likely.
Signed-off-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
---
drivers/of/irq.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/of_irq.h | 1 +
2 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 9f689f1..a0cd7e8 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -19,10 +19,13 @@
*/
#include <linux/errno.h>
+#include <linux/list.h>
+#include <linux/list_sort.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/string.h>
+#include <linux/slab.h>
/* For archs that don't support NO_IRQ (such as x86), provide a dummy value */
#ifndef NO_IRQ
@@ -386,3 +389,96 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res,
return i;
}
+
+struct intc_desc {
+ struct list_head list;
+ struct device_node *dev;
+ struct device_node *parent;
+};
+
+typedef void (*irq_init_cb_t)(struct device_node *, struct device_node *);
+
+static int __init irq_cmp_intc_desc(void *unused, struct list_head *a,
+ struct list_head *b)
+{
+ const struct intc_desc *da = list_entry(a, typeof(*da), list);
+ const struct intc_desc *db = list_entry(b, typeof(*db), list);
+
+ /* same parent, so order doesn't matter */
+ if (da->parent == db->parent)
+ return 0;
+
+ /* NULL parent comes first */
+ if (!da->parent && db->parent)
+ return -1;
+ if (!db->parent && da->parent)
+ return 1;
+
+ /* parent node must be before child node */
+ if (da->dev == db->parent)
+ return -1;
+ if (db->dev == da->parent)
+ return 1;
+
+ return 0;
+}
+
+/**
+ * of_irq_init - Scan the device tree for matching interrupt controllers and
+ * call their initialization functions in order with parents first.
+ * @matches: 0 terminated array of nodes to match and initialization function
+ * to call on match
+ */
+void __init of_irq_init(const struct of_device_id *matches)
+{
+ struct device_node *np;
+ const struct of_device_id *match;
+ struct intc_desc *desc;
+ struct intc_desc *temp_desc;
+ struct list_head intc_desc_list;
+
+ INIT_LIST_HEAD(&intc_desc_list);
+
+ for_each_matching_node(np, matches) {
+ if (!of_find_property(np, "interrupt-controller", NULL))
+ continue;
+ /* Here, we allocate and populate an intc_desc with the node
+ * pointer, interrupt-parent device_node etc. */
+ desc = kzalloc(sizeof(*desc), GFP_KERNEL);
+ if (!desc) {
+ WARN_ON(1);
+ goto err;
+ }
+ desc->dev = np;
+ desc->parent = of_irq_find_parent(np);
+ list_add(&desc->list, &intc_desc_list);
+ }
+ if (list_empty(&intc_desc_list))
+ return;
+
+ /*
+ * The root irq controller is the one without an interrupt-parent.
+ * That one goes first, followed by the controllers that reference it,
+ * followed by the ones that reference the 2nd level controllers, etc
+ */
+ list_sort(NULL, &intc_desc_list, irq_cmp_intc_desc);
+
+ list_for_each_entry_safe(desc, temp_desc, &intc_desc_list, list) {
+ match = of_match_node(matches, desc->dev);
+ if (match && match->data) {
+ irq_init_cb_t irq_init_cb = match->data;
+ pr_debug("of_irq_init: init %s @ %p, parent %p\n",
+ match->compatible, desc->dev, desc->parent);
+ irq_init_cb(desc->dev, desc->parent);
+ }
+ list_del(&desc->list);
+ kfree(desc);
+ }
+ return;
+
+err:
+ list_for_each_entry_safe(desc, temp_desc, &intc_desc_list, list) {
+ list_del(&desc->list);
+ kfree(desc);
+ }
+}
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index cd2e61c..032d76c 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -73,6 +73,7 @@ extern int of_irq_to_resource_table(struct device_node *dev,
struct resource *res, int nr_irqs);
extern struct device_node *of_irq_find_parent(struct device_node *child);
+extern void of_irq_init(const struct of_device_id *matches);
#endif /* CONFIG_OF_IRQ */
#endif /* CONFIG_OF */
--
1.7.5.4
next prev parent reply other threads:[~2011-09-14 16:31 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-14 16:31 [PATCH 0/5] GIC OF bindings Rob Herring
2011-09-14 16:31 ` [PATCH 2/5] irq: fix existing domain check in irq_domain_add Rob Herring
[not found] ` <1316017900-19918-3-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-14 16:44 ` Thomas Gleixner
2011-09-17 23:24 ` Grant Likely
2011-09-14 16:31 ` [PATCH 4/5] ARM: gic: allow irq_start to be 0 Rob Herring
[not found] ` <1316017900-19918-5-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-18 6:24 ` Grant Likely
2011-09-18 12:03 ` Russell King - ARM Linux
[not found] ` <1316017900-19918-1-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-14 16:31 ` [PATCH 1/5] irq: add declaration of irq_domain_simple_ops to irqdomain.h Rob Herring
2011-09-14 16:31 ` Rob Herring [this message]
[not found] ` <1316017900-19918-4-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-15 10:41 ` [PATCH 3/5] of/irq: introduce of_irq_init Arnd Bergmann
2011-09-17 23:53 ` Grant Likely
[not found] ` <20110917235328.GA3523-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-09-18 1:37 ` Rob Herring
[not found] ` <4E754B56.1010404-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-18 6:02 ` Grant Likely
2011-09-14 16:31 ` [PATCH 5/5] ARM: gic: add OF based initialization Rob Herring
2011-09-14 17:46 ` Marc Zyngier
[not found] ` <4E70E88E.4090503-5wv7dgnIgG8@public.gmane.org>
2011-09-14 17:57 ` Rob Herring
2011-09-14 18:34 ` Marc Zyngier
[not found] ` <4E70F3C9.2010202-5wv7dgnIgG8@public.gmane.org>
2011-09-14 18:51 ` Rob Herring
[not found] ` <4E70F7BE.6020909-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-18 0:13 ` Grant Likely
2011-09-15 7:55 ` Thomas Abraham
[not found] ` <CAJuYYwSFu2HC+u2NY41+yw9tEyy85RKa4Dpm3SL+jbwS_OOA0A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-09-15 10:07 ` Cousson, Benoit
[not found] ` <4E71CE5D.9030900-l0cyMroinI0@public.gmane.org>
2011-09-15 10:29 ` Russell King - ARM Linux
[not found] ` <20110915102915.GJ6267-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2011-09-15 12:28 ` Cousson, Benoit
[not found] ` <4E71EF56.3050503-l0cyMroinI0@public.gmane.org>
2011-09-15 12:51 ` Russell King - ARM Linux
[not found] ` <20110915125107.GK6267-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2011-09-15 13:03 ` Cousson, Benoit
2011-09-15 13:11 ` Rob Herring
[not found] ` <4E71F978.6020402-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-15 13:52 ` Cousson, Benoit
2011-09-15 16:43 ` Rob Herring
2011-09-18 21:23 ` Rob Herring
[not found] ` <4E76615C.3000005-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-19 12:09 ` Cousson, Benoit
[not found] ` <4E77310A.3000106-l0cyMroinI0@public.gmane.org>
2011-09-19 13:48 ` Rob Herring
[not found] ` <4E774847.3020104-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-19 14:32 ` Cousson, Benoit
2011-09-19 21:14 ` Grant Likely
[not found] ` <CACxGe6v9nd5f5x-eu9hUyAqdS1+p3h6ixyutECYLdNo3ewDH0w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-09-19 21:53 ` Rob Herring
[not found] ` <4E77B9E3.40004-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-20 0:22 ` Grant Likely
2011-09-20 4:18 ` Grant Likely
2011-09-20 15:23 ` Cousson, Benoit
2011-09-19 16:00 ` Russell King - ARM Linux
2011-09-19 20:49 ` Grant Likely
[not found] ` <4E722B2D.4050307-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-19 9:47 ` Cousson, Benoit
[not found] ` <4E770FA6.2070305-l0cyMroinI0@public.gmane.org>
2011-09-19 13:33 ` Russell King - ARM Linux
[not found] ` <20110919133301.GR16381-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2011-09-19 17:44 ` Grant Likely
2011-09-18 6:15 ` Grant Likely
[not found] ` <20110918061526.GE3523-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-09-19 8:47 ` Cousson, Benoit
2011-09-16 16:09 ` Dave Martin
[not found] ` <20110916160939.GA2100-5wv7dgnIgG8@public.gmane.org>
2011-09-18 6:21 ` Grant Likely
2011-09-19 12:07 ` Dave Martin
2011-09-19 13:08 ` Cousson, Benoit
2011-09-15 12:54 ` Rob Herring
[not found] ` <4E71F593.2040903-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-16 9:34 ` Thomas Abraham
[not found] ` <CAJuYYwQ=tSh8k5ZOi2kx6KbMsQ4eVAvgE=T4kdckRSLjdj3dMQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-09-18 6:10 ` Grant Likely
[not found] ` <20110918061024.GD3523-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-09-19 12:59 ` Thomas Abraham
[not found] ` <1316017900-19918-6-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-15 10:43 ` Arnd Bergmann
2011-09-18 6:30 ` Grant Likely
2011-09-15 8:50 ` [PATCH 0/5] GIC OF bindings Jamie Iles
2011-09-15 13:53 ` Shawn Guo
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=1316017900-19918-4-git-send-email-robherring2@gmail.com \
--to=robherring2-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).