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-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Move hdd_validate_context() after driver state check

Browse source 
Move hdd_validate_context() after driver state check such that if
the driver is closed and fw is down, system suspend is not rejected.

Change-Id: Ie066cee2e50a683433e337523ab21a153c8e272b
CRs-Fixed: 2759166
This commit is contained in:
Alan Chen 2020-08-19 13:10:08 -07:00 • committed by snandini
commit 64ac68cc67
2 changed files with 59 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

65
core/hdd/src/wlan_hdd_driver_ops.c
View file

@ -1042,17 +1042,23 @@ static int __wlan_hdd_bus_suspend(struct wow_enable_params wow_params)
hdd_info("starting bus suspend");
hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
hdd_err_rl("hdd context is NULL");
return -ENODEV;
}
/* If Wifi is off, return success for system suspend */
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver Module closed; skipping suspend");
return 0;
}
err = wlan_hdd_validate_context(hdd_ctx);
if (err) {
hdd_err("Invalid hdd context: %d", err);
return err;
}
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver Module closed; skipping suspend");
return 0;
}
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (!hif_ctx) {
hdd_err("Failed to get hif context");
@ -1167,17 +1173,24 @@ int wlan_hdd_bus_suspend_noirq(void)
uint32_t pending_events;
hdd_debug("start bus_suspend_noirq");
if (!hdd_ctx) {
hdd_err_rl("hdd context is NULL");
return -ENODEV;
}
/* If Wifi is off, return success for system suspend */
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver module closed; skip bus-noirq suspend");
return 0;
}
errno = wlan_hdd_validate_context(hdd_ctx);
if (errno) {
hdd_err("Invalid HDD context: errno %d", errno);
return errno;
}
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver module closed; skip bus-noirq suspend");
return 0;
}
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (!hif_ctx) {
hdd_err("hif_ctx is null");
@ -1245,17 +1258,23 @@ int wlan_hdd_bus_resume(void)
hdd_info("starting bus resume");
if (!hdd_ctx) {
hdd_err_rl("hdd context is NULL");
return -ENODEV;
}
/* If Wifi is off, return success for system resume */
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver Module closed; return success");
return 0;
}
status = wlan_hdd_validate_context(hdd_ctx);
if (status) {
hdd_err("Invalid hdd context");
return status;
}
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver Module closed; return success");
return 0;
}
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (!hif_ctx) {
hdd_err("Failed to get hif context");
@ -1335,17 +1354,23 @@ int wlan_hdd_bus_resume_noirq(void)
if (cds_is_driver_recovering())
return 0;
if (!hdd_ctx) {
hdd_err_rl("hdd context is NULL");
return -ENODEV;
}
/* If Wifi is off, return success for system resume */
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver Module closed return success");
return 0;
}
status = wlan_hdd_validate_context(hdd_ctx);
if (status) {
hdd_err("Invalid HDD context: %d", status);
return status;
}
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver Module closed return success");
return 0;
}
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (!hif_ctx)
return -EINVAL;

24
core/hdd/src/wlan_hdd_power.c
View file

@ -1896,15 +1896,21 @@ static int _wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
int errno;
errno = wlan_hdd_validate_context(hdd_ctx);
if (errno)
return errno;
if (!hdd_ctx) {
hdd_err_rl("hdd context is null");
return -ENODEV;
}
/* If Wifi is off, return success for system resume */
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver Modules not Enabled ");
return 0;
}
errno = wlan_hdd_validate_context(hdd_ctx);
if (errno)
return errno;
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (!hif_ctx)
return -EINVAL;
@ -2152,15 +2158,21 @@ static int _wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
int errno;
errno = wlan_hdd_validate_context(hdd_ctx);
if (errno)
return errno;
if (!hdd_ctx) {
hdd_err_rl("hdd context is null");
return -ENODEV;
}
/* If Wifi is off, return success for system suspend */
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
hdd_debug("Driver Modules not Enabled ");
return 0;
}
errno = wlan_hdd_validate_context(hdd_ctx);
if (errno)
return errno;
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (!hif_ctx)
return -EINVAL;