x86/platform/UV: Add UV4 Specific Defines

Add UV4 specific defines to determine if current system type is a
UV4 system.

Tested-by: John Estabrook <estabrook@sgi.com>
Tested-by: Gary Kroening <gfk@sgi.com>
Tested-by: Nathan Zimmer <nzimmer@sgi.com>
Signed-off-by: Mike Travis <travis@sgi.com>
Reviewed-by: Dimitri Sivanich <sivanich@sgi.com>
Cc: Andrew Banman <abanman@sgi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russ Anderson <rja@sgi.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160429215403.072323684@asylum.americas.sgi.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 8f4942e2bcbb21584a78225b1208adefe86e0aa9..9086d95031a5ad6dc88a22740a991602d2b72612 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -108,6 +108,9 @@ static int __init early_get_pnodeid(void)
        case UV3_HUB_PART_NUMBER_X:
                uv_min_hub_revision_id += UV3_HUB_REVISION_BASE;
                break;
+       case UV4_HUB_PART_NUMBER:
+               uv_min_hub_revision_id += UV4_HUB_REVISION_BASE - 1;
+               break;
        }
 
        uv_hub_info->hub_revision = uv_min_hub_revision_id;
@@ -155,8 +158,10 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
         *   SGI: UV100/1000
         *   SGI2: UV2000/3000
         *   SGI3: UV300 (truncated to 4 chars because of different varieties)
+        *   SGI4: UV400 (truncated to 4 chars because of different varieties)
         */
        uv_hub_info->hub_revision =
+               !strncmp(oem_id, "SGI4", 4) ? UV4_HUB_REVISION_BASE :
                !strncmp(oem_id, "SGI3", 4) ? UV3_HUB_REVISION_BASE :
                !strcmp(oem_id, "SGI2") ? UV2_HUB_REVISION_BASE :
                !strcmp(oem_id, "SGI") ? UV1_HUB_REVISION_BASE : 0;
@@ -881,9 +886,10 @@ 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() ? "UV100/1000" :
-                   (is_uv2_hub() ? "UV2000/3000" :
-                   (is_uv3_hub() ? "UV300" : NULL)));
+       char *hub = is_uv4_hub() ? "UV400" :
+                   is_uv3_hub() ? "UV300" :
+                   is_uv2_hub() ? "UV2000/3000" :
+                   is_uv1_hub() ? "UV100/1000" : NULL;
 
        if (!hub) {
                pr_err("UV: Unknown/unsupported UV hub\n");