lkml.org 
[lkml]   [2016]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 062/119] x86/apic: Do not init irq remapping if ioapic is disabled
    Date
    From: Wanpeng Li <wanpeng.li@hotmail.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/x86/kernel/apic/apic.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
    index 5c2742b75be1..4abec3858209 100644
    --- a/arch/x86/kernel/apic/apic.c
    +++ b/arch/x86/kernel/apic/apic.c
    @@ -1600,6 +1600,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();

    --
    2.10.0
    \
     
     \ /
      Last update: 2016-09-29 12:30    [W:2.215 / U:1.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site