Commit 00e7977d authored by Daniel J Blueman's avatar Daniel J Blueman Committed by Thomas Gleixner
Browse files

x86: numachip: Fix 16-bit APIC ID truncation



Prevent 16-bit APIC IDs being truncated by using correct mask. This fixes
booting large systems, where the wrong core would receive the startup and
init IPIs, causing hanging.

Signed-off-by: default avatarDaniel J Blueman <daniel@numascale.com>
Cc: Steffen Persvold <sp@numascale.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/1415089784-28779-1-git-send-email-daniel@numascale.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 0df1f248
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static unsigned int get_apic_id(unsigned long x)
	unsigned int id;

	rdmsrl(MSR_FAM10H_NODE_ID, value);
	id = ((x >> 24) & 0xffU) | ((value << 2) & 0x3f00U);
	id = ((x >> 24) & 0xffU) | ((value << 2) & 0xff00U);

	return id;
}