wlan: CCX upload support for statically linked driver
jb_mr2 enforces drivers must be statically linked and
does not support dynamically linked driver. CCX feature
has 7 proprietary files which cannot be pushed to public domain.
The changes in the 7 files are pushed to wpa_supplicant.
These are the changes required to support uploaded
approach and as well as support backward compatibility.
1. Traffic stream Metrics and TSR IE structures are moved
to common header files
2. Forwarding the IAPP data frame to wpa_supplicant incase
of CCX connection along with LLC header
3. Implementation of driver private commands
3.1 SETCCKMIE
3.2 GETTSMSTATS
3.3 SETCCXROAMSCANCHANNELS
4. Implementation of IWEVCUSTOM events
4.1 Sending CCKMPREAUTHNOTIFY event with bssid and TSF
4.2 Sending TSMIE event
4.3 Sending CCXADJAPREP event with roam delay info
5. New feature macro FEATURE_WLAN_CCX_UPLOAD added
Change-Id: Ic185d531de6e5b13984df1c563b0453f313afa27
CRs-Fixed: 555470
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index cabe5b0..ab1354b 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -5261,10 +5261,10 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
- vos_mem_free(pGetRoamRssiParams);
- vos_mem_free(pWdaParams);
return VOS_STATUS_E_NOMEM;
}
+ vos_mem_free(pGetRoamRssiParams);
+ vos_mem_free(pWdaParams);
pGetRoamRssiRspParams->staId = pGetRoamRssiParams->staId;
pGetRoamRssiRspParams->rc = eSIR_FAILURE;
pGetRoamRssiRspParams->rssi = 0;
@@ -6085,7 +6085,8 @@
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
tWDA_CbContext *pWDA = NULL;
- tTSMStats *pTsmRspParams = NULL;
+ tpAniGetTsmStatsRsp pTsmRspParams = NULL;
+ tpAniGetTsmStatsReq pGetTsmStatsReqParams = NULL;
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"<------ Entering: %s " ,__func__);
@@ -6097,7 +6098,20 @@
return ;
}
pWDA = (tWDA_CbContext *) pWdaParams->pWdaContext;
- pTsmRspParams = (tTSMStats *)pWdaParams->wdaMsgParam ;
+ pGetTsmStatsReqParams = (tAniGetTsmStatsReq *)pWdaParams->wdaMsgParam;
+
+ if(NULL == pGetTsmStatsReqParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pGetTsmStatsReqParams received NULL", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
+ return;
+ }
+
+ pTsmRspParams =
+ (tAniGetTsmStatsRsp *)vos_mem_malloc(sizeof(tAniGetTsmStatsRsp));
if( NULL == pTsmRspParams )
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -6105,9 +6119,10 @@
VOS_ASSERT( 0 );
return ;
}
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
- vos_mem_free(pWdaParams);
-
+ vos_mem_set(pTsmRspParams, sizeof(tAniGetTsmStatsRsp), 0);
+ pTsmRspParams->rc = pwdiTSMStatsRspParams->wdiStatus;
+ pTsmRspParams->staId = pGetTsmStatsReqParams->staId;
+
pTsmRspParams->tsmMetrics.UplinkPktQueueDly = pwdiTSMStatsRspParams->UplinkPktQueueDly;
vos_mem_copy(pTsmRspParams->tsmMetrics.UplinkPktQueueDlyHist,
pwdiTSMStatsRspParams->UplinkPktQueueDlyHist,
@@ -6118,6 +6133,14 @@
pTsmRspParams->tsmMetrics.UplinkPktCount = pwdiTSMStatsRspParams->UplinkPktCount;
pTsmRspParams->tsmMetrics.RoamingCount = pwdiTSMStatsRspParams->RoamingCount;
pTsmRspParams->tsmMetrics.RoamingDly = pwdiTSMStatsRspParams->RoamingDly;
+
+ /* Assign get tsm stats req req (backup) in to the response */
+ pTsmRspParams->tsmStatsReq = pGetTsmStatsReqParams;
+
+ /* free WDI command buffer */
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
+
WDA_SendMsg(pWDA, WDA_TSM_STATS_RSP, (void *)pTsmRspParams , 0) ;
return ;
}
@@ -6128,11 +6151,13 @@
* Request to WDI to get the TSM Stats params.
*/
VOS_STATUS WDA_ProcessTsmStatsReq(tWDA_CbContext *pWDA,
- tTSMStats *pTsmStats)
+ tpAniGetTsmStatsReq pTsmStats)
{
- WDI_Status status = WDI_STATUS_SUCCESS ;
+ WDI_Status status = WDI_STATUS_SUCCESS ;
WDI_TSMStatsReqParamsType *wdiTSMReqParam = NULL;
- tWDA_ReqParams *pWdaParams = NULL;
+ tWDA_ReqParams *pWdaParams = NULL;
+ tAniGetTsmStatsRsp *pGetTsmStatsRspParams = NULL;
+
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"------> Entering: %s " ,__func__);
wdiTSMReqParam = (WDI_TSMStatsReqParamsType *)vos_mem_malloc(
@@ -6162,17 +6187,30 @@
pWdaParams->pWdaContext = pWDA;
/* Store TSM Stats pointer, as this will be used for response */
pWdaParams->wdaMsgParam = (void *)pTsmStats ;
- /* store Params pass it to WDI */
- pWdaParams->wdaWdiApiMsgParam = (void *)wdiTSMReqParam ;
+ pWdaParams->wdaWdiApiMsgParam = NULL ;
status = WDI_TSMStatsReq(wdiTSMReqParam,
(WDI_TsmRspCb)WDA_TSMStatsReqCallback, pWdaParams);
if(IS_WDI_STATUS_FAILURE(status))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"Failure in TSM STATS REQ Params WDI API, free all the memory " );
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
- vos_mem_free(pWdaParams) ;
- WDA_SendMsg(pWDA, WDA_TSM_STATS_RSP, (void *)pTsmStats , 0) ;
+ vos_mem_free(pWdaParams);
+
+ pGetTsmStatsRspParams =
+ (tAniGetTsmStatsRsp *)vos_mem_malloc(sizeof(tAniGetTsmStatsRsp));
+ if(NULL == pGetTsmStatsRspParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(pTsmStats);
+ return VOS_STATUS_E_NOMEM;
+ }
+ pGetTsmStatsRspParams->staId = pTsmStats->staId;
+ pGetTsmStatsRspParams->rc = eSIR_FAILURE;
+ pGetTsmStatsRspParams->tsmStatsReq = pTsmStats;
+
+ WDA_SendMsg(pWDA, WDA_TSM_STATS_RSP, (void *)pGetTsmStatsRspParams , 0) ;
}
return CONVERT_WDI2VOS_STATUS(status) ;
}
@@ -11279,7 +11317,7 @@
#ifdef FEATURE_WLAN_CCX
case WDA_TSM_STATS_REQ:
{
- WDA_ProcessTsmStatsReq(pWDA, (tTSMStats *)pMsg->bodyptr);
+ WDA_ProcessTsmStatsReq(pWDA, (tpAniGetTsmStatsReq)pMsg->bodyptr);
break;
}
#endif