qcacld-3.0: Remove g_prefer_5g_scc_to_dbs

Remove g_prefer_5g_scc_to_dbs, and update PCL table
pm_second_connection_pcl_dbs_2x2_table.

For STA + GO concurrency if the second connection is GO,
perfer SCC to DBS, which makes GO get high throughput.

Change-Id: I0bf68662fc363a66c778904f9c12714407cd738a
CRs-Fixed: 2881383

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -36,6 +36,11 @@
 
 struct target_psoc_info;
 
+typedef const enum policy_mgr_pcl_type
+	pm_dbs_pcl_second_connection_table_type
+	[PM_MAX_ONE_CONNECTION_MODE][PM_MAX_NUM_OF_MODE]
+	[PM_MAX_CONC_PRIORITY_MODE];
+
 typedef const enum policy_mgr_pcl_type
 	pm_dbs_pcl_third_connection_table_type
 	[PM_MAX_TWO_CONNECTION_MODE][PM_MAX_NUM_OF_MODE]
@@ -3529,18 +3534,6 @@ uint32_t policy_mgr_get_mode_specific_conn_info(struct wlan_objmgr_psoc *psoc,
  */
 bool policy_mgr_is_sap_go_on_2g(struct wlan_objmgr_psoc *psoc);
 
-/**
- * policy_mgr_get_5g_scc_prefer() - Prefer 5G SCC
- * @psoc: psoc object
- * @mode: Connection Mode
- *
- * This function checks if 5G SCC is preferred.
- *
- * Return: True if 5G SCC is preferred
- */
-bool policy_mgr_get_5g_scc_prefer(
-	struct wlan_objmgr_psoc *psoc, enum policy_mgr_con_mode mode);
-
 /**
  * policy_mgr_dump_channel_list() - Print channel list
  * @len: Length of pcl list

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. 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
@@ -589,28 +589,6 @@ CFG_INI_UINT("g_enable_go_force_scc", 0, 1, 0, CFG_VALUE_OR_DEFAULT, \
 CFG_INI_UINT("g_pcl_band_priority", 0, 1, 0, CFG_VALUE_OR_DEFAULT, \
 	     "Set 5G and 6G Channel order")
 
-/*
- * <ini>
- * g_prefer_5g_scc_to_dbs - prefer 5g scc to dbs
- * @Min: 0
- * @Max: 0xFFFFFFFF
- * @Default: 0
- *
- * This ini is used to give higher priority for 5g scc than dbs.
- * It is bitmap per enum policy_mgr_con_mode.
- * For example in GO+STA(5G) mode, when TPUT is onfigured as wlan system
- * preference option, If 5G SCC needs higher priority than dbs, set it as 0x8.
- *
- * Supported Feature: P2P GO
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_PREFER_5G_SCC_TO_DBS \
-CFG_INI_UINT("g_prefer_5g_scc_to_dbs", 0, 0xFFFFFFFF, 0, CFG_VALUE_OR_DEFAULT, \
-	     "5G SCC has higher priority than DBS")
-
 #define CFG_POLICY_MGR_ALL \
 		CFG(CFG_MCC_TO_SCC_SWITCH) \
 		CFG(CFG_CONC_SYS_PREF) \
@@ -632,6 +610,5 @@ CFG_INI_UINT("g_prefer_5g_scc_to_dbs", 0, 0xFFFFFFFF, 0, CFG_VALUE_OR_DEFAULT, \
 		CFG(CFG_MARK_INDOOR_AS_DISABLE_FEATURE)\
 		CFG(CFG_ALLOW_MCC_GO_DIFF_BI) \
 		CFG(CFG_P2P_GO_ENABLE_FORCE_SCC) \
-		CFG(CFG_PCL_BAND_PRIORITY) \
-		CFG(CFG_PREFER_5G_SCC_TO_DBS)
+		CFG(CFG_PCL_BAND_PRIORITY)
 #endif

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -4370,20 +4370,6 @@ bool policy_mgr_is_sap_go_on_2g(struct wlan_objmgr_psoc *psoc)
 	return ret;
 }
 
-bool policy_mgr_get_5g_scc_prefer(
-	struct wlan_objmgr_psoc *psoc, enum policy_mgr_con_mode mode)
-{
-	struct policy_mgr_psoc_priv_obj *pm_ctx;
-
-	pm_ctx = policy_mgr_get_context(psoc);
-	if (!pm_ctx) {
-		policy_mgr_err("Invalid Context");
-		return false;
-	}
-
-	return pm_ctx->cfg.prefer_5g_scc_to_dbs & (1 << mode);
-}
-
 bool policy_mgr_is_restart_sap_required(struct wlan_objmgr_psoc *psoc,
 					uint8_t vdev_id,
 					qdf_freq_t freq,

components/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h

@@ -196,9 +196,9 @@ extern struct policy_mgr_conc_connection_info
 extern const enum policy_mgr_pcl_type
 	first_connection_pcl_table[PM_MAX_NUM_OF_MODE]
 			[PM_MAX_CONC_PRIORITY_MODE];
-extern enum policy_mgr_pcl_type
-	(*second_connection_pcl_dbs_table)[PM_MAX_ONE_CONNECTION_MODE]
-			[PM_MAX_NUM_OF_MODE][PM_MAX_CONC_PRIORITY_MODE];
+extern  pm_dbs_pcl_second_connection_table_type
+	*second_connection_pcl_dbs_table;
+
 extern enum policy_mgr_pcl_type const
 	(*second_connection_pcl_non_dbs_table)[PM_MAX_ONE_CONNECTION_MODE]
 			[PM_MAX_NUM_OF_MODE][PM_MAX_CONC_PRIORITY_MODE];
@@ -252,7 +252,6 @@ extern enum policy_mgr_conc_next_action
  * @enable_sta_cxn_5g_band: Enable/Disable STA connection in 5G band
  * @go_force_scc: Enable/Disable P2P GO force SCC
  * @pcl_band_priority: PCL channel order between 5G and 6G.
- * @prefer_5g_scc_to_dbs: Prefer to work in 5G SCC mode.
  */
 struct policy_mgr_cfg {
 	uint8_t mcc_to_scc_switch;
@@ -276,7 +275,6 @@ struct policy_mgr_cfg {
 	uint32_t chnl_select_plcy;
 	uint8_t go_force_scc;
 	enum policy_mgr_pcl_band_priority pcl_band_priority;
-	uint32_t prefer_5g_scc_to_dbs;
 };
 
 /**

components/cmn_services/policy_mgr/src/wlan_policy_mgr_init_deinit.c

@@ -377,34 +377,6 @@ QDF_STATUS policy_mgr_psoc_close(struct wlan_objmgr_psoc *psoc)
 	return QDF_STATUS_SUCCESS;
 }
 
-/**
- * policy_mgr_update_5g_scc_prefer() - Update pcl if 5g scc is preferred
- * @psoc: psoc object
- *
- * Return: void
- */
-static void policy_mgr_update_5g_scc_prefer(struct wlan_objmgr_psoc *psoc)
-{
-	enum policy_mgr_con_mode mode;
-
-	for (mode = PM_STA_MODE; mode < PM_MAX_NUM_OF_MODE; mode++) {
-		if (policy_mgr_get_5g_scc_prefer(psoc, mode)) {
-			(*second_connection_pcl_dbs_table)
-				[PM_STA_5_1x1][mode][PM_THROUGHPUT] =
-					PM_SCC_CH_24G;
-			policy_mgr_info("overwrite pm_second_connection_pcl_dbs_2x2_table, index %d mode %d system prefer %d new pcl %d",
-					PM_STA_5_1x1, mode,
-					PM_THROUGHPUT, PM_SCC_CH_24G);
-			(*second_connection_pcl_dbs_table)
-				[PM_STA_5_2x2][mode][PM_THROUGHPUT] =
-					PM_SCC_CH_24G;
-			policy_mgr_info("overwrite pm_second_connection_pcl_dbs_2x2_table, index %d mode %d system prefer %d new pcl %d",
-					PM_STA_5_2x2, mode,
-					PM_THROUGHPUT, PM_SCC_CH_24G);
-		}
-	}
-}
-
 #ifdef FEATURE_NO_DBS_INTRABAND_MCC_SUPPORT
 static void policy_mgr_init_non_dbs_pcl(struct wlan_objmgr_psoc *psoc)
 {
@@ -510,14 +482,12 @@ QDF_STATUS policy_mgr_psoc_enable(struct wlan_objmgr_psoc *psoc)
 	if (policy_mgr_is_hw_dbs_2x2_capable(psoc) ||
 	    policy_mgr_is_hw_dbs_required_for_band(psoc,
 						   HW_MODE_MAC_BAND_2G) ||
-	    policy_mgr_is_2x2_1x1_dbs_capable(psoc)) {
+	    policy_mgr_is_2x2_1x1_dbs_capable(psoc))
 		second_connection_pcl_dbs_table =
 		&pm_second_connection_pcl_dbs_2x2_table;
-		policy_mgr_update_5g_scc_prefer(psoc);
-	} else {
+	else
 		second_connection_pcl_dbs_table =
 		&pm_second_connection_pcl_dbs_1x1_table;
-	}
 
 	if (policy_mgr_is_hw_dbs_2x2_capable(psoc) ||
 	    policy_mgr_is_hw_dbs_required_for_band(psoc,

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -49,9 +49,9 @@ first_connection_pcl_table[PM_MAX_NUM_OF_MODE]
 	[PM_NAN_DISC_MODE] = {PM_5G, PM_5G, PM_5G},
 };
 
-enum policy_mgr_pcl_type
-	(*second_connection_pcl_dbs_table)[PM_MAX_ONE_CONNECTION_MODE]
-			[PM_MAX_NUM_OF_MODE][PM_MAX_CONC_PRIORITY_MODE];
+pm_dbs_pcl_second_connection_table_type
+		*second_connection_pcl_dbs_table;
+
 enum policy_mgr_pcl_type const
 	(*second_connection_pcl_non_dbs_table)[PM_MAX_ONE_CONNECTION_MODE]
 			[PM_MAX_NUM_OF_MODE][PM_MAX_CONC_PRIORITY_MODE];

components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_1x1_dbs_i.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. 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
@@ -26,9 +26,8 @@
  * for the 2nd connection, when we have a connection already in
  * the system (with DBS supported by HW)
  */
-enum policy_mgr_pcl_type
-	pm_second_connection_pcl_dbs_1x1_table[PM_MAX_ONE_CONNECTION_MODE]
-		[PM_MAX_NUM_OF_MODE][PM_MAX_CONC_PRIORITY_MODE] = {
+pm_dbs_pcl_second_connection_table_type
+pm_second_connection_pcl_dbs_1x1_table = {
 	[PM_STA_24_1x1] = {
 	[PM_STA_MODE] = {PM_5G_SCC_CH, PM_5G_SCC_CH, PM_5G_SCC_CH},
 	[PM_SAP_MODE] = {PM_5G_SCC_CH, PM_5G_SCC_CH, PM_5G_SCC_CH},

components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. 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
@@ -28,9 +28,8 @@
  * This table consolidates selection for P2PCLI, P2PGO, STA, SAP
  * into the single set of STA entries for 2.4G and 5G.
  */
-static enum policy_mgr_pcl_type
-	pm_second_connection_pcl_dbs_2x2_table[PM_MAX_ONE_CONNECTION_MODE]
-		[PM_MAX_NUM_OF_MODE][PM_MAX_CONC_PRIORITY_MODE] = {
+static pm_dbs_pcl_second_connection_table_type
+pm_second_connection_pcl_dbs_2x2_table = {
 	[PM_STA_24_1x1] = {
 	[PM_STA_MODE] = {PM_5G_SCC_CH, PM_5G_SCC_CH, PM_5G_SCC_CH},
 	[PM_SAP_MODE] = {PM_5G_SCC_CH, PM_5G_SCC_CH, PM_5G_SCC_CH},
@@ -54,7 +53,7 @@ static enum policy_mgr_pcl_type
 		PM_24G_SCC_CH_SBS_CH, PM_24G_SCC_CH_SBS_CH},
 	[PM_P2P_CLIENT_MODE] =	{ PM_24G_SCC_CH_SBS_CH,
 		PM_24G_SCC_CH_SBS_CH, PM_24G_SCC_CH_SBS_CH},
-	[PM_P2P_GO_MODE] = {PM_24G_SCC_CH_SBS_CH,
+	[PM_P2P_GO_MODE] = {PM_SCC_CH_24G,
 		PM_24G_SCC_CH_SBS_CH, PM_24G_SCC_CH_SBS_CH},
 	[PM_NAN_DISC_MODE] = {PM_24G_SCC_CH_SBS_CH, PM_24G_SCC_CH_SBS_CH,
 		PM_24G_SCC_CH_SBS_CH},
@@ -67,7 +66,7 @@ static enum policy_mgr_pcl_type
 		PM_24G_SCC_CH_SBS_CH, PM_24G_SCC_CH_SBS_CH},
 	[PM_P2P_CLIENT_MODE] =	{ PM_24G_SCC_CH_SBS_CH,
 		PM_24G_SCC_CH_SBS_CH, PM_24G_SCC_CH_SBS_CH},
-	[PM_P2P_GO_MODE] = {PM_24G_SCC_CH_SBS_CH,
+	[PM_P2P_GO_MODE] = {PM_SCC_CH_24G,
 		PM_24G_SCC_CH_SBS_CH, PM_24G_SCC_CH_SBS_CH},
 	[PM_NAN_DISC_MODE] = {PM_24G_SCC_CH_SBS_CH, PM_24G_SCC_CH_SBS_CH,
 		PM_24G_SCC_CH_SBS_CH},

components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021 The Linux Foundation. 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
@@ -73,7 +73,6 @@ static QDF_STATUS policy_mgr_init_cfg(struct wlan_objmgr_psoc *psoc)
 	cfg->mark_indoor_chnl_disable =
 		cfg_get(psoc, CFG_MARK_INDOOR_AS_DISABLE_FEATURE);
 	cfg->go_force_scc = cfg_get(psoc, CFG_P2P_GO_ENABLE_FORCE_SCC);
-	cfg->prefer_5g_scc_to_dbs = cfg_get(psoc, CFG_PREFER_5G_SCC_TO_DBS);
 
 	return QDF_STATUS_SUCCESS;
 }