* [PATCH] x86, uv: More Westmere support on SGI UV
@ 2010-10-28 22:41 Russ Anderson
2010-10-29 5:40 ` [tip:x86/uv] " tip-bot for Russ Anderson
0 siblings, 1 reply; 2+ messages in thread
From: Russ Anderson @ 2010-10-28 22:41 UTC (permalink / raw)
To: linux-kernel; +Cc: H. Peter Anvin, mingo, tglx, Jack Steiner, Russ Anderson
x86, uv: More Westmere support on SGI UV
Enable Westmere support on all apic modes on SGI UV.
Signed-off-by: Russ Anderson <rja@sgi.com>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Index: linux/arch/x86/kernel/apic/x2apic_uv_x.c
===================================================================
--- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2010-10-28 16:39:23.771774569 -0500
+++ linux/arch/x86/kernel/apic/x2apic_uv_x.c 2010-10-28 16:45:52.295342718 -0500
@@ -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_check
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
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;
}
--
Russ Anderson, OS RAS/Partitioning Project Lead
SGI - Silicon Graphics Inc rja@sgi.com
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/uv] x86, uv: More Westmere support on SGI UV
2010-10-28 22:41 [PATCH] x86, uv: More Westmere support on SGI UV Russ Anderson
@ 2010-10-29 5:40 ` tip-bot for Russ Anderson
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Russ Anderson @ 2010-10-29 5:40 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, rja, hpa, mingo, tglx, hpa
Commit-ID: 0520bd8438f18f2b1b2af5fd1c4ecc070a1bf837
Gitweb: http://git.kernel.org/tip/0520bd8438f18f2b1b2af5fd1c4ecc070a1bf837
Author: Russ Anderson <rja@sgi.com>
AuthorDate: Thu, 28 Oct 2010 17:41:32 -0500
Committer: H. Peter Anvin <hpa@zytor.com>
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 <rja@sgi.com>
LKML-Reference: <20101028224132.GB15804@sgi.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 0a2918e..ed4118d 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-29 5:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-28 22:41 [PATCH] x86, uv: More Westmere support on SGI UV Russ Anderson
2010-10-29 5:40 ` [tip:x86/uv] " tip-bot for Russ Anderson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.