Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 336224ba authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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: default avatarJoerg Roedel <joro@8bytes.org>
Acked-by: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 70733e0c

arch/x86/kernel/apic/apic.c

+9 −10
Original line number Diff line number Diff line
@@ -2266,7 +2266,7 @@ 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
@@ -2275,7 +2275,6 @@ static void lapic_resume(void) 
	 */

	mask_ioapic_entries();

	legacy_pic->mask_all();

	}



	if (x2apic_mode)

		enable_x2apic();