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

qcacld-3.0: Destroy pdev after all vdev free

Browse Source 
Currently, pdev destroy is before cds_close and
scheduler_disable. Some pending msg in scheduler
may hold ref count on vdev.
scheduler_flush_mqs will release all the vdev ref
and get vdev freed.
That may cause pdev freed before vdev and get
issue in wlan_objmgr_vdev_obj_free.

Fix by destroy pdev after all possible vdev ref
released (cds_close).

Change-Id: I8e898f6c63fa298f2c63c5fc19706208b8580a60
CRs-Fixed: 2156577
This commit is contained in:
Liangwei Dong
2018-01-11 01:17:00 -05:00
committed by snandini
parent 81f2ed3f2f
commit 50a64a7bdd
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/hdd/src/wlan_hdd_main.c
View File

@@ -10132,19 +10132,6 @@ int hdd_wlan_stop_modules(struct hdd_context *hdd_ctx, bool ftm_mode)
hdd_runtime_suspend_context_deinit(hdd_ctx); hdd_runtime_suspend_context_deinit(hdd_ctx);
ret = hdd_objmgr_release_and_destroy_pdev(hdd_ctx);
if (ret) {
hdd_err("Failed to destroy pdev; errno:%d", ret);
QDF_ASSERT(0);
}
/*
* Reset total mac phy during module stop such that during
* next module start same psoc is used to populate new service
* ready data
*/
hdd_ctx->hdd_psoc->total_mac_phy = 0;
qdf_status = cds_dp_close(hdd_ctx->hdd_psoc); qdf_status = cds_dp_close(hdd_ctx->hdd_psoc);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_warn("Failed to stop CDS DP: %d", qdf_status); hdd_warn("Failed to stop CDS DP: %d", qdf_status);
@@ -10159,6 +10146,19 @@ int hdd_wlan_stop_modules(struct hdd_context *hdd_ctx, bool ftm_mode)
QDF_ASSERT(0); QDF_ASSERT(0);
} }
ret = hdd_objmgr_release_and_destroy_pdev(hdd_ctx);
if (ret) {
hdd_err("Failed to destroy pdev; errno:%d", ret);
QDF_ASSERT(0);
}
/*
* Reset total mac phy during module stop such that during
* next module start same psoc is used to populate new service
* ready data
*/
hdd_ctx->hdd_psoc->total_mac_phy = 0;
hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (!hif_ctx) { if (!hif_ctx) {
hdd_err("Hif context is Null"); hdd_err("Hif context is Null");