summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2017-09-14 08:48:07 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-09-15 15:48:22 -0400
commitf720b309f1ea87a301bcb216983396f3d9c55abc (patch)
tree7776523be5dadc1a1af918e1d3f4525beadba075 /drivers/gpu/nvgpu/include
parent52f50addc6cedf57fc3d8ff06314921499fb59e3 (diff)
gpu: nvgpu: add tsg_verify_status_faulted operation
Add new API gv11b_fifo_tsg_verify_status_faulted() and use that as g->ops.fifo.tsg_verify_status_faulted operation for gv11b/gv100 This API will check if channel has ENG_FAULTED status set, if yes it will clear CE method buffer in case saved out channel is same as faulted channel We need to write 0 to method count to invalidate CE method buffer Also set g->ops.fifo.tsg_verify_status_ctx_reload operation for gv11b/gv100 Bug 200327095 Change-Id: I9d2b0f13faf881b30680219bbcadfd4969c4dff6 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1560643 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h12
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h12
2 files changed, 24 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h
index 664c0b80..dfebd60f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h
@@ -146,6 +146,10 @@ static inline u32 ccsr_channel_next_true_v(void)
146{ 146{
147 return 0x00000001; 147 return 0x00000001;
148} 148}
149static inline u32 ccsr_channel_force_ctx_reload_true_f(void)
150{
151 return 0x100;
152}
149static inline u32 ccsr_channel_pbdma_faulted_f(u32 v) 153static inline u32 ccsr_channel_pbdma_faulted_f(u32 v)
150{ 154{
151 return (v & 0x1) << 22; 155 return (v & 0x1) << 22;
@@ -158,10 +162,18 @@ static inline u32 ccsr_channel_eng_faulted_f(u32 v)
158{ 162{
159 return (v & 0x1) << 23; 163 return (v & 0x1) << 23;
160} 164}
165static inline u32 ccsr_channel_eng_faulted_v(u32 r)
166{
167 return (r >> 23) & 0x1;
168}
161static inline u32 ccsr_channel_eng_faulted_reset_f(void) 169static inline u32 ccsr_channel_eng_faulted_reset_f(void)
162{ 170{
163 return 0x800000; 171 return 0x800000;
164} 172}
173static inline u32 ccsr_channel_eng_faulted_true_v(void)
174{
175 return 0x00000001;
176}
165static inline u32 ccsr_channel_busy_v(u32 r) 177static inline u32 ccsr_channel_busy_v(u32 r)
166{ 178{
167 return (r >> 28) & 0x1; 179 return (r >> 28) & 0x1;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h
index 7e30c34b..bd1e31c7 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h
@@ -146,6 +146,10 @@ static inline u32 ccsr_channel_next_true_v(void)
146{ 146{
147 return 0x00000001; 147 return 0x00000001;
148} 148}
149static inline u32 ccsr_channel_force_ctx_reload_true_f(void)
150{
151 return 0x100;
152}
149static inline u32 ccsr_channel_pbdma_faulted_f(u32 v) 153static inline u32 ccsr_channel_pbdma_faulted_f(u32 v)
150{ 154{
151 return (v & 0x1) << 22; 155 return (v & 0x1) << 22;
@@ -158,10 +162,18 @@ static inline u32 ccsr_channel_eng_faulted_f(u32 v)
158{ 162{
159 return (v & 0x1) << 23; 163 return (v & 0x1) << 23;
160} 164}
165static inline u32 ccsr_channel_eng_faulted_v(u32 r)
166{
167 return (r >> 23) & 0x1;
168}
161static inline u32 ccsr_channel_eng_faulted_reset_f(void) 169static inline u32 ccsr_channel_eng_faulted_reset_f(void)
162{ 170{
163 return 0x800000; 171 return 0x800000;
164} 172}
173static inline u32 ccsr_channel_eng_faulted_true_v(void)
174{
175 return 0x00000001;
176}
165static inline u32 ccsr_channel_busy_v(u32 r) 177static inline u32 ccsr_channel_busy_v(u32 r)
166{ 178{
167 return (r >> 28) & 0x1; 179 return (r >> 28) & 0x1;