To use irq_domain_instantiate() from irq_domain_create_hierarchy(),
irq_domain_instantiate() needs to handle the domain hierarchy parent.

Handle this parent.

Signed-off-by: Herve Codina <herve.cod...@bootlin.com>
---
 include/linux/irqdomain.h | 6 ++++++
 kernel/irq/irqdomain.c    | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 4683b66eded9..e52fd5e5494c 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -276,6 +276,12 @@ struct irq_domain_info {
        int                                     direct_max;
        const struct irq_domain_ops             *ops;
        void                                    *host_data;
+#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
+       /**
+        * @parent: Pointer to the parent irq domain used in a hierarchy domain
+        */
+       struct irq_domain                       *parent;
+#endif
 };
 
 struct irq_domain *irq_domain_instantiate(const struct irq_domain_info *info);
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 34acc2ccfee7..7e4a1da63549 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -265,6 +265,13 @@ struct irq_domain *irq_domain_instantiate(const struct 
irq_domain_info *info)
 
        domain->flags |= info->domain_flags;
 
+#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
+       if (info->parent) {
+               domain->root = info->parent->root;
+               domain->parent = info->parent;
+       }
+#endif
+
        __irq_domain_publish(domain);
 
        return domain;
-- 
2.45.0


Reply via email to