diff options
author | Wanpeng Li <wanpeng.li@hotmail.com> | 2016-08-23 20:07:19 +0800 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-20 01:01:35 +0000 |
commit | fd9828ed90bd74ce1a48032a0eb696e4cf888a52 (patch) | |
tree | ac19ba131ef804cabb142cf74814fd4a178c802a /arch | |
parent | 18fffaf50400fc5fabf95c4888729236c819f16e (diff) |
x86/apic: Do not init irq remapping if ioapic is disabled
commit 2e63ad4bd5dd583871e6602f9d398b9322d358d9 upstream.
native_smp_prepare_cpus
-> default_setup_apic_routing
-> enable_IR_x2apic
-> irq_remapping_prepare
-> intel_prepare_irq_remapping
-> intel_setup_irq_remapping
So IR table is setup even if "noapic" boot parameter is added. As a result we
crash later when the interrupt affinity is set due to a half initialized
remapping infrastructure.
Prevent remap initialization when IOAPIC is disabled.
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Joerg Roedel <joro@8bytes.org>
Link: http://lkml.kernel.org/r/1471954039-3942-1-git-send-email-wanpeng.li@hotmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 838a3b40a4b0..8fcd92e9589b 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1481,6 +1481,9 @@ void __init enable_IR_x2apic(void) int ret, x2apic_enabled = 0; int dmar_table_init_ret; + if (skip_ioapic_setup) + return; + dmar_table_init_ret = dmar_table_init(); if (dmar_table_init_ret && !x2apic_supported()) return; |