gpu: nvgpu: Move non-fp pmu members from gpu_ops

Move non-function pointer members out of the pmu and pmu_ver
substructs of gpu_ops. Ideally gpu_ops will have only function
ponters, better matching its intended purpose and improving
readability.

 - g.ops.pmu_ver.cmd_id_zbc_table_update has been changed to
    g.pmu_ver_cmd_id_zbc_table_update
 - g.ops.pmu.lspmuwprinitdone has been changed to
    g.pmu_lsf_pmu_wpr_init_done
 - g.ops.pmu.lsfloadedfalconid has been changed to
    g.pmu_lsf_loaded_falcon_id

Boolean flags have been implemented using the enabled.h API
 - g.ops.pmu_ver.is_pmu_zbc_save_supported moved to
    common flag NVGPU_PMU_ZBC_SAVE
 - g.ops.pmu.fecsbootstrapdone moved to
    common flag NVGPU_PMU_FECS_BOOTSTRAP_DONE

Jira NVGPU-74

Change-Id: I08fb20f8f382277f2c579f06d561914c000ea6e0
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1530981
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index a9fb794d..3b75b488 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -233,8 +233,8 @@ static void gp106_pmu_load_multiple_falcons(struct gk20a *g, u32 falconidmask,
 
         gk20a_dbg_fn("");
 
-        gp106_dbg_pmu("wprinit status = %x\n", g->ops.pmu.lspmuwprinitdone);
-        if (g->ops.pmu.lspmuwprinitdone) {
+        gp106_dbg_pmu("wprinit status = %x\n", g->pmu_lsf_pmu_wpr_init_done);
+        if (g->pmu_lsf_pmu_wpr_init_done) {
                 /* send message to load FECS falcon */
                 memset(&cmd, 0, sizeof(struct pmu_cmd));
                 cmd.hdr.unit_id = PMU_UNIT_ACR;
@@ -268,14 +268,14 @@ static int gp106_load_falcon_ucode(struct gk20a *g, u32 falconidmask)
         if (falconidmask & ~((1 << LSF_FALCON_ID_FECS) |
                         (1 << LSF_FALCON_ID_GPCCS)))
                 return -EINVAL;
-        g->ops.pmu.lsfloadedfalconid = 0;
+        g->pmu_lsf_loaded_falcon_id = 0;
         /* check whether pmu is ready to bootstrap lsf if not wait for it */
-        if (!g->ops.pmu.lspmuwprinitdone) {
+        if (!g->pmu_lsf_pmu_wpr_init_done) {
                 pmu_wait_message_cond(&g->pmu,
                                 gk20a_get_gr_idle_timeout(g),
-                                &g->ops.pmu.lspmuwprinitdone, 1);
+                                &g->pmu_lsf_pmu_wpr_init_done, 1);
                 /* check again if it still not ready indicate an error */
-                if (!g->ops.pmu.lspmuwprinitdone) {
+                if (!g->pmu_lsf_pmu_wpr_init_done) {
                         nvgpu_err(g, "PMU not ready to load LSF");
                         return -ETIMEDOUT;
                 }
@@ -284,8 +284,8 @@ static int gp106_load_falcon_ucode(struct gk20a *g, u32 falconidmask)
         gp106_pmu_load_multiple_falcons(g, falconidmask, flags);
         pmu_wait_message_cond(&g->pmu,
                         gk20a_get_gr_idle_timeout(g),
-                        &g->ops.pmu.lsfloadedfalconid, falconidmask);
-        if (g->ops.pmu.lsfloadedfalconid != falconidmask)
+                        &g->pmu_lsf_loaded_falcon_id, falconidmask);
+        if (g->pmu_lsf_loaded_falcon_id != falconidmask)
                 return -ETIMEDOUT;
         return 0;
 }
@@ -318,8 +318,8 @@ void gp106_init_pmu_ops(struct gk20a *g)
         gops->pmu.pmu_mutex_size = pwr_pmu_mutex__size_1_v;
         gops->pmu.pmu_mutex_acquire = gk20a_pmu_mutex_acquire;
         gops->pmu.pmu_mutex_release = gk20a_pmu_mutex_release;
-        gops->pmu.lspmuwprinitdone = 0;
-        gops->pmu.fecsbootstrapdone = false;
+        g->pmu_lsf_pmu_wpr_init_done = 0;
+        __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false);
         gops->pmu.write_dmatrfbase = gp10b_write_dmatrfbase;
         gops->pmu.pmu_elpg_statistics = gp106_pmu_elpg_statistics;
         gops->pmu.pmu_pg_init_param = gp106_pg_param_init;