From 29ec6ad40f0c6ded9bac5c7bddf11b5bbb6faf84 Mon Sep 17 00:00:00 2001 From: Rajesh Devaraj Date: Tue, 18 Jun 2019 16:17:51 +0530 Subject: [PATCH] gpu: nvgpu: report fb_flush_timeout error This patch adds the support to report fb_flush_timeout error to 3LSS. Specifically, it adds the following service-ID: NVGUARD_SERVICE_IGPU_HOST_SWERR_PFIFO_FB_FLUSH_TIMEOUT_ERROR JIRA NVGPU-3460 JIRA NVGPU-3461 Change-Id: Iddf978eedbc676197a19e47e72e08cd71c478a08 Signed-off-by: Rajesh Devaraj Reviewed-on: https://git-master.nvidia.com/r/2138051 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: Raghuram Kothakota Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Vaibhav Kachore Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/hal/fifo/fifo_intr_gk20a.c | 2 ++ drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/hal/fifo/fifo_intr_gk20a.c b/drivers/gpu/nvgpu/hal/fifo/fifo_intr_gk20a.c index d75ff7ffb..31f281eca 100644 --- a/drivers/gpu/nvgpu/hal/fifo/fifo_intr_gk20a.c +++ b/drivers/gpu/nvgpu/hal/fifo/fifo_intr_gk20a.c @@ -182,6 +182,8 @@ static u32 gk20a_fifo_intr_handle_errors(struct gk20a *g, u32 fifo_intr) } if ((fifo_intr & fifo_intr_0_fb_flush_timeout_pending_f()) != 0U) { + (void) nvgpu_report_host_err(g, NVGPU_ERR_MODULE_HOST, + 0, GPU_HOST_PFIFO_FB_FLUSH_TIMEOUT_ERROR, 0); nvgpu_err(g, "fifo fb flush timeout error"); handled |= fifo_intr_0_fb_flush_timeout_pending_f(); } diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h index 64b7b471a..8ebc46303 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h @@ -56,7 +56,8 @@ struct gk20a; #define GPU_HOST_PBDMA_HCE_ERROR (13U) #define GPU_HOST_PBDMA_PREEMPT_ERROR (14U) #define GPU_HOST_PFIFO_CTXSW_TIMEOUT_ERROR (15U) -#define GPU_HOST_INVALID_ERROR (16U) +#define GPU_HOST_PFIFO_FB_FLUSH_TIMEOUT_ERROR (16U) +#define GPU_HOST_INVALID_ERROR (17U) #define GPU_SM_L1_TAG_ECC_CORRECTED (0U) #define GPU_SM_L1_TAG_ECC_UNCORRECTED (1U)