qcacld-3.0: Fix DFS issue when puncture enabled

If some 20M sub channels are disabled for puncture, bonded freq state will
become CHANNEL_STATE_DISABLE, while CHANNEL_STATE_DFS is expected if
DFS freq is included to pass CHAN_DFS_CFREQ2 to F/W by vdev start wmi cmd.
the check also happens in several other places.

To fix it, use API wlan_reg_get_5g_bonded_channel_state_for_pwrmode to
replace wlan_reg_get_5g_bonded_channel_state_for_freq and
wlan_reg_get_bonded_channel_state_for_freq.
set is_create_punc_bitmap of ch param as true, then bonded freq
state will become CHANNEL_STATE_DFS after
reg_update_5g_bonded_channel_state_punc_for_pwrmode called.

Change-Id: I3e5214e9e09ac2a959f6fa7d641173a80a3980a7
CRs-Fixed: 3360820

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -5451,9 +5451,12 @@ wlan_mlme_check_chan_param_has_dfs(struct wlan_objmgr_pdev *pdev,
 	bool is_dfs = false;
 
 	if (ch_params->ch_width == CH_WIDTH_160MHZ) {
-		if (wlan_reg_get_bonded_channel_state_for_freq(
-		    pdev, chan_freq, ch_params->ch_width, 0) ==
-				CHANNEL_STATE_DFS)
+		wlan_reg_set_create_punc_bitmap(ch_params, true);
+		if (wlan_reg_get_5g_bonded_channel_state_for_pwrmode(pdev,
+								     chan_freq,
+								     ch_params,
+								     REG_CURRENT_PWR_MODE) ==
+		    CHANNEL_STATE_DFS)
 			is_dfs = true;
 	} else if (ch_params->ch_width == CH_WIDTH_80P80MHZ) {
 		if (wlan_reg_get_channel_state_for_pwrmode(

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

@@ -230,10 +230,16 @@ void lim_process_mlm_start_cnf(struct mac_context *mac, uint32_t *msg_buf)
 		if (!LIM_IS_AP_ROLE(pe_session))
 			return;
 		if (pe_session->ch_width == CH_WIDTH_160MHZ) {
-			if (wlan_reg_get_bonded_channel_state_for_freq(
-					mac->pdev, chan_freq,
-					pe_session->ch_width, 0) !=
-					CHANNEL_STATE_DFS)
+			struct ch_params ch_params = {0};
+
+			if (IS_DOT11_MODE_EHT(pe_session->dot11mode))
+				wlan_reg_set_create_punc_bitmap(&ch_params, true);
+			ch_params.ch_width = pe_session->ch_width;
+			if (wlan_reg_get_5g_bonded_channel_state_for_pwrmode(mac->pdev,
+									     chan_freq,
+									     &ch_params,
+									     REG_CURRENT_PWR_MODE)  !=
+			    CHANNEL_STATE_DFS)
 				send_bcon_ind = true;
 		} else if (pe_session->ch_width == CH_WIDTH_80P80MHZ) {
 			if ((wlan_reg_get_channel_state_for_pwrmode(

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

@@ -2319,9 +2319,16 @@ lim_send_sme_ap_channel_switch_resp(struct mac_context *mac,
 				BIT(band));
 
 	if (ch_width == CH_WIDTH_160MHZ) {
-		if (wlan_reg_get_bonded_channel_state_for_freq(
-		    mac->pdev, pe_session->curr_op_freq,
-		    ch_width, 0) == CHANNEL_STATE_DFS)
+		struct ch_params ch_params = {0};
+
+		if (IS_DOT11_MODE_EHT(pe_session->dot11mode))
+			wlan_reg_set_create_punc_bitmap(&ch_params, true);
+		ch_params.ch_width = ch_width;
+		if (wlan_reg_get_5g_bonded_channel_state_for_pwrmode(mac->pdev,
+								     pe_session->curr_op_freq,
+								     &ch_params,
+								     REG_CURRENT_PWR_MODE) ==
+		    CHANNEL_STATE_DFS)
 			is_ch_dfs = true;
 	} else if (ch_width == CH_WIDTH_80P80MHZ) {
 		if (wlan_reg_get_channel_state_for_pwrmode(

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

@@ -10419,6 +10419,7 @@ QDF_STATUS lim_set_ch_phy_mode(struct wlan_objmgr_vdev *vdev, uint8_t dot11mode)
 	uint8_t band_mask;
 	enum channel_state ch_state;
 	uint32_t start_ch_freq;
+	struct ch_params ch_params = {0};
 
 	if (!mac_ctx)
 		return QDF_STATUS_E_FAILURE;
@@ -10515,9 +10516,14 @@ QDF_STATUS lim_set_ch_phy_mode(struct wlan_objmgr_vdev *vdev, uint8_t dot11mode)
 		else
 			start_ch_freq = des_chan->ch_freq;
 
-		ch_state = wlan_reg_get_5g_bonded_channel_state_for_freq(
-					mac_ctx->pdev, start_ch_freq,
-					des_chan->ch_width);
+		if (IS_DOT11_MODE_EHT(dot11mode))
+			wlan_reg_set_create_punc_bitmap(&ch_params, true);
+		ch_params.ch_width = des_chan->ch_width;
+		ch_state =
+		wlan_reg_get_5g_bonded_channel_state_for_pwrmode(mac_ctx->pdev,
+								 start_ch_freq,
+								 &ch_params,
+								 REG_CURRENT_PWR_MODE);
 		if (CHANNEL_STATE_DFS == ch_state)
 			des_chan->ch_flagext |= IEEE80211_CHAN_DFS_CFREQ2;
 	}

core/sap/src/sap_api_link_cntl.c

@@ -470,9 +470,15 @@ wlansap_roam_process_ch_change_success(struct mac_context *mac_ctx,
 	}
 
 	if (sap_ctx->ch_params.ch_width == CH_WIDTH_160MHZ) {
-		if (wlan_reg_get_bonded_channel_state_for_freq(
-		    mac_ctx->pdev, target_chan_freq,
-		    sap_ctx->ch_params.ch_width, 0) == CHANNEL_STATE_DFS)
+		struct ch_params ch_params = {0};
+
+		wlan_reg_set_create_punc_bitmap(&ch_params, true);
+		ch_params.ch_width = sap_ctx->ch_params.ch_width;
+		if (wlan_reg_get_5g_bonded_channel_state_for_pwrmode(mac_ctx->pdev,
+								     target_chan_freq,
+								     &ch_params,
+								     REG_CURRENT_PWR_MODE) ==
+		    CHANNEL_STATE_DFS)
 			is_ch_dfs = true;
 	} else if (sap_ctx->ch_params.ch_width == CH_WIDTH_80P80MHZ) {
 		if (wlan_reg_get_channel_state_for_pwrmode(

core/sap/src/sap_fsm.c

@@ -499,9 +499,12 @@ is_wlansap_cac_required_for_chan(struct mac_context *mac_ctx,
 	uint8_t sta_cnt, i;
 
 	if (ch_params->ch_width == CH_WIDTH_160MHZ) {
-		if (wlan_reg_get_bonded_channel_state_for_freq(
-		    mac_ctx->pdev, chan_freq,
-		    ch_params->ch_width, 0) == CHANNEL_STATE_DFS)
+		wlan_reg_set_create_punc_bitmap(ch_params, true);
+		if (wlan_reg_get_5g_bonded_channel_state_for_pwrmode(mac_ctx->pdev,
+								     chan_freq,
+								     ch_params,
+								     REG_CURRENT_PWR_MODE) ==
+		    CHANNEL_STATE_DFS)
 			is_ch_dfs = true;
 	} else if (ch_params->ch_width == CH_WIDTH_80P80MHZ) {
 		if (wlan_reg_get_channel_state_for_pwrmode(
@@ -3682,9 +3685,16 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx,
 		 * CAC is done if the operating channel is DFS
 		 */
 		if (sap_ctx->ch_params.ch_width == CH_WIDTH_160MHZ) {
-			is_dfs = wlan_reg_get_5g_bonded_channel_state_for_freq(
-					mac_ctx->pdev, sap_chan_freq,
-					CH_WIDTH_160MHZ) == CHANNEL_STATE_DFS;
+			struct ch_params ch_params = {0};
+
+			wlan_reg_set_create_punc_bitmap(&ch_params, true);
+			ch_params.ch_width = CH_WIDTH_160MHZ;
+			is_dfs =
+			wlan_reg_get_5g_bonded_channel_state_for_pwrmode(mac_ctx->pdev,
+									 sap_chan_freq,
+									 &ch_params,
+									 REG_CURRENT_PWR_MODE) ==
+			CHANNEL_STATE_DFS;
 		} else if (sap_ctx->ch_params.ch_width == CH_WIDTH_80P80MHZ) {
 			if (wlan_reg_get_channel_state_for_pwrmode(
 							mac_ctx->pdev,