qcacld-3.0: Replace WLAN_PHY_MODE with enum wlan_phymode

enum wlan_phymode is the enum to store the phymode in host
and thus replace WLAN_PHY_MODE with enum wlan_phymode
and add the corresponding change in the code to use
enum wlan_phymode.

Change-Id: I6c7990255f193eb3afdeeb278d3cc159ef8503b1
CRs-Fixed: 2544822

core/hdd/src/wlan_hdd_oemdata.c

@@ -399,7 +399,8 @@ void hdd_update_channel_bw_info(struct hdd_context *hdd_ctx,
 {
 	struct ch_params ch_params = {0};
 	uint16_t sec_ch_2g = 0;
-	WLAN_PHY_MODE phy_mode;
+	enum wlan_phymode phy_mode;
+	uint16_t fw_phy_mode;
 	uint32_t wni_dot11_mode;
 	struct hdd_channel_info *hdd_chan_info = chan_info;
 	uint32_t freq;
@@ -425,14 +426,16 @@ void hdd_update_channel_bw_info(struct hdd_context *hdd_ctx,
 		 * invalid and should not have been received in channel info
 		 * req. Set invalid phymode in this case.
 		 */
-		phy_mode = MODE_UNKNOWN;
+		phy_mode = WLAN_PHYMODE_AUTO;
 
-	hdd_debug("chan %d dot11_mode %d ch_width %d sec offset %d freq_seg0 %d phy_mode %d",
+	fw_phy_mode = wma_host_to_fw_phymode(phy_mode);
+
+	hdd_debug("chan %d dot11_mode %d ch_width %d sec offset %d freq_seg0 %d phy_mode %d fw_phy_mode %d",
 		chan, wni_dot11_mode, ch_params.ch_width,
 		ch_params.sec_ch_offset,
-		hdd_chan_info->band_center_freq1, phy_mode);
+		hdd_chan_info->band_center_freq1, phy_mode, fw_phy_mode);
 
-	WMI_SET_CHANNEL_MODE(hdd_chan_info, phy_mode);
+	WMI_SET_CHANNEL_MODE(hdd_chan_info, fw_phy_mode);
 }
 
 /**

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

@@ -8520,7 +8520,8 @@ QDF_STATUS lim_set_ch_phy_mode(struct wlan_objmgr_vdev *vdev, uint8_t dot11mode)
 		pe_err("Invalid center freq2 for 160MHz");
 		return QDF_STATUS_E_FAILURE;
 	}
-	mlme_obj->mgmt.generic.phy_mode = chan_mode;
+	/* Till conversion is not done in WMI we need to fill fw phy mode */
+	mlme_obj->mgmt.generic.phy_mode = wma_host_to_fw_phymode(chan_mode);
 	des_chan->ch_phymode = chan_mode;
 
 	return QDF_STATUS_SUCCESS;

core/wma/inc/wma.h

@@ -741,7 +741,7 @@ struct wma_txrx_node {
 	uint8_t llbCoexist;
 	uint8_t shortSlotTimeSupported;
 	uint8_t dtimPeriod;
-	uint32_t chanmode;
+	enum wlan_phymode chanmode;
 	A_UINT32 mhz;
 	enum phy_ch_width chan_width;
 	bool vdev_active;
@@ -1770,8 +1770,36 @@ QDF_STATUS wma_get_cca_stats(tp_wma_handle wma_handle,
 				uint8_t vdev_id);
 
 struct wma_ini_config *wma_get_ini_handle(tp_wma_handle wma_handle);
-WLAN_PHY_MODE wma_chan_phy_mode(uint32_t freq, enum phy_ch_width chan_width,
-				uint8_t dot11_mode);
+
+/**
+ * wma_chan_phy__mode() - get host phymode for channel
+ * @freq: channel freq
+ * @chan_width: maximum channel width possible
+ * @dot11_mode: maximum phy_mode possible
+ *
+ * Return: return host phymode
+ */
+enum wlan_phymode wma_chan_phy_mode(uint32_t freq, enum phy_ch_width chan_width,
+				    uint8_t dot11_mode);
+
+/**
+ * wma_host_to_fw_phymode() - convert host to fw phymode
+ * @host_phymode: phymode to convert
+ *
+ * Return: one of the values defined in enum WMI_HOST_WLAN_PHY_MODE;
+ *         or WMI_HOST_MODE_UNKNOWN if the conversion fails
+ */
+WMI_HOST_WLAN_PHY_MODE wma_host_to_fw_phymode(enum wlan_phymode host_phymode);
+
+/**
+ * wma_fw_to_host_phymode() - convert fw to host phymode
+ * @phymode: phymode to convert
+ *
+ * Return: one of the values defined in enum wlan_phymode;
+ *         or WLAN_PHYMODE_AUTO if the conversion fails
+ */
+enum wlan_phymode wma_fw_to_host_phymode(WMI_HOST_WLAN_PHY_MODE phymode);
+
 
 #ifdef FEATURE_OEM_DATA_SUPPORT
 /**

core/wma/inc/wma_api.h

@@ -140,7 +140,8 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1,
  *
  * Return: None
  */
-void wma_get_phy_mode_cb(uint8_t chan, uint32_t chan_width, uint32_t *phy_mode);
+void wma_get_phy_mode_cb(uint8_t chan, uint32_t chan_width,
+			 enum wlan_phymode  *phy_mode);
 
 QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value);
 

core/wma/inc/wma_internal.h

@@ -1232,9 +1232,21 @@ QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle);
 int wma_unified_debug_print_event_handler(void *handle, uint8_t *datap,
 					  uint32_t len);
 
-WLAN_PHY_MODE wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
-			       uint8_t is_ht, uint8_t ch_width,
-			       uint8_t is_vht, bool is_he);
+/**
+ * wma_peer_phymode() - get phymode
+ * @nw_type: nw type
+ * @sta_type: sta type
+ * @is_ht: is ht supported
+ * @ch_width: supported channel width
+ * @is_vht: is vht supported
+ * @is_he: is HE supported
+ *
+ * Return: host phymode
+ */
+enum wlan_phymode
+wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
+		 uint8_t is_ht, uint8_t ch_width,
+		 uint8_t is_vht, bool is_he);
 
 int32_t wma_txrx_fw_stats_reset(tp_wma_handle wma_handle,
 				uint8_t vdev_id, uint32_t value);
