[tip: irq/core] irqdomain: Handle additional domain flags in irq_domain_instantiate()

From: tip-bot2 for Herve Codina
Date: Mon Jun 17 2024 - 10:49:19 EST


The following commit has been merged into the irq/core branch of tip:

Commit-ID: 757398541c30a5e898169763b43f08dab71ea3bd
Gitweb: https://git.kernel.org/tip/757398541c30a5e898169763b43f08dab71ea3bd
Author: Herve Codina <herve.codina@xxxxxxxxxxx>
AuthorDate: Fri, 14 Jun 2024 19:32:08 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Mon, 17 Jun 2024 15:48:13 +02:00

irqdomain: Handle additional domain flags in irq_domain_instantiate()

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.

Add the required infrastructure.

Suggested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Herve Codina <herve.codina@xxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240614173232.1184015-8-herve.codina@xxxxxxxxxxx

---
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 a3b43e3..4683b66 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 0eda48f..26ad1ea 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;