prima: NAN - WDA and WDI changes to support NAN
Changes required in WDA and WDI layers to support NAN control
path.
1. Send the NAN command with associated data to firmware.
2. Send the NAN events received from firmware to SME using
the callback provided.
Change-Id: Ib8d478fcac3188cc977d4aecf81829431030c2f0
CRs-Fixed: 797391
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 934f249..cb6959c 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -5718,4 +5718,9 @@
tANI_U8 smeSessionId;
}tSirSmeUpdateMaxRateParams, *tpSirSmeUpdateMaxRateParams;
+typedef struct
+{
+ tANI_U32 event_data_len;
+ tANI_U8 event_data[1];
+} tSirNanEvent, *tpSirNanEvent;
#endif /* __SIR_API_H */
diff --git a/CORE/SME/inc/smeInternal.h b/CORE/SME/inc/smeInternal.h
index c291b18..1575212 100644
--- a/CORE/SME/inc/smeInternal.h
+++ b/CORE/SME/inc/smeInternal.h
@@ -169,6 +169,7 @@
#endif /* WLAN_FEATURE_EXTSCAN */
tSmeEncMsgHddCbkInfo pEncMsgInfoParams;
void (*pBtCoexTDLSNotification) (void *pAdapter, int);
+ void (*nanCallback) (void*, tSirNanEvent*);
} tSmeStruct, *tpSmeStruct;
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 2f94ddb..621909e 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -256,6 +256,73 @@
VOS_STATUS WDA_ProcessEncryptMsgReq(tWDA_CbContext *pWDA,
u8 *wdaRequest);
+
+/*
+ * FUNCTION: WDA_ProcessNanRequest
+ * Process NAN request
+ */
+VOS_STATUS WDA_ProcessNanRequest(tWDA_CbContext *pWDA,
+ tNanRequest *wdaRequest)
+{
+ WDI_Status status = WDI_STATUS_SUCCESS;
+ tWDA_ReqParams *pWdaParams;
+ WDI_NanRequestType *wdiRequest = NULL;
+ size_t wdiReqLength = sizeof(WDI_NanRequestType)
+ - sizeof(wdiRequest->request_data)
+ + wdaRequest->request_data_len;
+
+ wdiRequest = (WDI_NanRequestType *)vos_mem_malloc(wdiReqLength);
+
+ if (NULL == wdiRequest)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure, size : %zu", __func__,
+ wdiReqLength);
+ vos_mem_free(wdaRequest);
+ return VOS_STATUS_E_NOMEM;
+ }
+
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "WDA: Process Nan Request length: %zu", wdiReqLength);
+
+ 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 for tWDA_ReqParams", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(wdaRequest);
+ vos_mem_free(wdiRequest);
+ return VOS_STATUS_E_NOMEM;
+ }
+
+ wdiRequest->request_data_len = wdaRequest->request_data_len;
+
+ vos_mem_copy( wdiRequest->request_data,
+ wdaRequest->request_data,
+ wdaRequest->request_data_len);
+
+ vos_mem_free(wdaRequest);
+
+ pWdaParams->pWdaContext = pWDA;
+ pWdaParams->wdaMsgParam = NULL;
+ pWdaParams->wdaWdiApiMsgParam = wdiRequest;
+
+ status = WDI_NanRequest(wdiRequest, pWdaParams);
+
+ if (IS_WDI_STATUS_FAILURE(status))
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "Failure to request. Free all the memory " );
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
+ }
+
+ return CONVERT_WDI2VOS_STATUS(status) ;
+}
+
+
+
/*
* FUNCTION: WDA_open
* Allocate the WDA context
@@ -14013,6 +14080,13 @@
WDA_ProcessEncryptMsgReq(pWDA, (u8 *)pMsg->bodyptr);
break;
}
+
+ case WDA_NAN_REQUEST:
+ {
+ WDA_ProcessNanRequest( pWDA, (tNanRequest *)pMsg->bodyptr);
+ break;
+ }
+
default:
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
@@ -14862,6 +14936,51 @@
(void *)pDelBAInd , 0) ;
break;
}
+ case WDI_NAN_EVENT_IND:
+ {
+ vos_msg_t vosMsg;
+ tpSirNanEvent pSirNanEvent = NULL;
+
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "Received WDI_NAN_EVENT");
+
+ pSirNanEvent = (tpSirNanEvent)vos_mem_malloc( sizeof( tSirNanEvent )
+ - sizeof( pSirNanEvent->event_data)
+ + wdiLowLevelInd->wdiIndicationData.wdiNanEvent.event_data_len);
+
+ if (NULL == pSirNanEvent)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure", __func__);
+ VOS_ASSERT(0) ;
+ break;
+ }
+
+ pSirNanEvent->event_data_len =
+ wdiLowLevelInd->wdiIndicationData.wdiNanEvent.event_data_len;
+
+ if (wdiLowLevelInd->wdiIndicationData.wdiNanEvent.event_data_len)
+ {
+ vos_mem_copy( pSirNanEvent->event_data,
+ wdiLowLevelInd->wdiIndicationData.wdiNanEvent.event_data,
+ wdiLowLevelInd->wdiIndicationData.wdiNanEvent.event_data_len);
+ }
+
+ /* VOS message wrapper */
+ vosMsg.type = eWNI_SME_NAN_EVENT;
+ vosMsg.bodyptr = pSirNanEvent;
+ vosMsg.bodyval = 0;
+
+ /* Send message to SME */
+ if (VOS_STATUS_SUCCESS
+ != vos_mq_post_message(VOS_MQ_ID_SME, (vos_msg_t*)&vosMsg))
+ {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_WARN,
+ "post eWNI_SME_NAN_EVENT to SME Failed");
+ vos_mem_free(pSirNanEvent);
+ }
+ break;
+ }
default:
{
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index 91eea65..beb2016 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -414,6 +414,7 @@
#endif
/*Delete BA Ind*/
WDI_DEL_BA_IND,
+ WDI_NAN_EVENT_IND,
WDI_MAX_IND
}WDI_LowLevelIndEnumType;
@@ -615,6 +616,13 @@
} WDI_WakeReasonIndType;
#endif // WLAN_WAKEUP_EVENTS
+typedef struct
+{
+ wpt_uint16 event_data_len;
+ wpt_uint8* event_data;
+} WDI_NanEventType;
+
+
/*---------------------------------------------------------------------------
WDI_MissedBeaconIndType
-----------------------------------------------------------------------------*/
@@ -946,6 +954,8 @@
void *pEXTScanIndData;
#endif
WDI_DeleteBAIndType wdiDeleteBAInd;
+
+ WDI_NanEventType wdiNanEvent;
} wdiIndicationData;
}WDI_LowLevelIndType;
@@ -5742,6 +5752,16 @@
} WDI_AddPeriodicTxPtrnParamsType;
/*---------------------------------------------------------------------------
+ WDI_NanRequestType
+---------------------------------------------------------------------------*/
+typedef struct
+{
+ wpt_uint16 request_data_len;
+ wpt_uint8 request_data[1];
+} WDI_NanRequestType;
+
+
+/*---------------------------------------------------------------------------
WDI_DelPeriodicTxPtrnParamsType
---------------------------------------------------------------------------*/
typedef struct
@@ -11391,6 +11411,29 @@
WDI_EncryptMsgRspCb wdiEncryptMsgCbRsp,
void* pUserData
);
+
+/**
+ @brief WDI_NanRequest
+ NAN request
+
+ @param pwdiNanRequest: data
+
+ pwdiNanCb: callback
+
+ usrData: user data will be passed back with the
+ callback
+
+ @return Result of the function call
+*/
+WDI_Status
+WDI_NanRequest
+(
+ WDI_NanRequestType *pwdiNanRequest,
+ void *usrData
+);
+
+
+
#ifdef __cplusplus
}
#endif
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
index c1ac0c3..a8db5d9 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
@@ -473,6 +473,9 @@
WDI_MGMT_LOGGING_INIT_REQ = 104,
WDI_GET_FRAME_LOG_REQ = 105,
+ /* NAN Request */
+ WDI_NAN_REQUEST = 106,
+
WDI_MAX_REQ,
/*Send a suspend Indication down to HAL*/
@@ -805,6 +808,9 @@
WDI_MGMT_LOGGING_INIT_RSP = 104,
WDI_GET_FRAME_LOG_RSP = 105,
+
+ WDI_NAN_RESPONSE = 106,
+
/*-------------------------------------------------------------------------
Indications
!! Keep these last in the enum if possible
@@ -883,6 +889,7 @@
#endif
WDI_TDLS_CHAN_SWITCH_REQ_RESP = WDI_HAL_IND_MIN + 26,
WDI_HAL_DEL_BA_IND = WDI_HAL_IND_MIN + 27,
+ WDI_HAL_NAN_EVENT = WDI_HAL_IND_MIN + 28,
WDI_MAX_RESP
}WDI_ResponseEnumType;
@@ -6149,5 +6156,56 @@
WDI_ControlBlockType* pWDICtx,
WDI_EventInfoType* pEventData
);
+
+/**
+ @brief Process NAN Request
+
+ @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_ProcessNanRequest
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+);
+
+/**
+ @brief Process NAN Response
+
+ @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_ProcessNanResponse
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+);
+
+/**
+*@brief Process NAN Event function (called when
+ an indication 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_ProcessNanEvent
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+);
+
#endif /*WLAN_QCT_WDI_I_H*/
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index e799964..badb431 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -472,6 +472,9 @@
WDI_ProcessMgmtLoggingInitReq, /* WDI_MGMT_LOGGING_INIT_REQ*/
WDI_ProcessGetFrameLogReq, /* WDI_GET_FRAME_LOG_REQ*/
+
+ WDI_ProcessNanRequest, /* WDI_NAN_REQUEST*/
+
/*-------------------------------------------------------------------------
Indications
-------------------------------------------------------------------------*/
@@ -738,6 +741,8 @@
WDI_ProcessMgmtFrameLoggingInitRsp, /* WDI_MGMT_LOGGING_INIT_RSP*/
WDI_ProcessGetFrameLogRsp, /* WDI_GET_FRAME_LOG_RSP*/
+ WDI_ProcessNanResponse, /* WDI_NAN_RESPONSE */
+
/*---------------------------------------------------------------------
Indications
---------------------------------------------------------------------*/
@@ -822,6 +827,7 @@
NULL,
#endif
WDI_delBaInd, /* WDI_HAL_DEL_BA_IND*/
+ WDI_ProcessNanEvent, /* WDI_HAL_NAN_EVENT */
};
@@ -1160,6 +1166,7 @@
CASE_RETURN_STRING( WDI_ENCRYPT_MSG_REQ);
CASE_RETURN_STRING( WDI_MGMT_LOGGING_INIT_REQ);
CASE_RETURN_STRING( WDI_GET_FRAME_LOG_REQ);
+ CASE_RETURN_STRING( WDI_NAN_REQUEST );
default:
return "Unknown WDI MessageId";
}
@@ -24106,6 +24113,8 @@
return WLAN_HAL_MGMT_LOGGING_INIT_REQ;
case WDI_GET_FRAME_LOG_REQ:
return WLAN_HAL_GET_FRAME_LOG_REQ;
+ case WDI_NAN_REQUEST:
+ return WLAN_HAL_NAN_REQ;
default:
return WLAN_HAL_MSG_MAX;
@@ -24428,6 +24437,10 @@
return WDI_MGMT_LOGGING_INIT_RSP;
case WLAN_HAL_GET_FRAME_LOG_RSP:
return WDI_GET_FRAME_LOG_RSP;
+ case WLAN_HAL_NAN_RSP:
+ return WDI_NAN_RESPONSE;
+ case WLAN_HAL_NAN_EVT:
+ return WDI_HAL_NAN_EVENT;
default:
return eDRIVER_TYPE_MAX;
@@ -34308,3 +34321,197 @@
pWDICtx->pRspCBUserData);
return WDI_STATUS_SUCCESS;
}
+
+WDI_Status
+WDI_NanRequest
+(
+ WDI_NanRequestType *pwdiNanRequest,
+ void *usrData
+)
+{
+ 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;
+ }
+
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
+ "WDI_NanRequest %zu %d", sizeof(*pwdiNanRequest),
+ pwdiNanRequest->request_data_len);
+
+ /*------------------------------------------------------------------------
+ Fill in Event data and post to the Main FSM
+ ------------------------------------------------------------------------*/
+ wdiEventData.wdiRequest = WDI_NAN_REQUEST;
+ wdiEventData.pEventData = pwdiNanRequest;
+ wdiEventData.uEventDataSize = sizeof(*pwdiNanRequest)
+ + pwdiNanRequest->request_data_len;
+ wdiEventData.pUserData = usrData;
+ wdiEventData.pCBfnc = NULL;
+
+
+ return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
+}
+
+WDI_Status
+WDI_ProcessNanRequest
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+)
+{
+ WDI_NanRequestType *pwdiNanRequest = NULL;
+ wpt_uint8* pSendBuffer = NULL;
+ wpt_uint16 usDataOffset = 0;
+ wpt_uint16 usSendSize = 0;
+
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
+ "WDI_ProcessNanRequest");
+
+ /*-------------------------------------------------------------------------
+ Sanity check
+ -------------------------------------------------------------------------*/
+ if (( NULL == pEventData ) ||
+ ( NULL == (pwdiNanRequest = (WDI_NanRequestType*)pEventData->pEventData)))
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "%s: Invalid parameters", __FUNCTION__);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ /*-----------------------------------------------------------------------
+ Get message buffer
+ -----------------------------------------------------------------------*/
+ if (( WDI_STATUS_SUCCESS
+ != WDI_GetMessageBuffer( pWDICtx,
+ WDI_NAN_REQUEST,
+ pwdiNanRequest->request_data_len,
+ &pSendBuffer,
+ &usDataOffset,
+ &usSendSize))||
+ ( usSendSize < (usDataOffset + pwdiNanRequest->request_data_len)))
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "Unable to get send buffer in NAN request %p %p",
+ pEventData, pwdiNanRequest);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ wpalMemoryCopy( pSendBuffer+usDataOffset,
+ pwdiNanRequest->request_data,
+ pwdiNanRequest->request_data_len);
+
+ pWDICtx->pReqStatusUserData = NULL;
+ pWDICtx->pfncRspCB = NULL;
+ vos_mem_free( pEventData->pUserData);
+
+ /*-------------------------------------------------------------------------
+ Send NAN Request to HAL
+ -------------------------------------------------------------------------*/
+ return WDI_SendMsg( pWDICtx,
+ pSendBuffer,
+ usSendSize,
+ NULL,
+ NULL,
+ WDI_NAN_RESPONSE);
+}
+
+/**
+ @brief Process NAN Response 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_ProcessNanResponse
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+)
+{
+ WDI_Status wdiStatus;
+ eHalStatus halStatus;
+
+ /*-------------------------------------------------------------------------
+ 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;
+ }
+
+ halStatus = *((eHalStatus*)pEventData->pEventData);
+ wdiStatus = WDI_HAL_2_WDI_STATUS(halStatus);
+
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
+ "%s : Received NAN response, status : %d", __FUNCTION__, wdiStatus);
+
+ return WDI_STATUS_SUCCESS;
+}/*WDI_ProcessNanResponse*/
+
+
+/**
+ @brief Process NAN Event function (called when
+ an indication 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_ProcessNanEvent
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+)
+{
+ WDI_LowLevelIndType wdiInd;
+
+ /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+ 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;
+ }
+
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
+ "%s: Received NAN event", __func__);
+ /*-------------------------------------------------------------------------
+ Extract indication and send it to UMAC
+ -------------------------------------------------------------------------*/
+ wdiInd.wdiIndicationType = WDI_NAN_EVENT_IND;
+ wdiInd.wdiIndicationData.wdiNanEvent.event_data_len =
+ pEventData->uEventDataSize;
+ wdiInd.wdiIndicationData.wdiNanEvent.event_data =
+ pEventData->pEventData;
+
+ /*Notify UMAC*/
+ pWDICtx->wdiLowLevelIndCB( &wdiInd, pWDICtx->pIndUserData );
+
+ return WDI_STATUS_SUCCESS;
+}/*WDI_ProcessNanEvent*/
+
diff --git a/Kbuild b/Kbuild
index d9cd7ea..f48147e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -300,6 +300,9 @@
SME_RRM_OBJS := $(SME_SRC_DIR)/rrm/sme_rrm.o
+SME_NAN_OBJS = $(SME_SRC_DIR)/nan/nan_Api.o
+
+
SME_OBJS := $(SME_BTC_OBJS) \
$(SME_CCM_OBJS) \
$(SME_CMN_OBJS) \
@@ -308,7 +311,8 @@
$(SME_P2P_OBJS) \
$(SME_PMC_OBJS) \
$(SME_QOS_OBJS) \
- $(SME_RRM_OBJS)
+ $(SME_RRM_OBJS) \
+ $(SME_NAN_OBJS)
############ SVC ############
SVC_DIR := CORE/SVC