@@ -1788,6 +1800,7 @@ static inline int wma_twt_disable_comp_event_handler(void *handle,
 	return 0;
 }
 #endif
+
 /**
  * wma_get_roam_scan_stats() - Get roam scan stats request
  * @handle: wma handle

core/wma/src/wma_data.c

@@ -555,8 +555,7 @@ static QDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi,
  */
 static QDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi,
 					 uint32_t chwidth, int32_t mbpsx10_rate,
-					 uint8_t nss, WMI_HOST_WLAN_PHY_MODE chanmode,
-					 uint8_t *rate,
+					 uint8_t nss, uint8_t *rate,
 					 int32_t *streaming_rate)
 {
 	int32_t ret = 0;
@@ -590,7 +589,6 @@ static QDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi,
 static QDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi,
 					  uint32_t chwidth,
 					  int32_t mbpsx10_rate, uint8_t nss,
-					  WMI_HOST_WLAN_PHY_MODE chanmode,
 					  uint8_t *rate,
 					  int32_t *streaming_rate)
 {
@@ -626,8 +624,7 @@ static QDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi,
  * Return: QDF status
  */
 static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth,
-			     WMI_HOST_WLAN_PHY_MODE chanmode, A_UINT32 mhz,
-			     int32_t mbpsx10_rate, uint8_t nss,
+			     A_UINT32 mhz, int32_t mbpsx10_rate, uint8_t nss,
 			     uint8_t *rate)
 {
 	int32_t ret = 0;
@@ -639,8 +636,8 @@ static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth,
 	 * (3) 540 < mbpsx10_rate <= 2000: use 1x1 HT/VHT
 	 * (4) 2000 < mbpsx10_rate: use 2x2 HT/VHT
 	 */
-	WMA_LOGE("%s: Input: nss = %d, chanmode = %d, mbpsx10 = 0x%x, chwidth = %d, shortgi = %d",
-		 __func__, nss, chanmode, mbpsx10_rate, chwidth, shortgi);
+	WMA_LOGE("%s: Input: nss = %d, mbpsx10 = 0x%x, chwidth = %d, shortgi = %d",
+		 __func__, nss, mbpsx10_rate, chwidth, shortgi);
 	if ((mbpsx10_rate & 0x40000000) && nss > 0) {
 		/* bit 30 indicates user inputed nss,
 		 * bit 28 and 29 used to encode nss
@@ -670,7 +667,7 @@ static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth,
 		int32_t stream_rate = 0;
 
 		ret = wma_fill_ht_mcast_rate(shortgi, chwidth, mbpsx10_rate,
-					     nss, chanmode, &rate_ht,
+					     nss, &rate_ht,
 					     &stream_rate_ht);
 		if (ret != QDF_STATUS_SUCCESS)
 			stream_rate_ht = 0;
@@ -682,7 +679,7 @@ static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth,
 		}
 		/* capable doing 11AC mcast so that search vht tables */
 		ret = wma_fill_vht_mcast_rate(shortgi, chwidth, mbpsx10_rate,
-					      nss, chanmode, &rate_vht,
+					      nss, &rate_vht,
 					      &stream_rate_vht);
 		if (ret != QDF_STATUS_SUCCESS) {
 			if (stream_rate_ht != 0)
@@ -714,8 +711,8 @@ static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth,
 			}
 		}
 ht_vht_done:
-		WMA_LOGE("%s: NSS = %d, ucast_chanmode = %d, freq = %d",
-			 __func__, nss, chanmode, mhz);
+		WMA_LOGE("%s: NSS = %d, freq = %d",
+			 __func__, nss, mhz);
 		WMA_LOGD(" %s: input_rate = %d, chwidth = %d rate = 0x%x, streaming_rate = %d",
 			 __func__, mbpsx10_rate, chwidth, *rate, stream_rate);
 	} else {
@@ -725,8 +722,8 @@ ht_vht_done:
 		else
 			*rate = 0xFF;
 
-		WMA_LOGE("%s: NSS = %d, ucast_chanmode = %d, input_rate = %d, rate = 0x%x",
-			 __func__, nss, chanmode, mbpsx10_rate, *rate);
+		WMA_LOGE("%s: NSS = %d, input_rate = %d, rate = 0x%x",
+			 __func__, nss, mbpsx10_rate, *rate);
 	}
 	return ret;
 }
