qcacld-3.0: Update policy mgr device mode conversion API

Currently policy mgr api policy_mgr_convert_device_mode_to_qdf_type
accepts only QDF_OPMODE as an argument and converts it to
policy_mgr_con_mode. Also, name of this api does not reflect
the task this is doing.
With the new SAP mode for low latency low throughput SAP,
to convert the QDF_OPMODE to policy_mgr_con_mode, host driver
needs to know if it is ll_lt_sap or normal sap. To get this
information, update policy_mgr_convert_device_mode_to_qdf_type
api to accept the psoc and vdev id as parameters. Also, rename
this api to reflect the task this api is doing.

Change-Id: Idcf1321038ba4852d2aa3d8157b558423a738765
CRs-Fixed: 3524247

components/cmn_services/interface_mgr/src/wlan_if_mgr_roam.c

@@ -879,7 +879,8 @@ QDF_STATUS if_mgr_validate_candidate(struct wlan_objmgr_vdev *vdev,
 	 * If concurrency enabled take the concurrent connected channel first.
 	 * Valid multichannel concurrent sessions exempted
 	 */
-	mode = policy_mgr_convert_device_mode_to_qdf_type(op_mode);
+	mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc, op_mode,
+						    wlan_vdev_get_id(vdev));
 
 	/* If concurrency is not allowed select next bss */
 	conc_ext_flags = if_mgr_get_conc_ext_flags(vdev, candidate_info);

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -1939,17 +1939,21 @@ struct policy_mgr_conc_connection_info *policy_mgr_get_conn_info(
 		uint32_t *len);
 
 /**
- * policy_mgr_convert_device_mode_to_qdf_type() - provides the
- * type translation from HDD to policy manager type
+ * policy_mgr_qdf_opmode_to_pm_con_mode() - provides the
+ * type translation from QDF to policy manager type
+ * @psoc: psoc
  * @device_mode: Generic connection mode type
+ * @vdev_id: Vdev id
  *
  *
  * This function provides the type translation
  *
  * Return: policy_mgr_con_mode enum
  */
