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: do not disable SM exceptions for BPT_INT

Browse Source 
In gr_gk20a_handle_sm_exception(), we disable all SM exceptions
if SM debug mode is set and irrespective of exception type

But we should not disable SM exceptions if the only
exception is BPT_INT

Fix this by checking if only interrupt is BPT_INT and
do not disable SM exceptions in that case

Note that for rest of the exceptions we still need to
disable SM exceptions

Also, remove redudant checks of sm_debugger_attached since
we bail out early if this flag is not set anyways

Bug 200264850

Change-Id: I7732567273fc88f6c98f25372fd8619d92339734
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1487040
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Nibade
2017-05-22 17:25:47 +05:30
committed by mobile promotions
parent f044418427
commit f76febb962
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/nvgpu/gk20a/gr_gk20a.c
View File

@@ -6155,6 +6155,7 @@ int gr_gk20a_handle_sm_exception(struct gk20a *g, u32 gpc, u32 tpc,
{ {
int ret = 0; int ret = 0;
bool do_warp_sync = false, early_exit = false, ignore_debugger = false; bool do_warp_sync = false, early_exit = false, ignore_debugger = false;
bool disable_sm_exceptions = true;
u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE); u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE);
u32 tpc_in_gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE); u32 tpc_in_gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE);
u32 offset = gpc_stride * gpc + tpc_in_gpc_stride * tpc; u32 offset = gpc_stride * gpc + tpc_in_gpc_stride * tpc;
@@ -6209,9 +6210,17 @@ int gr_gk20a_handle_sm_exception(struct gk20a *g, u32 gpc, u32 tpc,
return ret; return ret;
} }
/* if an sm debugger is attached, disable forwarding of tpc exceptions. /*
* the debugger will reenable exceptions after servicing them. */ * Disable forwarding of tpc exceptions,
if (!ignore_debugger && sm_debugger_attached) { * the debugger will reenable exceptions after servicing them.
*
* Do not disable exceptions if the only SM exception is BPT_INT
*/
if ((global_esr == gr_gpc0_tpc0_sm_hww_global_esr_bpt_int_pending_f())
&& (warp_esr == 0))
disable_sm_exceptions = false;
if (!ignore_debugger && disable_sm_exceptions) {
u32 tpc_exception_en = gk20a_readl(g, u32 tpc_exception_en = gk20a_readl(g,
gr_gpc0_tpc0_tpccs_tpc_exception_en_r() + gr_gpc0_tpc0_tpccs_tpc_exception_en_r() +
offset); offset);
@@ -6219,11 +6228,11 @@ int gr_gk20a_handle_sm_exception(struct gk20a *g, u32 gpc, u32 tpc,
gk20a_writel(g, gk20a_writel(g,
gr_gpc0_tpc0_tpccs_tpc_exception_en_r() + offset, gr_gpc0_tpc0_tpccs_tpc_exception_en_r() + offset,
tpc_exception_en); tpc_exception_en);
gk20a_dbg(gpu_dbg_intr | gpu_dbg_gpu_dbg, "SM debugger attached"); gk20a_dbg(gpu_dbg_intr | gpu_dbg_gpu_dbg, "SM Exceptions disabled");
} }
/* if a debugger is present and an error has occurred, do a warp sync */ /* if a debugger is present and an error has occurred, do a warp sync */
if (!ignore_debugger && sm_debugger_attached && if (!ignore_debugger &&
((warp_esr != 0) || ((global_esr & ~global_mask) != 0))) { ((warp_esr != 0) || ((global_esr & ~global_mask) != 0))) {
gk20a_dbg(gpu_dbg_intr, "warp sync needed"); gk20a_dbg(gpu_dbg_intr, "warp sync needed");
do_warp_sync = true; do_warp_sync = true;