x86, apic: Mask IO-APIC and PIC unconditionally on LAPIC resume

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 <joro@8bytes.org>
Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

1 files changed, 9 insertions, 10 deletions

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 8d741e65ff64..a5b4dce1b7ac 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2266,16 +2266,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();