[PATCH 1/2] irq_domain: correct the debugfs file name

[PATCH 1/2] irq_domain: correct the debugfs file name

[Mika Westerberg]

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

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 kernel/irq/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
index cf1a4a6..d1a758b 100644
--- a/kernel/irq/Kconfig
+++ b/kernel/irq/Kconfig
@@ -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.
 
-- 
1.7.9.1

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

[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
...

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

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 kernel/irq/irqdomain.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 3601f3f..d350c72 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -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;
-- 
1.7.9.1

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

[Grant Likely]

On Tue, 10 Apr 2012 15:25:43 +0300, Mika Westerberg <mika.westerberg@linux.intel.com> wrote:
> 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.
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Applied, thanks.

g.

> ---
>  kernel/irq/irqdomain.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
> index 3601f3f..d350c72 100644
> --- a/kernel/irq/irqdomain.c
> +++ b/kernel/irq/irqdomain.c
> @@ -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;
> -- 
> 1.7.9.1
> 

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.

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

[Grant Likely]

On Tue, 10 Apr 2012 17:27:08 -0600, Grant Likely <grant.likely@secretlab.ca> wrote:
> On Tue, 10 Apr 2012 15:25:43 +0300, Mika Westerberg <mika.westerberg@linux.intel.com> wrote:
> > 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.
> > 
> > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> 
> 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.

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

[Mika Westerberg]

On Tue, Apr 10, 2012 at 11:47:28PM -0600, Grant Likely wrote:
> 
> 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.

Re: [PATCH 1/2] irq_domain: correct the debugfs file name

[Grant Likely]

On Tue, 10 Apr 2012 15:25:42 +0300, Mika Westerberg <mika.westerberg@linux.intel.com> wrote:
> The actual name of the irq_domain mapping debugfs file is
> "irq_domain_mapping" not "virq_mapping".
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Applied, thanks

.g

> ---
>  kernel/irq/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
> index cf1a4a6..d1a758b 100644
> --- a/kernel/irq/Kconfig
> +++ b/kernel/irq/Kconfig
> @@ -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.
>  
> -- 
> 1.7.9.1
> 

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.