x86: print real IOAPIC version for x86-64
PATCH 1/1 x86: print real IOAPIC version for x86-64
Fix the fact that the IOAPIC version number in the x86_64 code path always gets assigned to 0, instead of the correct value.
Before the patch: (from "dmesg" output):
ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0])
IOAPIC[0]: apic_id 8, version 0, address 0xfec00000, GSI 0-23 <---
After the patch:
ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0])
IOAPIC[0]: apic_id 8, version 32, address 0xfec00000, GSI 0-23 <---
History:io_apic_get_version() was compiled out of the x86_64 code path in the commit f2c2cca3acef8b253a36381d9b469ad4fb08563a:
*************************
Author: Andi Kleen <[email protected]> Date: Tue Sep 26 10:52:37 2006 +0200
[PATCH] Remove APIC version/cpu capability mpparse checking/printing
ACPI went to great trouble to get the APIC version and CPU capabilities of different CPUs before passing them to the mpparser. But all that data was used was to print it out. Actually it even faked some data based on the boot cpu, not on the actual CPU being booted.
Remove all this code because it's not needed.
*************************
At the time, the IOAPIC version number was deliberately not printed in the x86_64 code path. However, after the x86 and x86_64 files were merged, the net result is that the IOAPIC version is printed incorrectly in the x86_64 code path.
The patch below provides a fix. I have tested it with acpi, and with acpi=off, and did not see any problems.
--- arch/x86/kernel/acpi/boot.c | 5 +---- arch/x86/kernel/apic/io_apic.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
arch/x86/kernel/acpi/boot.c +1 -4
@@ -986,11 +986,8 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)set_fixmap_nocache (FIX_IO_APIC_BASE_0 + idx, address); mp_ioapics[idx].apicid =uniq_ioapic_id (id); -#ifdef CONFIG_X86_32 mp_ioapics[idx].apicver =io_apic_get_version (idx); -#else - mp_ioapics[idx].apicver =0 ; -#endif +/* * Build basic GSI lookup table to facilitate gsi->io_apic lookups * and to prevent reprogramming of IOAPIC pins (PCI GSIs).
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -3980,6 +3980,7 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id) return apic_id; } +#endif int __init io_apic_get_version (int ioapic) {
@@ -3992,7 +3993,6 @@ int __init io_apic_get_version(int ioapic)return reg_01.bits.version; } -#endif int io_apic_set_pci_routing (int ioapic,int pin,int irq,int triggering,int polarity) {
Signature · 1 line
1.6.2.2
Quoted 38 lines · Naga Chumbalkar
Fix the fact that the IOAPIC version number in the
x86_64code path always gets assigned to 0, instead of the correct value.Before the patch: (from "dmesg" output):
ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0]) IOAPIC[0]:apic_id8, version 0, address0xfec00000, GSI 0-23 <---After the patch:
ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0]) IOAPIC[0]:apic_id8, version 32, address0xfec00000, GSI 0-23 <---History:
io_apic_get_version()was compiled out of thex86_64code path in the commitf2c2cca3acef8b253a36381d9b469ad4fb08563a:*************************
Author: Andi Kleen <[email protected]>
Date: Tue Sep 26 10:52:37 2006 +0200[PATCH] Remove APIC version/cpu capability mpparse checking/printing
ACPI went to great trouble to get the APIC version and CPU capabilities of different CPUs before passing them to the mpparser. But all that data was used was to print it out. Actually it even faked some data based on the boot cpu, not on the actual CPU being booted.
Remove all this code because it's not needed.
Signed-off-by Andi Kleen <[email protected]>*************************
At the time, the IOAPIC version number was deliberately not printed in the
x86_64code path. However, after the x86 andx86_64files were merged, the net result is that the IOAPIC version is printed incorrectly in thex86_64code path.
Quoted 5 lines
The patch below provides a fix. I have tested it with acpi, and with acpi=off, and did not see any problems.
Signed-off-by Naga Chumbalkar <[email protected]>Cc Yinghai Lu <[email protected]>
[tip:irq/numa] x86: Print real IOAPIC version for x86-64
In reply to Naga ChumbalkarCommit-ID: 58f892e022e88438183c48661dcdc6a2997dab99 Gitweb: http://git.kernel.org/tip/58f892e022e88438183c48661dcdc6a2997dab99 Author: Naga Chumbalkar <[email protected]> AuthorDate: Tue, 26 May 2009 21:48:07 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 2 Jun 2009 02:03:18 +0200
x86: Print real IOAPIC version for x86-64
Fix the fact that the IOAPIC version number in the x86_64 code path always gets assigned to 0, instead of the correct value.
Before the patch: (from "dmesg" output):
ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0])
IOAPIC[0]: apic_id 8, version 0, address 0xfec00000, GSI 0-23 <---
After the patch:
ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0])
IOAPIC[0]: apic_id 8, version 32, address 0xfec00000, GSI 0-23 <---
History:
io_apic_get_version() was compiled out of the x86_64 code path in the commit f2c2cca3acef8b253a36381d9b469ad4fb08563a:
Author: Andi Kleen <[email protected]> Date: Tue Sep 26 10:52:37 2006 +0200
[PATCH] Remove APIC version/cpu capability mpparse checking/printing
ACPI went to great trouble to get the APIC version and CPU capabilities of different CPUs before passing them to the mpparser. But all that data was used was to print it out. Actually it even faked some data based on the boot cpu, not on the actual CPU being booted.
Remove all this code because it's not needed.
At the time, the IOAPIC version number was deliberately not printed in the x86_64 code path. However, after the x86 and x86_64 files were merged, the net result is that the IOAPIC version is printed incorrectly in the x86_64 code path.
The patch below provides a fix. I have tested it with acpi, and with acpi=off, and did not see any problems.
LKML-Reference: <[email protected]>
*************************
--- arch/x86/kernel/acpi/boot.c | 5 +---- arch/x86/kernel/apic/io_apic.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
arch/x86/kernel/acpi/boot.c +1 -4
@@ -985,11 +985,8 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)set_fixmap_nocache (FIX_IO_APIC_BASE_0 + idx, address); mp_ioapics[idx].apicid =uniq_ioapic_id (id); -#ifdef CONFIG_X86_32 mp_ioapics[idx].apicver =io_apic_get_version (idx); -#else - mp_ioapics[idx].apicver =0 ; -#endif +/* * Build basic GSI lookup table to facilitate gsi->io_apic lookups * and to prevent reprogramming of IOAPIC pins (PCI GSIs).
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -4012,6 +4012,7 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id) return apic_id; } +#endif int __init io_apic_get_version (int ioapic) {
@@ -4024,7 +4025,6 @@ int __init io_apic_get_version(int ioapic)return reg_01.bits.version; } -#endif int acpi_get_override_irq (int bus_irq,int *trigger,int *polarity) {