2015-04-09 18:26:37

by Mike Travis

Subject: [PATCH 3/3] X86, UV: Update UV APIC HUB check

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

Signed-off-by: Mike Travis <[email protected]>
Acked-by: Hedi Berriche <[email protected]>
Acked-by: Dimitri Sivanich <[email protected]>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

--- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c
+++ linux/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -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();


--

2015-04-10 17:44:20

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/apic] x86/apic/uv: Update the UV APIC HUB check

Commit-ID: 1912c7afa39d2683a574011ff455fe49ada8016c
Gitweb: http://git.kernel.org/tip/1912c7afa39d2683a574011ff455fe49ada8016c
Author: Mike Travis <[email protected]>
AuthorDate: Thu, 9 Apr 2015 13:26:31 -0500
Committer: Ingo Molnar <[email protected]>
CommitDate: Fri, 10 Apr 2015 10:16:08 +0200

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: Mike Travis <[email protected]>
Acked-by: Hedi Berriche <[email protected]>
Acked-by: Dimitri Sivanich <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index e18962c..c8d9295 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -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();