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

Commit 1d2c867c authored by Russ Anderson's avatar Russ Anderson Committed by H. Peter Anvin
Browse files

x86, uv: Ensure hub revision set for all ACPI modes. 



Ensure that UV hub revision is set for all ACPI modes.

Signed-off-by: default avatarRuss Anderson <rja@sgi.com>
LKML-Reference: <20100115180908.GB7757@sgi.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 7a1110e8

arch/x86/kernel/apic/x2apic_uv_x.c

+4 −1
Original line number Diff line number Diff line
@@ -66,7 +66,10 @@ static int early_get_nodeid(void) 


static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)

{

	int nodeid;



	if (!strcmp(oem_id, "SGI")) {

		nodeid = early_get_nodeid();

		x86_platform.is_untracked_pat_range =  uv_is_untracked_pat_range;

		if (!strcmp(oem_table_id, "UVL"))

			uv_system_type = UV_LEGACY_APIC;
@@ -74,7 +77,7 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) 
			uv_system_type = UV_X2APIC;

		else if (!strcmp(oem_table_id, "UVH")) {

			__get_cpu_var(x2apic_extra_bits) =

				early_get_nodeid() << (UV_APIC_PNODE_SHIFT - 1);

				nodeid << (UV_APIC_PNODE_SHIFT - 1);

			uv_system_type = UV_NON_UNIQUE_APIC;

			return 1;

		}