From f525ff15c4e8b5994201585ad584237b62bf3083 Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Wed, 28 Jun 2017 10:05:04 -0700 Subject: gpu: nvgpu: gv11b: add ce interrupt handling Added handling for below ce interrupts -INVALID_CONFIG interrupt will be generated if a floorswept PCE is assigned to a valid LCE in the NV_CE_PCE2LCE_CONFIG registers. This is a fatal error and the LCE will have to be reset to get back to a working state. -MTHD_BUFFER_FAULT interrupt will be triggered if any access to a method buffer during context load or save encounters a fault. This is a fatal interrupt and will require at least the LCE to be reset before operations can start again, if not the entire GPU. JIRA GPUT19X-12 JIRA GPUT19X-46 Change-Id: I2eeefc4e634f5bf53f20933c493c7594fe0ea755 Signed-off-by: Seema Khowala Reviewed-on: https://git-master/r/1510298 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/ce_gv11b.c | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'drivers/gpu/nvgpu/gv11b/ce_gv11b.c') diff --git a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c index efe443cc..1ba009bd 100644 --- a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c @@ -16,13 +16,52 @@ * this program. */ +#include "nvgpu/log.h" + #include "gk20a/gk20a.h" #include "gp10b/ce_gp10b.h" #include "ce_gv11b.h" +#include + +static void gv11b_ce_isr(struct gk20a *g, u32 inst_id, u32 pri_base) +{ + u32 ce_intr = gk20a_readl(g, ce_intr_status_r(inst_id)); + u32 clear_intr = 0; + + nvgpu_log(g, gpu_dbg_intr, "ce isr 0x%08x 0x%08x", ce_intr, inst_id); + + /* An INVALID_CONFIG interrupt will be generated if a floorswept + * PCE is assigned to a valid LCE in the NV_CE_PCE2LCE_CONFIG + * registers. This is a fatal error and the LCE will have to be + * reset to get back to a working state. + */ + if (ce_intr & ce_intr_status_invalid_config_pending_f()) { + nvgpu_log(g, gpu_dbg_intr, + "ce: inst %d: invalid config", inst_id); + clear_intr |= ce_intr_status_invalid_config_reset_f(); + } + + /* A MTHD_BUFFER_FAULT interrupt will be triggered if any access + * to a method buffer during context load or save encounters a fault. + * This is a fatal interrupt and will require at least the LCE to be + * reset before operations can start again, if not the entire GPU. + */ + if (ce_intr & ce_intr_status_mthd_buffer_fault_pending_f()) { + nvgpu_log(g, gpu_dbg_intr, + "ce: inst %d: mthd buffer fault", inst_id); + clear_intr |= ce_intr_status_mthd_buffer_fault_reset_f(); + } + + gk20a_writel(g, ce_intr_status_r(inst_id), clear_intr); + + gp10b_ce_isr(g, inst_id, pri_base); +} + void gv11b_init_ce(struct gpu_ops *gops) { gp10b_init_ce(gops); + gops->ce2.isr_stall = gv11b_ce_isr; } -- cgit v1.2.2