qcacld-3.0: Fix the bandwidth switch while handling CSA WBW IE

While handling CSA Wide BW IE to switch freq, driver update the
PE session bandwidth and limit the switch to existing bandwidth.

This result in failure while checking if new bandwidth is same
as previous bandwidth and thus bandwidth change fails in this
case.

To fix do not update PE session while handling CSA Wide BW IE and
do not limit the switch to 80 MHz. Also add current Bandwidth
info in logs.

Change-Id: Icb1f169b17f711df91fd10230d6fdfd9a3d30274
CRs-Fixed: 3498943

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

@@ -1597,10 +1597,8 @@ static QDF_STATUS lim_process_csa_wbw_ie(struct mac_context *mac_ctx,
 
 	ap_new_ch_width = csa_params->new_ch_width;
 
-	if (!csa_params->new_ch_freq_seg1 && !csa_params->new_ch_freq_seg2) {
-		pe_err("CSA wide BW IE has invalid center freq");
+	if (!csa_params->new_ch_freq_seg1 && !csa_params->new_ch_freq_seg2)
 		return QDF_STATUS_E_INVAL;
-	}
 
 	csa_cent_freq = csa_params->csa_chan_freq;
 	if (wlan_reg_is_6ghz_op_class(mac_ctx->pdev,
@@ -1644,7 +1642,7 @@ static QDF_STATUS lim_process_csa_wbw_ie(struct mac_context *mac_ctx,
 		csa_cent_freq1 = cent_freq1;
 		break;
 	default:
-		pe_err("CSA wide BW IE has wrong ch_width %d", ap_new_ch_width);
+		pe_debug("CSA wide BW IE has ch_width %d", ap_new_ch_width);
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -1702,19 +1700,18 @@ static QDF_STATUS lim_process_csa_wbw_ie(struct mac_context *mac_ctx,
 	}
 
 	if (ap_new_ch_width > fw_vht_ch_wd) {
-		pe_debug("New BW is not supported, setting BW to %d",
+		pe_debug("New BW is not supported, downgrade BW to %d",
 			 fw_vht_ch_wd);
 		ap_new_ch_width = fw_vht_ch_wd;
-		ch_params.ch_width = ap_new_ch_width;
-		wlan_reg_set_channel_params_for_pwrmode(
-						     mac_ctx->pdev,
-						     csa_params->csa_chan_freq,
-						     0, &ch_params,
-						     REG_CURRENT_PWR_MODE);
-		ap_new_ch_width = ch_params.ch_width;
-		csa_params->new_ch_freq_seg1 = ch_params.center_freq_seg0;
-		csa_params->new_ch_freq_seg2 = ch_params.center_freq_seg1;
 	}
+	ch_params.ch_width = ap_new_ch_width;
+	wlan_reg_set_channel_params_for_pwrmode(mac_ctx->pdev,
+						csa_params->csa_chan_freq,
+						0, &ch_params,
+						REG_CURRENT_PWR_MODE);
+	ap_new_ch_width = ch_params.ch_width;
+	csa_params->new_ch_freq_seg1 = ch_params.center_freq_seg0;
+	csa_params->new_ch_freq_seg2 = ch_params.center_freq_seg1;
 
 	session_entry->gLimChannelSwitch.state =
 		eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY;
@@ -1723,18 +1720,6 @@ static QDF_STATUS lim_process_csa_wbw_ie(struct mac_context *mac_ctx,
 	chnl_switch_info->newCenterChanFreq0 = csa_params->new_ch_freq_seg1;
 	chnl_switch_info->newCenterChanFreq1 = csa_params->new_ch_freq_seg2;
 
-	if (session_entry->ch_width == ap_new_ch_width)
-		goto prnt_log;
-
-	if (session_entry->ch_width == CH_WIDTH_80MHZ) {
-		chnl_switch_info->newChanWidth = CH_WIDTH_80MHZ;
-		chnl_switch_info->newCenterChanFreq1 = 0;
-	} else {
-		session_entry->ch_width = ap_new_ch_width;
-		chnl_switch_info->newChanWidth = ap_new_ch_width;
-	}
-prnt_log:
-
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -2140,13 +2125,12 @@ void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
 			session_entry->htSupportedChannelWidthSet = true;
 		}
 	}
-	pe_debug("new ch %d freq %d width: %d freq0 %d freq1 %d ht width %d",
-		 lim_ch_switch->primaryChannel,
-		 lim_ch_switch->sw_target_freq,
-		 lim_ch_switch->ch_width,
-		 lim_ch_switch->ch_center_freq_seg0,
+	pe_debug("new ch %d: freq %d width: %d freq0 %d freq1 %d ht width %d, current freq %d: bw %d",
+		 lim_ch_switch->primaryChannel, lim_ch_switch->sw_target_freq,
+		 lim_ch_switch->ch_width, lim_ch_switch->ch_center_freq_seg0,
 		 lim_ch_switch->ch_center_freq_seg1,
-		 lim_ch_switch->sec_ch_offset);
+		 lim_ch_switch->sec_ch_offset, session_entry->curr_op_freq,
+		 session_entry->ch_width);
 
 	if (session_entry->curr_op_freq == csa_params->csa_chan_freq &&
 	    session_entry->ch_width == lim_ch_switch->ch_width &&

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

@@ -2196,9 +2196,11 @@ void lim_switch_primary_secondary_channel(struct mac_context *mac,
 	mac->lim.gpchangeChannelData = NULL;
 
 	/* Store the new primary and secondary channel in session entries if different */
-	if (pe_session->curr_op_freq != new_channel_freq) {
-		pe_warn("freq: %d --> freq: %d", pe_session->curr_op_freq,
-			new_channel_freq);
+	if (pe_session->curr_op_freq != new_channel_freq ||
+	    pe_session->ch_width != ch_width) {
+		pe_warn("freq: %d[%d] --> freq: %d[%d]",
+			pe_session->curr_op_freq, pe_session->ch_width,
+			new_channel_freq, ch_width);
 		pe_session->curr_op_freq = new_channel_freq;
 	}
 	if (pe_session->htSecondaryChannelOffset !=