summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2015-03-02 04:19:37 -0500
committerDan Willemsen <dwillemsen@nvidia.com>2015-04-04 21:09:24 -0400
commit1b6372ec6b8704d6bacc6b8abf7e599f1cbc15ca (patch)
treeff7cad9958ff96b6aab61a481c3728635c12652a /drivers/gpu/nvgpu
parent0ff7f65382d84f74902a8d2ead0ac3fac3ddad78 (diff)
gpu: nvgpu: add exception registers to dump
Add below exception registers to GR dump : NV_PGRAPH_PRI_BE0_BECS_BE_EXCEPTION NV_PGRAPH_PRI_BE0_BECS_BE_EXCEPTION_EN NV_PGRAPH_PRI_GPC0_GPCCS_GPC_EXCEPTION NV_PGRAPH_PRI_GPC0_GPCCS_GPC_EXCEPTION_EN NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_EXCEPTION NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_EXCEPTION_EN Bug 200078514 Change-Id: Ib0ec34f7bf5a136928c53cf8398b4929fb4639c5 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/712480 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c12
-rw-r--r--drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h24
-rw-r--r--drivers/gpu/nvgpu/gm20b/gr_gm20b.c12
-rw-r--r--drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h24
4 files changed, 72 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index f632245e..b0fd3c0c 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -7437,6 +7437,18 @@ static int gr_gk20a_dump_gr_status_regs(struct gk20a *g,
7437 gk20a_readl(g, gr_pri_bes_zrop_status_r())); 7437 gk20a_readl(g, gr_pri_bes_zrop_status_r()));
7438 gk20a_debug_output(o, "NV_PGRAPH_PRI_BES_ZROP_STATUS2 : 0x%x\n", 7438 gk20a_debug_output(o, "NV_PGRAPH_PRI_BES_ZROP_STATUS2 : 0x%x\n",
7439 gk20a_readl(g, gr_pri_bes_zrop_status2_r())); 7439 gk20a_readl(g, gr_pri_bes_zrop_status2_r()));
7440 gk20a_debug_output(o, "NV_PGRAPH_PRI_BE0_BECS_BE_EXCEPTION: 0x%x\n",
7441 gk20a_readl(g, gr_pri_be0_becs_be_exception_r()));
7442 gk20a_debug_output(o, "NV_PGRAPH_PRI_BE0_BECS_BE_EXCEPTION_EN: 0x%x\n",
7443 gk20a_readl(g, gr_pri_be0_becs_be_exception_en_r()));
7444 gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_GPCCS_GPC_EXCEPTION: 0x%x\n",
7445 gk20a_readl(g, gr_pri_gpc0_gpccs_gpc_exception_r()));
7446 gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_GPCCS_GPC_EXCEPTION_EN: 0x%x\n",
7447 gk20a_readl(g, gr_pri_gpc0_gpccs_gpc_exception_en_r()));
7448 gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_EXCEPTION: 0x%x\n",
7449 gk20a_readl(g, gr_pri_gpc0_tpc0_tpccs_tpc_exception_r()));
7450 gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_EXCEPTION_EN: 0x%x\n",
7451 gk20a_readl(g, gr_pri_gpc0_tpc0_tpccs_tpc_exception_en_r()));
7440 return 0; 7452 return 0;
7441} 7453}
7442 7454
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
index d3345a51..ff698a51 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
@@ -298,6 +298,30 @@ static inline u32 gr_engine_status_value_busy_f(void)
298{ 298{
299 return 0x1; 299 return 0x1;
300} 300}
301static inline u32 gr_pri_be0_becs_be_exception_r(void)
302{
303 return 0x00410204;
304}
305static inline u32 gr_pri_be0_becs_be_exception_en_r(void)
306{
307 return 0x00410208;
308}
309static inline u32 gr_pri_gpc0_gpccs_gpc_exception_r(void)
310{
311 return 0x00502c90;
312}
313static inline u32 gr_pri_gpc0_gpccs_gpc_exception_en_r(void)
314{
315 return 0x00502c94;
316}
317static inline u32 gr_pri_gpc0_tpc0_tpccs_tpc_exception_r(void)
318{
319 return 0x00504508;
320}
321static inline u32 gr_pri_gpc0_tpc0_tpccs_tpc_exception_en_r(void)
322{
323 return 0x0050450c;
324}
301static inline u32 gr_activity_0_r(void) 325static inline u32 gr_activity_0_r(void)
302{ 326{
303 return 0x00400380; 327 return 0x00400380;
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 79e46421..da1c1ab0 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -934,6 +934,18 @@ static int gr_gm20b_dump_gr_status_regs(struct gk20a *g,
934 gk20a_readl(g, gr_pri_bes_zrop_status_r())); 934 gk20a_readl(g, gr_pri_bes_zrop_status_r()));
935 gk20a_debug_output(o, "NV_PGRAPH_PRI_BES_ZROP_STATUS2 : 0x%x\n", 935 gk20a_debug_output(o, "NV_PGRAPH_PRI_BES_ZROP_STATUS2 : 0x%x\n",
936 gk20a_readl(g, gr_pri_bes_zrop_status2_r())); 936 gk20a_readl(g, gr_pri_bes_zrop_status2_r()));
937 gk20a_debug_output(o, "NV_PGRAPH_PRI_BE0_BECS_BE_EXCEPTION: 0x%x\n",
938 gk20a_readl(g, gr_pri_be0_becs_be_exception_r()));
939 gk20a_debug_output(o, "NV_PGRAPH_PRI_BE0_BECS_BE_EXCEPTION_EN: 0x%x\n",
940 gk20a_readl(g, gr_pri_be0_becs_be_exception_en_r()));
941 gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_GPCCS_GPC_EXCEPTION: 0x%x\n",
942 gk20a_readl(g, gr_pri_gpc0_gpccs_gpc_exception_r()));
943 gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_GPCCS_GPC_EXCEPTION_EN: 0x%x\n",
944 gk20a_readl(g, gr_pri_gpc0_gpccs_gpc_exception_en_r()));
945 gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_EXCEPTION: 0x%x\n",
946 gk20a_readl(g, gr_pri_gpc0_tpc0_tpccs_tpc_exception_r()));
947 gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_EXCEPTION_EN: 0x%x\n",
948 gk20a_readl(g, gr_pri_gpc0_tpc0_tpccs_tpc_exception_en_r()));
937 return 0; 949 return 0;
938} 950}
939 951
diff --git a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
index 9c33321f..543c7773 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
@@ -286,6 +286,30 @@ static inline u32 gr_engine_status_value_busy_f(void)
286{ 286{
287 return 0x1; 287 return 0x1;
288} 288}
289static inline u32 gr_pri_be0_becs_be_exception_r(void)
290{
291 return 0x00410204;
292}
293static inline u32 gr_pri_be0_becs_be_exception_en_r(void)
294{
295 return 0x00410208;
296}
297static inline u32 gr_pri_gpc0_gpccs_gpc_exception_r(void)
298{
299 return 0x00502c90;
300}
301static inline u32 gr_pri_gpc0_gpccs_gpc_exception_en_r(void)
302{
303 return 0x00502c94;
304}
305static inline u32 gr_pri_gpc0_tpc0_tpccs_tpc_exception_r(void)
306{
307 return 0x00504508;
308}
309static inline u32 gr_pri_gpc0_tpc0_tpccs_tpc_exception_en_r(void)
310{
311 return 0x0050450c;
312}
289static inline u32 gr_activity_0_r(void) 313static inline u32 gr_activity_0_r(void)
290{ 314{
291 return 0x00400380; 315 return 0x00400380;