qcacld-3.0: Update SBS Freq Info during service ready ext2 evt

FW sends lower band end frequency filter in service ready
ext2 event.
Frequency Info for every supported mode gets updated in
wma_update_hw_mode_list when service ready ext evt is
received.
Although, FW sends lower band end frequency filter in
service ready ext2 event.
So, update SBS Frequency Info when Service ready ext2 evt is
received.

Change-Id: Iefe1e601bffaba877979e7ce42a32763b61293c2
CRs-Fixed: 3073649

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 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
@@ -3183,6 +3184,8 @@ void policy_mgr_init_dbs_hw_mode(struct wlan_objmgr_psoc *psoc,
 				uint32_t num_dbs_hw_modes,
 				uint32_t *ev_wlan_dbs_hw_mode_list);
 
+QDF_STATUS policy_mgr_update_sbs_freq(struct wlan_objmgr_psoc *psoc,
+				      struct target_psoc_info *tgt_hdl);
 /**
  * policy_mgr_update_hw_mode_list() - Function to initialize DBS
  * HW modes in policy manager component

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 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
@@ -991,10 +992,10 @@ policy_mgr_update_mac_freq_info(struct wlan_objmgr_psoc *psoc,
 			policy_mgr_update_freq_info(pm_ctx, mac_cap, MODE_SBS,
 						    phy_id);
 
-		/* Modify the SBS/DBS list once both phy info are filled */
+		/* Modify the DBS list once both phy info are filled */
 		if (policy_mgr_both_phy_range_updated(pm_ctx, MODE_DBS))
 			policy_mgr_update_dbs_freq_info(pm_ctx);
-		/* Modify the SBS/DBS list once both phy info are filled */
+		/* Modify the SBS list once both phy info are filled */
 		if (policy_mgr_both_phy_range_updated(pm_ctx, MODE_SBS))
 			policy_mgr_update_sbs_freq_info(pm_ctx);
 		break;
@@ -1158,7 +1159,6 @@ QDF_STATUS policy_mgr_update_hw_mode_list(struct wlan_objmgr_psoc *psoc,
 		policy_mgr_debug("DBS list is freed");
 	}
 
