Patched in Tegra support.

4 files changed, 25 insertions, 100 deletions

diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index c862cd4583c..851b2f25ce0 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -25,6 +25,7 @@
 #endif
 
 #if defined CONFIG_IA64
+#include <asm/system.h>
 #include <asm/sn/arch.h>        /* defines is_shub1() and is_shub2() */
 #define is_shub()       ia64_platform_is("sn2")
 #endif
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index d971817182f..8d082b46426 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -53,10 +53,6 @@
 #include <linux/kthread.h>
 #include "xpc.h"
 
-#ifdef CONFIG_X86_64
-#include <asm/traps.h>
-#endif
-
 /* define two XPC debug device structures to be used with dev_dbg() et al */
 
 struct device_driver xpc_dbg_name = {
@@ -1083,9 +1079,6 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)
         return NOTIFY_DONE;
 }
 
-/* Used to only allow one cpu to complete disconnect */
-static unsigned int xpc_die_disconnecting;
-
 /*
  * Notify other partitions to deactivate from us by first disengaging from all
  * references to our memory.
@@ -1099,9 +1092,6 @@ xpc_die_deactivate(void)
         long keep_waiting;
         long wait_to_print;
 
-        if (cmpxchg(&xpc_die_disconnecting, 0, 1))
-                return;
-
         /* keep xpc_hb_checker thread from doing anything (just in case) */
         xpc_exiting = 1;
 
@@ -1169,7 +1159,7 @@ xpc_die_deactivate(void)
  * about the lack of a heartbeat.
  */
 static int
-xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
+xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)
 {
 #ifdef CONFIG_IA64              /* !!! temporary kludge */
         switch (event) {
@@ -1201,27 +1191,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
                 break;
         }
 #else
-        struct die_args *die_args = _die_args;
-
-        switch (event) {
-        case DIE_TRAP:
-                if (die_args->trapnr == X86_TRAP_DF)
-                        xpc_die_deactivate();
-
-                if (((die_args->trapnr == X86_TRAP_MF) ||
-                     (die_args->trapnr == X86_TRAP_XF)) &&
-                    !user_mode_vm(die_args->regs))
-                        xpc_die_deactivate();
-
-                break;
-        case DIE_INT3:
-        case DIE_DEBUG:
-                break;
-        case DIE_OOPS:
-        case DIE_GPF:
-        default:
-                xpc_die_deactivate();
-        }
+        xpc_die_deactivate();
 #endif
 
         return NOTIFY_DONE;
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index b9e2000969f..17bbacb1b4b 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -18,8 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/cpu.h>
-#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <asm/uv/uv_hub.h>
@@ -61,8 +59,6 @@ static struct xpc_heartbeat_uv *xpc_heartbeat_uv;
                                          XPC_NOTIFY_MSG_SIZE_UV)
 #define XPC_NOTIFY_IRQ_NAME             "xpc_notify"
 
-static int xpc_mq_node = -1;
-
 static struct xpc_gru_mq_uv *xpc_activate_mq_uv;
 static struct xpc_gru_mq_uv *xpc_notify_mq_uv;
 
@@ -113,8 +109,11 @@ xpc_get_gru_mq_irq_uv(struct xpc_gru_mq_uv *mq, int cpu, char *irq_name)
 #if defined CONFIG_X86_64
         mq->irq = uv_setup_irq(irq_name, cpu, mq->mmr_blade, mq->mmr_offset,
                         UV_AFFINITY_CPU);
-        if (mq->irq < 0)
+        if (mq->irq < 0) {
+                dev_err(xpc_part, "uv_setup_irq() returned error=%d\n",
+                        -mq->irq);
                 return mq->irq;
+        }
 
         mq->mmr_value = uv_read_global_mmr64(mmr_pnode, mq->mmr_offset);
 
@@ -239,9 +238,8 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name,
         mq->mmr_blade = uv_cpu_to_blade_id(cpu);
 
         nid = cpu_to_node(cpu);
-        page = alloc_pages_exact_node(nid,
-                                      GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
-                                      pg_order);
+        page = alloc_pages_exact_node(nid, GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
+                                pg_order);
         if (page == NULL) {
                 dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d "
                         "bytes of memory on nid=%d for GRU mq\n", mq_size, nid);
