lkml.org 
[lkml]   [2012]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/19] [RFC] x86, apic: Mask IO-APIC and PIC unconditionally on LAPIC resume
    Date
    IO-APIC and PIC use the same resume routines when IRQ
    remapping is enabled or disabled. So it should be safe to
    mask the other APICs for the IRQ-remapping-disabled case
    too.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kernel/apic/apic.c | 19 +++++++++----------
    1 file changed, 9 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
    index 41681b3..109380a 100644
    --- a/arch/x86/kernel/apic/apic.c
    +++ b/arch/x86/kernel/apic/apic.c
    @@ -2233,16 +2233,15 @@ static void lapic_resume(void)
    return;

    local_irq_save(flags);
    - if (irq_remapping_enabled) {
    - /*
    - * IO-APIC and PIC have their own resume routines.
    - * We just mask them here to make sure the interrupt
    - * subsystem is completely quiet while we enable x2apic
    - * and interrupt-remapping.
    - */
    - mask_ioapic_entries();
    - legacy_pic->mask_all();
    - }
    +
    + /*
    + * IO-APIC and PIC have their own resume routines.
    + * We just mask them here to make sure the interrupt
    + * subsystem is completely quiet while we enable x2apic
    + * and interrupt-remapping.
    + */
    + mask_ioapic_entries();
    + legacy_pic->mask_all();

    if (x2apic_mode)
    enable_x2apic();
    --
    1.7.9.5



    \
     
     \ /
      Last update: 2012-08-20 16:41    [W:4.448 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site