gpu: nvgpu: handle replayable mmu fault during waiting for SM lockdown

outstanding replayable mmu fault will prevent SM from lockdown, so
handle the replayable mmu fault while polling lockdown status.

Jira EVLR-2643
Bug 200405202

Change-Id: I811f16ef4394a6cc42a5f37a17e426dd749c5652
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1741997
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 14 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 378bdc13..9bd48fdc 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -48,6 +48,7 @@
 #include "gv11b/subctx_gv11b.h"
 #include "gv11b/gv11b.h"
 #include "gv11b/gr_pri_gv11b.h"
+#include "gv11b/fb_gv11b.h"
 
 #include <nvgpu/hw/gv11b/hw_gr_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_fifo_gv11b.h>
@@ -3735,15 +3736,19 @@ int gv11b_gr_wait_for_sm_lock_down(struct gk20a *g,
                         return 0;
                 }
 
-                /* if an mmu fault is pending and mmu debug mode is not
-                 * enabled, the sm will never lock down.
-                 */
-                if (!mmu_debug_mode_enabled &&
-                     (g->ops.mm.mmu_fault_pending(g))) {
-                        nvgpu_err(g,
-                                "GPC%d TPC%d: mmu fault pending,"
-                                " SM%d will never lock down!", gpc, tpc, sm);
-                        return -EFAULT;
+                if (mmu_debug_mode_enabled) {
+                        gv11b_fb_handle_replayable_mmu_fault(g);
+                } else {
+                        /* if an mmu fault is pending and mmu debug mode is not
+                         * enabled, the sm will never lock down.
+                         */
+                        if (g->ops.mm.mmu_fault_pending(g)) {
+                                nvgpu_err(g,
+                                        "GPC%d TPC%d: mmu fault pending,"
+                                        " SM%d will never lock down!",
+                                        gpc, tpc, sm);
+                                return -EFAULT;
+                        }
                 }
 
                 nvgpu_usleep_range(delay, delay * 2);