| Message ID | 1344527635-6163-3-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Aug 9, 2012 at 5:53 PM, Lee Jones <lee.jones@linaro.org> wrote: > irq_find_host() currently ignores the 'interrupt-parent' property > even if it's specified in the Device Tree. Meaning that a node can > match to a domain in its hierarchy even if it doesn't belong to it. > By searching for the parent first using of_irq_find_parent() we > insist that the 'interrupt-parent' property is taken into account > ensuring a greater chance of returning the correct domain. > > CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> > CC: Grant Likely <grant.likely@secretlab.ca> > Signed-off-by: Lee Jones <lee.jones@linaro.org> This (with 1/8) is the right solution. Thanks, and I think Mark may want to look at this too since I recognize he asked you to work in this direction. Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Tue, Aug 14, 2012 at 10:19:08AM +0200, Linus Walleij wrote: > On Thu, Aug 9, 2012 at 5:53 PM, Lee Jones <lee.jones@linaro.org> wrote: > > > irq_find_host() currently ignores the 'interrupt-parent' property > > even if it's specified in the Device Tree. Meaning that a node can > > match to a domain in its hierarchy even if it doesn't belong to it. > > By searching for the parent first using of_irq_find_parent() we > > insist that the 'interrupt-parent' property is taken into account > > ensuring a greater chance of returning the correct domain. > > > > CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > CC: Grant Likely <grant.likely@secretlab.ca> > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > This (with 1/8) is the right solution. Thanks, and I think > Mark may want to look at this too since I recognize he asked > you to work in this direction. > > Acked-by: Linus Walleij <linus.walleij@linaro.org> Rob, did this get your Ack too? Ben, Grant, Mark, would you like to take a look also?
On 08/31/2012 04:44 AM, Lee Jones wrote: > On Tue, Aug 14, 2012 at 10:19:08AM +0200, Linus Walleij wrote: >> On Thu, Aug 9, 2012 at 5:53 PM, Lee Jones <lee.jones@linaro.org> wrote: >> >>> irq_find_host() currently ignores the 'interrupt-parent' property >>> even if it's specified in the Device Tree. Meaning that a node can >>> match to a domain in its hierarchy even if it doesn't belong to it. >>> By searching for the parent first using of_irq_find_parent() we >>> insist that the 'interrupt-parent' property is taken into account >>> ensuring a greater chance of returning the correct domain. >>> >>> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> >>> CC: Grant Likely <grant.likely@secretlab.ca> >>> Signed-off-by: Lee Jones <lee.jones@linaro.org> >> >> This (with 1/8) is the right solution. Thanks, and I think >> Mark may want to look at this too since I recognize he asked >> you to work in this direction. >> >> Acked-by: Linus Walleij <linus.walleij@linaro.org> > > Rob, did this get your Ack too? Acked-by: Rob Herring <rob.herring@calxeda.com> Rob > > Ben, Grant, Mark, would you like to take a look also? >
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 49a7772..db63b9b 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/of_irq.h> #include <linux/of_address.h> #include <linux/topology.h> #include <linux/seq_file.h> @@ -323,8 +324,14 @@ EXPORT_SYMBOL_GPL(irq_domain_add_tree); struct irq_domain *irq_find_host(struct device_node *node) { struct irq_domain *h, *found = NULL; + struct device_node *parent_node; int rc; + /* Take heed if an 'interrupt-parent' was specified. */ + parent_node = of_irq_find_parent(node); + if (parent_node) + node = parent_node; + /* We might want to match the legacy controller last since * it might potentially be set to match all interrupts in * the absence of a device node. This isn't a problem so far
irq_find_host() currently ignores the 'interrupt-parent' property even if it's specified in the Device Tree. Meaning that a node can match to a domain in its hierarchy even if it doesn't belong to it. By searching for the parent first using of_irq_find_parent() we insist that the 'interrupt-parent' property is taken into account ensuring a greater chance of returning the correct domain. CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- kernel/irq/irqdomain.c | 7 +++++++ 1 file changed, 7 insertions(+)