A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 14:13:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Avoid WD panic during scheduler shutdown

Browse source 
Avoid scheduler watchdog panic during scheduler shutdown to avoid
interfering with recovery mechanisms.

Change-Id: If32cc77a9725fdb61fc09c4065fc2603f2e8e00b
CRs-Fixed: 2069429
This commit is contained in:
Dustin Brown 2017-06-29 14:16:53 -07:00 • committed by snandini
commit bac753d968
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qdf/linux/src/i_qdf_trace.h
View file

@ -131,7 +131,7 @@ static inline void qdf_trace_msg(QDF_MODULE_ID module, QDF_TRACE_LEVEL level,
#ifdef KSYM_SYMBOL_LEN
#define __QDF_SYMBOL_LEN KSYM_SYMBOL_LEN
#else
#define __QDF_SYMBOL_LEN 0
#define __QDF_SYMBOL_LEN 1
#endif
#endif /* __I_QDF_TRACE_H */

31
scheduler/src/scheduler_api.c
View file

@ -63,11 +63,13 @@ static QDF_STATUS scheduler_close(struct scheduler_ctx *sched_ctx)
"%s: sched_ctx == NULL", __func__);
return QDF_STATUS_E_FAILURE;
}
/* shut down scheduler thread */
qdf_set_bit(MC_SHUTDOWN_EVENT_MASK, &sched_ctx->sch_event_flag);
qdf_set_bit(MC_POST_EVENT_MASK, &sched_ctx->sch_event_flag);
qdf_wake_up_interruptible(&sched_ctx->sch_wait_queue);
/* Wait for MC to exit */
/* Wait for scheduler thread to exit */
qdf_wait_single_event(&sched_ctx->sch_shutdown, 0);
sched_ctx->sch_thread = 0;
@ -84,27 +86,32 @@ static QDF_STATUS scheduler_close(struct scheduler_ctx *sched_ctx)
static inline void scheduler_watchdog_notify(struct scheduler_ctx *sched)
{
char symbol[QDF_SYMBOL_LEN] = "<null>";
char symbol[QDF_SYMBOL_LEN];
if (sched->watchdog_callback)
qdf_sprint_symbol(symbol, sched->watchdog_callback);
QDF_TRACE(QDF_MODULE_ID_SCHEDULER, QDF_TRACE_LEVEL_ERROR,
"%s: Callback %s (type 0x%x) has exceeded its allotted time of %ds",
__func__, symbol, sched->watchdog_msg_type,
SCHEDULER_WATCHDOG_TIMEOUT / 1000);
sched_err("Callback %s (type 0x%x) exceeded its allotted time of %ds",
sched->watchdog_callback ? symbol : "<null>",
sched->watchdog_msg_type, SCHEDULER_WATCHDOG_TIMEOUT / 1000);
}
#ifdef CONFIG_SLUB_DEBUG_ON
static void scheduler_watchdog_bite(void *arg)
static void scheduler_watchdog_timeout(void *arg)
{
scheduler_watchdog_notify((struct scheduler_ctx *)arg);
QDF_TRACE(QDF_MODULE_ID_SCHEDULER, QDF_TRACE_LEVEL_ERROR,
"%s: Going down for Scheduler Watchdog Bite!", __func__);
struct scheduler_ctx *sched = arg;
scheduler_watchdog_notify(sched);
/* avoid crashing during shutdown */
if (qdf_test_bit(MC_SHUTDOWN_EVENT_MASK, &sched->sch_event_flag))
return;
sched_fatal("Going down for Scheduler Watchdog Bite!");
QDF_BUG(0);
}
#else
static void scheduler_watchdog_bite(void *arg)
static void scheduler_watchdog_timeout(void *arg)
{
scheduler_watchdog_notify((struct scheduler_ctx *)arg);
}
@ -130,7 +137,7 @@ static QDF_STATUS scheduler_open(struct scheduler_ctx *sched_ctx)
sched_ctx->sch_event_flag = 0;
qdf_timer_init(NULL,
&sched_ctx->watchdog_timer,
&scheduler_watchdog_bite,
&scheduler_watchdog_timeout,
sched_ctx,
QDF_TIMER_TYPE_SW);