@@ -1240,8 +1237,8 @@ QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma,
 		 __func__, pRateUpdateParams->bssid.bytes,
 		 intr[vdev_id].config.shortgi, rate_flag);
 	ret = wma_encode_mc_rate(short_gi, intr[vdev_id].config.chwidth,
-				 intr[vdev_id].chanmode, intr[vdev_id].mhz,
-				 mbpsx10_rate, pRateUpdateParams->nss, &rate);
+				 intr[vdev_id].mhz, mbpsx10_rate,
+				 pRateUpdateParams->nss, &rate);
 	if (ret != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("%s: Error, Invalid input rate value", __func__);
 		qdf_mem_free(pRateUpdateParams);

core/wma/src/wma_dev_if.c

@@ -1140,6 +1140,7 @@ QDF_STATUS wma_handle_channel_switch_resp(tp_wma_handle wma,
 	     iface->type == WMI_VDEV_TYPE_MONITOR)) {
 		wmi_host_channel_width chanwidth;
 		int err;
+		WMI_HOST_WLAN_PHY_MODE phy_mode;
 
 		/* for CSA case firmware expects phymode before ch_wd */
 		bssid = wma_get_vdev_bssid(iface->vdev);
@@ -1148,14 +1149,16 @@ QDF_STATUS wma_handle_channel_switch_resp(tp_wma_handle wma,
 				 __func__, rsp->vdev_id);
 			return QDF_STATUS_E_FAILURE;
 		}
-		err = wma_set_peer_param(wma, bssid,
-					 WMI_PEER_PHYMODE, iface->chanmode,
-					rsp->vdev_id);
-		WMA_LOGD("%s:vdev_id %d chanmode %d status %d",
-			 __func__, rsp->vdev_id, iface->chanmode, err);
+		phy_mode = wma_host_to_fw_phymode(iface->chanmode);
 
