samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Improve bus suspend/resume logging

Browse Source 
Many branches in the bus suspend/resume code path are missing
appropriate logging. Add error logging for failure cases, and
info logging for enter/exit points.

Change-Id: Ia1d82e2a3d48335b31772a0fa7532ec99c08de4d
CRs-Fixed: 1104790
This commit is contained in:
Dustin Brown
2016-12-22 15:25:33 -08:00
committed by qcabuildsw
parent d6468c2fec
commit 562b96765e
2 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/hdd/src/wlan_hdd_driver_ops.c
View File

@@ -511,40 +511,50 @@ static int __wlan_hdd_bus_suspend(pm_message_t state, uint32_t wow_flags)
{
hdd_context_t *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
void *hif_ctx;
int err = wlan_hdd_validate_context(hdd_ctx);
int err;
int status;
void *soc = cds_get_context(QDF_MODULE_ID_SOC);
hdd_info("event %d", state.event);
hdd_info("starting bus suspend; event:%d, flags:%u",
state.event, wow_flags);
if (err)
err = wlan_hdd_validate_context(hdd_ctx);
if (err) {
hdd_err("Invalid hdd context");
goto done;
}
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_info("Driver Module closed return success");
hdd_info("Driver Module closed; return success");
return 0;
}
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (NULL == hif_ctx) {
hdd_err("Failed to get hif context");
err = -EINVAL;
goto done;
}
err = qdf_status_to_os_return(
cdp_bus_suspend(soc));
if (err)
err = qdf_status_to_os_return(cdp_bus_suspend(soc));
if (err) {
hdd_err("Failed cdp bus suspend");
goto done;
}
err = wma_bus_suspend(wow_flags);
if (err)
if (err) {
hdd_err("Failed wma bus suspend");
goto resume_oltxrx;
}
err = hif_bus_suspend(hif_ctx);
if (err)
if (err) {
hdd_err("Failed hif bus suspend");
goto resume_wma;
}
hdd_info("suspend done");
hdd_info("bus suspend succeeded");
return 0;
resume_wma:
@@ -677,34 +687,45 @@ static int __wlan_hdd_bus_resume(void)
if (cds_is_driver_recovering())
return 0;
hdd_info("starting bus resume");
status = wlan_hdd_validate_context(hdd_ctx);
if (status)
if (status) {
hdd_err("Invalid hdd context");
return status;
}
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_info("Driver Module closed return success");
hdd_info("Driver Module closed; return success");
return 0;
}
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (NULL == hif_ctx)
if (NULL == hif_ctx) {
hdd_err("Failed to get hif context");
return -EINVAL;
}
status = hif_bus_resume(hif_ctx);
if (status)
if (status) {
hdd_err("Failed hif bus resume");
goto out;
}
status = wma_bus_resume();
if (status)
if (status) {
hdd_err("Failed wma bus resume");
goto out;
}
qdf_status = cdp_bus_resume(cds_get_context(QDF_MODULE_ID_SOC));
status = qdf_status_to_os_return(qdf_status);
if (status)
if (status) {
hdd_err("Failed cdp bus resume");
goto out;
}
hdd_info("resume done");
hdd_info("bus resume succeeded");
return 0;
out:

3
core/hdd/src/wlan_hdd_power.c
View File

@@ -2511,6 +2511,8 @@ static void __hdd_wlan_fake_apps_resume(struct wiphy *wiphy,
QDF_BUG(resume_err == 0);
dev->watchdog_timeo = HDD_TX_TIMEOUT;
hdd_info("Unit-test resume succeeded");
}
/**
@@ -2577,6 +2579,7 @@ int hdd_wlan_fake_apps_suspend(struct wiphy *wiphy, struct net_device *dev)
*/
dev->watchdog_timeo = INT_MAX;
hdd_info("Unit-test suspend succeeded");
return 0;
enable_irqs_and_bus_resume: