x86, uv: More Westmere support on SGI UV
Subsystems (2)
PATCH 1/1 x86, uv: More Westmere support on SGI UV
x86, uv: More Westmere support on SGI UV
Enable Westmere support on all apic modes on SGI UV.
Signed-off-by Russ Anderson <[email protected]>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +3 -4
@@ -71,7 +71,7 @@ static int early_get_nodeid(void)return node_id.s.node_id; } -static int __init early_get_apic_pnode_shift (void ) +static void __init early_get_apic_pnode_shift (void ) {unsigned long *mmr;
@@ -83,8 +83,6 @@ static int __init early_get_apic_pnode_s* Old bios, use default value */ uvh_apicid.s.pnode_shift =UV_APIC_PNODE_SHIFT ; - -return uvh_apicid.s.pnode_shift; }static int __init uv_acpi_madt_oem_check (char *oem_id,char *oem_table_id)
@@ -93,6 +91,7 @@ static int __init uv_acpi_madt_oem_checkif (!strcmp (oem_id,"SGI" )) { nodeid =early_get_nodeid (); +early_get_apic_pnode_shift (); x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range; x86_platform.nmi_init = uv_nmi_init;if (!strcmp (oem_table_id,"UVL" ))
@@ -101,7 +100,7 @@ static int __init uv_acpi_madt_oem_check uv_system_type =UV_X2APIC ; else if (!strcmp(oem_table_id, "UVH")) {__get_cpu_var (x2apic_extra_bits) = - nodeid << (early_get_apic_pnode_shift () -1 ); + nodeid << (uvh_apicid.s.pnode_shift -1 ); uv_system_type =UV_NON_UNIQUE_APIC ;return 1 ; }
Signature · 2 lines
Russ Anderson, OS RAS/Partitioning Project Lead SGI - Silicon Graphics Inc [email protected]
Commit-ID: 0520bd8438f18f2b1b2af5fd1c4ecc070a1bf837 Gitweb: http://git.kernel.org/tip/0520bd8438f18f2b1b2af5fd1c4ecc070a1bf837 Author: Russ Anderson <[email protected]> AuthorDate: Thu, 28 Oct 2010 17:41:32 -0500 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 28 Oct 2010 22:38:07 -0700
x86, uv: More Westmere support on SGI UV
Enable Westmere support for all APIC modes on SGI UV.
Signed-off-by Russ Anderson <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by H. Peter Anvin <[email protected]>
--- arch/x86/kernel/apic/x2apic_uv_x.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +3 -4
@@ -71,7 +71,7 @@ static int early_get_nodeid(void)return node_id.s.node_id; } -static int __init early_get_apic_pnode_shift (void ) +static void __init early_get_apic_pnode_shift (void ) {unsigned long *mmr;
@@ -83,8 +83,6 @@ static int __init early_get_apic_pnode_shift(void)* Old bios, use default value */ uvh_apicid.s.pnode_shift =UV_APIC_PNODE_SHIFT ; - -return uvh_apicid.s.pnode_shift; }static int __init uv_acpi_madt_oem_check (char *oem_id,char *oem_table_id)
@@ -93,6 +91,7 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)if (!strcmp (oem_id,"SGI" )) { nodeid =early_get_nodeid (); +early_get_apic_pnode_shift (); x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range; x86_platform.nmi_init = uv_nmi_init;if (!strcmp (oem_table_id,"UVL" ))
@@ -101,7 +100,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) = - nodeid << (early_get_apic_pnode_shift () -1 ); + nodeid << (uvh_apicid.s.pnode_shift -1 ); uv_system_type =UV_NON_UNIQUE_APIC ;return 1 ; }