From 17df1921807a190d24dbd5b0e0f78192c2e3b772 Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Wed, 22 Mar 2017 09:24:19 -0700 Subject: gpu: nvgpu: gr faults: do not depend on fake mmu fault notifier Currently NVGPU_CHANNEL_FIFO_ERROR_MMU_ERR_FLT is being set in error notifier for non mmu fault too. For fake mmu faults i.e. trigger mmu fault cases, make sure proper notifiers are set and driver is not depending on sending mmu error fault notifier. This change is needed for t19x fifo recovery too. NVGPU_CHANNEL_GR_ERROR_SW_METHOD (12), NVGPU_CHANNEL_GR_EXCEPTION(13) and NVGPU_CHANNEL_FECS_ERR_UNIMP_FIRMWARE_METHOD (37) are new error notifiers. JIRA GPUT19X-7 Change-Id: Idee83e842c835bdba9eb18578aad0c372ea74c5d Signed-off-by: Seema Khowala Reviewed-on: http://git-master/r/1310563 Reviewed-by: mobile promotions Tested-by: mobile promotions --- include/uapi/linux/nvgpu.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index 75011998..ca9b49e6 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h @@ -1470,13 +1470,16 @@ struct nvgpu_notification { __u32 nanoseconds[2]; /* nanoseconds since Jan. 1, 1970 */ } time_stamp; /* -0007 */ __u32 info32; /* info returned depends on method 0008-000b */ -#define NVGPU_CHANNEL_FIFO_ERROR_IDLE_TIMEOUT 8 -#define NVGPU_CHANNEL_GR_ERROR_SW_NOTIFY 13 -#define NVGPU_CHANNEL_GR_SEMAPHORE_TIMEOUT 24 -#define NVGPU_CHANNEL_GR_ILLEGAL_NOTIFY 25 -#define NVGPU_CHANNEL_FIFO_ERROR_MMU_ERR_FLT 31 -#define NVGPU_CHANNEL_PBDMA_ERROR 32 -#define NVGPU_CHANNEL_RESETCHANNEL_VERIF_ERROR 43 +#define NVGPU_CHANNEL_FIFO_ERROR_IDLE_TIMEOUT 8 +#define NVGPU_CHANNEL_GR_ERROR_SW_METHOD 12 +#define NVGPU_CHANNEL_GR_ERROR_SW_NOTIFY 13 +#define NVGPU_CHANNEL_GR_EXCEPTION 13 +#define NVGPU_CHANNEL_GR_SEMAPHORE_TIMEOUT 24 +#define NVGPU_CHANNEL_GR_ILLEGAL_NOTIFY 25 +#define NVGPU_CHANNEL_FIFO_ERROR_MMU_ERR_FLT 31 +#define NVGPU_CHANNEL_PBDMA_ERROR 32 +#define NVGPU_CHANNEL_FECS_ERR_UNIMP_FIRMWARE_METHOD 37 +#define NVGPU_CHANNEL_RESETCHANNEL_VERIF_ERROR 43 #define NVGPU_CHANNEL_PBDMA_PUSHBUFFER_CRC_MISMATCH 80 __u16 info16; /* info returned depends on method 000c-000d */ __u16 status; /* user sets bit 15, NV sets status 000e-000f */ -- cgit v1.2.2