hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

irqdomain: Introduce irq_create_fwspec_mapping 

Just like we have irq_create_of_mapping, irq_create_fwspec_mapping
creates a IRQ domain mapping for an interrupt described in a
struct irq_fwspec.

irq_create_of_mapping gets rewritten in terms of the new function,
and the hack we introduced before gets removed (now that no stacked
irqchip uses of_phandle_args anymore).

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-7-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Marc Zyngier 2015-10-13 12:51:34 +01:00 committed by Thomas Gleixner
parent f833f57ff2
commit c0131f09de
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/irqdomain.h
View File

@ -267,6 +267,7 @@ extern void irq_domain_disassociate(struct irq_domain *domain,
extern unsigned int irq_create_mapping(struct irq_domain *host, extern unsigned int irq_create_mapping(struct irq_domain *host,
irq_hw_number_t hwirq); irq_hw_number_t hwirq);
extern unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);
extern void irq_dispose_mapping(unsigned int virq); extern void irq_dispose_mapping(unsigned int virq);
/** /**

30
kernel/irq/irqdomain.c
View File

@ -514,37 +514,28 @@ static void of_phandle_args_to_fwspec(struct of_phandle_args *irq_data,
fwspec->param[i] = irq_data->args[i]; fwspec->param[i] = irq_data->args[i];
} }
unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data) unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec)
{ {
struct irq_fwspec fwspec;
struct irq_domain *domain; struct irq_domain *domain;
irq_hw_number_t hwirq; irq_hw_number_t hwirq;
unsigned int type = IRQ_TYPE_NONE; unsigned int type = IRQ_TYPE_NONE;
int virq; int virq;
of_phandle_args_to_fwspec(irq_data, &fwspec); if (fwspec->fwnode)
domain = irq_find_matching_fwnode(fwspec->fwnode, DOMAIN_BUS_ANY);
if (fwspec.fwnode)
domain = irq_find_matching_fwnode(fwspec.fwnode, DOMAIN_BUS_ANY);
else else
domain = irq_default_domain; domain = irq_default_domain;
if (!domain) { if (!domain) {
pr_warn("no irq domain found for %s !\n", pr_warn("no irq domain found for %s !\n",
of_node_full_name(to_of_node(fwspec.fwnode))); of_node_full_name(to_of_node(fwspec->fwnode)));
return 0; return 0;
} }
if (irq_domain_translate(domain, &fwspec, &hwirq, &type)) if (irq_domain_translate(domain, fwspec, &hwirq, &type))
return 0; return 0;
if (irq_domain_is_hierarchy(domain)) { if (irq_domain_is_hierarchy(domain)) {
/* Temporary hack */
void *desc = &fwspec;
#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
if (!domain->ops->translate)
desc = irq_data;
#endif
/* /*
* If we've already configured this interrupt, * If we've already configured this interrupt,
* don't do it again, or hell will break loose. * don't do it again, or hell will break loose.
@ -553,7 +544,7 @@ unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data)
if (virq) if (virq)
return virq; return virq;
virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, desc); virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, fwspec);
if (virq <= 0) if (virq <= 0)
return 0; return 0;
} else { } else {
@ -569,6 +560,15 @@ unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data)
irq_set_irq_type(virq, type); irq_set_irq_type(virq, type);
return virq; return virq;
} }
EXPORT_SYMBOL_GPL(irq_create_fwspec_mapping);
unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data)
{
struct irq_fwspec fwspec;
of_phandle_args_to_fwspec(irq_data, &fwspec);
return irq_create_fwspec_mapping(&fwspec);
}
EXPORT_SYMBOL_GPL(irq_create_of_mapping); EXPORT_SYMBOL_GPL(irq_create_of_mapping);
/** /**