Incorrect MSI interrupt type name
PATCH 1/1 Incorrect MSI interrupt type name
/proc/interrupts shows "<NULL>" for MSI interrupt type name on my ia64 machine.
Below patch against 2.6.19-rc5-mm1 fixes it.
---
arch/ia64/kernel/msi_ia64.c +1 -1
@@ -115,7 +115,7 @@ static int ia64_msi_retrigger_irq(unsign* Generic ops used on most IA64 platforms. */ static struct irq_chip ia64_msi_chip = { - .name ="PCI-MSI" , + .typename ="PCI-MSI" , .mask = mask_msi_irq, .unmask = unmask_msi_irq, .ack = ia64_ack_msi_irq,
Quoted 12 lines · Yanmin
/proc/interruptsshows "<NULL>" for MSI interrupt type name on my ia64 machine.Below patch against 2.6.19-rc5-mm1 fixes it.
Signed-off-by Zhang Yanmin <[email protected]>---
arch/ia64/kernel/msi_ia64.c static int ia64_msi_retrigger_irq(unsign · line 121
Quoted 8 lines
arch/ia64/kernel/msi_ia64.c +1
-1@@ -115,7 +115,7 @@ static int ia64_msi_retrigger_irq(unsign* Generic ops used on most IA64 platforms. */ static struct irq_chip ia64_msi_chip = { - .name ="PCI-MSI" , + .typename ="PCI-MSI" , .mask = mask_msi_irq, .unmask = unmask_msi_irq, .ack = ia64_ack_msi_irq,
I think the bug is that ia64 is printing ->typename, whereas it should be printing ->name:
arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/ia64/kernel/iosapic.c renamed from arch/ia64/kernel/iosapic.c~ia64-irqs-use-name-not-typename +1 -1
@@ -664,7 +664,7 @@ register_intr (unsigned int gsi, int vecprintk (KERN_WARNING "%s: changing vector %d from %s to %s\n" , __FUNCTION__, vector, - idesc->chip->typename, irq_type->typename); + idesc->chip->name, irq_type->name); idesc->chip = irq_type; }return 0 ;
arch/ia64/kernel/irq.c renamed from arch/ia64/kernel/irq.c~ia64-irqs-use-name-not-typename +1 -1
@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p,seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); }#endif -seq_printf (p," %14s" , irq_desc[i].chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name); for (action¬tion->next; action; action = action->next)
_
Quoted 12 lines · Andrew Morton
Quoted 9 lines · Yanmin
/proc/interruptsshows "<NULL>" for MSI interrupt type name on my ia64 machine.Below patch against 2.6.19-rc5-mm1 fixes it.
Signed-off-by Zhang Yanmin <[email protected]>---
Quoted 14 lines
arch/ia64/kernel/msi_ia64.c static int ia64_msi_retrigger_irq(unsign · line 121
Quoted 11 lines
arch/ia64/kernel/msi_ia64.c +1
-1@@ -115,7 +115,7 @@ static int ia64_msi_retrigger_irq(unsign* Generic ops used on most IA64 platforms. */ static struct irq_chip ia64_msi_chip = { - .name ="PCI-MSI" , + .typename ="PCI-MSI" , .mask = mask_msi_irq, .unmask = unmask_msi_irq, .ack = ia64_ack_msi_irq,I think the bug is that ia64 is printing ->typename, whereas it should be printing ->name:
A couple of other arch also use typename instead of name when printing.
In addition, function irq_chip_set_defaults will let name=typename if name is NULL.
Is it more reasonable to delete typename completely?
Quoted 31 lines
arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)diff -puN
arch/ia64/kernel/iosapic.c~ia64-irqs-use-name-not-typenamearch/ia64/kernel/iosapic.carch/ia64/kernel/iosapic.c renamed from arch/ia64/kernel/iosapic.c~ia64-irqs-use-name-not-typename +1
-1@@ -664,7 +664,7 @@ register_intr (unsigned int gsi, int vecprintk (KERN_WARNING "%s: changing vector %d from %s to %s\n" , __FUNCTION__, vector, - idesc->chip->typename, irq_type->typename); + idesc->chip->name, irq_type->name); idesc->chip = irq_type; }return 0 ;diff -puN
arch/ia64/kernel/irq.c~ia64-irqs-use-name-not-typenamearch/ia64/kernel/irq.carch/ia64/kernel/irq.c renamed from arch/ia64/kernel/irq.c~ia64-irqs-use-name-not-typename +1
-1@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p,seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); }#endif -seq_printf (p," %14s" , irq_desc[i].chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name); for (action¬tion->next; action; action = action->next)_
Quoted 16 lines · Andrew Morton
Quoted 10 lines · Yanmin
/proc/interruptsshows "<NULL>" for MSI interrupt type name on my ia64 machine.Below patch against 2.6.19-rc5-mm1 fixes it.
Signed-off-by Zhang Yanmin <[email protected]>---
---
linux-2.6.19-rc5-mm1/arch/ia64/kernel/msi_ia64.c2006-11-1414:16:12.000000000 +0800
Quoted 1 line
+++
linux-2.6.19-rc5-mm1_fix/arch/ia64/kernel/msi_ia64.c2006-11-1415:08:37.000000000 +0800
Quoted 12 lines
Review static int ia64_msi_retrigger_irq(unsign · line 121
Quoted 9 lines
(quoted diff) +1
-1@@ -115,7 +115,7 @@ static int ia64_msi_retrigger_irq(unsign * Generic ops used on most IA64 platforms. */ static struct irq_chip ia64_msi_chip = { - .name = "PCI-MSI", + .typename = "PCI-MSI", .mask = mask_msi_irq, .unmask = unmask_msi_irq, .ack = ia64_ack_msi_irq,I think the bug is that ia64 is printing ->typename, whereas it should be printing ->name:
Looks right. The basic issue is that the msi code is fully
genirq converted. While the rest of the ia64 code has yet to be updated.
But since irq_chip_set_defaults sets name and typename to be the same I believe this patch is safe.
Eric
Quoted 31 lines
arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)diff -puN
arch/ia64/kernel/iosapic.c~ia64-irqs-use-name-not-typenamearch/ia64/kernel/iosapic.carch/ia64/kernel/iosapic.c renamed from arch/ia64/kernel/iosapic.c~ia64-irqs-use-name-not-typename +1
-1@@ -664,7 +664,7 @@ register_intr (unsigned int gsi, int vecprintk (KERN_WARNING "%s: changing vector %d from %s to %s\n" , __FUNCTION__, vector, - idesc->chip->typename, irq_type->typename); + idesc->chip->name, irq_type->name); idesc->chip = irq_type; }return 0 ;diff -puN
arch/ia64/kernel/irq.c~ia64-irqs-use-name-not-typenamearch/ia64/kernel/irq.carch/ia64/kernel/irq.c renamed from arch/ia64/kernel/irq.c~ia64-irqs-use-name-not-typename +1
-1@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p,seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); }#endif -seq_printf (p," %14s" , irq_desc[i].chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name); for (action¬tion->next; action; action = action->next)_