wlan: do not enter IMPS if DXE rings have pending TX data
It has been observed that if WCNSS goes to IMPS if data
is pending DXE will try to push that data once the WCNSS
comes out of IMPS. The Data pushed by DXE is leading to
a WCNSS crash in certain cases, so add a check in the host
to defer IMPS if DXE rings are not empty.
Change-Id: Ie4c729285495a96914e792833e26d6ec78a03302
CRs-Fixed: 634187
diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index 010e583..2e586c8 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -5341,8 +5341,11 @@
{
wpt_msg *msgContent = (wpt_msg *)msgPtr;
WLANDXE_CtrlBlkType *dxeCtxt;
- wpt_status status = eWLAN_PAL_STATUS_E_FAILURE;
+ wpt_status status = eWLAN_PAL_STATUS_SUCCESS;
WLANDXE_PowerStateType reqPowerState;
+ wpt_int8 i;
+ WLANDXE_ChannelCBType *channelEntry;
+ wpt_log_data_stall_channel_type channelLog;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
"%s Enter", __func__);
@@ -5370,7 +5373,33 @@
case WLANDXE_POWER_STATE_IMPS:
if(WLANDXE_RIVA_POWER_STATE_ACTIVE == dxeCtxt->rivaPowerState)
{
- dxeCtxt->rivaPowerState = WLANDXE_RIVA_POWER_STATE_IMPS_UNKNOWN;
+
+ for(i = WDTS_CHANNEL_TX_LOW_PRI; i < WDTS_CHANNEL_RX_LOW_PRI; i++)
+ {
+ channelEntry = &dxeCtxt->dxeChannel[i];
+ if(channelEntry->tailCtrlBlk != channelEntry->headCtrlBlk)
+ {
+ status = eWLAN_PAL_STATUS_E_FAILURE;
+ HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
+ "%11s : %s :TX Pending frame",
+ channelType[channelEntry->channelType], __func__);
+
+ dxeChannelMonitor("DXE_IMP_ERR", channelEntry, &channelLog);
+ dxeDescriptorDump(channelEntry,
+ channelEntry->headCtrlBlk->linkedDesc, 0);
+ dxeChannelRegisterDump(channelEntry, "DXE_IMPS_ERR",
+ &channelLog);
+ dxeChannelAllDescDump(channelEntry,
+ channelEntry->channelType,
+ &channelLog);
+ }
+ }
+
+ if (eWLAN_PAL_STATUS_SUCCESS == status)
+ {
+ dxeCtxt->rivaPowerState = WLANDXE_RIVA_POWER_STATE_IMPS_UNKNOWN;
+ dxeCtxt->hostPowerState = WLANDXE_POWER_STATE_IMPS;
+ }
}
else
{
@@ -5521,7 +5550,6 @@
hostPowerState = WLANDXE_POWER_STATE_BMPS;
break;
case WDTS_POWER_STATE_IMPS:
- pDxeCtrlBlk->hostPowerState = WLANDXE_POWER_STATE_IMPS;
hostPowerState = WLANDXE_POWER_STATE_IMPS;
break;
case WDTS_POWER_STATE_DOWN:
@@ -5615,6 +5643,10 @@
pDxeCtrlBlk->hostPowerState = hostPowerState;
pDxeCtrlBlk->rivaPowerState = WLANDXE_RIVA_POWER_STATE_BMPS_UNKNOWN;
}
+ else if ( hostPowerState == WLANDXE_POWER_STATE_IMPS )
+ {
+ pDxeCtrlBlk->hostPowerState = WLANDXE_POWER_STATE_IMPS;
+ }
else
{
HDXE_ASSERT(0);
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index e1c2305..af584cf 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -7478,17 +7478,66 @@
}
#endif
/*
- * FUNCTION: WDA_EnterImpsReqCallback
+ * FUNCTION: WDA_EnterImpsRspCallback
* send Enter IMPS RSP back to PE
*/
-void WDA_EnterImpsReqCallback(WDI_Status status, void* pUserData)
+void WDA_EnterImpsRspCallback(WDI_Status status, void* pUserData)
{
- tWDA_CbContext *pWDA = (tWDA_CbContext *)pUserData ;
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_CbContext *pWDA;
+
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__func__);
+ "<------ %s status=%d" ,__func__,status);
+ if(NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams received NULL", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
+
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
WDA_SendMsg(pWDA, WDA_ENTER_IMPS_RSP, NULL , status) ;
return ;
}
+
+
+/*
+ * FUNCTION: WDA_EnterImpsReqCallback
+ * Free memory and send Enter IMPS RSP back to PE.
+ * Invoked when Enter IMPS REQ failed in WDI and no RSP callback is generated.
+ */
+void WDA_EnterImpsReqCallback(WDI_Status wdiStatus, void* pUserData)
+{
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_CbContext *pWDA;
+
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s, wdiStatus: %d", __func__, wdiStatus);
+
+ if(NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams received NULL", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
+
+ if(IS_WDI_STATUS_FAILURE(wdiStatus))
+ {
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
+ WDA_SendMsg(pWDA, WDA_ENTER_IMPS_RSP, NULL,
+ CONVERT_WDI2SIR_STATUS(wdiStatus));
+ }
+
+ return;
+}
/*
* FUNCTION: WDA_ProcessEnterImpsReq
* Request to WDI to Enter IMPS power state.
@@ -7496,13 +7545,51 @@
VOS_STATUS WDA_ProcessEnterImpsReq(tWDA_CbContext *pWDA)
{
WDI_Status status = WDI_STATUS_SUCCESS ;
+ WDI_EnterImpsReqParamsType *wdiEnterImpsReqParams;
+ tWDA_ReqParams *pWdaParams;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"------> %s " ,__func__);
- status = WDI_EnterImpsReq((WDI_EnterImpsRspCb)WDA_EnterImpsReqCallback, pWDA);
+
+
+ wdiEnterImpsReqParams = vos_mem_malloc(sizeof(WDI_EnterImpsReqParamsType));
+ if (NULL == wdiEnterImpsReqParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure", __func__);
+ VOS_ASSERT(0);
+ WDA_SendMsg(pWDA, WDA_ENTER_IMPS_RSP, NULL,
+ CONVERT_WDI2SIR_STATUS(WDI_STATUS_MEM_FAILURE)) ;
+ return VOS_STATUS_E_NOMEM;
+ }
+
+ pWdaParams = (tWDA_ReqParams *)vos_mem_malloc(sizeof(tWDA_ReqParams));
+ if (NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(wdiEnterImpsReqParams);
+ WDA_SendMsg(pWDA, WDA_ENTER_IMPS_RSP, NULL ,
+ CONVERT_WDI2SIR_STATUS(WDI_STATUS_MEM_FAILURE)) ;
+ return VOS_STATUS_E_NOMEM;
+ }
+
+ wdiEnterImpsReqParams->wdiReqStatusCB = WDA_EnterImpsReqCallback;
+ wdiEnterImpsReqParams->pUserData = pWdaParams;
+
+ pWdaParams->wdaWdiApiMsgParam = wdiEnterImpsReqParams;
+ pWdaParams->wdaMsgParam = NULL;
+ pWdaParams->pWdaContext = pWDA;
+
+ status = WDI_EnterImpsReq(wdiEnterImpsReqParams,
+ (WDI_EnterImpsRspCb)WDA_EnterImpsRspCallback,
+ pWdaParams);
if(IS_WDI_STATUS_FAILURE(status))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"Failure in Enter IMPS REQ WDI API, free all the memory " );
+ vos_mem_free(wdiEnterImpsReqParams);
+ vos_mem_free(pWdaParams);
WDA_SendMsg(pWDA, WDA_ENTER_IMPS_RSP, NULL , CONVERT_WDI2SIR_STATUS(status)) ;
}
return CONVERT_WDI2VOS_STATUS(status) ;
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index 42c93e0..cc3cfaf 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -3691,6 +3691,21 @@
}WDI_EnterBmpsReqParamsType;
/*---------------------------------------------------------------------------
+ WDI_EnterImpsReqParamsType
+ Enter IMPS parameters passed to WDI from WDA
+---------------------------------------------------------------------------*/
+typedef struct
+{
+ /*Request status callback offered by UMAC - it is called if the current req
+ has returned PENDING as status; it delivers the status of sending the message
+ over the BUS */
+ WDI_ReqStatusCb wdiReqStatusCB;
+ /*The user data passed in by UMAC, it will be sent back when the above
+ function pointer will be called */
+ void* pUserData;
+}WDI_EnterImpsReqParamsType;
+
+/*---------------------------------------------------------------------------
WDI_EnterBmpsReqParamsType
Enter BMPS parameters passed from WDI to WDA
---------------------------------------------------------------------------*/
@@ -8638,6 +8653,7 @@
WDI_Status
WDI_EnterImpsReq
(
+ WDI_EnterImpsReqParamsType *pwdiEnterImpsReqParams,
WDI_EnterImpsRspCb wdiEnterImpsRspCb,
void* pUserData
);
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
index e537cfc..0324873 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
@@ -1116,6 +1116,8 @@
DXE when DXE wakes up from power save*/
unsigned int dxePhyAddr;
+ wpt_boolean dxeRingsEmpty;
+
/*NV download request parameters */
WDI_NvDownloadReqParamsType wdiCachedNvDownloadReq;
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index dfbd8f6..51f9e46 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -3503,6 +3503,7 @@
WDI_Status
WDI_EnterImpsReq
(
+ WDI_EnterImpsReqParamsType *pwdiEnterImpsReqParams,
WDI_EnterImpsRspCb wdiEnterImpsRspCb,
void* pUserData
)
@@ -3525,8 +3526,8 @@
Fill in Event data and post to the Main FSM
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_ENTER_IMPS_REQ;
- wdiEventData.pEventData = NULL;
- wdiEventData.uEventDataSize = 0;
+ wdiEventData.pEventData = pwdiEnterImpsReqParams;
+ wdiEventData.uEventDataSize = sizeof(*pwdiEnterImpsReqParams);
wdiEventData.pCBfnc = wdiEnterImpsRspCb;
wdiEventData.pUserData = pUserData;
@@ -13283,10 +13284,6 @@
wpt_status wptStatus;
WDI_ControlBlockType *pCB = NULL;
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- if(eWLAN_PAL_STATUS_E_FAILURE == status )
- {
- //it shouldn't happen, put an error msg
- }
/*
* Trigger the event to bring the Enter BMPS req function to come
* out of wait
@@ -13300,6 +13297,15 @@
//put an error msg
pCB = &gWDICb;
}
+
+ if(eWLAN_PAL_STATUS_SUCCESS == status )
+ {
+ pCB->dxeRingsEmpty = eWLAN_PAL_TRUE;
+ }
+ else
+ {
+ pCB->dxeRingsEmpty = eWLAN_PAL_FALSE;
+ }
pCB->dxePhyAddr = dxePhyAddr;
wptStatus = wpalEventSet(&pCB->setPowerStateEvent);
if ( eWLAN_PAL_STATUS_SUCCESS != wptStatus )
@@ -13335,13 +13341,16 @@
wpt_uint8* pSendBuffer = NULL;
wpt_uint16 usDataOffset = 0;
wpt_uint16 usSendSize = 0;
+ WDI_EnterImpsReqParamsType* pwdiEnterImpsReqParams = NULL;
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
/*-------------------------------------------------------------------------
Sanity check
-------------------------------------------------------------------------*/
- if (( NULL == pEventData ) ||
- ( NULL == (wdiEnterImpsRspCb = (WDI_EnterImpsRspCb)pEventData->pCBfnc)))
+ if ((NULL == pEventData ) ||
+ (NULL == (wdiEnterImpsRspCb = (WDI_EnterImpsRspCb)pEventData->pCBfnc)) ||
+ (NULL == (pwdiEnterImpsReqParams =
+ (WDI_EnterImpsReqParamsType*)pEventData->pEventData)))
{
WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
"%s: Invalid parameters", __func__);
@@ -13399,6 +13408,16 @@
goto fail;
}
+ if (pWDICtx->dxeRingsEmpty == eWLAN_PAL_FALSE)
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
+ "%s: DXE Rings not empty, cannot enter IMPS",__func__);
+
+ goto fail;
+ }
+
+ pWDICtx->wdiReqStatusCB = pwdiEnterImpsReqParams->wdiReqStatusCB;
+ pWDICtx->pReqStatusUserData = pwdiEnterImpsReqParams->pUserData;
/*-------------------------------------------------------------------------
Send Get STA Request to HAL
-------------------------------------------------------------------------*/
@@ -24419,6 +24438,10 @@
*ppfnReqCB = ((WDI_ExitBmpsReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_ExitBmpsReqParamsType*)pEvent->pEventData)->pUserData;
break;
+ case WDI_ENTER_IMPS_REQ:
+ *ppfnReqCB = ((WDI_EnterImpsReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
+ *ppUserData = ((WDI_EnterImpsReqParamsType*)pEvent->pEventData)->pUserData;
+ break;
case WDI_ENTER_UAPSD_REQ:
*ppfnReqCB = ((WDI_EnterUapsdReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_EnterUapsdReqParamsType*)pEvent->pEventData)->pUserData;