wlan: Avoid PNO during active session or session in progress
Avoid race condition of enabling PNO when there is exisiting
active session or during the session being establishment.
Change-Id: Ibc4641f598301c8807d953db90fed99ece4616ea
CRs-Fixed: 623887
(cherry picked from commit 3aec5c618d7c3b0ac522b6cf8876468b777bfca3)
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 0ac38c3..8e12732 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -205,6 +205,7 @@
#define HDD_PNO_SCAN_TIMERS_SET_ONE 1
/* value should not be greater than PNO_MAX_SCAN_TIMERS */
#define HDD_PNO_SCAN_TIMERS_SET_MULTIPLE 6
+#define WLAN_WAIT_TIME_PNO 500
#endif
#define MAX_USER_COMMAND_SIZE 4096
@@ -890,6 +891,10 @@
/* completion variable for cancel remain on channel Event */
struct completion cancel_rem_on_chan_var;
+ /** completion variable for PNO req callback */
+ struct completion pno_comp_var;
+ int pno_req_status;
+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
/* completion variable for off channel remain on channel Event */
struct completion offchannel_tx_event;
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index cfe9b51..9cc4ff2 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8317,6 +8317,33 @@
return eHAL_STATUS_SUCCESS;
}
+void hdd_cfg80211_sched_scan_start_status_cb(void *callbackContext, VOS_STATUS status)
+{
+ hdd_adapter_t *pAdapter = callbackContext;
+ hdd_context_t *pHddCtx;
+
+ if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("Invalid adapter or adapter has invalid magic"));
+ return;
+ }
+
+ pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ if (0 != wlan_hdd_validate_context(pHddCtx))
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("HDD context is not valid"));
+ return;
+ }
+
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ FL("PNO enable response status = %d"), status);
+
+ pAdapter->pno_req_status = (status == VOS_STATUS_SUCCESS) ? 0 : -EBUSY;
+ complete(&pAdapter->pno_comp_var);
+}
+
/*
* FUNCTION: wlan_hdd_cfg80211_sched_scan_start
* NL interface to enable PNO
@@ -8509,6 +8536,11 @@
pPnoRequest->modePNO = SIR_PNO_MODE_IMMEDIATE;
+ INIT_COMPLETION(pAdapter->pno_comp_var);
+ pPnoRequest->statusCallback = hdd_cfg80211_sched_scan_start_status_cb;
+ pPnoRequest->callbackContext = pAdapter;
+ pAdapter->pno_req_status = 0;
+
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"SessionId %d, enable %d, modePNO %d, ucScanTimersCount %d",
pAdapter->sessionId, pPnoRequest->enable, pPnoRequest->modePNO,
@@ -8525,10 +8557,26 @@
goto error;
}
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "PNO scanRequest offloaded");
+ ret = wait_for_completion_timeout(
+ &pAdapter->pno_comp_var,
+ msecs_to_jiffies(WLAN_WAIT_TIME_PNO));
+ if (0 >= ret)
+ {
+ // Did not receive the response for PNO enable in time.
+ // Assuming the PNO enable was success.
+ // Returning error from here, because we timeout, results
+ // in side effect of Wifi (Wifi Setting) not to work.
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("Timed out waiting for PNO to be Enabled"));
+ ret = 0;
+ goto error;
+ }
+
+ ret = pAdapter->pno_req_status;
error:
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ FL("PNO scanRequest offloaded ret = %d"), ret);
vos_mem_free(pPnoRequest);
return ret;
}
@@ -8616,11 +8664,12 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"Failed to disabled PNO");
ret = -EINVAL;
+ goto error;
}
+error:
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: PNO scan disabled", __func__);
-
+ FL("PNO scan disabled ret = %d"), ret);
vos_mem_free(pPnoRequest);
EXIT();
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 72e1cf9..f442f4f 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -5263,6 +5263,7 @@
init_completion(&pAdapter->linkup_event_var);
init_completion(&pAdapter->cancel_rem_on_chan_var);
init_completion(&pAdapter->rem_on_chan_ready_event);
+ init_completion(&pAdapter->pno_comp_var);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
init_completion(&pAdapter->offchannel_tx_event);
#endif
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index e03cca1..bb58484 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -3699,9 +3699,15 @@
tSirScanTimer aTimerValues[SIR_PNO_MAX_SCAN_TIMERS];
} tSirScanTimersType;
+/*Pref Net Req status */
+typedef void(*PNOReqStatusCb)(void *callbackContext, VOS_STATUS status);
+
+
typedef struct sSirPNOScanReq
{
tANI_U8 enable;
+ PNOReqStatusCb statusCallback;
+ void *callbackContext;
eSirPNOMode modePNO;
tANI_U8 ucNetworksCount;
tSirNetworkType aNetworks[SIR_PNO_MAX_SUPP_NETWORKS];
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index a789af8..910f8ad 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -13672,8 +13672,10 @@
void WDA_PNOScanRespCallback(WDI_Status status, void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tSirPNOScanReq *pPNOScanReqParams;
+
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__func__);
+ "<------ %s, wdiStatus: %d",__func__, status);
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -13682,6 +13684,14 @@
return ;
}
+ pPNOScanReqParams = (tSirPNOScanReq *)pWdaParams->wdaMsgParam;
+ if(pPNOScanReqParams->statusCallback)
+ {
+ pPNOScanReqParams->statusCallback(pPNOScanReqParams->callbackContext,
+ (status == WDI_STATUS_SUCCESS) ?
+ VOS_STATUS_SUCCESS : VOS_STATUS_E_FAILURE);
+ }
+
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams->wdaMsgParam);
vos_mem_free(pWdaParams);
@@ -13696,6 +13706,7 @@
void WDA_PNOScanReqCallback(WDI_Status wdiStatus, void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tSirPNOScanReq *pPNOScanReqParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"<------ %s, wdiStatus: %d", __func__, wdiStatus);
@@ -13710,6 +13721,13 @@
if(IS_WDI_STATUS_FAILURE(wdiStatus))
{
+ pPNOScanReqParams = (tSirPNOScanReq *)pWdaParams->wdaMsgParam;
+ if(pPNOScanReqParams->statusCallback)
+ {
+ pPNOScanReqParams->statusCallback(pPNOScanReqParams->callbackContext,
+ VOS_STATUS_E_FAILURE);
+ }
+
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams->wdaMsgParam);
vos_mem_free(pWdaParams);
@@ -13845,6 +13863,12 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"Failure in Set PNO REQ WDI API, free all the memory " );
+ if(pPNOScanReqParams->statusCallback)
+ {
+ pPNOScanReqParams->statusCallback(pPNOScanReqParams->callbackContext,
+ VOS_STATUS_E_FAILURE);
+ }
+
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
vos_mem_free(pWdaParams->wdaMsgParam);
pWdaParams->wdaWdiApiMsgParam = NULL;
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 1c579b0..e53cf85 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -24387,6 +24387,18 @@
return WDI_STATUS_E_NOT_ALLOWED;
}
+ /*----------------------------------------------------------------------
+ Avoid Enable PNO during any active session or an ongoing session
+ ----------------------------------------------------------------------*/
+ if ( (pwdiPNOScanReqParams->wdiPNOScanInfo.bEnable &&
+ WDI_GetActiveSessionsCount(&gWDICb, NULL, eWLAN_PAL_FALSE)) )
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "%s:(Active/Ongoing Session) - Fail request", __func__);
+
+ return WDI_STATUS_E_NOT_ALLOWED;
+ }
+
/*------------------------------------------------------------------------
Fill in Event data and post to the Main FSM
------------------------------------------------------------------------*/