From 1b6669957330312f0336bc207a64668782129048 Mon Sep 17 00:00:00 2001
From: seshendra Gadagottu <sgadagottu@nvidia.com>
Date: Fri, 20 Oct 2017 14:49:01 -0700
Subject: gpu: nvgpu: gvxx: enhance class error debug info

Generated following hw definitions for gv100 and gv11b
to dump relevant data in gk20a_gr_handle_class_error:
gr_trapped_addr_mme_generated_v
gr_trapped_addr_datahigh_v
gr_trapped_addr_priv_v
gr_trapped_data_lo_r
gr_trapped_data_mme_r
gr_trapped_data_mme_pc_v

Bug 2003671

Change-Id: I055c693458625e1cdbbcdaa63ee4b0efd3697015
Signed-off-by: seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1582848
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
---
 .../gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h | 24 ++++++++++++++++++++++
 .../gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h | 24 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)

(limited to 'drivers/gpu/nvgpu/include')

diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h
index bdd749d0..09cbc793 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h
@@ -284,6 +284,22 @@ static inline u32 gr_trapped_addr_subch_v(u32 r)
 {
 	return (r >> 16U) & 0x7U;
 }
+static inline u32 gr_trapped_addr_mme_generated_v(u32 r)
+{
+	return (r >> 20U) & 0x1U;
+}
+static inline u32 gr_trapped_addr_datahigh_v(u32 r)
+{
+	return (r >> 24U) & 0x1U;
+}
+static inline u32 gr_trapped_addr_priv_v(u32 r)
+{
+	return (r >> 28U) & 0x1U;
+}
+static inline u32 gr_trapped_addr_status_v(u32 r)
+{
+	return (r >> 31U) & 0x1U;
+}
 static inline u32 gr_trapped_data_lo_r(void)
 {
 	return 0x00400708U;
@@ -292,6 +308,14 @@ static inline u32 gr_trapped_data_hi_r(void)
 {
 	return 0x0040070cU;
 }
+static inline u32 gr_trapped_data_mme_r(void)
+{
+	return 0x00400710U;
+}
+static inline u32 gr_trapped_data_mme_pc_v(u32 r)
+{
+	return (r >> 0U) & 0xfffU;
+}
 static inline u32 gr_status_r(void)
 {
 	return 0x00400700U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
index 3bdf2de2..692b7ba3 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
@@ -284,6 +284,22 @@ static inline u32 gr_trapped_addr_subch_v(u32 r)
 {
 	return (r >> 16U) & 0x7U;
 }
+static inline u32 gr_trapped_addr_mme_generated_v(u32 r)
+{
+	return (r >> 20U) & 0x1U;
+}
+static inline u32 gr_trapped_addr_datahigh_v(u32 r)
+{
+	return (r >> 24U) & 0x1U;
+}
+static inline u32 gr_trapped_addr_priv_v(u32 r)
+{
+	return (r >> 28U) & 0x1U;
+}
+static inline u32 gr_trapped_addr_status_v(u32 r)
+{
+	return (r >> 31U) & 0x1U;
+}
 static inline u32 gr_trapped_data_lo_r(void)
 {
 	return 0x00400708U;
@@ -292,6 +308,14 @@ static inline u32 gr_trapped_data_hi_r(void)
 {
 	return 0x0040070cU;
 }
+static inline u32 gr_trapped_data_mme_r(void)
+{
+	return 0x00400710U;
+}
+static inline u32 gr_trapped_data_mme_pc_v(u32 r)
+{
+	return (r >> 0U) & 0xfffU;
+}
 static inline u32 gr_status_r(void)
 {
 	return 0x00400700U;
-- 
cgit v1.2.2