+		/* for CSA case firmware expects phymode before ch_wd */
+		err = wma_set_peer_param(wma, bssid, WMI_PEER_PHYMODE,
+					 phy_mode, rsp->vdev_id);
+		WMA_LOGD("%s:vdev_id %d fw_phy_mode %d chanmode %d status %d",
+			 __func__, rsp->vdev_id, phy_mode,
+			 iface->chanmode, err);
 		chanwidth = wmi_get_ch_width_from_phy_mode(wma->wmi_handle,
-							   iface->chanmode);
+							   phy_mode);
 		err = wma_set_peer_param(wma, bssid, WMI_PEER_CHWIDTH,
 					 chanwidth, rsp->vdev_id);
 		WMA_LOGD("%s:vdev_id %d chanwidth %d status %d",
@@ -2819,7 +2822,7 @@ QDF_STATUS wma_vdev_pre_start(uint8_t vdev_id, bool restart)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	intr[vdev_id].chanmode = mlme_obj->mgmt.generic.phy_mode;
+	intr[vdev_id].chanmode = des_chan->ch_phymode;
 	intr[vdev_id].config.gtx_info.gtxRTMask[0] =
 		CFG_TGT_DEFAULT_GTX_HT_MASK;
 	intr[vdev_id].config.gtx_info.gtxRTMask[1] =

core/wma/src/wma_features.c

@@ -529,30 +529,22 @@ QDF_STATUS wma_process_dhcp_ind(WMA_HANDLE handle,
 					    &peer_set_param_fp);
 }
 
-/**
- * wma_chan_phy__mode() - get WLAN_PHY_MODE for channel
- * @freq: operating frequency of connection
- * @chan_width: maximum channel width possible
- * @dot11_mode: maximum phy_mode possible
- *
- * Return: return WLAN_PHY_MODE
- */
-WLAN_PHY_MODE wma_chan_phy_mode(uint32_t freq, enum phy_ch_width chan_width,
-				uint8_t dot11_mode)
+enum wlan_phymode wma_chan_phy_mode(uint32_t freq, enum phy_ch_width chan_width,
+				    uint8_t dot11_mode)
 {
-	WLAN_PHY_MODE phymode = MODE_UNKNOWN;
+	enum wlan_phymode phymode = WLAN_PHYMODE_AUTO;
 	uint16_t bw_val = wlan_reg_get_bw_value(chan_width);
 	t_wma_handle *wma = cds_get_context(QDF_MODULE_ID_WMA);
 	uint16_t chan;
 
 	if (!wma) {
 		WMA_LOGE("%s : wma_handle is NULL", __func__);
-		return MODE_UNKNOWN;
+		return WLAN_PHYMODE_AUTO;
 	}
 
 	if (chan_width >= CH_WIDTH_INVALID) {
 		WMA_LOGE("%s : Invalid channel width", __func__);
-		return MODE_UNKNOWN;
+		return WLAN_PHYMODE_AUTO;
 	}
 
 	chan = wlan_reg_freq_to_chan(wma->pdev, freq);
@@ -565,49 +557,49 @@ WLAN_PHY_MODE wma_chan_phy_mode(uint32_t freq, enum phy_ch_width chan_width,
 		     (MLME_DOT11_MODE_ALL == dot11_mode) ||
 		     (MLME_DOT11_MODE_11AC == dot11_mode) ||
 		     (MLME_DOT11_MODE_11AX == dot11_mode)))
-			phymode = MODE_11G;
+			phymode = WLAN_PHYMODE_11G;
 		else {
 			switch (dot11_mode) {
 			case MLME_DOT11_MODE_11B:
 				if ((bw_val == 20) || (bw_val == 40))
-					phymode = MODE_11B;
+					phymode = WLAN_PHYMODE_11B;
 				break;
 			case MLME_DOT11_MODE_11G:
 				if ((bw_val == 20) || (bw_val == 40))
-					phymode = MODE_11G;
+					phymode = WLAN_PHYMODE_11G;
 				break;
 			case MLME_DOT11_MODE_11G_ONLY:
 				if ((bw_val == 20) || (bw_val == 40))
-					phymode = MODE_11GONLY;
+					phymode = WLAN_PHYMODE_11G_ONLY;
 				break;
 			case MLME_DOT11_MODE_11N:
 			case MLME_DOT11_MODE_11N_ONLY:
 				if (bw_val == 20)
-					phymode = MODE_11NG_HT20;
+					phymode = WLAN_PHYMODE_11NG_HT20;
 				else if (bw_val == 40)
-					phymode = MODE_11NG_HT40;
+					phymode = WLAN_PHYMODE_11NG_HT40;
 				break;
 			case MLME_DOT11_MODE_ALL:
 			case MLME_DOT11_MODE_11AC:
 			case MLME_DOT11_MODE_11AC_ONLY:
 				if (bw_val == 20)
-					phymode = MODE_11AC_VHT20_2G;
+					phymode = WLAN_PHYMODE_11AC_VHT20_2G;
 				else if (bw_val == 40)
-					phymode = MODE_11AC_VHT40_2G;
+					phymode = WLAN_PHYMODE_11AC_VHT40_2G;
 				break;
 			case MLME_DOT11_MODE_11AX:
 			case MLME_DOT11_MODE_11AX_ONLY:
 				if (20 == bw_val)
-					phymode = MODE_11AX_HE20_2G;
+					phymode = WLAN_PHYMODE_11AXG_HE20;
 				else if (40 == bw_val)
-					phymode = MODE_11AX_HE40_2G;
+					phymode = WLAN_PHYMODE_11AXG_HE40;
 				break;
 			default:
 				break;
 			}
 		}
 	} else if (wlan_reg_is_dsrc_chan(wma->pdev, chan))
