gpu: nvgpu: PMU reset reorg

- nvgpu_pmu_reset() as pmu reset for
all chips & removed gk20a_pmu_reset() &
gp106_pmu_reset() along with dependent
code.

- Created ops to do PMU engine reset & to
know the engine reset status

- Removed pmu.reset ops & replaced with
nvgpu_flcn_reset(pmu->flcn)

- Moved sec2 reset to sec2_gp106 from
pmu_gp106 & cleaned PMU code part of sec2.

JIRA NVGPU-99

Change-Id: I7575e4ca2b34922d73d171f6a41bfcdc2f40dc96
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: https://git-master/r/1507881
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 25 insertions, 94 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
index 9d378248..2a246fdc 100644
--- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
@@ -11,6 +11,7 @@
  * more details.
  */
 #include <nvgpu/falcon.h>
+#include <nvgpu/pmu.h>
 
 #include "gk20a/gk20a.h"
 
@@ -256,7 +257,7 @@ static void gk20a_falcon_engine_dependency_ops(struct nvgpu_falcon *flcn)
 
         switch (flcn->flcn_id) {
         case FALCON_ID_PMU:
-                flcn_eng_dep_ops->reset_eng = gk20a_pmu_reset;
+                flcn_eng_dep_ops->reset_eng = nvgpu_pmu_reset;
                 break;
         default:
                 /* NULL assignment make sure
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 191d1c39..ff37d9f3 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -755,7 +755,8 @@ struct gpu_ops {
                 int (*pmu_lpwr_disable_pg)(struct gk20a *g, bool pstate_lock);
                 u32 (*pmu_pg_param_post_init)(struct gk20a *g);
                 void (*dump_secure_fuses)(struct gk20a *g);
-                int (*reset)(struct gk20a *g);
+                int (*reset_engine)(struct gk20a *g, bool do_reset);
+                bool (*is_engine_in_reset)(struct gk20a *g);
                 int (*falcon_wait_for_halt)(struct gk20a *g,
                         unsigned int timeout);
                 int (*falcon_clear_halt_interrupt_status)(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 4a676b82..3fc73e42 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -38,8 +38,6 @@
 #define gk20a_dbg_pmu(fmt, arg...) \
         gk20a_dbg(gpu_dbg_pmu, fmt, ##arg)
 
-#define PMU_MEM_SCRUBBING_TIMEOUT_MAX 1000
-#define PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT 10
 
 bool nvgpu_find_hex_in_string(char *strings, struct gk20a *g, u32 *hex_pos)
 {
@@ -159,80 +157,7 @@ void pmu_enable_irq(struct nvgpu_pmu *pmu, bool enable)
         gk20a_dbg_fn("done");
 }
 
-int pmu_enable_hw(struct nvgpu_pmu *pmu, bool enable)
-{
-        struct gk20a *g = gk20a_from_pmu(pmu);
-        struct nvgpu_timeout timeout;
-        int err = 0;
-
-        gk20a_dbg_fn("");
-
-        if (enable) {
-                g->ops.mc.enable(g, mc_enable_pwr_enabled_f());
-
-                if (g->ops.clock_gating.slcg_pmu_load_gating_prod)
-                        g->ops.clock_gating.slcg_pmu_load_gating_prod(g,
-                                        g->slcg_enabled);
-                if (g->ops.clock_gating.blcg_pmu_load_gating_prod)
-                        g->ops.clock_gating.blcg_pmu_load_gating_prod(g,
-                                        g->blcg_enabled);
-
-                nvgpu_timeout_init(g, &timeout,
-                                   PMU_MEM_SCRUBBING_TIMEOUT_MAX /
-                                        PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT,
-                                   NVGPU_TIMER_RETRY_TIMER);
-                do {
-                        if (nvgpu_flcn_get_mem_scrubbing_status(pmu->flcn)) {
-                                gk20a_dbg_fn("done");
-                                goto exit;
-                        }
-                        nvgpu_udelay(PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT);
-                } while (!nvgpu_timeout_expired(&timeout));
-
-                g->ops.mc.disable(g, mc_enable_pwr_enabled_f());
-                nvgpu_err(g, "Falcon mem scrubbing timeout");
-
-                err = -ETIMEDOUT;
-        } else
-                g->ops.mc.disable(g, mc_enable_pwr_enabled_f());
-
-exit:
-        return err;
-}
 
-static int pmu_enable(struct nvgpu_pmu *pmu, bool enable)
-{
-        struct gk20a *g = gk20a_from_pmu(pmu);
-        u32 pmc_enable;
-        int err;
-
-        gk20a_dbg_fn("");
-
-        if (!enable) {
-                pmc_enable = gk20a_readl(g, mc_enable_r());
-                if (mc_enable_pwr_v(pmc_enable) !=
-                    mc_enable_pwr_disabled_v()) {
-
-                        pmu_enable_irq(pmu, false);
-                        pmu_enable_hw(pmu, false);
-                }
-        } else {
-                err = pmu_enable_hw(pmu, true);
-                if (err)
-                        return err;
-
-                /* TBD: post reset */
-
-                err = nvgpu_flcn_wait_idle(pmu->flcn);
-                if (err)
-                        return err;
-
-                pmu_enable_irq(pmu, true);
-        }
-
-        gk20a_dbg_fn("done");
-        return 0;
-}
 
 int pmu_bootstrap(struct nvgpu_pmu *pmu)
 {
@@ -576,25 +501,27 @@ static void gk20a_write_dmatrfbase(struct gk20a *g, u32 addr)
         gk20a_writel(g, pwr_falcon_dmatrfbase_r(), addr);
 }
 
