The following commit has been merged into the irq/core branch of tip:
Commit-ID: 419e3778ff295c00aa158d9f2854a70b47ba1136
Gitweb: https://git.kernel.org/tip/419e3778ff295c00aa158d9f2854a70b47ba1136
Author: Herve Codina <herve.codina@xxxxxxxxxxx>
AuthorDate: Fri, 14 Jun 2024 19:32:09 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Mon, 17 Jun 2024 15:48:13 +02:00
irqdomain: Handle domain hierarchy parent in irq_domain_instantiate()
To use irq_domain_instantiate() from irq_domain_create_hierarchy(),
irq_domain_instantiate() needs to handle the domain hierarchy parent.
Add the required functionality.
Signed-off-by: Herve Codina <herve.codina@xxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240614173232.1184015-9-herve.codina@xxxxxxxxxxx
---
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 4683b66..e52fd5e 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 26ad1ea..1269a81 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;
|