qcacmn: Add 2x2 chain configuration in policy manager

Add 2x2 chain configuration in policy manager that is coming from
user space.

Change-Id: I8c9c54a1e63810327dc4252bc5320f34965ea4ca
CRs-Fixed: 2009818

umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h

@@ -980,10 +980,12 @@ struct dual_mac_config {
  * @max_concurrent_active_sessions: User allowed maximum active
  *                              connections
  * @conc_system_pref: System preference for PCL table
+ * @enable2x2: 2x2 chain mask user config
  */
 struct policy_mgr_user_cfg {
 	uint8_t enable_mcc_adaptive_scheduler;
 	uint8_t max_concurrent_active_sessions;
 	uint8_t conc_system_pref;
+	bool enable2x2;
 };
 #endif /* __WLAN_POLICY_MGR_PUBLIC_STRUCT_H */

umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -115,11 +115,11 @@ QDF_STATUS policy_mgr_pdev_set_hw_mode(struct wlan_objmgr_psoc *psoc,
 	 * if HW is not capable of doing 2x2 or ini config disabled 2x2, don't
 	 * allow to request FW for 2x2
 	 */
-	if ((HW_MODE_SS_2x2 == mac0_ss) && (!pm_ctx->enable2x2)) {
+	if ((HW_MODE_SS_2x2 == mac0_ss) && (!pm_ctx->user_cfg.enable2x2)) {
 		policy_mgr_notice("2x2 is not allowed downgrading to 1x1 for mac0");
 		mac0_ss = HW_MODE_SS_1x1;
 	}
-	if ((HW_MODE_SS_2x2 == mac1_ss) && (!pm_ctx->enable2x2)) {
+	if ((HW_MODE_SS_2x2 == mac1_ss) && (!pm_ctx->user_cfg.enable2x2)) {
 		policy_mgr_notice("2x2 is not allowed downgrading to 1x1 for mac1");
 		mac1_ss = HW_MODE_SS_1x1;
 	}

umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h

@@ -244,13 +244,6 @@ extern enum policy_mgr_conc_next_action
  * @hw_mode: List of HW modes supported
  * @old_hw_mode_index: Old HW mode from hw_mode table
  * @new_hw_mode_index: New HW mode from hw_mode table
- * @phy_caps: PHY capability advertised by FW
- * @enable2x2: 2x2 chain mask user config
- * @gMaxConcurrentActiveSessions: Max concurrenct active
- *                              connections user config
- * @conc_system_pref: System preference of t/p, power or latancy
- *                  for Preferred Channel List table, user
- *                  config
  * @dual_mac_cfg: DBS configuration currenctly used by FW for
  *              scan & connections
  * @hw_mode_change_in_progress: This is to track if HW mode
@@ -279,7 +272,6 @@ struct policy_mgr_psoc_priv_obj {
 		struct dbs_hw_mode_info hw_mode;
 		uint32_t old_hw_mode_index;
 		uint32_t new_hw_mode_index;
-		bool enable2x2;
 		struct dual_mac_config dual_mac_cfg;
 		uint32_t hw_mode_change_in_progress;
 		struct policy_mgr_user_cfg user_cfg;