-int gk20a_pmu_reset(struct gk20a *g)
+bool gk20a_pmu_is_engine_in_reset(struct gk20a *g)
 {
-        struct nvgpu_pmu *pmu = &g->pmu;
-        int err;
+        u32 pmc_enable;
+        bool status = false;
 
-        err = nvgpu_flcn_wait_idle(pmu->flcn);
-        if (err)
-                goto exit;
+        pmc_enable = gk20a_readl(g, mc_enable_r());
+        if (mc_enable_pwr_v(pmc_enable) ==
+                        mc_enable_pwr_disabled_v())
+                status = true;
 
-        err = pmu_enable(pmu, false);
-        if (err)
-                goto exit;
+        return status;
+}
 
-        err = pmu_enable(pmu, true);
-        if (err)
-                goto exit;
+int gk20a_pmu_engine_reset(struct gk20a *g, bool do_reset)
+{
+        if (do_reset)
+                g->ops.mc.enable(g, mc_enable_pwr_enabled_f());
+        else
+                g->ops.mc.disable(g, mc_enable_pwr_enabled_f());
 
-exit:
-        return err;
+        return 0;
 }
 
 static bool gk20a_is_pmu_supported(struct gk20a *g)
@@ -650,7 +577,8 @@ void gk20a_init_pmu_ops(struct gpu_ops *gops)
         gops->pmu.alloc_blob_space = NULL;
         gops->pmu.pmu_populate_loader_cfg = NULL;
         gops->pmu.flcn_populate_bl_dmem_desc = NULL;
-        gops->pmu.reset = NULL;
+        gops->pmu.reset_engine = gk20a_pmu_engine_reset;
+        gops->pmu.is_engine_in_reset = gk20a_pmu_is_engine_in_reset;
 }
 
 static void pmu_handle_zbc_msg(struct gk20a *g, struct pmu_msg *msg,
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
index 8f337855..997a88d2 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
@@ -70,9 +70,10 @@ void pmu_handle_fecs_boot_acr_msg(struct gk20a *g, struct pmu_msg *msg,
                                 void *param, u32 handle, u32 status);
 void gk20a_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id,
                 struct pmu_pg_stats_data *pg_stat_data);
-int gk20a_pmu_reset(struct gk20a *g);
+bool gk20a_pmu_is_engine_in_reset(struct gk20a *g);
+int gk20a_pmu_engine_reset(struct gk20a *g, bool do_reset);
+
 int pmu_idle(struct nvgpu_pmu *pmu);
-int pmu_enable_hw(struct nvgpu_pmu *pmu, bool enable);
 
 bool nvgpu_find_hex_in_string(char *strings, struct gk20a *g, u32 *hex_pos);