wlan: avoid TX thread wait for haldumpcmd completion
In case of tx timeout we try to recover stall condition by
reloading FW. Haldumpcmd is sent to do this which is executed by
TX thread and response is expected to be processed by MCthread.
A race condition is observed when MC thread is unable to send
probe request on each channel due to TX thread stuck which is
due to hdd_tx_timeout invoking haldumpcmd. TX wait for 10sec
until rsp for haldumpcmd is received.
Avoiding TX thread to wait for haldumpcmd RSP as not needed.
Change-Id: I1067c5213ac3424c6b3bab36c68cd953b4eb66bc
CRs-Fixed: 778948
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index a46bf19..48b0648 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -11773,7 +11773,7 @@
{
tANI_U8 *buffer = NULL;
tWDA_CbContext *pWDA = NULL;
- tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_HalDumpReqParams *pWdaParams = (tWDA_HalDumpReqParams *)pUserData;
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -11789,11 +11789,13 @@
/*Copy the Resp data to UMAC supplied buffer*/
vos_mem_copy(buffer, wdiRspParams->pBuffer, wdiRspParams->usBufferLen);
}
+
+ if (!pWdaParams->wdaHALDumpAsync)
+ {/* Indicate VOSS about the start complete */
+ vos_WDAComplete_cback(pWDA->pVosContext);
+ }
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams);
-
- /* Indicate VOSS about the start complete */
- vos_WDAComplete_cback(pWDA->pVosContext);
return ;
}
@@ -11803,12 +11805,13 @@
*/
VOS_STATUS WDA_HALDumpCmdReq(tpAniSirGlobal pMac, tANI_U32 cmd,
tANI_U32 arg1, tANI_U32 arg2, tANI_U32 arg3,
- tANI_U32 arg4, tANI_U8 *pBuffer)
+ tANI_U32 arg4, tANI_U8 *pBuffer, wpt_boolean async)
{
WDI_Status status = WDI_STATUS_SUCCESS;
WDI_HALDumpCmdReqParamsType *wdiHALDumpCmdReqParam = NULL;
WDI_HALDumpCmdReqInfoType *wdiHalDumpCmdInfo = NULL ;
- tWDA_ReqParams *pWdaParams ;
+ tWDA_HalDumpReqParams *pWdaParams ;
+
pVosContextType pVosContext = NULL;
VOS_STATUS vStatus;
pVosContext = (pVosContextType)vos_get_global_context(VOS_MODULE_ID_PE,
@@ -11829,7 +11832,13 @@
return VOS_STATUS_E_RESOURCES;
}
- pWdaParams = (tWDA_ReqParams *)vos_mem_malloc(sizeof(tWDA_ReqParams)) ;
+ if (NULL == pVosContext->pWDAContext)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: WDA Context Null", __func__);
+ return VOS_STATUS_E_RESOURCES;
+ }
+ pWdaParams = (tWDA_HalDumpReqParams *)vos_mem_malloc(sizeof(tWDA_HalDumpReqParams)) ;
if(NULL == pWdaParams)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -11855,6 +11864,7 @@
wdiHalDumpCmdInfo->argument4 = arg4;
wdiHALDumpCmdReqParam->wdiReqStatusCB = NULL ;
pWdaParams->pWdaContext = pVosContext->pWDAContext;
+ pWdaParams->wdaHALDumpAsync = async;
/* Response message will be passed through the buffer */
pWdaParams->wdaMsgParam = (void *)pBuffer;
@@ -11862,21 +11872,27 @@
/* store Params pass it to WDI */
pWdaParams->wdaWdiApiMsgParam = (void *)wdiHALDumpCmdReqParam ;
/* Send command to WDI */
- status = WDI_HALDumpCmdReq(wdiHALDumpCmdReqParam, WDA_HALDumpCmdCallback, pWdaParams);
- vStatus = vos_wait_single_event( &(pVosContext->wdaCompleteEvent), WDA_DUMPCMD_WAIT_TIMEOUT );
- if ( vStatus != VOS_STATUS_SUCCESS )
+ status = WDI_HALDumpCmdReq(wdiHALDumpCmdReqParam, WDA_HALDumpCmdCallback,
+ pWdaParams);
+ /* For Sync event only wait for rsp until completion of wdaCompleteEvent*/
+ if (!async)
{
- if ( vStatus == VOS_STATUS_E_TIMEOUT )
+ vStatus = vos_wait_single_event( &(pVosContext->wdaCompleteEvent),
+ WDA_DUMPCMD_WAIT_TIMEOUT );
+ if ( vStatus != VOS_STATUS_SUCCESS )
{
- VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: Timeout occurred before WDA_HALDUMP complete",__func__);
+ if ( vStatus == VOS_STATUS_E_TIMEOUT )
+ {
+ VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: Timeout occurred before WDA_HALDUMP complete",__func__);
+ }
+ else
+ {
+ VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: WDA_HALDUMP reporting other error",__func__);
+ }
+ VOS_ASSERT(0);
}
- else
- {
- VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "%s: WDA_HALDUMP reporting other error",__func__);
- }
- VOS_ASSERT(0);
}
return status;
}