From f720b309f1ea87a301bcb216983396f3d9c55abc Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Thu, 14 Sep 2017 05:48:07 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1560643 Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h | 12 ++++++++++++ drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h | 12 ++++++++++++ 2 files changed, 24 insertions(+) (limited to 'drivers/gpu/nvgpu/include') 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) { return 0x00000001; } +static inline u32 ccsr_channel_force_ctx_reload_true_f(void) +{ + return 0x100; +} static inline u32 ccsr_channel_pbdma_faulted_f(u32 v) { return (v & 0x1) << 22; @@ -158,10 +162,18 @@ static inline u32 ccsr_channel_eng_faulted_f(u32 v) { return (v & 0x1) << 23; } +static inline u32 ccsr_channel_eng_faulted_v(u32 r) +{ + return (r >> 23) & 0x1; +} static inline u32 ccsr_channel_eng_faulted_reset_f(void) { return 0x800000; } +static inline u32 ccsr_channel_eng_faulted_true_v(void) +{ + return 0x00000001; +} static inline u32 ccsr_channel_busy_v(u32 r) { 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) { return 0x00000001; } +static inline u32 ccsr_channel_force_ctx_reload_true_f(void) +{ + return 0x100; +} static inline u32 ccsr_channel_pbdma_faulted_f(u32 v) { return (v & 0x1) << 22; @@ -158,10 +162,18 @@ static inline u32 ccsr_channel_eng_faulted_f(u32 v) { return (v & 0x1) << 23; } +static inline u32 ccsr_channel_eng_faulted_v(u32 r) +{ + return (r >> 23) & 0x1; +} static inline u32 ccsr_channel_eng_faulted_reset_f(void) { return 0x800000; } +static inline u32 ccsr_channel_eng_faulted_true_v(void) +{ + return 0x00000001; +} static inline u32 ccsr_channel_busy_v(u32 r) { return (r >> 28) & 0x1; -- cgit v1.2.2