In order to use irq_domain_instantiate() from several places such as
irq_domain_create_hierarchy(), irq_domain_instantiate() needs to handle
additional domain flags.

Handle these additional flags.

Suggested-by: Thomas Gleixner <t...@linutronix.de>
Signed-off-by: Herve Codina <herve.cod...@bootlin.com>
---
 include/linux/irqdomain.h | 2 ++
 kernel/irq/irqdomain.c    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index a3b43e357009..4683b66eded9 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -260,6 +260,7 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode);
 /**
  * struct irq_domain_info - Domain information structure
  * @fwnode:            firmware node for the interrupt controller
+ * @domain_flags:      Additional flags to add to the domain flags
  * @size:              Size of linear map; 0 for radix mapping only
  * @hwirq_max:         Maximum number of interrupts supported by controller
  * @direct_max:                Maximum value of direct maps;
@@ -269,6 +270,7 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode);
  */
 struct irq_domain_info {
        struct fwnode_handle                    *fwnode;
+       unsigned int                            domain_flags;
        unsigned int                            size;
        irq_hw_number_t                         hwirq_max;
        int                                     direct_max;
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 28a463e25d99..34acc2ccfee7 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -263,6 +263,8 @@ struct irq_domain *irq_domain_instantiate(const struct 
irq_domain_info *info)
        if (!domain)
                return ERR_PTR(-ENOMEM);
 
+       domain->flags |= info->domain_flags;
+
        __irq_domain_publish(domain);
 
        return domain;
-- 
2.45.0


Reply via email to