Support CUDA 4.2

2 files changed, 20 insertions, 6 deletions

diff --git a/litmus/Kconfig b/litmus/Kconfig
index 8dd3955f671d..4bd371d20a1a 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -515,11 +515,17 @@ config CUDA_5_0
           help
             Support CUDA 5.0 (dev. driver version: x86_64-304.54)
 
+config CUDA_4_2
+          bool "CUDA 4.2"
+          depends on LITMUS_NVIDIA
+          help
+                Support CUDA 4.2 (dev driver version: x86_64-295.40)
+
 config CUDA_4_0
           bool "CUDA 4.0"
           depends on LITMUS_NVIDIA
           help
-                Support CUDA 4.0 RC2 (dev. driver version: x86_64-270.40)
+                Support CUDA 4.0 (dev. driver version: x86_64-270.41)
 
 config CUDA_3_2
           bool "CUDA 3.2"
diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index 7f1dc18624e1..1255d8d6152e 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -35,7 +35,7 @@ typedef union
 typedef struct
 {
     NvU64 address;
-#if defined(CONFIG_CUDA_5_0) || defined(CONFIG_CUDA_5_X)
+#if defined(CONFIG_CUDA_4_2) || defined(CONFIG_CUDA_5_0) || defined(CONFIG_CUDA_5_X)
         NvU64 strapped_size;
 #endif
     NvU64 size;
@@ -626,7 +626,7 @@ typedef enum {
 static struct task_struct* __get_klm_thread(nv_device_registry_t* reg, nvklmtype_t type)
 {
         struct task_struct *klmirqd = NULL;
-        
+
         switch(type)
         {
         case INTERRUPT_TH:
@@ -731,10 +731,12 @@ static int gpu_klmirqd_increase_priority(struct task_struct *klmirqd, struct tas
 {
         int retval = 0;
 
+        /*
         TRACE_CUR("Increasing priority of %s/%d to %s/%d.\n",
                         klmirqd->comm, klmirqd->pid,
                         (hp) ? hp->comm : "null",
                         (hp) ? hp->pid : 0);
+        */
 
         /* the klmirqd thread should never attempt to hold a litmus-level real-time
          * so nested support is not required */
@@ -747,10 +749,12 @@ static int gpu_klmirqd_decrease_priority(struct task_struct *klmirqd, struct tas
 {
         int retval = 0;
 
+        /*
         TRACE_CUR("Decreasing priority of %s/%d to %s/%d.\n",
                         klmirqd->comm, klmirqd->pid,
                         (hp) ? hp->comm : "null",
                         (hp) ? hp->pid : 0);
+        */
 
         /* the klmirqd thread should never attempt to hold a litmus-level real-time
          * so nested support is not required */
@@ -775,7 +779,7 @@ long enable_gpu_owner(struct task_struct *t)
 #endif
 
         if (!tsk_rt(t)->held_gpus) {
-                TRACE_CUR("task %s/%d does not hold any GPUs\n", t->comm, t->pid);
+//              TRACE_CUR("task %s/%d does not hold any GPUs\n", t->comm, t->pid);
                 return -1;
         }
 
@@ -803,10 +807,12 @@ long enable_gpu_owner(struct task_struct *t)
                 int interrupt_success;
 
                 /* we're the new hp */
+                /*
                 TRACE_CUR("%s/%d (eff_prio = %s/%d) is new hp on GPU %d.\n",
                                 t->comm, t->pid,
                                 effective_priority(t)->comm, effective_priority(t)->pid,
                                 gpu);
+                */
 
                 interrupt_success = gpu_klmirqd_increase_priority(reg->interrupt_thread, effective_priority(t));
 
@@ -850,11 +856,11 @@ long disable_gpu_owner(struct task_struct *t)
         gpu = find_first_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus));
 
         if (!binheap_is_in_heap(&tsk_rt(t)->gpu_owner_node)) {
-                TRACE_CUR("task %s/%d is not active on GPU %d\n", t->comm, t->pid, gpu);
+//              TRACE_CUR("task %s/%d is not active on GPU %d\n", t->comm, t->pid, gpu);
                 goto out;
         }
 
-        TRACE_CUR("task %s/%d exiting from GPU %d.\n", t->comm, t->pid, gpu);
+//      TRACE_CUR("task %s/%d exiting from GPU %d.\n", t->comm, t->pid, gpu);
 
 
         reg = &NV_DEVICE_REG[gpu];
@@ -877,6 +883,7 @@ long disable_gpu_owner(struct task_struct *t)
 #endif
                 struct task_struct *to_inh = (new_hp) ? effective_priority(new_hp) : NULL;
 
+                /*
                 TRACE_CUR("%s/%d is no longer hp on GPU %d; new hp = %s/%d (eff_prio = %s/%d).\n",
                                                 t->comm, t->pid,
                                                 gpu,
@@ -884,6 +891,7 @@ long disable_gpu_owner(struct task_struct *t)
                                                 (new_hp) ? new_hp->pid : 0,
                                                 (to_inh) ? to_inh->comm : "null",
                                                 (to_inh) ? to_inh->pid : 0);
+                */
 
                 interrupt_success = gpu_klmirqd_decrease_priority(reg->interrupt_thread, to_inh);