qcacld-3.0: Add wma layer 11BE api

Implement 11BE api in wma layer

Change-Id: I23c8fae9e27f972dadfe8a517954481de8f92de0
CRs-Fixed: 2912568

core/mac/inc/sir_api.h

@@ -5080,12 +5080,6 @@ struct he_capability {
 };
 #endif
 
-#define EHT_CAP_OUI_TYPE "\xfd"
-#define EHT_CAP_OUI_SIZE 1
-
-#define EHT_OP_OUI_TYPE "\xfe"
-#define EHT_OP_OUI_SIZE 1
-
 #define HE_GET_NSS(mcs, nss)                                         \
 	do {                                                         \
 		(nss) = 0;                                           \
@@ -5093,6 +5087,26 @@ struct he_capability {
 			(nss)++;                                     \
 	} while (0)
 
+#ifdef WLAN_FEATURE_11BE
+#define EHT_MAX_PHY_CAP_SIZE 3
+#define EHT_CAP_OUI_TYPE "\xfd"
+#define EHT_CAP_OUI_SIZE 1
+
+#define EHT_OP_OUI_TYPE "\xfe"
+#define EHT_OP_OUI_SIZE 1
+
+/**
+ * struct eht_capability - to store 11be EHT capabilities
+ * @phy_cap: EHT PHY capabilities
+ * @mac_cap: EHT MAC capabilities
+ * @mcs: EHT MCS
+ */
+struct eht_capability {
+	uint32_t phy_cap[EHT_MAX_PHY_CAP_SIZE];
+	uint32_t mac_cap;
+	uint32_t mcs;
+};
+#endif
 /**
  * struct rsp_stats - arp packet stats
  * @arp_req_enqueue: fw tx count

core/wma/inc/wma.h

@@ -915,6 +915,7 @@ struct wma_wlm_stats_data {
  * @ito_repeat_count: Indicates ito repeated count
  * @wma_fw_time_sync_timer: timer used for firmware time sync
  * * @fw_therm_throt_support: FW Supports thermal throttling?
+ * @eht_cap: 802.11be capabilities
  *
  * This structure is the global wma context.  It contains global wma
  * module parameters and handles of other modules.
@@ -1050,6 +1051,9 @@ typedef struct {
 	qdf_mc_timer_t wma_fw_time_sync_timer;
 	bool fw_therm_throt_support;
 	bool enable_tx_compl_tsf64;
+#ifdef WLAN_FEATURE_11BE
+	struct eht_capability eht_cap;
+#endif
 } t_wma_handle, *tp_wma_handle;
 
 /**

core/wma/inc/wma_internal.h

@@ -1158,13 +1158,14 @@ int wma_unified_debug_print_event_handler(void *handle, uint8_t *datap,
  * @ch_width: supported channel width
  * @is_vht: is vht supported
  * @is_he: is HE supported
+ * @is_eht: is EHT 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);
+		 uint8_t is_vht, bool is_he, bool is_eht);
 
 int32_t wma_txrx_fw_stats_reset(tp_wma_handle wma_handle,
 				uint8_t vdev_id, uint32_t value);

core/wma/src/wma_data.c

@@ -757,6 +757,24 @@ static void wma_cp_stats_set_rate_flag(tp_wma_handle wma, uint8_t vdev_id)
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_WMA_ID);
 }
 
+#ifdef WLAN_FEATURE_11BE
+/**
+ * wma_get_bss_eht_capable() - whether bss is eht capable or not
+ * @add_bss: add_bss params
+ *
+ * Return: true if eht capable is present
+ */
+static bool wma_get_bss_eht_capable(struct bss_params *add_bss)
+{
+	return add_bss->eht_capable;
+}
+#else
+static bool wma_get_bss_eht_capable(struct bss_params *add_bss)
+{
+	return false;
+}
+#endif
+
 #ifdef WLAN_FEATURE_11AX
 /**
  * wma_set_bss_rate_flags_he() - set rate flags based on BSS capability
@@ -876,7 +894,8 @@ void wma_set_bss_rate_flags(tp_wma_handle wma, uint8_t vdev_id,
 		*rate_flags |= TX_RATE_SGI;
 
 	if (!add_bss->htCapable && !add_bss->vhtCapable &&
-	    !wma_get_bss_he_capable(add_bss))
+	    !wma_get_bss_he_capable(add_bss) &&
+	    !wma_get_bss_eht_capable(add_bss))
 		*rate_flags = TX_RATE_LEGACY;
 
 	wma_debug("capable: vht %u, ht %u, rate_flags %x, ch_width %d",

core/wma/src/wma_dev_if.c

@@ -74,6 +74,7 @@
 #include "wlan_reg_services_api.h"
 #include <include/wlan_vdev_mlme.h>
 #include "wma_he.h"
+#include "wma_eht.h"
 #include "wlan_roam_debug.h"
 #include "wlan_ocb_ucfg_api.h"
 #include "init_deinit_lmac.h"
@@ -922,12 +923,21 @@ static void wma_peer_send_phymode(struct wlan_objmgr_vdev *vdev,
 	} else {
 		nw_type = eSIR_11A_NW_TYPE;
 	}
+#ifdef WLAN_FEATURE_11BE
 	new_phymode = wma_peer_phymode(nw_type, STA_ENTRY_PEER,
 				       IS_WLAN_PHYMODE_HT(old_peer_phymode),
 				       vdev_chan->ch_width,
 				       IS_WLAN_PHYMODE_VHT(old_peer_phymode),
-				       IS_WLAN_PHYMODE_HE(old_peer_phymode));
-
+				       IS_WLAN_PHYMODE_HE(old_peer_phymode),
+				       IS_WLAN_PHYMODE_EHT(old_peer_phymode));
+#else
+	new_phymode = wma_peer_phymode(nw_type, STA_ENTRY_PEER,
+				       IS_WLAN_PHYMODE_HT(old_peer_phymode),
+				       vdev_chan->ch_width,
+				       IS_WLAN_PHYMODE_VHT(old_peer_phymode),
+				       IS_WLAN_PHYMODE_HE(old_peer_phymode),
+				       0);
+#endif
 	if (new_phymode == old_peer_phymode) {
 		wma_debug("Ignore update as old %d and new %d phymode are same for mac "QDF_MAC_ADDR_FMT,
 			  old_peer_phymode, new_phymode,
@@ -3665,6 +3675,10 @@ QDF_STATUS wma_post_vdev_start_setup(uint8_t vdev_id)
 
 	wma_vdev_set_he_bss_params(wma, vdev_id,
 				   &mlme_obj->proto.he_ops_info);
+#ifdef WLAN_FEATURE_11BE
+	wma_vdev_set_eht_bss_params(wma, vdev_id,
+				    &mlme_obj->proto.eht_ops_info);
+#endif
 
 	return status;
 }

core/wma/src/wma_eht.c

@@ -118,8 +118,76 @@ void wma_update_target_ext_eht_cap(struct target_psoc_info *tgt_hdl,
 		}
 	}
 	qdf_mem_copy(eht_cap, &eht_cap_mac, sizeof(tDot11fIEeht_cap));
+	wma_print_eht_cap(eht_cap);
 }
 
 void wma_update_vdev_eht_ops(uint32_t *eht_ops, tDot11fIEeht_op *eht_op)
 {
 }
+
+void wma_print_eht_cap(tDot11fIEeht_cap *eht_cap)
+{
+	if (!eht_cap->present)
+		return;
+
+	wma_debug("EHT Capabilities:");
+}
+
+void wma_print_eht_phy_cap(uint32_t *phy_cap)
+{
+	wma_debug("EHT PHY Capabilities:");
+}
+
+void wma_print_eht_mac_cap_w1(uint32_t mac_cap)
+{
+	wma_debug("EHT MAC Capabilities:");
+}
+
+void wma_print_eht_mac_cap_w2(uint32_t mac_cap)
+{
+}
+
+void wma_print_eht_op(tDot11fIEeht_op *eht_ops)
+{
+}
+
+void wma_populate_peer_eht_cap(struct peer_assoc_params *peer,
+			       tpAddStaParams params)
+{
+	tDot11fIEeht_cap *eht_cap = &params->eht_config;
+	uint32_t *phy_cap = peer->peer_eht_cap_phyinfo;
+	uint32_t mac_cap[PSOC_HOST_MAX_MAC_SIZE] = {0};
+
+	if (params->eht_capable)
+		peer->eht_flag = 1;
+	else
+		return;
+
+	wma_print_eht_cap(eht_cap);
+	wma_debug("Peer EHT Capabilities:");
+	wma_print_eht_phy_cap(phy_cap);
+	wma_print_eht_mac_cap_w1(mac_cap[0]);
+	wma_print_eht_mac_cap_w2(mac_cap[1]);
+}
+
+void wma_vdev_set_eht_bss_params(tp_wma_handle wma, uint8_t vdev_id,
+				 struct vdev_mlme_eht_ops_info *eht_info)
+{
+	if (!eht_info->eht_ops)
+		return;
+}
+
+QDF_STATUS wma_get_eht_capabilities(struct eht_capability *eht_cap)
+{
+	tp_wma_handle wma_handle;
+
+	wma_handle = cds_get_context(QDF_MODULE_ID_WMA);
+	if (!wma_handle)
+		return QDF_STATUS_E_FAILURE;
+
+	qdf_mem_copy(eht_cap->phy_cap,
+		     &wma_handle->eht_cap.phy_cap,
+		     WMI_MAX_EHTCAP_PHY_SIZE);
+	eht_cap->mac_cap = wma_handle->eht_cap.mac_cap;
+	return QDF_STATUS_SUCCESS;
+}

core/wma/src/wma_eht.h

@@ -47,6 +47,104 @@ void wma_update_target_ext_eht_cap(struct target_psoc_info *tgt_hdl,
 				   struct wma_tgt_cfg *tgt_cfg);
 
 void wma_update_vdev_eht_ops(uint32_t *eht_ops, tDot11fIEeht_op *eht_op);
+
+/**
+ * wma_print_eht_cap() - Print EHT capabilities
+ * @eht_cap: pointer to EHT Capability
+ *
+ * Received EHT capabilities are converted into dot11f structure.
+ * This function will print all the EHT capabilities as stored
+ * in the dot11f structure.
+ *
+ * Return: None
+ */
+void wma_print_eht_cap(tDot11fIEeht_cap *eht_cap);
+
+/**
+ * wma_print_eht_phy_cap() - Print EHT PHY Capability
+ * @phy_cap: pointer to PHY Capability
+ *
+ * This function prints EHT PHY Capability received from FW.
+ *
+ * Return: none
+ */
+void wma_print_eht_phy_cap(uint32_t *phy_cap);
+
+/**
+ * wma_print_eht_mac_cap_w1() - Print EHT MAC Capability
+ * @mac_cap: MAC Capability
+ *
+ * This function prints EHT MAC Capability received from FW.
+ *
+ * Return: none
+ */
+void wma_print_eht_mac_cap_w1(uint32_t mac_cap);
+
+/**
+ * wma_print_eht_mac_cap_w2() - Print EHT MAC Capability
+ * @mac_cap: MAC Capability
+ *
+ * This function prints EHT MAC Capability received from FW.
+ *
+ * Return: none
+ */
+void wma_print_eht_mac_cap_w2(uint32_t mac_cap);
+
+/**
+ * wma_print_eht_op() - Print EHT Operation
+ * @eht_cap: pointer to EHT Operation
+ *
+ * Print EHT operation stored as dot11f structure
+ *
+ * Return: None
+ */
+void wma_print_eht_op(tDot11fIEeht_op *eht_ops);
+
+/**
+ * wma_populate_peer_eht_cap() - populate peer EHT capabilities in
+ *                               peer assoc cmd
+ * @peer: pointer to peer assoc params
+ * @params: pointer to ADD STA params
+ *
+ * Return: None
+ */
+void wma_populate_peer_eht_cap(struct peer_assoc_params *peer,
+			       tpAddStaParams params);
+
+/**
+ * wma_vdev_set_eht_bss_params() - set EHT OPs in vdev start
+ * @wma: pointer to wma handle
+ * @vdev_id: VDEV id
+ * @eht_info: pointer to eht info
+ *
+ * Return: None
+ */
+void wma_vdev_set_eht_bss_params(tp_wma_handle wma, uint8_t vdev_id,
+				 struct vdev_mlme_eht_ops_info *eht_info);
+
+/**
+ * wma_is_peer_eht_capable() - whether peer is eht capable or not
+ * @params: add sta params
+ *
+ * Return: true if eht capable is present
+ */
+static inline bool wma_is_peer_eht_capable(tpAddStaParams params)
+{
+	return params->eht_capable;
+}
+
+/**
+ * wma_get_eht_capabilities() - Get EHT capabilities from WMA
+ * @eht_cap: Pointer to EHT capabilities
+ *
+ * Currently EHT capabilities are not updated in wma_handle. This
+ * is an interface for upper layer to query capabilities from WMA.
+ * When the real use case arise, update wma_handle with EHT capabilities
+ * as required.
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS wma_get_eht_capabilities(struct eht_capability *eht_cap);
 #else
 static inline void wma_eht_update_tgt_services(struct wmi_unified *wmi_handle,
 					       struct wma_tgt_services *cfg)
@@ -65,5 +163,42 @@ static inline
 void wma_update_vdev_eht_ops(uint32_t *eht_ops, tDot11fIEeht_op *eht_op)
 {
 }
+
+static inline
+void wma_print_eht_cap(tDot11fIEeht_cap *eht_cap)
+{
+}
+
+static inline
+void wma_print_eht_phy_cap(uint32_t *phy_cap)
+{
+}
+
+static inline
+void wma_print_eht_mac_cap_w1(uint32_t mac_cap)
+{
+}
+
+static inline
+void wma_print_eht_mac_cap_w2(uint32_t mac_cap)
+{
+}
+
+static inline
+void wma_print_eht_op(tDot11fIEeht_op *eht_ops)
+{
+}
+
+static inline
+void wma_populate_peer_eht_cap(struct peer_assoc_params *peer,
+			       tpAddStaParams params)
+{
+}
+
+static inline bool wma_is_peer_eht_capable(tpAddStaParams params)
+{
+	return false;
+}
+
 #endif
 #endif

core/wma/src/wma_mgmt.c

@@ -69,6 +69,7 @@
 #include "wlan_lmac_if_api.h"
 #include <cdp_txrx_handle.h>
 #include "wma_he.h"
+#include "wma_eht.h"
 #include <qdf_crypto.h>
 #include "wma_twt.h"
 #include "wlan_p2p_cfg_api.h"
@@ -1026,6 +1027,45 @@ wma_fw_to_host_phymode_11ax(WMI_HOST_WLAN_PHY_MODE phymode)
 }
 #endif
 
+#ifdef WLAN_FEATURE_11BE
+/**
+ * wma_fw_to_host_phymode_11be() - convert fw to host phymode for 11be phymodes
+ * @phymode: phymode to convert
+ *
+ * Return: one of the 11be values defined in enum wlan_phymode;
+ *         or WLAN_PHYMODE_AUTO if the input is not an 11be phymode
+ */
+static enum wlan_phymode
+wma_fw_to_host_phymode_11be(WMI_HOST_WLAN_PHY_MODE phymode)
+{
+	switch (phymode) {
+	default:
+		return WLAN_PHYMODE_AUTO;
+	case WMI_HOST_MODE_11BE_EHT20:
+		return WLAN_PHYMODE_11BEA_EHT20;
+	case WMI_HOST_MODE_11BE_EHT40:
+		return WLAN_PHYMODE_11BEA_EHT40;
+	case WMI_HOST_MODE_11BE_EHT80:
+		return WLAN_PHYMODE_11BEA_EHT80;
+	case WMI_HOST_MODE_11BE_EHT160:
+		return WLAN_PHYMODE_11BEA_EHT160;
+	case WMI_HOST_MODE_11BE_EHT320:
+		return WLAN_PHYMODE_11BEA_EHT320;
+	case WMI_HOST_MODE_11BE_EHT20_2G:
+		return WLAN_PHYMODE_11BEG_EHT20;
+	case WMI_HOST_MODE_11BE_EHT40_2G:
+		return WLAN_PHYMODE_11BEG_EHT40;
+	}
+	return WLAN_PHYMODE_AUTO;
+}
+#else
+static enum wlan_phymode
+wma_fw_to_host_phymode_11be(WMI_HOST_WLAN_PHY_MODE phymode)
+{
+	return WLAN_PHYMODE_AUTO;
+}
+#endif
+
 #ifdef CONFIG_160MHZ_SUPPORT
 /**
  * wma_fw_to_host_phymode_160() - convert fw to host phymode for 160 mhz
@@ -1063,7 +1103,10 @@ enum wlan_phymode wma_fw_to_host_phymode(WMI_HOST_WLAN_PHY_MODE phymode)
 		host_phymode = wma_fw_to_host_phymode_160(phymode);
 		if (host_phymode != WLAN_PHYMODE_AUTO)
 			return host_phymode;
-		return wma_fw_to_host_phymode_11ax(phymode);
+		host_phymode = wma_fw_to_host_phymode_11ax(phymode);
+		if (host_phymode != WLAN_PHYMODE_AUTO)
+			return host_phymode;
+		return wma_fw_to_host_phymode_11be(phymode);
 	case WMI_HOST_MODE_11A:
 		return WLAN_PHYMODE_11A;
 	case WMI_HOST_MODE_11G:
@@ -1165,6 +1208,46 @@ wma_host_to_fw_phymode_11ax(enum wlan_phymode host_phymode)
 }
 #endif
 
+#ifdef WLAN_FEATURE_11BE
+/**
+ * wma_host_to_fw_phymode_11be() - convert host to fw phymode for 11be phymode
+ * @host_phymode: phymode to convert
+ *
+ * Return: one of the 11be values defined in enum WMI_HOST_WLAN_PHY_MODE;
+ *         or WMI_HOST_MODE_UNKNOWN if the input is not an 11be phymode
+ */
+static WMI_HOST_WLAN_PHY_MODE
+wma_host_to_fw_phymode_11be(enum wlan_phymode host_phymode)
+{
+	switch (host_phymode) {
+	case WLAN_PHYMODE_11BEA_EHT20:
+		return WMI_HOST_MODE_11BE_EHT20;
+	case WLAN_PHYMODE_11BEA_EHT40:
+		return WMI_HOST_MODE_11BE_EHT40;
+	case WLAN_PHYMODE_11BEA_EHT80:
+		return WMI_HOST_MODE_11BE_EHT80;
+	case WLAN_PHYMODE_11BEA_EHT160:
+		return WMI_HOST_MODE_11BE_EHT160;
+	case WLAN_PHYMODE_11BEA_EHT320:
+		return WMI_HOST_MODE_11BE_EHT320;
+	case WLAN_PHYMODE_11BEG_EHT20:
+		return WMI_HOST_MODE_11BE_EHT20_2G;
+	case WLAN_PHYMODE_11BEG_EHT40:
+	case WLAN_PHYMODE_11BEG_EHT40PLUS:
+	case WLAN_PHYMODE_11BEG_EHT40MINUS:
+		return WMI_HOST_MODE_11BE_EHT40_2G;
+	default:
+		return WMI_HOST_MODE_UNKNOWN;
+	}
+}
+#else
+static WMI_HOST_WLAN_PHY_MODE
+wma_host_to_fw_phymode_11be(enum wlan_phymode host_phymode)
+{
+	return WMI_HOST_MODE_UNKNOWN;
+}
+#endif
+
 WMI_HOST_WLAN_PHY_MODE wma_host_to_fw_phymode(enum wlan_phymode host_phymode)
 {
 	WMI_HOST_WLAN_PHY_MODE fw_phymode;
@@ -1206,7 +1289,10 @@ WMI_HOST_WLAN_PHY_MODE wma_host_to_fw_phymode(enum wlan_phymode host_phymode)
 		fw_phymode = wma_host_to_fw_phymode_160(host_phymode);
 		if (fw_phymode != WMI_HOST_MODE_UNKNOWN)
 			return fw_phymode;
-		return wma_host_to_fw_phymode_11ax(host_phymode);
+		fw_phymode = wma_host_to_fw_phymode_11ax(host_phymode);
+		if (fw_phymode != WMI_HOST_MODE_UNKNOWN)
+			return fw_phymode;
+		return wma_host_to_fw_phymode_11be(host_phymode);
 	}
 }
 
