diff options
| author | Mike Travis <travis@sgi.com> | 2015-04-09 13:26:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-10 10:16:08 +0200 |
| commit | 1912c7afa39d2683a574011ff455fe49ada8016c (patch) | |
| tree | c3a861f38973ea486bd9b9e3ef9d4945f55a34fc /arch/x86/kernel | |
| parent | 379b97e280971ef7673db5166c7e0f7ab49b81de (diff) | |
| download | linux-1912c7afa39d2683a574011ff455fe49ada8016c.tar.bz2 | |
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 <travis@sgi.com>
Acked-by: Hedi Berriche <hedi@sgi.com>
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Link: http://lkml.kernel.org/r/20150409182629.267239403@asylum.americas.sgi.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 10 |
1 files 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 e18962c8b007..c8d92950bc04 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(); |