wlan: Drop Actions frames in FW, that are not processed by host
Several Action frame categories are not processed in host and they
are not forwarded to supplicant either, but they are dropped in host.
These unprocessed action frames are forwarded to host by FW and
wake up host unnecessarily which leads to battery drain. With this fix,
host conveys FW the allowed/required action frames list at HDD
startup so that the remaining frames can be dropped in FW itself
thereafter.
Change-Id: I97b87c9fa04973a5edbd0a4aa3aa5dd7c3d3e039
CRs-Fixed: 999114
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index ce299dd..014309a 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -3817,6 +3817,15 @@
void *fwlogInitCbContext;
}tSirFWLoggingInitParam,*tpSirFWLoggingInitParam;
+/**
+ * struct sir_allowed_action_frames - Parameters to set Allowed action frames
+ * @bitmask: Bits to convey the allowed action frames
+ * @reserved: For future use
+ */
+struct sir_allowed_action_frames {
+ uint32_t bitmask;
+ uint32_t reserved;
+};
/*
* struct rssi_monitor_req - rssi monitoring
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index 052e04d..2a68a3f 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -753,6 +753,7 @@
#define SIR_HAL_START_OEM_DATA_RSP_IND_NEW (SIR_HAL_ITC_MSG_TYPES_BEGIN + 281)
#define SIR_HAL_ANTENNA_DIVERSITY_SELECTION_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 282)
#define SIR_HAL_MODIFY_ROAM_PARAMS_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 283)
+#define SIR_HAL_SET_ALLOWED_ACTION_FRAMES (SIR_HAL_ITC_MSG_TYPES_BEGIN + 284)
#define SIR_HAL_MSG_TYPES_END (SIR_HAL_MSG_TYPES_BEGIN + 0x1FF)
// CFG message types
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index ddff1c1..98d68ed 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -2269,6 +2269,12 @@
switch (pActionHdr->category)
{
+
+ /*
+ * WARNING: If you add Action frame category case here, set the
+ * corresponding bit to 1 in sme_set_allowed_action_frames() for
+ * the FW to hand over that frame to host without dropping itself
+ */
case SIR_MAC_ACTION_QOS_MGMT:
if ( (psessionEntry->limQosEnabled) ||
(pActionHdr->actionID == SIR_MAC_QOS_MAP_CONFIGURE) )
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index bf1476a..c416890 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -100,6 +100,46 @@
reg_info_2 |= ((val & 0xff) << 8); \
} while(0)
+/**
+ * ALLOWED_ACTION_FRAMES_BITMAP
+ *
+ * Bitmask is based on the below.The frames with 0's
+ * set to their corresponding bit can be dropped in FW.
+ *
+ * -----------------------------+-----+-------+
+ * Type | Bit | Allow |
+ * -----------------------------+-----+-------+
+ * SIR_MAC_ACTION_SPECTRUM_MGMT 0 1
+ * SIR_MAC_ACTION_QOS_MGMT 1 1
+ * SIR_MAC_ACTION_DLP 2 0
+ * SIR_MAC_ACTION_BLKACK 3 1
+ * SIR_MAC_ACTION_PUBLIC_USAGE 4 1
+ * SIR_MAC_ACTION_RRM 5 1
+ * SIR_MAC_ACTION_FAST_BSS_TRNST 6 0
+ * SIR_MAC_ACTION_HT 7 0
+ * SIR_MAC_ACTION_SA_QUERY 8 1
+ * SIR_MAC_ACTION_PROT_DUAL_PUB 9 0
+ * SIR_MAC_ACTION_WNM 10 1
+ * SIR_MAC_ACTION_UNPROT_WNM 11 0
+ * SIR_MAC_ACTION_TDLS 12 0
+ * SIR_MAC_ACITON_MESH 13 0
+ * SIR_MAC_ACTION_MHF 14 0
+ * SIR_MAC_SELF_PROTECTED 15 0
+ * SIR_MAC_ACTION_WME 17 1
+ * SIR_MAC_ACTION_FST 18 0
+ * SIR_MAC_ACTION_VHT 21 1
+ * ----------------------------+------+-------+
+ */
+#define ALLOWED_ACTION_FRAMES_BITMAP \
+ ((1 << SIR_MAC_ACTION_SPECTRUM_MGMT) | \
+ (1 << SIR_MAC_ACTION_QOS_MGMT) | \
+ (1 << SIR_MAC_ACTION_BLKACK) | \
+ (1 << SIR_MAC_ACTION_PUBLIC_USAGE) | \
+ (1 << SIR_MAC_ACTION_RRM) | \
+ (1 << SIR_MAC_ACTION_SA_QUERY) | \
+ (1 << SIR_MAC_ACTION_WNM) | \
+ (1 << SIR_MAC_ACTION_WME) | \
+ (1 << SIR_MAC_ACTION_VHT))
/*--------------------------------------------------------------------------
Type declarations
------------------------------------------------------------------------*/
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 395f654..f38c706 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -1830,6 +1830,61 @@
return status;
}
+/**
+ * sme_set_allowed_action_frames() - Set allowed action frames to FW
+ *
+ * @hal: Handler to HAL
+ *
+ * This function conveys the list of action frames that needs to be forwarded
+ * to driver by FW. Rest of the action frames can be dropped in FW.Bitmask is
+ * set with ALLOWED_ACTION_FRAMES_BITMAP
+ *
+ * Return: None
+ */
+static void sme_set_allowed_action_frames(tHalHandle hal)
+{
+ eHalStatus status;
+ tpAniSirGlobal mac = PMAC_STRUCT(hal);
+ vos_msg_t vos_message;
+ VOS_STATUS vos_status;
+ struct sir_allowed_action_frames *sir_allowed_action_frames;
+
+ sir_allowed_action_frames =
+ vos_mem_malloc(sizeof(*sir_allowed_action_frames));
+ if (!sir_allowed_action_frames) {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "Not able to allocate memory for WDA_SET_ALLOWED_ACTION_FRAMES_IND");
+ return;
+ }
+
+ vos_mem_zero(sir_allowed_action_frames, sizeof(*sir_allowed_action_frames));
+ sir_allowed_action_frames->bitmask = ALLOWED_ACTION_FRAMES_BITMAP;
+ sir_allowed_action_frames->reserved = 0;
+
+ status = sme_AcquireGlobalLock(&mac->sme);
+ if (status == eHAL_STATUS_SUCCESS) {
+ /* serialize the req through MC thread */
+ vos_message.bodyptr = sir_allowed_action_frames;
+ vos_message.type = WDA_SET_ALLOWED_ACTION_FRAMES_IND;
+ MTRACE(vos_trace(VOS_MODULE_ID_SME,
+ TRACE_CODE_SME_TX_WDA_MSG,
+ NO_SESSION, vos_message.type));
+ vos_status = vos_mq_post_message(VOS_MQ_ID_WDA, &vos_message);
+ if (!VOS_IS_STATUS_SUCCESS(vos_status)) {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "Not able to post WDA_SET_ALLOWED_ACTION_FRAMES_IND message to HAL");
+ vos_mem_free(sir_allowed_action_frames);
+ }
+
+ sme_ReleaseGlobalLock( &mac->sme );
+ } else {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
+ "sme_AcquireGlobalLock error", __func__);
+ vos_mem_free(sir_allowed_action_frames);
+ }
+ return;
+}
+
/*--------------------------------------------------------------------------
\brief sme_Start() - Put all SME modules at ready state.
@@ -1875,6 +1930,8 @@
pMac->sme.state = SME_STATE_START;
}while (0);
+ sme_set_allowed_action_frames(hHal);
+
return status;
}
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index ff4ed62..28ea9c2 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -1339,6 +1339,8 @@
#endif
#define WDA_MODIFY_ROAM_PARAMS_IND SIR_HAL_MODIFY_ROAM_PARAMS_IND
+#define WDA_SET_ALLOWED_ACTION_FRAMES_IND SIR_HAL_SET_ALLOWED_ACTION_FRAMES
+
#define HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME 0x40 // Bit 6 will be used to control BD rate for Management frames
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 5a17e87..2ac7431 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -14935,7 +14935,54 @@
}
+/**
+ * wda_process_set_allowed_action_frames_ind() - Set allowed action frames to FW
+ *
+ * @pWDA: WDA Call back context
+ * @allowed_action_frames: Pointer to struct sir_allowed_action_frames
+ * that holds allowed action frames bitmask
+ *
+ * This function sets the allowed action frames that the FW needs to
+ * handover to host.The Action frames other than the requested ones
+ * can be dropped in FW
+ *
+ * Return: VOS_STATUS enumeration
+ */
+VOS_STATUS wda_process_set_allowed_action_frames_ind(tWDA_CbContext *pWDA,
+ struct sir_allowed_action_frames *allowed_action_frames)
+{
+ WDI_Status status;
+ struct WDI_AllowedActionFramesInd *wdi_allowed_action_frames;
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ FL("---> %s"), __func__);
+ wdi_allowed_action_frames = (struct WDI_AllowedActionFramesInd*)
+ vos_mem_malloc(sizeof
+ (*wdi_allowed_action_frames));
+ if (!wdi_allowed_action_frames) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure", __func__);
+ vos_mem_free(allowed_action_frames);
+ return VOS_STATUS_E_NOMEM;
+ }
+
+ wdi_allowed_action_frames->bitmask = allowed_action_frames->bitmask;
+ wdi_allowed_action_frames->reserved = allowed_action_frames->reserved;
+
+ status = WDI_SetAllowedActionFramesInd(wdi_allowed_action_frames);
+ if (WDI_STATUS_PENDING == status) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ FL("pending status received"));
+ } else if (WDI_STATUS_SUCCESS_SYNC != status &&
+ (WDI_STATUS_SUCCESS != status)) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ FL("Failure in allowed_action_frames API %d"), status);
+ }
+
+ vos_mem_free(wdi_allowed_action_frames);
+ vos_mem_free(allowed_action_frames);
+ return CONVERT_WDI2VOS_STATUS(status) ;
+}
/*
* FUNCTION: WDA_McProcessMsg
@@ -15883,6 +15930,12 @@
(tModifyRoamParamsReqParams *)pMsg->bodyptr);
break;
}
+
+ case WDA_SET_ALLOWED_ACTION_FRAMES_IND:
+ wda_process_set_allowed_action_frames_ind(pWDA,
+ (struct sir_allowed_action_frames*)pMsg->bodyptr);
+ break;
+
default:
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index bba85c3..36afdc7 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -6464,6 +6464,14 @@
wpt_uint32 value;
}WDI_ModifyRoamParamsReqType;
+/**
+ * struct WDI_AllowedActionFramesInd - Allowed Action frames details
+ *
+ */
+struct WDI_AllowedActionFramesInd {
+ wpt_uint32 bitmask;
+ wpt_uint32 reserved;
+};
/*----------------------------------------------------------------------------
* WDI callback types
*--------------------------------------------------------------------------*/
@@ -12181,5 +12189,17 @@
WDI_ModifyRoamParamsReqType *params
);
+/**
+ * WDI_SetAllowedActionFramesInd - This API is called to send Allowed
+ * Action frame details to FW
+ * @allowed_action_frames: Pointer to WDI_AllowedActionFramesInd structure
+ * which holds bitmask of allowed action frames
+ *
+ */
+WDI_Status
+WDI_SetAllowedActionFramesInd(
+ struct WDI_AllowedActionFramesInd *allowed_action_frames
+);
+
void WDI_SetMgmtPktViaWQ5(wpt_boolean sendMgmtPktViaWQ5);
#endif /* #ifndef WLAN_QCT_WDI_H */
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
index 03e0335..094ece3 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
@@ -551,7 +551,10 @@
such that we keep them separate */
WDI_ANTENNA_DIVERSITY_SELECTION_REQ = WDI_MAX_REQ + 21,
WDI_MODIFY_ROAM_PARAMS_IND = WDI_MAX_REQ + 22,
- WDI_MAX_UMAC_IND = WDI_MAX_REQ + 23,
+ WDI_SET_ALLOWED_ACTION_FRAMES_IND = WDI_MAX_REQ + 23,
+
+ WDI_MAX_UMAC_IND = WDI_MAX_REQ + 24
+
}WDI_RequestEnumType;
/*---------------------------------------------------------------------------
@@ -6627,5 +6630,20 @@
WDI_ControlBlockType* pWDICtx,
WDI_EventInfoType* pEventData
);
+
+/**
+ * WDI_ProcessSetAllowedActionFramesInd - Process Set allowed action
+ * frames command
+ *
+ * @pWDICtx: pointer to the WLAN DAL context
+ * @pEventData: pointer to the event information structure
+ *
+ */
+WDI_Status
+WDI_ProcessSetAllowedActionFramesInd
+(
+ 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 27198f0..703ac46 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -567,6 +567,7 @@
#endif /* FEATURE_OEM_DATA_SUPPORT */
WDI_ProcessGetCurrentAntennaIndex, /* WDI_ANTENNA_DIVERSITY_SELECTION_REQ */
WDI_ProcessBcnMissPenaltyCount, /* WDI_MODIFY_ROAM_PARAMS_IND */
+ WDI_ProcessSetAllowedActionFramesInd, /* WDI_SET_ALLOWED_ACTION_FRAMES_IND */
};
@@ -1280,6 +1281,7 @@
CASE_RETURN_STRING( WDI_START_OEM_DATA_REQ_IND_NEW );
CASE_RETURN_STRING( WDI_ANTENNA_DIVERSITY_SELECTION_REQ );
CASE_RETURN_STRING( WDI_MODIFY_ROAM_PARAMS_IND );
+ CASE_RETURN_STRING( WDI_SET_ALLOWED_ACTION_FRAMES_IND );
default:
return "Unknown WDI MessageId";
}
@@ -24704,6 +24706,8 @@
return WLAN_HAL_ANTENNA_DIVERSITY_SELECTION_REQ;
case WDI_MODIFY_ROAM_PARAMS_IND:
return WLAN_HAL_MODIFY_ROAM_PARAMS_IND;
+ case WDI_SET_ALLOWED_ACTION_FRAMES_IND:
+ return WLAN_HAL_SET_ALLOWED_ACTION_FRAMES_IND;
default:
return WLAN_HAL_MSG_MAX;
}
@@ -37816,3 +37820,91 @@
} /* WDI_SetBcnMissPenaltyCount */
#endif
+
+/**
+ * WDI_ProcessSetAllowedActionFramesInd() - Process Allowed action frames
+ * Indication message and post it to HAL
+ *
+ * @pWDICtx: pointer to the WLAN DAL context
+ * @pEventData: pointer to the event information structure
+ *
+ * Return: WDI_Status enumeration
+ */
+WDI_Status WDI_ProcessSetAllowedActionFramesInd(WDI_ControlBlockType *pWDICtx,
+ WDI_EventInfoType *pEventData)
+{
+ wpt_uint8 *pSendBuffer;
+ wpt_uint16 usDataOffset;
+ wpt_uint16 usSendSize;
+ wpt_uint16 usLen;
+ struct WDI_AllowedActionFramesInd* pwdiAllowedActionFramesInd;
+ tHalAllowedActionFrames* pAllowedActionFrames;
+ WDI_Status wdiStatus;
+
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
+ "%s", __func__);
+
+ if ((!pEventData) || (!pEventData->pEventData))
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
+ "%s: Invalid parameters", __func__);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ if ((WDI_STATUS_SUCCESS != WDI_GetMessageBuffer(pWDICtx,
+ WDI_SET_ALLOWED_ACTION_FRAMES_IND,
+ sizeof(tHalAllowedActionFrames),
+ &pSendBuffer, &usDataOffset,
+ &usSendSize))||
+ (usSendSize < (usDataOffset + usLen)))
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
+ "Unable to get send buffer in Allowed Action Frames req %p",
+ pEventData);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ pwdiAllowedActionFramesInd =
+ (struct WDI_AllowedActionFramesInd*)pEventData->pEventData;
+ pAllowedActionFrames =
+ (tHalAllowedActionFrames*)(pSendBuffer+usDataOffset);
+ pAllowedActionFrames->actionFramesBitMask =
+ pwdiAllowedActionFramesInd->bitmask;
+ pAllowedActionFrames->reserved = pwdiAllowedActionFramesInd->reserved;
+
+ pWDICtx->pReqStatusUserData = NULL;
+ pWDICtx->pfncRspCB = NULL;
+
+ wdiStatus = WDI_SendIndication(pWDICtx, pSendBuffer, usSendSize);
+ return (wdiStatus != WDI_STATUS_SUCCESS) ?
+ wdiStatus:WDI_STATUS_SUCCESS_SYNC;
+}/*WDI_ProcessSetAllowedActionFramesInd*/
+
+/**
+ * WDI_SetAllowedActionFramesInd() - Post Allowed Action Frames Indication to
+ * WDI Main Event Handler
+ * @params: pointer to the WDI_AllowedActionFramesInd structure
+ *
+ * Return: WDI_Status enumeration
+ */
+WDI_Status WDI_SetAllowedActionFramesInd(
+ struct WDI_AllowedActionFramesInd *params)
+{
+ WDI_EventInfoType wdiEventData;
+
+ if (eWLAN_PAL_FALSE == gWDIInitialized)
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "WDI API call before module is initialized - Fail req");
+ return WDI_STATUS_E_NOT_ALLOWED;
+ }
+
+ wdiEventData.wdiRequest = WDI_SET_ALLOWED_ACTION_FRAMES_IND;
+ wdiEventData.pEventData = params;
+ wdiEventData.uEventDataSize = sizeof(*params);
+ wdiEventData.pCBfnc = NULL;
+ wdiEventData.pUserData = NULL;
+
+ return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
+}