wlan: set wificonfiguration(wfc) parameters to firmware
Program the wifi configurations in the firmware using the vendor
commands
We can set the following three parameters using wfc:
* Modulated DTIM
* Average Stats Factor
* Guard Time
* Existing infrastucture is used for setting the modulated DTIM,
We check if we are presently in BMPS then comeout of BMPS,
set the requested modulated DTIM and enter BMPS again. If we are
not in BMPS state, the requested value shall be effective when we
enter the BMPS state again.
* For Guard Time & Average stats factor new WDI command is sent to
firmware(WDI_WIFI_CONFIG_REQ) and the status of the response is
checked in WDI response callback and the message shall be dropped
in WDA.
Change-Id: I9ebd1daacdb06e88b064936efe86af78c7fbdac4
CRs-Fixed: 924853
diff --git a/CORE/HDD/inc/wlan_hdd_assoc.h b/CORE/HDD/inc/wlan_hdd_assoc.h
index d96e66d..3cad4c0 100644
--- a/CORE/HDD/inc/wlan_hdd_assoc.h
+++ b/CORE/HDD/inc/wlan_hdd_assoc.h
@@ -147,4 +147,6 @@
const tANI_U8 numBss);
#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
+void iw_full_power_cbfn (void *pContext, eHalStatus status);
+
#endif
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 9f39771..2a4dfa4 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2576,6 +2576,12 @@
#define CFG_ACTIVE_PASSIVE_CHAN_CONV_MAX (1)
#define CFG_ACTIVE_PASSIVE_CHAN_CONV_DEF (1)
+#define CFG_WIFI_CONFIG_ENABLE "gEnableWifiConfig"
+#define CFG_WIFI_CONFIG_MIN (0)
+#define CFG_WIFI_CONFIG_MAX (1)
+#define CFG_WIFI_CONFIG_DEFAULT (1)
+
+
/*---------------------------------------------------------------------------
Type declarations
-------------------------------------------------------------------------*/
@@ -3095,7 +3101,8 @@
v_BOOL_t enableFwrMemDump;
v_U8_t gActivePassiveChCon;
v_U32_t cfgExtScanConcMode;
- v_U16_t rps_mask;
+ v_U16_t rps_mask;
+ v_BOOL_t fEnableWifiConfig;
} hdd_config_t;
/*---------------------------------------------------------------------------
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 6953a6c..2fe0f9d 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -175,6 +175,10 @@
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_SSID_HOTLIST = 66,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_SSID_FOUND = 67,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_SSID_LOST = 68,
+
+ /* Wi-Fi Configuration subcommands */
+ QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION = 74,
+ QCA_NL80211_VENDOR_SUBCMD_GET_WIFI_CONFIGURATION = 75,
QCA_NL80211_VENDOR_SUBCMD_GET_RING_DATA = 77,
QCA_NL80211_VENDOR_SUBCMD_MONITOR_RSSI = 80,
@@ -1077,6 +1081,26 @@
QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_AFTER_LAST - 1,
};
+/**
+ * enum qca_wlan_vendor_config: wifi config attr
+ *
+ * @QCA_WLAN_VENDOR_ATTR_CONFIG_INVALID: invalid config
+ * @QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM: dynamic dtim
+ * @QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR: stats avg. factor
+ * @QCA_WLAN_VENDOR_ATTR_CONFIG_GUARD_TIME: guard time
+ * @QCA_WLAN_VENDOR_ATTR_CONFIG_LAST: last config
+ * @QCA_WLAN_VENDOR_ATTR_CONFIG_MAX: max config
+ */
+enum qca_wlan_vendor_config {
+ QCA_WLAN_VENDOR_ATTR_CONFIG_INVALID = 0,
+ QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM,
+ QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR,
+ QCA_WLAN_VENDOR_ATTR_CONFIG_GUARD_TIME,
+ /* keep last */
+ QCA_WLAN_VENDOR_ATTR_CONFIG_LAST,
+ QCA_WLAN_VENDOR_ATTR_CONFIG_MAX =
+ QCA_WLAN_VENDOR_ATTR_CONFIG_LAST - 1
+};
/* Feature defines */
#define WIFI_FEATURE_INFRA 0x0001 /* Basic infrastructure mode */
@@ -1101,6 +1125,10 @@
Concurrency */
#define WIFI_FEATURE_LINK_LAYER_STATS 0x10000 /* Link layer stats */
+/* WIFI CONFIG Parameter defines */
+#define WIFI_CONFIG_SET_AVG_STATS_FACTOR 0x0001 /* Average stats factor */
+#define WIFI_CONFIG_SET_GUARD_TIME 0x0002 /* Guard Time */
+
/* Add more features here */
enum qca_wlan_vendor_attr_set_no_dfs_flag
{
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 465e4ab..2db1653 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -3146,7 +3146,7 @@
}
#endif
-static void iw_full_power_cbfn (void *pContext, eHalStatus status)
+void iw_full_power_cbfn (void *pContext, eHalStatus status)
{
hdd_adapter_t *pAdapter = (hdd_adapter_t *)pContext;
hdd_context_t *pHddCtx = NULL;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index f604ec3..b324823 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3446,6 +3446,13 @@
CFG_RPS_CPU_MAP_DEFAULT,
CFG_RPS_CPU_MAP_MIN,
CFG_RPS_CPU_MAP_MAX),
+
+ REG_VARIABLE( CFG_WIFI_CONFIG_ENABLE, WLAN_PARAM_Integer,
+ hdd_config_t, fEnableWifiConfig,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_WIFI_CONFIG_DEFAULT,
+ CFG_WIFI_CONFIG_MIN,
+ CFG_WIFI_CONFIG_MAX ),
};
/*
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 47fbe38..07099c6 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -7175,6 +7175,178 @@
return cfg80211_vendor_cmd_reply(reply_skb);
}
+#define PARAM_WIFICONFIG_MAX QCA_WLAN_VENDOR_ATTR_CONFIG_MAX
+#define PARAM_MODULATED_DTIM QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM
+#define PARAM_STATS_AVG_FACTOR QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR
+#define PARAM_GUARD_TIME QCA_WLAN_VENDOR_ATTR_CONFIG_GUARD_TIME
+
+/**
+ * __wlan_hdd_cfg80211_wifi_configuration_set() - Wifi configuration
+ * vendor command
+ *
+ * @wiphy: wiphy device pointer
+ * @wdev: wireless device pointer
+ * @data: Vendor command data buffer
+ * @data_len: Buffer length
+ *
+ * Handles QCA_WLAN_VENDOR_ATTR_CONFIG_MAX.
+ *
+ * Return: EOK or other error codes.
+ */
+
+static int __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
+ struct wireless_dev *wdev,
+ const void *data,
+ int data_len)
+{
+ struct net_device *dev = wdev->netdev;
+ hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
+ hdd_context_t *pHddCtx = wiphy_priv(wiphy);
+ hdd_station_ctx_t *pHddStaCtx;
+ struct nlattr *tb[PARAM_WIFICONFIG_MAX + 1];
+ tpSetWifiConfigParams pReq;
+ eHalStatus status;
+ int ret_val;
+ static const struct nla_policy policy[PARAM_WIFICONFIG_MAX + 1] = {
+ [PARAM_STATS_AVG_FACTOR] = { .type = NLA_U16 },
+ [PARAM_MODULATED_DTIM] = { .type = NLA_U32 },
+ [PARAM_GUARD_TIME] = { .type = NLA_U32},
+ };
+
+ ENTER();
+
+ if (VOS_FTM_MODE == hdd_get_conparam()) {
+ hddLog(LOGE, FL("Command not allowed in FTM mode"));
+ return -EINVAL;
+ }
+
+ ret_val = wlan_hdd_validate_context(pHddCtx);
+ if (ret_val) {
+ return ret_val;
+ }
+
+ pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+
+ if (!hdd_connIsConnected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) {
+ hddLog(LOGE, FL("Not in Connected state!"));
+ return -ENOTSUPP;
+ }
+
+ if (nla_parse(tb, PARAM_WIFICONFIG_MAX, data, data_len, policy)) {
+ hddLog(LOGE, FL("Invalid ATTR"));
+ return -EINVAL;
+ }
+
+ /* check the Wifi Capability */
+ if ( (TRUE != pHddCtx->cfg_ini->fEnableWifiConfig) &&
+ (TRUE != sme_IsFeatureSupportedByFW(WIFI_CONFIG)))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("WIFICONFIG not supported by Firmware"));
+ return -EINVAL;
+ }
+
+ pReq = vos_mem_malloc(sizeof(tSetWifiConfigParams));
+
+ if (!pReq) {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: Not able to allocate memory for tSetWifiConfigParams",
+ __func__);
+ return eHAL_STATUS_E_MALLOC_FAILED;
+ }
+
+ vos_mem_set(pReq, sizeof(tSetWifiConfigParams), 0);
+
+ pReq->sessionId = pAdapter->sessionId;
+ vos_mem_copy( &pReq->bssId, pHddStaCtx->conn_info.bssId, WNI_CFG_BSSID_LEN);
+
+ if (tb[PARAM_MODULATED_DTIM]) {
+ pReq->paramValue = nla_get_u32(
+ tb[PARAM_MODULATED_DTIM]);
+ hddLog(LOG1, FL("Modulated DTIM: pReq->paramValue:%d "),
+ pReq->paramValue);
+ pHddCtx->cfg_ini->fMaxLIModulatedDTIM = pReq->paramValue;
+ hdd_set_pwrparams(pHddCtx);
+ if (BMPS == pmcGetPmcState(pHddCtx->hHal)) {
+ hddLog( LOG1, FL("WifiConfig: Requesting FullPower!"));
+
+ sme_RequestFullPower(WLAN_HDD_GET_HAL_CTX(pAdapter),
+ iw_full_power_cbfn, pAdapter,
+ eSME_FULL_PWR_NEEDED_BY_HDD);
+ }
+ else
+ {
+ hddLog( LOG1, FL("WifiConfig Not in BMPS state"));
+ }
+ }
+
+ if (tb[PARAM_STATS_AVG_FACTOR]) {
+ pReq->paramType = WIFI_CONFIG_SET_AVG_STATS_FACTOR;
+ pReq->paramValue = nla_get_u16(
+ tb[PARAM_STATS_AVG_FACTOR]);
+ hddLog(LOG1, FL("AVG_STATS_FACTOR pReq->paramType:%d,pReq->paramValue:%d "),
+ pReq->paramType, pReq->paramValue);
+ status = sme_set_wificonfig_params(pHddCtx->hHal, pReq);
+
+ if (eHAL_STATUS_SUCCESS != status)
+ {
+ vos_mem_free(pReq);
+ pReq = NULL;
+ ret_val = -EPERM;
+ return ret_val;
+ }
+ }
+
+
+ if (tb[PARAM_GUARD_TIME]) {
+ pReq->paramType = WIFI_CONFIG_SET_GUARD_TIME;
+ pReq->paramValue = nla_get_u32(
+ tb[PARAM_GUARD_TIME]);
+ hddLog(LOG1, FL("GUARD_TIME pReq->paramType:%d,pReq->paramValue:%d "),
+ pReq->paramType, pReq->paramValue);
+ status = sme_set_wificonfig_params(pHddCtx->hHal, pReq);
+
+ if (eHAL_STATUS_SUCCESS != status)
+ {
+ vos_mem_free(pReq);
+ pReq = NULL;
+ ret_val = -EPERM;
+ return ret_val;
+ }
+
+ }
+
+ EXIT();
+ return ret_val;
+}
+
+/**
+ * wlan_hdd_cfg80211_wifi_configuration_set() - Wifi configuration
+ * vendor command
+ *
+ * @wiphy: wiphy device pointer
+ * @wdev: wireless device pointer
+ * @data: Vendor command data buffer
+ * @data_len: Buffer length
+ *
+ * Handles QCA_WLAN_VENDOR_ATTR_CONFIG_MAX.
+ *
+ * Return: EOK or other error codes.
+ */
+static int wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
+ struct wireless_dev *wdev,
+ const void *data,
+ int data_len)
+{
+ int ret;
+
+ vos_ssr_protect(__func__);
+ ret = __wlan_hdd_cfg80211_wifi_configuration_set(wiphy, wdev,
+ data, data_len);
+ vos_ssr_unprotect(__func__);
+
+ return ret;
+}
const struct wiphy_vendor_command hdd_wiphy_vendor_commands[] =
{
{
@@ -7412,6 +7584,14 @@
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
.doit = wlan_hdd_cfg80211_get_link_properties
+ },
+ {
+ .info.vendor_id = QCA_NL80211_VENDOR_ID,
+ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION,
+ .flags = WIPHY_VENDOR_CMD_NEED_WDEV |
+ WIPHY_VENDOR_CMD_NEED_NETDEV |
+ WIPHY_VENDOR_CMD_NEED_RUNNING,
+ .doit = wlan_hdd_cfg80211_wifi_configuration_set
}
};
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 8a94bd2..c08479b 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -5754,4 +5754,18 @@
tANI_U32 reserved1;
}tAniFwrDumpReq, *tpAniFwrDumpReq;
+/**
+* struct tSetWifiConfigParams - Structure to store the wificonfig related params
+* @paramType: 1. Average Stats factor 2. Guard type
+* @paramvalue: Value to be set in the firmware.
+* @bssId: macaddr of the connected BssId
+*/
+typedef struct
+{
+ tANI_U8 paramType;
+ tANI_U8 sessionId;
+ tANI_U32 paramValue;
+ tSirMacAddr bssId;
+} tSetWifiConfigParams, *tpSetWifiConfigParams;
+
#endif /* __SIR_API_H */
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index bb605f9..3d3d76d 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -137,6 +137,7 @@
MEMORY_DUMP_SUPPORTED = 57,
PER_PKT_STATS_SUPPORTED = 58,
+ WIFI_CONFIG = 61,
//MAX_FEATURE_SUPPORTED = 128
} placeHolderInCapBitmap;
@@ -730,6 +731,7 @@
#define SIR_HAL_RSSI_MON_STOP_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 278)
#define SIR_HAL_HIGH_PRIORITY_DATA_INFO_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 279)
+#define SIR_HAL_WIFI_CONFIG_PARAMS (SIR_HAL_ITC_MSG_TYPES_BEGIN + 280)
#define SIR_HAL_MSG_TYPES_END (SIR_HAL_MSG_TYPES_BEGIN + 0x1FF)
// CFG message types
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 8ce6cf8..251aca7 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -3802,4 +3802,15 @@
eHalStatus sme_enableDisableChanAvoidIndEvent(tHalHandle hHal,
tANI_U8 set_value);
+/* ---------------------------------------------------------------------------
+ \fn sme_set_wificonfig_params
+ \brief API to set WifiConfiguration Parameters.
+
+ \param wifi_config_param - Wificonfig parameter 1.Averaging factor 2. Guard time
+ \- return VOS_STATUS_SUCCES if INdication is posted to
+ WDA else return eHAL_STATUS_FAILURE
+ -------------------------------------------------------------------------*/
+
+eHalStatus sme_set_wificonfig_params(tHalHandle hHal, tSetWifiConfigParams *req);
+
#endif //#if !defined( __SME_API_H )
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 0522efe..14a7a54 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -13465,3 +13465,36 @@
return status;
}
+eHalStatus sme_set_wificonfig_params(tHalHandle hHal, tSetWifiConfigParams *req)
+{
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
+ vos_msg_t msg;
+
+ status = sme_AcquireGlobalLock(&pMac->sme);
+
+ if (eHAL_STATUS_SUCCESS == status){
+
+ /* serialize the req through MC thread */
+ msg.type = WDA_WIFI_CONFIG_REQ;
+ msg.reserved = 0;
+ msg.bodyptr = req;
+
+ MTRACE(vos_trace(VOS_MODULE_ID_SME,
+ TRACE_CODE_SME_TX_WDA_MSG, NO_SESSION, msg.type));
+
+ if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
+ "Not able to post SIR_HAL_WIFI_CONFIG_PARAMS message to HAL", __func__);
+ status = eHAL_STATUS_FAILURE;
+ }
+ sme_ReleaseGlobalLock( &pMac->sme );
+ }
+ else
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
+ "sme_AcquireGlobalLock error", __func__);
+ }
+ return status;
+}
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index f6a0cca..9475fbe 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -1310,6 +1310,8 @@
#define WDA_FW_MEM_DUMP_REQ SIR_HAL_FW_MEM_DUMP_REQ
+#define WDA_WIFI_CONFIG_REQ SIR_HAL_WIFI_CONFIG_PARAMS
+
#define HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME 0x40 // Bit 6 will be used to control BD rate for Management frames
#define halTxFrame(hHal, pFrmBuf, frmLen, frmType, txDir, tid, pCompFunc, pData, txFlag) \
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 620fe20..1a25f79 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -268,6 +268,9 @@
VOS_STATUS WDA_ProcessMonStartReq( tWDA_CbContext *pWDA, void* wdaRequest);
VOS_STATUS WDA_ProcessMonStopReq( tWDA_CbContext *pWDA, void* wdaRequest);
VOS_STATUS WDA_ProcessEnableDisableCAEventInd(tWDA_CbContext *pWDA, tANI_U8 val);
+
+VOS_STATUS WDA_ProcessWifiConfigReq(tWDA_CbContext *pWDA,
+ tSetWifiConfigParams *pwdaWificonfig);
/*
* FUNCTION: WDA_ProcessNanRequest
* Process NAN request
@@ -15285,6 +15288,11 @@
WDA_ProcessEnableDisableCAEventInd(pWDA, pMsg->bodyval);
break;
}
+ case WDA_WIFI_CONFIG_REQ:
+ {
+ WDA_ProcessWifiConfigReq(pWDA,(tSetWifiConfigParams *)pMsg->bodyptr);
+ break;
+ }
default:
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
@@ -20438,3 +20446,123 @@
}
return CONVERT_WDI2VOS_STATUS(status) ;
}
+
+/*==========================================================================
+ FUNCTION WDA_WifiConfigSetRspCallback
+
+ DESCRIPTION
+ API to process set WifiConfig response from FW
+
+ PARAMETERS
+ pRsp: Pointer to set WifiConfig response
+ pUserData: Pointer to user data
+
+ RETURN VALUE
+ NONE
+
+===========================================================================*/
+void WDA_WifiConfigSetRspCallback(void *pEventData, void* pUserData)
+{
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s " ,__func__);
+
+ if(NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams received NULL", __func__);
+ VOS_ASSERT(0);
+ return ;
+ }
+
+ if(NULL == pWdaParams->wdaMsgParam)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams->wdaMsgParam is NULL", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(pWdaParams);
+ return ;
+ }
+
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams->wdaMsgParam);
+ vos_mem_free(pWdaParams);
+
+ return;
+}
+
+/*==========================================================================
+ FUNCTION WDA_ProcessWifiConfigReq
+
+ DESCRIPTION
+ API to send Set WifiConfig params request to WDI
+
+ PARAMETERS
+ pWDA: Pointer to WDA context
+ wdaRequest: Pointer to set WifiConfig req parameters
+===========================================================================*/
+
+VOS_STATUS WDA_ProcessWifiConfigReq(tWDA_CbContext *pWDA,
+ tSetWifiConfigParams *pwdaWificonfig)
+{
+ WDI_Status status = WDI_STATUS_SUCCESS;
+ WDI_WifiConfigSetReqType *pwdiWifConfigSetReqParams;
+ tWDA_ReqParams *pWdaParams ;
+ WDI_Status wstatus;
+
+ /* Sanity Check*/
+ if(NULL == pwdaWificonfig)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: tSetWifiConfigParams received NULL", __func__);
+ VOS_ASSERT(0) ;
+ return VOS_STATUS_E_FAULT;
+ }
+
+ pwdiWifConfigSetReqParams = (WDI_WifiConfigSetReqType *)vos_mem_malloc(
+ sizeof(WDI_WifiConfigSetReqType));
+ if(NULL == pwdiWifConfigSetReqParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(pwdaWificonfig);
+ return VOS_STATUS_E_NOMEM;
+ }
+
+ 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", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(pwdiWifConfigSetReqParams);
+ vos_mem_free(pwdaWificonfig);
+ return VOS_STATUS_E_NOMEM;
+ }
+ pwdiWifConfigSetReqParams->paramType = pwdaWificonfig->paramType;
+ pwdiWifConfigSetReqParams->paramValue = pwdaWificonfig->paramValue;
+ vos_mem_copy(pwdiWifConfigSetReqParams->bssId,
+ &(pwdaWificonfig->bssId), sizeof(tSirMacAddr));
+
+ pWdaParams->pWdaContext = pWDA;
+ pWdaParams->wdaMsgParam = pwdiWifConfigSetReqParams;
+ pWdaParams->wdaWdiApiMsgParam = (void *)pwdiWifConfigSetReqParams;
+
+ wstatus = WDI_WifiConfigSetReq(pwdiWifConfigSetReqParams,
+ (WDI_WifiConfigSetRspCb)WDA_WifiConfigSetRspCallback,
+ pWdaParams);
+ if(IS_WDI_STATUS_FAILURE(wstatus))
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "Failure in sendind WifiConfigReq, free all the memory" );
+ status = CONVERT_WDI2VOS_STATUS(wstatus);
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
+ vos_mem_free(pWdaParams->wdaMsgParam);
+ vos_mem_free(pWdaParams);
+ }
+
+ return status;
+
+}
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index 73bce7c..11b67a2 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -6179,6 +6179,13 @@
}WDI_MonStartReqType;
+typedef struct
+{
+ wpt_uint8 paramType;
+ wpt_uint32 paramValue;
+ wpt_macAddr bssId;
+}WDI_WifiConfigSetReqType;
+
/**
* struct WDI_FwrMemDumpReqType - firmware memory dump request details.
.*.@FWMemDumpReqCb - Associated Callback
@@ -6204,6 +6211,10 @@
wpt_uint32 dump_status;
}WDI_FwrMemDumpRsp;
+typedef struct
+{
+ wpt_uint32 wificonfigset_status;
+}WDI_WifconfigSetRsp;
/*----------------------------------------------------------------------------
* WDI callback types
@@ -8149,6 +8160,7 @@
typedef void (*WDI_FwrMemDumpRspCb)(WDI_FwrMemDumpRsp *wdiRsp, void *pUserData);
+typedef void (*WDI_WifiConfigSetRspCb) (WDI_WifconfigSetRsp *wdiRsp, void *pUserData);
/*========================================================================
* Function Declarations and Documentation
@@ -11778,4 +11790,20 @@
}
#endif
+/**
+ @brief WDI_WifiConfigSetReq
+ This API is called to send WifiConfig request to FW
+
+ @param pwdiWifConfigSetReqParams : pointer to wificonfig params
+ wdiLLStatsSetRspCb : set wificonfig response callback
+ usrData : Client context
+ @see
+ @return SUCCESS or FAIL
+*/
+WDI_Status
+WDI_WifiConfigSetReq
+ (WDI_WifiConfigSetReqType* pwdiWifConfigSetReqParams,
+ WDI_WifiConfigSetRspCb wdiWifiConfigSetRspCb,
+ void* pUserData);
+
#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 cf7d8c1..a6e5ae9 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
@@ -483,6 +483,8 @@
WDI_START_RSSI_MONITOR_REQ = 111,
WDI_STOP_RSSI_MONITOR_REQ = 112,
+ WDI_WIFI_CONFIG_SET_REQ = 113,
+
WDI_MAX_REQ,
/*Send a suspend Indication down to HAL*/
@@ -832,6 +834,8 @@
WDI_START_RSSI_MONITOR_RSP = 111,
WDI_STOP_RSSI_MONITOR_RSP = 112,
+ WDI_WIFI_CONFIG_SET_RSP = 113,
+
/*-------------------------------------------------------------------------
Indications
!! Keep these last in the enum if possible
@@ -6383,5 +6387,19 @@
WDI_EventInfoType* pEventData
);
+WDI_Status
+WDI_ProcessWifiConfigReq
+(
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+);
+
+WDI_Status
+WDI_ProcessWificonfigSetRsp
+(
+ 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 c683252..a15fd8c 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -211,6 +211,9 @@
#endif
,MEMORY_DUMP_SUPPORTED //57
,PER_PKT_STATS_SUPPORTED //58
+ ,FEATURE_NOT_SUPPORTED //59
+ ,FEATURE_NOT_SUPPORTED //60
+ ,WIFI_CONFIG //61
};
/*--------------------------------------------------------------------------
@@ -491,6 +494,8 @@
WDI_ProcessRssiMonitorStartReq, /* WDI_START_RSSI_MONITOR_REQ */
WDI_ProcessRssiMonitorStopReq, /* WDI_STOP_RSSI_MONITOR_REQ */
+
+ WDI_ProcessWifiConfigReq, /*WDI_WIFI_CONFIG_SET_REQ*/
/*-------------------------------------------------------------------------
Indications
-------------------------------------------------------------------------*/
@@ -774,6 +779,8 @@
WDI_ProcessFwrMemDumpRsp, /* WDI_FWR_MEM_DUMP_RSP */
WDI_ProcessRssiMonitorStartRsp, /* WDI_START_RSSI_MONITOR_RSP*/
WDI_ProcessRssiMonitorStopRsp, /* WDI_STOP_RSSI_MONITOR_RSP*/
+
+ WDI_ProcessWificonfigSetRsp, /* /WDI_WIFI_CONFIG_SET_RSP*/
/*---------------------------------------------------------------------
Indications
---------------------------------------------------------------------*/
@@ -1347,6 +1354,7 @@
CASE_RETURN_STRING( WDI_FWR_MEM_DUMP_RSP);
CASE_RETURN_STRING (WDI_START_RSSI_MONITOR_RSP);
CASE_RETURN_STRING (WDI_STOP_RSSI_MONITOR_RSP);
+ CASE_RETURN_STRING( WDI_WIFI_CONFIG_SET_RSP);
default:
return "Unknown WDI MessageId";
}
@@ -24523,6 +24531,8 @@
return WLAN_HAL_START_RSSI_MONITORING_REQ;
case WDI_STOP_RSSI_MONITOR_REQ:
return WLAN_HAL_STOP_RSSI_MONITORING_REQ;
+ case WDI_WIFI_CONFIG_SET_REQ:
+ return WLAN_HAL_WIFI_CONFIG_SET_PARAMS_REQ;
default:
return WLAN_HAL_MSG_MAX;
}
@@ -24864,6 +24874,8 @@
return WDI_STOP_RSSI_MONITOR_RSP;
case WLAN_HAL_RSSI_MONITORING_IND:
return WDI_HAL_RSSI_BREACHED_IND;
+ case WLAN_HAL_WIFI_CONFIG_SET_PARAMS_RSP:
+ return WDI_WIFI_CONFIG_SET_RSP;
default:
return eDRIVER_TYPE_MAX;
}
@@ -36274,3 +36286,156 @@
return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
} /* WDI_EnableDisableCAEventInd */
+
+/**
+ @brief WDI_WifiConfigSetReq
+ This API is called to set WifiConfig params request in FW
+
+ @param pwdiWifiConfigSetReqParams : pointer to set WifiCofig request params
+ wdiWifiConfigSetRspCb : WifiConfig stats resp callback
+ usrData : Client context
+ @see
+ @return SUCCESS or FAIL
+*/
+WDI_Status
+WDI_WifiConfigSetReq(WDI_WifiConfigSetReqType* pwdiWifConfigSetReqParams,
+ WDI_WifiConfigSetRspCb wdiWifiConfigSetRspCb,
+ void* pUserData)
+{
+ WDI_EventInfoType wdiEventData;
+
+ /*------------------------------------------------------------------------
+ Sanity Check
+ ------------------------------------------------------------------------*/
+ if ( eWLAN_PAL_FALSE == gWDIInitialized )
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDI, VOS_TRACE_LEVEL_ERROR,
+ "WDI API call before module is initialized - Fail request");
+
+ return WDI_STATUS_E_NOT_ALLOWED;
+ }
+
+ wdiEventData.wdiRequest = WDI_WIFI_CONFIG_SET_REQ;
+ wdiEventData.pEventData = pwdiWifConfigSetReqParams;
+ wdiEventData.uEventDataSize = sizeof(*pwdiWifConfigSetReqParams);
+ wdiEventData.pCBfnc = wdiWifiConfigSetRspCb;
+ wdiEventData.pUserData = pUserData;
+
+ return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
+}
+
+/**
+ @brief WDI_ProcessWifiConfigReq -
+ Set WifiConfig request to FW
+
+ @param pWDICtx : wdi context
+ pEventData : indication data
+
+ @see
+ @return none
+*/
+ WDI_Status
+ WDI_ProcessWifiConfigReq
+ (
+ WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData
+ )
+ {
+ WDI_WifiConfigSetReqType* pwdiWifiConfigSetReqParams;
+ WDI_WifiConfigSetRspCb wdiWifiConfigSetRspCb;
+ wpt_uint8* pSendBuffer = NULL;
+ wpt_uint16 usSendSize = 0;
+ wpt_uint16 usDataOffset = 0;
+ tSetWifiConfigParamsReq halWifiConfigSetParams;
+
+ 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;
+ }
+ pwdiWifiConfigSetReqParams = (WDI_WifiConfigSetReqType*)pEventData->pEventData;
+ wdiWifiConfigSetRspCb = (WDI_WifiConfigSetRspCb)pEventData->pCBfnc;
+
+ /*-----------------------------------------------------------------------
+ Get message buffer
+ ! TO DO : proper conversion into the HAL Message Request Format
+ -----------------------------------------------------------------------*/
+ if (( WDI_STATUS_SUCCESS != WDI_GetMessageBuffer(
+ pWDICtx,
+ WDI_WIFI_CONFIG_SET_REQ,
+ sizeof(halWifiConfigSetParams.wifiConfigParams),
+ &pSendBuffer, &usDataOffset,
+ &usSendSize))||
+ ( usSendSize < (usDataOffset + sizeof(halWifiConfigSetParams.wifiConfigParams) )))
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "Unable to get send buffer in %s %p %p %p", __func__,
+ pEventData, pwdiWifiConfigSetReqParams, wdiWifiConfigSetRspCb);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ halWifiConfigSetParams.wifiConfigParams.paramType = pwdiWifiConfigSetReqParams->paramType;
+ halWifiConfigSetParams.wifiConfigParams.paramValue =
+ pwdiWifiConfigSetReqParams->paramValue;
+ vos_mem_copy(halWifiConfigSetParams.wifiConfigParams.bssid, &(pwdiWifiConfigSetReqParams->bssId),
+ sizeof(tSirMacAddr));
+
+ wpalMemoryCopy(pSendBuffer+usDataOffset,
+ &halWifiConfigSetParams.wifiConfigParams,
+ sizeof(halWifiConfigSetParams.wifiConfigParams));
+
+ pWDICtx->pReqStatusUserData = pEventData->pUserData;
+
+ /*-------------------------------------------------------------------------
+ Send Clear Link Layer Stats Request to HAL
+ -------------------------------------------------------------------------*/
+ return WDI_SendMsg( pWDICtx, pSendBuffer, usSendSize,
+ wdiWifiConfigSetRspCb, pEventData->pUserData,
+ WDI_WIFI_CONFIG_SET_RSP);
+ }
+
+WDI_Status
+WDI_ProcessWificonfigSetRsp
+( WDI_ControlBlockType* pWDICtx,
+ WDI_EventInfoType* pEventData )
+
+{
+ tHalSetWifiConfigRspParams halRsp;
+ WDI_WifiConfigSetRspCb wdiWifiConfigSetRspCb;
+ WDI_WifconfigSetRsp wdiWifconfigSetRsp;
+
+ VOS_TRACE( VOS_MODULE_ID_WDI, VOS_TRACE_LEVEL_INFO,
+ "%s: %d Enter",__func__, __LINE__);
+
+ /*-------------------------------------------------------------------------
+ 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;
+ }
+ wdiWifiConfigSetRspCb = (WDI_WifiConfigSetRspCb)pWDICtx->pfncRspCB;
+
+ /*-------------------------------------------------------------------------
+ Extract response and send it to UMAC
+ -------------------------------------------------------------------------*/
+ wpalMemoryCopy(&halRsp, pEventData->pEventData, sizeof(halRsp));
+
+ wdiWifconfigSetRsp.wificonfigset_status = WDI_HAL_2_WDI_STATUS(halRsp.status);
+
+ VOS_TRACE( VOS_MODULE_ID_WDI, VOS_TRACE_LEVEL_INFO,
+ "WifiConfig RSP status = %d",
+ wdiWifconfigSetRsp.wificonfigset_status);
+ /*Notify UMAC*/
+ wdiWifiConfigSetRspCb( &wdiWifconfigSetRsp, pWDICtx->pRspCBUserData);
+
+ return WDI_STATUS_SUCCESS;
+}