x86: UV BAU: Increase maximum CPUs per socket/hub

We have encountered hardware with 18 cores/socket that gives 36 CPUs/socket
with hyperthreading enabled. This exceeds the current MAX_CPUS_PER_SOCKET
causing a failure in get_cpu_topology. Increase MAX_CPUS_PER_SOCKET to 64
and MAX_CPUS_PER_UVHUB to 128.

Signed-off-by: James Custer <jcuster@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Link: http://lkml.kernel.org/r/1414952199-185319-1-git-send-email-jcuster@sgi.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
index 2d60a7813dfe37334b0149b5501cc9d367e540f9..fc808b83fccb28916a27ce757c4c63f3cd53704c 100644 (file)
--- a/arch/x86/include/asm/uv/uv_bau.h
+++ b/arch/x86/include/asm/uv/uv_bau.h
@@ -33,8 +33,8 @@
  * Each of the descriptors is 64 bytes in size (8*64 = 512 bytes in a set).
  */
 
-#define MAX_CPUS_PER_UVHUB             64
-#define MAX_CPUS_PER_SOCKET            32
+#define MAX_CPUS_PER_UVHUB             128
+#define MAX_CPUS_PER_SOCKET            64
 #define ADP_SZ                         64 /* hardware-provided max. */
 #define UV_CPUS_PER_AS                 32 /* hardware-provided max. */
 #define ITEMS_PER_DESC                 8