gpu: nvgpu: wait ACK for FECS watchdog timeout

On Volta, nvgpu needs to wait for explicit ACK from CTXSW while
setting FECS watchdog timeoout

This is manual port of the fixes 4d7e5026e38528b88a4a168eca9a8b180475b368
and ad89436b03428a42e43042b6a849c15843fdebc4 on dev-main since clean
cherry-pick is not possible due to huge file and structure differences.

Bug 200603566

Change-Id: Icba69998ab45eee5fdf2a29e1ac1067589301be6
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2371708
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 16 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 5820a695..a7a804d2 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -5074,3 +5074,17 @@ fail:
         nvgpu_mutex_release(&g->dbg_sessions_lock);
         return err;
 }
+
+int gr_gv11b_set_fecs_watchdog_timeout(struct gk20a *g)
+{
+        return gr_gk20a_submit_fecs_method_op_locked(g,
+              (struct fecs_method_op_gk20a) {
+                      .method.addr = gr_fecs_method_push_adr_set_watchdog_timeout_f(),
+                      .method.data = 0x7fffffff,
+                      .mailbox = { .id   = 0,
+                                   .data = ~0, .clr = ~0, .ret = NULL,
+                                   .ok = gr_fecs_ctxsw_mailbox_value_pass_v(),
+                                   .fail = 0, },
+                      .cond.ok = GR_IS_UCODE_OP_EQUAL,
+                      .cond.fail = GR_IS_UCODE_OP_SKIP}, false);
+}
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
index 2f765336..5d617a94 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
@@ -257,4 +257,5 @@ void gr_gv11b_set_skedcheck(struct gk20a *g, u32 data);
 void gr_gv11b_set_go_idle_timeout(struct gk20a *g, u32 data);
 void gr_gv11b_set_coalesce_buffer_size(struct gk20a *g, u32 data);
 void gr_gv11b_set_tex_in_dbg(struct gk20a *g, u32 data);
+int gr_gv11b_set_fecs_watchdog_timeout(struct gk20a *g);
 #endif /* NVGPU_GR_GV11B_H */
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index a2384fc8..c0f7e4e3 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -452,6 +452,7 @@ static const struct gpu_ops gv11b_ops = {
                 .get_offset_in_gpccs_segment =
                         gr_gk20a_get_offset_in_gpccs_segment,
                 .set_debug_mode = gm20b_gr_set_debug_mode,
+                .set_fecs_watchdog_timeout = gr_gv11b_set_fecs_watchdog_timeout,
         },
         .fb = {
                 .init_hw = gv11b_fb_init_hw,