-enum policy_mgr_con_mode policy_mgr_convert_device_mode_to_qdf_type(
-		enum QDF_OPMODE device_mode);
+enum policy_mgr_con_mode
+policy_mgr_qdf_opmode_to_pm_con_mode(struct wlan_objmgr_psoc *psoc,
+				     enum QDF_OPMODE device_mode,
+				     uint8_t vdev_id);
 
 /**
  * policy_mgr_get_qdf_mode_from_pm - provides the

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -692,8 +692,10 @@ policy_mgr_get_preferred_dbs_action_table(
 			new_conn_op_mode = pm_ctx->hdd_cbacks.
 					hdd_get_device_mode(vdev_id);
 
-		new_conn_mode = policy_mgr_convert_device_mode_to_qdf_type(
-			new_conn_op_mode);
+		new_conn_mode =
+			policy_mgr_qdf_opmode_to_pm_con_mode(psoc,
+							     new_conn_op_mode,
+							     vdev_id);
 		if (new_conn_mode == PM_MAX_NUM_OF_MODE)
 			policy_mgr_debug("new vdev %d op_mode %d freq %d reason %d: not prioritized",
 					 vdev_id, new_conn_op_mode,
@@ -1497,7 +1499,7 @@ policy_mgr_con_mode_by_vdev_id(struct wlan_objmgr_psoc *psoc,
 	}
 
 	op_mode = wlan_get_opmode_vdev_id(pm_ctx->pdev, vdev_id);
-	return policy_mgr_convert_device_mode_to_qdf_type(op_mode);
+	return policy_mgr_qdf_opmode_to_pm_con_mode(psoc, op_mode, vdev_id);
 }
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
@@ -2273,6 +2275,7 @@ policy_mgr_handle_sap_plus_go_force_scc(struct wlan_objmgr_psoc *psoc)
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	struct sta_ap_intf_check_work_ctx *work_info;
 	struct ch_params ch_params = {0};
+	enum QDF_OPMODE opmode;
 
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {
@@ -2290,8 +2293,9 @@ policy_mgr_handle_sap_plus_go_force_scc(struct wlan_objmgr_psoc *psoc)
 
 	vdev_id = work_info->sap_plus_go_force_scc.initiator_vdev_id;
 	chan_freq = wlan_get_operation_chan_freq_vdev_id(pm_ctx->pdev, vdev_id);
-	vdev_con_mode = policy_mgr_convert_device_mode_to_qdf_type(
-			wlan_get_opmode_vdev_id(pm_ctx->pdev, vdev_id));
+	opmode = wlan_get_opmode_vdev_id(pm_ctx->pdev, vdev_id);
+	vdev_con_mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc, opmode,
+							     vdev_id);
 
 	existing_vdev_id =
 		policy_mgr_fetch_existing_con_info(
@@ -2385,6 +2389,7 @@ policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
 	uint8_t vdev_id;
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	struct sta_ap_intf_check_work_ctx *work_info;
+	enum QDF_OPMODE opmode;
 
 	if (reason_code != CSA_REASON_GO_BSS_STARTED &&
 	    reason_code != CSA_REASON_USER_INITIATED)
@@ -2400,6 +2405,7 @@ policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
 		return QDF_STATUS_E_INVAL;
 	}
 	vdev_id = wlan_vdev_get_id(vdev);
+	opmode = wlan_vdev_mlme_get_opmode(vdev);
 	work_info = pm_ctx->sta_ap_intf_check_work_info;
 	if (!work_info) {
 		policy_mgr_err("invalid work info");
@@ -2407,8 +2413,8 @@ policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
 	}
 
 	chan_freq = wlan_get_operation_chan_freq(vdev);
-	vdev_con_mode = policy_mgr_convert_device_mode_to_qdf_type(
-			wlan_vdev_mlme_get_opmode(vdev));
+	vdev_con_mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc, opmode,
+							     vdev_id);
 
 	existing_vdev_id =
 		policy_mgr_fetch_existing_con_info(psoc,

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -4010,7 +4010,7 @@ policy_mgr_get_pref_force_scc_freq(struct wlan_objmgr_psoc *psoc,
 		sbs_ml_sta_present = true;
 
 	op_mode = wlan_get_opmode_vdev_id(pm_ctx->pdev, vdev_id);
-	mode = policy_mgr_convert_device_mode_to_qdf_type(op_mode);
+	mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc, op_mode, vdev_id);
 
 	qdf_mem_zero(&pcl, sizeof(pcl));
 	status = policy_mgr_get_pcl(psoc, mode, pcl.pcl_list, &pcl.pcl_len,

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -3980,7 +3980,8 @@ policy_mgr_add_to_disabled_links(struct policy_mgr_psoc_priv_obj *pm_ctx,
 	int i;
 	enum policy_mgr_con_mode pm_mode;
 
-	pm_mode = policy_mgr_convert_device_mode_to_qdf_type(mode);
+	pm_mode = policy_mgr_qdf_opmode_to_pm_con_mode(pm_ctx->psoc, mode,
+						       vdev_id);
 
 	qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
 	for (i = 0; i < MAX_NUMBER_OF_DISABLE_LINK; i++) {
@@ -4869,11 +4870,13 @@ QDF_STATUS policy_mgr_decr_active_session(struct wlan_objmgr_psoc *psoc,
 	}
 
 	qdf_status = policy_mgr_check_conn_with_mode_and_vdev_id(psoc,
-			policy_mgr_convert_device_mode_to_qdf_type(mode),
+			policy_mgr_qdf_opmode_to_pm_con_mode(psoc, mode,
+							     session_id),
 			session_id);
 	if (QDF_IS_STATUS_ERROR(qdf_status)) {
 		policy_mgr_debug("No connection with mode:%d vdev_id:%d",
-			policy_mgr_convert_device_mode_to_qdf_type(mode),
+			policy_mgr_qdf_opmode_to_pm_con_mode(psoc, mode,
+							     session_id),
 			session_id);
 		/*
 		 * In case of disconnect try delete the link from disabled link
@@ -8950,10 +8953,13 @@ struct policy_mgr_conc_connection_info *policy_mgr_get_conn_info(uint32_t *len)
 	return conn_ptr;
 }
 
-enum policy_mgr_con_mode policy_mgr_convert_device_mode_to_qdf_type(
-			enum QDF_OPMODE device_mode)
+enum policy_mgr_con_mode
+policy_mgr_qdf_opmode_to_pm_con_mode(struct wlan_objmgr_psoc *psoc,
+				     enum QDF_OPMODE device_mode,
+				     uint8_t vdev_id)
 {
 	enum policy_mgr_con_mode mode = PM_MAX_NUM_OF_MODE;
+
 	switch (device_mode) {
 	case QDF_STA_MODE:
 		mode = PM_STA_MODE;
@@ -8965,7 +8971,12 @@ enum policy_mgr_con_mode policy_mgr_convert_device_mode_to_qdf_type(
 		mode = PM_P2P_GO_MODE;
 		break;
 	case QDF_SAP_MODE:
-		mode = PM_SAP_MODE;
+#ifdef WLAN_FEATURE_LL_LT_SAP
+		if (policy_mgr_is_vdev_ll_lt_sap(psoc, vdev_id))
+			mode = PM_LL_LT_SAP_MODE;
+		else
+#endif
+			mode = PM_SAP_MODE;
 		break;
 	case QDF_NAN_DISC_MODE:
 		mode = PM_NAN_DISC_MODE;
@@ -11116,8 +11127,8 @@ bool policy_mgr_is_ap_ap_mcc_allow(struct wlan_objmgr_psoc *psoc,
 	*con_vdev_id = vdev_id[i];
 
 	mode = wlan_vdev_mlme_get_opmode(vdev);
-	con_mode = policy_mgr_convert_device_mode_to_qdf_type(mode);
-
+	con_mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc, mode,
+							wlan_vdev_get_id(vdev));
 	/*
 	 * For 3Vif concurrency we only support SCC in same MAC
 	 * in below combination:

components/tdls/core/src/wlan_tdls_cmds_process.c

@@ -2482,7 +2482,8 @@ QDF_STATUS tdls_process_antenna_switch(struct tdls_antenna_switch_request *req)
 
 	vdev_id = wlan_vdev_get_id(vdev);
 	opmode = wlan_vdev_mlme_get_opmode(vdev);
-	mode = policy_mgr_convert_device_mode_to_qdf_type(opmode);
+	mode = policy_mgr_qdf_opmode_to_pm_con_mode(wlan_vdev_get_psoc(vdev),
+						    opmode, vdev_id);
 	freq = policy_mgr_get_channel(soc_obj->soc,
 				      mode,
 				      &vdev_id);

components/tdls/core/src/wlan_tdls_peer.c

@@ -505,7 +505,8 @@ static void tdls_determine_channel_opclass(struct tdls_soc_priv_obj *soc_obj,
 	uint32_t vdev_id;
 	enum QDF_OPMODE opmode;
 	struct wlan_objmgr_pdev *pdev = NULL;
-
+	struct wlan_objmgr_psoc *psoc = NULL;
+	enum policy_mgr_con_mode mode;
 	/*
 	 * If tdls offchannel is not enabled then we provide base channel
 	 * and in that case pass opclass as 0 since opclass is mainly needed
@@ -517,10 +518,13 @@ static void tdls_determine_channel_opclass(struct tdls_soc_priv_obj *soc_obj,
 		vdev_id = wlan_vdev_get_id(vdev_obj->vdev);
 		opmode = wlan_vdev_mlme_get_opmode(vdev_obj->vdev);
 		pdev = wlan_vdev_get_pdev(vdev_obj->vdev);
+		psoc = wlan_pdev_get_psoc(pdev);
 
+		mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc, opmode,
+							    vdev_id);
 		*channel = wlan_reg_freq_to_chan(pdev, policy_mgr_get_channel(
 						 soc_obj->soc,
-						 policy_mgr_convert_device_mode_to_qdf_type(opmode),
+						 mode,
 						 &vdev_id));
 		*opclass = 0;
 	} else {

core/hdd/src/wlan_hdd_cfg80211.c

@@ -4004,7 +4004,9 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 	hdd_avoid_acs_channels(hdd_ctx, sap_config);
 
 	pm_mode =
-	      policy_mgr_convert_device_mode_to_qdf_type(adapter->device_mode);
+		policy_mgr_qdf_opmode_to_pm_con_mode(hdd_ctx->psoc,
+						     adapter->device_mode,
+						     adapter->deflink->vdev_id);
 
 	/* Remove passive/dfs acs channel for ll sap */
 	hdd_remove_passive_dfs_acs_channel_for_ll_sap(
@@ -8471,12 +8473,12 @@ static int wlan_hdd_handle_restrict_offchan_config(struct hdd_adapter *adapter,
 	if (!vdev)
 		return -EINVAL;
 	if (restrict_offchan == 1) {
+		u32 vdev_id = wlan_vdev_get_id(vdev);
 		enum policy_mgr_con_mode pmode =
-		policy_mgr_convert_device_mode_to_qdf_type(dev_mode);
+		policy_mgr_qdf_opmode_to_pm_con_mode(hdd_ctx->psoc, dev_mode,
+						     vdev_id);
 		uint32_t freq;
 
-		u32 vdev_id = wlan_vdev_get_id(vdev);
-
 		wlan_vdev_obj_lock(vdev);
 		wlan_vdev_mlme_cap_set(vdev, WLAN_VDEV_C_RESTRICT_OFFCHAN);
 		wlan_vdev_obj_unlock(vdev);

core/hdd/src/wlan_hdd_hostapd.c

@@ -3373,6 +3373,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_chan_freq,
 	bool capable, is_wps;
 	int32_t keymgmt;
 	struct wlan_hdd_link_info *link_info;
+	enum policy_mgr_con_mode pm_con_mode;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -3502,6 +3503,9 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_chan_freq,
 	ch_params.ch_width = target_bw;
 	target_bw = wlansap_get_csa_chanwidth_from_phymode(
 			sap_ctx, target_chan_freq, &ch_params);
+	pm_con_mode = policy_mgr_qdf_opmode_to_pm_con_mode(hdd_ctx->psoc,
+							   adapter->device_mode,
+							   link_info->vdev_id);
 	/*
 	 * Do SAP concurrency check to cover channel switch case as following:
 	 * There is already existing SAP+GO combination but due to upper layer
@@ -3514,14 +3518,11 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_chan_freq,
 	 * SAP2 will end up doing MCC which may not be desirable result. It
 	 * should will be prevented.
 	 */
-	if (!policy_mgr_allow_concurrency_csa(
-				hdd_ctx->psoc,
-				policy_mgr_convert_device_mode_to_qdf_type(
-					adapter->device_mode),
-				target_chan_freq, policy_mgr_get_bw(target_bw),
-				link_info->vdev_id,
-				forced,
-				sap_ctx->csa_reason)) {
+	if (!policy_mgr_allow_concurrency_csa(hdd_ctx->psoc, pm_con_mode,
+					      target_chan_freq,
+					      policy_mgr_get_bw(target_bw),
+					      link_info->vdev_id, forced,
+					      sap_ctx->csa_reason)) {
 		hdd_err("Channel switch failed due to concurrency check failure");
 		qdf_atomic_set(&ap_ctx->ch_switch_in_progress, 0);
 		return -EINVAL;
@@ -4029,7 +4030,7 @@ uint32_t hdd_get_ap_6ghz_capable(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)
 	struct sap_context *sap_context;
 	struct sap_config *sap_config;
 	uint32_t capable = 0;
-	enum policy_mgr_con_mode conn_mode;
+	enum policy_mgr_con_mode con_mode;
 
 	if (!psoc) {
 		hdd_err("PSOC is NULL");
@@ -4050,10 +4051,11 @@ uint32_t hdd_get_ap_6ghz_capable(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)
 	}
 
 	ap_adapter = link_info->adapter;
-	conn_mode = policy_mgr_convert_device_mode_to_qdf_type(
-			ap_adapter->device_mode);
-	if ((conn_mode != PM_SAP_MODE && conn_mode != PM_P2P_GO_MODE) ||
-	    !policy_mgr_is_6ghz_conc_mode_supported(psoc, conn_mode)) {
+	con_mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc,
+							ap_adapter->device_mode,
+							vdev_id);
+	if ((con_mode != PM_SAP_MODE && con_mode != PM_P2P_GO_MODE) ||
+	    !policy_mgr_is_6ghz_conc_mode_supported(psoc, con_mode)) {
 		hdd_err("unexpected device mode %d", ap_adapter->device_mode);
 		wlan_objmgr_vdev_release_ref(vdev, WLAN_HDD_ID_OBJ_MGR);
 		return 0;
@@ -6271,6 +6273,7 @@ int wlan_hdd_cfg80211_start_bss(struct wlan_hdd_link_info *link_info,
 	struct wlan_objmgr_vdev *vdev;
 	uint32_t user_config_freq = 0;
 	struct hdd_ap_ctx *ap_ctx;
+	enum policy_mgr_con_mode pm_con_mode;
 
 	hdd_enter();
 
@@ -6852,12 +6855,14 @@ int wlan_hdd_cfg80211_start_bss(struct wlan_hdd_link_info *link_info,
 		ret = 0;
 		goto free;
 	}
+	pm_con_mode = policy_mgr_qdf_opmode_to_pm_con_mode(hdd_ctx->psoc,
+							   adapter->device_mode,
+							   link_info->vdev_id);
 
 	if (check_for_concurrency) {
 		if (!policy_mgr_allow_concurrency(
 				hdd_ctx->psoc,
-				policy_mgr_convert_device_mode_to_qdf_type(
-					adapter->device_mode),
+				pm_con_mode,
 				config->chan_freq, HW_MODE_20_MHZ,
 				policy_mgr_get_conc_ext_flags(vdev, false),
 				link_info->vdev_id)) {
@@ -7794,8 +7799,10 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	intf_pm_mode = policy_mgr_convert_device_mode_to_qdf_type(
-							adapter->device_mode);
+	intf_pm_mode =
+		policy_mgr_qdf_opmode_to_pm_con_mode(hdd_ctx->psoc,
+						     adapter->device_mode,
+						     adapter->deflink->vdev_id);
 	status = policy_mgr_is_multi_sap_allowed_on_same_band(
 				hdd_ctx->pdev,
 				intf_pm_mode,

core/hdd/src/wlan_hdd_main.c

@@ -3834,7 +3834,9 @@ static enum policy_mgr_con_mode wlan_hdd_get_mode_for_non_connected_vdev(
 	}
 
 	adapter = link_info->adapter;
-	mode = policy_mgr_convert_device_mode_to_qdf_type(adapter->device_mode);
+	mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc,
+						    adapter->device_mode,
+						    vdev_id);
 	return mode;
 }
 
@@ -6810,13 +6812,15 @@ static void hdd_stop_last_active_connection(struct hdd_context *hdd_ctx,
 {
 	enum policy_mgr_con_mode mode;
 	struct wlan_objmgr_psoc *psoc;
+	enum QDF_OPMODE op_mode;
 
 	/* If this is the last active connection check
 	 * and stop the opportunistic timer.
 	 */
 	psoc = wlan_vdev_get_psoc(vdev);
-	mode = policy_mgr_convert_device_mode_to_qdf_type(
-					wlan_vdev_mlme_get_opmode(vdev));
+	op_mode = wlan_vdev_mlme_get_opmode(vdev);
+	mode = policy_mgr_qdf_opmode_to_pm_con_mode(psoc, op_mode,
+						    wlan_vdev_get_id(vdev));
 	if ((policy_mgr_get_connection_count(psoc) == 1 &&
 	     policy_mgr_mode_specific_connection_count(psoc,
 						       mode, NULL) == 1) ||

core/hdd/src/wlan_hdd_son.c

@@ -1898,7 +1898,9 @@ static QDF_STATUS hdd_son_init_acs_channels(struct hdd_adapter *adapter,
 	}
 
 	pm_mode =
-	      policy_mgr_convert_device_mode_to_qdf_type(adapter->device_mode);
+	      policy_mgr_qdf_opmode_to_pm_con_mode(hdd_ctx->psoc,
+						   adapter->device_mode,
+						   adapter->deflink->vdev_id);
 	/* convert channel to freq */
 	for (i = 0; i < num_channels; i++) {
 		acs_cfg->freq_list[i] = freq_list[i];

core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -1757,7 +1757,9 @@ static bool lim_is_csa_channel_allowed(struct mac_context *mac_ctx,
 		is_allowed =
 		policy_mgr_allow_concurrency_csa(
 			mac_ctx->psoc, ch_freq2,
-			policy_mgr_convert_device_mode_to_qdf_type(mode),
+			policy_mgr_qdf_opmode_to_pm_con_mode(mac_ctx->psoc,
+							     mode,
+							     session_entry->vdev_id),
 			session_entry->vdev_id,
 			policy_mgr_get_bw(new_ch_width), false,
 			CSA_REASON_UNKNOWN);