nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: gv11b: udpate PES exception handling

Browse Source 
At present, the  driver only report/handle exceptions from PES0, however,
Volta+ chips have 2 PES units within a GPC. Update the PES exception
handler to report/handle exceptions from both PES0,1 units.

Bug 3524791

Change-Id: I71ac75cc1abe492b7aa781d8d16077f4da3a997b
Signed-off-by: Antony Clince Alex <aalex@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2679931
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Seema Khowala <seemaj@nvidia.com>
This commit is contained in:
Antony Clince Alex
2022-03-11 03:34:11 +00:00
committed by mobile promotions
parent 62d6f753d2
commit 32a9c6923c
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gv11b_fusa.c
View File

@@ -603,8 +603,18 @@ void gv11b_gr_intr_handle_gpc_setup_exception(struct gk20a *g, u32 gpc,
void gv11b_gr_intr_handle_gpc_pes_exception(struct gk20a *g, u32 gpc, void gv11b_gr_intr_handle_gpc_pes_exception(struct gk20a *g, u32 gpc,
u32 gpc_exception) u32 gpc_exception)
{ {
u32 offset = nvgpu_gr_gpc_offset(g, gpc); u32 gpc_offset = nvgpu_gr_gpc_offset(g, gpc);
u32 ppc_in_gpc_stride =
nvgpu_get_litter_value(g, GPU_LIT_PPC_IN_GPC_STRIDE);
u32 reg_offset = 0U;
u32 hww_esr; u32 hww_esr;
u32 pes_pending_masks[] = {
gr_gpc0_gpccs_gpc_exception_pes0_m(),
gr_gpc0_gpccs_gpc_exception_pes1_m()
};
u32 num_pes_pending_masks =
sizeof(pes_pending_masks)/sizeof(*pes_pending_masks);
u32 i = 0U;
if (((gpc_exception & gr_gpc0_gpccs_gpc_exception_pes0_m()) == 0U) && if (((gpc_exception & gr_gpc0_gpccs_gpc_exception_pes0_m()) == 0U) &&
((gpc_exception & gr_gpc0_gpccs_gpc_exception_pes1_m()) ((gpc_exception & gr_gpc0_gpccs_gpc_exception_pes1_m())
@@ -612,18 +622,26 @@ void gv11b_gr_intr_handle_gpc_pes_exception(struct gk20a *g, u32 gpc,
return; return;
} }
hww_esr = nvgpu_readl(g, for (i = 0U; i < num_pes_pending_masks; i++) {
nvgpu_safe_add_u32(gr_gpc0_ppc0_pes_hww_esr_r(), offset)); if ((gpc_exception & pes_pending_masks[i]) == 0U) {
continue;
}
reg_offset = nvgpu_safe_add_u32(gr_gpc0_ppc0_pes_hww_esr_r(),
gpc_offset);
reg_offset = nvgpu_safe_add_u32(reg_offset, nvgpu_safe_mult_u32(
ppc_in_gpc_stride, i));
hww_esr = nvgpu_readl(g, reg_offset);
nvgpu_report_err_to_sdl(g, NVGPU_ERR_MODULE_PGRAPH, nvgpu_report_err_to_sdl(g, NVGPU_ERR_MODULE_PGRAPH,
GPU_PGRAPH_GPC_GFX_PES_EXCEPTION); GPU_PGRAPH_GPC_GFX_PES_EXCEPTION);
/* clear the interrupt */ /* clear the interrupt */
nvgpu_writel(g, nvgpu_safe_add_u32( nvgpu_writel(g, reg_offset,
gr_gpc0_ppc0_pes_hww_esr_r(), offset),
gr_gpc0_ppc0_pes_hww_esr_reset_task_f()); gr_gpc0_ppc0_pes_hww_esr_reset_task_f());
nvgpu_err(g, "gpc:%d pes interrupt intr: 0x%x", gpc, hww_esr); nvgpu_err(g, "gpc:%d pes:%d interrupt intr: 0x%x", gpc, i,
hww_esr);
}
} }
void gv11b_gr_intr_handle_gpc_gpccs_exception(struct gk20a *g, u32 gpc, void gv11b_gr_intr_handle_gpc_gpccs_exception(struct gk20a *g, u32 gpc,