@@ -1282,6 +1368,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	uint32_t peer_nss = 1;
 	struct wma_txrx_node *intr = NULL;
 	bool is_he;
+	bool is_eht;
 	QDF_STATUS status;
 	struct mac_context *mac = wma->mac_context;
 	struct wlan_channel *des_chan;
@@ -1302,6 +1389,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	qdf_mem_zero(cmd, sizeof(struct peer_assoc_params));
 
 	is_he = wma_is_peer_he_capable(params);
+	is_eht = wma_is_peer_eht_capable(params);
 	if ((params->ch_width > CH_WIDTH_40MHZ) &&
 	    ((nw_type == eSIR_11G_NW_TYPE) ||
 	     (nw_type == eSIR_11B_NW_TYPE))) {
@@ -1311,7 +1399,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	}
 	phymode = wma_peer_phymode(nw_type, params->staType,
 				   params->htCapable, params->ch_width,
-				   params->vhtCapable, is_he);
+				   params->vhtCapable, is_he, is_eht);
 
 	des_chan = wlan_vdev_mlme_get_des_chan(intr->vdev);
 	vdev_phymode = des_chan->ch_phymode;
@@ -1610,6 +1698,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	}
 
 	wma_populate_peer_he_cap(cmd, params);
+	wma_populate_peer_eht_cap(cmd, params);
 	if (!wma_is_vdev_in_ap_mode(wma, params->smesessionId))
 		intr->nss = cmd->peer_nss;
 

