qcacld-3.0: Modify support for connecting event logging

Connecting event logs are to be sent after candidate
selection and not immediately after receiving
connect request.

Modify the connecting event logs to be sent after
sta info event logs.

Change-Id: I83b654ba0ef3458368ba7dd6353c5ab67077ec39
CRs-Fixed: 3599703

components/cmn_services/logging/inc/wlan_connectivity_logging.h

@@ -1277,6 +1277,14 @@ void
 wlan_connectivity_sta_info_event(struct wlan_objmgr_psoc *psoc,
 				 uint8_t vdev_id);
 
+/**
+ * wlan_connectivity_connecting_event() - API to log connecting event
+ * @vdev: vdev pointer
+ *
+ * Return: None
+ */
+void
+wlan_connectivity_connecting_event(struct wlan_objmgr_vdev *vdev);
 
 #elif defined(WLAN_FEATURE_CONNECTIVITY_LOGGING)
 /**
@@ -1347,6 +1355,15 @@ wlan_connectivity_mgmt_event(struct wlan_objmgr_psoc *psoc,
 			     uint8_t auth_seq, uint16_t aid,
 			     enum wlan_main_tag tag);
 
+/**
+ * wlan_connectivity_connecting_event() - API to log connecting event
+ * @vdev: vdev pointer
+ *
+ * Return: None
+ */
+void
+wlan_connectivity_connecting_event(struct wlan_objmgr_vdev *vdev);
+
 /**
  * wlan_populate_vsie() - Populate VSIE field for logging
  * @vdev: vdev pointer
@@ -1446,6 +1463,11 @@ wlan_connectivity_t2lm_req_resp_event(struct wlan_objmgr_vdev *vdev,
 				      qdf_freq_t freq,
 				      bool is_rx, uint8_t subtype)
 {}
+
+static inline void
+wlan_connectivity_connecting_event(struct wlan_objmgr_vdev *vdev)
+{
+}
 #endif
 
 #if defined(CONNECTIVITY_DIAG_EVENT) && defined(WLAN_FEATURE_11BE_MLO)

components/cmn_services/logging/src/wlan_connectivity_logging.c

@@ -24,6 +24,7 @@
 #include "wlan_cm_api.h"
 #include "wlan_mlme_main.h"
 #include "wlan_mlo_mgr_sta.h"
+#include "wlan_mlme_api.h"
 
 #ifdef WLAN_FEATURE_CONNECTIVITY_LOGGING
 static struct wlan_connectivity_log_buf_data global_cl;
@@ -542,6 +543,9 @@ wlan_connectivity_sta_info_event(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)
 	if (wlan_vdev_mlme_get_opmode(vdev) != QDF_STA_MODE)
 		goto out;
 
+	if (!wlan_cm_is_first_candidate_connect_attempt(vdev))
+		goto out;
+
 	wlan_diag_event.diag_cmn.timestamp_us = qdf_get_time_of_the_day_us();
 	wlan_diag_event.diag_cmn.ktime_us = qdf_ktime_to_us(qdf_ktime_get());
 	wlan_diag_event.diag_cmn.vdev_id = vdev_id;
@@ -563,7 +567,7 @@ wlan_connectivity_sta_info_event(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)
 	}
 
 	WLAN_HOST_DIAG_EVENT_REPORT(&wlan_diag_event, EVENT_WLAN_STA_INFO);
-
+	wlan_connectivity_connecting_event(vdev);
 out:
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_OBJMGR_ID);
 }
@@ -678,6 +682,58 @@ out:
 
 }
 
+void
+wlan_connectivity_connecting_event(struct wlan_objmgr_vdev *vdev)
+{
+	QDF_STATUS status;
+	struct wlan_cm_connect_req req;
+
+	WLAN_HOST_DIAG_EVENT_DEF(wlan_diag_event, struct wlan_diag_connect);
+
+	status = wlan_cm_get_active_connect_req_param(vdev, &req);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		logging_err("vdev: %d failed to get active cmd request",
+			    wlan_vdev_get_id(vdev));
+		return;
+	}
+
+	wlan_diag_event.version = DIAG_CONN_VERSION;
+	wlan_diag_event.diag_cmn.timestamp_us = qdf_get_time_of_the_day_us();
+	wlan_diag_event.diag_cmn.ktime_us = qdf_ktime_to_us(qdf_ktime_get());
+	wlan_diag_event.diag_cmn.vdev_id = wlan_vdev_get_id(vdev);
+	wlan_diag_event.subtype = WLAN_CONN_DIAG_CONNECTING_EVENT;
+
+	wlan_diag_event.ssid_len = req.ssid.length;
+
+	if (req.ssid.length > WLAN_SSID_MAX_LEN)
+		wlan_diag_event.ssid_len = WLAN_SSID_MAX_LEN;
+
+	qdf_mem_copy(wlan_diag_event.ssid, req.ssid.ssid,
+		     wlan_diag_event.ssid_len);
+
+	if (!qdf_is_macaddr_zero(&req.bssid))
+		qdf_mem_copy(wlan_diag_event.diag_cmn.bssid, req.bssid.bytes,
+			     QDF_MAC_ADDR_SIZE);
+	else if (!qdf_is_macaddr_zero(&req.bssid_hint))
+		qdf_mem_copy(wlan_diag_event.bssid_hint, req.bssid_hint.bytes,
+			     QDF_MAC_ADDR_SIZE);
+
+	if (req.chan_freq)
+		wlan_diag_event.freq = req.chan_freq;
+	else if (req.chan_freq_hint)
+		wlan_diag_event.freq_hint = req.chan_freq_hint;
+
+	wlan_diag_event.pairwise_cipher	= req.crypto.user_cipher_pairwise;
+	wlan_diag_event.grp_cipher = req.crypto.user_grp_cipher;
+	wlan_diag_event.akm = req.crypto.user_akm_suite;
+	wlan_diag_event.auth_algo = req.crypto.user_auth_type;
+
+	wlan_diag_event.bt_coex =
+		wlan_mlme_get_bt_profile_con(wlan_vdev_get_psoc(vdev));
+
+	WLAN_HOST_DIAG_EVENT_REPORT(&wlan_diag_event, EVENT_WLAN_CONN);
+}
+
 #ifdef WLAN_FEATURE_11BE_MLO
 void wlan_connectivity_mld_link_status_event(struct wlan_objmgr_psoc *psoc,
 					     struct mlo_link_switch_params *src)

components/mlme/dispatcher/inc/wlan_mlme_api.h

@@ -4162,6 +4162,26 @@ wlan_mlme_is_data_stall_recovery_fw_supported(struct wlan_objmgr_psoc *psoc);
 QDF_STATUS mlme_cfg_get_eht_caps(struct wlan_objmgr_psoc *psoc,
 				 tDot11fIEeht_cap *eht_cap);
 
+/**
+ * wlan_mlme_set_bt_profile_con() - Set bluetooth connection profile
+ * @psoc: pointer to psoc object
+ * @bt_profile_con: Bluetooth connection profile bit
+ *
+ * Return: None
+ */
+void
+wlan_mlme_set_bt_profile_con(struct wlan_objmgr_psoc *psoc,
+			     bool bt_profile_con);
+
+/**
+ * wlan_mlme_get_bt_profile_con() - Get Bluetooth connection profile
+ * @psoc: pointer to psoc object
+ *
+ * Return: Bluetooth connection profile
+ */
+bool
+wlan_mlme_get_bt_profile_con(struct wlan_objmgr_psoc *psoc);
+
 #ifdef WLAN_FEATURE_11BE_MLO
 /**
  * wlan_mlme_get_sta_mlo_conn_max_num() - get max number of links that sta mlo

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1463,6 +1463,7 @@ struct wlan_mlme_aux_dev_caps {
  * connection, bypass strict power levels
  * @sr_enable_modes: modes for which SR(Spatial Reuse) is enabled
  * @wlan_mlme_aux0_dev_caps: capability for aux0
+ * @bt_profile_con: Bluetooth connection profile
  */
 struct wlan_mlme_generic {
 	uint32_t band_capability;
@@ -1530,6 +1531,7 @@ struct wlan_mlme_generic {
 #endif
 	struct wlan_mlme_aux_dev_caps
 		wlan_mlme_aux0_dev_caps[WLAN_MLME_HW_MODE_MAX];
+	bool bt_profile_con;
 };
 
 /**

components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -94,6 +94,15 @@ QDF_STATUS ucfg_mlme_pdev_open(struct wlan_objmgr_pdev *pdev);
 void ucfg_mlme_set_ml_link_control_mode(struct wlan_objmgr_psoc *psoc,
 					uint8_t vdev_id, uint8_t value);
 
+/**
+ * ucfg_mlme_set_bt_profile_con() - set Bluetooth connection profile
+ * @psoc: Pointer to psoc object
+ * @bt_profile_con: Bluetooth connection profile indicator
+ *
+ * Return: None
+ */
+void ucfg_mlme_set_bt_profile_con(struct wlan_objmgr_psoc *psoc,
+				  bool bt_profile_con);
 /**
  * ucfg_mlme_get_ml_link_control_mode() - get ml_link_control_mode
  * @psoc: pointer to psoc object

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -1413,6 +1413,31 @@ QDF_STATUS wlan_mlme_get_sta_ch_width(struct wlan_objmgr_vdev *vdev,
 	return  status;
 }
 
+void
+wlan_mlme_set_bt_profile_con(struct wlan_objmgr_psoc *psoc,
+			     bool bt_profile_con)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return;
+
+	mlme_obj->cfg.gen.bt_profile_con = bt_profile_con;
+}
+
+bool
+wlan_mlme_get_bt_profile_con(struct wlan_objmgr_psoc *psoc)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return false;
+
+	return mlme_obj->cfg.gen.bt_profile_con;
+}
+
 #ifdef WLAN_FEATURE_11BE_MLO
 uint8_t wlan_mlme_get_sta_mlo_simultaneous_links(struct wlan_objmgr_psoc *psoc)
 {

components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c

@@ -134,6 +134,12 @@ void ucfg_mlme_set_ml_link_control_mode(struct wlan_objmgr_psoc *psoc,
 	wlan_mlme_set_ml_link_control_mode(psoc, vdev_id, value);
 }
 
+void ucfg_mlme_set_bt_profile_con(struct wlan_objmgr_psoc *psoc,
+				  bool bt_profile_con)
+{
+	wlan_mlme_set_bt_profile_con(psoc, bt_profile_con);
+}
+
 uint8_t ucfg_mlme_get_ml_link_control_mode(struct wlan_objmgr_psoc *psoc,
 					   uint8_t vdev_id)
 {

core/hdd/src/wlan_hdd_cfg80211.c

@@ -18485,6 +18485,7 @@ void hdd_bt_activity_cb(hdd_handle_t hdd_handle, uint32_t bt_activity)
 		return;
 
 	ucfg_scan_set_bt_activity(hdd_ctx->psoc, hdd_ctx->bt_a2dp_active);
+	ucfg_mlme_set_bt_profile_con(hdd_ctx->psoc, hdd_ctx->bt_profile_con);
 	hdd_debug("a2dp_active: %d vo_active: %d connected:%d",
 		  hdd_ctx->bt_a2dp_active,
 		  hdd_ctx->bt_vo_active, hdd_ctx->bt_profile_con);

core/hdd/src/wlan_hdd_cm_connect.c

@@ -894,8 +894,6 @@ int wlan_hdd_cm_connect(struct wiphy *wiphy,
 	hdd_update_scan_ie_for_connect(adapter, &params);
 	hdd_update_action_oui_for_connect(hdd_ctx, req);
 
-	wlan_hdd_connectivity_event_connecting(hdd_ctx, req,
-					       adapter->deflink->vdev_id);
 	status = osif_cm_connect(ndev, vdev, req, &params);
 
 	if (status || ucfg_cm_is_vdev_roaming(vdev)) {

core/hdd/src/wlan_hdd_connectivity_logging.c

@@ -1299,59 +1299,10 @@ void wlan_hdd_start_connectivity_logging(struct hdd_context *hdd_ctx)
 #endif
 
 #ifdef CONNECTIVITY_DIAG_EVENT
-void wlan_hdd_connectivity_event_connecting(struct hdd_context *hdd_ctx,
-					    struct cfg80211_connect_params *req,
-					    uint8_t vdev_id)
-{
-	WLAN_HOST_DIAG_EVENT_DEF(wlan_diag_event, struct wlan_diag_connect);
-
-	qdf_mem_zero(&wlan_diag_event, sizeof(struct wlan_diag_connect));
-
-	if (wlan_get_opmode_from_vdev_id(hdd_ctx->pdev, vdev_id) !=
-	    QDF_STA_MODE)
-		return;
-
-	wlan_diag_event.diag_cmn.timestamp_us = qdf_get_time_of_the_day_us();
-	wlan_diag_event.diag_cmn.ktime_us = qdf_ktime_to_us(qdf_ktime_get());
-	wlan_diag_event.diag_cmn.vdev_id = vdev_id;
-	wlan_diag_event.subtype = WLAN_CONN_DIAG_CONNECTING_EVENT;
-
-	wlan_diag_event.version = DIAG_CONN_VERSION;
-	wlan_diag_event.ssid_len = req->ssid_len;
-	if (req->ssid_len > WLAN_SSID_MAX_LEN)
-		wlan_diag_event.ssid_len = WLAN_SSID_MAX_LEN;
-	qdf_mem_copy(wlan_diag_event.ssid, req->ssid,
-		     wlan_diag_event.ssid_len);
-
-	if (req->bssid)
-		qdf_mem_copy(wlan_diag_event.diag_cmn.bssid, req->bssid,
-			     QDF_MAC_ADDR_SIZE);
-	else if (req->bssid_hint)
-		qdf_mem_copy(wlan_diag_event.bssid_hint, req->bssid_hint,
-			     QDF_MAC_ADDR_SIZE);
-
-	if (req->channel)
-		wlan_diag_event.freq = req->channel->center_freq;
-
-	if (req->channel_hint)
-		wlan_diag_event.freq_hint = req->channel_hint->center_freq;
-
-	wlan_diag_event.pairwise_cipher = req->crypto.ciphers_pairwise[0];
-	wlan_diag_event.grp_cipher = req->crypto.cipher_group;
-	wlan_diag_event.akm = req->crypto.akm_suites[0];
-	wlan_diag_event.auth_algo = req->auth_type;
-	if (hdd_ctx->bt_profile_con)
-		wlan_diag_event.bt_coex = true;
-
-	WLAN_HOST_DIAG_EVENT_REPORT(&wlan_diag_event, EVENT_WLAN_CONN);
-}
-
 void
 wlan_hdd_connectivity_fail_event(struct wlan_objmgr_vdev *vdev,
 				 struct wlan_cm_connect_resp *rsp)
 {
-	uint8_t op_mode;
-
 	WLAN_HOST_DIAG_EVENT_DEF(wlan_diag_event, struct wlan_diag_connect);
 
 	qdf_mem_zero(&wlan_diag_event, sizeof(struct wlan_diag_connect));
@@ -1360,9 +1311,6 @@ wlan_hdd_connectivity_fail_event(struct wlan_objmgr_vdev *vdev,
 		return;
 
 	wlan_diag_event.diag_cmn.vdev_id = wlan_vdev_get_id(vdev);
-	op_mode = wlan_vdev_mlme_get_opmode(vdev);
-	if (op_mode != QDF_STA_MODE)
-		return;
 
 	wlan_diag_event.diag_cmn.timestamp_us = qdf_get_time_of_the_day_us();
 	wlan_diag_event.diag_cmn.ktime_us = qdf_ktime_to_us(qdf_ktime_get());