-	policy_mgr_update_sbs_lowr_band_end_frq(pm_ctx, info);
 	pm_ctx->num_dbs_hw_modes = info->service_ext_param.num_hw_modes;
 	pm_ctx->hw_mode.hw_mode_list =
 		qdf_mem_malloc(sizeof(*pm_ctx->hw_mode.hw_mode_list) *
@@ -1222,6 +1222,31 @@ QDF_STATUS policy_mgr_update_hw_mode_list(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
+QDF_STATUS policy_mgr_update_sbs_freq(struct wlan_objmgr_psoc *psoc,
+				      struct target_psoc_info *tgt_hdl)
+{
+	struct policy_mgr_psoc_priv_obj *pm_ctx;
+	struct tgt_info *info;
+
+	pm_ctx = policy_mgr_get_context(psoc);
+	if (!pm_ctx) {
+		policy_mgr_err("Invalid Context");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	info = &tgt_hdl->info;
+	policy_mgr_debug("sbs_lower_band_end_freq %d",
+			 info->sbs_lower_band_end_freq);
+	policy_mgr_update_sbs_lowr_band_end_frq(pm_ctx, info);
+	/* no need to update if sbs_lower_band_end_freq is not set */
+	if (!pm_ctx->hw_mode.sbs_lower_band_end_freq)
+		return QDF_STATUS_E_NOSUPPORT;
+
+	policy_mgr_update_hw_mode_list(psoc, tgt_hdl);
+
+	return QDF_STATUS_SUCCESS;
+}
+
 static bool
 policy_mgr_are_2_freq_in_freq_range(struct policy_mgr_psoc_priv_obj *pm_ctx,
 				    struct policy_mgr_freq_range *freq_range,

core/wma/inc/wma_api.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 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
@@ -133,6 +134,16 @@ int  wma_rx_service_ready_event(void *handle, uint8_t *ev, uint32_t len);
 
 int wma_rx_service_ready_ext_event(void *handle, uint8_t *ev, uint32_t len);
 
+/**
+ * wma_rx_service_ready_ext2_event() - evt handler for sevice ready ext2 event.
+ * @handle: wma handle
+ * @event: params of the service ready extended event
+ * @length: param length
+ *
+ * Return: none
+ */
+int wma_rx_service_ready_ext2_event(void *handle, uint8_t *ev, uint32_t len);
+
 QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle);
 
 int wma_cli_get_command(int vdev_id, int param_id, int vpdev);

core/wma/src/wma_main.c

@@ -2023,6 +2023,9 @@ static int wma_legacy_service_ready_event_handler(uint32_t event_id,
 						      length);
 	case wmi_ready_event_id:
 		return wma_rx_ready_event(handle, event_data, length);
+	case wmi_service_ready_ext2_event_id:
+		return wma_rx_service_ready_ext2_event(handle, event_data,
+						      length);
 	default:
 		wma_err("Legacy callback invoked with invalid event_id:%d",
 			 event_id);
@@ -6575,6 +6578,66 @@ static void wma_set_coex_res_cfg(t_wma_handle *wma_handle,
 }
 #endif
 
+static void wma_update_hw_mode_config(tp_wma_handle wma_handle,
+				      struct target_psoc_info *tgt_hdl)
+{
+	uint32_t conc_scan_config_bits, fw_config_bits;
+	uint8_t sta_sap_scc_on_dfs_chnl;
+
+	fw_config_bits = target_if_get_fw_config_bits(tgt_hdl);
+	conc_scan_config_bits = target_if_get_conc_scan_config_bits(tgt_hdl);
+
+	wma_debug("Defaults: scan config:%x FW mode config:%x",
+		  conc_scan_config_bits, fw_config_bits);
+
+	if (wma_is_dbs_mandatory(wma_handle->psoc, tgt_hdl) &&
+	    (policy_mgr_is_dual_mac_disabled_in_ini(wma_handle->psoc))) {
+		policy_mgr_set_dual_mac_feature(wma_handle->psoc,
+				ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN);
+		policy_mgr_set_ch_select_plcy(wma_handle->psoc,
+					      POLICY_MGR_CH_SELECT_POLICY_DEF);
+	}
+	wma_init_scan_fw_mode_config(wma_handle->psoc, conc_scan_config_bits,
+				     fw_config_bits);
+
+	policy_mgr_get_sta_sap_scc_on_dfs_chnl(wma_handle->psoc,
+					       &sta_sap_scc_on_dfs_chnl);
+
+	/*
+	 * For non-dbs HW, disallow sta+sap on DFS channel as if SAP comes
+	 * on DFS master mode enable (sta_sap_scc_on_dfs_chnl = 2), scan will
+	 * be disabled and STA cannot connect to any other channel
+	 */
+	if (!policy_mgr_is_hw_dbs_capable(wma_handle->psoc) &&
+	    sta_sap_scc_on_dfs_chnl == 2)
+		policy_mgr_set_sta_sap_scc_on_dfs_chnl(wma_handle->psoc, 1);
+}
+
+int wma_rx_service_ready_ext2_event(void *handle, uint8_t *ev, uint32_t len)
+{
+	tp_wma_handle wma_handle = (tp_wma_handle)handle;
+	struct target_psoc_info *tgt_hdl;
+	QDF_STATUS status;
+
+	wma_debug("Enter");
+
+	if (wma_validate_handle(wma_handle))
+		return -EINVAL;
+
+	tgt_hdl = wlan_psoc_get_tgt_if_handle(wma_handle->psoc);
+	if (!tgt_hdl) {
+		wma_err("target psoc info is NULL");
+		return -EINVAL;
+	}
+	status = policy_mgr_update_sbs_freq(wma_handle->psoc, tgt_hdl);
+	if (QDF_IS_STATUS_ERROR(status))
+		return -EINVAL;
+
+	wma_update_hw_mode_config(wma_handle, tgt_hdl);
+
+	return 0;
+}
+
 /**
  * wma_rx_service_ready_ext_event() - evt handler for sevice ready ext event.
  * @handle: wma handle
@@ -6592,11 +6655,9 @@ int wma_rx_service_ready_ext_event(void *handle, uint8_t *event,
 	QDF_STATUS ret;
 	struct target_psoc_info *tgt_hdl;
 	struct wlan_psoc_target_capability_info *tgt_cap_info;
-	uint32_t conc_scan_config_bits, fw_config_bits;
 	struct wmi_unified *wmi_handle;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	target_resource_config *wlan_res_cfg;
-	uint8_t sta_sap_scc_on_dfs_chnl;
 
 	wma_debug("Enter");
 
@@ -6627,12 +6688,6 @@ int wma_rx_service_ready_ext_event(void *handle, uint8_t *event,
 	wma_debug("WMA <-- WMI_SERVICE_READY_EXT_EVENTID");
 
 	tgt_cap_info = target_psoc_get_target_caps(tgt_hdl);
-	fw_config_bits = target_if_get_fw_config_bits(tgt_hdl);
-	conc_scan_config_bits = target_if_get_conc_scan_config_bits(tgt_hdl);
-
-	wma_debug("Defaults: scan config:%x FW mode config:%x",
-		 conc_scan_config_bits, fw_config_bits);
-
 	ret = qdf_mc_timer_stop(&wma_handle->service_ready_ext_timer);
 	if (!QDF_IS_STATUS_SUCCESS(ret)) {
 		wma_err("Failed to stop the service ready ext timer");
@@ -6648,27 +6703,7 @@ int wma_rx_service_ready_ext_event(void *handle, uint8_t *event,
 
 	wma_debug("WMA --> WMI_INIT_CMDID");
 
-	if (wma_is_dbs_mandatory(wma_handle->psoc, tgt_hdl) &&
-	   (policy_mgr_is_dual_mac_disabled_in_ini(wma_handle->psoc))) {
-		policy_mgr_set_dual_mac_feature(wma_handle->psoc,
-				ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN);
-		policy_mgr_set_ch_select_plcy(wma_handle->psoc,
-					      POLICY_MGR_CH_SELECT_POLICY_DEF);
-	}
-	wma_init_scan_fw_mode_config(wma_handle->psoc, conc_scan_config_bits,
-				     fw_config_bits);
-
-	policy_mgr_get_sta_sap_scc_on_dfs_chnl(wma_handle->psoc,
-					       &sta_sap_scc_on_dfs_chnl);
-
-	/*
-	 * For non-dbs HW, disallow sta+sap on DFS channel as if SAP comes
-	 * on DFS master mode enable (sta_sap_scc_on_dfs_chnl = 2), scan will
-	 * be disabled and STA cannot connect to any other channel
-	 */
-	if (!policy_mgr_is_hw_dbs_capable(wma_handle->psoc) &&
-	    sta_sap_scc_on_dfs_chnl == 2)
-		policy_mgr_set_sta_sap_scc_on_dfs_chnl(wma_handle->psoc, 1);
+	wma_update_hw_mode_config(wma_handle, tgt_hdl);
 
 	target_psoc_set_num_radios(tgt_hdl, 1);