3.2.84-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Wanpeng Li <[email protected]> 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 <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Joerg Roedel <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <[email protected]> --- arch/x86/kernel/apic/apic.c | 3 +++ 1 file changed, 3 insertions(+) --- 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;
