wlan: iwpriv getRoamRssi to query RSSI from roaming engine
A new iwpriv getRoamRssi is supported to query RSSI from
the LFR firmware monitoring.
Since the RSSI monitoring and penalization is done in
Riva in BMPS mode. Iwpriv wlan0 getRoamRSSI fetches RSSI
from the riva only in BMPS Mode. If this command is used
while not associated or not in BMPS mode, it returns a value of 0
Change-Id: Ifa660c51685af5dd5d20b28546aa1b9d4f217082
CRs-Fixed: 427473
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 3c73813..c1ada3c 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -340,10 +340,17 @@
WDI_ProcessFeatureCapsExchangeReq, /* WDI_FEATURE_CAPS_EXCHANGE_REQ */
#ifdef WLAN_FEATURE_11AC
WDI_ProcessUpdateVHTOpModeReq, /* WDI_UPDATE_VHT_OP_MODE_REQ */
+#else
+ NULL,
#endif
/*-------------------------------------------------------------------------
Indications
-------------------------------------------------------------------------*/
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+ WDI_ProcessGetRoamRssiReq, /* WDI_GET_ROAM_RSSI_REQ */
+#else
+ NULL,
+#endif
WDI_ProcessHostSuspendInd, /* WDI_HOST_SUSPEND_IND*/
WDI_ProcessTrafficStatsInd, /* WDI_TRAFFIC_STATS_IND*/
};
@@ -506,6 +513,11 @@
#ifdef WLAN_FEATURE_11AC
WDI_ProcessUpdateVHTOpModeRsp, /* WDI_UPDATE_VHT_OP_MODE_RESP */
#endif
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+ WDI_ProcessGetRoamRssiRsp, /* WDI_GET_ROAM_RSSI_RESP */
+#else
+ NULL,
+#endif
/*---------------------------------------------------------------------
Indications
@@ -837,6 +849,7 @@
CASE_RETURN_STRING( WDI_SHUTDOWN_REQ );
CASE_RETURN_STRING( WDI_SET_POWER_PARAMS_REQ );
CASE_RETURN_STRING( WDI_TRAFFIC_STATS_IND );
+ CASE_RETURN_STRING( WDI_GET_ROAM_RSSI_REQ );
default:
return "Unknown WDI MessageId";
}
@@ -932,6 +945,7 @@
CASE_RETURN_STRING( WDI_HAL_DUMP_CMD_RESP );
CASE_RETURN_STRING( WDI_SHUTDOWN_RESP );
CASE_RETURN_STRING( WDI_SET_POWER_PARAMS_RESP );
+ CASE_RETURN_STRING( WDI_GET_ROAM_RSSI_RESP );
default:
return "Unknown WDI MessageId";
}
@@ -4641,6 +4655,66 @@
}/*WDI_GetStatsReq*/
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+/**
+ @brief WDI_GetRoamRssiReq will be called when the upper MAC wants
+ to get roam rssi from the device. Upon
+ the call of this API the WLAN DAL will pack and send a
+ HAL Start request message to the lower RIVA sub-system
+ if DAL is in state STARTED.
+
+ In state BUSY this request will be queued. Request won't
+ be allowed in any other state.
+
+ WDI_Start must have been called.
+
+ @param wdiGetRoamRssiReqParams: the stats parameters to get as
+ specified by the Device Interface
+
+ wdiGetRoamRssiRspCb: callback for passing back the response
+ of the get stats operation received from the device
+
+ pUserData: user data will be passed back with the
+ callback
+
+ @see WDI_Start
+ @return Result of the function call
+*/
+WDI_Status
+WDI_GetRoamRssiReq
+(
+ WDI_GetRoamRssiReqParamsType* pwdiGetRoamRssiReqParams,
+ WDI_GetRoamRssiRspCb wdiGetRoamRssiRspCb,
+ void* pUserData
+)
+{
+ WDI_EventInfoType wdiEventData;
+ /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+ /*------------------------------------------------------------------------
+ Sanity Check
+ ------------------------------------------------------------------------*/
+ if ( eWLAN_PAL_FALSE == gWDIInitialized )
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "WDI API call before module is initialized - Fail request");
+
+ return WDI_STATUS_E_NOT_ALLOWED;
+ }
+ /*------------------------------------------------------------------------
+ Fill in Event data and post to the Main FSM
+ ------------------------------------------------------------------------*/
+ wdiEventData.wdiRequest = WDI_GET_ROAM_RSSI_REQ;
+ wdiEventData.pEventData = pwdiGetRoamRssiReqParams;
+ wdiEventData.uEventDataSize = sizeof(*pwdiGetRoamRssiReqParams);
+ wdiEventData.pCBfnc = wdiGetRoamRssiRspCb;
+ wdiEventData.pUserData = pUserData;
+
+ return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
+
+}/*WDI_GetRoamRssiReq*/
+#endif
+
/**
@brief WDI_UpdateCfgReq will be called when the upper MAC when
@@ -10870,6 +10944,129 @@
wdiGetStatsRspCb, pEventData->pUserData, WDI_GET_STATS_RESP);
}/*WDI_ProcessGetStatsReq*/
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+/**
+ @brief Process Get Roam Rssi Request function (called when Main FSM
+ allows it)
+
+ @param pWDICtx: pointer to the WLAN DAL context
+ pEventData: pointer to the event information structure
+
+ @see
+ @return Result of the function call
+*/
+WDI_Status
+WDI_ProcessGetRoamRssiReq
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+)
+{
+ WDI_GetRoamRssiReqParamsType* pwdiGetRoamRssiParams;
+ WDI_GetStatsRspCb wdiGetStatsRspCb;
+ wpt_uint8* pSendBuffer = NULL;
+ wpt_uint16 usDataOffset = 0;
+ wpt_uint16 usSendSize = 0;
+ wpt_uint8 ucCurrentBSSSesIdx = 0;
+ WDI_BSSSessionType* pBSSSes = NULL;
+ wpt_macAddr macBSSID;
+ WDI_Status wdiStatus = WDI_STATUS_SUCCESS;
+ tHalGetRoamRssiReqMsg halRssiRoamReqMsg;
+ /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+ /*-------------------------------------------------------------------------
+ Sanity check
+ -------------------------------------------------------------------------*/
+ if (( NULL == pEventData ) || ( NULL == pEventData->pEventData) ||
+ ( NULL == pEventData->pCBfnc ) )
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "%s: Invalid parameters", __func__);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ pwdiGetRoamRssiParams = (WDI_GetRoamRssiReqParamsType*)pEventData->pEventData;
+ wdiGetStatsRspCb = (WDI_GetStatsRspCb)pEventData->pCBfnc;
+
+ /*-------------------------------------------------------------------------
+ Check to see if we are in the middle of an association, if so queue, if
+ not it means it is free to process request
+ -------------------------------------------------------------------------*/
+ wpalMutexAcquire(&pWDICtx->wptMutex);
+
+ /*------------------------------------------------------------------------
+ Find the BSS for which the request is made
+ ------------------------------------------------------------------------*/
+ if ( WDI_STATUS_SUCCESS != WDI_STATableGetStaBSSIDAddr(pWDICtx,
+ pwdiGetRoamRssiParams->wdiGetRoamRssiParamsInfo.ucSTAIdx,
+ &macBSSID))
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "This station does not exist in the WDI Station Table %d");
+ wpalMutexRelease(&pWDICtx->wptMutex);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ ucCurrentBSSSesIdx = WDI_FindAssocSession( pWDICtx, macBSSID, &pBSSSes);
+ if ( NULL == pBSSSes )
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "%s: Association sequence for this BSS does not yet exist. macBSSID " MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(macBSSID));
+
+ wpalMutexRelease(&pWDICtx->wptMutex);
+ return WDI_STATUS_E_NOT_ALLOWED;
+ }
+
+ /*------------------------------------------------------------------------
+ Check if this BSS is being currently processed or queued,
+ if queued - queue the new request as well
+ ------------------------------------------------------------------------*/
+ if ( eWLAN_PAL_TRUE == pBSSSes->bAssocReqQueued )
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "%s: Association sequence for this BSS exists but currently queued. macBSSID " MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(macBSSID));
+
+ wdiStatus = WDI_QueueAssocRequest( pWDICtx, pBSSSes, pEventData);
+ wpalMutexRelease(&pWDICtx->wptMutex);
+ return wdiStatus;
+ }
+
+ wpalMutexRelease(&pWDICtx->wptMutex);
+
+ /*-----------------------------------------------------------------------
+ Get message buffer
+ -----------------------------------------------------------------------*/
+ if (( WDI_STATUS_SUCCESS != WDI_GetMessageBuffer( pWDICtx, WDI_GET_ROAM_RSSI_REQ,
+ sizeof(halRssiRoamReqMsg.roamRssiReqParams),
+ &pSendBuffer, &usDataOffset, &usSendSize))||
+ ( usSendSize < (usDataOffset + sizeof(halRssiRoamReqMsg.roamRssiReqParams) )))
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "Unable to get send buffer in set bss key req %x %x %x",
+ pEventData, pwdiGetRoamRssiParams, wdiGetStatsRspCb);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ halRssiRoamReqMsg.roamRssiReqParams.staId =
+ pwdiGetRoamRssiParams->wdiGetRoamRssiParamsInfo.ucSTAIdx;
+ wpalMemoryCopy( pSendBuffer+usDataOffset,
+ &halRssiRoamReqMsg.roamRssiReqParams,
+ sizeof(halRssiRoamReqMsg.roamRssiReqParams));
+
+ pWDICtx->wdiReqStatusCB = pwdiGetRoamRssiParams->wdiReqStatusCB;
+ pWDICtx->pReqStatusUserData = pwdiGetRoamRssiParams->pUserData;
+
+ /*-------------------------------------------------------------------------
+ Send Get STA Request to HAL
+ -------------------------------------------------------------------------*/
+ return WDI_SendMsg( pWDICtx, pSendBuffer, usSendSize,
+ wdiGetStatsRspCb, pEventData->pUserData, WDI_GET_ROAM_RSSI_RESP);
+}/*WDI_ProcessGetRoamRssiReq*/
+#endif
+
/**
@brief Process Update Cfg Request function (called when Main
FSM allows it)
@@ -16449,6 +16646,68 @@
return WDI_STATUS_SUCCESS;
}/*WDI_ProcessGetStatsRsp*/
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+/**
+ @brief Process Get Roam Rssi Rsp function (called when a response is
+ being received over the bus from HAL)
+
+ @param pWDICtx: pointer to the WLAN DAL context
+ pEventData: pointer to the event information structure
+
+ @see
+ @return Result of the function call
+*/
+WDI_Status
+WDI_ProcessGetRoamRssiRsp
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+)
+{
+ WDI_GetRoamRssiRspParamsType wdiGetRoamRssiRsp;
+ WDI_GetRoamRssiRspCb wdiGetRoamRssiRspCb;
+ tHalGetRoamRssiRspMsg halRoamRssiRspParams;
+ /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+ /*-------------------------------------------------------------------------
+ Sanity check
+ -------------------------------------------------------------------------*/
+ if (( NULL == pWDICtx ) || ( NULL == pEventData ) ||
+ ( NULL == pEventData->pEventData))
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "%s: Invalid parameters", __func__);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ wdiGetRoamRssiRspCb = (WDI_GetRoamRssiRspCb)pWDICtx->pfncRspCB;
+ if(NULL == wdiGetRoamRssiRspCb)
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
+ "%s: call back function is NULL", __func__);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ /*-------------------------------------------------------------------------
+ Extract response and send it to UMAC
+ -------------------------------------------------------------------------*/
+ wpalMemoryCopy( &halRoamRssiRspParams.roamRssiRspParams,
+ pEventData->pEventData,
+ sizeof(halRoamRssiRspParams.roamRssiRspParams));
+
+ wdiGetRoamRssiRsp.wdiStatus = WDI_HAL_2_WDI_STATUS(halRoamRssiRspParams.roamRssiRspParams.status);
+ wdiGetRoamRssiRsp.ucSTAIdx = halRoamRssiRspParams.roamRssiRspParams.staId;
+ wdiGetRoamRssiRsp.rssi = halRoamRssiRspParams.roamRssiRspParams.rssi;
+
+ /*Notify UMAC*/
+ wdiGetRoamRssiRspCb( &wdiGetRoamRssiRsp, pWDICtx->pRspCBUserData);
+
+ return WDI_STATUS_SUCCESS;
+}/*WDI_ProcessGetRoamRssiRsp*/
+#endif
+
/**
@brief Process Update Cfg Rsp function (called when a response is
@@ -21175,6 +21434,8 @@
case WDI_UPDATE_VHT_OP_MODE_REQ:
return WLAN_HAL_UPDATE_VHT_OP_MODE_REQ;
#endif
+ case WDI_GET_ROAM_RSSI_REQ:
+ return WLAN_HAL_GET_ROAM_RSSI_REQ;
default:
return WLAN_HAL_MSG_MAX;
}
@@ -21394,6 +21655,10 @@
case WLAN_HAL_UPDATE_VHT_OP_MODE_RSP:
return WDI_UPDATE_VHT_OP_MODE_RESP;
#endif
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+ case WLAN_HAL_GET_ROAM_RSSI_RSP:
+ return WDI_GET_ROAM_RSSI_RESP;
+#endif
default:
return eDRIVER_TYPE_MAX;
}
@@ -22244,6 +22509,12 @@
*ppfnReqCB = ((WDI_GetStatsReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_GetStatsReqParamsType*)pEvent->pEventData)->pUserData;
break;
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+ case WDI_GET_ROAM_RSSI_REQ:
+ *ppfnReqCB = ((WDI_GetRoamRssiReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
+ *ppUserData = ((WDI_GetRoamRssiReqParamsType*)pEvent->pEventData)->pUserData;
+ break;
+#endif
case WDI_UPDATE_CFG_REQ:
*ppfnReqCB = ((WDI_UpdateCfgReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_UpdateCfgReqParamsType*)pEvent->pEventData)->pUserData;