sgi-xp: support runtime selection of xp_max_npartitions

Support runtime selection of the max number of partitions based on the
hardware being run on.

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 34 insertions, 50 deletions

diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
index 196480b691a1..c5cec606377d 100644
--- a/drivers/misc/sgi-xp/xp_main.c
+++ b/drivers/misc/sgi-xp/xp_main.c
@@ -15,28 +15,32 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mutex.h>
-#include <asm/sn/intr.h>
-#include <asm/sn/sn_sal.h>
+#include <linux/device.h>
 #include "xp.h"
 
-/*
- * The export of xp_nofault_PIOR needs to happen here since it is defined
- * in drivers/misc/sgi-xp/xp_nofault.S. The target of the nofault read is
- * defined here.
- */
-EXPORT_SYMBOL_GPL(xp_nofault_PIOR);
+/* define the XP debug device structures to be used with dev_dbg() et al */
 
-u64 xp_nofault_PIOR_target;
-EXPORT_SYMBOL_GPL(xp_nofault_PIOR_target);
+struct device_driver xp_dbg_name = {
+        .name = "xp"
+};
+
+struct device xp_dbg_subname = {
+        .bus_id = {0},          /* set to "" */
+        .driver = &xp_dbg_name
+};
+
+struct device *xp = &xp_dbg_subname;
+
+/* max #of partitions possible */
+short xp_max_npartitions;
+EXPORT_SYMBOL_GPL(xp_max_npartitions);
 
 /*
  * xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level
  * users of XPC.
  */
-struct xpc_registration xpc_registrations[XPC_NCHANNELS];
+struct xpc_registration xpc_registrations[XPC_MAX_NCHANNELS];
 EXPORT_SYMBOL_GPL(xpc_registrations);
 
 /*
@@ -135,7 +139,7 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
 {
         struct xpc_registration *registration;
 
-        DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
+        DBUG_ON(ch_number < 0 || ch_number >= XPC_MAX_NCHANNELS);
         DBUG_ON(payload_size == 0 || nentries == 0);
         DBUG_ON(func == NULL);
         DBUG_ON(assigned_limit == 0 || idle_limit > assigned_limit);
@@ -185,7 +189,7 @@ xpc_disconnect(int ch_number)
 {
         struct xpc_registration *registration;
 
-        DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
+        DBUG_ON(ch_number < 0 || ch_number >= XPC_MAX_NCHANNELS);
 
         registration = &xpc_registrations[ch_number];
 
@@ -221,39 +225,21 @@ EXPORT_SYMBOL_GPL(xpc_disconnect);
 int __init
 xp_init(void)
 {
-        int ret, ch_number;
-        u64 func_addr = *(u64 *)xp_nofault_PIOR;
-        u64 err_func_addr = *(u64 *)xp_error_PIOR;
-
-        if (!ia64_platform_is("sn2"))
-                return -ENODEV;
+        enum xp_retval ret;
+        int ch_number;
 
-        /*
-         * Register a nofault code region which performs a cross-partition
-         * PIO read. If the PIO read times out, the MCA handler will consume
-         * the error and return to a kernel-provided instruction to indicate
-         * an error. This PIO read exists because it is guaranteed to timeout
-         * if the destination is down (AMO operations do not timeout on at
-         * least some CPUs on Shubs <= v1.2, which unfortunately we have to
-         * work around).
-         */
-        ret = sn_register_nofault_code(func_addr, err_func_addr, err_func_addr,
-                                       1, 1);
-        if (ret != 0) {
-                printk(KERN_ERR "XP: can't register nofault code, error=%d\n",
-                       ret);
-        }
-        /*
-         * Setup the nofault PIO read target. (There is no special reason why
-         * SH_IPI_ACCESS was selected.)
-         */
-        if (is_shub2())
-                xp_nofault_PIOR_target = SH2_IPI_ACCESS0;
+        if (is_shub())
+                ret = xp_init_sn2();
+        else if (is_uv())
+                ret = xp_init_uv();
         else
-                xp_nofault_PIOR_target = SH1_IPI_ACCESS;
+                ret = xpUnsupported;
+
+        if (ret != xpSuccess)
+                return -ENODEV;
 
         /* initialize the connection registration mutex */
-        for (ch_number = 0; ch_number < XPC_NCHANNELS; ch_number++)
+        for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)
                 mutex_init(&xpc_registrations[ch_number].mutex);
 
         return 0;
@@ -264,12 +250,10 @@ module_init(xp_init);
 void __exit
 xp_exit(void)
 {
-        u64 func_addr = *(u64 *)xp_nofault_PIOR;
-        u64 err_func_addr = *(u64 *)xp_error_PIOR;
-
-        /* unregister the PIO read nofault code region */
-        (void)sn_register_nofault_code(func_addr, err_func_addr,
-                                       err_func_addr, 1, 0);
+        if (is_shub())
+                xp_exit_sn2();
+        else if (is_uv())
+                xp_exit_uv();
 }
 
 module_exit(xp_exit);