5 files changed, 53 insertions, 15 deletions

diff --git a/drivers/gpu/nvgpu/common/falcon/falcon.c b/drivers/gpu/nvgpu/common/falcon/falcon.c
index 81ba5e81..6e5a477d 100644
--- a/drivers/gpu/nvgpu/common/falcon/falcon.c
+++ b/drivers/gpu/nvgpu/common/falcon/falcon.c
@@ -397,10 +397,11 @@ int nvgpu_flcn_bl_bootstrap(struct nvgpu_falcon *flcn,
         return status;
 }
 
-void nvgpu_flcn_sw_init(struct gk20a *g, u32 flcn_id)
+int nvgpu_flcn_sw_init(struct gk20a *g, u32 flcn_id)
 {
         struct nvgpu_falcon *flcn = NULL;
         struct gpu_ops *gops = &g->ops;
+        int err = 0;
 
         switch (flcn_id) {
         case FALCON_ID_PMU:
@@ -431,12 +432,15 @@ void nvgpu_flcn_sw_init(struct gk20a *g, u32 flcn_id)
                 break;
         default:
                 nvgpu_err(g, "Invalid/Unsupported falcon ID %x", flcn_id);
+                err = -ENODEV;
                 break;
         };
 
-        /* call to HAL method to assign flcn base & ops to selected falcon */
-        if (flcn) {
-                flcn->g = g;
-                gops->falcon.falcon_hal_sw_init(flcn);
+        if (err != 0) {
+                return err;
         }
+
+        /* call to HAL method to assign flcn base & ops to selected falcon */
+        flcn->g = g;
+        return gops->falcon.falcon_hal_sw_init(flcn);
 }
diff --git a/drivers/gpu/nvgpu/common/mm/comptags.c b/drivers/gpu/nvgpu/common/mm/comptags.c
index e6c99702..334236ec 100644
--- a/drivers/gpu/nvgpu/common/mm/comptags.c
+++ b/drivers/gpu/nvgpu/common/mm/comptags.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -66,7 +66,12 @@ int gk20a_comptag_allocator_init(struct gk20a *g,
                                  struct gk20a_comptag_allocator *allocator,
                                  unsigned long size)
 {
-        nvgpu_mutex_init(&allocator->lock);
+        int err = nvgpu_mutex_init(&allocator->lock);
+
+        if (err != 0) {
+                nvgpu_err(g, "Error in allocator.lock mutex initialization");
+                return err;
+        }
 
         /*
          * 0th comptag is special and is never used. The base for this bitmap
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c
index 6be619ed..54f621ae 100644
--- a/drivers/gpu/nvgpu/common/mm/mm.c
+++ b/drivers/gpu/nvgpu/common/mm/mm.c
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
@@ -375,7 +377,7 @@ clean_up_vm:
 static int nvgpu_init_mm_setup_sw(struct gk20a *g)
 {
         struct mm_gk20a *mm = &g->mm;
-        int err;
+        int err = 0;
 
         if (mm->sw_ready) {
                 nvgpu_log_info(g, "skip init");
@@ -383,7 +385,11 @@ static int nvgpu_init_mm_setup_sw(struct gk20a *g)
         }
 
         mm->g = g;
-        nvgpu_mutex_init(&mm->l2_op_lock);
+        err = nvgpu_mutex_init(&mm->l2_op_lock);
+        if (err != 0) {
+                nvgpu_err(g, "Error in l2_op_lock mutex initialization");
+                return err;
+        }
 
         /*TBD: make channel vm size configurable */
         mm->channel.user_size = NV_MM_DEFAULT_USER_SIZE -
diff --git a/drivers/gpu/nvgpu/common/mm/pd_cache.c b/drivers/gpu/nvgpu/common/mm/pd_cache.c
index 335ef360..77e20c38 100644
--- a/drivers/gpu/nvgpu/common/mm/pd_cache.c
+++ b/drivers/gpu/nvgpu/common/mm/pd_cache.c
@@ -90,6 +90,8 @@ int nvgpu_pd_cache_init(struct gk20a *g)
 {
         struct nvgpu_pd_cache *cache;
         u32 i;
+        int err = 0;
+
 
         /*
          * This gets called from finalize_poweron() so we need to make sure we
@@ -111,9 +113,15 @@ int nvgpu_pd_cache_init(struct gk20a *g)
         }
 
         cache->mem_tree = NULL;
-        g->mm.pd_cache = cache;
-        nvgpu_mutex_init(&cache->lock);
 
+        err = nvgpu_mutex_init(&cache->lock);
+        if (err != 0) {
+                nvgpu_err(g, "Error in cache.lock initialization");
+                nvgpu_kfree(g, cache);
+                return err;
+        }
+
+        g->mm.pd_cache = cache;
         pd_dbg(g, "PD cache initialized!");
 
         return 0;
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index b364f4d6..3cb8ed60 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -284,7 +284,7 @@ int __nvgpu_vm_init(struct mm_gk20a *mm,
                            bool userspace_managed,
                            char *name)
 {
-        int err;
+        int err = 0;
         char alloc_name[32];
         u64 kernel_vma_flags;
         u64 user_vma_start, user_vma_limit;
@@ -476,8 +476,19 @@ int __nvgpu_vm_init(struct mm_gk20a *mm,
 
         vm->mapped_buffers = NULL;
 
-        nvgpu_mutex_init(&vm->syncpt_ro_map_lock);
-        nvgpu_mutex_init(&vm->update_gmmu_lock);
+        err = nvgpu_mutex_init(&vm->syncpt_ro_map_lock);
+        if (err != 0) {
+                nvgpu_err(g,
+                           "Error in syncpt_ro_map_lock mutex initialization");
+                goto clean_up_allocators;
+        }
+
+        err = nvgpu_mutex_init(&vm->update_gmmu_lock);
+        if (err != 0) {
+                nvgpu_err(g, "Error in update_gmmu_lock mutex initialization");
+                goto clean_up_ro_map_lock;
+        }
+
         nvgpu_ref_init(&vm->ref);
         nvgpu_init_list_node(&vm->vm_area_list);
 
@@ -489,12 +500,16 @@ int __nvgpu_vm_init(struct mm_gk20a *mm,
         if (vm->va_limit > 4ULL * SZ_1G) {
                 err = nvgpu_init_sema_pool(vm);
                 if (err) {
-                        goto clean_up_allocators;
+                        goto clean_up_gmmu_lock;
                 }
         }
 
         return 0;
 
+clean_up_gmmu_lock:
+        nvgpu_mutex_destroy(&vm->update_gmmu_lock);
+clean_up_ro_map_lock:
+        nvgpu_mutex_destroy(&vm->syncpt_ro_map_lock);
 clean_up_allocators:
         if (nvgpu_alloc_initialized(&vm->kernel)) {
                 nvgpu_alloc_destroy(&vm->kernel);