diff options
author | Lakshmanan M <lm@nvidia.com> | 2017-05-19 06:13:13 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-19 12:44:30 -0400 |
commit | dcb744acfbbc11e66cac2d0a674a42e62d908b9d (patch) | |
tree | d8f0cf97fbbe4acd8e68a79669588b5457faa1db /drivers/gpu/nvgpu/include | |
parent | d85aa0064b3e9e1de3f2583499963977286b0d25 (diff) |
gpu: nvgpu: Add GCC exception handling support
Add support for per-chip handling of GCC exception.
JIRA GPUT19X-86
Change-Id: I76ea588dc76b5c821ae5b53529db6dd64b3a856a
Signed-off-by: Lakshmanan M <lm@nvidia.com>
Reviewed-on: http://git-master/r/1485836
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
5 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h index 7f6f58f3..455eef90 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h | |||
@@ -3066,6 +3066,10 @@ static inline u32 gr_gpc0_gpccs_gpc_exception_r(void) | |||
3066 | { | 3066 | { |
3067 | return 0x00502c90; | 3067 | return 0x00502c90; |
3068 | } | 3068 | } |
3069 | static inline u32 gr_gpc0_gpccs_gpc_exception_gcc_v(u32 r) | ||
3070 | { | ||
3071 | return (r >> 2) & 0x1; | ||
3072 | } | ||
3069 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) | 3073 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) |
3070 | { | 3074 | { |
3071 | return (r >> 16) & 0xff; | 3075 | return (r >> 16) & 0xff; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_gr_gm206.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_gr_gm206.h index f0dea40a..34c46855 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_gr_gm206.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm206/hw_gr_gm206.h | |||
@@ -3078,6 +3078,10 @@ static inline u32 gr_gpc0_gpccs_gpc_exception_r(void) | |||
3078 | { | 3078 | { |
3079 | return 0x00502c90; | 3079 | return 0x00502c90; |
3080 | } | 3080 | } |
3081 | static inline u32 gr_gpc0_gpccs_gpc_exception_gcc_v(u32 r) | ||
3082 | { | ||
3083 | return (r >> 2) & 0x1; | ||
3084 | } | ||
3081 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) | 3085 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) |
3082 | { | 3086 | { |
3083 | return (r >> 16) & 0xff; | 3087 | return (r >> 16) & 0xff; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h index bc966416..b6f0d047 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h | |||
@@ -3138,6 +3138,10 @@ static inline u32 gr_gpc0_gpccs_gpc_exception_r(void) | |||
3138 | { | 3138 | { |
3139 | return 0x00502c90; | 3139 | return 0x00502c90; |
3140 | } | 3140 | } |
3141 | static inline u32 gr_gpc0_gpccs_gpc_exception_gcc_v(u32 r) | ||
3142 | { | ||
3143 | return (r >> 2) & 0x1; | ||
3144 | } | ||
3141 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) | 3145 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) |
3142 | { | 3146 | { |
3143 | return (r >> 16) & 0xff; | 3147 | return (r >> 16) & 0xff; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h index c6490f7a..9b5a475e 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h | |||
@@ -3382,6 +3382,10 @@ static inline u32 gr_gpc0_gpccs_gpc_exception_r(void) | |||
3382 | { | 3382 | { |
3383 | return 0x00502c90; | 3383 | return 0x00502c90; |
3384 | } | 3384 | } |
3385 | static inline u32 gr_gpc0_gpccs_gpc_exception_gcc_v(u32 r) | ||
3386 | { | ||
3387 | return (r >> 2) & 0x1; | ||
3388 | } | ||
3385 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) | 3389 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) |
3386 | { | 3390 | { |
3387 | return (r >> 16) & 0xff; | 3391 | return (r >> 16) & 0xff; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h index 43591166..4a87a629 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h | |||
@@ -3502,6 +3502,10 @@ static inline u32 gr_gpc0_gpccs_gpc_exception_r(void) | |||
3502 | { | 3502 | { |
3503 | return 0x00502c90; | 3503 | return 0x00502c90; |
3504 | } | 3504 | } |
3505 | static inline u32 gr_gpc0_gpccs_gpc_exception_gcc_v(u32 r) | ||
3506 | { | ||
3507 | return (r >> 2) & 0x1; | ||
3508 | } | ||
3505 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) | 3509 | static inline u32 gr_gpc0_gpccs_gpc_exception_tpc_v(u32 r) |
3506 | { | 3510 | { |
3507 | return (r >> 16) & 0xff; | 3511 | return (r >> 16) & 0xff; |