Commit f8ac6343 authored Nov 04, 2014 by Daniel J Blueman Committed by Sasha Levin Mar 28, 2015

x86: numachip: Fix 16-bit APIC ID truncation



[ Upstream commit 00e7977dd1bbd46e336d7ef907d0fb6b6a4c294f ]

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: Daniel 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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent ad927769

arch/x86/kernel/apic/apic_numachip.c

+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;
		}