qcacld-3.0: Add PM_SCC_ON_5_CH_5G pcl type support

Add PM_SCC_ON_5_CH_5G pcl type to give priority
to SCC 5G followed by rest 5G channels for next
connection.

Change-Id: Ibff48dcd145368d967fb9f39c0118f94897a72a4
CRs-Fixed: 3170031

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -133,6 +133,7 @@ static inline const char *pcl_type_to_string(uint32_t idx)
 	CASE_RETURN_STRING(PM_SCC_CH_5G);
 	CASE_RETURN_STRING(PM_24G_SCC_CH);
 	CASE_RETURN_STRING(PM_5G_SCC_CH);
+	CASE_RETURN_STRING(PM_SCC_ON_5_CH_5G);
 	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);

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h

@@ -302,6 +302,7 @@ enum policy_mgr_mac_use {
  * @PM_SCC_CH_5G: SCC channel & 5 Ghz channels
  * @PM_24G_SCC_CH: 2.4 Ghz channels & SCC channel
  * @PM_5G_SCC_CH: 5 Ghz channels & SCC channel
+ * @PM_SCC_ON_5_CH_5G: 5 Ghz SCC channel & 5 Ghz channels
  * @PM_SCC_ON_5_SCC_ON_24_24G: SCC channel on 5 Ghz, SCC
  *	channel on 2.4 Ghz & 2.4 Ghz channels
  * @PM_SCC_ON_5_SCC_ON_24_5G: SCC channel on 5 Ghz, SCC channel
@@ -343,6 +344,7 @@ enum policy_mgr_pcl_type {
 	PM_SCC_CH_5G,
 	PM_24G_SCC_CH,
 	PM_5G_SCC_CH,
+	PM_SCC_ON_5_CH_5G,
 	PM_SCC_ON_5_SCC_ON_24_24G,
 	PM_SCC_ON_5_SCC_ON_24_5G,
 	PM_SCC_ON_5_5G_24G,

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -2973,6 +2973,20 @@ 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_CH_5G:
+		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);
+		status = QDF_STATUS_SUCCESS;
+		break;
 	case PM_SCC_ON_5_SCC_ON_24_24G:
 		policy_mgr_get_connection_channels(
 					psoc, mode,

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -2906,6 +2906,7 @@ bool policy_mgr_is_3rd_conn_on_same_band_allowed(struct wlan_objmgr_psoc *psoc,
 	case PM_SCC_CH_5G:
 	case PM_24G_SCC_CH:
 	case PM_5G_SCC_CH:
+	case PM_SCC_ON_5_CH_5G:
 	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:

core/hdd/src/wlan_hdd_conc_ut.c

@@ -654,6 +654,24 @@ static bool wlan_hdd_validate_pcl(struct hdd_context *hdd_ctx,
 			return false;
 		}
 		break;
+	case PM_SCC_ON_5_CH_5G:
+		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 scc chnl");
+			return false;
+		}
+		if (!WLAN_REG_IS_5GHZ_CH_FREQ(
+				pcl_freqs[pcl_len - 1]) &&
+		    !WLAN_REG_IS_6GHZ_CHAN_FREQ(
+				pcl_freqs[pcl_len - 1])) {
+			snprintf(reason, reason_length,
+				 "No 5Ghz chnl");
+			return false;
+		}
+		break;
 	case PM_SCC_ON_5_SCC_ON_24_24G:
 		if ((!WLAN_REG_IS_5GHZ_CH_FREQ(pcl_freqs[0]) &&
 		     !WLAN_REG_IS_6GHZ_CHAN_FREQ(pcl_freqs[0])) ||