gpu: nvgpu: ACR code refactor

-Created struct nvgpu_acr to hold acr module related member
 within single struct which are currently spread across multiple structs
 like nvgpu_pmu, pmu_ops & gk20a.
-Created struct hs_flcn_bl struct to hold ACR HS bootloader specific members
-Created struct hs_acr to hold ACR ucode specific members like bootloader data
 using struct hs_flcn_bl, acr type & falcon info on which ACR ucode need to run.
-Created acr ops under struct nvgpu_acr	to perform ACR specific operation,
 currently ACR ops were part PMU which caused to have always dependence
 on PMU even though ACR was not executing on PMU.
-Added acr_remove_support ops which will be called as part of
 gk20a_remove_support() method, earlier acr cleanup was part of
 pmu remove_support method.
-Created define for ACR types,
-Ops acr_sw_init() function helps to set ACR properties
 statically for chip currently in execution & assign ops to point to
 needed functions as per chip.
-Ops acr_sw_init execute at early as nvgpu_init_mm_support calls acr
 function to alloc blob space.
-Created ops to fill bootloader descriptor & to patch WPR info to ACR uocde
 based on interfaces used to bootstrap ACR ucode.
-Created function gm20b_bootstrap_hs_acr() function which is now common
 HAL for all chips to bootstrap ACR, earlier had 3 different function for
 gm20b/gp10b, gv11b & for all dgpu based on interface needed.
-Removed duplicate code for falcon engine wherever common falcon code can be used.
-Removed ACR code dependent on PMU & made changes to use from nvgpu_acr.

JIRA NVGPU-1148

Change-Id: I39951d2fc9a0bb7ee6057e0fa06da78045d47590
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1813231
GVS: Gerrit_Virtual_Submit
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 8 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index 56a6b01a..9b3b4ed5 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -548,6 +548,9 @@ static const struct gpu_ops vgpu_gp10b_ops = {
                 .read_vin_cal_slope_intercept_fuse = NULL,
                 .read_vin_cal_gain_offset_fuse = NULL,
         },
+        .acr = {
+                .acr_sw_init = nvgpu_gm20b_acr_sw_init,
+        },
         .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics,
         .get_litter_value = gp10b_get_litter_value,
 };
@@ -585,6 +588,7 @@ int vgpu_gp10b_init_hal(struct gk20a *g)
         gops->priv_ring = vgpu_gp10b_ops.priv_ring;
 
         gops->fuse = vgpu_gp10b_ops.fuse;
+        gops->acr = vgpu_gp10b_ops.acr;
 
         /* Lone Functions */
         gops->chip_init_gpu_characteristics =
@@ -631,7 +635,6 @@ int vgpu_gp10b_init_hal(struct gk20a *g)
 
         __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false);
         g->pmu_lsf_pmu_wpr_init_done = 0;
-        g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
 
         g->name = "gp10b";
 
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index bcd352e7..9ad0468e 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -217,6 +217,10 @@ void vgpu_remove_support_common(struct gk20a *g)
         if (g->pmu.remove_support)
                 g->pmu.remove_support(&g->pmu);
 
+        if (g->acr.remove_support != NULL) {
+                g->acr.remove_support(&g->acr);
+        }
+
         if (g->gr.remove_support)
                 g->gr.remove_support(&g->gr);