@@ -454,9 +452,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
 
                 if (msg->activate_gru_mq_desc_gpa !=
                     part_uv->activate_gru_mq_desc_gpa) {
-                        spin_lock(&part_uv->flags_lock);
+                        spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
                         part_uv->flags &= ~XPC_P_CACHED_ACTIVATE_GRU_MQ_DESC_UV;
-                        spin_unlock(&part_uv->flags_lock);
+                        spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
                         part_uv->activate_gru_mq_desc_gpa =
                             msg->activate_gru_mq_desc_gpa;
                 }
@@ -1733,50 +1731,9 @@ static struct xpc_arch_operations xpc_arch_ops_uv = {
         .notify_senders_of_disconnect = xpc_notify_senders_of_disconnect_uv,
 };
 
-static int
-xpc_init_mq_node(int nid)
-{
-        int cpu;
-
-        get_online_cpus();
-
-        for_each_cpu(cpu, cpumask_of_node(nid)) {
-                xpc_activate_mq_uv =
-                        xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, nid,
-                                             XPC_ACTIVATE_IRQ_NAME,
-                                             xpc_handle_activate_IRQ_uv);
-                if (!IS_ERR(xpc_activate_mq_uv))
-                        break;
-        }
-        if (IS_ERR(xpc_activate_mq_uv)) {
-                put_online_cpus();
-                return PTR_ERR(xpc_activate_mq_uv);
-        }
-
-        for_each_cpu(cpu, cpumask_of_node(nid)) {
-                xpc_notify_mq_uv =
-                        xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, nid,
-                                             XPC_NOTIFY_IRQ_NAME,
-                                             xpc_handle_notify_IRQ_uv);
-                if (!IS_ERR(xpc_notify_mq_uv))
-                        break;
-        }
-        if (IS_ERR(xpc_notify_mq_uv)) {
-                xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
-                put_online_cpus();
-                return PTR_ERR(xpc_notify_mq_uv);
-        }
-
-        put_online_cpus();
-        return 0;
-}
-
 int
 xpc_init_uv(void)
 {
-        int nid;
-        int ret = 0;
-
         xpc_arch_ops = xpc_arch_ops_uv;
 
         if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
@@ -1785,21 +1742,21 @@ xpc_init_uv(void)
                 return -E2BIG;
         }
 
-        if (xpc_mq_node < 0)
-                for_each_online_node(nid) {
-                        ret = xpc_init_mq_node(nid);
-
-                        if (!ret)
-                                break;
-                }
-        else
-                ret = xpc_init_mq_node(xpc_mq_node);
+        xpc_activate_mq_uv = xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, 0,
+                                                  XPC_ACTIVATE_IRQ_NAME,
+                                                  xpc_handle_activate_IRQ_uv);
+        if (IS_ERR(xpc_activate_mq_uv))
+                return PTR_ERR(xpc_activate_mq_uv);
 
-        if (ret < 0)
-                dev_err(xpc_part, "xpc_init_mq_node() returned error=%d\n",
-                        -ret);
+        xpc_notify_mq_uv = xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, 0,
+                                                XPC_NOTIFY_IRQ_NAME,
+                                                xpc_handle_notify_IRQ_uv);
+        if (IS_ERR(xpc_notify_mq_uv)) {
+                xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
+                return PTR_ERR(xpc_notify_mq_uv);
+        }
 
-        return ret;
+        return 0;
 }
 
 void
@@ -1808,6 +1765,3 @@ xpc_exit_uv(void)
         xpc_destroy_gru_mq_uv(xpc_notify_mq_uv);
         xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
 }
-
-module_param(xpc_mq_node, int, 0);
-MODULE_PARM_DESC(xpc_mq_node, "Node number on which to allocate message queues.");
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 3fac67a5204..42f067347bc 100644
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -576,7 +576,7 @@ xpnet_init(void)
          * report an error if the data is not retrievable and the
          * packet will be dropped.
          */
-        xpnet_device->features = NETIF_F_HW_CSUM;
+        xpnet_device->features = NETIF_F_NO_CSUM;
 
         result = register_netdev(xpnet_device);
         if (result != 0) {