qcacld-3.0: update the eht capabilities received from firmware

Update the wma structures with the eht capabilities received
from the firmware.

Change-Id: If571ab857e1f71b972655d9d48902b28e3974b1e
CRs-Fixed: 2911863

Kbuild

@@ -2492,6 +2492,9 @@ WMA_OBJS :=	$(WMA_SRC_DIR)/wma_main.o \
 		$(WMA_SRC_DIR)/wlan_qct_wma_legacy.o\
 		$(WMA_NDP_OBJS)
 
+ifeq ($(CONFIG_WLAN_FEATURE_11BE), y)
+WMA_OBJS +=	$(WMA_SRC_DIR)/wma_eht.o
+endif
 ifeq ($(CONFIG_WLAN_FEATURE_DSRC), y)
 WMA_OBJS+=	$(WMA_SRC_DIR)/wma_ocb.o
 endif

core/wma/inc/wma_if.h

@@ -167,6 +167,9 @@ struct sAniProbeRspStruct {
  * @nss: Return the number of spatial streams supported
  * @stbc_capable: stbc capable
  * @no_ptk_4_way: Do not need 4-way handshake
+ * @eht_capable: is EHT capabale or not
+ * @eht_config: EHT capability
+ * @eht_op: EHT operation
  *
  * This structure contains parameter required for
  * add sta request of upper layer.
@@ -248,6 +251,11 @@ typedef struct {
 	uint8_t twt_responder;
 #endif
 	bool no_ptk_4_way;
+#ifdef WLAN_FEATURE_11BE
+	bool eht_capable;
+	tDot11fIEeht_cap eht_config;
+	tDot11fIEeht_op eht_op;
+#endif
 } tAddStaParams, *tpAddStaParams;
 
 /**
@@ -338,6 +346,7 @@ typedef struct sLimMlmSetKeysReq {
  * @ch_width: VHT tx channel width
  * @he_capable: HE Capability
  * @no_ptk_4_way: Do not need 4-way handshake
+ * @eht_capable: EHT capability
  */
 struct bss_params {
 	tSirMacAddr bssId;
@@ -364,6 +373,9 @@ struct bss_params {
 #endif
 	bool no_ptk_4_way;
 	uint16_t bss_max_idle_period;
+#ifdef WLAN_FEATURE_11BE
+	bool eht_capable;
+#endif
 };
 
 /**

core/wma/inc/wma_tgt_cfg.h

@@ -49,6 +49,7 @@
  *                                          stats req
  * @is_fw_therm_throt_supp: Get thermal throttling threshold
  * @igmp_offload_enable: Get igmp offload enable or disable
+ * @en_11be: enable 11be
  */
 struct wma_tgt_services {
 	uint32_t sta_power_save;
@@ -90,6 +91,7 @@ struct wma_tgt_services {
 #ifdef WLAN_FEATURE_IGMP_OFFLOAD
 	bool igmp_offload_enable;
 #endif
+	bool en_11be;
 };
 
 /**
@@ -243,5 +245,10 @@ struct wma_tgt_cfg {
 	bool all_twt_enabled;
 	bool twt_stats_enabled;
 #endif
+#ifdef WLAN_FEATURE_11BE
+	tDot11fIEeht_cap eht_cap;
+	tDot11fIEeht_cap eht_cap_2g;
+	tDot11fIEeht_cap eht_cap_5g;
+#endif
 };
 #endif /* WMA_TGT_CFG_H */

core/wma/src/wma_eht.c

@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wma_eht.c
+ *
+ * WLAN Host Device Driver 802.11be - Extremely High Throughput Implementation
+ */
+
+#include "wma_eht.h"
+#include "wmi_unified.h"
+#include "service_ready_param.h"
+#include "target_if.h"
+
+/**
+ * wma_convert_eht_cap() - convert EHT capabilities into dot11f structure
+ * @eht_cap: pointer to dot11f structure
+ * @mac_cap: Received EHT MAC capability
+ * @phy_cap: Received EHT PHY capability
+ *
+ * This function converts various EHT capability received as part of extended
+ * service ready event into dot11f structure.
+ *
+ * Return: None
+ */
+static void wma_convert_eht_cap(tDot11fIEeht_cap *eht_cap, uint32_t *mac_cap,
+				uint32_t *phy_cap)
+{
+	eht_cap->present = true;
+	qdf_mem_copy(eht_cap->eht_mac_cap, mac_cap,
+		     sizeof(eht_cap->eht_mac_cap));
+	qdf_mem_copy(eht_cap->phy_cap_bytes, phy_cap,
+		     sizeof(eht_cap->phy_cap_bytes));
+}
+
+void wma_eht_update_tgt_services(struct wmi_unified *wmi_handle,
+				 struct wma_tgt_services *cfg)
+{
+	if (wmi_service_enabled(wmi_handle, wmi_service_11be)) {
+		cfg->en_11be = true;
+		wma_set_fw_wlan_feat_caps(DOT11BE);
+		wma_debug("11be is enabled");
+	} else {
+		wma_debug("11be is not enabled");
+	}
+}
+
+void wma_update_target_ext_eht_cap(struct target_psoc_info *tgt_hdl,
+				   struct wma_tgt_cfg *tgt_cfg)
+{
+	tDot11fIEeht_cap *eht_cap = &tgt_cfg->eht_cap;
+	tDot11fIEeht_cap *eht_cap_2g = &tgt_cfg->eht_cap_2g;
+	tDot11fIEeht_cap *eht_cap_5g = &tgt_cfg->eht_cap_5g;
+	int i, num_hw_modes, total_mac_phy_cnt;
+	tDot11fIEeht_cap eht_cap_mac;
+	struct wlan_psoc_host_mac_phy_caps_ext2 *mac_cap, *mac_phy_cap;
+	struct wlan_psoc_host_mac_phy_caps *host_cap;
+	uint32_t supported_bands;
+
+	qdf_mem_zero(eht_cap_2g, sizeof(tDot11fIEeht_cap));
+	qdf_mem_zero(eht_cap_5g, sizeof(tDot11fIEeht_cap));
+	num_hw_modes = target_psoc_get_num_hw_modes(tgt_hdl);
+	mac_phy_cap = target_psoc_get_mac_phy_cap_ext2(tgt_hdl);
+	host_cap = target_psoc_get_mac_phy_cap(tgt_hdl);
+	total_mac_phy_cnt = target_psoc_get_total_mac_phy_cnt(tgt_hdl);
+	if (!mac_phy_cap || !host_cap) {
+		wma_err("Invalid MAC PHY capabilities handle");
+		eht_cap->present = false;
+		return;
+	}
+
+	if (!num_hw_modes) {
+		wma_err("No extended EHT cap for current SOC");
+		eht_cap->present = false;
+		return;
+	}
+
+	if (!tgt_cfg->services.en_11be) {
+		wma_info("Target does not support 11BE");
+		eht_cap->present = false;
+		return;
+	}
+
+	supported_bands = host_cap->supported_bands;
+	for (i = 0; i < total_mac_phy_cnt; i++) {
+		qdf_mem_zero(&eht_cap_mac, sizeof(tDot11fIEeht_cap));
+		mac_cap = &mac_phy_cap[i];
+		if (supported_bands & WLAN_2G_CAPABILITY) {
+			wma_convert_eht_cap(&eht_cap_mac,
+					    mac_cap->eht_cap_info_2G,
+					    mac_cap->eht_cap_phy_info_2G);
+			wma_convert_eht_cap(eht_cap_2g,
+					    mac_cap->eht_cap_info_2G,
+					    mac_cap->eht_cap_info_2G,
+		}
+
+		if (supported_bands & WLAN_5G_CAPABILITY) {
+			qdf_mem_zero(&eht_cap_mac, sizeof(tDot11fIEeht_cap));
+			wma_convert_eht_cap(&eht_cap_mac,
+					    mac_cap->eht_cap_info_5G,
+					    mac_cap->eht_cap_phy_info_5G);
+			wma_convert_eht_cap(eht_cap_5g,
+					    mac_cap->eht_cap_info_5G,
+					    mac_cap->eht_cap_phy_info_5G);
+		}
+	}
+	qdf_mem_copy(eht_cap, &eht_cap_mac, sizeof(tDot11fIEeht_cap));
+}
+
+void wma_update_vdev_eht_ops(uint32_t *eht_ops, tDot11fIEeht_op *eht_op)
+{
+}

core/wma/src/wma_eht.h

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __WMA_EHT_H
+#define __WMA_EHT_H
+
+#include "wma.h"
+
+#ifdef WLAN_FEATURE_11BE
+/*
+ * wma_eht_update_tgt_services() - update tgt cfg to indicate 11be support
+ * @wmi_handle: pointer to WMI handle
+ * @cfg: pointer to WMA target services
+ *
+ * Based on WMI SERVICES information, enable 11be support and set DOT11BE
+ * bit in feature caps bitmap.
+ *
+ * Return: None
+ */
+void wma_eht_update_tgt_services(struct wmi_unified *wmi_handle,
+				 struct wma_tgt_services *cfg);
+/**
+ * wma_update_target_ext_eht_cap() - Update EHT caps with given extended cap
+ * @tgt_hdl: target psoc information
+ * @tgt_cfg: Target config
+ *
+ * This function loop through each hardware mode and for each hardware mode
+ * again it loop through each MAC/PHY and pull the caps 2G and 5G specific
+ * EHT caps and derives the final cap.
+ *
+ * Return: None
+ */
+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);
+#else
+static inline void wma_eht_update_tgt_services(struct wmi_unified *wmi_handle,
+					       struct wma_tgt_services *cfg)
+{
+		cfg->en_11be = false;
+		return;
+}
+
+static inline
+void wma_update_target_ext_eht_cap(struct target_psoc_info *tgt_hdl,
+				   struct wma_tgt_cfg *tgt_cfg)
+{
+}
+
+static inline
+void wma_update_vdev_eht_ops(uint32_t *eht_ops, tDot11fIEeht_op *eht_op)
+{
+}
+#endif
+#endif

core/wma/src/wma_main.c

@@ -108,6 +108,7 @@
 #include "target_if_psoc_timer_tx_ops.h"
 #include <ftm_time_sync_ucfg_api.h>
 #include "wlan_ipa_ucfg_api.h"
+#include "wma_eht.h"
 
 #ifdef DIRECT_BUF_RX_ENABLE
 #include <target_if_direct_buf_rx_api.h>
@@ -4658,6 +4659,7 @@ static inline void wma_update_target_services(struct wmi_unified *wmi_handle,
 	}
 
 	wma_he_update_tgt_services(wmi_handle, cfg);
+	wma_eht_update_tgt_services(wmi_handle, cfg);
 
 	cfg->get_peer_info_enabled =
 		wmi_service_enabled(wmi_handle,
@@ -5494,6 +5496,7 @@ static int wma_update_hdd_cfg(tp_wma_handle wma_handle)
 	wma_update_target_ext_vht_cap(tgt_hdl, &tgt_cfg.vht_cap);
 
 	wma_update_target_ext_he_cap(tgt_hdl, &tgt_cfg);
+	wma_update_target_ext_eht_cap(tgt_hdl, &tgt_cfg);
 
 	tgt_cfg.target_fw_version = target_if_get_fw_version(tgt_hdl);
 	if (service_ext_param)