wlan: Mocha Low Power Heart Beat Enhancement
Pronto FW has 2 data path mode "on-data path", "off-data path".
To handle LPHB TCP/UDP frame within FW properly,
Mocha application should know FW state properly.
And to generate TCP LPHB frame within FW, FW should know TCP SN.
Mocha app should update TCP SN to FW.
Change-Id: Id1666791b7c5088c0f04cc92d0d975fc7249b986
CRs-fixed: 550741
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 1ef7c7a..aa797eb 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8370,29 +8370,29 @@
#ifdef WLAN_NL80211_TESTMODE
#ifdef FEATURE_WLAN_LPHB
-static void wlan_hdd_cfg80211_lphb_wait_timeout_ind_handler
+void wlan_hdd_cfg80211_lphb_ind_handler
(
void *pAdapter,
void *indCont
)
{
- tSirLPHBTimeoutInd *lphbTimeoutInd;
- struct sk_buff *skb;
+ tSirLPHBInd *lphbInd;
+ struct sk_buff *skb;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "LPHB wait timeout indication arrived");
+ "LPHB indication arrived");
if (NULL == indCont)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "LPHB timeout, invalid argument");
+ "LPHB IND, invalid argument");
return;
}
- lphbTimeoutInd = (tSirLPHBTimeoutInd *)indCont;
+ lphbInd = (tSirLPHBInd *)indCont;
skb = cfg80211_testmode_alloc_event_skb(
((hdd_adapter_t *)pAdapter)->wdev.wiphy,
- sizeof(tSirLPHBTimeoutInd),
+ sizeof(tSirLPHBInd),
GFP_ATOMIC);
if (!skb)
{
@@ -8401,10 +8401,25 @@
return;
}
- NLA_PUT_U32(skb, WLAN_HDD_TM_ATTR_CMD, WLAN_HDD_TM_CMD_WLAN_HB);
- NLA_PUT_U32(skb, WLAN_HDD_TM_ATTR_TYPE, lphbTimeoutInd->protocolType);
- NLA_PUT(skb, WLAN_HDD_TM_ATTR_DATA,
- sizeof(tSirLPHBTimeoutInd), lphbTimeoutInd);
+ if(!nla_put_u32(skb, WLAN_HDD_TM_ATTR_CMD, WLAN_HDD_TM_CMD_WLAN_HB))
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "WLAN_HDD_TM_ATTR_CMD put fail");
+ goto nla_put_failure;
+ }
+ if(!nla_put_u32(skb, WLAN_HDD_TM_ATTR_TYPE, lphbInd->protocolType))
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "WLAN_HDD_TM_ATTR_TYPE put fail");
+ goto nla_put_failure;
+ }
+ if(!nla_put(skb, WLAN_HDD_TM_ATTR_DATA,
+ sizeof(tSirLPHBInd), lphbInd))
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "WLAN_HDD_TM_ATTR_DATA put fail");
+ goto nla_put_failure;
+ }
cfg80211_testmode_event(skb, GFP_ATOMIC);
return;
@@ -8423,6 +8438,7 @@
int err = 0;
#ifdef FEATURE_WLAN_LPHB
hdd_context_t *pHddCtx = wiphy_priv(wiphy);
+ eHalStatus smeStatus;
#endif /* FEATURE_WLAN_LPHB */
err = nla_parse(tb, WLAN_HDD_TM_ATTR_MAX, data, len, wlan_hdd_tm_policy);
@@ -8468,43 +8484,15 @@
}
vos_mem_copy(hb_params, buf, buf_len);
-
- /* LPHB enable and disable request will send to FW
- * when host suspend and resume
- * host suspend -> enable LPHB
- * host resume -> disable LPHB
- * if host is not suspend, cache into HDD context
- * and when host goes to suspend, send request to FW */
- if ((LPHB_SET_EN_PARAMS_INDID == hb_params->cmd) &&
- (!pHddCtx->hdd_wlan_suspended))
+ smeStatus = sme_LPHBConfigReq((tHalHandle)(pHddCtx->hHal),
+ hb_params,
+ wlan_hdd_cfg80211_lphb_ind_handler);
+ if (eHAL_STATUS_SUCCESS != smeStatus)
{
- /* Feature enable command cache into HDD context,
- * if WLAN is not suspend
- * When WLAN goes into suspend, send enable command to FW */
- pHddCtx->lphbEnableReq.enable =
- hb_params->params.lphbEnableReq.enable;
- pHddCtx->lphbEnableReq.item =
- hb_params->params.lphbEnableReq.item;
- pHddCtx->lphbEnableReq.session =
- hb_params->params.lphbEnableReq.session;
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "LPHB Config Fail, disable");
vos_mem_free(hb_params);
}
- else
- {
- eHalStatus smeStatus;
-
- /* If WLAN is suspend state, send enable command immediately */
- smeStatus = sme_LPHBConfigReq((tHalHandle)(pHddCtx->hHal),
- hb_params,
- wlan_hdd_cfg80211_lphb_wait_timeout_ind_handler);
- if (eHAL_STATUS_SUCCESS != smeStatus)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "LPHB Config Fail, disable");
- pHddCtx->lphbEnableReq.enable = 0;
- vos_mem_free(hb_params);
- }
- }
return 0;
}
#endif /* FEATURE_WLAN_LPHB */