3 files changed, 96 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
index f5ca144a..de2502ce 100644
--- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
@@ -38,6 +38,7 @@
 #include "acr_gv11b.h"
 #include "pmu_gv11b.h"
 #include "gm20b/mm_gm20b.h"
+#include "gm20b/pmu_gm20b.h"
 #include "gm20b/acr_gm20b.h"
 #include "gp106/acr_gp106.h"
 
@@ -68,6 +69,8 @@ void gv11b_setup_apertures(struct gk20a *g)
         struct mm_gk20a *mm = &g->mm;
         struct nvgpu_mem *inst_block = &mm->pmu.inst_block;
 
+        nvgpu_log_fn(g, " ");
+
         /* setup apertures - virtual */
         gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_UCODE),
                         pwr_fbif_transcfg_mem_type_physical_f() |
@@ -91,3 +94,87 @@ void gv11b_setup_apertures(struct gk20a *g)
                         pwr_fbif_transcfg_mem_type_physical_f() |
                         pwr_fbif_transcfg_target_noncoherent_sysmem_f());
 }
+
+int gv11b_acr_patch_wpr_info_to_ucode(struct gk20a *g, struct nvgpu_acr *acr,
+        struct hs_acr *acr_desc, bool is_recovery)
+{
+        struct nvgpu_firmware *acr_fw = acr_desc->acr_fw;
+        struct acr_fw_header *acr_fw_hdr = NULL;
+        struct bin_hdr *acr_fw_bin_hdr = NULL;
+        struct flcn_acr_desc_v1 *acr_dmem_desc;
+        u32 *acr_ucode_header = NULL;
+        u32 *acr_ucode_data = NULL;
+
+        nvgpu_log_fn(g, " ");
+
+        if (is_recovery) {
+                acr_desc->acr_dmem_desc_v1->nonwpr_ucode_blob_size = 0U;
+        } else {
+                acr_fw_bin_hdr = (struct bin_hdr *)acr_fw->data;
+                acr_fw_hdr = (struct acr_fw_header *)
+                        (acr_fw->data + acr_fw_bin_hdr->header_offset);
+
+                acr_ucode_data = (u32 *)(acr_fw->data +
+                        acr_fw_bin_hdr->data_offset);
+                acr_ucode_header = (u32 *)(acr_fw->data +
+                        acr_fw_hdr->hdr_offset);
+
+                /* During recovery need to update blob size as 0x0*/
+                acr_desc->acr_dmem_desc_v1 = (struct flcn_acr_desc_v1 *)
+                        ((u8 *)(acr_desc->acr_ucode.cpu_va) +
+                        acr_ucode_header[2U]);
+
+                /* Patch WPR info to ucode */
+                acr_dmem_desc = (struct flcn_acr_desc_v1 *)
+                        &(((u8 *)acr_ucode_data)[acr_ucode_header[2U]]);
+
+                acr_dmem_desc->nonwpr_ucode_blob_start =
+                        nvgpu_mem_get_addr(g, &g->acr.ucode_blob);
+                acr_dmem_desc->nonwpr_ucode_blob_size =
+                        g->acr.ucode_blob.size;
+                acr_dmem_desc->regions.no_regions = 1U;
+                acr_dmem_desc->wpr_offset = 0U;
+        }
+
+        return 0;
+}
+
+static void gv11b_acr_default_sw_init(struct gk20a *g, struct hs_acr *hs_acr)
+{
+        struct hs_flcn_bl *hs_bl = &hs_acr->acr_hs_bl;
+
+        nvgpu_log_fn(g, " ");
+
+        hs_bl->bl_fw_name = HSBIN_ACR_BL_UCODE_IMAGE;
+
+        hs_acr->acr_type = ACR_DEFAULT;
+        hs_acr->acr_fw_name = HSBIN_ACR_UCODE_IMAGE;
+
+        hs_acr->ptr_bl_dmem_desc = &hs_acr->bl_dmem_desc_v1;
+        hs_acr->bl_dmem_desc_size = sizeof(struct flcn_bl_dmem_desc_v1);
+
+        hs_acr->acr_flcn = &g->pmu_flcn;
+        hs_acr->acr_flcn_setup_hw_and_bl_bootstrap =
+                gm20b_pmu_setup_hw_and_bl_bootstrap;
+}
+
+void nvgpu_gv11b_acr_sw_init(struct gk20a *g, struct nvgpu_acr *acr)
+{
+        nvgpu_log_fn(g, " ");
+
+        acr->g = g;
+
+        acr->bootstrap_owner = LSF_FALCON_ID_PMU;
+        acr->max_supported_lsfm = MAX_SUPPORTED_LSFM;
+
+        gv11b_acr_default_sw_init(g, &acr->acr);
+
+        acr->get_wpr_info = gm20b_wpr_info;
+        acr->alloc_blob_space = gv11b_alloc_blob_space;
+        acr->bootstrap_hs_acr = gm20b_bootstrap_hs_acr;
+        acr->patch_wpr_info_to_ucode = gv11b_acr_patch_wpr_info_to_ucode;
+        acr->acr_fill_bl_dmem_desc =
+                gp106_acr_fill_bl_dmem_desc;
+
+        acr->remove_support = gm20b_remove_acr_support;
+}
diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.h b/drivers/gpu/nvgpu/gv11b/acr_gv11b.h
index 8529e821..99fe3ea3 100644
--- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.h
@@ -30,4 +30,9 @@ int gv11b_init_pmu_setup_hw1(struct gk20a *g,
 void gv11b_setup_apertures(struct gk20a *g);
 int gv11b_alloc_blob_space(struct gk20a *g, size_t size,
                                 struct nvgpu_mem *mem);
+
+void nvgpu_gv11b_acr_sw_init(struct gk20a *g, struct nvgpu_acr *acr);
+int gv11b_acr_patch_wpr_info_to_ucode(struct gk20a *g, struct nvgpu_acr *acr,
+        struct hs_acr *acr_desc, bool is_recovery);
 #endif /* NVGPU_ACR_GV11B_H */
+
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 0d9f65bf..18b00ea4 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -823,6 +823,9 @@ static const struct gpu_ops gv11b_ops = {
                 .read_vin_cal_slope_intercept_fuse = NULL,
                 .read_vin_cal_gain_offset_fuse = NULL,
         },
+        .acr = {
+                .acr_sw_init = nvgpu_gv11b_acr_sw_init,
+        },
         .chip_init_gpu_characteristics = gv11b_init_gpu_characteristics,
         .get_litter_value = gv11b_get_litter_value,
 };
@@ -858,6 +861,7 @@ int gv11b_init_hal(struct gk20a *g)
         gops->priv_ring = gv11b_ops.priv_ring;
         gops->fuse = gv11b_ops.fuse;
         gops->clk_arb = gv11b_ops.clk_arb;
+        gops->acr = gv11b_ops.acr;
 
         /* Lone functions */
         gops->chip_init_gpu_characteristics =
@@ -903,7 +907,6 @@ int gv11b_init_hal(struct gk20a *g)
 
         __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false);
         __nvgpu_set_enabled(g, NVGPU_FECS_TRACE_VA, true);
-        g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
 
         __nvgpu_set_enabled(g, NVGPU_SUPPORT_MULTIPLE_WPR, false);