3 files changed, 18 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/gv100/flcn_gv100.c b/drivers/gpu/nvgpu/gv100/flcn_gv100.c
index 5820d6c9..5167e3f0 100644
--- a/drivers/gpu/nvgpu/gv100/flcn_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/flcn_gv100.c
@@ -29,27 +29,29 @@
 
 #include <nvgpu/hw/gv100/hw_falcon_gv100.h>
 
-void gv100_falcon_hal_sw_init(struct nvgpu_falcon *flcn)
+int gv100_falcon_hal_sw_init(struct nvgpu_falcon *flcn)
 {
         struct gk20a *g = flcn->g;
+        int err = 0;
 
-        switch (flcn->flcn_id) {
-        case FALCON_ID_MINION:
+        if (flcn->flcn_id == FALCON_ID_MINION) {
                 flcn->flcn_base = g->nvlink.minion_base;
                 flcn->is_falcon_supported = true;
                 flcn->is_interrupt_enabled = true;
-                break;
-        default:
-                break;
-        }
 
-        if (flcn->is_falcon_supported) {
-                nvgpu_mutex_init(&flcn->copy_lock);
+                err = nvgpu_mutex_init(&flcn->copy_lock);
+                if (err != 0) {
+                        nvgpu_err(g, "Error in flcn.copy_lock mutex initialization");
+                        return err;
+                }
+
                 gk20a_falcon_ops(flcn);
         } else {
                 /*
                  * Fall back
                  */
-                gp106_falcon_hal_sw_init(flcn);
+                err = gp106_falcon_hal_sw_init(flcn);
         }
+
+        return err;
 }
diff --git a/drivers/gpu/nvgpu/gv100/flcn_gv100.h b/drivers/gpu/nvgpu/gv100/flcn_gv100.h
index 869e74c8..9207519a 100644
--- a/drivers/gpu/nvgpu/gv100/flcn_gv100.h
+++ b/drivers/gpu/nvgpu/gv100/flcn_gv100.h
@@ -22,6 +22,6 @@
 #ifndef __FLCN_GV100_H__
 #define __FLCN_GV100_H__
 
-void gv100_falcon_hal_sw_init(struct nvgpu_falcon *flcn);
+int gv100_falcon_hal_sw_init(struct nvgpu_falcon *flcn);
 
 #endif /* __FLCN_GV100_H__ */
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
index b39e4165..3e1b2cda 100644
--- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
@@ -2715,7 +2715,11 @@ int gv100_nvlink_early_init(struct gk20a *g)
                 goto nvlink_init_exit;
         }
 
-        nvgpu_flcn_sw_init(g, FALCON_ID_MINION);
+        err = nvgpu_flcn_sw_init(g, FALCON_ID_MINION);
+        if (err != 0) {
+                nvgpu_err(g, "failed to sw init FALCON_ID_MINION");
+                goto nvlink_init_exit;
+        }
 
         g->nvlink.discovered_links &= ~g->nvlink.link_disable_mask;
         nvgpu_log(g, gpu_dbg_nvlink, "link_disable_mask = 0x%08x (from VBIOS)",