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

irqdomain: Add a name field 

This patch adds a name field to the irq_domain structure to help mere
mortals understand the mappings between irq domains and virqs. It also
converts a number of places that have open-coded some kind of fudging
an irqdomain name to use the new field. This means a more consistent
display of names in irq domain log messages and debugfs output.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
hifive-unleashed-5.1
Grant Likely 2013-06-06 14:23:30 +01:00
parent 9bbf877d3b
commit 0bb4afb45d
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/irqdomain.h
View File

@ -89,6 +89,7 @@ struct irq_domain_chip_generic;
*/ */
struct irq_domain { struct irq_domain {
struct list_head link; struct list_head link;
const char *name;
/* type of reverse mapping_technique */ /* type of reverse mapping_technique */
unsigned int revmap_type; unsigned int revmap_type;

1
kernel/irq/generic-chip.c
View File

@ -305,6 +305,7 @@ int irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip,
/* Calc pointer to the next generic chip */ /* Calc pointer to the next generic chip */
tmp += sizeof(*gc) + num_ct * sizeof(struct irq_chip_type); tmp += sizeof(*gc) + num_ct * sizeof(struct irq_chip_type);
} }
d->name = name;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(irq_alloc_domain_generic_chips); EXPORT_SYMBOL_GPL(irq_alloc_domain_generic_chips);

19
kernel/irq/irqdomain.c
View File

@ -410,12 +410,15 @@ int irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base,
*/ */
if (ret != -EPERM) { if (ret != -EPERM) {
pr_info("%s didn't like hwirq-0x%lx to VIRQ%i mapping (rc=%d)\n", pr_info("%s didn't like hwirq-0x%lx to VIRQ%i mapping (rc=%d)\n",
of_node_full_name(domain->of_node), hwirq, virq, ret); domain->name, hwirq, virq, ret);
} }
irq_data->domain = NULL; irq_data->domain = NULL;
irq_data->hwirq = 0; irq_data->hwirq = 0;
continue; continue;
} }
/* If not already assigned, give the domain the chip's name */
if (!domain->name && irq_data->chip)
domain->name = irq_data->chip->name;
} }
switch (domain->revmap_type) { switch (domain->revmap_type) {
@ -708,8 +711,6 @@ static int virq_debug_show(struct seq_file *m, void *private)
{ {
unsigned long flags; unsigned long flags;
struct irq_desc *desc; struct irq_desc *desc;
const char *p;
static const char none[] = "none";
void *data; void *data;
int i; int i;
@ -731,20 +732,12 @@ static int virq_debug_show(struct seq_file *m, void *private)
seq_printf(m, "0x%05lx ", desc->irq_data.hwirq); seq_printf(m, "0x%05lx ", desc->irq_data.hwirq);
chip = irq_desc_get_chip(desc); chip = irq_desc_get_chip(desc);
if (chip && chip->name) seq_printf(m, "%-15s ", (chip && chip->name) ? chip->name : "none");
p = chip->name;
else
p = none;
seq_printf(m, "%-15s ", p);
data = irq_desc_get_chip_data(desc); data = irq_desc_get_chip_data(desc);
seq_printf(m, data ? "0x%p " : " %p ", data); seq_printf(m, data ? "0x%p " : " %p ", data);
if (desc->irq_data.domain) seq_printf(m, "%s\n", desc->irq_data.domain->name);
p = of_node_full_name(desc->irq_data.domain->of_node);
else
p = none;
seq_printf(m, "%s\n", p);
} }
raw_spin_unlock_irqrestore(&desc->lock, flags); raw_spin_unlock_irqrestore(&desc->lock, flags);