Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / drivers / misc / sgi-gru / grufile.c

diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 9e6da46..aed6098 100644 (file)
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/io.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
 #include <linux/miscdevice.h>
@@ -46,6 +45,7 @@
 
 struct gru_blade_state *gru_base[GRU_MAX_BLADES] __read_mostly;
 unsigned long gru_start_paddr __read_mostly;
+void *gru_start_vaddr __read_mostly;
 unsigned long gru_end_paddr __read_mostly;
 unsigned int gru_max_gids __read_mostly;
 struct gru_stats_s gru_stats;
@@ -135,11 +135,9 @@ static int gru_create_new_context(unsigned long arg)
        if (copy_from_user(&req, (void __user *)arg, sizeof(req)))
                return -EFAULT;
 
-       if (req.data_segment_bytes == 0 ||
-                               req.data_segment_bytes > max_user_dsr_bytes)
+       if (req.data_segment_bytes > max_user_dsr_bytes)
                return -EINVAL;
-       if (!req.control_blocks || !req.maximum_thread_count ||
-                               req.control_blocks > max_user_cbrs)
+       if (req.control_blocks > max_user_cbrs || !req.maximum_thread_count)
                return -EINVAL;
 
        if (!(req.options & GRU_OPT_MISS_MASK))
@@ -183,41 +181,6 @@ static long gru_get_config_info(unsigned long arg)
        return 0;
 }
 
-/*
- * Get GRU chiplet status
- */
-static long gru_get_chiplet_status(unsigned long arg)
-{
-       struct gru_state *gru;
-       struct gru_chiplet_info info;
-
-       if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
-               return -EFAULT;
-
-       if (info.node == -1)
-               info.node = numa_node_id();
-       if (info.node >= num_possible_nodes() ||
-                       info.chiplet >= GRU_CHIPLETS_PER_HUB ||
-                       info.node < 0 || info.chiplet < 0)
-               return -EINVAL;
-
-       info.blade = uv_node_to_blade_id(info.node);
-       gru = get_gru(info.blade, info.chiplet);
-
-       info.total_dsr_bytes = GRU_NUM_DSR_BYTES;
-       info.total_cbr = GRU_NUM_CB;
-       info.total_user_dsr_bytes = GRU_NUM_DSR_BYTES -
-               gru->gs_reserved_dsr_bytes;
-       info.total_user_cbr = GRU_NUM_CB - gru->gs_reserved_cbrs;
-       info.free_user_dsr_bytes = hweight64(gru->gs_dsr_map) *
-                       GRU_DSR_AU_BYTES;
-       info.free_user_cbr = hweight64(gru->gs_cbr_map) * GRU_CBR_AU_SIZE;
-
-       if (copy_to_user((void __user *)arg, &info, sizeof(info)))
-               return -EFAULT;
-       return 0;
-}
-
 /*
  * gru_file_unlocked_ioctl
  *
@@ -234,8 +197,8 @@ static long gru_file_unlocked_ioctl(struct file *file, unsigned int req,
        case GRU_CREATE_CONTEXT:
                err = gru_create_new_context(arg);
                break;
-       case GRU_SET_TASK_SLICE:
-               err = gru_set_task_slice(arg);
+       case GRU_SET_CONTEXT_OPTION:
+               err = gru_set_context_option(arg);
                break;
        case GRU_USER_GET_EXCEPTION_DETAIL:
                err = gru_get_exception_detail(arg);
@@ -243,15 +206,18 @@ static long gru_file_unlocked_ioctl(struct file *file, unsigned int req,
        case GRU_USER_UNLOAD_CONTEXT:
                err = gru_user_unload_context(arg);
                break;
-       case GRU_GET_CHIPLET_STATUS:
-               err = gru_get_chiplet_status(arg);
-               break;
        case GRU_USER_FLUSH_TLB:
                err = gru_user_flush_tlb(arg);
                break;
        case GRU_USER_CALL_OS:
                err = gru_handle_user_call_os(arg);
                break;
+       case GRU_GET_GSEG_STATISTICS:
+               err = gru_get_gseg_statistics(arg);
+               break;
+       case GRU_KTEST:
+               err = gru_ktest(arg);
+               break;
        case GRU_GET_CONFIG_INFO:
                err = gru_get_config_info(arg);
                break;
@@ -285,7 +251,6 @@ static void gru_init_chiplet(struct gru_state *gru, unsigned long paddr,
        gru_dbg(grudev, "bid %d, nid %d, gid %d, vaddr %p (0x%lx)\n",
                bid, nid, gru->gs_gid, gru->gs_gru_base_vaddr,
                gru->gs_gru_base_paddr);
-       gru_kservices_init(gru);
 }
 
 static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr)
@@ -312,6 +277,7 @@ static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr)
                memset(gru_base[bid], 0, sizeof(struct gru_blade_state));
                gru_base[bid]->bs_lru_gru = &gru_base[bid]->bs_grus[0];
                spin_lock_init(&gru_base[bid]->bs_lock);
+               init_rwsem(&gru_base[bid]->bs_kgts_sema);
 
                dsrbytes = 0;
                cbrs = 0;
@@ -375,7 +341,6 @@ static int __init gru_init(void)
 {
        int ret, irq, chip;
        char id[10];
-       void *gru_start_vaddr;
 
        if (!is_uv_system())
                return 0;
@@ -425,6 +390,7 @@ static int __init gru_init(void)
                printk(KERN_ERR "%s: init tables failed\n", GRU_DRIVER_ID_STR);
                goto exit3;
        }
+       gru_kservices_init();
 
        printk(KERN_INFO "%s: v%s\n", GRU_DRIVER_ID_STR,
               GRU_DRIVER_VERSION_STR);
@@ -443,7 +409,7 @@ exit1:
 
 static void __exit gru_exit(void)
 {
-       int i, bid, gid;
+       int i, bid;
        int order = get_order(sizeof(struct gru_state) *
                              GRU_CHIPLETS_PER_BLADE);
 
@@ -452,10 +418,7 @@ static void __exit gru_exit(void)
 
        for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
                free_irq(IRQ_GRU + i, NULL);
-
-       foreach_gid(gid)
-               gru_kservices_exit(GID_TO_GRU(gid));
-
+       gru_kservices_exit();
        for (bid = 0; bid < GRU_MAX_BLADES; bid++)
                free_pages((unsigned long)gru_base[bid], order);