nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: fix invalid "reset initiated" prints

Browse Source 
Improve the error path and return values from function
gk20a_fifo_handle_sched_error()
- return true, when we trigger the recovery in this function
- otherwise, return false

No need to reset the scheduler error register in this function,
since we anyway clear the interrupt in fifo_error_isr()

Also, fix the typo
"reset initated" -> "reset initiated"

Bug 200089043

Change-Id: Ibfc2fd2133982a268699d08682bcd6f044a3196a
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/722711
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Deepak Nibade
2015-03-25 18:04:18 +05:30
committed by Dan Willemsen
parent f09fa2cf20
commit 0a99cb3559
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
View File

@@ -1252,10 +1252,10 @@ static bool gk20a_fifo_handle_sched_error(struct gk20a *g)
u32 engine_id; u32 engine_id;
int id = -1; int id = -1;
bool non_chid = false; bool non_chid = false;
bool ret = false;
/* read and reset the scheduler error register */ /* read the scheduler error register */
sched_error = gk20a_readl(g, fifo_intr_sched_error_r()); sched_error = gk20a_readl(g, fifo_intr_sched_error_r());
gk20a_writel(g, fifo_intr_0_r(), fifo_intr_0_sched_error_reset_f());
for (engine_id = 0; engine_id < g->fifo.max_engines; engine_id++) { for (engine_id = 0; engine_id < g->fifo.max_engines; engine_id++) {
u32 status = gk20a_readl(g, fifo_engine_status_r(engine_id)); u32 status = gk20a_readl(g, fifo_engine_status_r(engine_id));
@@ -1287,8 +1287,12 @@ static bool gk20a_fifo_handle_sched_error(struct gk20a *g)
} }
/* could not find the engine - should never happen */ /* could not find the engine - should never happen */
if (unlikely(engine_id >= g->fifo.max_engines)) if (unlikely(engine_id >= g->fifo.max_engines)) {
gk20a_err(dev_from_gk20a(g), "fifo sched error : 0x%08x, failed to find engine\n",
sched_error);
ret = false;
goto err; goto err;
}
if (fifo_intr_sched_error_code_f(sched_error) == if (fifo_intr_sched_error_code_f(sched_error) ==
fifo_intr_sched_error_code_ctxsw_timeout_v()) { fifo_intr_sched_error_code_ctxsw_timeout_v()) {
@@ -1297,6 +1301,7 @@ static bool gk20a_fifo_handle_sched_error(struct gk20a *g)
if (non_chid) { if (non_chid) {
gk20a_fifo_recover(g, BIT(engine_id), true); gk20a_fifo_recover(g, BIT(engine_id), true);
ret = true;
goto err; goto err;
} }
@@ -1310,20 +1315,23 @@ static bool gk20a_fifo_handle_sched_error(struct gk20a *g)
gk20a_gr_debug_dump(g->dev); gk20a_gr_debug_dump(g->dev);
gk20a_fifo_recover(g, BIT(engine_id), gk20a_fifo_recover(g, BIT(engine_id),
ch->timeout_debug_dump); ch->timeout_debug_dump);
ret = true;
} else { } else {
gk20a_dbg_info( gk20a_dbg_info(
"fifo is waiting for ctx switch for %d ms," "fifo is waiting for ctx switch for %d ms,"
"ch = %d\n", "ch = %d\n",
ch->timeout_accumulated_ms, ch->timeout_accumulated_ms,
id); id);
ret = false;
} }
return ch->timeout_debug_dump; return ret;
} }
err:
gk20a_err(dev_from_gk20a(g), "fifo sched error : 0x%08x, engine=%u, %s=%d",
sched_error, engine_id, non_chid ? "non-ch" : "ch", id);
return true; gk20a_err(dev_from_gk20a(g), "fifo sched error : 0x%08x, engine=%u, %s=%d",
sched_error, engine_id, non_chid ? "non-ch" : "ch", id);
err:
return ret;
} }
static u32 fifo_error_isr(struct gk20a *g, u32 fifo_intr) static u32 fifo_error_isr(struct gk20a *g, u32 fifo_intr)
@@ -1375,7 +1383,7 @@ static u32 fifo_error_isr(struct gk20a *g, u32 fifo_intr)
if (print_channel_reset_log) { if (print_channel_reset_log) {
int engine_id; int engine_id;
gk20a_err(dev_from_gk20a(g), gk20a_err(dev_from_gk20a(g),
"channel reset initated from %s; intr=0x%08x", "channel reset initiated from %s; intr=0x%08x",
__func__, fifo_intr); __func__, fifo_intr);
for (engine_id = 0; for (engine_id = 0;
engine_id < g->fifo.max_engines; engine_id < g->fifo.max_engines;