Skip to contentSkip to conversation

irq_domain: correct the debugfs file name

PATCH Applied Mika Westerberg 2 participants 6 messages Apr 10, 2012 – Apr 11, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 irq_domain: correct the debugfs file name

The actual name of the irq_domain mapping debugfs file is "irq_domain_mapping" not "virq_mapping".

---
 kernel/irq/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/irq/Kconfig +1 -1
index cf1a4a6..d1a758b 100644
@@ -62,7 +62,7 @@ config IRQ_DOMAIN_DEBUG
 	help
 	  This option will show the mapping relationship between hardware irq
 	  numbers and Linux irq numbers. The mapping is exposed via debugfs
-	  in the file "virq_mapping".
+	  in the file "irq_domain_mapping".
 
 	  If you don't know what this means you don't need it.
 
Signature · 1 line
1.7.9.1
#1 lore raw

PATCH 2/2 irq_domain: fix formatting of chip data pointer in virq_debug_show()

On 32-bit machines reading the /sys/kernel/debug/irq_domain_mapping file outputs following:

virq   hwirq    chip name        chip data           domain name
    9  0x00000  IO-APIC          0x        c175a0f8  none
   10  0x00000  IO-APIC          0x        c175a108  none
   11  0x00000  IO-APIC          0x        c175a118  none

...

which looks a bit funny. Fix that with filling the gap with zeroes instead of spaces.

---
 kernel/irq/irqdomain.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/irq/irqdomain.c +1 -1
index 3601f3f..d350c72 100644
@@ -666,7 +666,7 @@ static int virq_debug_show(struct seq_file *m, void *private)
 			seq_printf(m, "%-15s  ", p);
 
 			data = irq_desc_get_chip_data(desc);
-			seq_printf(m, "0x%16p  ", data);
+			seq_printf(m, "0x%016lx  ", (unsigned long)data);
 
 			if (desc->irq_data.domain && desc->irq_data.domain->of_node)
 				p = desc->irq_data.domain->of_node->full_name;
Signature · 1 line
1.7.9.1
Applied
#2 lore raw

Re: [PATCH 2/2] irq_domain: fix formatting of chip data pointer in virq_debug_show()

Quoted 7 lines · Mika Westerberg

On 32-bit machines reading the /sys/kernel/debug/irq_domain_mapping file outputs following:

virq   hwirq    chip name        chip data           domain name
    9  0x00000  IO-APIC          0x        c175a0f8  none
   10  0x00000  IO-APIC          0x        c175a108  none
   11  0x00000  IO-APIC          0x        c175a118  none
Quoted 6 lines

...

which looks a bit funny. Fix that with filling the gap with zeroes instead of spaces.

Applied, thanks.

g.

Quoted 20 lines
---
 kernel/irq/irqdomain.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/irq/irqdomain.c +1 -1
index 3601f3f..d350c72 100644
@@ -666,7 +666,7 @@ static int virq_debug_show(struct seq_file *m, void *private)
 			seq_printf(m, "%-15s  ", p);
 
 			data = irq_desc_get_chip_data(desc);
-			seq_printf(m, "0x%16p  ", data);
+			seq_printf(m, "0x%016lx  ", (unsigned long)data);
 
 			if (desc->irq_data.domain && desc->irq_data.domain->of_node)
 				p = desc->irq_data.domain->of_node->full_name;
Signature · 1 line
1.7.9.1
Signature · 2 lines
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.
#3 lore raw

Re: [PATCH 2/2] irq_domain: fix formatting of chip data pointer in virq_debug_show()

Quoted 10 lines · Grant Likely
Quoted 9 lines · Mika Westerberg

On 32-bit machines reading the /sys/kernel/debug/irq_domain_mapping file outputs following:

virq   hwirq    chip name        chip data           domain name
    9  0x00000  IO-APIC          0x        c175a0f8  none
   10  0x00000  IO-APIC          0x        c175a108  none
   11  0x00000  IO-APIC          0x        c175a118  none

...

Quoted 6 lines
Quoted 4 lines

which looks a bit funny. Fix that with filling the gap with zeroes instead of spaces.

Applied, thanks.

I've dropped this one again. There is actually an easier way to achieve the same result. By dropping the precision entirely from the format string the output will always get 0 extended. I'll post an alternate patch soon.

g.

#4 lore raw

Re: [PATCH 2/2] irq_domain: fix formatting of chip data pointer in virq_debug_show()

Quoted 5 lines · Grant Likely

I've dropped this one again. There is actually an easier way to achieve the same result. By dropping the precision entirely from the format string the output will always get 0 extended. I'll post an alternate patch soon.

Yeah, that sounds simpler as well. Thanks for fixing it.

Applied
#5 lore raw
In reply to Mika Westerberg
Quoted 4 lines · Mika Westerberg

The actual name of the irq_domain mapping debugfs file is "irq_domain_mapping" not "virq_mapping".

Applied, thanks

.g

Quoted 20 lines
---
 kernel/irq/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/irq/Kconfig +1 -1
index cf1a4a6..d1a758b 100644
@@ -62,7 +62,7 @@ config IRQ_DOMAIN_DEBUG
 	help
 	  This option will show the mapping relationship between hardware irq
 	  numbers and Linux irq numbers. The mapping is exposed via debugfs
-	  in the file "virq_mapping".
+	  in the file "irq_domain_mapping".
 
 	  If you don't know what this means you don't need it.
 
Signature · 1 line
1.7.9.1
Signature · 2 lines
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.