[PATCH] x86/ioapic: Correctly print IRTE's index field when enabling INTR

[PATCH] x86/ioapic: Correctly print IRTE's index field when enabling INTR

[raymond pang]

When enabling interrupt remap, IOAPIC's RTE contains interrupt_index
field of IRTE. And this field is composed of index and index2 member of
struct IR_IO_APIC_route_entry. Make io_apic_print_entries() correctly
print interrupt index field.

Signed-off-by: Raymond Pang <raymondpangxd@gmail.com>
---
 arch/x86/kernel/apic/io_apic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 237e9c2..70e48aa 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1243,7 +1243,7 @@ static void io_apic_print_entries(unsigned int
apic, unsigned int nr_entries)
     entry.vector, entry.irr, entry.delivery_status);
   if (ir_entry->format)
    printk(KERN_DEBUG "%s, remapped, I(%04X),  Z(%X)\n",
-          buf, (ir_entry->index << 15) | ir_entry->index,
+          buf, (ir_entry->index2 << 15) | ir_entry->index,
           ir_entry->zero);
   else
    printk(KERN_DEBUG "%s, %s, D(%02X), M(%1d)\n",
-- 
1.9.1

Re: [PATCH] x86/ioapic: Correctly print IRTE's index field when enabling INTR

[Ingo Molnar]

* raymond pang <raymondpangxd@gmail.com> wrote:

> When enabling interrupt remap, IOAPIC's RTE contains interrupt_index
> field of IRTE. And this field is composed of index and index2 member of
> struct IR_IO_APIC_route_entry. Make io_apic_print_entries() correctly
> print interrupt index field.
> 
> Signed-off-by: Raymond Pang <raymondpangxd@gmail.com>
> ---
>  arch/x86/kernel/apic/io_apic.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> index 237e9c2..70e48aa 100644
> --- a/arch/x86/kernel/apic/io_apic.c
> +++ b/arch/x86/kernel/apic/io_apic.c
> @@ -1243,7 +1243,7 @@ static void io_apic_print_entries(unsigned int
> apic, unsigned int nr_entries)
>      entry.vector, entry.irr, entry.delivery_status);
>    if (ir_entry->format)
>     printk(KERN_DEBUG "%s, remapped, I(%04X),  Z(%X)\n",
> -          buf, (ir_entry->index << 15) | ir_entry->index,
> +          buf, (ir_entry->index2 << 15) | ir_entry->index,
>            ir_entry->zero);
>    else
>     printk(KERN_DEBUG "%s, %s, D(%02X), M(%1d)\n",

Applied.

[ Note that your patch was whitespace damaged (all tabs were converted to spaces), 
  I fixed that up manually. It's a pain to keep some mailers from doing that, see
  Documentation/process/email-clients.rst for best practices. ]

Thanks,

	Ingo

[tip:x86/apic] x86/ioapic: Print the IRTE's index field correctly when enabling INTR

[tip-bot for raymond pang]

Commit-ID:  adfaf18334cbf16c563e4ebc67e968ea1b17ec51
Gitweb:     http://git.kernel.org/tip/adfaf18334cbf16c563e4ebc67e968ea1b17ec51
Author:     raymond pang <raymondpangxd@gmail.com>
AuthorDate: Tue, 22 Aug 2017 23:44:47 +0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 23 Aug 2017 10:17:17 +0200

x86/ioapic: Print the IRTE's index field correctly when enabling INTR

When enabling interrupt remap, IOAPIC's RTE contains the interrupt_index
field of IRTE. This field is composed of the ->index and the ->index2 members
of 'struct IR_IO_APIC_route_entry' - but what we print out currently only
uses ->index.

Fix it.

Signed-off-by: Raymond Pang <raymondpangxd@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: joro@8bytes.org
Cc: linux-arch@vger.kernel.org
Link: http://lkml.kernel.org/r/CAHG4imNDzpDyOVi7MByVrLQ%3DQFuOVqpzJ5F-Xs5z6OZphubj-Q@mail.gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/apic/io_apic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 237e9c2..70e48aa 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1243,7 +1243,7 @@ static void io_apic_print_entries(unsigned int apic, unsigned int nr_entries)
 			 entry.vector, entry.irr, entry.delivery_status);
 		if (ir_entry->format)
 			printk(KERN_DEBUG "%s, remapped, I(%04X),  Z(%X)\n",
-			       buf, (ir_entry->index << 15) | ir_entry->index,
+			       buf, (ir_entry->index2 << 15) | ir_entry->index,
 			       ir_entry->zero);
 		else
 			printk(KERN_DEBUG "%s, %s, D(%02X), M(%1d)\n",