[tip:irq/core] irqdomain: Let irq_find_host default to DOMAIN_BUS_WIRED

[tip-bot for Marc Zyngier]

Commit-ID:  6461934371bfc1bfe6b424b197a546b4effd0a32
Gitweb: https://git.kernel.org/tip/6461934371bfc1bfe6b424b197a546b4effd0a32
Author: Marc Zyngier 
AuthorDate: Tue, 8 May 2018 13:14:34 +0100
Committer:  Thomas Gleixner 
CommitDate: Sun, 13 May 2018 15:59:00 +0200

irqdomain: Let irq_find_host default to DOMAIN_BUS_WIRED

At the beginning of times, irq_find_host() was simple. Each device node
implemented at most one irq domain, and we were happy. Over time, things
have become more complex, and we now have nodes implementing a plurality
of domains, tagged by "bus_token".

Crutially, users of irq_find_host() all expect the most basic domain
to be returned, and not any other domain such as a bus-specific MSI
domain.

So let's change irq_find_host() to first look for a DOMAIN_BUS_WIRED
domain, and only if this fails fallback to DOMAIN_BUS_ANY. Note that
this is consistent with what irq_create_fwspec_mapping is already
doing, see 530cbe100ef7 ("irqdomain: Allow domain lookup with
DOMAIN_BUS_WIRED token").

Signed-off-by: Marc Zyngier 
Signed-off-by: Thomas Gleixner 
Cc: Rob Herring 
Cc: Jason Cooper 
Cc: Ard Biesheuvel 
Cc: Srinivas Kandagatla 
Cc: Thomas Petazzoni 
Cc: Miquel Raynal 
Link: https://lkml.kernel.org/r/20180508121438.11301-6-marc.zyng...@arm.com

---
 include/linux/irqdomain.h | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 48c7e86bb556..dccfa65aee96 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -301,7 +301,13 @@ static inline struct irq_domain 
*irq_find_matching_host(struct device_node *node
 
 static inline struct irq_domain *irq_find_host(struct device_node *node)
 {
-   return irq_find_matching_host(node, DOMAIN_BUS_ANY);
+   struct irq_domain *d;
+
+   d = irq_find_matching_host(node, DOMAIN_BUS_WIRED);
+   if (!d)
+   d = irq_find_matching_host(node, DOMAIN_BUS_ANY);
+
+   return d;
 }
 
 /**

[tip:irq/core] irqdomain: Let irq_find_host default to DOMAIN_BUS_WIRED

[tip-bot for Marc Zyngier]

Commit-ID:  6461934371bfc1bfe6b424b197a546b4effd0a32
Gitweb: https://git.kernel.org/tip/6461934371bfc1bfe6b424b197a546b4effd0a32
Author: Marc Zyngier 
AuthorDate: Tue, 8 May 2018 13:14:34 +0100
Committer:  Thomas Gleixner 
CommitDate: Sun, 13 May 2018 15:59:00 +0200

irqdomain: Let irq_find_host default to DOMAIN_BUS_WIRED

At the beginning of times, irq_find_host() was simple. Each device node
implemented at most one irq domain, and we were happy. Over time, things
have become more complex, and we now have nodes implementing a plurality
of domains, tagged by "bus_token".

Crutially, users of irq_find_host() all expect the most basic domain
to be returned, and not any other domain such as a bus-specific MSI
domain.

So let's change irq_find_host() to first look for a DOMAIN_BUS_WIRED
domain, and only if this fails fallback to DOMAIN_BUS_ANY. Note that
this is consistent with what irq_create_fwspec_mapping is already
doing, see 530cbe100ef7 ("irqdomain: Allow domain lookup with
DOMAIN_BUS_WIRED token").

Signed-off-by: Marc Zyngier 
Signed-off-by: Thomas Gleixner 
Cc: Rob Herring 
Cc: Jason Cooper 
Cc: Ard Biesheuvel 
Cc: Srinivas Kandagatla 
Cc: Thomas Petazzoni 
Cc: Miquel Raynal 
Link: https://lkml.kernel.org/r/20180508121438.11301-6-marc.zyng...@arm.com

---
 include/linux/irqdomain.h | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 48c7e86bb556..dccfa65aee96 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -301,7 +301,13 @@ static inline struct irq_domain 
*irq_find_matching_host(struct device_node *node
 
 static inline struct irq_domain *irq_find_host(struct device_node *node)
 {
-   return irq_find_matching_host(node, DOMAIN_BUS_ANY);
+   struct irq_domain *d;
+
+   d = irq_find_matching_host(node, DOMAIN_BUS_WIRED);
+   if (!d)
+   d = irq_find_matching_host(node, DOMAIN_BUS_ANY);
+
+   return d;
 }
 
 /**