gpu: nvgpu: Catch DS exception

Catch DS exception and write an error to UART.

Change-Id: Iaad9813c48191f0d3d734d4af264b976a3818672
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/679142

2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index e4e0d163..e8340216 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -5612,6 +5612,12 @@ int gk20a_gr_isr(struct gk20a *g)
                                         NVGPU_CHANNEL_GR_ERROR_SW_NOTIFY);
                 }
 
+                if (exception & gr_exception_ds_m()) {
+                        u32 ds = gk20a_readl(g, gr_ds_hww_esr_r());
+                        gk20a_dbg(gpu_dbg_intr, "ds exception %08x\n", ds);
+                        gk20a_writel(g, gr_ds_hww_esr_r(), ds);
+                }
+
                 gk20a_writel(g, gr_intr_r(), gr_intr_exception_reset_f());
                 gr_intr &= ~gr_intr_exception_pending_f();
         }
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
index 8a6c2f23..2d63147a 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
@@ -182,6 +182,10 @@ static inline u32 gr_exception_memfmt_m(void)
 {
         return 0x1 << 1;
 }
+static inline u32 gr_exception_ds_m(void)
+{
+        return 0x1 << 4;
+}
 static inline u32 gr_exception1_r(void)
 {
         return 0x00400118;