-		phymode = MODE_11A;
+		phymode = WLAN_PHYMODE_11A;
 	else {
 		if (((CH_WIDTH_5MHZ == chan_width) ||
 		     (CH_WIDTH_10MHZ == chan_width)) &&
@@ -616,46 +608,46 @@ WLAN_PHY_MODE wma_chan_phy_mode(uint32_t freq, enum phy_ch_width chan_width,
 		     (MLME_DOT11_MODE_ALL == dot11_mode) ||
 		     (MLME_DOT11_MODE_11AC == dot11_mode) ||
 		     (MLME_DOT11_MODE_11AX == dot11_mode)))
-			phymode = MODE_11A;
+			phymode = WLAN_PHYMODE_11A;
 		else {
 			switch (dot11_mode) {
 			case MLME_DOT11_MODE_11A:
 				if (0 < bw_val)
-					phymode = MODE_11A;
+					phymode = WLAN_PHYMODE_11A;
 				break;
 			case MLME_DOT11_MODE_11N:
 			case MLME_DOT11_MODE_11N_ONLY:
 				if (bw_val == 20)
-					phymode = MODE_11NA_HT20;
+					phymode = WLAN_PHYMODE_11NA_HT20;
 				else if (40 <= bw_val)
-					phymode = MODE_11NA_HT40;
+					phymode = WLAN_PHYMODE_11NA_HT40;
 				break;
 			case MLME_DOT11_MODE_ALL:
 			case MLME_DOT11_MODE_11AC:
 			case MLME_DOT11_MODE_11AC_ONLY:
 				if (bw_val == 20)
-					phymode = MODE_11AC_VHT20;
+					phymode = WLAN_PHYMODE_11AC_VHT20;
 				else if (bw_val == 40)
-					phymode = MODE_11AC_VHT40;
+					phymode = WLAN_PHYMODE_11AC_VHT40;
 				else if (bw_val == 80)
-					phymode = MODE_11AC_VHT80;
+					phymode = WLAN_PHYMODE_11AC_VHT80;
 				else if (chan_width == CH_WIDTH_160MHZ)
-					phymode = MODE_11AC_VHT160;
+					phymode = WLAN_PHYMODE_11AC_VHT160;
 				else if (chan_width == CH_WIDTH_80P80MHZ)
-					phymode = MODE_11AC_VHT80_80;
+					phymode = WLAN_PHYMODE_11AC_VHT80_80;
 				break;
 			case MLME_DOT11_MODE_11AX:
 			case MLME_DOT11_MODE_11AX_ONLY:
 				if (20 == bw_val)
-					phymode = MODE_11AX_HE20;
+					phymode = WLAN_PHYMODE_11AXA_HE20;
 				else if (40 == bw_val)
-					phymode = MODE_11AX_HE40;
+					phymode = WLAN_PHYMODE_11AXA_HE40;
 				else if (80 == bw_val)
-					phymode = MODE_11AX_HE80;
+					phymode = WLAN_PHYMODE_11AXA_HE80;
 				else if (CH_WIDTH_160MHZ == chan_width)
-					phymode = MODE_11AX_HE160;
+					phymode = WLAN_PHYMODE_11AXA_HE160;
 				else if (CH_WIDTH_80P80MHZ == chan_width)
-					phymode = MODE_11AX_HE80_80;
+					phymode = WLAN_PHYMODE_11AXA_HE80_80;
 				break;
 			default:
 				break;
@@ -666,7 +658,7 @@ WLAN_PHY_MODE wma_chan_phy_mode(uint32_t freq, enum phy_ch_width chan_width,
 	WMA_LOGD("%s: phymode %d freq %d ch_width %d dot11_mode %d",
 		 __func__, phymode, freq, chan_width, dot11_mode);
 
-	QDF_ASSERT(MODE_UNKNOWN != phymode);
+	QDF_ASSERT(phymode != WLAN_PHYMODE_AUTO);
 	return phymode;
 }
 

core/wma/src/wma_main.c

@@ -3053,7 +3053,8 @@ struct wlan_objmgr_psoc *wma_get_psoc_from_scn_handle(void *scn_handle)
 	return wma_handle->psoc;
 }
 
-void wma_get_phy_mode_cb(uint8_t chan, uint32_t chan_width, uint32_t *phy_mode)
+void wma_get_phy_mode_cb(uint8_t chan, uint32_t chan_width,
+			 enum wlan_phymode *phy_mode)
 {
 	uint32_t dot11_mode;
 	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
@@ -3061,7 +3062,7 @@ void wma_get_phy_mode_cb(uint8_t chan, uint32_t chan_width, uint32_t *phy_mode)
 
 	if (!mac) {
 		wma_err("MAC context is NULL");
-		*phy_mode = MODE_UNKNOWN;
+		*phy_mode = WLAN_PHYMODE_AUTO;
 		return;
 	}
 

core/wma/src/wma_mgmt.c

@@ -1125,14 +1125,7 @@ wma_fw_to_host_phymode_160(WMI_HOST_WLAN_PHY_MODE phymode)
 }
 #endif
 
-/**
- * wma_fw_to_host_phymode() - convert fw to host phymode
- * @phymode: phymode to convert
- *
- * Return: one of the values defined in enum wlan_phymode;
- *         or WLAN_PHYMODE_AUTO if the conversion fails
- */
-static enum wlan_phymode wma_fw_to_host_phymode(WMI_HOST_WLAN_PHY_MODE phymode)
+enum wlan_phymode wma_fw_to_host_phymode(WMI_HOST_WLAN_PHY_MODE phymode)
 {
 	enum wlan_phymode host_phymode;
 	switch (phymode) {
@@ -1242,15 +1235,7 @@ wma_host_to_fw_phymode_11ax(enum wlan_phymode host_phymode)
 }
 #endif
 
-/**
- * wma_host_to_fw_phymode() - convert host to fw phymode
- * @host_phymode: phymode to convert
- *
- * Return: one of the values defined in enum WMI_HOST_WLAN_PHY_MODE;
- *         or WMI_HOST_MODE_UNKNOWN if the conversion fails
- */
-static WMI_HOST_WLAN_PHY_MODE
-wma_host_to_fw_phymode(enum wlan_phymode host_phymode)
+WMI_HOST_WLAN_PHY_MODE wma_host_to_fw_phymode(enum wlan_phymode host_phymode)
 {
 	WMI_HOST_WLAN_PHY_MODE fw_phymode;
 
@@ -1305,7 +1290,7 @@ wma_host_to_fw_phymode(enum wlan_phymode host_phymode)
  */
 static void wma_objmgr_set_peer_mlme_phymode(tp_wma_handle wma,
 					     uint8_t *mac_addr,
-					     WMI_HOST_WLAN_PHY_MODE phymode)
+					     enum wlan_phymode phymode)
 {
 	uint8_t pdev_id;
 	struct wlan_objmgr_peer *peer;
@@ -1320,7 +1305,7 @@ static void wma_objmgr_set_peer_mlme_phymode(tp_wma_handle wma,
 	}
 
 	wlan_peer_obj_lock(peer);
-	wlan_peer_set_phymode(peer, wma_fw_to_host_phymode(phymode));
+	wlan_peer_set_phymode(peer, phymode);
 	wlan_peer_obj_unlock(peer);
 	wlan_objmgr_peer_release_ref(peer, WLAN_LEGACY_WMA_ID);
 }
@@ -1377,7 +1362,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	wmi_rate_set peer_legacy_rates, peer_ht_rates;
 	uint32_t num_peer_11b_rates = 0;
 	uint32_t num_peer_11a_rates = 0;
-	uint32_t phymode;
+	enum wlan_phymode phymode;
 	uint32_t peer_nss = 1;
 	struct wma_txrx_node *intr = NULL;
 	bool is_he;
@@ -1423,8 +1408,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 		phymode = intr->chanmode;
 	}
 
-	wma_objmgr_set_peer_mlme_phymode(wma, params->staMac, phymode);
-
 	if (!mac->mlme_cfg->rates.disable_abg_rate_txdata) {
 		/* Legacy Rateset */
 		rate_pos = (uint8_t *) peer_legacy_rates.rates;
@@ -1444,8 +1427,8 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 		}
 	}
 
-	if ((phymode == MODE_11A && num_peer_11a_rates == 0) ||
-	    (phymode == MODE_11B && num_peer_11b_rates == 0)) {
+	if ((phymode == WLAN_PHYMODE_11A && num_peer_11a_rates == 0) ||
+	    (phymode == WLAN_PHYMODE_11B && num_peer_11b_rates == 0)) {
 		WMA_LOGW("%s: Invalid phy rates. phymode 0x%x, 11b_rates %d, 11a_rates %d",
 			__func__, phymode, num_peer_11b_rates,
 			num_peer_11a_rates);
@@ -1503,8 +1486,8 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	} else {
 		qdf_mem_copy(cmd->peer_mac, params->bssId,
 						sizeof(cmd->peer_mac));
-		wma_objmgr_set_peer_mlme_phymode(wma, params->bssId, phymode);
 	}
+	wma_objmgr_set_peer_mlme_phymode(wma, cmd->peer_mac, phymode);
 
 	cmd->vdev_id = params->smesessionId;
 	cmd->peer_new_assoc = 1;
@@ -1718,11 +1701,12 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	if (!wma_is_vdev_in_ap_mode(wma, params->smesessionId))
 		intr->nss = cmd->peer_nss;
 
-	cmd->peer_phymode = phymode;
+	/* Till conversion is not done in WMI we need to fill fw phy mode */
+	cmd->peer_phymode = wma_host_to_fw_phymode(phymode);
 	WMA_LOGD("%s: vdev_id %d associd %d rate_caps %x peer_caps %x",
 		 __func__,  cmd->vdev_id, cmd->peer_associd,
 		 cmd->peer_rate_caps, cmd->peer_caps);
-	WMA_LOGD("%s:listen_intval %d ht_caps %x max_mpdu %d nss %d phymode %d",
+	WMA_LOGD("%s:listen_intval %d ht_caps %x max_mpdu %d nss %d fw_phymode %d",
 		 __func__, cmd->peer_listen_intval, cmd->peer_ht_caps,
 		 cmd->peer_max_mpdu, cmd->peer_nss, cmd->peer_phymode);
 	WMA_LOGD("%s: peer_mpdu_density %d encr_type %d cmd->peer_vht_caps %x",

core/wma/src/wma_scan_roam.c

@@ -2961,7 +2961,8 @@ int wma_mlme_roam_synch_event_handler_cb(void *handle, uint8_t *event,
 	channel = wlan_freq_to_chan(wma->interfaces[synch_event->vdev_id].mhz);
 	if (param_buf->chan) {
 		wma->interfaces[synch_event->vdev_id].chanmode =
-			WMI_GET_CHANNEL_MODE(param_buf->chan);
+			wma_fw_to_host_phymode(
+				WMI_GET_CHANNEL_MODE(param_buf->chan));
 	} else {
 		wma_get_phy_mode_cb(channel,
 				    wma->interfaces[synch_event->vdev_id].

core/wma/src/wma_utils.c

@@ -2872,22 +2872,12 @@ int wma_unified_debug_print_event_handler(void *handle, uint8_t *datap,
 #endif /* BIG_ENDIAN_HOST */
 }
 
-/**
- * wma_peer_phymode() - get phymode
- * @nw_type: nw type
- * @sta_type: sta type
- * @is_ht: is ht supported
- * @ch_width: supported channel width
- * @is_vht: is vht supported
- * @is_he: is HE supported
- *
- * Return: WLAN_PHY_MODE
- */
-WLAN_PHY_MODE wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
-			       uint8_t is_ht, uint8_t ch_width,
-			       uint8_t is_vht, bool is_he)
+enum wlan_phymode
+wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
+		 uint8_t is_ht, uint8_t ch_width,
+		 uint8_t is_vht, bool is_he)
 {
-	WLAN_PHY_MODE phymode = MODE_UNKNOWN;
+	enum wlan_phymode phymode = WLAN_PHYMODE_AUTO;
 
 	switch (nw_type) {
 	case eSIR_11B_NW_TYPE:
@@ -2895,65 +2885,71 @@ WLAN_PHY_MODE wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
 	if (STA_ENTRY_TDLS_PEER == sta_type) {
 		if (is_vht) {
 			if (CH_WIDTH_80MHZ == ch_width)
-				phymode = MODE_11AC_VHT80;
+				phymode = WLAN_PHYMODE_11AC_VHT80;
 			else
 				phymode = (CH_WIDTH_40MHZ == ch_width) ?
-					  MODE_11AC_VHT40 :
-					  MODE_11AC_VHT20;
+					  WLAN_PHYMODE_11AC_VHT40 :
+					  WLAN_PHYMODE_11AC_VHT20;
 		} else if (is_ht) {
 			phymode = (CH_WIDTH_40MHZ == ch_width) ?
-				  MODE_11NG_HT40 : MODE_11NG_HT20;
+				   WLAN_PHYMODE_11NG_HT40 :
+				   WLAN_PHYMODE_11NG_HT20;
 		} else
-			phymode = MODE_11B;
+			phymode = WLAN_PHYMODE_11B;
 	} else
 #endif /* FEATURE_WLAN_TDLS */
 	{
-		phymode = MODE_11B;
+		phymode = WLAN_PHYMODE_11B;
 		if (is_ht || is_vht || is_he)
 			WMA_LOGE("HT/VHT is enabled with 11B NW type");
 	}
 		break;
 	case eSIR_11G_NW_TYPE:
 		if (!(is_ht || is_vht || is_he)) {
-			phymode = MODE_11G;
+			phymode = WLAN_PHYMODE_11G;
 			break;
 		}
 		if (CH_WIDTH_40MHZ < ch_width)
 			WMA_LOGE("80/160 MHz BW sent in 11G, configured 40MHz");
 		if (ch_width)
-			phymode = (is_he) ? MODE_11AX_HE40_2G : (is_vht) ?
-					MODE_11AC_VHT40_2G : MODE_11NG_HT40;
+			phymode = (is_he) ? WLAN_PHYMODE_11AXG_HE40 : (is_vht) ?
+					WLAN_PHYMODE_11AC_VHT40_2G :
+					WLAN_PHYMODE_11NG_HT40;
 		else
-			phymode = (is_he) ? MODE_11AX_HE20_2G : (is_vht) ?
-					MODE_11AC_VHT20_2G : MODE_11NG_HT20;
+			phymode = (is_he) ? WLAN_PHYMODE_11AXG_HE20 : (is_vht) ?
+					WLAN_PHYMODE_11AC_VHT20_2G :
+					WLAN_PHYMODE_11NG_HT20;
 		break;
 	case eSIR_11A_NW_TYPE:
 		if (!(is_ht || is_vht || is_he)) {
-			phymode = MODE_11A;
+			phymode = WLAN_PHYMODE_11A;
 			break;
 		}
 		if (is_he) {
 			if (ch_width == CH_WIDTH_160MHZ)
-				phymode = MODE_11AX_HE160;
+				phymode = WLAN_PHYMODE_11AXA_HE160;
 			else if (ch_width == CH_WIDTH_80P80MHZ)
-				phymode = MODE_11AX_HE80_80;
+				phymode = WLAN_PHYMODE_11AXA_HE80_80;
 			else if (ch_width == CH_WIDTH_80MHZ)
-				phymode = MODE_11AX_HE80;
+				phymode = WLAN_PHYMODE_11AXA_HE80;
 			else
 				phymode = (ch_width) ?
-					  MODE_11AX_HE40 : MODE_11AX_HE20;
+					  WLAN_PHYMODE_11AXA_HE40 :
+					  WLAN_PHYMODE_11AXA_HE20;
 		} else if (is_vht) {
 			if (ch_width == CH_WIDTH_160MHZ)
-				phymode = MODE_11AC_VHT160;
+				phymode = WLAN_PHYMODE_11AC_VHT160;
 			else if (ch_width == CH_WIDTH_80P80MHZ)
-				phymode = MODE_11AC_VHT80_80;
+				phymode = WLAN_PHYMODE_11AC_VHT80_80;
 			else if (ch_width == CH_WIDTH_80MHZ)
-				phymode = MODE_11AC_VHT80;
+				phymode = WLAN_PHYMODE_11AC_VHT80;
 			else
 				phymode = (ch_width) ?
-					  MODE_11AC_VHT40 : MODE_11AC_VHT20;
+					  WLAN_PHYMODE_11AC_VHT40 :
+					  WLAN_PHYMODE_11AC_VHT20;
 		} else
-			phymode = (ch_width) ? MODE_11NA_HT40 : MODE_11NA_HT20;
+			phymode = (ch_width) ? WLAN_PHYMODE_11NA_HT40 :
+						WLAN_PHYMODE_11NA_HT20;
 		break;
 	default:
 		WMA_LOGE("%s: Invalid nw type %d", __func__, nw_type);