qcacld-3.0: Use source CM_ROAMING_USER for user REASSOC request

Currently, host driver uses CM_ROAMING_HOST for ROAM_INVOKE for
both host initiated(e.g. connect on connect, qos,..) and user
initiated requests(e.g. REASSOC ioctl).
The expectations are different for these cases upon ROAM_INVOKE
failure as explained below,
1. connect-on-connect/FASTREASSOC case: Expectation upon
   ROAM_INVOKE failure is to disconnect from current AP as this
   status needs to be sent to kernel.
2. REASSOC ioctl: Expectation upon ROAM_INVOKE failure is to stay
   connected to the current AP.

So, define a new source CM_ROAMING_USER for REASSOC and use it to
differentiate from CM_ROAMING_HOST to avoid disconnection.

Also, pass right cm_id to WLAN_CM_SM_EV_ROAM_INVOKE_FAIL to
gracefully remove the ROAM command from SER queue.

Change-Id: I0d48d4773c659e667d87c9583ce6530543998e19
CRs-Fixed: 3621341

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c

@@ -1382,6 +1382,7 @@ QDF_STATUS cm_fw_roam_invoke_fail(struct wlan_objmgr_psoc *psoc,
 	struct wlan_objmgr_vdev *vdev;
 	wlan_cm_id cm_id = CM_ID_INVALID;
 	struct cnx_mgr *cm_ctx;
+	struct cm_roam_req *roam_req = NULL;
 
 	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
 						    vdev_id,
@@ -1397,6 +1398,10 @@ QDF_STATUS cm_fw_roam_invoke_fail(struct wlan_objmgr_psoc *psoc,
 		goto error;
 	}
 
+	roam_req = cm_get_first_roam_command(vdev);
+	if (roam_req)
+		cm_id = roam_req->cm_id;
+
 	status = cm_sm_deliver_event(vdev, WLAN_CM_SM_EV_ROAM_INVOKE_FAIL,
 				     sizeof(wlan_cm_id), &cm_id);
 	if (QDF_IS_STATUS_ERROR(status))

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c

@@ -5897,7 +5897,7 @@ QDF_STATUS cm_start_roam_invoke(struct wlan_objmgr_psoc *psoc,
 		}
 
 		cm_req->roam_req.req.forced_roaming = true;
-		if (source == CM_ROAMING_HOST)
+		if (source == CM_ROAMING_HOST || source == CM_ROAMING_USER)
 			rso_cfg->is_forced_roaming = true;
 		source = CM_ROAMING_NUD_FAILURE;
 		goto send_evt;
@@ -5936,7 +5936,8 @@ send_evt:
 	 */
 	if (source == CM_ROAMING_HOST ||
 	    source == CM_ROAMING_NUD_FAILURE ||
-	    source == CM_ROAMING_LINK_REMOVAL)
+	    source == CM_ROAMING_LINK_REMOVAL ||
+	    source == CM_ROAMING_USER)
 		rso_cfg->roam_invoke_source = source;
 
 	cm_req->roam_req.req.vdev_id = vdev_id;

components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

@@ -1710,6 +1710,9 @@ wlan_cm_roam_invoke(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
 		return QDF_STATUS_E_NULL_VALUE;
 	}
 
+	mlme_debug("vdev: %d source: %d freq: %d bssid: " QDF_MAC_ADDR_FMT,
+		   vdev_id, source, chan_freq, QDF_MAC_ADDR_REF(bssid->bytes));
+
 	status = cm_start_roam_invoke(psoc, vdev, bssid, chan_freq, source);
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);
 

core/hdd/src/wlan_hdd_ioctl.c

@@ -589,7 +589,7 @@ static int hdd_parse_reassoc_v1(struct hdd_adapter *adapter, const char *command
 	status = ucfg_wlan_cm_roam_invoke(hdd_ctx->pdev,
 					  adapter->deflink->vdev_id,
 					  &target_bssid, freq,
-					  CM_ROAMING_HOST);
+					  CM_ROAMING_USER);
 	return qdf_status_to_os_return(status);
 }
 
@@ -645,7 +645,7 @@ static int hdd_parse_reassoc_v2(struct hdd_adapter *adapter,
 		status = ucfg_wlan_cm_roam_invoke(hdd_ctx->pdev,
 						  adapter->deflink->vdev_id,
 						  &target_bssid, freq,
-						  CM_ROAMING_HOST);
+						  CM_ROAMING_USER);
 		ret = qdf_status_to_os_return(status);
 	}
 
@@ -4414,6 +4414,30 @@ exit:
 	return ret;
 }
 
+/**
+ * drv_cmd_fast_reassoc() - Handler for FASTREASSOC driver command
+ * @link_info: Carries link specific info, which contains adapter
+ * @hdd_ctx: pointer to hdd context
+ * @command: Buffer that carries actual command data, which can be parsed by
+ *           hdd_parse_reassoc_command_v1_data()
+ * @command_len: Command length
+ * @priv_data: to carry any priv data, FASTREASSOC doesn't have any priv
+ *             data for now.
+ *
+ * This function parses the reasoc command data passed in the format
+ * FASTREASSOC<space><bssid><space><channel/frequency>
+ *
+ * If MAC from user space is broadcast MAC as:
+ * "wpa_cli DRIVER FASTREASSOC ff:ff:ff:ff:ff:ff 0",
+ * user space invoked roaming candidate selection will base on firmware score
+ * algorithm, current connection will be kept if current AP has highest
+ * score. It is requirement from customer which can avoid ping-pong roaming.
+ *
+ * If firmware fails to roam to new AP due to any reason, host to disconnect
+ * from current AP as it's unable to roam.
+ *
+ * Return: 0 for success non-zero for failure
+ */
 static int drv_cmd_fast_reassoc(struct wlan_hdd_link_info *link_info,
 				struct hdd_context *hdd_ctx,
 				uint8_t *command,

core/hdd/src/wlan_hdd_sysfs_reassoc.c

@@ -56,7 +56,7 @@ __wlan_hdd_store_reassoc_sysfs(struct net_device *net_dev, char const *buf,
 				    &target_bssid);
 	hdd_debug("reassoc: net_devname %s", net_dev->name);
 	ucfg_wlan_cm_roam_invoke(hdd_ctx->pdev, adapter->deflink->vdev_id,
-				 &target_bssid, operating_ch, CM_ROAMING_HOST);
+				 &target_bssid, operating_ch, CM_ROAMING_USER);
 
 	return count;
 }

core/hdd/src/wlan_hdd_wext.c

@@ -6549,7 +6549,7 @@ static int __iw_setnone_getnone(struct net_device *dev,
 		ucfg_wlan_cm_roam_invoke(hdd_ctx->pdev,
 					 adapter->deflink->vdev_id,
 					 &target_bssid, chan_freq,
-					 CM_ROAMING_HOST);
+					 CM_ROAMING_USER);
 		return 0;
 	}