redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

irqdomain: Allow irq domain lookup by fwnode 

So far, our irq domains are still looked up by device node.
Let's change this and allow a domain to be looked up using
a fwnode_handle pointer.

The existing interfaces are preserved with a couple of helpers.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-and-tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Graeme Gregory <graeme@xora.org.uk>
Cc: Jake Oshins <jakeo@microsoft.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Link: http://lkml.kernel.org/r/1444737105-31573-4-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
steinar/wifi_calib_4_9_kernel
Marc Zyngier 2015-10-13 12:51:31 +01:00 committed by Thomas Gleixner
parent f110711a60
commit 130b8c6c8d
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/irqdomain.h
View File

@ -183,10 +183,17 @@ struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,
irq_hw_number_t first_hwirq, irq_hw_number_t first_hwirq,
const struct irq_domain_ops *ops, const struct irq_domain_ops *ops,
void *host_data); void *host_data);
extern struct irq_domain *irq_find_matching_host(struct device_node *node, extern struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
enum irq_domain_bus_token bus_token); enum irq_domain_bus_token bus_token);
extern void irq_set_default_host(struct irq_domain *host); extern void irq_set_default_host(struct irq_domain *host);
static inline struct irq_domain *irq_find_matching_host(struct device_node *node,
enum irq_domain_bus_token bus_token)
{
return irq_find_matching_fwnode(node ? &node->fwnode : NULL,
bus_token);
}
static inline struct irq_domain *irq_find_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); return irq_find_matching_host(node, DOMAIN_BUS_ANY);

16
kernel/irq/irqdomain.c
View File

@ -191,12 +191,12 @@ struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,
EXPORT_SYMBOL_GPL(irq_domain_add_legacy); EXPORT_SYMBOL_GPL(irq_domain_add_legacy);
/** /**
* irq_find_matching_host() - Locates a domain for a given device node * irq_find_matching_fwnode() - Locates a domain for a given fwnode
* @node: device-tree node of the interrupt controller * @fwnode: FW descriptor of the interrupt controller
* @bus_token: domain-specific data * @bus_token: domain-specific data
*/ */
struct irq_domain *irq_find_matching_host(struct device_node *node, struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
enum irq_domain_bus_token bus_token) enum irq_domain_bus_token bus_token)
{ {
struct irq_domain *h, *found = NULL; struct irq_domain *h, *found = NULL;
int rc; int rc;
@ -212,12 +212,10 @@ struct irq_domain *irq_find_matching_host(struct device_node *node,
*/ */
mutex_lock(&irq_domain_mutex); mutex_lock(&irq_domain_mutex);
list_for_each_entry(h, &irq_domain_list, link) { list_for_each_entry(h, &irq_domain_list, link) {
struct device_node *of_node;
of_node = irq_domain_get_of_node(h);
if (h->ops->match) if (h->ops->match)
rc = h->ops->match(h, node, bus_token); rc = h->ops->match(h, to_of_node(fwnode), bus_token);
else else
rc = ((of_node != NULL) && (of_node == node) && rc = ((fwnode != NULL) && (h->fwnode == fwnode) &&
((bus_token == DOMAIN_BUS_ANY) || ((bus_token == DOMAIN_BUS_ANY) ||
(h->bus_token == bus_token))); (h->bus_token == bus_token)));
@ -229,7 +227,7 @@ struct irq_domain *irq_find_matching_host(struct device_node *node,
mutex_unlock(&irq_domain_mutex); mutex_unlock(&irq_domain_mutex);
return found; return found;
} }
EXPORT_SYMBOL_GPL(irq_find_matching_host); EXPORT_SYMBOL_GPL(irq_find_matching_fwnode);
/** /**
* irq_set_default_host() - Set a "default" irq domain * irq_set_default_host() - Set a "default" irq domain