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>

2 files changed, 12 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 56ebc8ca..5fcc3f7b 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -755,8 +755,8 @@ static int gr_gm20b_load_ctxsw_ucode(struct gk20a *g)
         }
 
         flags = PMU_ACR_CMD_BOOTSTRAP_FALCON_FLAGS_RESET_YES;
-        g->ops.pmu.lsfloadedfalconid = 0;
-        if (g->ops.pmu.fecsbootstrapdone) {
+        g->pmu_lsf_loaded_falcon_id = 0;
+        if (nvgpu_is_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE)) {
                 /* this must be recovery so bootstrap fecs and gpccs */
                 if (!nvgpu_is_enabled(g, NVGPU_SEC_SECUREGPCCS)) {
                         gr_gm20b_load_gpccs_with_bootloader(g);
@@ -776,7 +776,7 @@ static int gr_gm20b_load_ctxsw_ucode(struct gk20a *g)
 
         } else {
                 /* cold boot or rg exit */
-                g->ops.pmu.fecsbootstrapdone = true;
+                __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, true);
                 if (!nvgpu_is_enabled(g, NVGPU_SEC_SECUREGPCCS)) {
                         gr_gm20b_load_gpccs_with_bootloader(g);
                 } else {
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
index b85e72a0..a5940fcf 100644
--- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
@@ -132,7 +132,7 @@ static void pmu_handle_acr_init_wpr_msg(struct gk20a *g, struct pmu_msg *msg,
         gm20b_dbg_pmu("reply PMU_ACR_CMD_ID_INIT_WPR_REGION");
 
         if (msg->msg.acr.acrmsg.errorcode == PMU_ACR_SUCCESS)
-                g->ops.pmu.lspmuwprinitdone = 1;
+                g->pmu_lsf_pmu_wpr_init_done = 1;
         gk20a_dbg_fn("done");
 }
 
@@ -171,7 +171,7 @@ void pmu_handle_fecs_boot_acr_msg(struct gk20a *g, struct pmu_msg *msg,
         gm20b_dbg_pmu("reply PMU_ACR_CMD_ID_BOOTSTRAP_FALCON");
 
         gm20b_dbg_pmu("response code = %x\n", msg->msg.acr.acrmsg.falconid);
-        g->ops.pmu.lsfloadedfalconid = msg->msg.acr.acrmsg.falconid;
+        g->pmu_lsf_loaded_falcon_id = msg->msg.acr.acrmsg.falconid;
         gk20a_dbg_fn("done");
 }
 
@@ -205,8 +205,8 @@ void gm20b_pmu_load_lsf(struct gk20a *g, u32 falcon_id, u32 flags)
 
         gk20a_dbg_fn("");
 
-        gm20b_dbg_pmu("wprinit status = %x\n", g->ops.pmu.lspmuwprinitdone);
-        if (g->ops.pmu.lspmuwprinitdone) {
+        gm20b_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;
@@ -236,12 +236,12 @@ static int gm20b_load_falcon_ucode(struct gk20a *g, u32 falconidmask)
         if (!(falconidmask == (1 << LSF_FALCON_ID_FECS)))
                 return -EINVAL;
         /* 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;
                 }
@@ -299,8 +299,8 @@ void gm20b_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 = gm20b_write_dmatrfbase;
         gops->pmu.pmu_elpg_statistics = gk20a_pmu_elpg_statistics;
         gops->pmu.pmu_pg_init_param = NULL;