Support NV 304.x and 310.x drivers.

4 files changed, 18 insertions, 81 deletions

diff --git a/include/litmus/nvidia_info.h b/include/litmus/nvidia_info.h
index 8c2a5524512e..0ebe9c10c6a2 100644
--- a/include/litmus/nvidia_info.h
+++ b/include/litmus/nvidia_info.h
@@ -19,8 +19,6 @@ void shutdown_nvidia_info(void);
 
 int is_nvidia_func(void* func_addr);
 
-void dump_nvidia_info(const struct tasklet_struct *t);
-
 // Returns the Nvidia device # associated with provided tasklet and work_struct.
 u32 get_tasklet_nv_device_num(const struct tasklet_struct *t);
 u32 get_work_nv_device_num(const struct work_struct *t);
diff --git a/litmus/Kconfig b/litmus/Kconfig
index fa470b27ace4..bf802b760e1f 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -471,11 +471,17 @@ choice
           help
                 Select the version of CUDA/driver to support.
 
+config CUDA_5_X
+          bool "CUDA 5.0+"
+          depends on LITMUS_NVIDIA && REALTIME_AUX_TASKS
+          help
+            Support CUDA 5.0 (dev. driver version: x86_64-310.x)
+
 config CUDA_5_0
           bool "CUDA 5.0"
           depends on LITMUS_NVIDIA && REALTIME_AUX_TASKS
           help
-            Support CUDA 5.0 RCx (dev. driver version: x86_64-304.33)
+            Support CUDA 5.0 (dev. driver version: x86_64-304.54)
 
 config CUDA_4_0
           bool "CUDA 4.0"
diff --git a/litmus/gpu_affinity.c b/litmus/gpu_affinity.c
index 7d73105b4181..cf94d8449e3b 100644
--- a/litmus/gpu_affinity.c
+++ b/litmus/gpu_affinity.c
@@ -19,6 +19,7 @@
 
 #define MIN(a, b) ((a < b) ? a : b)
 
+#if 0
 static fp_t update_estimate(feedback_est_t* fb, fp_t a, fp_t b, lt_t observed)
 {
         fp_t relative_err;
@@ -35,6 +36,7 @@ static fp_t update_estimate(feedback_est_t* fb, fp_t a, fp_t b, lt_t observed)
 
         return relative_err;
 }
+#endif
 
 lt_t varience(lt_t nums[], const lt_t avg, const uint16_t count)
 {
diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index be0c09b19c6d..73c933a87623 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -35,7 +35,7 @@ typedef union
 typedef struct
 {
     NvU64 address;
-#ifdef CONFIG_CUDA_5_0
+#if defined(CONFIG_CUDA_5_0) || defined(CONFIG_CUDA_5_X)
         NvU64 strapped_size;
 #endif
     NvU64 size;
@@ -68,13 +68,13 @@ typedef struct
     litmus_nv_aperture_t *regs;
     litmus_nv_aperture_t *fb, ud;
 
-#ifndef CONFIG_CUDA_5_0
+#ifndef CONFIG_CUDA_5_X
     litmus_nv_aperture_t agp;
 #endif
 
     NvU32  interrupt_line;
 
-#ifndef CONFIG_CUDA_5_0
+#ifndef CONFIG_CUDA_5_X
     NvU32 agp_config;
     NvU32 agp_status;
 #endif
@@ -105,7 +105,7 @@ typedef struct litmus_nv_linux_state_s {
 
         struct pci_dev *dev;
 
-#ifndef CONFIG_CUDA_5_0
+#ifndef CONFIG_CUDA_5_X
     void *agp_bridge;
 #endif
 
@@ -116,7 +116,7 @@ typedef struct litmus_nv_linux_state_s {
     void *pci_cfgchk_sp;
     void *isr_bh_sp;
 
-#if defined(CONFIG_CUDA_4_0) || defined(CONFIG_CUDA_5_0)
+#ifndef CONFIG_CUDA_3_2
         char registry_keys[512];
 #endif
 
@@ -137,7 +137,10 @@ typedef struct litmus_nv_linux_state_s {
     struct litmus_nv_linux_state_s *next;
 } litmus_nv_linux_state_t;
 
-void dump_nvidia_info(const struct tasklet_struct *t)
+
+
+static void __attribute__((unused))
+dump_nvidia_info(const struct tasklet_struct *t)
 {
         litmus_nv_state_t* nvstate = NULL;
         litmus_nv_linux_state_t* linuxstate =  NULL;
@@ -219,84 +222,12 @@ void dump_nvidia_info(const struct tasklet_struct *t)
         {
                 TRACE("INVALID LINUXNVSTATE?????\n");
         }
-
-#if 0
-        if(pci)
-        {
-                TRACE("PCI DEV Info:\n"
-                          "pci device ptr: %p\n"
-                          "\tdevfn = %d\n"
-                          "\tvendor = %d\n"
-                          "\tdevice = %d\n"
-                          "\tsubsystem_vendor = %d\n"
-                          "\tsubsystem_device = %d\n"
-                          "\tslot # = %d\n",
-                          pci,
-                          pci->devfn,
-                          pci->vendor,
-                          pci->device,
-                          pci->subsystem_vendor,
-                          pci->subsystem_device,
-                          pci->slot->number);
-        }
-        else
-        {
-                TRACE("INVALID PCIDEV PTR?????\n");
-        }
-#endif
 }
 
 
 
 static struct module* nvidia_mod = NULL;
 
-
-
-
-#if 0
-static int nvidia_ready_module_notify(struct notifier_block *self,
-                                unsigned long val, void *data)
-{
-        mutex_lock(&module_mutex);
-        nvidia_mod = find_module("nvidia");
-        mutex_unlock(&module_mutex);
-
-        if(nvidia_mod != NULL)
-        {
-                TRACE("%s : Found NVIDIA module. Core Code: %p to %p\n", __FUNCTION__,
-                          (void*)(nvidia_mod->module_core),
-                          (void*)(nvidia_mod->module_core) + nvidia_mod->core_size);
-                init_nv_device_reg();
-                return(0);
-        }
-        else
-        {
-                TRACE("%s : Could not find NVIDIA module!  Loaded?\n", __FUNCTION__);
-        }
-}
-
-static int nvidia_going_module_notify(struct notifier_block *self,
-                                unsigned long val, void *data)
-{
-        nvidia_mod = NULL;
-        mb();
-
-        return 0;
-}
-
-static struct notifier_block nvidia_ready = {
-        .notifier_call = nvidia_ready_module_notify,
-        .priority = 1,
-};
-
-static struct notifier_block nvidia_going = {
-        .notifier_call = nvidia_going_module_notify,
-        .priority = 1,
-};
-#endif
-
-
-
 static int init_nv_device_reg(void);
 static int shutdown_nv_device_reg(void);