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>
Signed-off-by: Willy Tarreau <w@1wt.eu>

This commit is contained in:

Wanpeng Li

2016-08-23 20:07:19 +08:00

committed by

Willy Tarreau

parent b591901eb8

commit 928a27752e

1 changed files with 3 additions and 0 deletions

									
										arch/x86/kernel/apic/apic.c
									
		+3
		
												View File
												
				@@ -1581,6 +1581,9 @@ void __init enable_IR_x2apic(void)

					int ret, x2apic_enabled = 0;

					int hardware_init_ret;

					if (skip_ioapic_setup)

						return;

					/* Make sure irq_remap_ops are initialized */

					setup_irq_remapping_ops();