Merge "wlan: Configure correct max tx power to firmware" into wlan-driver.lnx.1.0-dev.1.0
diff --git a/CORE/HDD/inc/qc_sap_ioctl.h b/CORE/HDD/inc/qc_sap_ioctl.h
index 303376b..764384e 100644
--- a/CORE/HDD/inc/qc_sap_ioctl.h
+++ b/CORE/HDD/inc/qc_sap_ioctl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -177,6 +177,9 @@
#define QCSAP_IOCTL_SET_TRAFFIC_MONITOR (SIOCIWFIRSTPRIV+24)
#define QCSAP_IOCTL_AP_STATS (SIOCIWFIRSTPRIV+25) // get routines should be odd numbered
+#define QCSAP_IOCTL_PRIV_SET_NONE_GET_THREE_INT (SIOCIWFIRSTPRIV+27)
+#define QCSAP_IOCTL_GET_TSF 1
+
#define MAX_VAR_ARGS 7
#define QCSAP_IOCTL_PRIV_GET_SOFTAP_LINK_SPEED (SIOCIWFIRSTPRIV + 31)
@@ -191,7 +194,8 @@
QCSAP_PARAM_SET_AUTO_CHANNEL = 11,
QCSAP_PARAM_GET_FRAME_LOGS = 12,
QCSAP_PARAM_SET_PROXIMITY = 13,
- QCSAP_PARAM_SET_WOWL = 14
+ QCSAP_PARAM_SET_WOWL = 14,
+ QCSAP_PARAM_CAP_TSF = 15
};
int iw_softap_get_channel_list(struct net_device *dev,
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 593e52f..04ebf82 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3020,10 +3020,10 @@
#define CFG_DISABLE_SCAN_DURING_SCO_MAX (1)
#define CFG_DISABLE_SCAN_DURING_SCO_DEFAULT (0)
-#define CFG_CH_AVOID_SAP_RESTART_NAME "sap_ch_avoid_restart"
-#define CFG_CH_AVOID_SAP_RESTART_MIN (0)
-#define CFG_CH_AVOID_SAP_RESTART_MAX (1)
-#define CFG_CH_AVOID_SAP_RESTART_DEFAULT (1)
+#define CFG_SAP_INTERNAL_RESTART_NAME "gEnableSapInternalRestart"
+#define CFG_SAP_INTERNAL_RESTART_MIN (0)
+#define CFG_SAP_INTERNAL_RESTART_MAX (1)
+#define CFG_SAP_INTERNAL_RESTART_DEFAULT (1)
/*
* maximum interval (in seconds) for a
@@ -3628,7 +3628,7 @@
v_BOOL_t sendMgmtPktViaWQ5;
v_BOOL_t sap_probe_resp_offload;
v_BOOL_t disable_scan_during_sco;
- v_BOOL_t sap_restrt_ch_avoid;
+ v_BOOL_t sap_internal_restart;
#ifdef SAP_AUTH_OFFLOAD
bool enable_sap_auth_offload;
uint32_t sap_auth_offload_sec_type;
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 9bcba3c..b89fa7d 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1459,4 +1459,5 @@
#endif
int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *pHostapdAdapter);
+int wlan_hdd_try_disconnect(hdd_adapter_t *pAdapter);
#endif
diff --git a/CORE/HDD/inc/wlan_hdd_hostapd.h b/CORE/HDD/inc/wlan_hdd_hostapd.h
index 79a52a6..8e83650 100644
--- a/CORE/HDD/inc/wlan_hdd_hostapd.h
+++ b/CORE/HDD/inc/wlan_hdd_hostapd.h
@@ -116,6 +116,9 @@
void hdd_hostapd_ch_avoid_cb(void *pAdapter, void *indParam);
#endif /* FEATURE_WLAN_CH_AVOID */
int hdd_del_all_sta(hdd_adapter_t *pAdapter);
+void hdd_sap_indicate_disconnect_for_sta(hdd_adapter_t *adapter);
+void hdd_sap_destroy_events(hdd_adapter_t *adapter);
+
#ifdef SAP_AUTH_OFFLOAD
bool hdd_set_sap_auth_offload(hdd_adapter_t *pHostapdAdapter,
bool enabled);
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 00d5e77..4d9faa1 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -817,6 +817,64 @@
} hdd_mdns_state_t;
#endif /* MDNS_OFFLOAD */
+#ifdef WLAN_FEATURE_TSF
+
+#define HDD_TSF_CAP_REQ_TIMEOUT 2000
+#define HDD_TSF_GET_REQ_TIMEOUT 2000
+
+/**
+ * enum hdd_tsf_get_state - status of get tsf action
+ *
+ * TSF_RETURN: get tsf
+ * TSF_STA_NOT_CONNECTED_NO_TSF: sta not connected to ap
+ * TSF_NOT_RETURNED_BY_FW: fw not returned tsf
+ * TSF_CURRENT_IN_CAP_STATE: driver in capture state
+ * TSF_CAPTURE_FAIL: capture fail
+ * TSF_GET_FAIL: get fail
+ * TSF_RESET_GPIO_FAIL: GPIO reset fail
+ * TSF_SAP_NOT_STARTED_NO_TSF SAP not started
+ */
+enum hdd_tsf_get_state {
+ TSF_RETURN = 0,
+ TSF_STA_NOT_CONNECTED_NO_TSF,
+ TSF_NOT_RETURNED_BY_FW,
+ TSF_CURRENT_IN_CAP_STATE,
+ TSF_CAPTURE_FAIL,
+ TSF_GET_FAIL,
+ TSF_RESET_GPIO_FAIL,
+ TSF_SAP_NOT_STARTED_NO_TSF
+};
+
+/**
+ * enum hdd_tsf_capture_state - status of capture
+ *
+ * TSF_IDLE: idle
+ * TSF__CAP_STATE: current is in capture state
+ */
+enum hdd_tsf_capture_state {
+ TSF_IDLE = 0,
+ TSF_CAP_STATE
+};
+
+/**
+ * struct hdd_tsf_ctx_s - TSF capture ctx
+ * @tsf_get_state : tsf action enum
+ * @tsf_capture_state: tsf capture state enum
+ * @tsf_capture_done_event : Indicate tsf completion
+ * @tsf_high : Higher 32-bit for 64-bit tsf
+ * @tsf_lo : Lower 32-bit for 64-bit tsf
+ *
+ */
+struct hdd_tsf_ctx_s {
+ enum hdd_tsf_get_state tsf_get_state;
+ enum hdd_tsf_capture_state tsf_capture_state;
+ vos_event_t tsf_capture_done_event;
+ vos_spin_lock_t tsf_lock;
+ uint32_t tsf_high;
+ uint32_t tsf_low;
+};
+
+#endif /* WLAN_FEATURE_TSF */
/*
* Per station structure kept in HDD for multiple station support for SoftAP
*/
@@ -1261,6 +1319,10 @@
#ifdef MDNS_OFFLOAD
hdd_mdns_state_t mdns_status;
#endif /* MDNS_OFFLOAD */
+
+#ifdef WLAN_FEATURE_TSF
+ struct hdd_tsf_ctx_s tsf_cap_ctx;
+#endif
};
#define WLAN_HDD_GET_STATION_CTX_PTR(pAdapter) (&(pAdapter)->sessionCtx.station)
@@ -2044,4 +2106,30 @@
return FALSE;
}
#endif /* MDNS_OFFLOAD */
+
+void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter);
+
+#ifdef WLAN_FEATURE_TSF
+void wlan_hdd_tsf_init(hdd_adapter_t *adapter);
+int hdd_capture_tsf(hdd_adapter_t *adapter, uint32_t *buf, int len);
+int hdd_indicate_tsf(hdd_adapter_t *adapter, uint32_t *buf, int len);
+#else
+static inline void
+wlan_hdd_tsf_init(hdd_adapter_t *adapter)
+{
+ return;
+}
+
+static inline int
+hdd_indicate_tsf(hdd_adapter_t *adapter, uint32_t *buf, int len)
+{
+ return -ENOTSUPP;
+}
+
+static inline int
+hdd_capture_tsf(hdd_adapter_t *adapter, uint32_t *buf, int len)
+{
+ return -ENOTSUPP;
+}
+#endif
#endif // end #if !defined( WLAN_HDD_MAIN_H )
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 4fc44c2..f45ad5b 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -4120,7 +4120,6 @@
hdd_context_t *pHddCtx;
v_U32_t roamId;
tCsrRoamProfile *pRoamProfile;
- eMib_dot11DesiredBssType connectedBssType;
eCsrAuthType RSNAuthType;
tHalHandle hHal;
hdd_station_ctx_t *pHddStaCtx;
@@ -4170,25 +4169,14 @@
if( SIR_MAC_MAX_SSID_LENGTH < wrqu->essid.length )
return -EINVAL;
pRoamProfile = &pWextState->roamProfile;
- if (pRoamProfile)
- {
- if ( hdd_connGetConnectedBssType( pHddStaCtx, &connectedBssType ) ||
- ( eMib_dot11DesiredBssType_independent == pHddStaCtx->conn_info.connDot11DesiredBssType ))
- {
- VOS_STATUS vosStatus;
- // need to issue a disconnect to CSR.
- INIT_COMPLETION(pAdapter->disconnect_comp_var);
- vosStatus = sme_RoamDisconnect( hHal, pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED );
- if(VOS_STATUS_SUCCESS == vosStatus)
- wait_for_completion_interruptible_timeout(&pAdapter->disconnect_comp_var,
- msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
- }
- }
- /** wpa_supplicant 0.8.x, wext driver uses */
- else
+ /*Try disconnecting if already in connected state*/
+ status = wlan_hdd_try_disconnect(pAdapter);
+ if (0 > status)
{
- return -EINVAL;
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("Failed to disconnect the existing"
+ " connection"));
+ return -EALREADY;
}
/** wpa_supplicant 0.8.x, wext driver uses */
/** when cfg80211 defined, wpa_supplicant wext driver uses
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 1de4671..103e4e3 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3750,12 +3750,12 @@
CFG_SAP_PROBE_RESP_OFFLOAD_MIN,
CFG_SAP_PROBE_RESP_OFFLOAD_MAX),
- REG_VARIABLE(CFG_CH_AVOID_SAP_RESTART_NAME, WLAN_PARAM_Integer,
- hdd_config_t, sap_restrt_ch_avoid,
+ REG_VARIABLE(CFG_SAP_INTERNAL_RESTART_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, sap_internal_restart,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_CH_AVOID_SAP_RESTART_DEFAULT,
- CFG_CH_AVOID_SAP_RESTART_MIN,
- CFG_CH_AVOID_SAP_RESTART_MAX),
+ CFG_SAP_INTERNAL_RESTART_DEFAULT,
+ CFG_SAP_INTERNAL_RESTART_MIN,
+ CFG_SAP_INTERNAL_RESTART_MAX),
REG_VARIABLE(CFG_DISABLE_SCAN_DURING_SCO, WLAN_PARAM_Integer,
hdd_config_t, disable_scan_during_sco,
@@ -4536,8 +4536,8 @@
pHddCtx->cfg_ini->enable_sap_auth_offload);
#endif
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
- "Name = [sap_ch_avoid_restart] Value = [%u] ",
- pHddCtx->cfg_ini->sap_restrt_ch_avoid);
+ "Name = [gEnableSapInternalRestart] Value = [%u] ",
+ pHddCtx->cfg_ini->sap_internal_restart);
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index fce4530..b2e69e6 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8636,10 +8636,14 @@
beacon->proberesp_ies_len = proberesp_ies_len;
beacon->assocresp_ies_len= assocresp_ies_len;
- memcpy(beacon->head, head, head_len);
- memcpy(beacon->tail, tail, tail_len);
- memcpy(beacon->proberesp_ies, proberesp_ies, proberesp_ies_len);
- memcpy(beacon->assocresp_ies, assocresp_ies, assocresp_ies_len);
+ if (head && head_len)
+ memcpy(beacon->head, head, head_len);
+ if (tail && tail_len)
+ memcpy(beacon->tail, tail, tail_len);
+ if (proberesp_ies && proberesp_ies_len)
+ memcpy(beacon->proberesp_ies, proberesp_ies, proberesp_ies_len);
+ if (assocresp_ies && assocresp_ies_len)
+ memcpy(beacon->assocresp_ies, assocresp_ies, assocresp_ies_len);
*ppBeacon = beacon;
@@ -14984,7 +14988,7 @@
* This function is used to disconnect from previous
* connection
*/
-static int wlan_hdd_try_disconnect( hdd_adapter_t *pAdapter )
+int wlan_hdd_try_disconnect( hdd_adapter_t *pAdapter )
{
long ret = 0;
int status, result = 0;
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 0ff4d4b..b96e9a6 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -2352,7 +2352,34 @@
return VOS_STATUS_SUCCESS;
}
+/**
+ * hdd_ssr_restart_sap() - restart sap on SSR
+ * @hdd_ctx: hdd context
+ *
+ * Return: nothing
+ */
+static void hdd_ssr_restart_sap(hdd_context_t *hdd_ctx)
+{
+ VOS_STATUS status;
+ hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
+ hdd_adapter_t *adapter;
+ ENTER();
+
+ status = hdd_get_front_adapter (hdd_ctx, &adapter_node);
+ while (NULL != adapter_node && VOS_STATUS_SUCCESS == status) {
+ adapter = adapter_node->pAdapter;
+ if (adapter && adapter->device_mode == WLAN_HDD_SOFTAP) {
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("in sap mode %p"),
+ adapter);
+ wlan_hdd_start_sap(adapter);
+ }
+ status = hdd_get_next_adapter(hdd_ctx, adapter_node, &next);
+ adapter_node = next;
+ }
+
+ EXIT();
+}
/* the HDD interface to WLAN driver re-init.
* This is called to initialize/start WLAN driver after a shutdown.
@@ -2401,7 +2428,8 @@
vos_set_reinit_in_progress(VOS_MODULE_ID_VOSS, TRUE);
/* The driver should always be initialized in STA mode after SSR */
- hdd_set_conparam(0);
+ if (VOS_STA_SAP_MODE != hdd_get_conparam())
+ hdd_set_conparam(0);
dev = wcnss_wlan_get_device();
if (NULL == dev)
@@ -2652,5 +2680,9 @@
success:
/* Trigger replay of BTC events */
send_btc_nlink_msg(WLAN_MODULE_DOWN_IND, 0);
+
+ if (pHddCtx->cfg_ini->sap_internal_restart)
+ hdd_ssr_restart_sap(pHddCtx);
+
return VOS_STATUS_SUCCESS;
}
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index ffe3542..5e6d326 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1359,7 +1359,7 @@
hddLog(LOG1, FL("ch avoid in progress: %d"),
pHddCtx->is_ch_avoid_in_progress);
if (pHddCtx->is_ch_avoid_in_progress &&
- pHddCtx->cfg_ini->sap_restrt_ch_avoid)
+ pHddCtx->cfg_ini->sap_internal_restart)
netif_tx_disable(dev);
else
hdd_hostapd_stop(dev);
@@ -1600,7 +1600,7 @@
AUTO_CHANNEL_SELECT;
- if (hdd_ctx->cfg_ini->sap_restrt_ch_avoid) {
+ if (hdd_ctx->cfg_ini->sap_internal_restart) {
netif_tx_disable(adapter->dev);
schedule_work(&hdd_ctx->sap_start_work);
} else {
@@ -2138,6 +2138,12 @@
}
break;
}
+ case QCSAP_PARAM_CAP_TSF:
+ {
+ ret = hdd_capture_tsf(pHostapdAdapter,
+ (uint32_t *)&set_value, 1);
+ break;
+ }
default:
hddLog(LOGE, FL("Invalid setparam command %d value %d"),
sub_cmd, set_value);
@@ -3244,6 +3250,60 @@
return ret;
}
+/**
+ * __iw_softap_get_three() - return three value to upper layer.
+ *
+ * @dev: pointer of net_device of this wireless card
+ * @info: meta data about Request sent
+ * @wrqu: include request info
+ * @extra: buf used for in/out
+ *
+ * Return: execute result
+ */
+static int __iw_softap_get_three(struct net_device *dev,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu, char *extra)
+{
+ uint32_t *value = (uint32_t *)extra;
+ uint32_t sub_cmd = value[0];
+ int ret = 0; /* success */
+
+ hdd_adapter_t *padapter = WLAN_HDD_GET_PRIV_PTR(dev);
+
+ switch (sub_cmd) {
+ case QCSAP_IOCTL_GET_TSF:
+ ret = hdd_indicate_tsf(padapter, value, 3);
+ break;
+ default:
+ hddLog(LOGE, FL("Invalid getparam command %d"), sub_cmd);
+ break;
+ }
+ return ret;
+}
+
+
+/**
+ * iw_softap_get_three() - return three value to upper layer.
+ *
+ * @dev: pointer of net_device of this wireless card
+ * @info: meta data about Request sent
+ * @wrqu: include request info
+ * @extra: buf used for in/Output
+ *
+ * Return: execute result
+ */
+static int iw_softap_get_three(struct net_device *dev,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu, char *extra)
+{
+ int ret;
+
+ vos_ssr_protect(__func__);
+ ret = __iw_softap_get_three(dev, info, wrqu, extra);
+ vos_ssr_unprotect(__func__);
+
+ return ret;
+}
static int __iw_softap_set_channel_range(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
@@ -4702,6 +4762,8 @@
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "setMcRate" },
{ QCSAP_PARAM_SET_PROXIMITY,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "setProximity" },
+ { QCSAP_PARAM_CAP_TSF,
+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "cap_tsf" },
{ QCSAP_PARAM_SET_WOWL,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wowl" },
{ QCSAP_IOCTL_GETPARAM,
@@ -4737,6 +4799,14 @@
IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 6 , 0, "disassoc_sta" },
{ QCSAP_IOCTL_AP_STATS, 0,
IW_PRIV_TYPE_CHAR | QCSAP_MAX_WSC_IE, "ap_stats" },
+ /* handlers for main ioctl */
+ { QCSAP_IOCTL_PRIV_SET_NONE_GET_THREE_INT, 0,
+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3, "" },
+#ifdef WLAN_FEATURE_TSF
+ { QCSAP_IOCTL_GET_TSF, 0,
+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3,
+ "get_tsf" },
+#endif
{ QCSAP_IOCTL_GET_STATS, 0,
IW_PRIV_TYPE_CHAR | QCSAP_MAX_STR_LEN, "getStats"},
{ QCSAP_IOCTL_CLR_STATS, 0, 0, "clearStats" },
@@ -4846,6 +4916,7 @@
[QCSAP_IOCTL_ASSOC_STA_MACADDR - SIOCIWFIRSTPRIV] = iw_softap_getassoc_stamacaddr,
[QCSAP_IOCTL_DISASSOC_STA - SIOCIWFIRSTPRIV] = iw_softap_disassoc_sta,
[QCSAP_IOCTL_AP_STATS - SIOCIWFIRSTPRIV] = iw_softap_ap_stats,
+ [QCSAP_IOCTL_PRIV_SET_NONE_GET_THREE_INT - SIOCIWFIRSTPRIV] = iw_softap_get_three,
[QCSAP_IOCTL_PRIV_SET_THREE_INT_GET_NONE - SIOCIWFIRSTPRIV] = iw_set_three_ints_getnone,
[QCSAP_IOCTL_PRIV_SET_VAR_INT_GET_NONE - SIOCIWFIRSTPRIV] = iw_set_var_ints_getnone,
[QCSAP_IOCTL_SET_CHANNEL_RANGE - SIOCIWFIRSTPRIV] = iw_softap_set_channel_range,
@@ -5151,3 +5222,107 @@
EXIT();
return 0;
}
+
+/**
+ * hdd_sap_indicate_disconnect_for_sta() - Indicate disconnect indication
+ * to supplicant, if there any clients connected to SAP interface.
+ * @adapter: sap adapter context
+ *
+ * Return: nothing
+ */
+void hdd_sap_indicate_disconnect_for_sta(hdd_adapter_t *adapter)
+{
+ tSap_Event sap_event;
+ int staId;
+ hdd_context_t *hdd_ctx;
+ v_CONTEXT_t vos_ctx;
+ ptSapContext sap_ctx;
+
+ ENTER();
+
+ hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ if (0 != wlan_hdd_validate_context(hdd_ctx)) {
+ return;
+ }
+
+ vos_ctx = hdd_ctx->pvosContext;
+ if (NULL == vos_ctx) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS context is not valid",__func__);
+ return;
+ }
+
+ sap_ctx = VOS_GET_SAP_CB(vos_ctx);
+ if (!sap_ctx) {
+ hddLog(LOGE, FL("invalid sap context"));
+ return;
+ }
+
+ for (staId = 0; staId < WLAN_MAX_STA_COUNT; staId++) {
+ if (sap_ctx->aStaInfo[staId].isUsed) {
+ hddLog(LOG1, FL("staId: %d isUsed: %d %p"),
+ staId, sap_ctx->aStaInfo[staId].isUsed,
+ sap_ctx);
+
+ if (vos_is_macaddr_broadcast(
+ &sap_ctx->aStaInfo[staId].macAddrSTA))
+ continue;
+
+ sap_event.sapHddEventCode = eSAP_STA_DISASSOC_EVENT;
+ vos_mem_copy(
+ &sap_event.sapevt.
+ sapStationDisassocCompleteEvent.staMac,
+ &sap_ctx->aStaInfo[staId].macAddrSTA,
+ sizeof(v_MACADDR_t));
+ sap_event.sapevt.sapStationDisassocCompleteEvent.
+ reason =
+ eSAP_MAC_INITATED_DISASSOC;
+ sap_event.sapevt.sapStationDisassocCompleteEvent.
+ statusCode =
+ eSIR_SME_RESOURCES_UNAVAILABLE;
+ hdd_hostapd_SAPEventCB(&sap_event,
+ sap_ctx->pUsrContext);
+ }
+ }
+
+ clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags);
+
+ EXIT();
+}
+
+/**
+ * hdd_sap_destroy_events() - Destroy sap evets
+ * @adapter: sap adapter context
+ *
+ * Return: nothing
+ */
+void hdd_sap_destroy_events(hdd_adapter_t *adapter)
+{
+ hdd_context_t *hdd_ctx;
+ v_CONTEXT_t vos_ctx;
+ ptSapContext sap_ctx;
+
+ ENTER();
+
+ hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ if (0 != wlan_hdd_validate_context(hdd_ctx)) {
+ return;
+ }
+
+ vos_ctx = hdd_ctx->pvosContext;
+ if (NULL == vos_ctx) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS context is not valid",__func__);
+ return;
+ }
+
+ sap_ctx = VOS_GET_SAP_CB(vos_ctx);
+ if (!sap_ctx) {
+ hddLog(LOGE, FL("invalid sap context"));
+ return;
+ }
+
+ if (!VOS_IS_STATUS_SUCCESS(vos_lock_destroy(&sap_ctx->SapGlobalLock)))
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("WLANSAP_Stop failed destroy lock"));
+}
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index bbb244e..8ffb9fb 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3056,6 +3056,8 @@
hdd_station_ctx_t *pHddStaCtx = NULL;
hdd_context_t *pHddCtx = NULL;
int ret;
+ tCsrRoamModifyProfileFields mod_profile_fields;
+ uint32_t roam_id = 0;
pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
@@ -3076,8 +3078,12 @@
if (vos_mem_compare(targetApBssid,
pHddStaCtx->conn_info.bssId,
sizeof(tSirMacAddr))) {
+ sme_GetModifyProfileFields(pHddCtx->hHal, pAdapter->sessionId,
+ &mod_profile_fields);
+ sme_RoamReassoc(pHddCtx->hHal, pAdapter->sessionId, NULL,
+ mod_profile_fields, &roam_id, 1);
hddLog(LOG1, FL("Reassoc BSSID is same as currently associated AP bssid"));
- return eHAL_STATUS_FAILURE;
+ return eHAL_STATUS_SUCCESS;
}
/* Check channel number is a valid channel number */
@@ -8828,6 +8834,8 @@
hddLog(VOS_TRACE_LEVEL_FATAL,"%s: hdd_init_wowl failed",__func__);
goto err_free_netdev;
}
+ //Initialize the TSF capture data
+ wlan_hdd_tsf_init(pAdapter);
}
return pAdapter;
@@ -9447,7 +9455,18 @@
pAdapter = pAdapterNode->pAdapter;
hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
- netif_carrier_off(pAdapter->dev);
+
+ if (pHddCtx->cfg_ini->sap_internal_restart &&
+ pAdapter->device_mode == WLAN_HDD_SOFTAP) {
+ hddLog(LOG1, FL("driver supports sap restart"));
+ vos_flush_work(&pHddCtx->sap_start_work);
+ hdd_sap_indicate_disconnect_for_sta(pAdapter);
+ hdd_cleanup_actionframe(pHddCtx, pAdapter);
+ hdd_softap_deinit_tx_rx(pAdapter);
+ hdd_sap_destroy_events(pAdapter);
+ } else {
+ netif_carrier_off(pAdapter->dev);
+ }
pAdapter->sessionCtx.station.hdd_ReassocScenario = VOS_FALSE;
@@ -9667,7 +9686,15 @@
break;
case WLAN_HDD_SOFTAP:
- /* softAP can handle SSR */
+ if (pHddCtx->cfg_ini->sap_internal_restart) {
+ hdd_init_ap_mode(pAdapter);
+ status = hdd_sta_id_hash_attach(pAdapter);
+ if (VOS_STATUS_SUCCESS != status)
+ {
+ hddLog(VOS_TRACE_LEVEL_FATAL,
+ FL("failed to attach hash for"));
+ }
+ }
break;
case WLAN_HDD_P2P_GO:
@@ -16299,8 +16326,381 @@
"%s: enable mDNS offload successfully!", __func__);
return TRUE;
}
+
+
#endif /* MDNS_OFFLOAD */
+/**
+ * wlan_hdd_start_sap() - This function starts bss of SAP.
+ * @ap_adapter: SAP adapter
+ *
+ * This function will process the starting of sap adapter.
+ *
+ * Return: void.
+ */
+void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter)
+{
+ hdd_ap_ctx_t *hdd_ap_ctx;
+ hdd_hostapd_state_t *hostapd_state;
+ VOS_STATUS vos_status;
+ hdd_context_t *hdd_ctx;
+ tsap_Config_t *pConfig;
+
+ if (NULL == ap_adapter) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("ap_adapter is NULL here"));
+ return;
+ }
+
+ hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
+ hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+ hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter);
+ pConfig = &ap_adapter->sessionCtx.ap.sapConfig;
+
+ mutex_lock(&hdd_ctx->sap_lock);
+ if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags))
+ goto end;
+
+ if (0 != wlan_hdd_cfg80211_update_apies(ap_adapter)) {
+ hddLog(LOGE, FL("SAP Not able to set AP IEs"));
+ goto end;
+ }
+
+ vos_event_reset(&hostapd_state->vosEvent);
+ if (WLANSAP_StartBss(hdd_ctx->pvosContext, hdd_hostapd_SAPEventCB,
+ &hdd_ap_ctx->sapConfig, (v_PVOID_t)ap_adapter->dev)
+ != VOS_STATUS_SUCCESS) {
+ goto end;
+ }
+
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("Waiting for SAP to start"));
+ vos_status = vos_wait_single_event(&hostapd_state->vosEvent, 10000);
+ if (!VOS_IS_STATUS_SUCCESS(vos_status)) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("SAP Start failed"));
+ goto end;
+ }
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ FL("SAP Start Success"));
+ set_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
+
+ wlan_hdd_incr_active_session(hdd_ctx, ap_adapter->device_mode);
+ hostapd_state->bCommit = TRUE;
+
+end:
+ mutex_unlock(&hdd_ctx->sap_lock);
+ return;
+}
+
+#ifdef WLAN_FEATURE_TSF
+
+/**
+ * hdd_tsf_cb() - handle tsf request callback
+ *
+ * @pcb_cxt: pointer to the hdd_contex
+ * @ptsf: pointer to struct stsf
+ *
+ * Based on the request sent .
+ *
+ * Return: Describe the execute result of this routine
+ */
+static int hdd_tsf_cb(void *pcb_ctx, struct stsf *ptsf)
+{
+ hdd_context_t *hddctx;
+ int status;
+ hdd_adapter_t* adapter = (hdd_adapter_t*)pcb_ctx;
+
+ if (pcb_ctx == NULL || ptsf == NULL) {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("HDD context is not valid"));
+ return -EINVAL;
+ }
+
+ hddctx = (hdd_context_t *)pcb_ctx;
+ status = wlan_hdd_validate_context(hddctx);
+ if (0 != status)
+ return -EINVAL;
+
+ if (NULL == adapter) {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("failed to find adapter"));
+ return -EINVAL;
+ }
+
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("tsf cb handle event, device_mode is %d"),
+ adapter->device_mode);
+
+ /* copy the return value to hdd_tsf_ctx in adapter*/
+ if (ptsf->tsf_req_status) {
+
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_get_state = TSF_NOT_RETURNED_BY_FW;
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_IDLE;
+ vos_event_set (&adapter->tsf_cap_ctx.tsf_capture_done_event);
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("tsf req failure :%d"),
+ ptsf->tsf_req_status);
+ return ptsf->tsf_req_status;
+ }
+ /* If this is a get request.Store the tsf values in adapter. */
+ if (!ptsf->set_tsf_req) {
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_low = ptsf->tsf_low;
+ adapter->tsf_cap_ctx.tsf_high = ptsf->tsf_high;
+ adapter->tsf_cap_ctx.tsf_get_state = TSF_RETURN;
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_IDLE;
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("hdd_get_tsf_cb sta=%u, tsf_low=%u, tsf_high=%u"),
+ adapter->sessionId, ptsf->tsf_low, ptsf->tsf_high);
+ }
+ else {
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_CAP_STATE;
+ adapter->tsf_cap_ctx.tsf_get_state = TSF_CURRENT_IN_CAP_STATE;
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+ }
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ vos_event_set (&adapter->tsf_cap_ctx.tsf_capture_done_event);
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+
+ /* free allocated mem */
+ vos_mem_free(ptsf);
+
+ return 0;
+}
+
+/**
+ * hdd_capture_tsf() - capture tsf
+ *
+ * @adapter: pointer to adapter
+ * @buf: pointer to upper layer buf
+ * @len : the length of buf
+ *
+ * This function returns tsf value to uplayer.
+ *
+ * Return: Describe the execute result of this routine
+ */
+int hdd_capture_tsf(hdd_adapter_t *adapter, uint32_t *buf, int len)
+{
+ int ret = 0;
+ hdd_station_ctx_t *hdd_sta_ctx;
+ hdd_context_t *hdd_ctx;
+ tSirCapTsfParams cap_tsf_params;
+ VOS_STATUS status;
+
+ if (adapter == NULL || buf == NULL) {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("invalid pointer"));
+ return -EINVAL;
+ }
+ if (len != 1)
+ return -EINVAL;
+
+ hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+
+ if (wlan_hdd_validate_context(hdd_ctx)) {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("invalid hdd ctx"));
+ return -EINVAL;
+ }
+ if (adapter->device_mode == WLAN_HDD_INFRA_STATION ||
+ adapter->device_mode == WLAN_HDD_P2P_CLIENT) {
+ hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
+ if (hdd_sta_ctx->conn_info.connState !=
+ eConnectionState_Associated) {
+
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("failed to cap tsf, not connect with ap"));
+ buf[0] = TSF_STA_NOT_CONNECTED_NO_TSF;
+ return ret;
+ }
+ }
+ if ((adapter->device_mode == WLAN_HDD_SOFTAP ||
+ adapter->device_mode == WLAN_HDD_P2P_GO) &&
+ !(test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags))) {
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("Soft AP / P2p GO not beaconing"));
+ buf[0] = TSF_SAP_NOT_STARTED_NO_TSF;
+ return ret;
+ }
+ if (adapter->tsf_cap_ctx.tsf_capture_state == TSF_CAP_STATE) {
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("current in capture state, pls reset"));
+ buf[0] = TSF_CURRENT_IN_CAP_STATE;
+ } else {
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("ioctl issue cap tsf cmd"));
+ buf[0] = TSF_RETURN;
+ cap_tsf_params.session_id = adapter->sessionId;
+ cap_tsf_params.tsf_rsp_cb_func = hdd_tsf_cb;
+ cap_tsf_params.tsf_rsp_cb_ctx = adapter;
+
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_CAP_STATE;
+ adapter->tsf_cap_ctx.tsf_get_state = TSF_CURRENT_IN_CAP_STATE;
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+
+ ret = sme_capture_tsf_req(hdd_ctx->hHal, cap_tsf_params);
+
+ if (ret != VOS_STATUS_SUCCESS) {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("capture fail"));
+ buf[0] = TSF_CAPTURE_FAIL;
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_IDLE;
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+ return -EINVAL;
+ }
+ /* wait till we get a response from fw */
+ status = vos_wait_single_event(&adapter->tsf_cap_ctx.
+ tsf_capture_done_event,
+ HDD_TSF_CAP_REQ_TIMEOUT);
+
+ if (!VOS_IS_STATUS_SUCCESS(status)) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ ("capture tsf vos wait for single_event failed!! %d"),
+ adapter->tsf_cap_ctx.tsf_get_state);
+
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_IDLE;
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+
+ return -EINVAL;
+ }
+ }
+ buf[0] = TSF_RETURN;
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("ioctl return cap tsf cmd, ret = %d"), ret);
+ return ret;
+}
+
+/**
+ * hdd_indicate_tsf() - return tsf to uplayer
+ *
+ * @adapter: pointer to adapter
+ * @buf: pointer to uplayer buf
+ * @len : the length of buf
+ *
+ * This function returns tsf value to uplayer.
+ *
+ * Return: Describe the execute result of this routine
+ */
+int hdd_indicate_tsf(hdd_adapter_t *adapter, uint32_t *buf, int len)
+{
+ int ret = 0;
+ hdd_station_ctx_t *hdd_sta_ctx;
+ hdd_context_t *hdd_ctx;
+ tSirCapTsfParams cap_tsf_params;
+ VOS_STATUS status;
+
+ if (adapter == NULL || buf == NULL) {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("invalid pointer"));
+ return -EINVAL;
+ }
+ if (len != 3)
+ return -EINVAL;
+
+ buf [1] = 0;
+ buf [2] = 0;
+ hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+
+ if (wlan_hdd_validate_context(hdd_ctx)) {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("invalid hdd ctx"));
+ return -EINVAL;
+ }
+ if (adapter->device_mode == WLAN_HDD_INFRA_STATION ||
+ adapter->device_mode == WLAN_HDD_P2P_CLIENT) {
+ hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
+ if (hdd_sta_ctx->conn_info.connState !=
+ eConnectionState_Associated) {
+
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("failed to cap tsf, not connect with ap"));
+ buf[0] = TSF_STA_NOT_CONNECTED_NO_TSF;
+ return ret;
+ }
+ }
+ if ((adapter->device_mode == WLAN_HDD_SOFTAP ||
+ adapter->device_mode == WLAN_HDD_P2P_GO) &&
+ !(test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags))) {
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("Soft AP / P2p GO not beaconing"));
+ buf[0] = TSF_SAP_NOT_STARTED_NO_TSF;
+ return ret;
+ }
+
+ if (adapter->tsf_cap_ctx.tsf_capture_state != TSF_CAP_STATE ||
+ adapter->tsf_cap_ctx.tsf_get_state != TSF_CURRENT_IN_CAP_STATE ) {
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("Not in capture state,Enter capture state first"));
+ buf[0] = TSF_GET_FAIL;
+ } else {
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("ioctl issue cap tsf cmd"));
+ cap_tsf_params.session_id = adapter->sessionId;
+ cap_tsf_params.tsf_rsp_cb_func = hdd_tsf_cb;
+ cap_tsf_params.tsf_rsp_cb_ctx = adapter;
+
+ ret = sme_get_tsf_req(hdd_ctx->hHal, cap_tsf_params);
+
+ if (ret != VOS_STATUS_SUCCESS) {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("capture fail"));
+ buf[0] = TSF_CAPTURE_FAIL;
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_IDLE;
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+ return -EINVAL;
+ }
+ /* wait till we get a response from fw */
+ status = vos_wait_single_event(&adapter->tsf_cap_ctx.
+ tsf_capture_done_event,
+ HDD_TSF_GET_REQ_TIMEOUT);
+
+ if (!VOS_IS_STATUS_SUCCESS(status)) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ ("capture tsf vos wait for single_event failed!! %d"),
+ status);
+
+ vos_spin_lock_acquire(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_IDLE;
+ vos_spin_lock_release(&adapter->tsf_cap_ctx.tsf_lock);
+ return status;
+ }
+ buf[1] = adapter->tsf_cap_ctx.tsf_low;
+ buf[2] = adapter->tsf_cap_ctx.tsf_high;
+
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("get tsf cmd,status=%u, tsf_low=%u, tsf_high=%u"),
+ buf[0], buf[1], buf[2]);
+ }
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("ioctl return cap tsf cmd, ret = %d"), ret);
+ return ret;
+}
+
+void wlan_hdd_tsf_init(hdd_adapter_t *adapter)
+{
+
+ if (adapter == NULL) {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("TSF init on a null adapter!"));
+ return;
+ }
+
+ adapter->tsf_cap_ctx.tsf_get_state = TSF_RETURN;
+ adapter->tsf_cap_ctx.tsf_capture_state = TSF_IDLE;
+ vos_event_init(&adapter->tsf_cap_ctx.tsf_capture_done_event);
+ vos_spin_lock_init(&adapter->tsf_cap_ctx.tsf_lock);
+ adapter->tsf_cap_ctx.tsf_high = 0;
+ adapter->tsf_cap_ctx.tsf_low = 0;
+}
+
+#endif
+
//Register the module init/exit functions
module_init(hdd_module_init);
module_exit(hdd_module_exit);
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index ca996af..5c6e396 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1648,7 +1648,7 @@
vos_pkt_t* pVosPacket;
vos_pkt_t* pNextVosPacket;
hdd_context_t *pHddCtx = NULL;
- v_U8_t proto_type;
+ v_U8_t proto_type = 0;
//Sanity check on inputs
if ( ( NULL == vosContext ) ||
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index 3cae547..b08ac0d 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -2568,7 +2568,7 @@
struct sk_buff *skb = NULL;
vos_pkt_t* pVosPacket;
vos_pkt_t* pNextVosPacket;
- v_U8_t proto_type;
+ v_U8_t proto_type = 0;
//Sanity check on inputs
if ( ( NULL == vosContext ) ||
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index c76aba6..2f6b9fd 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -174,6 +174,7 @@
#define WE_SET_MONITOR_STATE 22
#define WE_SET_PKT_STATS_ENABLE_DISABLE 23
#define WE_SET_PROXIMITY_ENABLE 24
+#define WE_CAP_TSF 25
/* Private ioctls and their sub-ioctls */
#define WLAN_PRIV_SET_NONE_GET_INT (SIOCIWFIRSTPRIV + 1)
@@ -295,7 +296,8 @@
/* (SIOCIWFIRSTPRIV + 10) is currently unused */
/* (SIOCIWFIRSTPRIV + 12) is currently unused */
/* (SIOCIWFIRSTPRIV + 14) is currently unused */
-/* (SIOCIWFIRSTPRIV + 15) is currently unused */
+#define WLAN_PRIV_SET_NONE_GET_THREE_INT (SIOCIWFIRSTPRIV + 15)
+#define WE_GET_TSF 1
#ifdef FEATURE_OEM_DATA_SUPPORT
/* Private ioctls for setting the measurement configuration */
@@ -6330,6 +6332,14 @@
ret = wlan_hdd_set_proximity(set_value, hHal);
break;
}
+ case WE_CAP_TSF:
+ {
+ if (NULL == hHal)
+ return -EINVAL;
+
+ ret = hdd_capture_tsf(pAdapter, (uint32_t *)&set_value, 1);
+ break;
+ }
default:
{
hddLog(LOGE, "Invalid IOCTL setvalue command %d value %d",
@@ -8475,6 +8485,62 @@
return ret;
}
+/**
+ * __iw_setnone_get_threeint() - return three value to up layer.
+ *
+ * @dev: pointer of net_device of this wireless card
+ * @info: meta data about Request sent
+ * @wrqu: include request info
+ * @extra: buf used for in/Output
+ *
+ * Return: execute result
+ */
+static int __iw_setnone_get_threeint(struct net_device *dev,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu, char *extra)
+{
+ int ret = 0; /* success */
+ uint32_t *value = (int *)extra;
+ hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("param = %d"), value[0]);
+
+ switch (value[0]) {
+ case WE_GET_TSF:
+ ret = hdd_indicate_tsf(adapter, value, 3);
+ break;
+ default:
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("Invalid IOCTL get_value command %d"),
+ value[0]);
+ break;
+ }
+ return ret;
+}
+
+/**
+ * iw_setnone_get_threeint() - return three value to up layer.
+ *
+ * @dev: pointer of net_device of this wireless card
+ * @info: meta data about Request sent
+ * @wrqu: include request info
+ * @extra: buf used for in/Output
+ *
+ * Return: execute result
+ */
+static int iw_setnone_get_threeint(struct net_device *dev,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu, char *extra)
+{
+ int ret;
+
+ vos_ssr_protect(__func__);
+ ret = __iw_setnone_get_threeint(dev, info, wrqu, extra);
+ vos_ssr_unprotect(__func__);
+
+ return ret;
+}
+
#ifdef WLAN_FEATURE_VOWIFI_11R
//
//
@@ -9820,7 +9886,6 @@
}
vos_mem_zero(data, len);
vos_mem_copy(data, &extra[nOffset], (len-1));
- data[len] = '\0';
ptr = data;
if (1 != sscanf(ptr," %hhu%n", &(pnoRequest.enable), &nOffset))
@@ -10980,6 +11045,8 @@
[WLAN_PRIV_ADD_TSPEC - SIOCIWFIRSTPRIV] = iw_add_tspec,
[WLAN_PRIV_DEL_TSPEC - SIOCIWFIRSTPRIV] = iw_del_tspec,
[WLAN_PRIV_GET_TSPEC - SIOCIWFIRSTPRIV] = iw_get_tspec,
+ [WLAN_PRIV_SET_NONE_GET_THREE_INT - SIOCIWFIRSTPRIV] =
+ iw_setnone_get_threeint,
#ifdef FEATURE_OEM_DATA_SUPPORT
[WLAN_PRIV_SET_OEM_DATA_REQ - SIOCIWFIRSTPRIV] = iw_set_oem_data_req, //oem data req Specifc
[WLAN_PRIV_GET_OEM_DATA_RSP - SIOCIWFIRSTPRIV] = iw_get_oem_data_rsp, //oem data req Specifc
@@ -11142,6 +11209,12 @@
{ WE_SET_PROXIMITY_ENABLE,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
0, "setProximity" },
+
+#ifdef WLAN_FEATURE_TSF
+ { WE_CAP_TSF,
+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+ 0, "cap_tsf" },
+#endif
/* handlers for main ioctl */
{ WLAN_PRIV_SET_NONE_GET_INT,
0,
@@ -11498,7 +11571,17 @@
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
"getTspec" },
-
+ /* handlers for main ioctl */
+ { WLAN_PRIV_SET_NONE_GET_THREE_INT,
+ 0,
+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3,
+ "" },
+#ifdef WLAN_FEATURE_TSF
+ { WE_GET_TSF,
+ 0,
+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3,
+ "get_tsf" },
+#endif
#ifdef FEATURE_OEM_DATA_SUPPORT
/* handlers for main ioctl - OEM DATA */
{
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 56ee96a..379e905 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -5837,7 +5837,7 @@
typedef struct
{
tANI_U32 request_id;
- tANI_U8 session_id;
+ tANI_U8 session_id;
tANI_U32 lost_ssid_sample_size;
tANI_U32 ssid_count;
tSirSsidThresholdParam ssid[WLAN_EXTSCAN_MAX_HOTLIST_SSIDS];
@@ -6256,4 +6256,40 @@
#endif /* SAP_AUTH_OFFLOAD */
+/**
+ * struct stsf - the basic stsf structure
+ *
+ * @session_id: session id from adapter
+ * @set_req: set/get request flag.
+ * @tsf_low: low 32bits of tsf
+ * @tsf_high: high 32bits of tsf
+ *
+ * driver use this struct to store the tsf info
+ */
+struct stsf {
+ uint32_t session_id;
+ bool set_tsf_req;
+ uint32_t tsf_low;
+ uint32_t tsf_high;
+ bool tsf_req_status;
+};
+
+typedef int(*tsf_rsp_cb)(void *tsf_ctx, struct stsf *pTsf);
+
+/**
+ * struct tCapTsfParams - capture tsf request
+ * @bss_idx: bss index, SAP/STA
+ * @session_id: adapter session id
+ * @bssid: bssid for SAP/STA
+ * @tsf_rsp_cb_func : handler for tsf rsp from fw
+ * @tsf_rsp_cb_ctx : hdd ctx for tsf rsp handler
+ */
+typedef struct {
+ tANI_U8 bss_idx;
+ tANI_U8 session_id;
+ tSirMacAddr bssid;
+ tsf_rsp_cb tsf_rsp_cb_func;
+ void * tsf_rsp_cb_ctx;
+}tSirCapTsfParams,*tpSirCapTsfParams;
+
#endif /* __SIR_API_H */
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index ff69d7f..718af27 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2013, 2016-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -387,6 +387,8 @@
eWNI_SME_SET_TDLS_2040_BSSCOEX_REQ,
eWNI_SME_DEL_ALL_TDLS_PEERS,
eWNI_SME_REGISTER_MGMT_FRAME_CB,
+ eWNI_SME_CAP_TSF_REQ,
+ eWNI_SME_GET_TSF_REQ,
eWNI_SME_MSG_TYPES_END
};
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index bac3ba8..a911c33 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -792,6 +792,9 @@
#define SIR_HAL_AP_FIND_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 300)
#endif/* WLAN_FEATURE_APFIND */
+#define SIR_HAL_CAP_TSF_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 300)
+#define SIR_HAL_GET_TSF_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 301)
+
#define SIR_HAL_MSG_TYPES_END (SIR_HAL_MSG_TYPES_BEGIN + 0x1FF)
// CFG message types
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index e2dd714..24a0fa4 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -2697,3 +2697,105 @@
}
return (status);
}
+/**
+ * lim_process_sme_cap_tsf_req()- send cap tsf request to WDA
+ * Get bss_idx from PE and fill in cap tsf request.
+ * @pMac:Mac ctx
+ * @pMsgBuf: message buffer from sme
+ * Returns success on post to WDA, otherwise failure
+ */
+
+tSirRetStatus lim_process_sme_cap_tsf_req(tpAniSirGlobal pMac,
+ tANI_U32 *pMsgBuf)
+{
+ tSirCapTsfParams *pMsg = NULL;
+ tpPESession psessionEntry = NULL;
+ uint8_t sessionId;
+ tSirMsgQ msg;
+ tSirCapTsfParams *cap_tsf_params;
+
+ pMsg = (tSirCapTsfParams*)pMsgBuf;
+ if (pMsg == NULL) {
+ limLog(pMac, LOGE, FL("NULL pMsg"));
+ return eSIR_FAILURE;
+ }
+
+ psessionEntry = peFindSessionByBssid(pMac, pMsg->bssid, &sessionId);
+ if (NULL == psessionEntry)
+ {
+ limLog(pMac, LOGE, FL("NULL psessionEntry"));
+ return eSIR_FAILURE;
+ }
+ cap_tsf_params = (tSirCapTsfParams *)
+ vos_mem_malloc(sizeof(*cap_tsf_params));
+ if (!cap_tsf_params) {
+ limLog(pMac, LOGE, FL(" Unable to allocate memory for cap tsf params"));
+ return eSIR_MEM_ALLOC_FAILED;
+ }
+ vos_mem_copy (cap_tsf_params, pMsg, sizeof(*cap_tsf_params));
+ cap_tsf_params->bss_idx = psessionEntry->bssIdx;
+
+ msg.type = WDA_CAP_TSF_REQ;
+ msg.reserved = 0;
+ msg.bodyptr = cap_tsf_params;
+ msg.bodyval = 0;
+ if(eSIR_SUCCESS != wdaPostCtrlMsg(pMac, &msg))
+ {
+ limLog(pMac, LOGE, FL("lim_process_sme_cap_tsf_req failed\n"));
+ vos_mem_free(cap_tsf_params);
+ return eSIR_FAILURE;
+ }
+
+ return eSIR_SUCCESS;
+}
+
+/**
+ * lim_process_sme_get_tsf_req()- send get tsf request to WDA
+ * Get bss_idx from PE and fill in cap tsf request.
+ * @pMac:Mac ctx
+ * @pMsgBuf: message buffer from sme
+ * Returns success on post to WDA, otherwise failure
+ */
+tSirRetStatus lim_process_sme_get_tsf_req(tpAniSirGlobal pMac,
+ tANI_U32 *pMsgBuf)
+{
+ tSirCapTsfParams *pMsg = NULL;
+ tpPESession psessionEntry = NULL;
+ uint8_t sessionId;
+ tSirMsgQ msg;
+ tSirCapTsfParams *get_tsf_params;
+
+ pMsg = (tSirCapTsfParams*)pMsgBuf;
+ if (pMsg == NULL) {
+ limLog(pMac, LOGE, FL("NULL pMsg"));
+ return eSIR_FAILURE;
+ }
+
+ psessionEntry = peFindSessionByBssid(pMac, pMsg->bssid, &sessionId);
+ if (NULL == psessionEntry)
+ {
+ limLog(pMac, LOGE, FL("NULL psessionEntry"));
+ return eSIR_FAILURE;
+ }
+ get_tsf_params = (tSirCapTsfParams *)
+ vos_mem_malloc(sizeof(*get_tsf_params));
+ if (!get_tsf_params) {
+ limLog(pMac, LOGE, FL(" Unable to allocate memory for cap tsf params"));
+ return eSIR_MEM_ALLOC_FAILED;
+ }
+ vos_mem_copy (get_tsf_params, pMsg, sizeof(*get_tsf_params));
+ get_tsf_params->bss_idx = psessionEntry->bssIdx;
+
+ msg.type = WDA_GET_TSF_REQ;
+ msg.reserved = 0;
+ msg.bodyptr = get_tsf_params;
+ msg.bodyval = 0;
+ if(eSIR_SUCCESS != wdaPostCtrlMsg(pMac, &msg))
+ {
+ limLog(pMac, LOGE, FL("lim_process_sme_cap_tsf_req failed\n"));
+ vos_mem_free(get_tsf_params);
+ return eSIR_FAILURE;
+ }
+
+ return eSIR_SUCCESS;
+}
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 262a95b..abc8bad 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -2496,6 +2496,18 @@
vos_mem_free((v_VOID_t*)limMsg->bodyptr);
limMsg->bodyptr = NULL;
break;
+
+ case eWNI_SME_CAP_TSF_REQ:
+ lim_process_sme_cap_tsf_req(pMac, limMsg->bodyptr);
+ vos_mem_free((v_VOID_t*)limMsg->bodyptr);
+ limMsg->bodyptr = NULL;
+ break;
+
+ case eWNI_SME_GET_TSF_REQ:
+ lim_process_sme_get_tsf_req(pMac, limMsg->bodyptr);
+ vos_mem_free((v_VOID_t*)limMsg->bodyptr);
+ limMsg->bodyptr = NULL;
+ break;
default:
vos_mem_free((v_VOID_t*)limMsg->bodyptr);
limMsg->bodyptr = NULL;
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index a375494..feaf1ed 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1072,5 +1072,11 @@
tANI_U32 *pMsgBuf);
tSirRetStatus limProcessSmeDelAllTdlsPeers(tpAniSirGlobal pMac,
tANI_U32 *pMsgBuf);
+
+tSirRetStatus lim_process_sme_cap_tsf_req(tpAniSirGlobal pMac,
+ tANI_U32 *pMsgBuf);
+
+tSirRetStatus lim_process_sme_get_tsf_req(tpAniSirGlobal pMac,
+ tANI_U32 *pMsgBuf);
#endif /* __LIM_TYPES_H */
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index ba5185b..2ede8eb 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -4012,4 +4012,15 @@
eHalStatus sme_update_hb_threshold(tHalHandle hHal, tANI_U32 cfgId,
tANI_U8 hbThresh, eCsrBand eBand);
+
+eHalStatus sme_capture_tsf_req(tHalHandle hHal,
+ tSirCapTsfParams capTsfParams);
+
+eHalStatus sme_get_tsf_req(tHalHandle hHal,
+ tSirCapTsfParams capTsfParams);
+
+eHalStatus sme_set_tsfcb(tHalHandle hHal,
+ tsf_rsp_cb rsp_cb, struct stsf *pTsf,
+ void *pcallbackcontext);
+
#endif //#if !defined( __SME_API_H )
diff --git a/CORE/SME/inc/sme_Trace.h b/CORE/SME/inc/sme_Trace.h
index 9967cac..d5a4ba0 100644
--- a/CORE/SME/inc/sme_Trace.h
+++ b/CORE/SME/inc/sme_Trace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -146,6 +146,8 @@
TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ,
#endif /* FEATURE_WLAN_LPHB */
TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE,
+ TRACE_CODE_SME_TX_HDD_CAP_TSF_REQ,
+ TRACE_CODE_SME_TX_HDD_GET_TSF_REQ,
/* New trace commands to be added before this comment not at the end */
/* Trace codes for SME commands */
TRACE_CODE_SME_COMMAND = 250,
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index d6ea857..0e8bc3a 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -2719,8 +2719,8 @@
{
pTmpResult = GET_BASE_ADDR( pTmpEntry, tCsrScanResult, Link );
/* Skip the bssid hint AP, as it should be on head */
- if (pFilter &&
- vos_mem_compare(pResult->Result.BssDescriptor.bssId,
+ if (pFilter && vos_mem_compare(
+ pTmpResult->Result.BssDescriptor.bssId,
pFilter->bssid_hint, VOS_MAC_ADDR_SIZE)) {
pTmpEntry = csrLLNext(&pRetList->List,
pTmpEntry, LL_ACCESS_NOLOCK);
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 4765601..69a99fa 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -14923,4 +14923,135 @@
return VOS_STATUS_SUCCESS;
}
+
#endif /* WLAN_FEATURE_APFIND */
+
+/**
+ * sme_capture_tsf_req() - send tsf capture request to firmware
+ * @hHal: hal handle.
+ * @cap_tsf_params: capture tsf request params.
+ *
+ * Return: hal status.
+ */
+eHalStatus sme_capture_tsf_req(tHalHandle hHal, tSirCapTsfParams cap_tsf_params)
+{
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
+ vos_msg_t vosMessage;
+ tpSirCapTsfParams tsf_params = NULL;
+ VOS_STATUS vos_status;
+ tCsrRoamSession *pSession;
+
+ MTRACE(vos_trace(VOS_MODULE_ID_SME,
+ TRACE_CODE_SME_TX_HDD_CAP_TSF_REQ, NO_SESSION, 0));
+ if (eHAL_STATUS_SUCCESS == ( status = sme_AcquireGlobalLock(&pMac->sme)))
+ {
+ pSession = CSR_GET_SESSION(pMac, cap_tsf_params.session_id);
+ if (!pSession)
+ {
+ smsLog(pMac, LOGE, FL("session %d not found"),
+ cap_tsf_params.bss_idx);
+ sme_ReleaseGlobalLock( &pMac->sme );
+ return eHAL_STATUS_FAILURE;
+ }
+
+ tsf_params = (tpSirCapTsfParams)
+ vos_mem_malloc(sizeof(*tsf_params));
+
+ if (NULL == tsf_params)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: Not able to allocate memory for sme_capture_tsf_req",
+ __func__);
+ sme_ReleaseGlobalLock( &pMac->sme );
+ return eHAL_STATUS_FAILURE;
+ }
+ vos_mem_copy(&tsf_params->bssid, &pSession->connectedProfile.bssid,
+ sizeof(tsf_params->bssid));
+
+ tsf_params->tsf_rsp_cb_func = cap_tsf_params.tsf_rsp_cb_func;
+ tsf_params->tsf_rsp_cb_ctx = cap_tsf_params.tsf_rsp_cb_ctx;
+
+ /* serialize the req through MC thread */
+ /* TODO: check if callback is required */
+ vosMessage.bodyptr = tsf_params;
+ vosMessage.type = eWNI_SME_CAP_TSF_REQ;
+
+ vos_status = vos_mq_post_message(VOS_MQ_ID_PE, &vosMessage);
+
+ if (!VOS_IS_STATUS_SUCCESS(vos_status))
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: Post Set TM Level MSG fail", __func__);
+ vos_mem_free(tsf_params);
+ status = eHAL_STATUS_FAILURE;
+ }
+ sme_ReleaseGlobalLock( &pMac->sme );
+ }
+ return(status);
+}
+
+/**
+ * sme_get_tsf_req() - send tsf get request to firmware
+ * @hHal: hal handle.
+ * @cap_tsf_params: capture tsf request params.
+ *
+ * Return: hal status.
+ */
+eHalStatus sme_get_tsf_req(tHalHandle hHal, tSirCapTsfParams cap_tsf_params)
+{
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
+ vos_msg_t vosMessage;
+ tpSirCapTsfParams tsf_params = NULL;
+ VOS_STATUS vosStatus;
+ tCsrRoamSession *pSession;
+
+ MTRACE(vos_trace(VOS_MODULE_ID_SME,
+ TRACE_CODE_SME_TX_HDD_GET_TSF_REQ, NO_SESSION, 0));
+
+ if (eHAL_STATUS_SUCCESS == (status = sme_AcquireGlobalLock(&pMac->sme)))
+ {
+ pSession = CSR_GET_SESSION(pMac, cap_tsf_params.session_id);
+
+ if (!pSession)
+ {
+ smsLog(pMac, LOGE, FL("session %d not found"),
+ cap_tsf_params.bss_idx);
+ sme_ReleaseGlobalLock(&pMac->sme);
+ return eHAL_STATUS_FAILURE;
+ }
+
+ tsf_params = (tpSirCapTsfParams)
+ vos_mem_malloc(sizeof(*tsf_params));
+ if (NULL == tsf_params)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: Not able to allocate memory for sme_capture_tsf_req",
+ __func__);
+ sme_ReleaseGlobalLock(&pMac->sme);
+ return eHAL_STATUS_FAILURE;
+ }
+
+ vos_mem_copy(&tsf_params->bssid, &pSession->connectedProfile.bssid,
+ sizeof(tsf_params->bssid));
+ tsf_params->tsf_rsp_cb_func = cap_tsf_params.tsf_rsp_cb_func;
+ tsf_params->tsf_rsp_cb_ctx = cap_tsf_params.tsf_rsp_cb_ctx;
+
+ /* serialize the req through MC thread */
+ /* TODO: check if callback is required */
+ vosMessage.bodyptr = tsf_params;
+ vosMessage.type = eWNI_SME_GET_TSF_REQ;
+
+ vosStatus = vos_mq_post_message(VOS_MQ_ID_PE, &vosMessage);
+ if (!VOS_IS_STATUS_SUCCESS(vosStatus))
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: Post Set TM Level MSG fail", __func__);
+ vos_mem_free(tsf_params);
+ status = eHAL_STATUS_FAILURE;
+ }
+ sme_ReleaseGlobalLock(&pMac->sme);
+ }
+ return(status);
+}
diff --git a/CORE/SYS/common/src/wlan_qct_sys.c b/CORE/SYS/common/src/wlan_qct_sys.c
index be54dff..11f9fe5 100644
--- a/CORE/SYS/common/src/wlan_qct_sys.c
+++ b/CORE/SYS/common/src/wlan_qct_sys.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015,2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -778,7 +778,7 @@
vosMessage.reserved = FTM_SYS_MSG_COOKIE;
vosMessage.type = SYS_MSG_ID_MC_THR_PROBE;
- vosMessage.callback = NULL;
+ vosMessage.callback = vos_dump_thread_stacks;
vosMessage.bodyptr = NULL;
vos_mq_post_message(VOS_MQ_ID_SYS, &vosMessage);
diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c
index a805b43..4b2dcd4 100644
--- a/CORE/SYS/legacy/src/utils/src/macTrace.c
+++ b/CORE/SYS/legacy/src/utils/src/macTrace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -573,6 +573,8 @@
CASE_RETURN_STRING(eWNI_SME_SET_TDLS_2040_BSSCOEX_REQ);
CASE_RETURN_STRING(eWNI_SME_REGISTER_MGMT_FRAME_CB);
CASE_RETURN_STRING(eWNI_SME_MSG_TYPES_END);
+ CASE_RETURN_STRING(eWNI_SME_CAP_TSF_REQ);
+ CASE_RETURN_STRING(eWNI_SME_GET_TSF_REQ);
default:
return( (tANI_U8*)"UNKNOWN" );
break;
@@ -915,6 +917,8 @@
CASE_RETURN_STRING(WDA_SET_MDNS_RESPONSE_CMD);
CASE_RETURN_STRING(WDA_GET_MDNS_STATUS_CMD);
#endif
+ CASE_RETURN_STRING(WDA_CAP_TSF_REQ);
+ CASE_RETURN_STRING(WDA_GET_TSF_REQ);
default:
return((tANI_U8*) "UNKNOWN" );
break;
diff --git a/CORE/VOSS/inc/vos_api.h b/CORE/VOSS/inc/vos_api.h
index ddfc25c..00c1817 100644
--- a/CORE/VOSS/inc/vos_api.h
+++ b/CORE/VOSS/inc/vos_api.h
@@ -208,6 +208,17 @@
WLAN_LOG_REASON_SCAN_NOT_ALLOWED,
};
+/**
+ * vos_wdi_trace_event_type: Trace type for WDI Write/Read
+ * VOS_WDI_READ: Log the WDI read event
+ * VOS_WDI_WRITE: Log the WDI write event
+ */
+typedef enum
+{
+ VOS_WDI_READ,
+ VOS_WDI_WRITE,
+} vos_wdi_trace_event_type;
+
/*-------------------------------------------------------------------------
Function declarations and documenation
------------------------------------------------------------------------*/
@@ -516,4 +527,7 @@
v_BOOL_t vos_is_probe_rsp_offload_enabled(void);
void vos_set_snoc_high_freq_voting(bool enable);
+void vos_smd_dump_stats(void);
+void vos_log_wdi_event(uint16 msg, vos_wdi_trace_event_type event);
+void vos_dump_wdi_events(void);
#endif // if !defined __VOS_NVITEM_H
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index fe97e74..814c113 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -83,7 +83,7 @@
#include "bapInternal.h"
#include "bap_hdd_main.h"
#endif //WLAN_BTAMP_FEATURE
-
+#include "wlan_qct_wdi_cts.h"
/*---------------------------------------------------------------------------
* Preprocessor Definitions and Constants
@@ -100,6 +100,9 @@
/* Approximate amount of time to wait for WDA to issue a DUMP req */
#define VOS_WDA_RESP_TIMEOUT WDA_STOP_TIMEOUT
+/* Trace index for WDI Read/Write */
+#define VOS_TRACE_INDEX_MAX 256
+
/*---------------------------------------------------------------------------
* Data definitions
* ------------------------------------------------------------------------*/
@@ -107,6 +110,16 @@
static pVosContextType gpVosContext;
static v_U8_t vos_multicast_logging;
+struct vos_wdi_trace
+{
+ vos_wdi_trace_event_type event;
+ uint16 message;
+ uint64 time;
+};
+
+static struct vos_wdi_trace gvos_wdi_msg_trace[VOS_TRACE_INDEX_MAX];
+uint16 gvos_wdi_msg_trace_index = 0;
+
/*---------------------------------------------------------------------------
* Forward declaration
* ------------------------------------------------------------------------*/
@@ -900,6 +913,12 @@
if ( vStatus == VOS_STATUS_E_TIMEOUT )
{
WDA_setNeedShutdown(vosContext);
+ vos_smd_dump_stats();
+ vos_dump_wdi_events();
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: Test MC thread by posting a probe message to SYS",
+ __func__);
+ wlan_sys_probe();
}
VOS_ASSERT(0);
return VOS_STATUS_E_FAILURE;
@@ -3705,3 +3724,38 @@
return;
}
#endif
+
+void vos_smd_dump_stats(void)
+{
+ WCTS_Dump_Smd_status();
+}
+
+void vos_log_wdi_event(uint16 msg, vos_wdi_trace_event_type event)
+{
+
+ if (gvos_wdi_msg_trace_index >= VOS_TRACE_INDEX_MAX)
+ {
+ gvos_wdi_msg_trace_index = 0;
+ }
+
+ gvos_wdi_msg_trace[gvos_wdi_msg_trace_index].event = event;
+ gvos_wdi_msg_trace[gvos_wdi_msg_trace_index].time =
+ vos_get_monotonic_boottime();
+ gvos_wdi_msg_trace[gvos_wdi_msg_trace_index].message = msg;
+ gvos_wdi_msg_trace_index++;
+
+ return;
+}
+
+void vos_dump_wdi_events(void)
+{
+ int i;
+
+ for(i = 0; i < VOS_TRACE_INDEX_MAX; i++) {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s:event:%d time:%lld msg:%d ",__func__,
+ gvos_wdi_msg_trace[i].event,
+ gvos_wdi_msg_trace[i].time,
+ gvos_wdi_msg_trace[i].message);
+ }
+}
diff --git a/CORE/VOSS/src/vos_sched.c b/CORE/VOSS/src/vos_sched.c
index 0dafd25..f9014e7 100644
--- a/CORE/VOSS/src/vos_sched.c
+++ b/CORE/VOSS/src/vos_sched.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -2206,3 +2206,23 @@
"%s: Invalid thread %d invoked",__func__, thread_id);
}
}
+
+void vos_dump_thread_stacks(int threadId)
+{
+ /* Make sure that Vos Watchdog context has been initialized */
+ if (gpVosWatchdogContext == NULL)
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "%s: gpVosWatchdogContext == NULL", __func__);
+ return;
+ }
+ hddLog(LOGE, FL("Thread Stuck count reached threshold!!!"
+ "MC Count %d RX count %d TX count %d"),
+ gpVosWatchdogContext->mcThreadStuckCount,
+ gpVosWatchdogContext->rxThreadStuckCount,
+ gpVosWatchdogContext->txThreadStuckCount);
+
+ vos_dump_stack(MC_Thread);
+ vos_dump_stack(TX_Thread);
+ vos_dump_stack(RX_Thread);
+}
diff --git a/CORE/VOSS/src/vos_sched.h b/CORE/VOSS/src/vos_sched.h
index ed4839e..09b8038 100644
--- a/CORE/VOSS/src/vos_sched.h
+++ b/CORE/VOSS/src/vos_sched.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -539,6 +539,6 @@
void vos_wd_reset_thread_stuck_count(int threadId);
bool vos_is_wd_thread(int threadId);
void vos_dump_stack(uint8_t value);
-
+void vos_dump_thread_stacks(int threadId);
#endif // #if !defined __VOSS_SCHED_H
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index 1b77fbf..6f0d9b7 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1380,6 +1380,10 @@
#define WDA_AP_FIND_IND SIR_HAL_AP_FIND_IND
#endif /* WLAN_FEATURE_APFIND */
+#define WDA_CAP_TSF_REQ SIR_HAL_CAP_TSF_REQ
+#define WDA_GET_TSF_REQ SIR_HAL_GET_TSF_REQ
+
+
#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) \
@@ -2199,4 +2203,9 @@
void WDA_SetMgmtPktViaWQ5(v_BOOL_t sendMgmtPktViaWQ5);
+#define CAP_TSF_REQUEST 0
+#define GET_TSF_REQUEST 1
+
+VOS_STATUS WDA_ProcessCapTsfReq(tWDA_CbContext *pWDA, tSirCapTsfParams *params);
+VOS_STATUS WDA_ProcessGetTsfReq(tWDA_CbContext *pWDA, tSirCapTsfParams *params);
#endif
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 4368612..81b9574 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -17403,6 +17403,17 @@
break;
}
#endif
+ case WDA_CAP_TSF_REQ:
+ {
+ WDA_ProcessCapTsfReq(pWDA, (tSirCapTsfParams *)
+ pMsg->bodyptr);
+ break;
+ }
+ case WDA_GET_TSF_REQ:
+ {
+ WDA_ProcessGetTsfReq(pWDA, (tSirCapTsfParams *)pMsg->bodyptr);
+ break;
+ }
default:
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
@@ -23192,5 +23203,274 @@
vos_mem_free(params);
return CONVERT_WDI2VOS_STATUS(status) ;
}
-
#endif
+/*
+ * WDA_CapTsfRspCb : handle response for tsf requests
+ * @wdi_rsp : Response from WDI for tsf requests
+ * @user_data: pointer to user data
+ * Returns: None
+ */
+void WDA_CapTsfRspCb (wdi_cap_tsf_rsp_t *wdi_rsp, void *user_data)
+{
+
+ tWDA_ReqParams *wda_params = (tWDA_ReqParams *)user_data;
+ tSirCapTsfParams *cap_tsf_params;
+ struct stsf *stsf_temp;
+ VOS_STATUS status;
+
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s " ,__func__);
+
+ if (NULL == wda_params) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams received NULL", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ if (NULL == wda_params->wdaMsgParam) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams->wdaMsgParam is NULL", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(wda_params->wdaWdiApiMsgParam);
+ vos_mem_free(wda_params);
+ return;
+ }
+
+ stsf_temp = (struct stsf *)vos_mem_malloc(sizeof(*stsf_temp));
+ if (NULL == stsf_temp) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Unable to allocate tsf struct", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(wda_params->wdaWdiApiMsgParam);
+ vos_mem_free(wda_params->wdaMsgParam);
+ vos_mem_free(wda_params);
+ return;
+ }
+ cap_tsf_params = (tSirCapTsfParams *)wda_params->wdaMsgParam;
+ stsf_temp->session_id = cap_tsf_params->bss_idx;
+ stsf_temp->set_tsf_req = true;
+ stsf_temp->tsf_req_status = wdi_rsp->status;
+
+ if (cap_tsf_params->tsf_rsp_cb_func) {
+ cap_tsf_params->tsf_rsp_cb_func (
+ cap_tsf_params->tsf_rsp_cb_ctx, stsf_temp);
+ }
+ else {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: tsf callback is NULL", __func__);
+ vos_mem_free(stsf_temp);
+ }
+ status = CONVERT_WDI2VOS_STATUS(wdi_rsp->status);
+ if (status) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Capture TSF failed with status=%d", __func__,
+ status);
+ VOS_ASSERT(0);
+ }
+ vos_mem_free(wda_params->wdaWdiApiMsgParam);
+ vos_mem_free(wda_params->wdaMsgParam);
+ vos_mem_free(wda_params);
+ return;
+}
+
+/*
+ * WDA_GetTsfRspCb : handle response for get tsf request
+ * @wdi_rsp : Response from WDI for tsf requests
+ * @user_data: pointer to user data
+ * Returns: None
+ */
+void WDA_GetTsfRspCb (wdi_cap_tsf_rsp_t *wdi_rsp, void *user_data)
+{
+
+ tWDA_ReqParams *wda_params = (tWDA_ReqParams *)user_data;
+ tSirCapTsfParams *cap_tsf_params;
+ struct stsf *stsf_temp;
+ VOS_STATUS status;
+
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s " ,__func__);
+
+ if (NULL == wda_params) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams received NULL", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ if (NULL == wda_params->wdaMsgParam) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams->wdaMsgParam is NULL", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(wda_params->wdaWdiApiMsgParam);
+ vos_mem_free(wda_params);
+ return;
+ }
+
+ stsf_temp = (struct stsf *)vos_mem_malloc(sizeof(*stsf_temp));
+ if (NULL == stsf_temp) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Unable to allocate tsf struct", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(wda_params->wdaWdiApiMsgParam);
+ vos_mem_free(wda_params->wdaMsgParam);
+ vos_mem_free(wda_params);
+ return;
+ }
+ cap_tsf_params = (tSirCapTsfParams *)wda_params->wdaMsgParam;
+ stsf_temp->session_id = cap_tsf_params->bss_idx;
+ /* Indicate to upper layer that this is a get request */
+ stsf_temp->set_tsf_req = false;
+ stsf_temp->tsf_low = wdi_rsp->tsf_lo;
+ stsf_temp->tsf_high = wdi_rsp->tsf_hi;
+ stsf_temp->tsf_req_status = wdi_rsp->status;
+
+ if (cap_tsf_params->tsf_rsp_cb_func) {
+ cap_tsf_params->tsf_rsp_cb_func (
+ cap_tsf_params->tsf_rsp_cb_ctx, stsf_temp);
+ }
+ else {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: tsf callback is NULL", __func__);
+ vos_mem_free(stsf_temp);
+ }
+ status = CONVERT_WDI2VOS_STATUS(wdi_rsp->status);
+ if (status) {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Capture TSF failed with status=%d", __func__,
+ status);
+ VOS_ASSERT(0);
+ }
+ vos_mem_free(wda_params->wdaWdiApiMsgParam);
+ vos_mem_free(wda_params->wdaMsgParam);
+ vos_mem_free(wda_params);
+ return;
+}
+/*
+ * FUNCTION: WDA_ProcessCapTsfReq
+ * Send capture tsf request to FW.
+ */
+VOS_STATUS WDA_ProcessCapTsfReq(tWDA_CbContext *pWDA, tSirCapTsfParams *params)
+{
+ WDI_Status status = WDI_STATUS_SUCCESS;
+ wdi_cap_tsf_params_t *pWDICapTsfReqType;
+ tWDA_ReqParams *pWdaParams ;
+
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s " ,__func__);
+ if(NULL == params)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: cap tsf params NULL", __func__);
+ VOS_ASSERT(0) ;
+ return -EINVAL;
+ }
+
+ pWDICapTsfReqType = (wdi_cap_tsf_params_t *)vos_mem_malloc(
+ sizeof(*pWDICapTsfReqType));
+ if(NULL == pWDICapTsfReqType)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(params);
+ return VOS_STATUS_E_NOMEM;
+ }
+ pWdaParams = (tWDA_ReqParams *)vos_mem_malloc(sizeof(*pWdaParams)) ;
+ 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(pWDICapTsfReqType);
+ vos_mem_free(params);
+ return VOS_STATUS_E_NOMEM;
+ }
+
+ pWDICapTsfReqType->bss_idx = params->bss_idx;
+ pWDICapTsfReqType->capTSFget = CAP_TSF_REQUEST;
+
+ pWdaParams->pWdaContext = pWDA;
+ pWdaParams->wdaMsgParam = params;
+ pWdaParams->wdaWdiApiMsgParam = (void *)pWDICapTsfReqType;
+
+ status = wdi_process_cap_tsf_req(pWDICapTsfReqType,
+ (wdi_tsf_rsp_cb)WDA_CapTsfRspCb,
+ pWdaParams);
+
+ if(IS_WDI_STATUS_FAILURE(status))
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "Failure in sendind WifiConfigReq, free all the memory" );
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
+ vos_mem_free(pWdaParams->wdaMsgParam);
+ vos_mem_free(pWdaParams);
+ vos_mem_free(params);
+ }
+ return CONVERT_WDI2VOS_STATUS(status) ;
+}
+
+/*
+ * FUNCTION: WDA_ProcessGetTsfReq
+ * Send capture tsf request to FW.
+ */
+VOS_STATUS WDA_ProcessGetTsfReq(tWDA_CbContext *pWDA, tSirCapTsfParams *params)
+{
+ WDI_Status status = WDI_STATUS_SUCCESS;
+ wdi_cap_tsf_params_t *pWDIGetTsfReqType;
+ tWDA_ReqParams *pWdaParams ;
+
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s " ,__func__);
+ if(NULL == params)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: cap tsf params NULL", __func__);
+ VOS_ASSERT(0) ;
+ return VOS_STATUS_E_INVAL;
+ }
+
+ pWDIGetTsfReqType = (wdi_cap_tsf_params_t *)vos_mem_malloc(
+ sizeof(wdi_cap_tsf_params_t));
+ if(NULL == pWDIGetTsfReqType)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: VOS MEM Alloc Failure", __func__);
+ VOS_ASSERT(0);
+ vos_mem_free(params);
+ return VOS_STATUS_E_INVAL;
+ }
+ 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(pWDIGetTsfReqType);
+ vos_mem_free(params);
+ return VOS_STATUS_E_NOMEM;
+ }
+
+ pWDIGetTsfReqType->bss_idx = params->bss_idx;
+ /* Indicate that this is a get request */
+ pWDIGetTsfReqType->capTSFget = GET_TSF_REQUEST;
+
+ pWdaParams->pWdaContext = pWDA;
+ pWdaParams->wdaMsgParam = params;
+ pWdaParams->wdaWdiApiMsgParam = (void *)pWDIGetTsfReqType;
+
+ status = wdi_process_get_tsf_req(pWDIGetTsfReqType,
+ (wdi_tsf_rsp_cb)WDA_GetTsfRspCb,
+ pWdaParams);
+
+ if(IS_WDI_STATUS_FAILURE(status))
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "Failure in sendind WifiConfigReq, free all the memory" );
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
+ vos_mem_free(pWdaParams->wdaMsgParam);
+ vos_mem_free(pWdaParams);
+ vos_mem_free(params);
+ }
+ return CONVERT_WDI2VOS_STATUS(status) ;
+}
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index fc3dfe7..fd7912b 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -6664,6 +6664,28 @@
wpt_uint8 key[64];
};
+/**
+ * wdi_cap_tsf_params_t - wdi capture tsf params
+ * @bssidx: bss index
+ * @capTSFget: whether get/set request
+ *
+ */
+ typedef struct {
+ wpt_uint8 bss_idx;
+ wpt_uint8 capTSFget;
+} wdi_cap_tsf_params_t;
+
+/**
+ * wdi_cap_tsf_rsp_t - capture tsf response
+ * @bssidx: bss index
+ * @capTSFget: whether get/set request
+ *
+ */
+ typedef struct {
+ wpt_uint32 status;
+ wpt_uint32 tsf_lo;
+ wpt_uint32 tsf_hi;
+} wdi_cap_tsf_rsp_t;
/*----------------------------------------------------------------------------
* WDI callback types
@@ -8635,6 +8657,8 @@
typedef void (*wdi_get_stats_rsp_cb)(void *event_data,void *user_data);
#endif /* MDNS_OFFLOAD */
+typedef void (*wdi_tsf_rsp_cb)(void *event_data,void *user_data);
+
/*========================================================================
* Function Declarations and Documentation
@@ -12475,4 +12499,15 @@
);
#endif /* MDNS_OFFLOAD */
+WDI_Status
+wdi_process_cap_tsf_req (wdi_cap_tsf_params_t *wdi_cap_tsf_req,
+ wdi_tsf_rsp_cb wdi_tsf_rsp_callback,
+ void *user_data);
+
+WDI_Status
+wdi_process_get_tsf_req (wdi_cap_tsf_params_t *wdi_get_tsf_req,
+ wdi_tsf_rsp_cb wdi_tsf_rsp_callback,
+ void *user_data);
+
+
#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 0f01a78..034fe71 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -500,6 +500,9 @@
WDI_MDNS_RESP_OFFLOAD_REQ = 121,
WDI_MDNS_STATS_OFFLOAD_REQ = 122,
+ WDI_CAP_TSF_REQ = 123,
+ WDI_GET_TSF_REQ = 124,
+
WDI_MAX_REQ,
/*Send a suspend Indication down to HAL*/
@@ -885,6 +888,7 @@
WDI_MDNS_FQDN_OFFLOAD_RSP = 120,
WDI_MDNS_RESP_OFFLOAD_RSP = 121,
WDI_MDNS_STATS_OFFLOAD_RSP = 122,
+ WDI_CAPTURE_GET_TSF_TSTAMP_RSP = 123,
/*-------------------------------------------------------------------------
Indications
@@ -6808,5 +6812,26 @@
WDI_EventInfoType* pEventData
);
#endif
+
+WDI_Status
+wdi_cap_tsf_req
+(
+ WDI_ControlBlockType *wdi_ctx,
+ WDI_EventInfoType *event_data
+);
+
+WDI_Status
+wdi_get_tsf_req
+(
+ WDI_ControlBlockType *wdi_ctx,
+ WDI_EventInfoType *event_data
+);
+WDI_Status
+wdi_get_tsf_rsp
+(
+ WDI_ControlBlockType *wdi_ctx,
+ WDI_EventInfoType *event_data
+);
+
#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 6de2e84..5ed7a7a 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -535,6 +535,8 @@
NULL,
NULL,
#endif /* MDNS_OFFLOAD */
+ wdi_cap_tsf_req, /* WDI_CAP_TSF_REQ */
+ wdi_get_tsf_req, /* WDI_GET_TSF_REQ */
/*-------------------------------------------------------------------------
Indications
@@ -878,7 +880,9 @@
NULL,
NULL,
NULL,
-#endif /* MDNS_OFFLOAD */
+#endif /* MDNS_OFFLOAD */
+ wdi_get_tsf_rsp, /* WDI_CAPTURE_GET_TSF_TSTAMP_RSP */
+
/*---------------------------------------------------------------------
Indications
---------------------------------------------------------------------*/
@@ -1710,6 +1714,7 @@
#ifdef DHCP_SERVER_OFFLOAD
CASE_RETURN_STRING (WDI_DHCP_SERVER_OFFLOAD_RSP);
#endif /* DHCP_SERVER_OFFLOAD */
+ CASE_RETURN_STRING (WDI_CAPTURE_GET_TSF_TSTAMP_RSP);
default:
return "Unknown WDI MessageId";
}
@@ -22921,6 +22926,7 @@
}
wdiEventData.wdiResponse = HAL_2_WDI_RSP_TYPE( pHalMsgHeader->msgType );
+ vos_log_wdi_event(wdiEventData.wdiResponse, VOS_WDI_READ);
/*The message itself starts after the header*/
wdiEventData.pEventData = (wpt_uint8*)pMsg + sizeof(tHalMsgHeader);
@@ -25040,6 +25046,10 @@
case WDI_MDNS_STATS_OFFLOAD_REQ:
return WLAN_HAL_MDNS_STATS_OFFLOAD_REQ;
#endif /* MDNS_OFFLOAD */
+ case WDI_CAP_TSF_REQ:
+ return WLAN_HAL_CAPTURE_GET_TSF_TSTAMP;
+ case WDI_GET_TSF_REQ:
+ return WLAN_HAL_CAPTURE_GET_TSF_TSTAMP;
default:
return WLAN_HAL_MSG_MAX;
}
@@ -25427,6 +25437,8 @@
case WLAN_HAL_QRF_PREF_NETW_FOUND_IND:
return WDI_HAL_QRF_PREF_NETWORK_FOUND_IND;
#endif
+ case WLAN_HAL_CAPTURE_GET_TSF_TSTAMP_RSP:
+ return WDI_CAPTURE_GET_TSF_TSTAMP_RSP;
default:
return eDRIVER_TYPE_MAX;
}
@@ -39411,4 +39423,249 @@
return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
}
+
+/**
+ * wdi_process_cap_tsf_req() - Send Capture tsf request to FW.
+ *
+ * @pWDICtx: pointer to the WLAN DAL context
+ * @pEventData: pointer to the event information structure
+ *
+ * Return: WDI_Status enumeration
+ */
+WDI_Status wdi_process_cap_tsf_req(wdi_cap_tsf_params_t *wdi_cap_tsf_req,
+ wdi_tsf_rsp_cb wdi_cap_tsf_rsp_callback,
+ void *user_data)
+{
+ 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_CAP_TSF_REQ;
+ wdiEventData.pEventData = wdi_cap_tsf_req;
+ wdiEventData.uEventDataSize = sizeof(*wdi_cap_tsf_req);
+ wdiEventData.pCBfnc = wdi_cap_tsf_rsp_callback;
+ wdiEventData.pUserData = user_data;
+
+ return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
+}
+/**
+ * wdi_process_get_tsf_req() - Send Get tsf request to FW.
+ *
+ * @pWDICtx: pointer to the WLAN DAL context
+ * @pEventData: pointer to the event information structure
+ *
+ * Return: WDI_Status enumeration
+ */
+WDI_Status wdi_process_get_tsf_req(wdi_cap_tsf_params_t *wdi_get_tsf_req,
+ wdi_tsf_rsp_cb wdi_tsf_rsp_callback,
+ void *user_data)
+{
+ 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_GET_TSF_REQ;
+ wdiEventData.pEventData = wdi_get_tsf_req;
+ wdiEventData.uEventDataSize = sizeof(*wdi_get_tsf_req);
+ wdiEventData.pCBfnc = wdi_tsf_rsp_callback;
+ wdiEventData.pUserData = user_data;
+
+ return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
+}
+
+/**
+ * wdi_cap_tsf_req() - wdi api for capture tsf request
+ * @wdi_ctx: pointer to wdi context
+ * @event_data: pointer to event data
+ *
+ * Return: WDI_Status
+ * WDI_STATUS_SUCCESS - success or else failure status
+ */
+WDI_Status wdi_cap_tsf_req (WDI_ControlBlockType *wdi_ctx,
+ WDI_EventInfoType *event_data)
+{
+
+ wdi_cap_tsf_params_t *wdi_cap_tsf_req_info;
+ wpt_uint8 *buff = NULL;
+ wpt_uint16 data_offset = 0;
+ wpt_uint16 size = 0;
+ WDI_Status wdi_status;
+ tHalCapTSFgetReqInd hal_cap_tsf_req;
+ wdi_tsf_rsp_cb wdi_tsf_rsp_callback;
+
+ VOS_TRACE(VOS_MODULE_ID_WDI, VOS_TRACE_LEVEL_INFO,
+ "%s: Enter",__func__ );
+ /* Sanity check */
+ if ((NULL == wdi_ctx) || (NULL == event_data) ||
+ (NULL == event_data->pEventData)) {
+
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "%s: Invalid parameters", __func__);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ wdi_cap_tsf_req_info = (wdi_cap_tsf_params_t *)
+ event_data->pEventData;
+
+ /* Get message buffer */
+ if (( WDI_STATUS_SUCCESS !=
+ WDI_GetMessageBuffer(wdi_ctx,
+ WDI_CAP_TSF_REQ,
+ sizeof(hal_cap_tsf_req.
+ capTSFget),
+ &buff, &data_offset, &size))||
+ (size < (data_offset +
+ sizeof(hal_cap_tsf_req.capTSFget))))
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
+ "Unable to get send buffer in GetTsfFrame Req");
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+ hal_cap_tsf_req.capTSFget.uBssIdx = wdi_cap_tsf_req_info->bss_idx;
+ hal_cap_tsf_req.capTSFget.capTSFget = wdi_cap_tsf_req_info->capTSFget;
+
+ wdi_tsf_rsp_callback = (wdi_tsf_rsp_cb)event_data->pCBfnc;
+
+ wpalMemoryCopy(buff+data_offset,
+ &hal_cap_tsf_req.capTSFget,
+ sizeof(hal_cap_tsf_req.capTSFget));
+
+ wdi_status = WDI_SendMsg(wdi_ctx, buff, size,
+ wdi_tsf_rsp_callback,
+ event_data->pUserData,
+ WDI_CAPTURE_GET_TSF_TSTAMP_RSP);
+
+ VOS_TRACE(VOS_MODULE_ID_WDI, VOS_TRACE_LEVEL_INFO,
+ "%s: Exit",__func__);
+
+ return wdi_status;
+}
+
+/**
+ * wdi_get_tsf_req() - wdi api for get tsf request
+ * @wdi_ctx: pointer to wdi context
+ * @event_data: pointer to event data
+ *
+ * Return: WDI_Status
+ * WDI_STATUS_SUCCESS - success or else failure status
+ */
+WDI_Status wdi_get_tsf_req (WDI_ControlBlockType *wdi_ctx,
+ WDI_EventInfoType *event_data)
+{
+
+ wdi_cap_tsf_params_t *wdi_cap_tsf_req_info;
+ wpt_uint8 *buff = NULL;
+ wpt_uint16 data_offset = 0;
+ wpt_uint16 size = 0;
+ WDI_Status wdi_status;
+ tHalCapTSFgetReqInd hal_cap_tsf_req;
+ wdi_tsf_rsp_cb wdi_tsf_rsp_callback;
+
+ VOS_TRACE(VOS_MODULE_ID_WDI, VOS_TRACE_LEVEL_INFO,
+ "%s: Enter",__func__ );
+ /* Sanity check */
+ if ((NULL == wdi_ctx) || (NULL == event_data) ||
+ (NULL == event_data->pEventData)) {
+
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "%s: Invalid parameters", __func__);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ wdi_cap_tsf_req_info = (wdi_cap_tsf_params_t *)
+ event_data->pEventData;
+
+ /* Get message buffer */
+ if (( WDI_STATUS_SUCCESS !=
+ WDI_GetMessageBuffer(wdi_ctx,
+ WDI_CAP_TSF_REQ,
+ sizeof(hal_cap_tsf_req.
+ capTSFget),
+ &buff, &data_offset, &size))||
+ (size < (data_offset +
+ sizeof(hal_cap_tsf_req.capTSFget))))
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
+ "Unable to get send buffer in GetTsfFrame Req");
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+ hal_cap_tsf_req.capTSFget.uBssIdx = wdi_cap_tsf_req_info->bss_idx;
+ hal_cap_tsf_req.capTSFget.capTSFget = wdi_cap_tsf_req_info->capTSFget;
+
+ wdi_tsf_rsp_callback = (wdi_tsf_rsp_cb)event_data->pCBfnc;
+
+ wpalMemoryCopy(buff+data_offset,
+ &hal_cap_tsf_req.capTSFget,
+ sizeof(hal_cap_tsf_req.capTSFget));
+
+ wdi_status = WDI_SendMsg(wdi_ctx, buff, size,
+ wdi_tsf_rsp_callback,
+ event_data->pUserData,
+ WDI_CAPTURE_GET_TSF_TSTAMP_RSP);
+
+ VOS_TRACE(VOS_MODULE_ID_WDI, VOS_TRACE_LEVEL_INFO,
+ "%s: Exit",__func__);
+
+ return wdi_status;
+}
+
+/**
+ * wdi_get_tsf_rsp() - wdi api for the get tsf response
+ * @wdi_ctx: pointer to the wdi context
+ * @event_data: pointer to the event data
+ *
+ * Return: WDI_Status
+ * WDI_STATUS_SUCCESS - success or else failure status
+ */
+WDI_Status
+wdi_get_tsf_rsp
+(
+ WDI_ControlBlockType *wdi_ctx,
+ WDI_EventInfoType *event_data
+)
+{
+ wdi_tsf_rsp_cb wdi_tsf_rsp_callback;
+
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
+ "%s: Enter ", __func__);
+ /*-------------------------------------------------------------------
+ Sanity check
+ -----------------------------------------------------------------*/
+ if ((NULL == wdi_ctx) || (NULL == event_data) ||
+ (NULL == event_data->pEventData))
+ {
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_WARN,
+ "%s: Invalid parameters", __func__);
+ WDI_ASSERT(0);
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ wdi_tsf_rsp_callback =
+ (wdi_tsf_rsp_cb)wdi_ctx->pfncRspCB;
+
+ if (wdi_tsf_rsp_callback)
+ wdi_tsf_rsp_callback((void *) event_data->pEventData,
+ wdi_ctx->pRspCBUserData);
+ else {
+ VOS_TRACE(VOS_MODULE_ID_WDI, VOS_TRACE_LEVEL_ERROR,
+ "wdi_tsf_rsp_callback is NULL!");
+ return WDI_STATUS_E_FAILURE;
+ }
+
+ return WDI_STATUS_SUCCESS;
+}
#endif
diff --git a/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h b/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h
index 16bfad0..daf87b0 100644
--- a/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h
+++ b/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2013,2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -97,6 +97,16 @@
WCTS_EVENT_MAX
} WCTS_NotifyEventType;
+struct WdiSmdStats
+{
+ int smd_event_data;
+ int smd_event_open;
+ int smd_event_close;
+ int smd_event_status;
+ int smd_event_reopen_ready;
+ int smd_event_err;
+};
+
/*----------------------------------------------------------------------------
* WDI callback types
*--------------------------------------------------------------------------*/
@@ -253,4 +263,6 @@
(
WCTS_HandleType wctsHandle
);
+
+void WCTS_Dump_Smd_status(void);
#endif /* #ifndef WLAN_QCT_WDI_CTS_H */
diff --git a/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c b/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
index 9c04d88..ddf4d4d 100644
--- a/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
+++ b/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015,2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -108,6 +108,8 @@
/* time to wait for SMD channel to close (in msecs) */
#define WCTS_SMD_CLOSE_TIMEOUT 5000
+/* Global Variable for WDI SMD stats */
+static struct WdiSmdStats gWdiSmdStats;
/*----------------------------------------------------------------------------
* Type Declarations
* -------------------------------------------------------------------------*/
@@ -528,6 +530,7 @@
wpalDriverReInit();
return;
}
+ gWdiSmdStats.smd_event_open++;
palMsg = &pWCTSCb->wctsOpenMsg;
break;
@@ -543,6 +546,7 @@
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
"%s: received SMD_EVENT_DATA from SMD", __func__);
palMsg = &pWCTSCb->wctsDataMsg;
+ gWdiSmdStats.smd_event_data++;
break;
case SMD_EVENT_CLOSE:
@@ -560,11 +564,13 @@
/* subsystem restart: shutdown */
wpalDriverShutdown();
+ gWdiSmdStats.smd_event_close++;
return;
case SMD_EVENT_STATUS:
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
"%s: received SMD_EVENT_STATUS from SMD", __func__);
+ gWdiSmdStats.smd_event_status++;
return;
case SMD_EVENT_REOPEN_READY:
@@ -575,12 +581,14 @@
running, this one is received when the threads are closed and
the rmmod thread is waiting. so just unblock that thread */
wpalEventSet(&pWCTSCb->wctsEvent);
+ gWdiSmdStats.smd_event_reopen_ready++;
return;
default:
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
"%s: Unexpected event %u received from SMD",
__func__, event);
+ gWdiSmdStats.smd_event_err++;
return;
}
@@ -977,3 +985,19 @@
return eWLAN_PAL_STATUS_SUCCESS;
}/*WCTS_SendMessage*/
+
+void WCTS_Dump_Smd_status(void)
+{
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "Smd Read Stats: %d", gWdiSmdStats.smd_event_data);
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "Smd Open Stats: %d", gWdiSmdStats.smd_event_open);
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "Smd Close Stats: %d", gWdiSmdStats.smd_event_close);
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "Smd Status Stats: %d", gWdiSmdStats.smd_event_status);
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "Smd Reopen Stats: %d", gWdiSmdStats.smd_event_reopen_ready);
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "Smd Error Stats: %d", gWdiSmdStats.smd_event_err);
+}
diff --git a/Kbuild b/Kbuild
index 438335d..a7d0f57 100644
--- a/Kbuild
+++ b/Kbuild
@@ -573,7 +573,8 @@
-DWLAN_FEATURE_EXTSCAN \
-DFEATURE_EXT_LL_STAT \
-DWLAN_VOWIFI_DEBUG \
- -DDHCP_SERVER_OFFLOAD
+ -DDHCP_SERVER_OFFLOAD \
+ -DWLAN_FEATURE_TSF
ifneq ($(CONFIG_PRONTO_WLAN),)
CDEFINES += -DWCN_PRONTO
diff --git a/riva/inc/wlan_hal_msg.h b/riva/inc/wlan_hal_msg.h
index 81d6a7a..cd67d3f 100644
--- a/riva/inc/wlan_hal_msg.h
+++ b/riva/inc/wlan_hal_msg.h
@@ -620,6 +620,8 @@
/* QRF Support */
WLAN_HAL_QRF_AP_FIND_COMMAND = 350,
WLAN_HAL_QRF_PREF_NETW_FOUND_IND = 351,
+ WLAN_HAL_CAPTURE_GET_TSF_TSTAMP = 352,
+ WLAN_HAL_CAPTURE_GET_TSF_TSTAMP_RSP = 353,
WLAN_HAL_MSG_MAX = WLAN_HAL_MSG_TYPE_MAX_ENUM_SIZE
}tHalHostMsgType;
@@ -9085,6 +9087,39 @@
tConfigRoamScanRspParams configRoamScanRspParams;
} tSetRoamScanConfigRsp, * tpSetRoamScanConfigRsp;
+/*---------------------------------------------------------------------------
+* WLAN_HAL_CAPTURE_GET_TSF_TSTAMP
+*-------------------------------------------------------------------------*/
+typedef PACKED_PRE struct PACKED_POST
+{
+ uint8 uBssIdx;
+ boolean capTSFget;
+}tHalCapTSFget, *tptHalCapTSFget;
+
+typedef PACKED_PRE struct PACKED_POST
+{
+ tHalMsgHeader header;
+ tHalCapTSFget capTSFget;
+}tHalCapTSFgetReqInd, *tpHalCapTSFgetReqInd;
+
+/*---------------------------------------------------------------------------
+ WLAN_HAL_CAPTURE_GET_TSF_TSTAMP_RSP
+---------------------------------------------------------------------------*/
+
+typedef PACKED_PRE struct PACKED_POST
+{
+ /* Success /Failure / Nil result */
+ tANI_U32 status;
+ tANI_U32 tsf_lo;
+ tANI_U32 tsf_hi;
+} tConfigcapTSFgetRspParams, * tptConfigcapTSFgetRspParams;
+
+typedef PACKED_PRE struct PACKED_POST
+{
+ tHalMsgHeader header;
+ tConfigcapTSFgetRspParams configcapTSFgetRspParams;
+} tcapGetTSFConfigRsp, * tpcapGetTSFConfigRsp;
+
#define PER_ROAM_MAX_AP_CNT 30
#define PER_ROAM_MAX_CANDIDATE_CNT 15