lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix cds_trigger_recovery PERF build issue

Browse Source 
QDF_DEBUG_PANIC() is stubbed out for PERF builds, leading to a warning
in cds_trigger_recovery() because @call_info is unused. Extract the
trigger recovery handling into its own function with proper types
instead of void*, and make cds_trigger_recovery_work() a thin wrapper
over this to do the type conversion. This will address the unused
variable warning, and provide stronger type checks via the compiler.

Change-Id: Idf712bdf30d2c6c338219a0327221fe6a0b0b27a
CRs-Fixed: 2299813
This commit is contained in:
Dustin Brown 2018-08-20 10:28:40 -07:00 committed by nshrivas
parent 03b6363540
commit 485bbad241
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
core/cds/src/cds_api.c
View File

@ -1782,13 +1782,14 @@ static QDF_STATUS cds_force_assert_target(qdf_device_t qdf)
}
/**
* cds_trigger_recovery_work() - trigger self recovery work
* cds_trigger_recovery_handler() - handle a self recovery request
* @func: the name of the function that called cds_trigger_recovery
* @line: the line number of the call site which called cds_trigger_recovery
*
* Return: none
*/
static void cds_trigger_recovery_work(void *context)
static void cds_trigger_recovery_handler(const char *func, const uint32_t line)
{
struct cds_recovery_call_info *call_info = context;
QDF_STATUS status;
qdf_runtime_lock_t rtl;
qdf_device_t qdf;
@ -1815,7 +1816,7 @@ static void cds_trigger_recovery_work(void *context)
if (!cds_is_self_recovery_enabled()) {
QDF_DEBUG_PANIC("Recovery is not enabled (via %s:%d)",
call_info->func, call_info->line);
func, line);
return;
}
@ -1847,6 +1848,34 @@ deinit_rtl:
qdf_runtime_lock_deinit(&rtl);
}
static void cds_trigger_recovery_work(void *context)
{
struct cds_recovery_call_info *call_info = context;
cds_trigger_recovery_handler(call_info->func, call_info->line);
}
void __cds_trigger_recovery(enum qdf_hang_reason reason, const char *func,
const uint32_t line)
{
if (!gp_cds_context) {
cds_err("gp_cds_context is null");
return;
}
gp_cds_context->recovery_reason = reason;
if (in_atomic()) {
__cds_recovery_caller.func = func;
__cds_recovery_caller.line = line;
qdf_queue_work(0, gp_cds_context->cds_recovery_wq,
&gp_cds_context->cds_recovery_work);
return;
}
cds_trigger_recovery_handler(func, line);
}
/**
* cds_get_recovery_reason() - get self recovery reason
* @reason: recovery reason
@ -1878,27 +1907,6 @@ void cds_reset_recovery_reason(void)
gp_cds_context->recovery_reason = QDF_REASON_UNSPECIFIED;
}
void __cds_trigger_recovery(enum qdf_hang_reason reason, const char *func,
const uint32_t line)
{
if (!gp_cds_context) {
cds_err("gp_cds_context is null");
return;
}
gp_cds_context->recovery_reason = reason;
__cds_recovery_caller.func = func;
__cds_recovery_caller.line = line;
if (in_atomic()) {
qdf_queue_work(0, gp_cds_context->cds_recovery_wq,
&gp_cds_context->cds_recovery_work);
return;
}
cds_trigger_recovery_work(&__cds_recovery_caller);
}
/**
* cds_get_monotonic_boottime() - Get kernel boot time.
*