On 06/07/17 05:35, Hanjun Guo wrote:
> From: Hanjun Guo <hanjun....@linaro.org>
>
> commit d59f6617eef0 (genirq: Allow fwnode to carry name information only)
> forgot to do "domain->fwnode = fwnode;" for irqchips being probed via
> ACPI namesapce (DSDT/SSDT), that will break platforms with irqchip such
> as mbigen or qcom irq combiner, set the fwnode back to fix the issue.
>
> Reported-by: John Garry <john.ga...@huawei.com>
> Signed-off-by: Hanjun Guo <hanjun....@linaro.org>
> ---
> kernel/irq/irqdomain.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
> index 14fe862..1bc38fa 100644
> --- a/kernel/irq/irqdomain.c
> +++ b/kernel/irq/irqdomain.c
> @@ -151,7 +151,6 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle
> *fwnode, int size,
> domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
> break;
> default:
> - domain->fwnode = fwnode;
> domain->name = fwid->name;
> break;
> }
> @@ -172,7 +171,6 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle
> *fwnode, int size,
> strreplace(name, '/', ':');
>
> domain->name = name;
> - domain->fwnode = fwnode;
> domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
> }
>
> @@ -196,6 +194,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle
> *fwnode, int size,
> INIT_RADIX_TREE(&domain->revmap_tree, GFP_KERNEL);
> domain->ops = ops;
> domain->host_data = host_data;
> + domain->fwnode = fwnode;
> domain->hwirq_max = hwirq_max;
> domain->revmap_size = size;
> domain->revmap_direct_max_irq = direct_max;
>
This doesn't seem right.
Why is is_fwnode_irqchip() returning false when presented with an
irqchip probed via the ACPI namespace? That's what you should consider
fixing instead of moving that code around.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
