gpu: nvgpu: check return value of mutex_init in mclk code

- check return value of nvgpu_mutex_init in clk_mclk.c
- declare new callback g->ops.pmu.mclk_deinit() to
  deinitialize mclk mutexes
- and define this callback for gp106
- add corresponding nvgpu_mutex_destroy calls in
  deinitialization

Jira NVGPU-13

Change-Id: I1491c084d330ac9756c9520477e6fe494560e651
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1321294
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

5 files changed, 42 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c
index 16852b5e..f973a696 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.c
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.c
@@ -2174,20 +2174,33 @@ done:
         return status;
 }
 
+void clk_mclkseq_deinit_mclk_gddr5(struct gk20a *g)
+{
+        struct clk_mclk_state *mclk = &g->clk_pmu.clk_mclk;
+
+        nvgpu_mutex_destroy(&mclk->data_lock);
+        nvgpu_mutex_destroy(&mclk->mclk_lock);
+}
+
 int clk_mclkseq_init_mclk_gddr5(struct gk20a *g)
 {
         struct clk_mclk_state *mclk;
         int status;
         struct clk_set_info *p5_info;
         struct clk_set_info *p0_info;
-
+        int err;
 
         gk20a_dbg_fn("");
 
         mclk = &g->clk_pmu.clk_mclk;
 
-        nvgpu_mutex_init(&mclk->mclk_lock);
-        nvgpu_mutex_init(&mclk->data_lock);
+        err = nvgpu_mutex_init(&mclk->mclk_lock);
+        if (err)
+                return err;
+
+        err = nvgpu_mutex_init(&mclk->data_lock);
+        if (err)
+                goto fail_mclk_mutex;
 
         /* FBPA gain WAR */
         gk20a_writel(g, fb_fbpa_fbio_iref_byte_rx_ctrl_r(), 0x22222222);
@@ -2196,32 +2209,37 @@ int clk_mclkseq_init_mclk_gddr5(struct gk20a *g)
 
         /* Parse VBIOS */
         status = mclk_get_memclk_table(g);
-        if (status < 0)
-                return status;
+        if (status < 0) {
+                err = status;
+                goto fail_data_mutex;
+        }
 
         /* Load RAM pattern */
         mclk_memory_load_training_pattern(g);
 
         p5_info = pstate_get_clk_set_info(g,
                         CTRL_PERF_PSTATE_P5, clkwhich_mclk);
-        if (!p5_info)
-                return -EINVAL;
+        if (!p5_info) {
+                err = -EINVAL;
+                goto fail_data_mutex;
+        }
 
         p0_info = pstate_get_clk_set_info(g,
                         CTRL_PERF_PSTATE_P0, clkwhich_mclk);
-        if (!p0_info)
-                return -EINVAL;
-
+        if (!p0_info) {
+                err = -EINVAL;
+                goto fail_data_mutex;
+        }
 
         mclk->p5_min = p5_info->min_mhz;
         mclk->p0_min = p0_info->min_mhz;
 
-
         mclk->vreg_buf = nvgpu_kcalloc(g, VREG_COUNT, sizeof(u32));
         if (!mclk->vreg_buf) {
                 gk20a_err(dev_from_gk20a(g),
                                 "unable to allocate memory for VREG");
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto fail_data_mutex;
         }
 
 #ifdef CONFIG_DEBUG_FS
@@ -2235,6 +2253,12 @@ int clk_mclkseq_init_mclk_gddr5(struct gk20a *g)
         mclk->init = true;
 
         return 0;
+
+fail_data_mutex:
+        nvgpu_mutex_destroy(&mclk->data_lock);
+fail_mclk_mutex:
+        nvgpu_mutex_destroy(&mclk->mclk_lock);
+        return err;
 }
 
 int clk_mclkseq_change_mclk_gddr5(struct gk20a *g, u16 val)
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.h b/drivers/gpu/nvgpu/clk/clk_mclk.h
index 731f289d..64eee5ac 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.h
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.h
@@ -47,6 +47,7 @@ struct clk_mclk_state {
 };
 
 int clk_mclkseq_init_mclk_gddr5(struct gk20a *g);
+void clk_mclkseq_deinit_mclk_gddr5(struct gk20a *g);
 int clk_mclkseq_change_mclk_gddr5(struct gk20a *g, u16 val);
 
 #endif
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 4ed7251a..aae3072a 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -452,6 +452,9 @@ static int gk20a_pm_prepare_poweroff(struct device *dev)
         ret |= gk20a_mm_suspend(g);
         ret |= gk20a_fifo_suspend(g);
 
+        if (g->ops.pmu.mclk_deinit)
+                g->ops.pmu.mclk_deinit(g);
+
         /* Disable GPCPLL */
         if (g->ops.clk.suspend_clk_support)
                 ret |= g->ops.clk.suspend_clk_support(g);
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 951c8267..e3dad962 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -699,6 +699,7 @@ struct gpu_ops {
                 int (*flcn_populate_bl_dmem_desc)(struct gk20a *g,
                         void *lsfm,     u32 *p_bl_gen_desc_size, u32 falconid);
                 int (*mclk_init)(struct gk20a *g);
+                void (*mclk_deinit)(struct gk20a *g);
                 u32  lspmuwprinitdone;
                 u32  lsfloadedfalconid;
                 bool fecsbootstrapdone;
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index bb9c63ca..a2eef6ff 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -439,6 +439,7 @@ void gp106_init_pmu_ops(struct gpu_ops *gops)
         gops->pmu.dump_secure_fuses = NULL;
         gops->pmu.reset = gp106_falcon_reset;
         gops->pmu.mclk_init = clk_mclkseq_init_mclk_gddr5;
+        gops->pmu.mclk_deinit = clk_mclkseq_deinit_mclk_gddr5;
         gops->pmu.is_pmu_supported = gp106_is_pmu_supported;
 
         gk20a_dbg_fn("done");