qcacld-3.0: Don't disable connected 6 GHz channels

Currently host disables 6 GHz band when set_fcc_channel cmd
is received hence existing STA/P2P client 6 GHz connections
get disabled.
Add changes to keep existing STA/P2P client 6 GHz connections
intact and also keep SAP up on 6 GHz if STA+SAP SCC on 6 GHz
channel was present before receiving this command. Disable all
other 6 GHz operations.

Change-Id: I95c094e1b344d430a288b6f613842efe6e576e25
CRs-Fixed: 3495006

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -5034,9 +5034,9 @@ bool policy_mgr_is_ll_sap_concurrency_valid(struct wlan_objmgr_psoc *psoc,
  * @discon_freq: disconnect frequency
  * @type: enum indoor_conc_update_type
  *
- * Return: None
+ * Return: True if need to compute pdev current channel list
  */
-void
+bool
 policy_mgr_update_indoor_concurrency(struct wlan_objmgr_psoc *psoc,
 				     uint8_t vdev_id,
 				     uint32_t discon_freq,

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -414,12 +414,16 @@ QDF_STATUS policy_mgr_update_connection_info(struct wlan_objmgr_psoc *psoc,
 	policy_mgr_handle_ml_sta_links_on_vdev_up_csa(psoc,
 				policy_mgr_get_qdf_mode_from_pm(mode), vdev_id);
 
-	if (policy_mgr_is_conc_sap_present_on_sta_freq(psoc, mode, cur_freq))
-		policy_mgr_update_indoor_concurrency(psoc, vdev_id, 0,
-						     SWITCH_WITH_CONCURRENCY);
-	else
-		policy_mgr_update_indoor_concurrency(psoc, vdev_id, cur_freq,
-						     SWITCH_WITHOUT_CONCURRENCY);
+	if (policy_mgr_is_conc_sap_present_on_sta_freq(psoc, mode, cur_freq) &&
+	    policy_mgr_update_indoor_concurrency(psoc, vdev_id, 0,
+						 SWITCH_WITH_CONCURRENCY))
+		wlan_reg_recompute_current_chan_list(psoc, pm_ctx->pdev);
+	else if (policy_mgr_update_indoor_concurrency(psoc, vdev_id, cur_freq,
+						SWITCH_WITHOUT_CONCURRENCY))
+		wlan_reg_recompute_current_chan_list(psoc, pm_ctx->pdev);
+	else if (wlan_reg_get_keep_6ghz_sta_cli_connection(pm_ctx->pdev))
+		wlan_reg_recompute_current_chan_list(psoc, pm_ctx->pdev);
+
 
 	return QDF_STATUS_SUCCESS;
 }

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -4510,7 +4510,8 @@ void policy_mgr_incr_active_session(struct wlan_objmgr_psoc *psoc,
 
 	policy_mgr_dump_current_concurrency(psoc);
 
-	policy_mgr_update_indoor_concurrency(psoc, session_id, 0, CONNECT);
+	if (policy_mgr_update_indoor_concurrency(psoc, session_id, 0, CONNECT))
+		wlan_reg_recompute_current_chan_list(psoc, pm_ctx->pdev);
 
 	qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 	policy_mgr_handle_ml_sta_links_on_vdev_up_csa(psoc, mode, session_id);
@@ -4687,9 +4688,16 @@ QDF_STATUS policy_mgr_decr_active_session(struct wlan_objmgr_psoc *psoc,
 	    mode == QDF_STA_MODE || mode == QDF_P2P_CLIENT_MODE)
 		policy_mgr_update_dfs_master_dynamic_enabled(psoc, session_id);
 
-	if (!pm_ctx->last_disconn_sta_freq)
-		policy_mgr_update_indoor_concurrency(psoc, session_id, cur_freq,
-						     DISCONNECT_WITHOUT_CONCURRENCY);
+	if (!pm_ctx->last_disconn_sta_freq) {
+		if (policy_mgr_update_indoor_concurrency(psoc, session_id,
+		    cur_freq, DISCONNECT_WITHOUT_CONCURRENCY))
+			wlan_reg_recompute_current_chan_list(psoc,
+							     pm_ctx->pdev);
+	}
+
+	if (wlan_reg_get_keep_6ghz_sta_cli_connection(pm_ctx->pdev) &&
+	    (mode == QDF_STA_MODE || mode == QDF_P2P_CLIENT_MODE))
+		wlan_reg_recompute_current_chan_list(psoc, pm_ctx->pdev);
 
 	return qdf_status;
 }
@@ -10409,7 +10417,7 @@ bool policy_mgr_is_ll_sap_concurrency_valid(struct wlan_objmgr_psoc *psoc,
 	return true;
 }
 
-void
+bool
 policy_mgr_update_indoor_concurrency(struct wlan_objmgr_psoc *psoc,
 				     uint8_t vdev_id,
 				     uint32_t discon_freq,
@@ -10424,13 +10432,13 @@ policy_mgr_update_indoor_concurrency(struct wlan_objmgr_psoc *psoc,
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {
 		policy_mgr_err("Invalid pm context");
-		return;
+		return false;
 	}
 
 	ucfg_mlme_get_indoor_channel_support(psoc, &indoor_support);
 	if (indoor_support ||
 	    !policy_mgr_get_sta_sap_scc_allowed_on_indoor_chnl(psoc))
-		return;
+		return false;
 
 	mode = wlan_get_opmode_from_vdev_id(pm_ctx->pdev, vdev_id);
 
@@ -10440,10 +10448,10 @@ policy_mgr_update_indoor_concurrency(struct wlan_objmgr_psoc *psoc,
 	 */
 	if (type != DISCONNECT_WITH_CONCURRENCY &&
 	    (mode != QDF_STA_MODE && mode != QDF_P2P_CLIENT_MODE)) {
-		return;
+		return false;
 	} else if (type == DISCONNECT_WITH_CONCURRENCY &&
 		 (mode != QDF_SAP_MODE && mode != QDF_P2P_GO_MODE)) {
-		return;
+		return false;
 	}
 
 	switch (type) {
@@ -10458,13 +10466,13 @@ policy_mgr_update_indoor_concurrency(struct wlan_objmgr_psoc *psoc,
 		ch_freq = discon_freq;
 		break;
 	default:
-		return;
+		return false;
 	}
 
 	if (type != SWITCH_WITHOUT_CONCURRENCY &&
 	    !(WLAN_REG_IS_5GHZ_CH_FREQ(ch_freq) &&
 	    wlan_reg_is_freq_indoor(pm_ctx->pdev, ch_freq))) {
-		return;
+		return false;
 	} else if (type == SWITCH_WITHOUT_CONCURRENCY) {
 		/* Either the previous frequency or the current
 		 * frequency can be indoor. Or both can be indoor.
@@ -10475,7 +10483,7 @@ policy_mgr_update_indoor_concurrency(struct wlan_objmgr_psoc *psoc,
 		       wlan_reg_is_freq_indoor(pm_ctx->pdev, ch_freq)) ||
 		      (WLAN_REG_IS_5GHZ_CH_FREQ(discon_freq) &&
 		       wlan_reg_is_freq_indoor(pm_ctx->pdev, discon_freq))))
-			return;
+			return false;
 	}
 
 	switch (type) {
@@ -10498,7 +10506,7 @@ policy_mgr_update_indoor_concurrency(struct wlan_objmgr_psoc *psoc,
 	case DISCONNECT_WITH_CONCURRENCY:
 		/*If there are other sessions, do not change current chan list*/
 		if (policy_mgr_get_connection_count_with_ch_freq(ch_freq) > 1)
-			return;
+			return false;
 		wlan_reg_modify_indoor_concurrency(pm_ctx->pdev,
 						   INVALID_VDEV_ID, ch_freq,
 						   CH_WIDTH_INVALID, false);
@@ -10510,9 +10518,9 @@ policy_mgr_update_indoor_concurrency(struct wlan_objmgr_psoc *psoc,
 		 * The previous frequency removal and current channel list
 		 * recomputation will happen after SAP CSA
 		 */
-		return;
+		return false;
 	}
-	wlan_reg_recompute_current_chan_list(psoc, pm_ctx->pdev);
+	return true;
 }
 
 bool policy_mgr_is_conc_sap_present_on_sta_freq(struct wlan_objmgr_psoc *psoc,

core/hdd/src/wlan_hdd_cm_connect.c

@@ -733,6 +733,7 @@ int wlan_hdd_cm_connect(struct wiphy *wiphy,
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
 	struct hdd_context *hdd_ctx;
 	struct hdd_station_ctx *hdd_sta_ctx;
+	qdf_freq_t ch_freq = 0;
 
 	hdd_enter();
 
@@ -771,6 +772,15 @@ int wlan_hdd_cm_connect(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
+	if (req->channel && req->channel->center_freq)
+		ch_freq = req->channel->center_freq;
+
+	if (ch_freq && wlan_reg_is_6ghz_chan_freq(ch_freq) &&
+	    !wlan_reg_is_6ghz_band_set(hdd_ctx->pdev)) {
+		hdd_err("6 GHz band disabled");
+		return -EINVAL;
+	}
+
 	qdf_mem_zero(&params, sizeof(params));
 	ucfg_dlm_dump_deny_list_ap(hdd_ctx->pdev);
 	vdev = hdd_objmgr_get_vdev_by_user(adapter->deflink, WLAN_OSIF_CM_ID);

core/hdd/src/wlan_hdd_ioctl.c

@@ -6119,7 +6119,6 @@ static int drv_cmd_set_fcc_channel(struct hdd_adapter *adapter,
 	QDF_STATUS status;
 	QDF_STATUS status_6G = QDF_STATUS_SUCCESS;
 	int8_t input_value;
-	bool fcc_constraint;
 	int err;
 	uint32_t band_bitmap = 0;
 	bool rf_test_mode;
@@ -6129,8 +6128,11 @@ static int drv_cmd_set_fcc_channel(struct hdd_adapter *adapter,
 	 * ON after airplane mode is set. When APM is set, WLAN turns off.
 	 * But it can be turned back on. Otherwise; when APM is turned back
 	 * off, WLAN would turn back on. So at that point the command is
-	 * expected to come down. 0 means reduce power as per fcc constraint
-	 * and -1 means remove constraint.
+	 * expected to come down.
+	 * a) 0 means reduce power as per fcc constraint and disable 6 GHz band
+	 *    but keep existing STA/P2P Client connections intact.
+	 * b) 1 means reduce power as per fcc constraint and enable 6 GHz band.
+	 * c) -1 means remove constraint and enable 6 GHz band.
 	 */
 
 	err = kstrtos8(command + command_len + 1, 10, &input_value);
@@ -6139,11 +6141,49 @@ static int drv_cmd_set_fcc_channel(struct hdd_adapter *adapter,
 		return err;
 	}
 
-	fcc_constraint = (input_value == -1) ? false : true;
-	hdd_debug("input_value = %d && fcc_constraint = %u",
-		  input_value, fcc_constraint);
+	hdd_debug("input_value = %d", input_value);
 
-	status = ucfg_reg_set_fcc_constraint(hdd_ctx->pdev, fcc_constraint);
+	if (input_value == 0 || input_value == 1) {
+		status = ucfg_reg_set_fcc_constraint(hdd_ctx->pdev, true);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			hdd_err("Failed to reduce tx power for channels 12/13");
+			return qdf_status_to_os_return(status);
+		}
+	} else if (input_value == -1) {
+		status = ucfg_reg_set_fcc_constraint(hdd_ctx->pdev, false);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			hdd_err("Failed to reset tx power for channels 12/13");
+			return qdf_status_to_os_return(status);
+		}
+	} else {
+		return -EINVAL;
+	}
+
+	/*
+	 * For input value 1 or -1, 6 GHz band should be re enabled, so
+	 * keep_6ghz_sta_cli_connection flag can be disabled.
+	 */
+	if (input_value == 1 || input_value == -1) {
+		status = ucfg_reg_set_keep_6ghz_sta_cli_connection(
+							hdd_ctx->pdev, false);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			hdd_err("Failed to enable 6 GHz band");
+			return qdf_status_to_os_return(status);
+		}
+	}
+
+	/*
+	 * For input value 0, 6 GHz band is disabled but existing 6 GHz STA
+	 * P2P client connections should be intact.
+	 * If host receives this SET_FCC_CHANNEL 0 twice return from here to
+	 * avoid completely disabling 6 GHz band.
+	 */
+	if (input_value == 0 &&
+	    ucfg_reg_get_keep_6ghz_sta_cli_connection(hdd_ctx->pdev)) {
+		hdd_debug("FCC constraint is already set");
+		status = QDF_STATUS_SUCCESS;
+		return qdf_status_to_os_return(status);
+	}
 
 	status_6G = ucfg_mlme_is_rf_test_mode_enabled(hdd_ctx->psoc,
 						      &rf_test_mode);
@@ -6155,6 +6195,12 @@ static int drv_cmd_set_fcc_channel(struct hdd_adapter *adapter,
 	if (!rf_test_mode) {
 		if (!input_value) {
 			band_bitmap |= (BIT(REG_BAND_5G) | BIT(REG_BAND_2G));
+			status = ucfg_reg_set_keep_6ghz_sta_cli_connection(
+							hdd_ctx->pdev, true);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				hdd_err("Failed to disable 6 GHz band");
+				return qdf_status_to_os_return(status);
+			}
 		} else {
 			if (wlan_reg_is_6ghz_supported(hdd_ctx->psoc))
 				band_bitmap = REG_BAND_MASK_ALL;
@@ -6164,12 +6210,7 @@ static int drv_cmd_set_fcc_channel(struct hdd_adapter *adapter,
 	}
 
 send_status:
-	if (QDF_IS_STATUS_ERROR(status))
-		hdd_err("Failed to %s tx power for channels 12/13",
-			fcc_constraint ? "restore" : "reduce");
-	else
-		status = status_6G;
-
+	status = status_6G;
 	return qdf_status_to_os_return(status);
 }
 

core/hdd/src/wlan_hdd_regulatory.c

@@ -938,7 +938,15 @@ int hdd_reg_set_band(struct net_device *dev, uint32_t band_bitmap)
 		return -EIO;
 	}
 
-	if (current_band == band_bitmap) {
+	/*
+	 * If SET_FCC_CHANNEL 0 command is received first then 6 GHz band would
+	 * be disabled and band_capability would be set to 3 but existing 6 GHz
+	 * STA and P2P client connections won't be disconnected.
+	 * If set band comes again for 6 GHz band disabled and band_bitmap is
+	 * equal to band_capability, proceed to disable 6 GHz band completely.
+	 */
+	if (current_band == band_bitmap &&
+	    !ucfg_reg_get_keep_6ghz_sta_cli_connection(hdd_ctx->pdev)) {
 		hdd_debug("band is the same so not updating");
 		return 0;
 	}

core/mac/src/pe/lim/lim_api.c

@@ -874,6 +874,9 @@ QDF_STATUS pe_open(struct mac_context *mac, struct cds_config_info *cds_cfg)
 					mac->psoc,
 					lim_update_tx_pwr_on_ctry_change_cb);
 
+	wlan_reg_register_is_chan_connected_callback(mac->psoc,
+					lim_is_chan_connected_for_mode);
+
 	if (mac->mlme_cfg->edca_params.enable_edca_params)
 		lim_register_policy_mgr_callback(mac->psoc);
 
@@ -921,6 +924,9 @@ QDF_STATUS pe_close(struct mac_context *mac)
 					mac->psoc,
 					lim_update_tx_pwr_on_ctry_change_cb);
 
+	wlan_reg_unregister_is_chan_connected_callback(mac->psoc,
+					lim_is_chan_connected_for_mode);
+
 	if (mac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq) {
 		qdf_mem_free(mac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq);
 		mac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq = NULL;

core/mac/src/pe/lim/lim_utils.c

@@ -11410,3 +11410,40 @@ lim_update_tx_pwr_on_ctry_change_cb(uint8_t vdev_id)
 
 	lim_set_tpc_power(mac_ctx, session);
 }
+
+bool lim_is_chan_connected_for_mode(struct wlan_objmgr_psoc *psoc,
+				    enum QDF_OPMODE device_mode,
+				    qdf_freq_t chan_freq)
+{
+	struct wlan_channel *des_chan;
+	struct wlan_objmgr_vdev *vdev;
+	uint8_t vdev_id;
+
+	for (vdev_id = 0; vdev_id < WLAN_UMAC_PSOC_MAX_VDEVS; vdev_id++) {
+		vdev =
+		wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
+						     WLAN_LEGACY_MAC_ID);
+		if (!vdev)
+			continue;
+
+		if (vdev->vdev_mlme.vdev_opmode != device_mode)
+			goto next;
+
+		if (!wlan_cm_is_vdev_connected(vdev))
+			goto next;
+
+		des_chan = vdev->vdev_mlme.des_chan;
+		if (!des_chan)
+			goto next;
+
+		if (des_chan->ch_freq != chan_freq)
+			goto next;
+
+		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);
+		return true;
+next:
+		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);
+	}
+
+	return false;
+}

core/mac/src/pe/lim/lim_utils.h

@@ -3239,4 +3239,18 @@ lim_is_power_change_required_for_sta(struct mac_context *mac_ctx,
  */
 void
 lim_update_tx_pwr_on_ctry_change_cb(uint8_t vdev_id);
+
+/*
+ * lim_is_chan_connected_for_mode() - Check if frequency is connected
+ *                                    for given opmode.
+ * @psoc: Pointer to psoc object
+ * @opmode: Vdev opmode
+ * @freq: Frequency
+ *
+ * Return: Return true if frequency is connected for given opmode.
+ */
+bool
+lim_is_chan_connected_for_mode(struct wlan_objmgr_psoc *psoc,
+			       enum QDF_OPMODE opmode,
+			       qdf_freq_t freq);
 #endif /* __LIM_UTILS_H */

core/sap/src/sap_module.c

@@ -2041,10 +2041,13 @@ QDF_STATUS wlansap_channel_change_request(struct sap_context *sap_ctx,
 		  sap_ctx->chan_freq, phy_mode, ch_params->ch_width,
 		  ch_params->sec_ch_offset, ch_params->center_freq_seg0,
 		  ch_params->center_freq_seg1);
-	policy_mgr_update_indoor_concurrency(mac_ctx->psoc,
-					     wlan_vdev_get_id(sap_ctx->vdev),
-					     sap_ctx->freq_before_ch_switch,
-					     DISCONNECT_WITH_CONCURRENCY);
+	if (policy_mgr_update_indoor_concurrency(mac_ctx->psoc,
+						wlan_vdev_get_id(sap_ctx->vdev),
+						sap_ctx->freq_before_ch_switch,
+						DISCONNECT_WITH_CONCURRENCY))
+		wlan_reg_recompute_current_chan_list(mac_ctx->psoc,
+						     mac_ctx->pdev);
+
 	return status;
 }