]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
x86/apic: Clear stale x2apic mode
authorThomas Gleixner <tglx@linutronix.de>
Wed, 14 Jan 2015 17:31:33 +0000 (18:31 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 15 Jan 2015 10:24:22 +0000 (11:24 +0100)
commitf7ccadac2d3fe373d14a5917c86c499770ebbffc
tree0af9fc8a597e065f05cb6b3ebd17e7516bb12296
parente3a981d61d156c1a9ea0aac253d2d3f33c081906
x86/apic: Clear stale x2apic mode

If x2apic got disabled on the kernel command line, then the following
issue can happen:

enable_IR_x2apic()
   ....
   x2apic_mode = 1;
   enable_x2apic();

     if (x2apic_disabled) {
__disable_x2apic();
return;
     }

That leaves X2APIC disabled in hardware, but x2apic_mode stays 1. So
all other code which checks x2apic_mode gets the wrong information.

Set x2apic_mode to 0 after disabling it in hardware.

This is just a hotfix. The proper solution is to rework this code so
it has seperate functions for the initial setup on the boot processor
and the secondary cpus, but that's beyond the scope of this fix.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: iommu@lists.linux-foundation.org
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Rientjes <rientjes@google.com>
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Oren Twaig <oren@scalemp.com>
arch/x86/kernel/apic/apic.c