diff options
author | seshendra Gadagottu <sgadagottu@nvidia.com> | 2017-10-20 17:49:01 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-23 13:46:11 -0400 |
commit | 1b6669957330312f0336bc207a64668782129048 (patch) | |
tree | b65641a5f1ebe85d9b8399d91e28efe317f9508d /drivers/gpu/nvgpu | |
parent | 8b100734e08e887eb363ced2c9455fa874e6e6a2 (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h | 24 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h | 24 |
2 files changed, 48 insertions, 0 deletions
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) | |||
284 | { | 284 | { |
285 | return (r >> 16U) & 0x7U; | 285 | return (r >> 16U) & 0x7U; |
286 | } | 286 | } |
287 | static inline u32 gr_trapped_addr_mme_generated_v(u32 r) | ||
288 | { | ||
289 | return (r >> 20U) & 0x1U; | ||
290 | } | ||
291 | static inline u32 gr_trapped_addr_datahigh_v(u32 r) | ||
292 | { | ||
293 | return (r >> 24U) & 0x1U; | ||
294 | } | ||
295 | static inline u32 gr_trapped_addr_priv_v(u32 r) | ||
296 | { | ||
297 | return (r >> 28U) & 0x1U; | ||
298 | } | ||
299 | static inline u32 gr_trapped_addr_status_v(u32 r) | ||
300 | { | ||
301 | return (r >> 31U) & 0x1U; | ||
302 | } | ||
287 | static inline u32 gr_trapped_data_lo_r(void) | 303 | static inline u32 gr_trapped_data_lo_r(void) |
288 | { | 304 | { |
289 | return 0x00400708U; | 305 | return 0x00400708U; |
@@ -292,6 +308,14 @@ static inline u32 gr_trapped_data_hi_r(void) | |||
292 | { | 308 | { |
293 | return 0x0040070cU; | 309 | return 0x0040070cU; |
294 | } | 310 | } |
311 | static inline u32 gr_trapped_data_mme_r(void) | ||
312 | { | ||
313 | return 0x00400710U; | ||
314 | } | ||
315 | static inline u32 gr_trapped_data_mme_pc_v(u32 r) | ||
316 | { | ||
317 | return (r >> 0U) & 0xfffU; | ||
318 | } | ||
295 | static inline u32 gr_status_r(void) | 319 | static inline u32 gr_status_r(void) |
296 | { | 320 | { |
297 | return 0x00400700U; | 321 | 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) | |||
284 | { | 284 | { |
285 | return (r >> 16U) & 0x7U; | 285 | return (r >> 16U) & 0x7U; |
286 | } | 286 | } |
287 | static inline u32 gr_trapped_addr_mme_generated_v(u32 r) | ||
288 | { | ||
289 | return (r >> 20U) & 0x1U; | ||
290 | } | ||
291 | static inline u32 gr_trapped_addr_datahigh_v(u32 r) | ||
292 | { | ||
293 | return (r >> 24U) & 0x1U; | ||
294 | } | ||
295 | static inline u32 gr_trapped_addr_priv_v(u32 r) | ||
296 | { | ||
297 | return (r >> 28U) & 0x1U; | ||
298 | } | ||
299 | static inline u32 gr_trapped_addr_status_v(u32 r) | ||
300 | { | ||
301 | return (r >> 31U) & 0x1U; | ||
302 | } | ||
287 | static inline u32 gr_trapped_data_lo_r(void) | 303 | static inline u32 gr_trapped_data_lo_r(void) |
288 | { | 304 | { |
289 | return 0x00400708U; | 305 | return 0x00400708U; |
@@ -292,6 +308,14 @@ static inline u32 gr_trapped_data_hi_r(void) | |||
292 | { | 308 | { |
293 | return 0x0040070cU; | 309 | return 0x0040070cU; |
294 | } | 310 | } |
311 | static inline u32 gr_trapped_data_mme_r(void) | ||
312 | { | ||
313 | return 0x00400710U; | ||
314 | } | ||
315 | static inline u32 gr_trapped_data_mme_pc_v(u32 r) | ||
316 | { | ||
317 | return (r >> 0U) & 0xfffU; | ||
318 | } | ||
295 | static inline u32 gr_status_r(void) | 319 | static inline u32 gr_status_r(void) |
296 | { | 320 | { |
297 | return 0x00400700U; | 321 | return 0x00400700U; |