x86/apic: Do not init irq remapping if ioapic is disabled
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 Cc: stable@vger.kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
fa8410b355
commit
2e63ad4bd5
|
@ -1623,6 +1623,9 @@ void __init enable_IR_x2apic(void)
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int ret, ir_stat;
|
int ret, ir_stat;
|
||||||
|
|
||||||
|
if (skip_ioapic_setup)
|
||||||
|
return;
|
||||||
|
|
||||||
ir_stat = irq_remapping_prepare();
|
ir_stat = irq_remapping_prepare();
|
||||||
if (ir_stat < 0 && !x2apic_supported())
|
if (ir_stat < 0 && !x2apic_supported())
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue