* [PATCH 1/2] x86: Format clean up for IOAPIC output
@ 2011-07-08 18:46 Naga Chumbalkar
2011-07-08 18:46 ` [PATCH 2/2] x86: Print Dest Field also Naga Chumbalkar
2011-07-11 18:58 ` [tip:x86/apic] x86, ioapic: Format clean up for IOAPIC output tip-bot for Naga Chumbalkar
0 siblings, 2 replies; 4+ messages in thread
From: Naga Chumbalkar @ 2011-07-08 18:46 UTC (permalink / raw)
To: x86; +Cc: Naga Chumbalkar, mingo, tglx, linux-kernel, hpa
When IOAPIC data is displayed in "dmesg" with the help of the boot parameter
"apic=debug" certain values are not formatted correctly wrt their size.
In the "dmesg" snippet below, note that the output for "max redirection entries",
and "IO APIC version" which are each defined to be just 8-bits long are displayed
as 2 bytes in length. Similarly, "Dst" under the "IRQ redirection table"
should only be 8-bits long.
IO APIC #0......
...
...
.... register #01: 00170020
....... : max redirection entries: 0017
....... : PRQ implemented: 0
....... : IO APIC version: 0020
...
...
.... IRQ redirection table:
NR Dst Mask Trig IRR Pol Stat Dmod Deli Vect:
00 000 1 0 0 0 0 0 0 00
01 000 0 0 0 0 0 0 0 31
02 000 0 0 0 0 0 0 0 30
03 000 1 0 0 0 0 0 0 33
...
...
Do some formatting clean up, so you will see output like below:
IO APIC #0......
...
...
.... register #01: 00170020
....... : max redirection entries: 17
....... : PRQ implemented: 0
....... : IO APIC version: 20
...
...
.... IRQ redirection table:
NR Dst Mask Trig IRR Pol Stat Dmod Deli Vect:
00 00 1 0 0 0 0 0 0 00
01 00 0 0 0 0 0 0 0 31
02 00 0 0 0 0 0 0 0 30
03 00 1 0 0 0 0 0 0 33
...
...
Signed-off-by: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
---
arch/x86/kernel/apic/io_apic.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 98c8d7e..ed4abaa 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1522,10 +1522,12 @@ __apicdebuginit(void) print_IO_APIC(void)
printk(KERN_DEBUG "....... : LTS : %X\n", reg_00.bits.LTS);
printk(KERN_DEBUG ".... register #01: %08X\n", *(int *)®_01);
- printk(KERN_DEBUG "....... : max redirection entries: %04X\n", reg_01.bits.entries);
+ printk(KERN_DEBUG "....... : max redirection entries: %02X\n",
+ reg_01.bits.entries);
printk(KERN_DEBUG "....... : PRQ implemented: %X\n", reg_01.bits.PRQ);
- printk(KERN_DEBUG "....... : IO APIC version: %04X\n", reg_01.bits.version);
+ printk(KERN_DEBUG "....... : IO APIC version: %02X\n",
+ reg_01.bits.version);
/*
* Some Intel chipsets with IO APIC VERSION of 0x1? don't have reg_02,
@@ -1558,7 +1560,7 @@ __apicdebuginit(void) print_IO_APIC(void)
entry = ioapic_read_entry(apic, i);
- printk(KERN_DEBUG " %02x %03X ",
+ printk(KERN_DEBUG " %02x %02X ",
i,
entry.dest
);
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] x86: Print Dest Field also
2011-07-08 18:46 [PATCH 1/2] x86: Format clean up for IOAPIC output Naga Chumbalkar
@ 2011-07-08 18:46 ` Naga Chumbalkar
2011-07-11 18:58 ` [tip:x86/apic] x86, ioapic: Also print Dest field tip-bot for Naga Chumbalkar
2011-07-11 18:58 ` [tip:x86/apic] x86, ioapic: Format clean up for IOAPIC output tip-bot for Naga Chumbalkar
1 sibling, 1 reply; 4+ messages in thread
From: Naga Chumbalkar @ 2011-07-08 18:46 UTC (permalink / raw)
To: x86; +Cc: Naga Chumbalkar, hpa, tglx, mingo, linux-kernel
The code in setup_ioapic_irq() determines the Destination Field, so why not also
include it in the debug printk output that gets displayed when the boot parameter
"apic=debug" is used.
Before the fix, "dmesg" will show:
IOAPIC[0]: Set routing entry (8-1 -> 0x31 -> IRQ 1 Mode:0 Active:0)
IOAPIC[0]: Set routing entry (8-2 -> 0x30 -> IRQ 0 Mode:0 Active:0)
IOAPIC[0]: Set routing entry (8-3 -> 0x33 -> IRQ 3 Mode:0 Active:0)
...
After the fix, you will see:
IOAPIC[0]: Set routing entry (8-1 -> 0x31 -> IRQ 1 Mode:0 Active:0 Dest:0)
IOAPIC[0]: Set routing entry (8-2 -> 0x30 -> IRQ 0 Mode:0 Active:0 Dest:0)
IOAPIC[0]: Set routing entry (8-3 -> 0x33 -> IRQ 3 Mode:0 Active:0 Dest:0)
...
Signed-off-by: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
---
arch/x86/kernel/apic/io_apic.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index ed4abaa..5cba200 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1337,9 +1337,9 @@ static void setup_ioapic_irq(int apic_id, int pin, unsigned int irq,
apic_printk(APIC_VERBOSE,KERN_DEBUG
"IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> "
- "IRQ %d Mode:%i Active:%i)\n",
+ "IRQ %d Mode:%i Active:%i Dest:%d)\n",
apic_id, mpc_ioapic_id(apic_id), pin, cfg->vector,
- irq, trigger, polarity);
+ irq, trigger, polarity, dest);
if (setup_ioapic_entry(mpc_ioapic_id(apic_id), irq, &entry,
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:x86/apic] x86, ioapic: Also print Dest field
2011-07-08 18:46 ` [PATCH 2/2] x86: Print Dest Field also Naga Chumbalkar
@ 2011-07-11 18:58 ` tip-bot for Naga Chumbalkar
0 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Naga Chumbalkar @ 2011-07-11 18:58 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, nagananda.chumbalkar, tglx, mingo
Commit-ID: 7fece83235a59b15d75d6c8ef2225c24abd4505b
Gitweb: http://git.kernel.org/tip/7fece83235a59b15d75d6c8ef2225c24abd4505b
Author: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
AuthorDate: Fri, 8 Jul 2011 18:46:42 +0000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 11 Jul 2011 16:31:05 +0200
x86, ioapic: Also print Dest field
The code in setup_ioapic_irq() determines the Destination Field,
so why not also include it in the debug printk output that gets
displayed when the boot parameter "apic=debug" is used.
Before the change, "dmesg" will show:
IOAPIC[0]: Set routing entry (8-1 -> 0x31 -> IRQ 1 Mode:0 Active:0)
IOAPIC[0]: Set routing entry (8-2 -> 0x30 -> IRQ 0 Mode:0 Active:0)
IOAPIC[0]: Set routing entry (8-3 -> 0x33 -> IRQ 3 Mode:0 Active:0) ...
After the change, you will see:
IOAPIC[0]: Set routing entry (8-1 -> 0x31 -> IRQ 1 Mode:0 Active:0 Dest:0)
IOAPIC[0]: Set routing entry (8-2 -> 0x30 -> IRQ 0 Mode:0 Active:0 Dest:0)
IOAPIC[0]: Set routing entry (8-3 -> 0x33 -> IRQ 3 Mode:0 Active:0 Dest:0) ...
Signed-off-by: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
Link: http://lkml.kernel.org/r/20110708184603.2734.91071.sendpatchset@nchumbalkar.americas.cpqcorp.net
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/apic/io_apic.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index ed4abaa..5cba200 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1337,9 +1337,9 @@ static void setup_ioapic_irq(int apic_id, int pin, unsigned int irq,
apic_printk(APIC_VERBOSE,KERN_DEBUG
"IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> "
- "IRQ %d Mode:%i Active:%i)\n",
+ "IRQ %d Mode:%i Active:%i Dest:%d)\n",
apic_id, mpc_ioapic_id(apic_id), pin, cfg->vector,
- irq, trigger, polarity);
+ irq, trigger, polarity, dest);
if (setup_ioapic_entry(mpc_ioapic_id(apic_id), irq, &entry,
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:x86/apic] x86, ioapic: Format clean up for IOAPIC output
2011-07-08 18:46 [PATCH 1/2] x86: Format clean up for IOAPIC output Naga Chumbalkar
2011-07-08 18:46 ` [PATCH 2/2] x86: Print Dest Field also Naga Chumbalkar
@ 2011-07-11 18:58 ` tip-bot for Naga Chumbalkar
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Naga Chumbalkar @ 2011-07-11 18:58 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, nagananda.chumbalkar, tglx, mingo
Commit-ID: bd6a46e087571897f0b2736917500b97d18dac13
Gitweb: http://git.kernel.org/tip/bd6a46e087571897f0b2736917500b97d18dac13
Author: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
AuthorDate: Fri, 8 Jul 2011 18:46:36 +0000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 11 Jul 2011 16:31:05 +0200
x86, ioapic: Format clean up for IOAPIC output
When IOAPIC data is displayed in "dmesg" with the help of the
boot parameter "apic=debug" certain values are not formatted
correctly wrt their size.
In the "dmesg" snippet below, note that the output for "max
redirection entries", and "IO APIC version" which are each
defined to be just 8-bits long are displayed as 2 bytes in
length. Similarly, "Dst" under the "IRQ redirection table"
should only be 8-bits long.
IO APIC #0......
...
...
.... register #01: 00170020
....... : max redirection entries: 0017
....... : PRQ implemented: 0
....... : IO APIC version: 0020
...
...
.... IRQ redirection table:
NR Dst Mask Trig IRR Pol Stat Dmod Deli Vect:
00 000 1 0 0 0 0 0 0 00
01 000 0 0 0 0 0 0 0 31
02 000 0 0 0 0 0 0 0 30
03 000 1 0 0 0 0 0 0 33
...
...
Do some formatting clean up, so you will see output like below:
IO APIC #0......
...
...
.... register #01: 00170020
....... : max redirection entries: 17
....... : PRQ implemented: 0
....... : IO APIC version: 20
...
...
.... IRQ redirection table:
NR Dst Mask Trig IRR Pol Stat Dmod Deli Vect:
00 00 1 0 0 0 0 0 0 00
01 00 0 0 0 0 0 0 0 31
02 00 0 0 0 0 0 0 0 30
03 00 1 0 0 0 0 0 0 33
...
...
Signed-off-by: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
Link: http://lkml.kernel.org/r/20110708184557.2734.61830.sendpatchset@nchumbalkar.americas.cpqcorp.net
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/apic/io_apic.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 98c8d7e..ed4abaa 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1522,10 +1522,12 @@ __apicdebuginit(void) print_IO_APIC(void)
printk(KERN_DEBUG "....... : LTS : %X\n", reg_00.bits.LTS);
printk(KERN_DEBUG ".... register #01: %08X\n", *(int *)®_01);
- printk(KERN_DEBUG "....... : max redirection entries: %04X\n", reg_01.bits.entries);
+ printk(KERN_DEBUG "....... : max redirection entries: %02X\n",
+ reg_01.bits.entries);
printk(KERN_DEBUG "....... : PRQ implemented: %X\n", reg_01.bits.PRQ);
- printk(KERN_DEBUG "....... : IO APIC version: %04X\n", reg_01.bits.version);
+ printk(KERN_DEBUG "....... : IO APIC version: %02X\n",
+ reg_01.bits.version);
/*
* Some Intel chipsets with IO APIC VERSION of 0x1? don't have reg_02,
@@ -1558,7 +1560,7 @@ __apicdebuginit(void) print_IO_APIC(void)
entry = ioapic_read_entry(apic, i);
- printk(KERN_DEBUG " %02x %03X ",
+ printk(KERN_DEBUG " %02x %02X ",
i,
entry.dest
);
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-11 18:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-08 18:46 [PATCH 1/2] x86: Format clean up for IOAPIC output Naga Chumbalkar
2011-07-08 18:46 ` [PATCH 2/2] x86: Print Dest Field also Naga Chumbalkar
2011-07-11 18:58 ` [tip:x86/apic] x86, ioapic: Also print Dest field tip-bot for Naga Chumbalkar
2011-07-11 18:58 ` [tip:x86/apic] x86, ioapic: Format clean up for IOAPIC output tip-bot for Naga Chumbalkar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.