qcacld-3.0: Add Handling for new pcl type

Add handling for below pcl types which are added
due to ML STA and 2 P2P connection concurrencies.
PM_SCC_ON_5_5G_24G
PM_SCC_ON_5_5G_SCC_ON_24G
PM_SBS_CH_2G

Change-Id: I62df80c15bcd84ba9cb64cbf6ce2e4d154f6f697
CRs-Fixed: 3167325

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -135,6 +135,8 @@ static inline const char *pcl_type_to_string(uint32_t idx)
 	CASE_RETURN_STRING(PM_5G_SCC_CH);
 	CASE_RETURN_STRING(PM_SCC_ON_5_SCC_ON_24_24G);
 	CASE_RETURN_STRING(PM_SCC_ON_5_SCC_ON_24_5G);
+	CASE_RETURN_STRING(PM_SCC_ON_5_5G_24G);
+	CASE_RETURN_STRING(PM_SCC_ON_5_5G_SCC_ON_24G);
 	CASE_RETURN_STRING(PM_SCC_ON_24_SCC_ON_5_24G);
 	CASE_RETURN_STRING(PM_SCC_ON_24_SCC_ON_5_5G);
 	CASE_RETURN_STRING(PM_SCC_ON_5_SCC_ON_24);
@@ -154,6 +156,7 @@ static inline const char *pcl_type_to_string(uint32_t idx)
 	CASE_RETURN_STRING(PM_SCC_CH_SBS_CH_24G);
 	CASE_RETURN_STRING(PM_SBS_CH_SCC_CH_5G_24G);
 	CASE_RETURN_STRING(PM_SCC_CH_MCC_CH_SBS_CH_24G);
+	CASE_RETURN_STRING(PM_SBS_CH_2G);
 	default:
 		return "Unknown";
 	}

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h