core/wma/src/wma_utils.c

@@ -3181,7 +3181,7 @@ int wma_unified_debug_print_event_handler(void *handle, uint8_t *datap,
 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)
+		 uint8_t is_vht, bool is_he, bool is_eht)
 {
 	enum wlan_phymode phymode = WLAN_PHYMODE_AUTO;
 
@@ -3201,17 +3201,29 @@ wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
 #endif /* FEATURE_WLAN_TDLS */
 	{
 		phymode = WLAN_PHYMODE_11B;
-		if (is_ht || is_vht || is_he)
+		if (is_ht || is_vht || is_he || is_eht)
 			wma_err("HT/VHT is enabled with 11B NW type");
 	}
 		break;
 	case eSIR_11G_NW_TYPE:
-		if (!(is_ht || is_vht || is_he)) {
+		if (!(is_ht || is_vht || is_he || is_eht)) {
 			phymode = WLAN_PHYMODE_11G;
 			break;
 		}
 		if (CH_WIDTH_40MHZ < ch_width)
 			wma_err("80/160 MHz BW sent in 11G, configured 40MHz");
+#ifdef WLAN_FEATURE_11BE
+		if (ch_width)
+			phymode = (is_eht) ? WLAN_PHYMODE_11BEG_EHT40 :
+					(is_he) ? WLAN_PHYMODE_11AXG_HE40 :
+					(is_vht) ? WLAN_PHYMODE_11AC_VHT40_2G :
+					WLAN_PHYMODE_11NG_HT40;
+		else
+			phymode = (is_eht) ? WLAN_PHYMODE_11BEG_EHT20 :
+					(is_he) ? WLAN_PHYMODE_11AXG_HE20 :
+					(is_vht) ? WLAN_PHYMODE_11AC_VHT20_2G :
+					WLAN_PHYMODE_11NG_HT20;
+#else
 		if (ch_width)
 			phymode = (is_he) ? WLAN_PHYMODE_11AXG_HE40 : (is_vht) ?
 					WLAN_PHYMODE_11AC_VHT40_2G :
@@ -3220,12 +3232,27 @@ wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
 			phymode = (is_he) ? WLAN_PHYMODE_11AXG_HE20 : (is_vht) ?
 					WLAN_PHYMODE_11AC_VHT20_2G :
 					WLAN_PHYMODE_11NG_HT20;
+#endif
 		break;
 	case eSIR_11A_NW_TYPE:
-		if (!(is_ht || is_vht || is_he)) {
+		if (!(is_ht || is_vht || is_he || is_eht)) {
 			phymode = WLAN_PHYMODE_11A;
 			break;
 		}
+#ifdef WLAN_FEATURE_11BE
+		if (is_eht) {
+			if (ch_width == CH_WIDTH_160MHZ)
+				phymode = WLAN_PHYMODE_11BEA_EHT160;
+			else if (ch_width == CH_WIDTH_320MHZ)
+				phymode = WLAN_PHYMODE_11BEA_EHT320;
+			else if (ch_width == CH_WIDTH_80MHZ)
+				phymode = WLAN_PHYMODE_11BEA_EHT80;
+			else
+				phymode = (ch_width) ?
+					  WLAN_PHYMODE_11BEA_EHT40 :
+					  WLAN_PHYMODE_11BEA_EHT20;
+		} else
+#endif
 		if (is_he) {
 			if (ch_width == CH_WIDTH_160MHZ)
 				phymode = WLAN_PHYMODE_11AXA_HE160;
@@ -3256,8 +3283,8 @@ wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
 		wma_err("Invalid nw type %d", nw_type);
 		break;
 	}
-	wma_debug("nw_type %d is_ht %d ch_width %d is_vht %d is_he %d phymode %d",
-		 nw_type, is_ht, ch_width, is_vht, is_he, phymode);
+	wma_debug("nw_type %d is_ht %d ch_width %d is_vht %d is_he %d is_eht %d phymode %d",
+		  nw_type, is_ht, ch_width, is_vht, is_he, is_eht, phymode);
 
 	return phymode;
 }