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

Commit 1912c7af authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

x86/apic/uv: Update the UV APIC HUB check 



Update the check for UV2000/3000.  Note when the HUB is not recognized.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarHedi Berriche <hedi@sgi.com>
Acked-by: default avatarDimitri Sivanich <sivanich@sgi.com>
Link: http://lkml.kernel.org/r/20150409182629.267239403@asylum.americas.sgi.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 379b97e2

arch/x86/kernel/apic/x2apic_uv_x.c

+7 −3
Original line number Diff line number Diff line
@@ -881,10 +881,14 @@ void __init uv_system_init(void) 
	unsigned long mmr_base, present, paddr;

	unsigned short pnode_mask;

	unsigned char n_lshift;

	char *hub = (is_uv1_hub() ? "UV1" :

		    (is_uv2_hub() ? "UV2" :

				    "UV3"));

	char *hub = (is_uv1_hub() ? "UV100/1000" :

		    (is_uv2_hub() ? "UV2000/3000" :

		    (is_uv3_hub() ? "UV300" : NULL)));



	if (!hub) {

		pr_err("UV: Unknown/unsupported UV hub\n");

		return;

	}

	pr_info("UV: Found %s hub\n", hub);

	map_low_mmrs();