@@ -172,6 +172,8 @@ enum policy_mgr_pcl_group_id {
  * @POLICY_MGR_PCL_ORDER_NONE: no order
  * @POLICY_MGR_PCL_ORDER_24G_THEN_5G: 2.4 Ghz channel followed by 5 Ghz channel
  * @POLICY_MGR_PCL_ORDER_5G_THEN_2G: 5 Ghz channel followed by 2.4 Ghz channel
+ * @POLICY_MGR_PCL_ORDER_2G: 2G channels
+ * @POLICY_MGR_PCL_ORDER_5G: 5G channels
  *
  * Order in which the PCL is requested
  */
@@ -179,6 +181,8 @@ enum policy_mgr_pcl_channel_order {
 	POLICY_MGR_PCL_ORDER_NONE,
 	POLICY_MGR_PCL_ORDER_24G_THEN_5G,
 	POLICY_MGR_PCL_ORDER_5G_THEN_2G,
+	POLICY_MGR_PCL_ORDER_2G,
+	POLICY_MGR_PCL_ORDER_5G,
 };
 
 /**

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -2470,6 +2470,47 @@ policy_mgr_get_connection_channels(struct wlan_objmgr_psoc *psoc,
 				conn_index++;
 			}
 		}
+	} else if (order == POLICY_MGR_PCL_ORDER_2G) {
+		while (PM_CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) {
+			if (WLAN_REG_IS_24GHZ_CH_FREQ(cl[conn_index].freq) &&
+			    idx < pcl_sz) {
+				pcl_freqs[idx] = cl[conn_index++].freq;
+				pcl_weights[idx] = weight1;
+				idx++;
+
+			} else {
+				conn_index++;
+			}
+		}
+	} else if (order == POLICY_MGR_PCL_ORDER_5G) {
+		while (PM_CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) {
+			if (skip_dfs_channel &&
+			    wlan_reg_is_dfs_for_freq(pm_ctx->pdev,
+						     cl[conn_index].freq)) {
+				conn_index++;
+			} else if (WLAN_REG_IS_5GHZ_CH_FREQ(
+					cl[conn_index].freq) &&
+				   (idx < pcl_sz)) {
+				pcl_freqs[idx] = cl[conn_index++].freq;
+				pcl_weights[idx] = weight1;
+				idx++;
+			} else {
+				conn_index++;
+			}
+		}
+		conn_index = 0;
+		while (add_6ghz &&
+		       PM_CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) {
+			bool is_6ghz_ch = WLAN_REG_IS_6GHZ_CHAN_FREQ(
+				cl[conn_index].freq);
+			if (is_6ghz_ch && idx < pcl_sz) {
+				pcl_freqs[idx] = cl[conn_index++].freq;
+				pcl_weights[idx] = weight1;
+				idx++;
+			} else {
+				conn_index++;
+			}
+		}
 	} else {
 		policy_mgr_err("unknown order %d", order);
 		status = QDF_STATUS_E_FAILURE;
@@ -2958,6 +2999,44 @@ QDF_STATUS policy_mgr_get_channel_list(struct wlan_objmgr_psoc *psoc,
 					 channel_list_6, chan_index_6);
 		status = QDF_STATUS_SUCCESS;
 		break;
+	case PM_SCC_ON_5_5G_24G:
+		policy_mgr_get_connection_channels(psoc, mode,
+						   POLICY_MGR_PCL_ORDER_5G,
+						   skip_dfs_channel,
+						   POLICY_MGR_PCL_GROUP_ID1_ID2,
+						   pcl_channels, pcl_weights,
+						   pcl_sz, len);
+		policy_mgr_add_5g_to_pcl(psoc, pcl_channels, pcl_weights,
+					 pcl_sz, len,
+					 POLICY_MGR_PCL_GROUP_ID2_ID3,
+					 channel_list_5, chan_index_5,
+					 channel_list_6, chan_index_6);
+		policy_mgr_add_24g_to_pcl(pcl_channels, pcl_weights, pcl_sz,
+					  len, WEIGHT_OF_GROUP3_PCL_CHANNELS,
+					  channel_list_24, chan_index_24);
+		status = QDF_STATUS_SUCCESS;
+		break;
+	case PM_SCC_ON_5_5G_SCC_ON_24G:
+		policy_mgr_get_connection_channels(psoc, mode,
+						   POLICY_MGR_PCL_ORDER_5G,
+						   skip_dfs_channel,
+						   POLICY_MGR_PCL_GROUP_ID1_ID2,
+						   pcl_channels, pcl_weights,
+						   pcl_sz, len);
+		policy_mgr_add_5g_to_pcl(psoc, pcl_channels, pcl_weights,
+					 pcl_sz, len,
+					 POLICY_MGR_PCL_GROUP_ID2_ID3,
+					 channel_list_5, chan_index_5,
+					 channel_list_6, chan_index_6);
+		policy_mgr_get_connection_channels(psoc, mode,
+						   POLICY_MGR_PCL_ORDER_2G,
+						   skip_dfs_channel,
+						   POLICY_MGR_PCL_GROUP_ID3_ID4,
+						   pcl_channels, pcl_weights,
+						   pcl_sz, len);
+		status = QDF_STATUS_SUCCESS;
+		break;
+
 	case PM_24G_SCC_CH_SBS_CH:
 		get_sub_channels(psoc,
 				 sbs_freqs, &sbs_num,
@@ -3208,6 +3287,31 @@ QDF_STATUS policy_mgr_get_channel_list(struct wlan_objmgr_psoc *psoc,
 				  false, false);
 		status = QDF_STATUS_SUCCESS;
 		break;
+	case PM_SBS_CH_2G:
+		get_sub_channels(psoc,
+				 sbs_freqs, &sbs_num,
+				 scc_freqs, &scc_num,
+				 rest_freqs, &rest_num,
+				 channel_list_5, chan_index_5,
+				 channel_list_6, chan_index_6);
+		add_chlist_to_pcl(pm_ctx->pdev,
+				  pcl_channels, pcl_weights, pcl_sz,
+				  len, WEIGHT_OF_GROUP1_PCL_CHANNELS,
+				  sbs_freqs, sbs_num,
+				  skip_dfs_channel, skip_6ghz_channel);
+		if (!sbs_num)
+			add_chlist_to_pcl(pm_ctx->pdev,
+					  pcl_channels, pcl_weights, pcl_sz,
+					  len, WEIGHT_OF_GROUP1_PCL_CHANNELS,
+					  scc_freqs, scc_num,
+					  skip_dfs_channel, skip_6ghz_channel);
+		add_chlist_to_pcl(pm_ctx->pdev,
+				  pcl_channels, pcl_weights, pcl_sz,
+				  len, WEIGHT_OF_GROUP2_PCL_CHANNELS,
+				  channel_list_24, chan_index_24,
+				  false, false);
+		status = QDF_STATUS_SUCCESS;
+		break;
 	default:
 		policy_mgr_err("unknown pcl value %d", pcl);
 		break;

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -2908,6 +2908,8 @@ bool policy_mgr_is_3rd_conn_on_same_band_allowed(struct wlan_objmgr_psoc *psoc,
 	case PM_5G_SCC_CH:
 	case PM_SCC_ON_5_SCC_ON_24_24G:
 	case PM_SCC_ON_5_SCC_ON_24_5G:
+	case PM_SCC_ON_5_5G_24G:
+	case PM_SCC_ON_5_5G_SCC_ON_24G:
 	case PM_SCC_ON_24_SCC_ON_5_24G:
 	case PM_SCC_ON_24_SCC_ON_5_5G:
 	case PM_SCC_ON_5_SCC_ON_24:
@@ -2925,6 +2927,7 @@ bool policy_mgr_is_3rd_conn_on_same_band_allowed(struct wlan_objmgr_psoc *psoc,
 	case PM_24G_MCC_CH:
 	case PM_5G_MCC_CH:
 	case PM_24G_SBS_CH_MCC_CH:
+	case PM_SBS_CH_2G:
 		ret = true;
 		break;
 	default:

core/hdd/src/wlan_hdd_conc_ut.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -277,14 +278,14 @@ static void _validate_scc(bool *status, uint32_t *first_idx,
 	if (second_connection_chnl) {
 		if (*first_idx >= pcl_len) {
 			snprintf(reason, reason_length,
-				 "no 2rd scc ch");
+				 "no 2nd scc ch");
 			*status = false;
 			return;
 		}
 		if (pcl_freqs[*first_idx] != first_connection_chnl &&
 		    pcl_freqs[*first_idx] != second_connection_chnl) {
 			snprintf(reason, reason_length,
-				 "2rd scc ch is not correct %d expect %d %d",
+				 "2nd scc ch is not correct %d expect %d %d",
 				 pcl_freqs[*first_idx],
 				 first_connection_chnl,
 				 second_connection_chnl);
@@ -698,6 +699,53 @@ static bool wlan_hdd_validate_pcl(struct hdd_context *hdd_ctx,
 			return false;
 		}
 		break;
+	case PM_SCC_ON_5_5G_24G:
+		if ((!WLAN_REG_IS_5GHZ_CH_FREQ(pcl_freqs[0]) &&
+		     !WLAN_REG_IS_6GHZ_CHAN_FREQ(pcl_freqs[0])) ||
+			(pcl_freqs[0] != first_connection_chnl &&
+			 pcl_freqs[0] != second_connection_chnl)) {
+			snprintf(reason, reason_length,
+				 "No 5Ghz chnl/scc");
+			return false;
+		}
+		if (!WLAN_REG_IS_5GHZ_CH_FREQ(
+			pcl_freqs[pcl_len - (NUM_24GHZ_CHANNELS - 1)]) &&
+		    !WLAN_REG_IS_6GHZ_CHAN_FREQ(
+			pcl_freqs[pcl_len - (NUM_24GHZ_CHANNELS - 1)])) {
+			snprintf(reason, reason_length,
+				 "No 5Ghz chnls");
+			return false;
+		}
+		if (!WLAN_REG_IS_24GHZ_CH_FREQ(pcl_freqs[pcl_len - 1])) {
+			snprintf(reason, reason_length,
+				 "No 24Ghz chnls");
+			return false;
+		}
+		break;
+	case PM_SCC_ON_5_5G_SCC_ON_24G:
+		if ((!WLAN_REG_IS_5GHZ_CH_FREQ(pcl_freqs[0]) &&
+		     !WLAN_REG_IS_6GHZ_CHAN_FREQ(pcl_freqs[0])) ||
+			(pcl_freqs[0] != first_connection_chnl &&
+			 pcl_freqs[0] != second_connection_chnl)) {
+			snprintf(reason, reason_length,
+				 "No 5Ghz chnl/scc");
+			return false;
+		}
+		if (!WLAN_REG_IS_5GHZ_CH_FREQ(
+				pcl_freqs[pcl_len - 2]) &&
+		    !WLAN_REG_IS_6GHZ_CHAN_FREQ(
+				pcl_freqs[pcl_len - 2])) {
+			snprintf(reason, reason_length,
+				 "No 5Ghz chnls");
+			return false;
+		}
+		if (!WLAN_REG_IS_24GHZ_CH_FREQ(pcl_freqs[pcl_len - 1]) ||
+		    (pcl_freqs[1] != first_connection_chnl &&
+		     pcl_freqs[1] != second_connection_chnl)) {
+			snprintf(reason, reason_length,
+				 "No 24Ghz chnl/scc");
+			return false;
+		}
 	case PM_SCC_ON_24_SCC_ON_5_24G:
 		if (!WLAN_REG_IS_24GHZ_CH_FREQ(pcl_freqs[0]) ||
 			(pcl_freqs[0] != first_connection_chnl &&
@@ -846,6 +894,10 @@ static bool wlan_hdd_validate_pcl(struct hdd_context *hdd_ctx,
 		validate_24g;
 		validate_end;
 		break;
+	case PM_SBS_CH_2G:
+		validate_sbs;
+		validate_24g;
+		validate_end;
 	default:
 		snprintf(reason, reason_length,
 			"Unknown option");